@@ -124,13 +124,17 @@ export const seedDevReplayInstance = Effect.fn(
124124 } ) ;
125125} ) ;
126126
127+ // A label is display-only, so only kind and config can change what a vault returns.
128+ const vaultConfigs = ( settings : ServerSettings ) =>
129+ Object . entries ( settings . secretProviders ) . map ( ( [ id , { kind, config } ] ) => [ id , kind , config ] ) ;
130+
127131export const layerSettingsWatcher = ( settingsChanges : Stream . Stream < ServerSettings > ) =>
128132 Layer . effectDiscard (
129133 Effect . gen ( function * ( ) {
130134 const mutator = yield * ProviderInstanceRegistryMutator . ProviderInstanceRegistryMutator ;
131135 const serverSettings = yield * Settings . ServerSettingsService ;
132136 let secretProviders = yield * serverSettings . getSettings . pipe (
133- Effect . map ( ( settings ) => settings . secretProviders ) ,
137+ Effect . map ( vaultConfigs ) ,
134138 Effect . orElseSucceed ( ( ) => undefined ) ,
135139 ) ;
136140 yield * settingsChanges . pipe (
@@ -143,8 +147,9 @@ export const layerSettingsWatcher = (settingsChanges: Stream.Stream<ServerSettin
143147 yield * mutator . reconcile ( deriveProviderInstanceConfigMap ( current ) ) ;
144148 // Reconcile leaves instances parked on an unreadable secret alone,
145149 // and a corrected secret provider is what can make them readable.
146- if ( ! NodeUtil . isDeepStrictEqual ( secretProviders , current . secretProviders ) ) {
147- secretProviders = current . secretProviders ;
150+ const next = vaultConfigs ( current ) ;
151+ if ( ! NodeUtil . isDeepStrictEqual ( secretProviders , next ) ) {
152+ secretProviders = next ;
148153 yield * mutator . reloadSecrets ( ) ;
149154 }
150155 } ) ,
0 commit comments