@catladder/cli 1.146.2 → 1.148.0

package/package.json

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

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

@@ -38,11 +38,9 @@ export default async (vorpal: Vorpal) =>
           "⚠️ connection string does not include mr information on review environments",
         );
       }
-      if (isOfDeployType(context.componentConfig.deploy, "kubernetes")) {
+      if (isOfDeployType(context.deploy?.config, "kubernetes")) {
         proxyInfo = await getProxyInfoForKubernetes(this, context);
-      } else if (
-        isOfDeployType(context.componentConfig.deploy, "google-cloudrun")
-      ) {
+      } else if (isOfDeployType(context.deploy?.config, "google-cloudrun")) {
         proxyInfo = await getProxyInfoForCloudRun(this, context);
       } else {
         throw new Error("unsupported environment");
@@ -81,7 +79,7 @@ const getProxyInfoForKubernetes = async (
   vorpal: CommandInstance,
   context: ComponentContext,
 ): Promise<ProxyInfo> => {
-  if (!isOfDeployType(context.componentConfig.deploy, "kubernetes")) {
+  if (!isOfDeployType(context.deploy?.config, "kubernetes")) {
     throw new Error("unsupported");
   }
 
@@ -112,8 +110,8 @@ const getProxyInfoForCloudRun = async (
   context: ComponentContext,
 ): Promise<ProxyInfo> => {
   if (
-    !isOfDeployType(context.componentConfig.deploy, "google-cloudrun") ||
-    !context.componentConfig.deploy.cloudSql
+    !isOfDeployType(context.deploy?.config, "google-cloudrun") ||
+    !context.deploy?.config.cloudSql
   ) {
     throw new Error("unsupported");
   }
@@ -130,8 +128,7 @@ const getProxyInfoForCloudRun = async (
   const DB_NAME = context.environment.envVars.DB_NAME.toString();
 
   return {
-    instanceName:
-      context.componentConfig.deploy.cloudSql.instanceConnectionName,
+    instanceName: context.deploy?.config.cloudSql.instanceConnectionName,
     DB_PASSWORD,
     DB_NAME,
     DB_USER,

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

@@ -19,10 +19,10 @@ export default async (vorpal: Vorpal) =>
     .action(async function ({ envComponent }) {
       const { env, componentName } = parseChoice(envComponent);
       const context = await getPipelineContextByChoice(env, componentName);
-      if (isOfDeployType(context.componentConfig.deploy, "kubernetes")) {
+      if (isOfDeployType(context.deploy?.config, "kubernetes")) {
         await openGoogleCloudKubernetesDashboard(this, context);
       }
-      if (isOfDeployType(context.componentConfig.deploy, "google-cloudrun")) {
+      if (isOfDeployType(context.deploy?.config, "google-cloudrun")) {
         await openGoogleCloudRunDashboard(this, context);
       }
     });

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

@@ -48,7 +48,7 @@ const cloudRunPortForward = async (
   cmd: CommandInstance,
   context: ComponentContext,
 ) => {
-  if (!isOfDeployType(context.componentConfig.deploy, "google-cloudrun")) {
+  if (!isOfDeployType(context.deploy?.config, "google-cloudrun")) {
     throw new Error("not cloud run");
   }
 
@@ -67,7 +67,7 @@ const cloudRunPortForward = async (
       .replace("-review-", "-review-mr" + mr + "-");
   }
 
-  const { projectId, region } = context.componentConfig.deploy;
+  const { projectId, region } = context.deploy.config;
 
   const command = `gcloud beta run services proxy ${serviceName} --project ${projectId} --region ${region}`;
 
@@ -82,10 +82,10 @@ export default async (vorpal: Vorpal) =>
       const { env, componentName } = parseChoice(envComponent);
       const context = await getPipelineContextByChoice(env, componentName);
 
-      if (isOfDeployType(context.componentConfig.deploy, "kubernetes")) {
+      if (isOfDeployType(context.deploy?.config, "kubernetes")) {
         await kubePortForward(this, envComponent);
       }
-      if (isOfDeployType(context.componentConfig.deploy, "google-cloudrun")) {
+      if (isOfDeployType(context.deploy?.config, "google-cloudrun")) {
         await cloudRunPortForward(this, context);
       }
     });

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

@@ -16,11 +16,11 @@ export const setupCloudRun = async (
   instance: CommandInstance,
   context: ComponentContext,
 ) => {
-  if (!isOfDeployType(context.componentConfig.deploy, "google-cloudrun")) {
+  if (!isOfDeployType(context.deploy?.config, "google-cloudrun")) {
     throw new Error("deploy config is not of type 'google-cloudrun'");
   }
 
-  const config = context.componentConfig.deploy;
+  const config = context.deploy?.config;
 
   // enable services
 

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

@@ -22,11 +22,11 @@ export const setupContext = async (
       "...",
   );
   instance.log("");
-  if (isOfDeployType(context.componentConfig.deploy, "google-cloudrun")) {
+  if (isOfDeployType(context.deploy?.config, "google-cloudrun")) {
     await setupCloudRun(instance, context);
   }
 
-  const deployConfig = context.componentConfig.deploy;
+  const deployConfig = context.deploy?.config;
   if (isOfDeployType(deployConfig, "kubernetes")) {
     await setupKubernetes(instance, context);
   }

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

@@ -17,7 +17,7 @@ export const setupKubernetes = async (
   instance: CommandInstance,
   context: ComponentContext,
 ) => {
-  const deployConfig = context.componentConfig.deploy;
+  const deployConfig = context.deploy?.config;
   if (!isOfDeployType(deployConfig, "kubernetes")) {
     throw new Error("cannot run setupKubernetes on non-kubernetes deployments");
   }

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

@@ -13,12 +13,10 @@ import {
 export default async function (envComponent: string) {
   const { env, componentName } = parseChoice(envComponent);
   const context = await getPipelineContextByChoice(env, componentName);
-  if (!isOfDeployType(context.componentConfig.deploy, "kubernetes")) {
+  if (!isOfDeployType(context.deploy?.config, "kubernetes")) {
     throw new Error("can't ensure cluster for non-kubernetes deployments");
   }
-  const cluster = getFullKubernetesClusterName(
-    context.componentConfig.deploy.cluster,
-  );
+  const cluster = getFullKubernetesClusterName(context.deploy?.config.cluster);
   const connectedClusterName = await getCurrentConnectedClusterName();
 
   if (cluster !== connectedClusterName) {

package/src/gcloud/cloudRun/openCloudRunDashboards.ts

@@ -7,11 +7,11 @@ export const openGoogleCloudRunDashboard = async (
   instance: CommandInstance,
   context: ComponentContext,
 ) => {
-  if (!isOfDeployType(context.componentConfig.deploy, "google-cloudrun")) {
+  if (!isOfDeployType(context.deploy?.config, "google-cloudrun")) {
     throw new Error("deploy type is not google-cloudrun ");
   }
   const { fullName } = context.environment;
-  const { region, projectId } = context.componentConfig.deploy;
+  const { region, projectId } = context.deploy.config;
   await openGoogleCloudDashboard(
     instance,
     `run/detail/${region}/${fullName}/metrics`,

package/src/kubernetes/openKubernetesDashboards.ts

@@ -7,7 +7,7 @@ export const openGoogleCloudLogs = async (
   instance: CommandInstance,
   context: ComponentContext,
 ) => {
-  const deployConfig = context.componentConfig.deploy;
+  const deployConfig = context.deploy?.config;
   if (!isOfDeployType(deployConfig, "kubernetes")) {
     throw new Error("context is not of type kubernetes");
   }
@@ -33,7 +33,7 @@ export const openGoogleCloudKubernetesDashboard = async (
   instance: CommandInstance,
   context: ComponentContext,
 ) => {
-  const deployConfig = context.componentConfig.deploy;
+  const deployConfig = context.deploy?.config;
   if (!isOfDeployType(deployConfig, "kubernetes")) {
     throw new Error("context is not of type kubernetes");
   }