@catladder/cli 1.47.0 → 1.48.0

package/package.json

@@ -24,7 +24,7 @@
     "node": ">=12.0.0"
   },
   "devDependencies": {
-    "@catladder/pipeline": "1.47.0",
+    "@catladder/pipeline": "1.48.0",
     "@kubernetes/client-node": "^0.16.2",
     "@tsconfig/node14": "^1.0.1",
     "@types/common-tags": "^1.8.0",
@@ -58,5 +58,5 @@
     "update-notifier": "^5",
     "vorpal": "^1.12.0"
   },
-  "version": "1.47.0"
+  "version": "1.48.0"
 }

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

@@ -1,48 +1,28 @@
+import { isOfDeployType } from "@catladder/pipeline";
 import type Vorpal from "vorpal";
 import {
   getPipelineContextByChoice,
   parseChoice,
 } from "../../../../config/getProjectConfig";
-import { getGoogleAuthUserNumber } from "../../utils/getGoogleAuthUserNumber";
-import { openGoogleCloudKubernetesDashboard } from "../shared";
+import { openGoogleCloudRunDashboard } from "../../../../gcloud/cloudRun/openCloudRunDashboards";
+import { openGoogleCloudKubernetesDashboard } from "../../../../kubernetes/openKubernetesDashboards";
+
 import { envAndComponents } from "./utils/autocompletions";
+
 export default async (vorpal: Vorpal) =>
   vorpal
     .command(
       "project-open-dashboard <envComponent>",
-      "open kubernetes dashboard on google"
+      "open an apps dashboard (kubernetes or cloudrun)"
     )
     .autocomplete(await envAndComponents())
     .action(async function ({ envComponent }) {
       const { env, componentName } = parseChoice(envComponent);
-      const { componentConfig, environment } = await getPipelineContextByChoice(
-        env,
-        componentName
-      );
-
-      if (
-        !componentConfig.deploy ||
-        componentConfig.deploy.type !== "kubernetes"
-      ) {
-        throw new Error(
-          "only kubernetes deployments are supported at the moment"
-        );
+      const context = await getPipelineContextByChoice(env, componentName);
+      if (isOfDeployType(context.componentConfig.deploy, "kubernetes")) {
+        await openGoogleCloudKubernetesDashboard(this, context);
       }
-
-      if (
-        !componentConfig.deploy.cluster ||
-        componentConfig.deploy.cluster.type !== "gcloud"
-      ) {
-        throw new Error("no gcloud custer configured");
+      if (isOfDeployType(context.componentConfig.deploy, "google-cloudrun")) {
+        await openGoogleCloudRunDashboard(this, context);
       }
-      // currently only supports kubernetes
-      const namespace = environment.envVars.KUBE_NAMESPACE;
-
-      const authGoogleNumber = await getGoogleAuthUserNumber.call(this, vorpal);
-
-      openGoogleCloudKubernetesDashboard(
-        componentConfig.deploy.cluster,
-        namespace,
-        authGoogleNumber
-      );
     });

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

@@ -3,12 +3,8 @@ import {
   getPipelineContextByChoice,
   parseChoice,
 } from "../../../../config/getProjectConfig";
-import { getCurrentConnectedClusterName } from "../../../../utils/cluster";
-import { getProjectNamespace } from "../../../../utils/projects";
-import { getGoogleAuthUserNumber } from "../../utils/getGoogleAuthUserNumber";
-import { openGoogleCloudLogs } from "../shared";
+import { openGoogleCloudLogs } from "../../../../kubernetes/openKubernetesDashboards";
 import { envAndComponents } from "./utils/autocompletions";
-import ensureCluster from "./utils/ensureCluster";
 
 export default async (vorpal: Vorpal) =>
   vorpal
@@ -19,34 +15,7 @@ export default async (vorpal: Vorpal) =>
     .autocomplete(await envAndComponents())
     .action(async function ({ envComponent }) {
       const { env, componentName } = parseChoice(envComponent);
-      const { componentConfig, environment } = await getPipelineContextByChoice(
-        env,
-        componentName
-      );
+      const context = await getPipelineContextByChoice(env, componentName);
 
-      if (
-        !componentConfig.deploy ||
-        componentConfig.deploy.type !== "kubernetes"
-      ) {
-        throw new Error(
-          "only kubernetes deployments are supported at the moment"
-        );
-      }
-
-      if (
-        !componentConfig.deploy.cluster ||
-        componentConfig.deploy.cluster.type !== "gcloud"
-      ) {
-        throw new Error("no gcloud custer configured");
-      }
-      // currently only supports kubernetes
-      const namespace = environment.envVars.KUBE_NAMESPACE;
-
-      const authGoogleNumber = await getGoogleAuthUserNumber.call(this, vorpal);
-
-      await openGoogleCloudLogs(
-        componentConfig.deploy.cluster,
-        namespace,
-        authGoogleNumber
-      );
+      await openGoogleCloudLogs(this, context);
     });

package/src/gcloud/cloudRun/getCloudRunDomainSuffix.ts

@@ -17,7 +17,7 @@ export const getCloudRunDomainSuffix = async (config: DeployConfigCloudRun) => {
   
   */
 
-  const dummyServiceName = "cl-dummy-service";
+  const dummyServiceName = "cl-dummy-service-delete-me";
 
   const existingServices = await exec(
     `gcloud run services list --format=json  --project="${config.projectId}"  --region=${config.region} --limit=1`
@@ -30,5 +30,6 @@ export const getCloudRunDomainSuffix = async (config: DeployConfigCloudRun) => {
   const result = await exec(
     `gcloud run deploy ${dummyServiceName} --region=${config.region} --allow-unauthenticated --project ${config.projectId} --image=us-docker.pkg.dev/cloudrun/container/hello --format=json`
   ).then((r) => JSON.parse(r.stdout));
+
   return await getSuffixFromService(result);
 };

package/src/gcloud/cloudRun/openCloudRunDashboards.ts

@@ -0,0 +1,22 @@
+import type { Context } 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
+) => {
+  if (!isOfDeployType(context.componentConfig.deploy, "google-cloudrun")) {
+    throw new Error("deploy type is not google-cloudrun ");
+  }
+  const { fullName } = context.environment;
+  const { region, projectId } = context.componentConfig.deploy;
+  await openGoogleCloudDashboard(
+    instance,
+    `run/detail/${region}/${fullName}/metrics`,
+    {
+      project: projectId,
+    }
+  );
+};

package/src/gcloud/openDashboard.ts

@@ -0,0 +1,19 @@
+import type { CommandInstance } from "vorpal";
+import { getGoogleAuthUserNumber } from "../apps/cli/utils/getGoogleAuthUserNumber";
+import open from "open";
+export const openGoogleCloudDashboard = async (
+  instance: CommandInstance,
+  path: string,
+  params: Record<string, string>
+) => {
+  const url = new URL("https://console.cloud.google.com/");
+  url.pathname = path;
+  for (const [key, value] of Object.entries(params)) {
+    url.searchParams.set(key, value);
+  }
+
+  const googleAuthUserNumber = await getGoogleAuthUserNumber.call(instance);
+  url.searchParams.set("authuser", googleAuthUserNumber);
+
+  open(url.toString());
+};

package/src/kubernetes/openKubernetesDashboards.ts

@@ -0,0 +1,52 @@
+import type { Context } 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
+) => {
+  const deployConfig = context.componentConfig.deploy;
+  if (!isOfDeployType(deployConfig, "kubernetes")) {
+    throw new Error("context is not of type kubernetes");
+  }
+
+  if (!deployConfig.cluster || deployConfig.cluster.type !== "gcloud") {
+    throw new Error("no gcloud custer configured");
+  }
+
+  const namespace = context.environment.envVars.KUBE_NAMESPACE;
+  const cluster = deployConfig.cluster;
+
+  const resource = `k8s_container/cluster_name/${cluster.name}${
+    namespace ? `/namespace_name/${namespace}` : ""
+  }`;
+
+  await openGoogleCloudDashboard(instance, "logs/viewer", {
+    project: cluster.projectId,
+    resource: resource,
+  });
+};
+
+export const openGoogleCloudKubernetesDashboard = async (
+  instance: CommandInstance,
+  context: Context
+) => {
+  const deployConfig = context.componentConfig.deploy;
+  if (!isOfDeployType(deployConfig, "kubernetes")) {
+    throw new Error("context is not of type kubernetes");
+  }
+
+  if (!deployConfig.cluster || deployConfig.cluster.type !== "gcloud") {
+    throw new Error("no gcloud custer configured");
+  }
+  const namespace = context.environment.envVars.KUBE_NAMESPACE;
+  const cluster = deployConfig.cluster;
+  const pageState = `("savedViews":("c":["gke/${cluster.region}/${cluster.name}"],"n":["${namespace}"],"i":"4e42e0b9cd6147f8a4fba7516752ec48"))`;
+
+  await openGoogleCloudDashboard(instance, "kubernetes/workload", {
+    project: cluster.projectId,
+    pageState: pageState,
+  });
+};

package/dist/apps/cli/commands/shared/index.d.ts

@@ -1,3 +0,0 @@
-import type { DeployConfigKubernetesCluster } from "@catladder/pipeline";
-export declare const openGoogleCloudLogs: (cluster?: DeployConfigKubernetesCluster, namespace?: string, googleAuthUserNumber?: number) => Promise<void>;
-export declare const openGoogleCloudKubernetesDashboard: (cluster: DeployConfigKubernetesCluster, namespace: string, googleAuthUserNumber?: number) => Promise<void>;

package/dist/apps/cli/commands/shared/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/shared/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,8CAAwB;AAEjB,IAAM,mBAAmB,GAAG,UACjC,OAAuC,EACvC,SAAkB,EAClB,oBAAwB;IAAxB,qCAAA,EAAA,wBAAwB;;;;YAElB,QAAQ,GAAG,qCAA8B,OAAO,CAAC,IAAI,SACzD,SAAS,CAAC,CAAC,CAAC,0BAAmB,SAAS,CAAE,CAAC,CAAC,CAAC,EAAE,CAC/C,CAAC;YAEG,GAAG,GAAG,+DACV,OAAO,CAAC,SAAS,SAEjB,QAAQ,CAAC,CAAC,CAAC,oBAAa,kBAAkB,CAAC,QAAQ,CAAC,CAAE,CAAC,CAAC,CAAC,EAAE,uBAChD,oBAAoB,CAAE,CAAC;YACpC,IAAA,iBAAI,EAAC,GAAG,CAAC,CAAC;;;;CACX,CAAC;AAfW,QAAA,mBAAmB,uBAe9B;AAEK,IAAM,kCAAkC,GAAG,UAChD,OAAsC,EACtC,SAAiB,EACjB,oBAAwB;IAAxB,qCAAA,EAAA,wBAAwB;;;;YAElB,SAAS,GAAG,wCAA4B,OAAO,CAAC,MAAM,cAAI,OAAO,CAAC,IAAI,0BAAY,SAAS,qDAA6C,CAAC;YACzI,GAAG,GAAG,wEAAiE,oBAAoB,sBAC/F,OAAO,CAAC,SAAS,wBACL,kBAAkB,CAAC,SAAS,CAAC,CAAE,CAAC;YAE9C,IAAA,iBAAI,EAAC,GAAG,CAAC,CAAC;;;;CACX,CAAC;AAXW,QAAA,kCAAkC,sCAW7C"}

package/src/apps/cli/commands/shared/index.ts

@@ -1,32 +0,0 @@
-import type { DeployConfigKubernetesCluster } from "@catladder/pipeline";
-import open from "open";
-
-export const openGoogleCloudLogs = async (
-  cluster?: DeployConfigKubernetesCluster,
-  namespace?: string,
-  googleAuthUserNumber = 0
-) => {
-  const resource = `k8s_container/cluster_name/${cluster.name}${
-    namespace ? `/namespace_name/${namespace}` : ""
-  }`;
-
-  const url = `https://console.cloud.google.com/logs/viewer?project=${
-    cluster.projectId
-  }${
-    resource ? `&resource=${encodeURIComponent(resource)}` : ""
-  }&authuser=${googleAuthUserNumber}`;
-  open(url);
-};
-
-export const openGoogleCloudKubernetesDashboard = async (
-  cluster: DeployConfigKubernetesCluster,
-  namespace: string,
-  googleAuthUserNumber = 0
-) => {
-  const pageState = `("savedViews":("c":["gke/${cluster.region}/${cluster.name}"],"n":["${namespace}"],"i":"4e42e0b9cd6147f8a4fba7516752ec48"))`;
-  const url = `https://console.cloud.google.com/kubernetes/workload?authuser=${googleAuthUserNumber}&project=${
-    cluster.projectId
-  }&pageState=${encodeURIComponent(pageState)}`;
-
-  open(url);
-};