@catladder/cli 1.153.1 → 1.154.1

package/package.json

@@ -52,7 +52,7 @@
     }
   ],
   "license": "MIT",
-  "version": "1.153.1",
+  "version": "1.154.1",
   "scripts": {
     "lint": "eslint \"src/**/*.ts\"",
     "lint:fix": "eslint \"src/**/*.ts\" --fix",

package/src/apps/cli/commands/project/cloudSql/commandProjectRestoreDb.ts

@@ -37,7 +37,7 @@ export default async (vorpal: Vorpal) =>
       const sourceEnvVars = await getEnvVarsResolved(
         this,
         sourceContext.env,
-        sourceContext.componentName,
+        sourceContext.name,
       );
 
       let sourceProxy: CloudSqlBackgroundProxy;
@@ -100,7 +100,7 @@ export default async (vorpal: Vorpal) =>
       const targetEnvVars = await getEnvVarsResolved(
         this,
         targetContext.env,
-        targetContext.componentName,
+        targetContext.name,
       );
 
       if (targetEnv === "local") {

package/src/apps/cli/commands/project/commandCloudSqlProxy.ts

@@ -83,11 +83,7 @@ const getProxyInfoForKubernetes = async (
     throw new Error("unsupported");
   }
 
-  const envVars = await getEnvVarsResolved(
-    vorpal,
-    context.env,
-    context.componentName,
-  );
+  const envVars = await getEnvVarsResolved(vorpal, context.env, context.name);
   // bit hacky, would be nicer if we would also declare this through env vars
   const cloudSqlValues = createKubernetesCloudsqlBaseValues(context);
 
@@ -116,11 +112,7 @@ const getProxyInfoForCloudRun = async (
     throw new Error("unsupported");
   }
 
-  const envVars = await getEnvVarsResolved(
-    vorpal,
-    context.env,
-    context.componentName,
-  );
+  const envVars = await getEnvVarsResolved(vorpal, context.env, context.name);
 
   const DB_PASSWORD = envVars?.DB_PASSWORD;
   const DB_USER = envVars?.DB_USER;

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

@@ -77,7 +77,7 @@ export const setupCloudRun = async (
       [GCLOUD_RUN_CANONICAL_HOST_SUFFIX]: suffix,
     },
     context.env,
-    context.componentName,
+    context.name,
     false, // backup
     false, // masked
   );

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

@@ -14,9 +14,7 @@ export const setupContext = async (
     "==================================================================================",
   );
 
-  instance.log(
-    "🐱 🔧 setting up " + context.env + ":" + context.componentName + "...",
-  );
+  instance.log("🐱 🔧 setting up " + context.env + ":" + context.name + "...");
   instance.log("");
   if (isOfDeployType(context.deploy?.config, "google-cloudrun")) {
     await setupCloudRun(instance, context);
@@ -28,7 +26,7 @@ export const setupContext = async (
   }
 
   instance.log("");
-  instance.log("✅ " + context.env + ":" + context.componentName + " done!");
+  instance.log("✅ " + context.env + ":" + context.name + " done!");
 
   instance.log("");
 };

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

@@ -63,7 +63,7 @@ export const setupKubernetes = async (
   // we name the service account and the role and the role binding with the same name
   // we currently create one per component to better separate them
   instance.log("ensuring service accounts...");
-  const serviceAccountName = `cl-${context.componentName}-deploy`;
+  const serviceAccountName = `cl-${context.name}-deploy`;
   const KUBE_URL = await exec(
     `TERM=dumb kubectl cluster-info | grep -E 'Kubernetes master|Kubernetes control plane' | awk '/http/ {print $NF}'`,
   ).then((s) => s.stdout.trim());
@@ -164,7 +164,7 @@ EOF
     instance,
     vars,
     context.env,
-    context.componentName,
+    context.name,
     false, // no backup
   );
   instance.log("done!");

package/src/apps/cli/commands/project/utils/ensureNamespace.ts

@@ -14,17 +14,7 @@ export default async function (context: ComponentContext) {
       appName: context.fullConfig.appName,
       environment: context.env,
       components: Object.keys(context.fullConfig.components).join("_"), // limited chars available...
-      buildTypes: Object.values(context.fullConfig.components)
-        .map((config) => config.build.type)
-        .join("_"), // limited chars available...
-      ...Object.fromEntries(
-        Object.entries(context.fullConfig.components).map(
-          ([componentName, config]) => [
-            "buildType_" + componentName,
-            config.build.type,
-          ],
-        ),
-      ),
+
       ...(context.fullConfig.meta?.labels ?? {}),
     },
   };

package/src/gcloud/serviceAccounts.ts

@@ -29,7 +29,7 @@ const upsertGcloudServiceAccount = async (
 
   // name has limit of 30
   const namePrefix = `${name}`;
-  const nameSuffixRaw = `${context.env}-${context.componentName}`;
+  const nameSuffixRaw = `${context.env}-${context.name}`;
   const nameMiddleRaw = `${context.fullConfig.customerName}-${context.fullConfig.appName}`;
   const MAX_LENGTH = 30;
   const NUM_SEPARATORS = 2;
@@ -55,7 +55,7 @@ const upsertGcloudServiceAccount = async (
 
   const fullName = `${namePrefix}-${nameMiddle}-${nameSuffix}`;
 
-  const fullDisplayName = `${context.fullConfig.customerName}-${context.fullConfig.appName} ${context.env}:${context.componentName} | ${displayName}`;
+  const fullDisplayName = `${context.fullConfig.customerName}-${context.fullConfig.appName} ${context.env}:${context.name} | ${displayName}`;
 
   const fullIdentifier = `${fullName}@${projectId}.iam.gserviceaccount.com`;
 
@@ -107,7 +107,7 @@ export const upsertGcloudServiceAccountAndSaveSecret = async (
       [secretName]: key,
     },
     context.env,
-    context.componentName,
+    context.name,
   );
   instance.log("done!");
 };