Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure
TypeScript
fix(control-ui): normalize connector secret names before rotation
M9e7a85178075
diff --git a/control-ui/app/secrets/connector/[name]/edit/page.tsx b/control-ui/app/secrets/connector/[name]/edit/page.tsxindex e2781d7b8..91ab28e7e 100644--- a/control-ui/app/secrets/connector/[name]/edit/page.tsx+++ b/control-ui/app/secrets/connector/[name]/edit/page.tsx@@ -22,8 +22,7 @@ import { getMcpServers } from '@lib/api'import type { McpServerResource } from '@lib/api'function serverRefersToSecret(server: McpServerResource, secretName: string): boolean {- const envSecret = server.spec?.envSecret as { name?: unknown } | undefined- return typeof envSecret?.name === 'string' && envSecret.name.trim() === secretName+ return resolveEnvSecret(server.spec as Record<string, unknown> | undefined)?.name === secretName}function EditConnectorSecretContent() {@@ -82,6 +81,10 @@ function EditConnectorSecretContent() {: servers[0]}, [servers, requestedServer])const selectedName = selected ? String(selected.metadata?.name ?? '') : ''+ const selectedEnvSecret = selected+ ? resolveEnvSecret(selected.spec as Record<string, unknown> | undefined)+ : undefined+ const secretMatches = selectedEnvSecret?.name === secretNamefunction backToList() {router.push(CONTROL_ROUTES.secrets.connector)@@ -100,13 +103,17 @@ function EditConnectorSecretContent() {<div className="cu-create-panel"><div className="cu-create-content">- {loadError ? <div className="cu-banner cu-banner--error">{loadError}</div> : null}+ {loadError ? (+ <div className="cu-banner cu-banner--error" role="alert">+ {loadError}+ </div>+ ) : null}{servers === null ? (<p className="cu-muted" role="status">Loading attached connectors…</p>- ) : servers.length === 0 ? (+ ) : servers.length === 0 && !loadError ? (<div className="cu-banner cu-banner--error">No connector currently references Secret <code>{secretName || '(unnamed)'}</code>.Attach it to a connector before rotating it from here.@@ -136,11 +143,18 @@ function EditConnectorSecretContent() {</div>) : null}- {selected ? (+ {selected && !secretMatches ? (+ <div className="cu-banner cu-banner--error" role="alert">+ This connector does not reference Secret <code>{secretName}</code>. Choose a+ connector that does.+ </div>+ ) : null}++ {selected && secretMatches ? (<UpdateConnectorCredentialskey={selectedName}serverName={selectedName}- envSecret={resolveEnvSecret(selected.spec as Record<string, unknown>)}+ envSecret={selectedEnvSecret}surface={resolveCredentialSurface(selected.status?.conditions,selected.spec as { managed?: boolean } | undefineddiff --git a/control-ui/components/UpdateConnectorCredentials/mcpServerCredentialResolvers.ts b/control-ui/components/UpdateConnectorCredentials/mcpServerCredentialResolvers.tsindex bef01b133..34a9091e1 100644--- a/control-ui/components/UpdateConnectorCredentials/mcpServerCredentialResolvers.ts+++ b/control-ui/components/UpdateConnectorCredentials/mcpServerCredentialResolvers.ts@@ -12,6 +12,8 @@ export function resolveEnvSecret(spec: Record<string, unknown> | undefined): Envif (!raw || typeof raw !== 'object') return undefinedconst candidate = raw as { name?: unknown; keys?: unknown }if (typeof candidate.name !== 'string' || !Array.isArray(candidate.keys)) return undefined+ const name = candidate.name.trim()+ if (!name) return undefinedconst keys = candidate.keys.filter((k): k is EnvSecretKeyMapping =>Boolean(k) &&@@ -19,7 +21,7 @@ export function resolveEnvSecret(spec: Record<string, unknown> | undefined): Envtypeof (k as EnvSecretKeyMapping).envVar === 'string')if (keys.length === 0) return undefined- return { name: candidate.name, keys }+ return { name, keys }}/**diff --git a/control-ui/components/__tests__/EditConnectorSecretPage.test.tsx b/control-ui/components/__tests__/EditConnectorSecretPage.test.tsxindex 13ea982df..34b471fa4 100644--- a/control-ui/components/__tests__/EditConnectorSecretPage.test.tsx+++ b/control-ui/components/__tests__/EditConnectorSecretPage.test.tsx@@ -54,7 +54,12 @@ const mockGetMcpServers = vi.mocked(getMcpServers)const mockGetRegistryCredentialSchema = vi.mocked(getRegistryCredentialSchema)const mockUpdateMcpSecret = vi.mocked(updateMcpSecret)-function server(options: { name: string; secretKey?: string; envVar?: string }): McpServerResource {+function server(options: {+ name: string+ secretName?: string+ secretKey?: string+ envVar?: string+}): McpServerResource {return {metadata: {name: options.name,@@ -65,7 +70,7 @@ function server(options: { name: string; secretKey?: string; envVar?: string }):},spec: {envSecret: {- name: 'linear-credentials',+ name: options.secretName ?? 'linear-credentials',keys: [{secretKey: options.secretKey ?? 'api-key',@@ -184,6 +189,34 @@ describe('EditConnectorSecretPage', () => {).toBeInTheDocument()})+ it('uses the normalized Secret name for selection and rotation', async () => {+ mockGetMcpServers.mockResolvedValue({+ items: [server({ name: 'linear-conn', secretName: ' linear-credentials ' })],+ })+ await renderPage()++ expect(screen.getByRole('button', { name: 'Rotate credentials' })).toBeInTheDocument()+ await submitRotation('API token', 'rotated')++ expect(mockUpdateMcpSecret).toHaveBeenCalledWith('linear-credentials', {+ 'api-key': 'rotated',+ })+ expect(mockUpdateMcpSecret).not.toHaveBeenCalledWith(' linear-credentials ', {+ 'api-key': 'rotated',+ })+ })++ it('refuses rotation when the normalized connector Secret name differs from the URL', async () => {+ mockGetMcpServers.mockResolvedValue({+ items: [server({ name: 'linear-conn', secretName: ' other-credentials ' })],+ })+ await renderPage()++ expect(screen.getByText(/No connector currently references Secret/i)).toBeInTheDocument()+ expect(screen.queryByRole('button', { name: 'Rotate credentials' })).not.toBeInTheDocument()+ expect(mockUpdateMcpSecret).not.toHaveBeenCalled()+ })+it('latches to recreate mode when the rotation PUT answers 404', async () => {mockUpdateMcpSecret.mockRejectedValue(Object.assign(new Error('404 Not Found'), { status: 404 })@@ -253,4 +286,13 @@ describe('EditConnectorSecretPage', () => {expect(screen.getByText(/No connector currently references Secret/i)).toBeInTheDocument()expect(screen.queryByRole('button', { name: 'Rotate credentials' })).not.toBeInTheDocument()})++ it('shows the connector load error without presenting an empty result as verified', async () => {+ mockGetMcpServers.mockRejectedValue(new Error('Connector list unavailable'))+ await renderPage()++ expect(screen.getByRole('alert')).toHaveTextContent('Connector list unavailable')+ expect(screen.queryByText(/No connector currently references Secret/i)).not.toBeInTheDocument()+ expect(screen.queryByRole('button', { name: 'Rotate credentials' })).not.toBeInTheDocument()+ })})