comi-logic/cfw-autumn
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: revert database v2 url changes

Browse Source
This commit is contained in:
Charlie Lamb
2026-04-27 14:01:26 +01:00
parent 9aff8b3d30
commit 0dc77a7dcd
20 changed files with 61 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/db/pull.ts
View File

@@ -184,7 +184,7 @@ async function getCustomerCount(
}
/**
* Read DATABASE_V2_URL from server/.env file
* Read DATABASE_URL from server/.env file
*/
function readLocalDatabaseUrl(): string | null {
try {
@@ -194,8 +194,8 @@ function readLocalDatabaseUrl(): string | null {
for (const line of lines) {
const trimmed = line.trim();
if (trimmed.startsWith("DATABASE_V2_URL=")) {
const url = trimmed.replace(/^DATABASE_V2_URL=/, "").trim();
if (trimmed.startsWith("DATABASE_URL=")) {
const url = trimmed.replace(/^DATABASE_URL=/, "").trim();
// Remove quotes if present
return url.replace(/^["']|["']$/g, "");
}
@@ -237,7 +237,7 @@ async function pullDatabase({
if (!localUrl) {
console.error("❌ Could not find local database URL");
console.error(" Options:");
console.error(" 1. Ensure server/.env exists and contains DATABASE_V2_URL");
console.error(" 1. Ensure server/.env exists and contains DATABASE_URL");
console.error(" 2. Pass local URL as second argument");
console.error(" 3. Set LOCAL_DATABASE_URL environment variable");
process.exit(1);
@@ -359,7 +359,7 @@ if (!remoteUrl) {
" local-database-url (optional) Local database URL to pull into",
);
console.log(
" If not provided, reads from server/.env DATABASE_V2_URL\n",
" If not provided, reads from server/.env DATABASE_URL\n",
);
console.log("Environment variables:");
console.log(" REMOTE_DATABASE_URL Remote database URL");
@@ -370,7 +370,7 @@ if (!remoteUrl) {
console.log(' REMOTE_DATABASE_URL="postgresql://..." bun db:pull\n');
console.log("⚠️ Important: URLs must be quoted to prevent shell expansion\n");
console.log(
"By default, the script reads DATABASE_V2_URL from server/.env for the local database.\n",
"By default, the script reads DATABASE_URL from server/.env for the local database.\n",
);
process.exit(1);
}

12
scripts/db/set-critical-role-timeouts.ts
View File

@@ -39,7 +39,9 @@ const setEnvFromInfisicalExport = (value: unknown) => {
return;
}
for (const [key, secretValue] of Object.entries(value as Record<string, string>)) {
for (const [key, secretValue] of Object.entries(
value as Record<string, string>,
)) {
process.env[key] = secretValue;
}
};
@@ -71,9 +73,11 @@ const main = async () => {
loadInfisicalEnv(env);
const criticalDatabaseUrl = process.env.DATABASE_V2_CRITICAL_URL;
const criticalDatabaseUrl = process.env.DATABASE_CRITICAL_URL;
if (!criticalDatabaseUrl) {
throw new Error(`DATABASE_V2_CRITICAL_URL is not set in Infisical env "${env}"`);
throw new Error(
`DATABASE_CRITICAL_URL is not set in Infisical env "${env}"`,
);
}
const client = new Pool({
@@ -106,7 +110,7 @@ const main = async () => {
});
try {
console.log("Verified in a new DATABASE_V2_CRITICAL_URL session:");
console.log("Verified in a new DATABASE_CRITICAL_URL session:");
for (const key of Object.keys(ROLE_SETTINGS)) {
const verifyResult = await verifyClient.query<Record<string, string>>(
`SHOW ${key}`,