Repository navigation
feat: attest legacy AWS scope for retained reconciliation #2861
+371
−25
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,6 +18,45 @@ import type { Env, LeaseRecord, ProviderMachine } from "./types"; | |
| export const retainedReconcileStateKey = "retained-reconcile-state"; | ||
| export const retainedAbsenceIntervalMs = 10 * 60_000; | ||
| const claimDurationMs = 5 * 60_000; | ||
| // Scope persistence landed in 1efb91002; only older records may use operator attestation. | ||
| const awsLegacyScopeCutoverMs = Date.parse("2026-09-13T00:00:00Z"); | ||
| let warnedInvalidAWSLegacyAccount = false; | ||
|
|
||
| function awsLegacyAccount(env: Env): string | undefined { | ||
| const account = env.CRABBOX_RETAINED_RECONCILE_AWS_LEGACY_ACCOUNT; | ||
| if (account?.length === 12 && /^\d{12}$/.test(account)) return account; | ||
| if (account !== undefined && !warnedInvalidAWSLegacyAccount) { | ||
| warnedInvalidAWSLegacyAccount = true; | ||
| console.warn("CRABBOX_RETAINED_RECONCILE_AWS_LEGACY_ACCOUNT is invalid; ignoring it"); | ||
| } | ||
| return undefined; | ||
| } | ||
|
|
||
| // sanitizeAWSRegion throws on malformed input; one bad legacy record must not | ||
| // fail every reconcile pass at the same cursor. | ||
| function sanitizedRegionMatches(region: string): boolean { | ||
| try { | ||
| return sanitizeAWSRegion(region) === region; | ||
| } catch { | ||
| return false; | ||
| } | ||
| } | ||
|
|
||
| function attestedAWSLegacyScope(lease: LeaseRecord, account?: string): string | undefined { | ||
| if ( | ||
| lease.provider === "aws" && | ||
| lease.providerScope === undefined && | ||
| account !== undefined && | ||
| account.length === 12 && | ||
| /^\d{12}$/.test(account) && | ||
| lease.region && | ||
| sanitizedRegionMatches(lease.region) && | ||
| /^i-[a-f0-9]{8,17}$/.test(lease.cloudID) && | ||
| Date.parse(lease.createdAt) < awsLegacyScopeCutoverMs | ||
|
There was a problem hiding this comment.
When a stored legacy record has a malformed Useful? React with 👍 / 👎. |
||
| ) | ||
| return `aws:account:${account}`; | ||
| return undefined; | ||
| } | ||
|
|
||
| type Counters = Record<string, Record<string, number>>; | ||
| export interface RetainedReconcileState { | ||
|
|
@@ -37,6 +76,7 @@ export interface RetainedSettings { | |
| budget: number; | ||
| lookupBudget: number; | ||
| intervalSeconds: number; | ||
| awsLegacyAccountConfigured: boolean; | ||
| } | ||
| function integer(value: string | undefined, fallback: number, min: number, max: number): number { | ||
| if (!value || !/^\d+$/.test(value)) return fallback; | ||
|
|
@@ -52,6 +92,7 @@ export function retainedReconcileSettings(env: Env): RetainedSettings { | |
| budget: integer(env.CRABBOX_RETAINED_RECONCILE_BUDGET, 200, 1, 200), | ||
| lookupBudget: integer(env.CRABBOX_RETAINED_RECONCILE_LOOKUP_BUDGET, 64, 5, 256), | ||
| intervalSeconds: integer(env.CRABBOX_RETAINED_RECONCILE_INTERVAL_SECONDS, 120, 60, 86_400), | ||
| awsLegacyAccountConfigured: awsLegacyAccount(env) !== undefined, | ||
| }; | ||
| } | ||
| function emptyState(): RetainedReconcileState { | ||
|
|
@@ -129,7 +170,10 @@ export class RetainedLookupBudget { | |
| } | ||
|
|
||
| // Skip uncertain allocation/action ownership; a missing instance cannot retire these journals. | ||
| export function retainedUnresolvedReason( | ||
| lease: LeaseRecord, | ||
| legacyAccount?: string, | ||
| ): string | undefined { | ||
| if (isRegisteredLease(lease)) return "registered_resource"; | ||
| if (!lease.cloudID) return "missing_identity"; | ||
| if ( | ||
|
|
@@ -151,8 +195,8 @@ export function retainedUnresolvedReason(lease: LeaseRecord): string | undefined | |
| return "no_scoped_exact_read"; | ||
| } | ||
| if (!/^i-[a-f0-9]{8,17}$/.test(lease.cloudID)) return "missing_identity"; | ||
| const scope = lease.providerScope ?? attestedAWSLegacyScope(lease, legacyAccount); | ||
| if (!/^aws:account:\d{12}$/.test(scope ?? "") || !lease.region) return "missing_original_scope"; | ||
| try { | ||
| if (sanitizeAWSRegion(lease.region) !== lease.region) return "invalid_scope"; | ||
| } catch { | ||
|
|
@@ -228,6 +272,7 @@ export async function observeAWSRetained( | |
| ): Promise<Map<string, RetainedObservation>> { | ||
| const result = new Map<string, RetainedObservation>(); | ||
| if (!leases.length) return result; | ||
| const legacyAccount = awsLegacyAccount(env); | ||
| try { | ||
| budget.take(); // STS identity is part of the provider lookup budget. | ||
| await new EC2SpotClient(env, leases[0]!.region!, undefined, budget.signal).withLeaseOperation( | ||
|
|
@@ -236,7 +281,10 @@ export async function observeAWSRetained( | |
| if ( | ||
| leases.some( | ||
| (lease) => | ||
| (lease.providerScope ?? | ||
| (!retainedUnresolvedReason(lease, legacyAccount) | ||
| ? attestedAWSLegacyScope(lease, legacyAccount) | ||
| : undefined)) !== `aws:account:${identity.account}` || | ||
|
Comment on lines
+284
to
+287
There was a problem hiding this comment.
When the configured legacy account differs from the STS identity, this classifies every eligible legacy record as AGENTS.md reference: AGENTS.md:L26-L26 Useful? React with 👍 / 👎. |
||
| lease.region !== session.region, | ||
| ) | ||
| ) { | ||
|
|
@@ -348,6 +396,7 @@ export async function maintainRetainedLeases( | |
| ): Promise<void> { | ||
| const settings = retainedReconcileSettings(env); | ||
| if (settings.mode === "off") return; | ||
| const legacyAccount = awsLegacyAccount(env); | ||
| const now = hooks.now ?? Date.now; | ||
| const started = now(); | ||
| const stored = await storage.get<RetainedReconcileState>(retainedReconcileStateKey, { | ||
|
|
@@ -409,10 +458,11 @@ export async function maintainRetainedLeases( | |
| !lease || | ||
| !leaseCurrentIndex.member(lease) || | ||
| leaseIsLive(lease) || | ||
| retainedUnresolvedReason(lease, legacyAccount) | ||
| ) | ||
| continue; | ||
| const scope = lease.providerScope ?? attestedAWSLegacyScope(lease, legacyAccount); | ||
| const group = `${scope}:${lease.region}`; | ||
| groups.set(group, [...(groups.get(group) ?? []), lease]); | ||
| } | ||
| if ((state.backoff["aws"]?.until ?? 0) <= started) { | ||
|
|
@@ -444,7 +494,7 @@ export async function maintainRetainedLeases( | |
| if ( | ||
| lease && | ||
| !leaseIsLive(lease) && | ||
| !retainedUnresolvedReason(lease, legacyAccount) && | ||
| observations.get(lease.id)?.outcome === "lookup_budget" | ||
| ) | ||
| break; | ||
|
|
@@ -455,11 +505,13 @@ export async function maintainRetainedLeases( | |
| count(lease?.provider ?? "all", "not_terminal"); | ||
| continue; | ||
| } | ||
| const reason = retainedUnresolvedReason(lease, legacyAccount); | ||
| if (reason) { | ||
| count(lease.provider, reason); | ||
| continue; | ||
| } | ||
| const attestedScope = attestedAWSLegacyScope(lease, legacyAccount); | ||
| if (attestedScope) count(lease.provider, "legacy_scope_attested"); | ||
| const observation = observations.get(lease.id); | ||
| if (!observation) { | ||
| count(lease.provider, "backoff"); | ||
|
|
@@ -484,7 +536,9 @@ export async function maintainRetainedLeases( | |
| if (settings.mode === "report") continue; | ||
| const snapshot = baseline(lease); | ||
| // oxlint-disable-next-line eslint/no-await-in-loop -- fingerprint is bound to this exact candidate before a short transactional commit. | ||
| const fingerprint = await sha256Hex( | ||
| attestedScope ? JSON.stringify([snapshot, attestedScope]) : snapshot, | ||
| ); | ||
| if (outcome === "absent" && observation.credentialFingerprint) { | ||
| // oxlint-disable-next-line eslint/no-await-in-loop -- only publication holds the lifecycle fence; all cloud I/O has finished. | ||
| await hooks.exclusive(() => | ||
|
|
@@ -512,7 +566,11 @@ export async function maintainRetainedLeases( | |
| current.retainedReconcileDeleteClaim = "awaiting-confirmation"; | ||
| delete current.cleanupStartedAt; | ||
| delete current.cleanupClaimExpiresAt; | ||
| observationFingerprint = await sha256Hex( | ||
| attestedScope | ||
| ? JSON.stringify([baseline(current), attestedScope]) | ||
| : baseline(current), | ||
| ); | ||
| } | ||
| const previous = current.retainedReconcileObservation; | ||
| if (previous && previous.credentialFingerprint !== observation.credentialFingerprint) { | ||
|
|
@@ -545,7 +603,10 @@ export async function maintainRetainedLeases( | |
| delete current.providerKeyCleanupPending; | ||
| delete current.providerKeyCleanupID; | ||
| completeLeaseProviderCleanup(current, observedAt); | ||
| current.cleanupConfirmedBy = attestedScope | ||
| ? "retained-reconcile-legacy-attested" | ||
| : "retained-reconcile"; | ||
| if (attestedScope) current.providerScope = attestedScope; | ||
| count("aws", "confirmed"); | ||
| } else count("aws", "first_absence"); | ||
| await putLeaseRecord(transaction, current); | ||
|
|
@@ -565,7 +626,14 @@ export async function maintainRetainedLeases( | |
| } | ||
| }), | ||
| ); | ||
| // Attestation permits audit completion only, never provider deletion. | ||
| if ( | ||
| attestedScope || | ||
| !settings.delete || | ||
| !observation.server || | ||
| !observation.credentialFingerprint | ||
| ) | ||
| continue; | ||
| const terminalAt = Date.parse(lease.endedAt ?? lease.releasedAt ?? ""); | ||
| if (!Number.isFinite(terminalAt) || started - terminalAt < settings.graceSeconds * 1000) { | ||
| count("aws", "grace"); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This adds AWS-specific account formatting, region and instance-ID eligibility, and rollout-cutover policy directly to coordinator reconciliation. The repository requires provider-specific reconciliation, resource identity, and rollout compatibility to live behind provider adapters, so this logic should be exposed through an AWS adapter capability while core consumes a provider-neutral result.
AGENTS.md reference: AGENTS.md:L24-L28
Useful? React with 👍 / 👎.