@catladder/cli 1.152.0 → 1.153.1

package/package.json

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

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

@@ -36,7 +36,7 @@ export default async (vorpal: Vorpal) =>
 
       const sourceEnvVars = await getEnvVarsResolved(
         this,
-        sourceContext.environment.shortName,
+        sourceContext.env,
         sourceContext.componentName,
       );
 
@@ -99,7 +99,7 @@ export default async (vorpal: Vorpal) =>
 
       const targetEnvVars = await getEnvVarsResolved(
         this,
-        targetContext.environment.shortName,
+        targetContext.env,
         targetContext.componentName,
       );
 

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

@@ -85,7 +85,7 @@ const getProxyInfoForKubernetes = async (
 
   const envVars = await getEnvVarsResolved(
     vorpal,
-    context.environment.shortName,
+    context.env,
     context.componentName,
   );
   // bit hacky, would be nicer if we would also declare this through env vars
@@ -118,7 +118,7 @@ const getProxyInfoForCloudRun = async (
 
   const envVars = await getEnvVarsResolved(
     vorpal,
-    context.environment.shortName,
+    context.env,
     context.componentName,
   );
 

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

@@ -76,7 +76,7 @@ export const setupCloudRun = async (
     {
       [GCLOUD_RUN_CANONICAL_HOST_SUFFIX]: suffix,
     },
-    context.environment.shortName,
+    context.env,
     context.componentName,
     false, // backup
     false, // masked

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

@@ -15,11 +15,7 @@ export const setupContext = async (
   );
 
   instance.log(
-    "🐱 🔧 setting up " +
-      context.environment.shortName +
-      ":" +
-      context.componentName +
-      "...",
+    "🐱 🔧 setting up " + context.env + ":" + context.componentName + "...",
   );
   instance.log("");
   if (isOfDeployType(context.deploy?.config, "google-cloudrun")) {
@@ -32,13 +28,7 @@ export const setupContext = async (
   }
 
   instance.log("");
-  instance.log(
-    "✅ " +
-      context.environment.shortName +
-      ":" +
-      context.componentName +
-      " done!",
-  );
+  instance.log("✅ " + context.env + ":" + context.componentName + " done!");
 
   instance.log("");
 };

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

@@ -163,7 +163,7 @@ EOF
   await upsertAllVariables(
     instance,
     vars,
-    context.environment.shortName,
+    context.env,
     context.componentName,
     false, // no backup
   );

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

@@ -5,17 +5,14 @@ import { V1Namespace } from "@kubernetes/client-node";
 import { getk8sApi } from "../../../../../k8sApi";
 
 export default async function (context: ComponentContext) {
-  const namespace = getKubernetesNamespace(
-    context.fullConfig,
-    context.environment.shortName,
-  );
+  const namespace = getKubernetesNamespace(context.fullConfig, context.env);
   const namespaceBody = new V1Namespace();
   const metadata: V1ObjectMeta = {
     name: namespace,
     labels: {
       customerName: context.fullConfig.customerName,
       appName: context.fullConfig.appName,
-      environment: context.environment.shortName,
+      environment: context.env,
       components: Object.keys(context.fullConfig.components).join("_"), // limited chars available...
       buildTypes: Object.values(context.fullConfig.components)
         .map((config) => config.build.type)

package/src/gcloud/serviceAccounts.ts

@@ -29,7 +29,7 @@ const upsertGcloudServiceAccount = async (
 
   // name has limit of 30
   const namePrefix = `${name}`;
-  const nameSuffixRaw = `${context.environment.shortName}-${context.componentName}`;
+  const nameSuffixRaw = `${context.env}-${context.componentName}`;
   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.environment.shortName}:${context.componentName} | ${displayName}`;
+  const fullDisplayName = `${context.fullConfig.customerName}-${context.fullConfig.appName} ${context.env}:${context.componentName} | ${displayName}`;
 
   const fullIdentifier = `${fullName}@${projectId}.iam.gserviceaccount.com`;
 
@@ -106,7 +106,7 @@ export const upsertGcloudServiceAccountAndSaveSecret = async (
     {
       [secretName]: key,
     },
-    context.environment.shortName,
+    context.env,
     context.componentName,
   );
   instance.log("done!");