CodeCow/stack
1
0
Fork 0
mirror of https://github.com/stack-auth/stack.git synced 2026-07-20 21:29:36 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Move dbSync to environment config

Browse Source
This commit is contained in:
Konstantin Wohlwend 2026-07-01 12:44:33 -07:00
parent 1cf93a5f76
commit 82517ee69d
2 changed files with 46 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
packages/shared/src/config/schema-fuzzer.test.ts
View File

@ -61,17 +61,6 @@ const branchSchemaFuzzerConfig = [{
}],
signUpRulesDefaultAction: ["allow", "reject"],
}],
dbSync: [{
externalDatabases: [{
"some-external-db-id": [{
type: ["postgres"] as const,
connectionString: [
"postgres://user:password@host:port/database",
"some-connection-string",
],
}],
}],
}],
dataVault: [{
stores: [{
"some-store-id": [{
@ -250,6 +239,17 @@ const environmentSchemaFuzzerConfig = [{
...branchSchemaFuzzerConfig[0].payments[0],
testMode: [false, true],
}],
dbSync: [{
externalDatabases: [{
"some-external-db-id": [{
type: ["postgres"] as const,
connectionString: [
"postgres://user:password@host:port/database",
"some-connection-string",
],
}],
}],
}],
analytics: [{
queryFolders: [{
"some-folder-id": [{

49
packages/shared/src/config/schema.ts
View File

@ -327,20 +327,6 @@ export const branchConfigSchema = canNoLongerBeOverridden(projectConfigSchema, [
payments: branchPaymentsSchema,
dbSync: yupObject({
externalDatabases: yupRecord(
userSpecifiedIdSchema("externalDatabaseId"),
yupObject({
type: yupString().oneOf(["postgres"]).defined(),
connectionString: yupString().when("type", {
is: "postgres",
then: (schema) => schema.defined(),
otherwise: (schema) => schema.optional(),
}),
}),
),
}),
dataVault: yupObject({
stores: yupRecord(
@ -449,6 +435,20 @@ export const environmentConfigSchema = branchConfigSchema.concat(yupObject({
testMode: yupBoolean(),
})),
dbSync: yupObject({
externalDatabases: yupRecord(
userSpecifiedIdSchema("externalDatabaseId"),
yupObject({
type: yupString().oneOf(["postgres"]).defined(),
connectionString: yupString().when("type", {
is: "postgres",
then: (schema) => schema.defined(),
otherwise: (schema) => schema.optional(),
}),
}),
),
}),
analytics: environmentAnalyticsSchema,
customDashboards: schemaFields.customDashboardsSchema,
}));
@ -567,6 +567,13 @@ export function migrateConfigOverride(type: "project" | "branch" | "environment"
}
// END
// BEGIN 2026-07-01: dbSync.externalDatabases contains environment-specific connection strings.
// It should never be rendered from branch config, which can be read by branch-scoped tools.
if (type === "branch") {
res = removeProperty(res, p => p[0] === "dbSync");
}
// END
// return the result
return res;
};
@ -587,6 +594,20 @@ import.meta.vitest?.test("migrateConfigOverride removes legacy sourceOfTruth ove
})).toEqual({});
});
import.meta.vitest?.test("migrateConfigOverride removes legacy branch-level dbSync overrides", ({ expect }) => {
const dbSync = {
externalDatabases: {
main: {
type: "postgres",
connectionString: "postgres://user:password@host:5432/database",
},
},
};
expect(migrateConfigOverride("branch", { dbSync })).toEqual({});
expect(migrateConfigOverride("environment", { dbSync })).toEqual({ dbSync });
});
function removeProperty(obj: Record<string, any>, pathCond: (path: (string | symbol)[]) => boolean): any {
return mapProperty(obj, pathCond, () => undefined);
}