Skip to content

Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure

TypeScript

fix(control-api): r2-m1 preserve old writer defaults

Josué7e84f564742b
diff --git a/control-api/package-lock.json b/control-api/package-lock.json
index d9cd76f95..41ca58423 100644
--- a/control-api/package-lock.json
+++ b/control-api/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "clerum-control-api",
- "version": "0.1.827",
+ "version": "0.1.828",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "clerum-control-api",
- "version": "0.1.827",
+ "version": "0.1.828",
"dependencies": {
"@clerum/display-field": "file:../packages/display-field",
"@clerum/grok-provider-attempt-contract": "file:../packages/grok-provider-attempt-contract",
diff --git a/control-api/package.json b/control-api/package.json
index 6d53a161d..f54b934cc 100644
--- a/control-api/package.json
+++ b/control-api/package.json
@@ -1,6 +1,6 @@
{
"name": "clerum-control-api",
- "version": "0.1.827",
+ "version": "0.1.828",
"description": "Internal Clerum control plane REST API + UI for managing CRDs and secrets",
"main": "dist/main.js",
"engines": {
diff --git a/control-api/src/db.ts b/control-api/src/db.ts
index a03ac30b1..db9165f1d 100644
--- a/control-api/src/db.ts
+++ b/control-api/src/db.ts
@@ -3219,6 +3219,16 @@ async function applyInvitationExpirationTtlMigration(db: DbClient): Promise<void
`)
}
+async function applyInvitationExpirationWriterCompatibilityMigration(db: DbClient): Promise<void> {
+ await db.query(`
+ ALTER TABLE invitations
+ ALTER COLUMN expires_at SET DEFAULT (NOW() + INTERVAL '48 hours');
+
+ ALTER TABLE control_admin_invitations
+ ALTER COLUMN expires_at SET DEFAULT (NOW() + INTERVAL '48 hours');
+ `)
+}
+
// Exported (read-only) so the migration-order invariant test can assert the
// array is monotonic by version-string. Applied strictly in array order and
// tracked by full version-string in `schema_migrations`, so a non-monotonic
@@ -6391,6 +6401,10 @@ export const CONTROL_API_MIGRATIONS: DbMigration[] = [
version: '0130_invitation_expiration_ttl_one_week',
apply: applyInvitationExpirationTtlMigration,
},
+ {
+ version: '0131_invitation_expiration_writer_compatibility',
+ apply: applyInvitationExpirationWriterCompatibilityMigration,
+ },
]
async function consolidateWorkflowAllowedUsersToTriggers(db: DbClient): Promise<void> {
diff --git a/control-api/src/services/adminAuthService.ts b/control-api/src/services/adminAuthService.ts
index bcd4a2fbc..33be389b2 100644
--- a/control-api/src/services/adminAuthService.ts
+++ b/control-api/src/services/adminAuthService.ts
@@ -1,6 +1,7 @@
import { config } from '../config.js'
import { type DbClient, pool, withTransaction } from '../db.js'
import { rootLogger } from '../observability/logger.js'
+import { INVITATION_TTL_HOURS } from './directory/invitationStore.js'
import { retireDesktopUserInTransaction } from './directory/users.js'
import { gfsDesktopOperatorLinkService } from './gfsDesktopOperatorLinkService.js'
import { currentAdministrativeRequestContext } from './tracing/adminOperationContext.js'
@@ -889,8 +890,9 @@ export async function createControlAdminInvitation(
AND status = 'active'
FOR UPDATE
)
- INSERT INTO control_admin_invitations(email, invited_by_admin_id, replace_inviter)
- SELECT $1, locked_inviter.id, $3::boolean
+ INSERT INTO control_admin_invitations(email, invited_by_admin_id, replace_inviter, expires_at)
+ SELECT $1, locked_inviter.id, $3::boolean,
+ NOW() + INTERVAL '${INVITATION_TTL_HOURS} hours'
FROM locked_inviter
WHERE NOT EXISTS (
SELECT 1 FROM control_admin_users WHERE lower(email) = lower($1)
diff --git a/control-api/test/db.invitationExpirationTtlMigration.test.ts b/control-api/test/db.invitationExpirationTtlMigration.test.ts
index b874208a2..bfe5cf69e 100644
--- a/control-api/test/db.invitationExpirationTtlMigration.test.ts
+++ b/control-api/test/db.invitationExpirationTtlMigration.test.ts
@@ -6,12 +6,12 @@ vi.mock('pg', () => ({
}),
}))
-describe('0130_invitation_expiration_ttl_one_week migration', () => {
- it('updates member and Control Admin invitation defaults without rewriting existing rows', async () => {
+describe('0131_invitation_expiration_writer_compatibility migration', () => {
+ it('restores 48-hour invitation defaults without rewriting existing rows', async () => {
const { CONTROL_API_MIGRATIONS } = await import('../src/db.js')
const versions = CONTROL_API_MIGRATIONS.map(migration => migration.version)
- const previous = versions.indexOf('0129_workflow_schedules_concurrency_policy')
- const current = versions.indexOf('0130_invitation_expiration_ttl_one_week')
+ const previous = versions.indexOf('0130_invitation_expiration_ttl_one_week')
+ const current = versions.indexOf('0131_invitation_expiration_writer_compatibility')
expect(previous).toBeGreaterThanOrEqual(0)
expect(current).toBeGreaterThan(previous)
@@ -21,10 +21,10 @@ describe('0130_invitation_expiration_ttl_one_week migration', () => {
const sql = String(query.mock.calls[0]?.[0])
expect(sql).toMatch(
- /ALTER TABLE invitations\s+ALTER COLUMN expires_at SET DEFAULT \(NOW\(\) \+ INTERVAL '7 days'\)/i
+ /ALTER TABLE invitations\s+ALTER COLUMN expires_at SET DEFAULT \(NOW\(\) \+ INTERVAL '48 hours'\)/i
)
expect(sql).toMatch(
- /ALTER TABLE control_admin_invitations\s+ALTER COLUMN expires_at SET DEFAULT \(NOW\(\) \+ INTERVAL '7 days'\)/i
+ /ALTER TABLE control_admin_invitations\s+ALTER COLUMN expires_at SET DEFAULT \(NOW\(\) \+ INTERVAL '48 hours'\)/i
)
expect(sql).not.toMatch(/UPDATE\s+(?:invitations|control_admin_invitations)/i)
})
diff --git a/control-api/test/services.controlAdminReplaceInviter.realPostgres.integration.test.ts b/control-api/test/services.controlAdminReplaceInviter.realPostgres.integration.test.ts
index d9c8d2555..f455d2c80 100644
--- a/control-api/test/services.controlAdminReplaceInviter.realPostgres.integration.test.ts
+++ b/control-api/test/services.controlAdminReplaceInviter.realPostgres.integration.test.ts
@@ -193,7 +193,7 @@ describeRealPostgres('control admin replace-inviter invitations on real PostgreS
}
})
- it('expires member, admin desktop-access, and Control Admin invitations after seven days', async () => {
+ it('keeps new invitations at seven days and legacy Control Admin inserts at 48 hours', async () => {
const inviter = await seedAdmin('ttl-inviter')
const controlAdminInvitation = await createControlAdminInvitation(
uniqueEmail('ttl-admin'),
@@ -201,6 +201,14 @@ describeRealPostgres('control admin replace-inviter invitations on real PostgreS
)
if ('error' in controlAdminInvitation) throw new Error(controlAdminInvitation.error)
+ // This matches the pre-0131 writer's INSERT columns, which rely on the table default.
+ const legacyControlAdminInvitation = await testPool.query(
+ `INSERT INTO control_admin_invitations (email, invited_by_admin_id, replace_inviter)
+ VALUES ($1, $2, false)
+ RETURNING created_at, expires_at`,
+ [uniqueEmail('ttl-legacy-admin'), inviter.id]
+ )
+
const memberInvitation = await createSilentInvitationForTeams({
inviteeName: 'TTL member',
email: uniqueEmail('ttl-member'),
@@ -230,6 +238,13 @@ describeRealPostgres('control admin replace-inviter invitations on real PostgreS
expect(
controlAdminInvitation.expiresAt.getTime() - controlAdminInvitation.createdAt.getTime()
).toBe(604_800_000)
+ const legacyControlAdminRow = legacyControlAdminInvitation.rows[0] as {
+ created_at: Date
+ expires_at: Date
+ }
+ expect(
+ legacyControlAdminRow.expires_at.getTime() - legacyControlAdminRow.created_at.getTime()
+ ).toBe(172_800_000)
})
it('stores replaceInviter and exposes it with the inviter on every invitation read', async () => {