@@ -130,6 +130,38 @@ const readInstanceSecrets = Effect.fn("ProviderInstanceRegistry.readInstanceSecr
130130 return { secrets, unreadable } ;
131131} ) ;
132132
133+ // Replaces only the checked reference's value in the secrets a live instance already holds, so
134+ // another reference whose read failed earlier is not read again and does not park the instance.
135+ const carryCheckedSecret = < R > (
136+ driver : AnyProviderDriver < R > | undefined ,
137+ entry : ProviderInstanceConfig ,
138+ current : InstanceSecrets ,
139+ checked : SecretReference ,
140+ value : string | undefined ,
141+ ) : InstanceSecrets => {
142+ if ( value === undefined || value . trim ( ) === "" ) return current ;
143+ const matches = ( reference : SecretReference ) =>
144+ reference . provider === checked . provider && reference . reference === checked . reference ;
145+ const replacedNames = new Set (
146+ ( entry . environment ?? [ ] ) . flatMap ( ( variable ) =>
147+ typeof variable . value !== "string" && matches ( variable . value ) ? [ variable . name ] : [ ] ,
148+ ) ,
149+ ) ;
150+ const replacedFields = new Set (
151+ configSecretReferences ( driver , entry ) . flatMap ( ( { field, reference } ) =>
152+ matches ( reference ) ? [ field ] : [ ] ,
153+ ) ,
154+ ) ;
155+ return {
156+ environment : current . environment . map ( ( variable ) =>
157+ replacedNames . has ( variable . name ) ? { ...variable , value } : variable ,
158+ ) ,
159+ config : current . config . map ( ( slot ) =>
160+ replacedFields . has ( slot . field ) ? { ...slot , value } : slot ,
161+ ) ,
162+ } ;
163+ } ;
164+
133165/** Conflicting saved flags must preserve any explicit disable. */
134166const resolveEntryEnabled = ( entry : ProviderInstanceConfig , typedConfig : unknown ) : boolean => {
135167 const rawConfigEnabled = providerInstanceConfigEnabledFlag ( entry . config ) ;
@@ -161,6 +193,7 @@ const buildEntry = Effect.fn("ProviderInstanceRegistry.buildEntry")(function* <R
161193 readonly rawInstanceId : string ;
162194 readonly entry : ProviderInstanceConfig ;
163195 readonly deferSecrets : boolean ;
196+ readonly carriedSecrets ?: InstanceSecrets | undefined ;
164197} ) : Effect . fn . Return <
165198 | { readonly kind : "live" ; readonly live : LiveEntry }
166199 | {
@@ -171,7 +204,15 @@ const buildEntry = Effect.fn("ProviderInstanceRegistry.buildEntry")(function* <R
171204 never ,
172205 R | SecretResolver . SecretResolver
173206> {
174- const { driversById, parentScope, instanceId, rawInstanceId, entry, deferSecrets } = input ;
207+ const {
208+ driversById,
209+ parentScope,
210+ instanceId,
211+ rawInstanceId,
212+ entry,
213+ deferSecrets,
214+ carriedSecrets,
215+ } = input ;
175216 const blocked = input . blockedReason ( entry . driver ) ;
176217 if ( blocked !== undefined ) {
177218 return {
@@ -235,12 +276,14 @@ const buildEntry = Effect.fn("ProviderInstanceRegistry.buildEntry")(function* <R
235276 } ) ,
236277 } ;
237278 }
238- const { secrets, unreadable } = enabled
239- ? yield * readInstanceSecrets ( driver , entry )
240- : {
241- secrets : { environment : withoutSecretReferences ( entry . environment ?? [ ] ) , config : [ ] } ,
242- unreadable : [ ] ,
243- } ;
279+ const { secrets, unreadable } = carriedSecrets
280+ ? { secrets : carriedSecrets , unreadable : [ ] }
281+ : enabled
282+ ? yield * readInstanceSecrets ( driver , entry )
283+ : {
284+ secrets : { environment : withoutSecretReferences ( entry . environment ?? [ ] ) , config : [ ] } ,
285+ unreadable : [ ] ,
286+ } ;
244287 // Starting with a blank credential would fail later with a less useful error, or fall back to
245288 // whatever the server inherited.
246289 if ( unreadable . length > 0 ) {
@@ -311,9 +354,10 @@ const makeReconcile = <R>(input: {
311354 configMap : ProviderInstanceConfigMap ,
312355 rebuild ?: ReadonlySet < ProviderInstanceId > ,
313356 deferSecrets ?: boolean ,
357+ carried ?: ReadonlyMap < ProviderInstanceId , InstanceSecrets > ,
314358) => Effect . Effect < void , never , R | SecretResolver . SecretResolver > ) => {
315359 const { state, driversById, blockedReason, parentScope } = input ;
316- return ( configMap , rebuild = new Set ( ) , deferSecrets = false ) =>
360+ return ( configMap , rebuild = new Set ( ) , deferSecrets = false , carried = new Map ( ) ) =>
317361 Effect . gen ( function * ( ) {
318362 const previousEntries = yield * Ref . get ( state . entries ) ;
319363 const previousUnavailable = yield * Ref . get ( state . unavailable ) ;
@@ -365,6 +409,7 @@ const makeReconcile = <R>(input: {
365409 const instanceId = ProviderInstanceId . make ( rawInstanceId ) ;
366410 const kept = previousEntries . has ( instanceId ) && ! replacedIds . has ( instanceId ) ;
367411 return kept ||
412+ carried . has ( instanceId ) ||
368413 parkedSnapshot ( instanceId , entry ) !== undefined ||
369414 ! ( yield * isEntryEnabled ( driversById , entry ) )
370415 ? [ ]
@@ -406,6 +451,7 @@ const makeReconcile = <R>(input: {
406451 rawInstanceId,
407452 entry,
408453 deferSecrets,
454+ carriedSecrets : carried . get ( instanceId ) ,
409455 } ) ;
410456 if ( result . kind === "live" ) {
411457 builtEntries . set ( instanceId , result . live ) ;
@@ -503,44 +549,79 @@ export const makeProviderInstanceRegistry = Effect.fn(
503549 ) ;
504550
505551 // Rebuilds an instance only when it was unavailable or its secrets changed, so a refresh does
506- // not restart providers whose credentials are the same.
507- const reloadSecrets : ProviderInstanceRegistryMutator . ProviderInstanceRegistryMutatorShape [ "reloadSecrets" ] =
508- Effect . fn ( "ProviderInstanceRegistry.reloadSecrets" ) (
509- function * ( instanceId ) {
510- const configMap = yield * Ref . get ( configMapRef ) ;
511- const targets = yield * Effect . filter ( Object . entries ( configMap ) , ( [ rawInstanceId , entry ] ) =>
512- ( instanceId === undefined || rawInstanceId === instanceId ) &&
513- secretReferencesOf ( driversById , entry ) . length > 0
514- ? isEntryEnabled ( driversById , entry )
515- : Effect . succeed ( false ) ,
516- ) ;
517- if ( targets . length === 0 ) return ;
518- const resolver = yield * SecretResolver . SecretResolver ;
519- const references = targets . flatMap ( ( [ , entry ] ) => secretReferencesOf ( driversById , entry ) ) ;
520- yield * resolver . invalidate ( references ) ;
521- yield * resolver . read ( references ) ;
522- const live = yield * Ref . get ( entries ) ;
523- const rebuild = new Set < ProviderInstanceId > ( ) ;
524- for ( const [ rawInstanceId , entry ] of targets ) {
525- const current = live . get ( ProviderInstanceId . make ( rawInstanceId ) ) ;
526- if ( current === undefined ) {
527- rebuild . add ( ProviderInstanceId . make ( rawInstanceId ) ) ;
528- continue ;
529- }
530- const { secrets, unreadable } = yield * readInstanceSecrets (
552+ // not restart providers whose credentials are the same. a missing `checked` reference drops
553+ // the cached values first; with one, only that value is replaced and the rest are carried over.
554+ const reloadWhere = Effect . fn ( "ProviderInstanceRegistry.reloadWhere" ) (
555+ function * (
556+ select : ( rawInstanceId : string , entry : ProviderInstanceConfig ) => boolean ,
557+ checked ?: SecretReference ,
558+ ) {
559+ const configMap = yield * Ref . get ( configMapRef ) ;
560+ const targets = yield * Effect . filter ( Object . entries ( configMap ) , ( [ rawInstanceId , entry ] ) =>
561+ select ( rawInstanceId , entry ) && secretReferencesOf ( driversById , entry ) . length > 0
562+ ? isEntryEnabled ( driversById , entry )
563+ : Effect . succeed ( false ) ,
564+ ) ;
565+ if ( targets . length === 0 ) return [ ] ;
566+ const resolver = yield * SecretResolver . SecretResolver ;
567+ const references = targets . flatMap ( ( [ , entry ] ) => secretReferencesOf ( driversById , entry ) ) ;
568+ if ( checked === undefined ) yield * resolver . invalidate ( references ) ;
569+ const [ checkedValue ] = yield * resolver . read ( checked === undefined ? references : [ checked ] ) ;
570+ const live = yield * Ref . get ( entries ) ;
571+ const rebuild = new Set < ProviderInstanceId > ( ) ;
572+ const carried = new Map < ProviderInstanceId , InstanceSecrets > ( ) ;
573+ for ( const [ rawInstanceId , entry ] of targets ) {
574+ const current = live . get ( ProviderInstanceId . make ( rawInstanceId ) ) ;
575+ if ( current === undefined ) {
576+ rebuild . add ( ProviderInstanceId . make ( rawInstanceId ) ) ;
577+ continue ;
578+ }
579+ if ( checked !== undefined ) {
580+ const secrets = carryCheckedSecret (
531581 driversById . get ( entry . driver ) ,
532582 entry ,
583+ current . secrets ,
584+ checked ,
585+ checkedValue ,
533586 ) ;
534- // A failed re-read keeps the working instance and the value it already holds.
535- if ( unreadable . length === 0 && ! Equal . equals ( secrets , current . secrets ) ) {
587+ if ( ! Equal . equals ( secrets , current . secrets ) ) {
536588 rebuild . add ( current . instance . instanceId ) ;
589+ carried . set ( current . instance . instanceId , secrets ) ;
537590 }
591+ continue ;
538592 }
539- yield * reconcileWithR ( configMap , rebuild ) ;
540- } ,
541- ( effect ) => semaphore . withPermits ( 1 ) ( effect ) ,
542- Effect . provideContext ( driverContext ) ,
543- ) ;
593+ const { secrets, unreadable } = yield * readInstanceSecrets (
594+ driversById . get ( entry . driver ) ,
595+ entry ,
596+ ) ;
597+ // A failed re-read keeps the working instance and the value it already holds.
598+ if ( unreadable . length === 0 && ! Equal . equals ( secrets , current . secrets ) ) {
599+ rebuild . add ( current . instance . instanceId ) ;
600+ }
601+ }
602+ yield * reconcileWithR ( configMap , rebuild , false , carried ) ;
603+ return targets . map ( ( [ rawInstanceId ] ) => ProviderInstanceId . make ( rawInstanceId ) ) ;
604+ } ,
605+ ( effect ) => semaphore . withPermits ( 1 ) ( effect ) ,
606+ Effect . provideContext ( driverContext ) ,
607+ ) ;
608+ const reloadSecrets : ProviderInstanceRegistryMutator . ProviderInstanceRegistryMutatorShape [ "reloadSecrets" ] =
609+ ( instanceId ) =>
610+ reloadWhere (
611+ ( rawInstanceId ) => instanceId === undefined || rawInstanceId === instanceId ,
612+ undefined ,
613+ ) . pipe ( Effect . asVoid ) ;
614+ const applySecret : ProviderInstanceRegistryMutator . ProviderInstanceRegistryMutatorShape [ "applySecret" ] =
615+ ( reference ) =>
616+ reloadWhere (
617+ ( _ , entry ) =>
618+ secretReferencesOf ( driversById , entry ) . some (
619+ ( candidate ) =>
620+ candidate . provider === reference . provider &&
621+ candidate . reference === reference . reference ,
622+ ) ,
623+ reference ,
624+ ) ;
544625
545626 // Reading secrets can wait on a vault unlock, so the server does not wait for it to start.
546627 yield * semaphore . withPermits ( 1 ) (
@@ -592,6 +673,7 @@ export const makeProviderInstanceRegistry = Effect.fn(
592673 const mutator : ProviderInstanceRegistryMutator . ProviderInstanceRegistryMutatorShape = {
593674 reconcile,
594675 reloadSecrets,
676+ applySecret,
595677 } ;
596678
597679 return { registry, mutator } ;
0 commit comments