Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure
TypeScript
fix(control-ui): rotate existing connector secrets instead of re-creating them
M8215dc31765e
diff --git a/control-ui/app/secrets/connector/[name]/edit/page.tsx b/control-ui/app/secrets/connector/[name]/edit/page.tsxindex 756fe19f2..a577534ec 100644--- a/control-ui/app/secrets/connector/[name]/edit/page.tsx+++ b/control-ui/app/secrets/connector/[name]/edit/page.tsx@@ -60,6 +60,8 @@ function EditConnectorSecretContent() {{ name: string; keys: string[] } | null | undefined>(undefined)const [keyValues, setKeyValues] = useState<Record<string, string>>({})+ const [extraKeys, setExtraKeys] = useState<Array<{ id: number; key: string; value: string }>>([])+ const extraKeyId = React.useRef(0)const [saving, setSaving] = useState(false)const [saveError, setSaveError] = useState('')const { showToast } = useToast()@@ -159,15 +161,49 @@ function EditConnectorSecretContent() {router.push(CONTROL_ROUTES.secrets.connector)}- const filledKeyData = () =>- Object.fromEntries(+ function addExtraKey() {+ extraKeyId.current += 1+ setExtraKeys(current => [...current, { id: extraKeyId.current, key: '', value: '' }])+ }++ function updateExtraKey(id: number, field: 'key' | 'value', value: string) {+ setExtraKeys(current => current.map(row => (row.id === id ? { ...row, [field]: value } : row)))+ }++ function removeExtraKey(id: number) {+ setExtraKeys(current => current.filter(row => row.id !== id))+ }++ const SECRET_KEY_NAME_PATTERN = /^[A-Za-z0-9._-]+$/++ function collectRotationData(): Record<string, string> | string {+ const data = Object.fromEntries(Object.entries(keyValues).filter(([key, value]) => key.length > 0 && value.trim().length > 0))+ const existingKeys = new Set(secretSummary?.keys ?? [])+ for (const row of extraKeys) {+ const name = row.key.trim()+ const hasName = name.length > 0+ const hasValue = row.value.trim().length > 0+ if (!hasName && !hasValue) continue+ if (!hasName) return 'Name the new key before saving.'+ if (!hasValue) return `Fill in a value for the new key ${name}.`+ if (!SECRET_KEY_NAME_PATTERN.test(name))+ return `Key ${name} is invalid: use letters, numbers, dots, underscores, or hyphens.`+ if (existingKeys.has(name) || name in data)+ return `Key ${name} already exists on this Secret.`+ data[name] = row.value+ }+ if (Object.keys(data).length === 0) {+ return 'Fill in at least one key to rotate its value.'+ }+ return data+ }async function saveDirectRotation() {- const data = filledKeyData()- if (Object.keys(data).length === 0) {- setSaveError('Fill in at least one key to rotate its value.')+ const data = collectRotationData()+ if (typeof data === 'string') {+ setSaveError(data)return}setSaving(true)@@ -240,15 +276,15 @@ function EditConnectorSecretContent() {<h2>Rotate stored values</h2><p className="cu-muted">No connector references this Secret yet, so changes take effect for the next- connector that attaches it. Only the keys you fill in are replaced; every other- key already on the Secret is kept.+ connector that attaches it. Only the keys you fill in are replaced or added;+ every other key already on the Secret is kept.</p>{saveError ? (<div className="cu-banner cu-banner--error" role="alert">{saveError}</div>) : null}- {secretSummary.keys.length === 0 ? (+ {secretSummary.keys.length === 0 && extraKeys.length === 0 ? (<p className="cu-muted">This Secret has no keys yet.</p>) : (secretSummary.keys.map(key => (@@ -271,6 +307,46 @@ function EditConnectorSecretContent() {</Field>)))}+ {extraKeys.map(row => (+ <div className="cu-form-inline" key={row.id}>+ <TextInput+ monospace+ aria-label={`New key name ${row.id}`}+ value={row.key}+ onChange={e => updateExtraKey(row.id, 'key', e.target.value)}+ placeholder="NEW_API_KEY"+ disabled={saving}+ />+ <TextInput+ monospace+ aria-label={`New key value ${row.id}`}+ value={row.value}+ onChange={e => updateExtraKey(row.id, 'value', e.target.value)}+ placeholder="secret value"+ type="password"+ autoComplete="off"+ disabled={saving}+ />+ <button+ type="button"+ className="cu-btn cu-btn--ghost cu-btn--sm"+ onClick={() => removeExtraKey(row.id)}+ disabled={saving}+ >+ Remove+ </button>+ </div>+ ))}+ <div>+ <button+ type="button"+ className="cu-btn cu-btn--ghost cu-btn--sm"+ onClick={addExtraKey}+ disabled={saving}+ >+ Add key+ </button>+ </div><div className="cu-create-actions"><button type="button" className="cu-btn cu-btn--ghost" onClick={backToList}>Cancel@@ -279,7 +355,7 @@ function EditConnectorSecretContent() {type="button"className="cu-btn cu-btn--primary"onClick={() => void saveDirectRotation()}- disabled={saving || secretSummary.keys.length === 0}+ disabled={saving}>{saving ? 'Saving…' : 'Save'}</button>diff --git a/control-ui/components/SecretsTable.tsx b/control-ui/components/SecretsTable.tsxindex 2eb271159..4b0fd4180 100644--- a/control-ui/components/SecretsTable.tsx+++ b/control-ui/components/SecretsTable.tsx@@ -50,6 +50,9 @@ type McpSecretRow = {/** Live Secret identity for compare-and-delete; absent on older backends. */uid?: stringresourceVersion?: string+ /** The provisioned listing confirmed this Secret exists. When false, the+ * row comes from a connector reference alone and "Add" creates it. */+ exists: boolean}type RecipeSecretStatus = 'provisioned' | 'missing'type RecipeSecretRowOwnership =@@ -266,6 +269,9 @@ export function SecretsTable({.filter(item => item.name && item.uid && item.resourceVersion).map(item => [item.name, { uid: item.uid!, resourceVersion: item.resourceVersion! }]))+ const existsNames = new Set(+ (provisioned.items ?? []).map(item => item.name).filter(name => name)+ )const nextRows = Array.from(usage.entries()).map(([name, details]) => {@@ -278,6 +284,7 @@ export function SecretsTable({servers: Array.from(details.servers).sort((a, b) => a.localeCompare(b)),registryEntries: registrySources.map(source => `${source.name}@${source.version}`),registrySources,+ exists: existsNames.has(name),...(identity ? identity : {}),}})@@ -741,26 +748,35 @@ export function SecretsTable({ariaLabel={`Actions for connector secret ${row.name}`}horizontalTriggeractions={[- {- key: 'add',- label: 'Add',- disabled: row.name !== row.name.trim(),- disabledReason: 'The connector stores a non-canonical Secret name.',- onClick: () => {- const source =- row.registrySources.length === 1- ? row.registrySources[0]- : undefined- router.push(- CONTROL_ROUTES.secrets.new({- scope: 'mcp',- name: row.name,- registryEntry: source?.name,- registryVersion: source?.version,- })- )- },- },+ // "Add" creates the Secret a connector references but+ // that does not exist yet. An existing Secret must not+ // go through the create flow — POST refuses duplicate+ // names (409); its keys rotate through "Update".+ ...(row.exists+ ? []+ : [+ {+ key: 'add',+ label: 'Add',+ disabled: row.name !== row.name.trim(),+ disabledReason:+ 'The connector stores a non-canonical Secret name.',+ onClick: () => {+ const source =+ row.registrySources.length === 1+ ? row.registrySources[0]+ : undefined+ router.push(+ CONTROL_ROUTES.secrets.new({+ scope: 'mcp',+ name: row.name,+ registryEntry: source?.name,+ registryVersion: source?.version,+ })+ )+ },+ },+ ]),{key: 'update',label: 'Update',diff --git a/control-ui/components/__tests__/EditConnectorSecretPage.test.tsx b/control-ui/components/__tests__/EditConnectorSecretPage.test.tsxindex 555c6b523..8a8bbf635 100644--- a/control-ui/components/__tests__/EditConnectorSecretPage.test.tsx+++ b/control-ui/components/__tests__/EditConnectorSecretPage.test.tsx@@ -310,6 +310,40 @@ describe('EditConnectorSecretPage', () => {expect(navigation.push).toHaveBeenCalledWith('/secrets/connector')})+ it('adds new keys to the secret through the direct rotation merge', async () => {+ mockGetMcpServers.mockResolvedValue({ items: [] })+ await renderPage()++ fireEvent.click(screen.getByRole('button', { name: 'Add key' }))+ fireEvent.change(screen.getByLabelText('New key name 1'), {+ target: { value: 'webhook-secret' },+ })+ fireEvent.change(screen.getByLabelText('New key value 1'), { target: { value: 'whv-1' } })+ fireEvent.change(screen.getByLabelText('api-key'), { target: { value: 'new-token' } })+ fireEvent.click(screen.getByRole('button', { name: 'Save' }))+ await flush()++ expect(mockUpdateMcpSecret).toHaveBeenCalledWith('linear-credentials', {+ 'api-key': 'new-token',+ 'webhook-secret': 'whv-1',+ })+ expect(navigation.push).toHaveBeenCalledWith('/secrets/connector')+ })++ it('rejects a new key that duplicates an existing key instead of merging it', async () => {+ mockGetMcpServers.mockResolvedValue({ items: [] })+ await renderPage()++ fireEvent.click(screen.getByRole('button', { name: 'Add key' }))+ fireEvent.change(screen.getByLabelText('New key name 1'), { target: { value: 'api-key' } })+ fireEvent.change(screen.getByLabelText('New key value 1'), { target: { value: 'dup' } })+ fireEvent.click(screen.getByRole('button', { name: 'Save' }))+ await flush()++ expect(screen.getByRole('alert')).toHaveTextContent('Key api-key already exists')+ expect(mockUpdateMcpSecret).not.toHaveBeenCalled()+ })+it('keeps unfilled keys out of the direct rotation and refuses empty saves', async () => {mockGetMcpServers.mockResolvedValue({ items: [] })await renderPage()diff --git a/control-ui/components/__tests__/RegistryConnectorCredentialContract.test.tsx b/control-ui/components/__tests__/RegistryConnectorCredentialContract.test.tsxindex f8f979444..55539cbff 100644--- a/control-ui/components/__tests__/RegistryConnectorCredentialContract.test.tsx+++ b/control-ui/components/__tests__/RegistryConnectorCredentialContract.test.tsx@@ -72,7 +72,9 @@ it('shows and rotates the registry-produced credential mapping for the attachedexpect(await screen.findByRole('button', { name: 'Rotate credentials' })).toBeInTheDocument()expect(screen.getByText('Edit connector secret: linear-credentials')).toBeInTheDocument()- expect(screen.getByLabelText('API token')).toBeInTheDocument()+ // The credential fields render one effect pass after the button; wait for+ // the label instead of assuming it settled with the button.+ expect(await screen.findByLabelText('API token')).toBeInTheDocument()expect(screen.getAllByText('api-key').length).toBeGreaterThan(0)fireEvent.change(screen.getByLabelText('API token'), { target: { value: 'rotated' } })diff --git a/control-ui/components/__tests__/SecretsTable.test.tsx b/control-ui/components/__tests__/SecretsTable.test.tsxindex 9eefe109d..90c85b1da 100644--- a/control-ui/components/__tests__/SecretsTable.test.tsx+++ b/control-ui/components/__tests__/SecretsTable.test.tsx@@ -511,7 +511,7 @@ describe('SecretsTable — connector row actions', () => {fireEvent.click(trigger)}- it('offers Update, enabled Delete, and Add on a connector row with identity', async () => {+ it('offers Update and enabled Delete, and no create-flow Add, on an existing secret', async () => {mockConnectorRow({uid: 'uid-linear-1',resourceVersion: '42',@@ -519,9 +519,30 @@ describe('SecretsTable — connector row actions', () => {renderTable()await openRowMenu()- expect(screen.getByRole('menuitem', { name: 'Add' })).toBeEnabled()expect(screen.getByRole('menuitem', { name: 'Update' })).toBeEnabled()expect(screen.getByRole('menuitem', { name: /^Delete/ })).toBeEnabled()+ // The Secret exists (the listing returned it); the create flow would 409.+ expect(screen.queryByRole('menuitem', { name: 'Add' })).toBeNull()+ })++ it('routes Add to the create flow only for a referenced but missing secret', async () => {+ getMcpServersMock.mockResolvedValue({+ items: [+ buildDirectCrdMcpServerReference({+ name: 'ghost-conn',+ secretName: 'ghost-credentials',+ }),+ ],+ })+ renderTable()++ const trigger = await screen.findByRole('button', {+ name: 'Actions for connector secret ghost-credentials',+ })+ fireEvent.click(trigger)+ fireEvent.click(screen.getByRole('menuitem', { name: 'Add' }))++ expect(mockPush).toHaveBeenCalledWith('/secrets/new?scope=mcp&name=ghost-credentials')})it('deletes a connector secret through its live identity after confirmation', async () => {diff --git a/control-ui/package-lock.json b/control-ui/package-lock.jsonindex 0a9d88d39..8fea81289 100644--- a/control-ui/package-lock.json+++ b/control-ui/package-lock.json@@ -1,12 +1,12 @@{"name": "clerum-control-ui",- "version": "0.1.744",+ "version": "0.1.745","lockfileVersion": 3,"requires": true,"packages": {"": {"name": "clerum-control-ui",- "version": "0.1.744",+ "version": "0.1.745","dependencies": {"@clerum/display-field": "file:../packages/display-field","@clerum/frontend-components": "file:../packages/frontend-components",diff --git a/control-ui/package.json b/control-ui/package.jsonindex 3437fedb6..bc2c54b6a 100644--- a/control-ui/package.json+++ b/control-ui/package.json@@ -1,6 +1,6 @@{"name": "clerum-control-ui",- "version": "0.1.744",+ "version": "0.1.745","private": true,"scripts": {"dev": "NEXT_IGNORE_INCORRECT_LOCKFILE=1 next dev",