Skip to content

Commit cf10da0

Browse files
Merge the contributor's amended head into the takeover
The contributor's 49eb332 carries a live instance's other secrets when a check applies one; it is kept alongside the resolver's fresh read. Their two-secret test becomes one case in the takeover's harness.
2 parents 2f76e16 + 49eb332 commit cf10da0

4 files changed

Lines changed: 102 additions & 22 deletions

File tree

‎apps/server/src/provider/ProviderInstanceRegistry.ts‎

Lines changed: 78 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,39 @@ 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+
// A live instance resolved every variable in order, so slots line up with the entry's variables
146+
// by position; names may repeat.
147+
const variables = entry.environment ?? [];
148+
const replacedFields = new Set(
149+
configSecretReferences(driver, entry).flatMap(({ field, reference }) =>
150+
matches(reference) ? [field] : [],
151+
),
152+
);
153+
return {
154+
environment: current.environment.map((variable, index) => {
155+
const source = variables[index]?.value;
156+
return source !== undefined && typeof source !== "string" && matches(source)
157+
? { ...variable, value }
158+
: variable;
159+
}),
160+
config: current.config.map((slot) =>
161+
replacedFields.has(slot.field) ? { ...slot, value } : slot,
162+
),
163+
};
164+
};
165+
133166
/** Conflicting saved flags must preserve any explicit disable. */
134167
const resolveEntryEnabled = (entry: ProviderInstanceConfig, typedConfig: unknown): boolean => {
135168
const rawConfigEnabled = providerInstanceConfigEnabledFlag(entry.config);
@@ -161,6 +194,7 @@ const buildEntry = Effect.fn("ProviderInstanceRegistry.buildEntry")(function* <R
161194
readonly rawInstanceId: string;
162195
readonly entry: ProviderInstanceConfig;
163196
readonly deferSecrets: boolean;
197+
readonly carriedSecrets?: InstanceSecrets | undefined;
164198
}): Effect.fn.Return<
165199
| { readonly kind: "live"; readonly live: LiveEntry }
166200
| {
@@ -171,7 +205,15 @@ const buildEntry = Effect.fn("ProviderInstanceRegistry.buildEntry")(function* <R
171205
never,
172206
R | SecretResolver.SecretResolver
173207
> {
174-
const { driversById, parentScope, instanceId, rawInstanceId, entry, deferSecrets } = input;
208+
const {
209+
driversById,
210+
parentScope,
211+
instanceId,
212+
rawInstanceId,
213+
entry,
214+
deferSecrets,
215+
carriedSecrets,
216+
} = input;
175217
const blocked = input.blockedReason(entry.driver);
176218
if (blocked !== undefined) {
177219
return {
@@ -235,12 +277,14 @@ const buildEntry = Effect.fn("ProviderInstanceRegistry.buildEntry")(function* <R
235277
}),
236278
};
237279
}
238-
const { secrets, unreadable } = enabled
239-
? yield* readInstanceSecrets(driver, entry)
240-
: {
241-
secrets: { environment: withoutSecretReferences(entry.environment ?? []), config: [] },
242-
unreadable: [],
243-
};
280+
const { secrets, unreadable } = carriedSecrets
281+
? { secrets: carriedSecrets, unreadable: [] }
282+
: enabled
283+
? yield* readInstanceSecrets(driver, entry)
284+
: {
285+
secrets: { environment: withoutSecretReferences(entry.environment ?? []), config: [] },
286+
unreadable: [],
287+
};
244288
// Starting with a blank credential would fail later with a less useful error, or fall back to
245289
// whatever the server inherited.
246290
if (unreadable.length > 0) {
@@ -311,9 +355,10 @@ const makeReconcile = <R>(input: {
311355
configMap: ProviderInstanceConfigMap,
312356
rebuild?: ReadonlySet<ProviderInstanceId>,
313357
deferSecrets?: boolean,
358+
carried?: ReadonlyMap<ProviderInstanceId, InstanceSecrets>,
314359
) => Effect.Effect<void, never, R | SecretResolver.SecretResolver>) => {
315360
const { state, driversById, blockedReason, parentScope } = input;
316-
return (configMap, rebuild = new Set(), deferSecrets = false) =>
361+
return (configMap, rebuild = new Set(), deferSecrets = false, carried = new Map()) =>
317362
Effect.gen(function* () {
318363
const previousEntries = yield* Ref.get(state.entries);
319364
const previousUnavailable = yield* Ref.get(state.unavailable);
@@ -365,6 +410,7 @@ const makeReconcile = <R>(input: {
365410
const instanceId = ProviderInstanceId.make(rawInstanceId);
366411
const kept = previousEntries.has(instanceId) && !replacedIds.has(instanceId);
367412
return kept ||
413+
carried.has(instanceId) ||
368414
parkedSnapshot(instanceId, entry) !== undefined ||
369415
!(yield* isEntryEnabled(driversById, entry))
370416
? []
@@ -406,6 +452,7 @@ const makeReconcile = <R>(input: {
406452
rawInstanceId,
407453
entry,
408454
deferSecrets,
455+
carriedSecrets: carried.get(instanceId),
409456
});
410457
if (result.kind === "live") {
411458
builtEntries.set(instanceId, result.live);
@@ -503,12 +550,12 @@ export const makeProviderInstanceRegistry = Effect.fn(
503550
);
504551

505552
// 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. `fresh` drops the cached values first;
507-
// without it the values a caller just read are used as they are.
553+
// not restart providers whose credentials are the same. a missing `checked` reference drops
554+
// the cached values first; with one, only that value is replaced and the rest are carried over.
508555
const reloadWhere = Effect.fn("ProviderInstanceRegistry.reloadWhere")(
509556
function* (
510557
select: (rawInstanceId: string, entry: ProviderInstanceConfig) => boolean,
511-
fresh: boolean,
558+
checked?: SecretReference,
512559
) {
513560
const configMap = yield* Ref.get(configMapRef);
514561
const targets = yield* Effect.filter(Object.entries(configMap), ([rawInstanceId, entry]) =>
@@ -519,16 +566,31 @@ export const makeProviderInstanceRegistry = Effect.fn(
519566
if (targets.length === 0) return [];
520567
const resolver = yield* SecretResolver.SecretResolver;
521568
const references = targets.flatMap(([, entry]) => secretReferencesOf(driversById, entry));
522-
if (fresh) yield* resolver.invalidate(references);
523-
yield* resolver.read(references);
569+
if (checked === undefined) yield* resolver.invalidate(references);
570+
const [checkedValue] = yield* resolver.read(checked === undefined ? references : [checked]);
524571
const live = yield* Ref.get(entries);
525572
const rebuild = new Set<ProviderInstanceId>();
573+
const carried = new Map<ProviderInstanceId, InstanceSecrets>();
526574
for (const [rawInstanceId, entry] of targets) {
527575
const current = live.get(ProviderInstanceId.make(rawInstanceId));
528576
if (current === undefined) {
529577
rebuild.add(ProviderInstanceId.make(rawInstanceId));
530578
continue;
531579
}
580+
if (checked !== undefined) {
581+
const secrets = carryCheckedSecret(
582+
driversById.get(entry.driver),
583+
current.entry,
584+
current.secrets,
585+
checked,
586+
checkedValue,
587+
);
588+
if (!Equal.equals(secrets, current.secrets)) {
589+
rebuild.add(current.instance.instanceId);
590+
carried.set(current.instance.instanceId, secrets);
591+
}
592+
continue;
593+
}
532594
const { secrets, unreadable } = yield* readInstanceSecrets(
533595
driversById.get(entry.driver),
534596
entry,
@@ -538,7 +600,7 @@ export const makeProviderInstanceRegistry = Effect.fn(
538600
rebuild.add(current.instance.instanceId);
539601
}
540602
}
541-
yield* reconcileWithR(configMap, rebuild);
603+
yield* reconcileWithR(configMap, rebuild, false, carried);
542604
return targets.map(([rawInstanceId]) => ProviderInstanceId.make(rawInstanceId));
543605
},
544606
(effect) => semaphore.withPermits(1)(effect),
@@ -548,7 +610,7 @@ export const makeProviderInstanceRegistry = Effect.fn(
548610
(instanceId) =>
549611
reloadWhere(
550612
(rawInstanceId) => instanceId === undefined || rawInstanceId === instanceId,
551-
true,
613+
undefined,
552614
).pipe(Effect.asVoid);
553615
const applySecret: ProviderInstanceRegistryMutator.ProviderInstanceRegistryMutatorShape["applySecret"] =
554616
(reference) =>
@@ -559,7 +621,7 @@ export const makeProviderInstanceRegistry = Effect.fn(
559621
candidate.provider === reference.provider &&
560622
candidate.reference === reference.reference,
561623
),
562-
false,
624+
reference,
563625
);
564626

565627
// Reading secrets can wait on a vault unlock, so the server does not wait for it to start.

‎apps/server/src/secrets/SecretCheck.test.ts‎

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,8 @@ const setup = Effect.fn("SecretCheckTest.setup")(function* (
166166
),
167167
);
168168
const secretCheck = yield* SecretCheck.SecretCheck.pipe(Effect.provide(services));
169-
return { secretCheck, registry, reads, created, refreshed };
169+
const resolver = yield* SecretResolver.SecretResolver.pipe(Effect.provide(resolverContext));
170+
return { secretCheck, registry, mutator, resolver, reads, created, refreshed };
170171
});
171172

172173
const layerTest = Layer.mergeAll(
@@ -235,25 +236,42 @@ it.layer(layerTest)("SecretCheck", (it) => {
235236
}).pipe(Effect.scoped),
236237
);
237238

238-
it.effect("a failed check keeps the value an instance already reads", () =>
239+
it.effect("a failed check keeps the value the server already holds", () =>
239240
Effect.gen(function* () {
240241
const vault = new Map<string, Array<string | undefined>>([
241-
[wanted.reference, ["wanted-old"]],
242+
[wanted.reference, ["wanted-key"]],
242243
[locked.reference, ["locked-key", undefined]],
243244
[other.reference, ["other-key"]],
244245
]);
245246
const server = yield* setup(vault, [wanted, locked]);
246247
const readsBefore = server.reads.length;
247248

248249
assert.strictEqual((yield* server.secretCheck.check(locked))._tag, "Failed");
250+
251+
assert.deepStrictEqual(yield* server.resolver.read([locked]), ["locked-key"]);
252+
assert.deepStrictEqual(server.reads.slice(readsBefore), [locked.reference]);
253+
}).pipe(Effect.scoped),
254+
);
255+
256+
it.effect("a check applies to an instance whose other secret failed a later refresh", () =>
257+
Effect.gen(function* () {
258+
const vault = new Map<string, Array<string | undefined>>([
259+
[wanted.reference, ["wanted-old"]],
260+
[locked.reference, ["locked-key", undefined]],
261+
[other.reference, ["other-key"]],
262+
]);
263+
const server = yield* setup(vault, [wanted, locked]);
264+
// A Settings refresh while the vault is locked keeps the live instance and caches the failure.
265+
yield* server.mutator.reloadSecrets(dependent);
249266
vault.set(wanted.reference, ["wanted-new"]);
267+
250268
assert.deepStrictEqual(yield* server.secretCheck.check(wanted), { _tag: "Resolved" });
251269

252-
assert.deepStrictEqual(server.reads.slice(readsBefore), [locked.reference, wanted.reference]);
253270
assert.deepStrictEqual(server.created.at(-1), {
254271
instanceId: dependent,
255272
secrets: ["wanted-new", "locked-key"],
256273
});
274+
assert.deepStrictEqual(yield* server.registry.listUnavailable, []);
257275
}).pipe(Effect.scoped),
258276
);
259277
});

‎apps/web/src/components/settings/SimlockDeviceHostEditor.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,7 @@ function SimlockTokenField(props: {
301301
key={inputKey}
302302
id={id}
303303
aria-label="Agent token"
304+
environmentId={props.environmentId}
304305
className="min-w-0 flex-1"
305306
configured={props.token.kind === "saved" && typeof props.saved === "string"}
306307
value={
@@ -311,7 +312,6 @@ function SimlockTokenField(props: {
311312
: ""
312313
}
313314
sources={sources}
314-
environmentId={props.environmentId}
315315
onValidityChange={props.onValidityChange}
316316
onSecretChange={(secret) =>
317317
props.onChange(

‎apps/web/src/components/settings/SourceControlTokenSettings.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,10 @@ export function SourceControlTokenSettings({
127127
id={`${definition.kind}-token-${environmentId}`}
128128
size="sm"
129129
aria-label={`${definition.label} token`}
130+
environmentId={environmentId}
130131
configured={isSaved && !isSecretReference(savedToken)}
131132
value={draft}
132133
sources={secretSources}
133-
environmentId={environmentId}
134134
onChange={(event) => setPending({ key: sourceKey, draft: event.target.value })}
135135
onSecretChange={(secret) => setPending({ key: sourceKey, draft: secret ?? "" })}
136136
/>

0 commit comments

Comments
 (0)