Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure
TypeScript
test(hcc): pin Role skip convergence and isolation (#460)
Alfredo Lopez9517603d322c
diff --git a/host-context-controller/package-lock.json b/host-context-controller/package-lock.jsonindex 0b28c1870..64b419081 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.259",+ "version": "0.1.260","lockfileVersion": 3,"requires": true,"packages": {"": {"name": "clerum-host-context-controller",- "version": "0.1.259",+ "version": "0.1.260","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 e07c3453f..95556c9a5 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.259",+ "version": "0.1.260","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__/asApiserverRole.ts b/host-context-controller/src/__tests__/asApiserverRole.tsindex 126c470f6..449c2f3d9 100644--- a/host-context-controller/src/__tests__/asApiserverRole.ts+++ b/host-context-controller/src/__tests__/asApiserverRole.ts@@ -52,6 +52,7 @@ function shuffleLabelKeys(labels: Record<string, string>): Record<string, string/*** Rebuild a rule in client-node ObjectSerializer / V1PolicyRule.attributeTypeMap* order so a missing key-canonicalize cannot hide behind a cloned builder object.+ * FIXTURE-ROLE-1 pins this order against the live client-node class.*/export function asApiserverPolicyRule(rule: k8s.V1PolicyRule): k8s.V1PolicyRule {const live: Record<string, unknown> = {}diff --git a/host-context-controller/src/__tests__/hostRoleNoopGate.test.ts b/host-context-controller/src/__tests__/hostRoleNoopGate.test.tsindex e8df899b4..b9c1afac0 100644--- a/host-context-controller/src/__tests__/hostRoleNoopGate.test.ts+++ b/host-context-controller/src/__tests__/hostRoleNoopGate.test.ts@@ -1,4 +1,5 @@import { beforeEach, describe, expect, it, vi } from 'vitest'+import { V1PolicyRule } from '@kubernetes/client-node'import type * as k8s from '@kubernetes/client-node'import {type MockRbacApi,@@ -13,9 +14,10 @@ import {createMockNetworkingApi,createMockRbacApi,} from '../../test/__fixtures__/testMocks'+import { HOST_LABEL } from '../constants'import { HostReconciler } from '../hostReconciler'import type { HostCRD } from '../types'-import { asApiserverRole, updatedRoleLogs } from './asApiserverRole'+import { asApiserverPolicyRule, asApiserverRole, updatedRoleLogs } from './asApiserverRole'function makeStubKc(): k8s.KubeConfig {const stub = new Proxy({}, { get: () => vi.fn() })@@ -39,6 +41,14 @@ function desiredFromCreate(rbacApi: MockRbacApi): k8s.V1Role {return rbacApi.createNamespacedRole.mock.calls[0][0].body as k8s.V1Role}+function secretGetRule(role: k8s.V1Role): k8s.V1PolicyRule {+ const rule = role.rules?.find(+ (entry: k8s.V1PolicyRule) => entry.resources?.[0] === 'secrets' && entry.verbs?.includes('get')+ )+ if (!rule) throw new Error('desired Role is missing the secrets get rule')+ return rule+}+describe('Host ensureHostRole no-op gate', () => {let rbacApi: MockRbacApilet reconciler: HostReconciler@@ -74,12 +84,12 @@ describe('Host ensureHostRole no-op gate', () => {await (reconciler as any).ensureHostRole(host)expect(rbacApi.readNamespacedRole).toHaveBeenCalledOnce()expect(existing?.rules?.length).toBeGreaterThan(0)- expect(Object.keys(existing!.rules![0] ?? {})).toEqual([- 'apiGroups',- 'resourceNames',- 'resources',- 'verbs',- ])+ const authoredKeys = Object.keys(desiredFromCreate(rbacApi).rules![0] ?? {})+ const liveKeys = Object.keys(existing!.rules![0] ?? {})+ // Author order vs client-node attributeTypeMap — canonicalize must run.+ expect(authoredKeys).toEqual(['apiGroups', 'resources', 'resourceNames', 'verbs'])+ expect(liveKeys).toEqual(['apiGroups', 'resourceNames', 'resources', 'verbs'])+ expect(authoredKeys).not.toEqual(liveKeys)expect(desiredFromCreate(rbacApi).rules?.length).toBeGreaterThan(0)expect(rbacApi.replaceNamespacedRole).not.toHaveBeenCalled()expect(updatedRoleLogs(log, '"host-chatllm-config-reader"')).toEqual([])@@ -93,10 +103,7 @@ describe('Host ensureHostRole no-op gate', () => {let existing: k8s.V1Role | undefinedrbacApi.readNamespacedRole.mockImplementation(() => {const live = structuredClone(desiredFromCreate(rbacApi))- const secretRule = live.rules?.find(- (rule: k8s.V1PolicyRule) => rule.resources?.[0] === 'secrets' && rule.verbs?.includes('get')- )- secretRule!.resourceNames![0] = host.spec.secretRef+ secretGetRule(live).resourceNames![0] = host.spec.secretRefexisting = asApiserverRole(live)return Promise.resolve(existing)})@@ -140,10 +147,8 @@ describe('Host ensureHostRole no-op gate', () => {let existing: k8s.V1Role | undefinedrbacApi.readNamespacedRole.mockImplementation(() => {const live = structuredClone(desiredFromCreate(rbacApi))- const secretRule = live.rules?.find(- (rule: k8s.V1PolicyRule) => rule.resources?.[0] === 'secrets' && rule.verbs?.includes('get')- )- secretRule!.verbs = [...(secretRule!.verbs ?? []), 'update']+ const secretRule = secretGetRule(live)+ secretRule.verbs = [...(secretRule.verbs ?? []), 'update']existing = asApiserverRole(live)return Promise.resolve(existing)})@@ -159,4 +164,114 @@ describe('Host ensureHostRole no-op gate', () => {log.mockRestore()}})++ it('NOOP-ROLE-5: reordered live verbs still replaces once', async () => {+ rbacApi.createNamespacedRole.mockRejectedValue({ code: 409 })+ let existing: k8s.V1Role | undefined+ rbacApi.readNamespacedRole.mockImplementation(() => {+ const live = structuredClone(desiredFromCreate(rbacApi))+ secretGetRule(live).verbs = ['watch', 'get', 'list']+ existing = asApiserverRole(live)+ return Promise.resolve(existing)+ })+ const log = vi.spyOn(console, 'log')+ try {+ await (reconciler as any).ensureHostRole(host)+ expect(secretGetRule(existing!).verbs).toEqual(['watch', 'get', 'list'])+ expect(rbacApi.replaceNamespacedRole).toHaveBeenCalledOnce()+ expect(updatedRoleLogs(log, '"host-chatllm-config-reader"')).toEqual([+ '[HostReconciler] Updated Role "host-chatllm-config-reader"',+ ])+ } finally {+ log.mockRestore()+ }+ })++ it('NOOP-ROLE-6: tampered live host label still replaces once', async () => {+ rbacApi.createNamespacedRole.mockRejectedValue({ code: 409 })+ let existing: k8s.V1Role | undefined+ rbacApi.readNamespacedRole.mockImplementation(() => {+ existing = asApiserverRole(desiredFromCreate(rbacApi))+ existing.metadata!.labels![HOST_LABEL] = 'other-host'+ return Promise.resolve(existing)+ })+ const log = vi.spyOn(console, 'log')+ try {+ await (reconciler as any).ensureHostRole(host)+ expect(existing?.metadata?.labels?.[HOST_LABEL]).toBe('other-host')+ expect(rbacApi.replaceNamespacedRole).toHaveBeenCalledOnce()+ expect(updatedRoleLogs(log, '"host-chatllm-config-reader"')).toEqual([+ '[HostReconciler] Updated Role "host-chatllm-config-reader"',+ ])+ } finally {+ log.mockRestore()+ }+ })++ it('NOOP-ROLE-7: removed live rule still replaces once', async () => {+ rbacApi.createNamespacedRole.mockRejectedValue({ code: 409 })+ let existing: k8s.V1Role | undefined+ rbacApi.readNamespacedRole.mockImplementation(() => {+ const live = structuredClone(desiredFromCreate(rbacApi))+ live.rules = (live.rules ?? []).filter(rule => rule.resources?.[0] !== 'configmaps')+ existing = asApiserverRole(live)+ return Promise.resolve(existing)+ })+ const log = vi.spyOn(console, 'log')+ try {+ await (reconciler as any).ensureHostRole(host)+ expect(existing?.rules?.some(rule => rule.resources?.[0] === 'configmaps')).toBe(false)+ expect(rbacApi.replaceNamespacedRole).toHaveBeenCalledOnce()+ expect(updatedRoleLogs(log, '"host-chatllm-config-reader"')).toEqual([+ '[HostReconciler] Updated Role "host-chatllm-config-reader"',+ ])+ } finally {+ log.mockRestore()+ }+ })++ it('NOOP-ROLE-8: removed live secret resourceName still replaces once', async () => {+ rbacApi.createNamespacedRole.mockRejectedValue({ code: 409 })+ let existing: k8s.V1Role | undefined+ rbacApi.readNamespacedRole.mockImplementation(() => {+ const live = structuredClone(desiredFromCreate(rbacApi))+ const secretRule = secretGetRule(live)+ secretRule.resourceNames = (secretRule.resourceNames ?? []).filter((_, index) => index !== 1)+ existing = asApiserverRole(live)+ return Promise.resolve(existing)+ })+ const log = vi.spyOn(console, 'log')+ try {+ await (reconciler as any).ensureHostRole(host)+ expect(secretGetRule(existing!).resourceNames).toHaveLength(+ (secretGetRule(desiredFromCreate(rbacApi)).resourceNames?.length ?? 0) - 1+ )+ expect(rbacApi.replaceNamespacedRole).toHaveBeenCalledOnce()+ expect(updatedRoleLogs(log, '"host-chatllm-config-reader"')).toEqual([+ '[HostReconciler] Updated Role "host-chatllm-config-reader"',+ ])+ } finally {+ log.mockRestore()+ }+ })++ it('FIXTURE-ROLE-1: asApiserverPolicyRule follows V1PolicyRule.attributeTypeMap', () => {+ expect(V1PolicyRule.getAttributeTypeMap().map(entry => entry.name)).toEqual([+ 'apiGroups',+ 'nonResourceURLs',+ 'resourceNames',+ 'resources',+ 'verbs',+ ])+ expect(+ Object.keys(+ asApiserverPolicyRule({+ apiGroups: [''],+ resources: ['secrets'],+ resourceNames: ['x'],+ verbs: ['get'],+ })+ )+ ).toEqual(['apiGroups', 'resourceNames', 'resources', 'verbs'])+ })})