From 794b818f4cbdcc06ee7fb03f6662abbb4cf4bc7f Mon Sep 17 00:00:00 2001 From: Sam Catlow Date: Mon, 5 Oct 2026 20:26:02 +1100 Subject: [PATCH] refactor(org): rename the default org to org-sys --- internal/app/statestore/policy_guard_test.go | 2 +- internal/domain/org/org.go | 2 +- .../domain/storecontract/storecontract.go | 2 +- .../postgres/migrations/0033_org_sys.sql | 127 +++++++++++++ .../postgres/org_sys_migration_test.go | 175 ++++++++++++++++++ .../postgres/postgresdb/orgs.sql.go | 2 +- .../postgres/postgresdb/orgupgrade.sql.go | 28 +-- .../postgres/postgresdb/tasks.sql.go | 4 +- .../infrastructure/postgres/queries/orgs.sql | 2 +- .../postgres/queries/orgupgrade.sql | 28 +-- .../infrastructure/postgres/queries/tasks.sql | 4 +- 11 files changed, 339 insertions(+), 37 deletions(-) create mode 100644 internal/infrastructure/postgres/migrations/0033_org_sys.sql create mode 100644 internal/infrastructure/postgres/org_sys_migration_test.go diff --git a/internal/app/statestore/policy_guard_test.go b/internal/app/statestore/policy_guard_test.go index 74b2e913b..d09f4bb74 100644 --- a/internal/app/statestore/policy_guard_test.go +++ b/internal/app/statestore/policy_guard_test.go @@ -32,7 +32,7 @@ func (m *memPolicies) DeletePolicy(_ context.Context, p access.Policy) error { type oneOwnerOrg struct{} -const testOrg org.OrgID = "default" +const testOrg org.OrgID = "org-sys" func (oneOwnerOrg) ListOrgs(context.Context) ([]org.Org, error) { return []org.Org{{ID: testOrg}}, nil } diff --git a/internal/domain/org/org.go b/internal/domain/org/org.go index efd5d35d7..c9d3d82a8 100644 --- a/internal/domain/org/org.go +++ b/internal/domain/org/org.go @@ -19,7 +19,7 @@ type ( // The org and workspace every record of a single-operator install, and every // record written before orgs existed, belongs to. const ( - DefaultOrgID OrgID = "default" + DefaultOrgID OrgID = "org-sys" DefaultWorkspaceID WorkspaceID = "default" ) diff --git a/internal/domain/storecontract/storecontract.go b/internal/domain/storecontract/storecontract.go index c212a0408..04212b5c0 100644 --- a/internal/domain/storecontract/storecontract.go +++ b/internal/domain/storecontract/storecontract.go @@ -528,7 +528,7 @@ const AuditTableResources = "resources" // DefaultOrgID is the org every resource written before orgs existed belongs // to, and the org a request that names none acts in. -const DefaultOrgID = "default" +const DefaultOrgID = "org-sys" // ResourceAuditKey is the sys_audit record key of one org's resource kind. The // default org keeps the bare kind, so audit rows written before resources were diff --git a/internal/infrastructure/postgres/migrations/0033_org_sys.sql b/internal/infrastructure/postgres/migrations/0033_org_sys.sql new file mode 100644 index 000000000..f15232949 --- /dev/null +++ b/internal/infrastructure/postgres/migrations/0033_org_sys.sql @@ -0,0 +1,127 @@ +-- Rename the built-in org from 'default' to 'org-sys'. The default workspace +-- id stays 'default'. Every table that carried the org moves with it, and +-- every column that defaulted to the old id defaults to the new one; the +-- created row is 'System' because that is the name the boot upgrade now uses. + +-- +goose Up + +-- The row the rest of the migration points at. A fresh install has no +-- 'default' row yet, so this is a no-op and the boot upgrade creates 'org-sys'. +INSERT INTO orgs (id, name) +SELECT 'org-sys', 'System' +WHERE EXISTS (SELECT 1 FROM orgs WHERE id = 'default') +ON CONFLICT (id) DO NOTHING; + +-- The installed_package children reference (org_id, name) on their parent, so +-- the parent and children cannot move under an immediate FK; drop the child +-- FKs, move both, then re-add them unchanged. +ALTER TABLE installed_package_requirements + DROP CONSTRAINT installed_package_requirements_org_id_package_name_fkey, + DROP CONSTRAINT installed_package_requirements_org_id_required_name_fkey; +ALTER TABLE installed_package_contributions + DROP CONSTRAINT installed_package_contributions_org_id_package_name_fkey; + +UPDATE workspaces SET org_id = 'org-sys' WHERE org_id = 'default'; +UPDATE memberships SET org_id = 'org-sys' WHERE org_id = 'default'; +UPDATE org_agents SET org_id = 'org-sys' WHERE org_id = 'default'; +UPDATE tasks SET org_id = 'org-sys' WHERE org_id = 'default'; +UPDATE events SET org_id = 'org-sys' WHERE org_id = 'default'; +UPDATE transitions SET org_id = 'org-sys' WHERE org_id = 'default'; +UPDATE resources SET org_id = 'org-sys' WHERE org_id = 'default'; +UPDATE resource_history SET org_id = 'org-sys' WHERE org_id = 'default'; +UPDATE step_executions SET org_id = 'org-sys' WHERE org_id = 'default'; +UPDATE access_policies SET org_id = 'org-sys' WHERE org_id = 'default'; +UPDATE access_policy_versions SET org_id = 'org-sys' WHERE org_id = 'default'; +UPDATE access_denials SET org_id = 'org-sys' WHERE org_id = 'default'; +UPDATE bindings SET org_id = 'org-sys' WHERE org_id = 'default'; +UPDATE mappings SET org_id = 'org-sys' WHERE org_id = 'default'; +UPDATE captures SET org_id = 'org-sys' WHERE org_id = 'default'; +UPDATE sources SET org_id = 'org-sys' WHERE org_id = 'default'; +UPDATE event_types SET org_id = 'org-sys' WHERE org_id = 'default'; +UPDATE tool_calls SET org_id = 'org-sys' WHERE org_id = 'default'; +UPDATE installed_packages SET org_id = 'org-sys' WHERE org_id = 'default'; +UPDATE installed_package_requirements SET org_id = 'org-sys' WHERE org_id = 'default'; +UPDATE installed_package_contributions SET org_id = 'org-sys' WHERE org_id = 'default'; + +ALTER TABLE installed_package_requirements + ADD CONSTRAINT installed_package_requirements_org_id_package_name_fkey + FOREIGN KEY (org_id, package_name) REFERENCES installed_packages (org_id, name) ON DELETE CASCADE, + ADD CONSTRAINT installed_package_requirements_org_id_required_name_fkey + FOREIGN KEY (org_id, required_name) REFERENCES installed_packages (org_id, name) ON DELETE RESTRICT; +ALTER TABLE installed_package_contributions + ADD CONSTRAINT installed_package_contributions_org_id_package_name_fkey + FOREIGN KEY (org_id, package_name) REFERENCES installed_packages (org_id, name) ON DELETE CASCADE; + +ALTER TABLE tasks ALTER COLUMN org_id SET DEFAULT 'org-sys'; +ALTER TABLE events ALTER COLUMN org_id SET DEFAULT 'org-sys'; +ALTER TABLE transitions ALTER COLUMN org_id SET DEFAULT 'org-sys'; +ALTER TABLE resources ALTER COLUMN org_id SET DEFAULT 'org-sys'; +ALTER TABLE resource_history ALTER COLUMN org_id SET DEFAULT 'org-sys'; +ALTER TABLE step_executions ALTER COLUMN org_id SET DEFAULT 'org-sys'; +ALTER TABLE bindings ALTER COLUMN org_id SET DEFAULT 'org-sys'; +ALTER TABLE mappings ALTER COLUMN org_id SET DEFAULT 'org-sys'; +ALTER TABLE captures ALTER COLUMN org_id SET DEFAULT 'org-sys'; +ALTER TABLE sources ALTER COLUMN org_id SET DEFAULT 'org-sys'; +ALTER TABLE event_types ALTER COLUMN org_id SET DEFAULT 'org-sys'; +ALTER TABLE tool_calls ALTER COLUMN org_id SET DEFAULT 'org-sys'; + +DELETE FROM orgs WHERE id = 'default'; + +-- +goose Down + +INSERT INTO orgs (id, name) +SELECT 'default', 'Default' +WHERE EXISTS (SELECT 1 FROM orgs WHERE id = 'org-sys') +ON CONFLICT (id) DO NOTHING; + +ALTER TABLE installed_package_requirements + DROP CONSTRAINT installed_package_requirements_org_id_package_name_fkey, + DROP CONSTRAINT installed_package_requirements_org_id_required_name_fkey; +ALTER TABLE installed_package_contributions + DROP CONSTRAINT installed_package_contributions_org_id_package_name_fkey; + +UPDATE workspaces SET org_id = 'default' WHERE org_id = 'org-sys'; +UPDATE memberships SET org_id = 'default' WHERE org_id = 'org-sys'; +UPDATE org_agents SET org_id = 'default' WHERE org_id = 'org-sys'; +UPDATE tasks SET org_id = 'default' WHERE org_id = 'org-sys'; +UPDATE events SET org_id = 'default' WHERE org_id = 'org-sys'; +UPDATE transitions SET org_id = 'default' WHERE org_id = 'org-sys'; +UPDATE resources SET org_id = 'default' WHERE org_id = 'org-sys'; +UPDATE resource_history SET org_id = 'default' WHERE org_id = 'org-sys'; +UPDATE step_executions SET org_id = 'default' WHERE org_id = 'org-sys'; +UPDATE access_policies SET org_id = 'default' WHERE org_id = 'org-sys'; +UPDATE access_policy_versions SET org_id = 'default' WHERE org_id = 'org-sys'; +UPDATE access_denials SET org_id = 'default' WHERE org_id = 'org-sys'; +UPDATE bindings SET org_id = 'default' WHERE org_id = 'org-sys'; +UPDATE mappings SET org_id = 'default' WHERE org_id = 'org-sys'; +UPDATE captures SET org_id = 'default' WHERE org_id = 'org-sys'; +UPDATE sources SET org_id = 'default' WHERE org_id = 'org-sys'; +UPDATE event_types SET org_id = 'default' WHERE org_id = 'org-sys'; +UPDATE tool_calls SET org_id = 'default' WHERE org_id = 'org-sys'; +UPDATE installed_packages SET org_id = 'default' WHERE org_id = 'org-sys'; +UPDATE installed_package_requirements SET org_id = 'default' WHERE org_id = 'org-sys'; +UPDATE installed_package_contributions SET org_id = 'default' WHERE org_id = 'org-sys'; + +ALTER TABLE installed_package_requirements + ADD CONSTRAINT installed_package_requirements_org_id_package_name_fkey + FOREIGN KEY (org_id, package_name) REFERENCES installed_packages (org_id, name) ON DELETE CASCADE, + ADD CONSTRAINT installed_package_requirements_org_id_required_name_fkey + FOREIGN KEY (org_id, required_name) REFERENCES installed_packages (org_id, name) ON DELETE RESTRICT; +ALTER TABLE installed_package_contributions + ADD CONSTRAINT installed_package_contributions_org_id_package_name_fkey + FOREIGN KEY (org_id, package_name) REFERENCES installed_packages (org_id, name) ON DELETE CASCADE; + +ALTER TABLE tasks ALTER COLUMN org_id SET DEFAULT 'default'; +ALTER TABLE events ALTER COLUMN org_id SET DEFAULT 'default'; +ALTER TABLE transitions ALTER COLUMN org_id SET DEFAULT 'default'; +ALTER TABLE resources ALTER COLUMN org_id SET DEFAULT 'default'; +ALTER TABLE resource_history ALTER COLUMN org_id SET DEFAULT 'default'; +ALTER TABLE step_executions ALTER COLUMN org_id SET DEFAULT 'default'; +ALTER TABLE bindings ALTER COLUMN org_id SET DEFAULT 'default'; +ALTER TABLE mappings ALTER COLUMN org_id SET DEFAULT 'default'; +ALTER TABLE captures ALTER COLUMN org_id SET DEFAULT 'default'; +ALTER TABLE sources ALTER COLUMN org_id SET DEFAULT 'default'; +ALTER TABLE event_types ALTER COLUMN org_id SET DEFAULT 'default'; +ALTER TABLE tool_calls ALTER COLUMN org_id SET DEFAULT 'default'; + +DELETE FROM orgs WHERE id = 'org-sys'; diff --git a/internal/infrastructure/postgres/org_sys_migration_test.go b/internal/infrastructure/postgres/org_sys_migration_test.go new file mode 100644 index 000000000..f98144c5f --- /dev/null +++ b/internal/infrastructure/postgres/org_sys_migration_test.go @@ -0,0 +1,175 @@ +package postgres_test + +import ( + "database/sql" + "fmt" + "slices" + "strings" + "testing" + + "github.com/jackc/pgx/v5/pgxpool" + "github.com/jackc/pgx/v5/stdlib" + "github.com/pressly/goose/v3" + + "github.com/samcharles93/archie-core/internal/infrastructure/postgres" + "github.com/samcharles93/archie-core/internal/infrastructure/postgres/pgtest" +) + +// orgSysTables are the tables whose org_id defaulted to 'default' before the +// rename; the migration points them at 'org-sys'. +var orgSysTables = []string{ + "bindings", "captures", "event_types", "events", "mappings", + "resource_history", "resources", "sources", "step_executions", "tasks", + "tool_calls", "transitions", +} + +// TestOrgSysMigrationMovesExistingDefaultRows exercises the rename on the path +// a real install takes: a database at the previous schema with rows already +// under the old org id. +func TestOrgSysMigrationMovesExistingDefaultRows(t *testing.T) { + ctx := t.Context() + pool, err := postgres.Open(ctx, pgtest.URL(t)) + if err != nil { + t.Fatal(err) + } + t.Cleanup(pool.Close) + db := stdlib.OpenDBFromPool(pool) + t.Cleanup(func() { _ = db.Close() }) + provider, err := goose.NewProvider(goose.DialectPostgres, db, postgres.Migrations()) + if err != nil { + t.Fatal(err) + } + + if _, err := provider.UpTo(ctx, 32); err != nil { + t.Fatalf("migrate to 32: %v", err) + } + seedDefaultOrg(t, pool) + if _, err := provider.UpTo(ctx, 33); err != nil { + t.Fatalf("migrate to 33: %v", err) + } + + if name := orgName(t, pool, "org-sys"); name != "System" { + t.Fatalf("org-sys name = %q, want System", name) + } + assertNoOrg(t, pool, "default") + + tables := orgIDTables(t, pool) + for _, name := range tables { + var left int + if err := pool.QueryRow(ctx, fmt.Sprintf("SELECT count(*) FROM %s WHERE org_id = 'default'", name)).Scan(&left); err != nil { + t.Fatal(err) + } + if left != 0 { + t.Fatalf("%s left %d rows in the old org", name, left) + } + } + // The seeded rows are on the new org, so the move was not a delete. + for _, name := range []string{ + "workspaces", "tasks", "events", "resources", "step_executions", "access_policies", + "installed_packages", "installed_package_requirements", "installed_package_contributions", + } { + var moved int + if err := pool.QueryRow(ctx, fmt.Sprintf("SELECT count(*) FROM %s WHERE org_id = 'org-sys'", name)).Scan(&moved); err != nil { + t.Fatal(err) + } + if moved == 0 { + t.Fatalf("%s moved no rows to org-sys", name) + } + } + // The new default is the renamed org, on exactly the tables that had one. + for _, name := range tables { + var def sql.NullString + if err := pool.QueryRow(ctx, `SELECT column_default FROM information_schema.columns WHERE table_name = $1 AND column_name = 'org_id'`, name).Scan(&def); err != nil { + t.Fatal(err) + } + want := slices.Contains(orgSysTables, name) + got := def.Valid && strings.Contains(def.String, "'org-sys'") + if got != want { + t.Fatalf("%s org_id default = %q, want org-sys = %v", name, def.String, want) + } + } + assertForeignKey(t, pool, "installed_package_requirements", "installed_package_requirements_org_id_required_name_fkey") + assertForeignKey(t, pool, "installed_package_contributions", "installed_package_contributions_org_id_package_name_fkey") + + // The down migration is the exact reverse. + if _, err := provider.DownTo(ctx, 32); err != nil { + t.Fatalf("migrate down to 32: %v", err) + } + if name := orgName(t, pool, "default"); name != "Default" { + t.Fatalf("default org name = %q, want Default", name) + } + assertNoOrg(t, pool, "org-sys") +} + +func seedDefaultOrg(t *testing.T, pool *pgxpool.Pool) { + t.Helper() + ctx := t.Context() + statements := []string{ + `INSERT INTO orgs (id, name) VALUES ('default', 'Default')`, + `INSERT INTO workspaces (id, org_id, name) VALUES ('default', 'default', 'Default')`, + `INSERT INTO tasks (owner, repo, issue_number, identity, org_id, workspace_id) VALUES ('o', 'r', 1, 'sam', 'default', 'default')`, + `INSERT INTO events (at, kind, org_id, workspace_id) VALUES (now(), 'task_started', 'default', 'default')`, + `INSERT INTO resources (org_id, kind, value, version, updated_at) VALUES ('default', 'workflows', '\x00', 1, now())`, + `INSERT INTO step_executions (org_id, execution_id, attempt, kind, name) VALUES ('default', 1, 1, 'stage', 'build')`, + `INSERT INTO access_policies (level, org_id, policy_id, text) VALUES ('org', 'default', 'p', 'allow')`, + `INSERT INTO installed_packages (org_id, name, reference, digest, descriptor, layer) VALUES ('default', 'pkg', 'ref', 'sha256:' || repeat('a', 64), '{}', '\x00')`, + `INSERT INTO installed_packages (org_id, name, reference, digest, descriptor, layer) VALUES ('default', 'dep', 'ref', 'sha256:' || repeat('b', 64), '{}', '\x00')`, + `INSERT INTO installed_package_requirements (org_id, package_name, required_name, required_digest) VALUES ('default', 'pkg', 'dep', 'sha256:' || repeat('b', 64))`, + `INSERT INTO installed_package_contributions (org_id, package_name, family, entry_id) VALUES ('default', 'pkg', 'fam', 'e1')`, + } + for _, sql := range statements { + if _, err := pool.Exec(ctx, sql); err != nil { + t.Fatalf("seed %q: %v", sql, err) + } + } +} + +// orgIDTables lists every table that carries an org_id column. +func orgIDTables(t *testing.T, pool *pgxpool.Pool) []string { + t.Helper() + rows, err := pool.Query(t.Context(), `SELECT table_name FROM information_schema.columns WHERE column_name = 'org_id' ORDER BY table_name`) + if err != nil { + t.Fatal(err) + } + defer rows.Close() + var tables []string + for rows.Next() { + var name string + if err := rows.Scan(&name); err != nil { + t.Fatal(err) + } + tables = append(tables, name) + } + return tables +} + +func orgName(t *testing.T, pool *pgxpool.Pool, id string) string { + t.Helper() + var name string + if err := pool.QueryRow(t.Context(), `SELECT name FROM orgs WHERE id = $1`, id).Scan(&name); err != nil { + t.Fatalf("org %s: %v", id, err) + } + return name +} + +func assertNoOrg(t *testing.T, pool *pgxpool.Pool, id string) { + t.Helper() + var n int + if err := pool.QueryRow(t.Context(), `SELECT count(*) FROM orgs WHERE id = $1`, id).Scan(&n); err != nil { + t.Fatal(err) + } + if n != 0 { + t.Fatalf("org %s still exists", id) + } +} + +func assertForeignKey(t *testing.T, pool *pgxpool.Pool, table, name string) { + t.Helper() + var n int + if err := pool.QueryRow(t.Context(), `SELECT count(*) FROM pg_constraint WHERE contype = 'f' AND conrelid = $1::regclass AND conname = $2`, table, name).Scan(&n); err != nil { + t.Fatal(err) + } + if n != 1 { + t.Fatalf("foreign key %s on %s = %d, want 1", name, table, n) + } +} diff --git a/internal/infrastructure/postgres/postgresdb/orgs.sql.go b/internal/infrastructure/postgres/postgresdb/orgs.sql.go index 439a5f491..d73da509e 100644 --- a/internal/infrastructure/postgres/postgresdb/orgs.sql.go +++ b/internal/infrastructure/postgres/postgresdb/orgs.sql.go @@ -229,7 +229,7 @@ SELECT COALESCE( (SELECT a.org_id FROM org_agents a WHERE a.identity_id = $1), (SELECT m.org_id FROM memberships m WHERE m.identity_id = $1 ORDER BY m.created_at, m.org_id, m.workspace_id NULLS LAST LIMIT 1), - 'default' + 'org-sys' )::text AS org_id ` diff --git a/internal/infrastructure/postgres/postgresdb/orgupgrade.sql.go b/internal/infrastructure/postgres/postgresdb/orgupgrade.sql.go index fb3d24d33..8c83ba314 100644 --- a/internal/infrastructure/postgres/postgresdb/orgupgrade.sql.go +++ b/internal/infrastructure/postgres/postgresdb/orgupgrade.sql.go @@ -12,7 +12,7 @@ import ( const assignDefaultOrgIdentities = `-- name: AssignDefaultOrgIdentities :exec INSERT INTO org_agents (identity_id, org_id) -SELECT id, 'default' FROM identities WHERE kind IN ('bot', 'service_account') +SELECT id, 'org-sys' FROM identities WHERE kind IN ('bot', 'service_account') ON CONFLICT (identity_id) DO NOTHING ` @@ -23,7 +23,7 @@ func (q *Queries) AssignDefaultOrgIdentities(ctx context.Context) error { } const ensureDefaultOrg = `-- name: EnsureDefaultOrg :exec -INSERT INTO orgs (id, name) VALUES ('default', 'Default') +INSERT INTO orgs (id, name) VALUES ('org-sys', 'System') ON CONFLICT (id) DO NOTHING ` @@ -33,7 +33,7 @@ func (q *Queries) EnsureDefaultOrg(ctx context.Context) error { } const ensureDefaultWorkspace = `-- name: EnsureDefaultWorkspace :exec -INSERT INTO workspaces (id, org_id, name) VALUES ('default', 'default', 'Default') +INSERT INTO workspaces (id, org_id, name) VALUES ('default', 'org-sys', 'Default') ON CONFLICT (org_id, id) DO NOTHING ` @@ -68,7 +68,7 @@ func (q *Queries) InsertOrgUpgradePhase(ctx context.Context, phase string) error } const stampEdastoreBindings = `-- name: StampEdastoreBindings :execrows -UPDATE bindings SET org_id = 'default', workspace_id = 'default' WHERE org_id = '' +UPDATE bindings SET org_id = 'org-sys', workspace_id = 'default' WHERE org_id = '' ` func (q *Queries) StampEdastoreBindings(ctx context.Context) (int64, error) { @@ -80,7 +80,7 @@ func (q *Queries) StampEdastoreBindings(ctx context.Context) (int64, error) { } const stampEdastoreCaptures = `-- name: StampEdastoreCaptures :execrows -UPDATE captures SET org_id = 'default', workspace_id = 'default' WHERE org_id = '' +UPDATE captures SET org_id = 'org-sys', workspace_id = 'default' WHERE org_id = '' ` func (q *Queries) StampEdastoreCaptures(ctx context.Context) (int64, error) { @@ -92,7 +92,7 @@ func (q *Queries) StampEdastoreCaptures(ctx context.Context) (int64, error) { } const stampEdastoreEventTypes = `-- name: StampEdastoreEventTypes :execrows -UPDATE event_types SET org_id = 'default', workspace_id = 'default' WHERE org_id = '' +UPDATE event_types SET org_id = 'org-sys', workspace_id = 'default' WHERE org_id = '' ` func (q *Queries) StampEdastoreEventTypes(ctx context.Context) (int64, error) { @@ -104,7 +104,7 @@ func (q *Queries) StampEdastoreEventTypes(ctx context.Context) (int64, error) { } const stampEdastoreMappings = `-- name: StampEdastoreMappings :execrows -UPDATE mappings SET org_id = 'default', workspace_id = 'default' WHERE org_id = '' +UPDATE mappings SET org_id = 'org-sys', workspace_id = 'default' WHERE org_id = '' ` func (q *Queries) StampEdastoreMappings(ctx context.Context) (int64, error) { @@ -116,7 +116,7 @@ func (q *Queries) StampEdastoreMappings(ctx context.Context) (int64, error) { } const stampEdastoreSources = `-- name: StampEdastoreSources :execrows -UPDATE sources SET org_id = 'default', workspace_id = 'default' WHERE org_id = '' +UPDATE sources SET org_id = 'org-sys', workspace_id = 'default' WHERE org_id = '' ` func (q *Queries) StampEdastoreSources(ctx context.Context) (int64, error) { @@ -128,7 +128,7 @@ func (q *Queries) StampEdastoreSources(ctx context.Context) (int64, error) { } const stampEdastoreToolCalls = `-- name: StampEdastoreToolCalls :execrows -UPDATE tool_calls SET org_id = 'default', workspace_id = 'default' WHERE org_id = '' +UPDATE tool_calls SET org_id = 'org-sys', workspace_id = 'default' WHERE org_id = '' ` func (q *Queries) StampEdastoreToolCalls(ctx context.Context) (int64, error) { @@ -140,7 +140,7 @@ func (q *Queries) StampEdastoreToolCalls(ctx context.Context) (int64, error) { } const stampStateStoreEvents = `-- name: StampStateStoreEvents :execrows -UPDATE events SET org_id = 'default', workspace_id = 'default' WHERE org_id = '' +UPDATE events SET org_id = 'org-sys', workspace_id = 'default' WHERE org_id = '' ` func (q *Queries) StampStateStoreEvents(ctx context.Context) (int64, error) { @@ -152,7 +152,7 @@ func (q *Queries) StampStateStoreEvents(ctx context.Context) (int64, error) { } const stampStateStoreResourceHistory = `-- name: StampStateStoreResourceHistory :execrows -UPDATE resource_history SET org_id = 'default' WHERE org_id = '' +UPDATE resource_history SET org_id = 'org-sys' WHERE org_id = '' ` func (q *Queries) StampStateStoreResourceHistory(ctx context.Context) (int64, error) { @@ -164,7 +164,7 @@ func (q *Queries) StampStateStoreResourceHistory(ctx context.Context) (int64, er } const stampStateStoreResources = `-- name: StampStateStoreResources :execrows -UPDATE resources SET org_id = 'default' WHERE org_id = '' +UPDATE resources SET org_id = 'org-sys' WHERE org_id = '' ` func (q *Queries) StampStateStoreResources(ctx context.Context) (int64, error) { @@ -177,7 +177,7 @@ func (q *Queries) StampStateStoreResources(ctx context.Context) (int64, error) { const stampStateStoreTasks = `-- name: StampStateStoreTasks :execrows -UPDATE tasks SET org_id = 'default', workspace_id = 'default' WHERE org_id = '' +UPDATE tasks SET org_id = 'org-sys', workspace_id = 'default' WHERE org_id = '' ` // The phase stamps: empty values are rows written before the default @@ -192,7 +192,7 @@ func (q *Queries) StampStateStoreTasks(ctx context.Context) (int64, error) { } const stampStateStoreTransitions = `-- name: StampStateStoreTransitions :execrows -UPDATE transitions SET org_id = 'default', workspace_id = 'default' WHERE org_id = '' +UPDATE transitions SET org_id = 'org-sys', workspace_id = 'default' WHERE org_id = '' ` func (q *Queries) StampStateStoreTransitions(ctx context.Context) (int64, error) { diff --git a/internal/infrastructure/postgres/postgresdb/tasks.sql.go b/internal/infrastructure/postgres/postgresdb/tasks.sql.go index 7f125b536..ce310cb0a 100644 --- a/internal/infrastructure/postgres/postgresdb/tasks.sql.go +++ b/internal/infrastructure/postgres/postgresdb/tasks.sql.go @@ -264,7 +264,7 @@ VALUES ( (SELECT a.org_id FROM org_agents a WHERE a.identity_id = $7), (SELECT m.org_id FROM memberships m WHERE m.identity_id = $7 ORDER BY m.created_at, m.org_id, m.workspace_id NULLS LAST LIMIT 1), - 'default' + 'org-sys' ), 'default' ) @@ -316,7 +316,7 @@ VALUES ( (SELECT a.org_id FROM org_agents a WHERE a.identity_id = $7), (SELECT m.org_id FROM memberships m WHERE m.identity_id = $7 ORDER BY m.created_at, m.org_id, m.workspace_id NULLS LAST LIMIT 1), - 'default' + 'org-sys' ), $8 ) diff --git a/internal/infrastructure/postgres/queries/orgs.sql b/internal/infrastructure/postgres/queries/orgs.sql index bf69a4b46..52d1ae607 100644 --- a/internal/infrastructure/postgres/queries/orgs.sql +++ b/internal/infrastructure/postgres/queries/orgs.sql @@ -39,7 +39,7 @@ SELECT COALESCE( (SELECT a.org_id FROM org_agents a WHERE a.identity_id = $1), (SELECT m.org_id FROM memberships m WHERE m.identity_id = $1 ORDER BY m.created_at, m.org_id, m.workspace_id NULLS LAST LIMIT 1), - 'default' + 'org-sys' )::text AS org_id; -- name: EnsureAgentOrgMembership :exec -- Every agent identity serves its org with the shipped developer role: an diff --git a/internal/infrastructure/postgres/queries/orgupgrade.sql b/internal/infrastructure/postgres/queries/orgupgrade.sql index 3f2fdad49..77c994e51 100644 --- a/internal/infrastructure/postgres/queries/orgupgrade.sql +++ b/internal/infrastructure/postgres/queries/orgupgrade.sql @@ -10,17 +10,17 @@ SELECT completed_at FROM org_upgrades WHERE phase = $1; INSERT INTO org_upgrades (phase) VALUES ($1); -- name: EnsureDefaultOrg :exec -INSERT INTO orgs (id, name) VALUES ('default', 'Default') +INSERT INTO orgs (id, name) VALUES ('org-sys', 'System') ON CONFLICT (id) DO NOTHING; -- name: EnsureDefaultWorkspace :exec -INSERT INTO workspaces (id, org_id, name) VALUES ('default', 'default', 'Default') +INSERT INTO workspaces (id, org_id, name) VALUES ('default', 'org-sys', 'Default') ON CONFLICT (org_id, id) DO NOTHING; -- name: AssignDefaultOrgIdentities :exec -- Every existing agent and service identity belongs to the default org. INSERT INTO org_agents (identity_id, org_id) -SELECT id, 'default' FROM identities WHERE kind IN ('bot', 'service_account') +SELECT id, 'org-sys' FROM identities WHERE kind IN ('bot', 'service_account') ON CONFLICT (identity_id) DO NOTHING; -- The phase stamps: empty values are rows written before the default @@ -28,34 +28,34 @@ ON CONFLICT (identity_id) DO NOTHING; -- only ever match what the upgrade has not covered yet. -- name: StampStateStoreTasks :execrows -UPDATE tasks SET org_id = 'default', workspace_id = 'default' WHERE org_id = ''; +UPDATE tasks SET org_id = 'org-sys', workspace_id = 'default' WHERE org_id = ''; -- name: StampStateStoreEvents :execrows -UPDATE events SET org_id = 'default', workspace_id = 'default' WHERE org_id = ''; +UPDATE events SET org_id = 'org-sys', workspace_id = 'default' WHERE org_id = ''; -- name: StampStateStoreTransitions :execrows -UPDATE transitions SET org_id = 'default', workspace_id = 'default' WHERE org_id = ''; +UPDATE transitions SET org_id = 'org-sys', workspace_id = 'default' WHERE org_id = ''; -- name: StampStateStoreResources :execrows -UPDATE resources SET org_id = 'default' WHERE org_id = ''; +UPDATE resources SET org_id = 'org-sys' WHERE org_id = ''; -- name: StampStateStoreResourceHistory :execrows -UPDATE resource_history SET org_id = 'default' WHERE org_id = ''; +UPDATE resource_history SET org_id = 'org-sys' WHERE org_id = ''; -- name: StampEdastoreBindings :execrows -UPDATE bindings SET org_id = 'default', workspace_id = 'default' WHERE org_id = ''; +UPDATE bindings SET org_id = 'org-sys', workspace_id = 'default' WHERE org_id = ''; -- name: StampEdastoreMappings :execrows -UPDATE mappings SET org_id = 'default', workspace_id = 'default' WHERE org_id = ''; +UPDATE mappings SET org_id = 'org-sys', workspace_id = 'default' WHERE org_id = ''; -- name: StampEdastoreCaptures :execrows -UPDATE captures SET org_id = 'default', workspace_id = 'default' WHERE org_id = ''; +UPDATE captures SET org_id = 'org-sys', workspace_id = 'default' WHERE org_id = ''; -- name: StampEdastoreSources :execrows -UPDATE sources SET org_id = 'default', workspace_id = 'default' WHERE org_id = ''; +UPDATE sources SET org_id = 'org-sys', workspace_id = 'default' WHERE org_id = ''; -- name: StampEdastoreEventTypes :execrows -UPDATE event_types SET org_id = 'default', workspace_id = 'default' WHERE org_id = ''; +UPDATE event_types SET org_id = 'org-sys', workspace_id = 'default' WHERE org_id = ''; -- name: StampEdastoreToolCalls :execrows -UPDATE tool_calls SET org_id = 'default', workspace_id = 'default' WHERE org_id = ''; \ No newline at end of file +UPDATE tool_calls SET org_id = 'org-sys', workspace_id = 'default' WHERE org_id = ''; \ No newline at end of file diff --git a/internal/infrastructure/postgres/queries/tasks.sql b/internal/infrastructure/postgres/queries/tasks.sql index 984efac06..05ec9dd60 100644 --- a/internal/infrastructure/postgres/queries/tasks.sql +++ b/internal/infrastructure/postgres/queries/tasks.sql @@ -74,7 +74,7 @@ VALUES ( (SELECT a.org_id FROM org_agents a WHERE a.identity_id = sqlc.arg(identity)), (SELECT m.org_id FROM memberships m WHERE m.identity_id = sqlc.arg(identity) ORDER BY m.created_at, m.org_id, m.workspace_id NULLS LAST LIMIT 1), - 'default' + 'org-sys' ), sqlc.arg(inputs) ) @@ -143,7 +143,7 @@ VALUES ( (SELECT a.org_id FROM org_agents a WHERE a.identity_id = $7), (SELECT m.org_id FROM memberships m WHERE m.identity_id = $7 ORDER BY m.created_at, m.org_id, m.workspace_id NULLS LAST LIMIT 1), - 'default' + 'org-sys' ), 'default' )