@catladder/cli 1.146.1 → 1.147.0

package/package.json

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

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

@@ -1,4 +1,4 @@
-import type { Context } from "@catladder/pipeline";
+import type { ComponentContext } from "@catladder/pipeline";
 import {
   createKubernetesCloudsqlBaseValues,
   isOfDeployType,
@@ -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");
@@ -79,9 +77,9 @@ export default async (vorpal: Vorpal) =>
 
 const getProxyInfoForKubernetes = async (
   vorpal: CommandInstance,
-  context: Context,
+  context: ComponentContext,
 ): Promise<ProxyInfo> => {
-  if (!isOfDeployType(context.componentConfig.deploy, "kubernetes")) {
+  if (!isOfDeployType(context.deploy?.config, "kubernetes")) {
     throw new Error("unsupported");
   }
 
@@ -109,11 +107,11 @@ const getProxyInfoForKubernetes = async (
 
 const getProxyInfoForCloudRun = async (
   vorpal: CommandInstance,
-  context: Context,
+  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

@@ -8,7 +8,7 @@ import ensureCluster from "./utils/ensureCluster";
 import type { CommandInstance } from "vorpal";
 import { parseChoice } from "../../../../config/parseChoice";
 import { getPipelineContextByChoice } from "../../../../config/getProjectConfig";
-import type { Context } from "@catladder/pipeline";
+import type { ComponentContext } from "@catladder/pipeline";
 import { isOfDeployType } from "@catladder/pipeline";
 import { startPortForwardCommand } from "../../../../utils/portForwards";
 import open from "open";
@@ -44,8 +44,11 @@ const kubePortForward = async (cmd: CommandInstance, envComponent: string) => {
   return startKubePortForward(podName, localPort, remotePort, namespace);
 };
 
-const cloudRunPortForward = async (cmd: CommandInstance, context: Context) => {
-  if (!isOfDeployType(context.componentConfig.deploy, "google-cloudrun")) {
+const cloudRunPortForward = async (
+  cmd: CommandInstance,
+  context: ComponentContext,
+) => {
+  if (!isOfDeployType(context.deploy?.config, "google-cloudrun")) {
     throw new Error("not cloud run");
   }
 
@@ -64,7 +67,7 @@ const cloudRunPortForward = async (cmd: CommandInstance, context: Context) => {
       .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}`;
 
@@ -79,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

@@ -1,4 +1,4 @@
-import type { Context } from "@catladder/pipeline";
+import type { ComponentContext } from "@catladder/pipeline";
 import {
   GCLOUD_DEPLOY_CREDENTIALS_KEY,
   GCLOUD_RUN_CANONICAL_HOST_SUFFIX,
@@ -14,13 +14,13 @@ import { upsertAllVariables } from "../../../../../utils/gitlab";
 
 export const setupCloudRun = async (
   instance: CommandInstance,
-  context: Context,
+  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

@@ -1,4 +1,4 @@
-import type { Context } from "@catladder/pipeline";
+import type { ComponentContext } from "@catladder/pipeline";
 import { isOfDeployType } from "@catladder/pipeline";
 import type { CommandInstance } from "vorpal";
 import { setupCloudRun } from "./setupCloudRun";
@@ -7,7 +7,7 @@ import { setupKubernetes } from "./setupKubernetes";
 
 export const setupContext = async (
   instance: CommandInstance,
-  context: Context,
+  context: ComponentContext,
 ) => {
   instance.log("");
   instance.log(
@@ -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

@@ -1,4 +1,4 @@
-import type { Context } from "@catladder/pipeline";
+import type { ComponentContext } from "@catladder/pipeline";
 import {
   getFullKubernetesClusterName,
   isOfDeployType,
@@ -15,9 +15,9 @@ import ensureNamespace from "../utils/ensureNamespace";
 
 export const setupKubernetes = async (
   instance: CommandInstance,
-  context: Context,
+  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/apps/cli/commands/project/utils/ensureNamespace.ts

@@ -1,10 +1,10 @@
-import type { Context } from "@catladder/pipeline";
+import type { ComponentContext } from "@catladder/pipeline";
 import { getKubernetesNamespace } from "@catladder/pipeline";
 import type { V1ObjectMeta } from "@kubernetes/client-node";
 import { V1Namespace } from "@kubernetes/client-node";
 import { getk8sApi } from "../../../../../k8sApi";
 
-export default async function (context: Context) {
+export default async function (context: ComponentContext) {
   const namespace = getKubernetesNamespace(
     context.fullConfig,
     context.environment.shortName,

package/src/config/getProjectConfig.ts

@@ -3,7 +3,7 @@ import {
   readConfigSync,
   getAllEnvs,
   getEnvironment as _getEnvironment,
-  createContext,
+  createComponentContext,
   getSecretVarName,
 } from "@catladder/pipeline";
 
@@ -53,7 +53,7 @@ export const getPipelineContextByChoice = async (
   componentName: string,
 ) => {
   const config = await getProjectConfig();
-  return await createContext({
+  return await createComponentContext({
     config,
     componentName,
     env,

package/src/gcloud/cloudRun/openCloudRunDashboards.ts

@@ -1,17 +1,17 @@
-import type { Context } from "@catladder/pipeline";
+import type { ComponentContext } from "@catladder/pipeline";
 import { isOfDeployType } from "@catladder/pipeline";
 import type { CommandInstance } from "vorpal";
 import { openGoogleCloudDashboard } from "../openDashboard";
 
 export const openGoogleCloudRunDashboard = async (
   instance: CommandInstance,
-  context: Context,
+  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/gcloud/serviceAccounts.ts

@@ -1,4 +1,4 @@
-import type { Context } from "@catladder/pipeline";
+import type { ComponentContext } from "@catladder/pipeline";
 
 import { exec } from "child-process-promise";
 import { createHmac } from "crypto";
@@ -22,7 +22,7 @@ type ServiceAccount = {
   description: string;
 };
 const upsertGcloudServiceAccount = async (
-  context: Context,
+  context: ComponentContext,
   account: ServiceAccount,
 ): Promise<string> => {
   const { projectId, name, displayName, roles, description } = account;
@@ -76,7 +76,7 @@ const upsertGcloudServiceAccount = async (
 
 export const upsertGcloudServiceAccountAndSaveSecret = async (
   instance: CommandInstance,
-  context: Context,
+  context: ComponentContext,
   account: ServiceAccount,
   secretName: string,
 ): Promise<void> => {

package/src/kubernetes/openKubernetesDashboards.ts

@@ -1,13 +1,13 @@
-import type { Context } from "@catladder/pipeline";
+import type { ComponentContext } from "@catladder/pipeline";
 import { isOfDeployType } from "@catladder/pipeline";
 import type { CommandInstance } from "vorpal";
 import { openGoogleCloudDashboard } from "../gcloud/openDashboard";
 
 export const openGoogleCloudLogs = async (
   instance: CommandInstance,
-  context: Context,
+  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");
   }
@@ -31,9 +31,9 @@ export const openGoogleCloudLogs = async (
 
 export const openGoogleCloudKubernetesDashboard = async (
   instance: CommandInstance,
-  context: Context,
+  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");
   }