@catladder/cli 0.0.0-next-1cd29c1f → 0.0.0-next-52feb889

package/package.json

@@ -53,14 +53,15 @@
     }
   ],
   "license": "MIT",
-  "version": "0.0.0-next-1cd29c1f",
+  "version": "0.0.0-next-52feb889",
   "scripts": {
     "lint": "eslint \"src/**/*.ts\"",
     "lint:fix": "eslint \"src/**/*.ts\" --fix",
     "test": "yarn run lint",
-    "build": "yarn build:compile && yarn build:inline-variables && yarn build:bundle",
+    "build": "yarn build:compile && yarn build:inline-variables && yarn build:bundle && yarn build:copy-images",
     "build:inline-variables": "yarn babel --keep-file-extension --extensions \".ts,.js\" --config-file ./babel-inline.json dist --out-dir dist",
     "build:bundle": "./scripts/bundle",
+    "build:copy-images": "rm -rf dist/runner-images dist/bundles/runner-images && cp -R ../runner-images dist/runner-images && cp -R ../runner-images dist/bundles/runner-images",
     "build:compile": "yarn tsc && yarn tsc-alias",
     "dev:own-catenv": "cd ../ && node cli/bin/catenv-dev",
     "build:watch": "tsc-watch --onSuccess \"yarn dev:own-catenv\""

package/src/apps/cli/commands/project/setup/ensureGcloudProjectNumbers.ts

@@ -0,0 +1,61 @@
+import { getEnvConfig, readCatladderStore } from "@catladder/pipeline";
+import {
+  getAllComponentsWithAllEnvsFlat,
+  getProjectConfig,
+  invalidateProjectConfig,
+} from "../../../../../config/getProjectConfig";
+import type { IO } from "../../../../../core/types";
+import { fetchGcloudProjectNumber } from "../../../../../gcloud/getProjectNumber";
+import { updateCatladderStore } from "../../../../../store/updateCatladderStore";
+import { getGitRoot } from "../../../../../utils/projects";
+
+/**
+ * fetches the gcloud project numbers of all cloud run deploys into the
+ * catladder store.
+ *
+ * This must run BEFORE any pipeline context is created: context creation
+ * computes the deterministic cloud run urls, which read the project
+ * number from the store and throw when it is missing — on a fresh
+ * project that would make `project setup` fail with the very error it is
+ * supposed to fix (chicken-and-egg).
+ */
+export const ensureGcloudProjectNumbers = async (instance: IO) => {
+  const config = await getProjectConfig();
+  if (!config) return;
+
+  const projectIds = new Set<string>();
+  for (const {
+    componentName,
+    env,
+  } of await getAllComponentsWithAllEnvsFlat()) {
+    const { deploy } = getEnvConfig(config, componentName, env);
+    if (deploy && deploy.type === "google-cloudrun") {
+      projectIds.add(deploy.projectId);
+    }
+  }
+
+  const root = (await getGitRoot()) ?? process.cwd();
+  const store = readCatladderStore(root);
+  const missing = [...projectIds].filter(
+    (projectId) => !store.gcloudProjects?.[projectId]?.projectNumber,
+  );
+
+  for (const projectId of missing) {
+    instance.log(`fetch gcloud project number for ${projectId}...`);
+    const projectNumber = await fetchGcloudProjectNumber(projectId);
+    instance.log(`project number: ${projectNumber}`);
+    await updateCatladderStore((current) => ({
+      ...current,
+      gcloudProjects: {
+        ...current.gcloudProjects,
+        [projectId]: { projectNumber },
+      },
+    }));
+  }
+
+  if (missing.length > 0) {
+    // the store is attached to the config at read time; drop the cached
+    // config so contexts created after this pre-pass see the new values
+    invalidateProjectConfig();
+  }
+};

package/src/apps/cli/commands/project/setup/index.ts

@@ -5,11 +5,14 @@ import { setupContext } from "./setupContext";
 import { setupTopic } from "./setupTopic";
 import { setupAgents } from "./setupAgents";
 import { logSection } from "./logSection";
+import { ensureGcloudProjectNumbers } from "./ensureGcloudProjectNumbers";
 
 export const setupProject = async (
   instance: IO,
   onlyComponents?: string | string[],
 ) => {
+  // must come first: creating contexts already requires the store
+  await ensureGcloudProjectNumbers(instance);
   const allContext = await getAllPipelineContexts(onlyComponents);
   instance.log("will setup those contexts:");
   allContext.forEach((context) => {

package/src/config/getProjectConfig.ts

@@ -39,6 +39,15 @@ export const getProjectConfig = async () => {
   return currentConfig as Config;
 };
 
+/**
+ * drops the cached config so the next access re-reads it from disk —
+ * needed after writing the catladder store, which is attached to the
+ * config (`config.store`) at read time
+ */
+export const invalidateProjectConfig = () => {
+  currentConfig = null;
+};
+
 export const getProjectComponents = async () => {
   const config = await getProjectConfig();
   if (!config) return [];

package/src/gcloud/cloudSql/copyDb.ts

@@ -38,9 +38,14 @@ const createCopyDbScript = ({
       set -e
 
       ${targetPSQL(
-        `-c 'drop database "${targetDbName}" WITH (FORCE)' 1> /dev/null || true`,
+        // connect to the always-existing "postgres" maintenance database:
+        // without an explicit dbname, psql falls back to the username and
+        // fails with e.g. 'FATAL: database "user" does not exist'
+        `--dbname=postgres -c 'drop database "${targetDbName}" WITH (FORCE)' 1> /dev/null || true`,
+      )}
+      ${targetPSQL(
+        `--dbname=postgres -c 'create database "${targetDbName}"' 1> /dev/null`,
       )}
-      ${targetPSQL(`-c 'create database "${targetDbName}"' 1> /dev/null`)}
       echo "Estimating database size..."
       DB_SIZE=$(PGPASSWORD=${encodedSourcePassword} psql --dbname=postgres://${encodedSourceUsername}:${encodedSourcePassword}@localhost:${sourcePort}/${sourceDbName} -t -A -c "SELECT pg_database_size('${sourceDbName}')")
       # pg_database_size includes indexes, TOAST, and free space — pg_dump output is roughly 40% of that