Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure
TypeScript
fix(hcc): treat a 404 on conflict-retry read as gone, not fatal (#472)
Alfredo Lopez9a4755c4b4bb
diff --git a/host-context-controller/package-lock.json b/host-context-controller/package-lock.jsonindex d25fd9e7f..ae4172910 100644--- a/host-context-controller/package-lock.json+++ b/host-context-controller/package-lock.json@@ -1,12 +1,12 @@{"name": "clerum-host-context-controller",- "version": "0.1.255",+ "version": "0.1.256","lockfileVersion": 3,"requires": true,"packages": {"": {"name": "clerum-host-context-controller",- "version": "0.1.255",+ "version": "0.1.256","license": "SEE LICENSE IN LICENSE","dependencies": {"@clerum/image-policy": "file:../packages/image-policy",diff --git a/host-context-controller/package.json b/host-context-controller/package.jsonindex f2fa3361b..de345e343 100644--- a/host-context-controller/package.json+++ b/host-context-controller/package.json@@ -1,6 +1,6 @@{"name": "clerum-host-context-controller",- "version": "0.1.255",+ "version": "0.1.256","description": "Host Context Controller - provides McpServer CRDs to mcp-host via REST API","main": "dist/main.js","engines": {diff --git a/host-context-controller/src/__tests__/applyNetworkPolicyNoopGate.test.ts b/host-context-controller/src/__tests__/applyNetworkPolicyNoopGate.test.tsindex 6af71edcf..6c4b5574b 100644--- a/host-context-controller/src/__tests__/applyNetworkPolicyNoopGate.test.ts+++ b/host-context-controller/src/__tests__/applyNetworkPolicyNoopGate.test.ts@@ -98,6 +98,42 @@ describe('applyNetworkPolicy no-op gate', () => {expect(api.replaceNamespacedNetworkPolicy).not.toHaveBeenCalled()})+ it.each([+ { form: 'code', error: { code: 404 } },+ { form: 'statusCode', error: { response: { statusCode: 404 } } },+ ])('TOCTOU-NP-1: create 409 + read 404 ($form) returns without replace', async ({ error }) => {+ const api = fakeNetworkingApi()+ api.createNamespacedNetworkPolicy.mockRejectedValue({ code: 409 })+ api.readNamespacedNetworkPolicy.mockRejectedValue(error)++ await expect(+ applyNetworkPolicy(api as unknown as k8s.NetworkingV1Api, 'np', 'ns', desiredPolicy())+ ).resolves.toBeUndefined()++ expect(api.createNamespacedNetworkPolicy).toHaveBeenCalledOnce()+ expect(api.readNamespacedNetworkPolicy).toHaveBeenCalledOnce()+ expect(api.replaceNamespacedNetworkPolicy).not.toHaveBeenCalled()+ })++ it.each([+ { status: 403, form: 'code', error: { code: 403 } },+ { status: 403, form: 'statusCode', error: { response: { statusCode: 403 } } },+ { status: 500, form: 'code', error: { code: 500 } },+ { status: 500, form: 'statusCode', error: { response: { statusCode: 500 } } },+ ])('TOCTOU-NP-2: create 409 + read $status ($form) still throws', async ({ error }) => {+ const api = fakeNetworkingApi()+ api.createNamespacedNetworkPolicy.mockRejectedValue({ code: 409 })+ api.readNamespacedNetworkPolicy.mockRejectedValue(error)++ await expect(+ applyNetworkPolicy(api as unknown as k8s.NetworkingV1Api, 'np', 'ns', desiredPolicy())+ ).rejects.toBe(error)++ expect(api.createNamespacedNetworkPolicy).toHaveBeenCalledOnce()+ expect(api.readNamespacedNetworkPolicy).toHaveBeenCalledOnce()+ expect(api.replaceNamespacedNetworkPolicy).not.toHaveBeenCalled()+ })+it('GATE-NP-1: mutationAllowed false after create-409 skips replace on drift', async () => {const desired = desiredPolicy()const drifted = asApiserverNetworkPolicy(desired, { port: 9090 })diff --git a/host-context-controller/src/__tests__/replaceWithConflictRetryOrder.test.ts b/host-context-controller/src/__tests__/replaceWithConflictRetryOrder.test.tsindex 890a04559..3c3a8da89 100644--- a/host-context-controller/src/__tests__/replaceWithConflictRetryOrder.test.ts+++ b/host-context-controller/src/__tests__/replaceWithConflictRetryOrder.test.ts@@ -94,6 +94,82 @@ describe('replaceWithConflictRetry order and retry', () => {}})+ it.each([+ { status: 403, form: 'code', error: { code: 403 } },+ { status: 403, form: 'statusCode', error: { response: { statusCode: 403 } } },+ { status: 500, form: 'code', error: { code: 500 } },+ { status: 500, form: 'statusCode', error: { response: { statusCode: 500 } } },+ ])('TOCTOU-NP-2: helper read $status ($form) still throws', async ({ error }) => {+ const replace = vi.fn()+ const validateExisting = vi.fn()+ const read = vi.fn().mockRejectedValue(error)++ await expect(+ replaceWithConflictRetry({+ description: 'Service "svc"',+ logPrefix: '[Test]',+ body: desired,+ mergeExisting: preserveServiceAssignedFields,+ isUpToDate: serviceMatchesDesired,+ validateExisting,+ read,+ replace,+ })+ ).rejects.toBe(error)++ expect(read).toHaveBeenCalledOnce()+ expect(validateExisting).not.toHaveBeenCalled()+ expect(replace).not.toHaveBeenCalled()+ })++ it('TOCTOU-NP-3: replace 409 then second read 404 returns without a third replace', async () => {+ const read = vi.fn().mockResolvedValueOnce(existing).mockRejectedValueOnce({ code: 404 })+ const replace = vi.fn().mockRejectedValueOnce({ code: 409 })+ const validateExisting = vi.fn()++ await expect(+ replaceWithConflictRetry({+ description: 'Service "svc"',+ logPrefix: '[Test]',+ body: desired,+ mergeExisting: preserveServiceAssignedFields,+ isUpToDate: () => false,+ validateExisting,+ read,+ replace,+ })+ ).resolves.toBeUndefined()++ expect(read).toHaveBeenCalledTimes(2)+ expect(validateExisting).toHaveBeenCalledOnce()+ expect(replace).toHaveBeenCalledOnce()+ expect(replace.mock.calls[0][0].metadata?.resourceVersion).toBe('9')+ })++ it('TOCTOU-NP-4: network Error without code is rethrown', async () => {+ const networkErr = new Error('socket hang up')+ const replace = vi.fn()+ const validateExisting = vi.fn()+ const read = vi.fn().mockRejectedValue(networkErr)++ await expect(+ replaceWithConflictRetry({+ description: 'Service "svc"',+ logPrefix: '[Test]',+ body: desired,+ mergeExisting: preserveServiceAssignedFields,+ isUpToDate: serviceMatchesDesired,+ validateExisting,+ read,+ replace,+ })+ ).rejects.toBe(networkErr)++ expect(read).toHaveBeenCalledOnce()+ expect(validateExisting).not.toHaveBeenCalled()+ expect(replace).not.toHaveBeenCalled()+ })+it('RETRY-SVC-2: post-409 re-read that matches skips the second replace', async () => {const drifted: k8s.V1Service = {...existing,diff --git a/host-context-controller/src/utils.ts b/host-context-controller/src/utils.tsindex 200437a89..f82d3459f 100644--- a/host-context-controller/src/utils.ts+++ b/host-context-controller/src/utils.ts@@ -56,7 +56,13 @@ export async function replaceWithConflictRetry<maxAttempts = 3,} = optsfor (let attempt = 1; attempt <= maxAttempts; attempt++) {- const existing = await read()+ let existing: T+ try {+ existing = await read()+ } catch (err) {+ if (getErrorCode(err) === 404) return+ throw err+ }validateExisting?.(existing)const desired = resolveBody ? await resolveBody() : bodyconst base: T = {