|
8 | 8 | type ProviderInstanceConfigMap, |
9 | 9 | ServerSettings, |
10 | 10 | } from "@t3tools/contracts"; |
| 11 | +import * as NodeUtil from "node:util"; |
| 12 | + |
11 | 13 | import * as HostProcess from "@t3tools/shared/HostProcess"; |
12 | 14 | import type * as SecureRandom from "effect/crypto/SecureRandom"; |
13 | 15 | import * as Effect from "effect/Effect"; |
@@ -127,13 +129,25 @@ export const layerSettingsWatcher = (settingsChanges: Stream.Stream<ServerSettin |
127 | 129 | Effect.gen(function* () { |
128 | 130 | const mutator = yield* ProviderInstanceRegistryMutator.ProviderInstanceRegistryMutator; |
129 | 131 | const serverSettings = yield* Settings.ServerSettingsService; |
| 132 | + let secretProviders = yield* serverSettings.getSettings.pipe( |
| 133 | + Effect.map((settings) => settings.secretProviders), |
| 134 | + Effect.orElseSucceed(() => undefined), |
| 135 | + ); |
130 | 136 | yield* settingsChanges.pipe( |
131 | 137 | Stream.runForEach(() => |
132 | 138 | // The subscription predates the seed read, so a queued change can be |
133 | 139 | // older than the seed. A failed current read must leave the registry intact. |
134 | 140 | serverSettings.getSettings.pipe( |
135 | 141 | Effect.flatMap((current) => |
136 | | - mutator.reconcile(deriveProviderInstanceConfigMap(current)), |
| 142 | + Effect.gen(function* () { |
| 143 | + yield* mutator.reconcile(deriveProviderInstanceConfigMap(current)); |
| 144 | + // Reconcile leaves instances parked on an unreadable secret alone, |
| 145 | + // and a corrected secret provider is what can make them readable. |
| 146 | + if (!NodeUtil.isDeepStrictEqual(secretProviders, current.secretProviders)) { |
| 147 | + secretProviders = current.secretProviders; |
| 148 | + yield* mutator.reloadSecrets(); |
| 149 | + } |
| 150 | + }), |
137 | 151 | ), |
138 | 152 | Effect.catchCause((cause) => |
139 | 153 | Effect.logError("ProviderInstanceRegistry reconcile failed", cause), |
|
0 commit comments