@catladder/cli 2.0.3 → 2.0.5

package/package.json

@@ -53,7 +53,7 @@
     }
   ],
   "license": "MIT",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "scripts": {
     "lint": "eslint \"src/**/*.ts\"",
     "lint:fix": "eslint \"src/**/*.ts\" --fix",

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

@@ -12,8 +12,7 @@ import commandSetup from "./commandSetup";
 import commandRenewToken from "./commandRenewToken";
 import commandListPods from "./commandListPods";
 import commandNamespace from "./commandNamespace";
-import commandOpenCostDashboard from "./commandOpenCostDashboard";
-import commandOpenDashboard from "./commandOpenDashboard";
+
 import commandOpenEnv from "./commandOpenEnv";
 import commandOpenGit from "./commandOpenGit";
 import commandOpenLogs from "./commandOpenLogs";
@@ -35,12 +34,8 @@ export default async (vorpal: Vorpal) => {
   commandPauseProject(vorpal);
   commandDeleteProject(vorpal);
 
-  commandOpenDashboard(vorpal);
-
   commandOpenLogs(vorpal);
 
-  commandOpenCostDashboard(vorpal);
-
   commandCloudSqlProxy(vorpal);
   commandProjectRestoreDb(vorpal);
   commandOpenGit(vorpal);

package/dist/cli/src/apps/cli/commands/project/commandMigrateHelm3.d.ts

@@ -1,7 +0,0 @@
-import type Vorpal from "vorpal";
-/**
- * Error: rendered manifests contain a resource that already exists.
- * Unable to continue with install: ConfigMap "web-app-env" in namespace "pvl-bike2school-dev" exists and cannot be imported into the current release: invalid ownership metadata; label validation error: missing key "app.kubernetes.io/managed-by": must be set to "Helm"; annotation validation error: missing key "meta.helm.sh/release-name": must be set to "pvl-bike2school-dev-web"; annotation validation error: missing key "meta.helm.sh/release-namespace": must be set to "pvl-bike2school-dev"
- */
-declare const _default: (vorpal: Vorpal) => Promise<Vorpal.Command>;
-export default _default;

package/dist/cli/src/apps/cli/commands/project/commandMigrateHelm3.js

@@ -1,46 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const child_process_promise_1 = require("child-process-promise");
-const getProjectConfig_1 = require("../../../../config/getProjectConfig");
-const log_1 = require("../../../../utils/log");
-const autocompletions_1 = require("./utils/autocompletions");
-/**
- * Error: rendered manifests contain a resource that already exists.
- * Unable to continue with install: ConfigMap "web-app-env" in namespace "pvl-bike2school-dev" exists and cannot be imported into the current release: invalid ownership metadata; label validation error: missing key "app.kubernetes.io/managed-by": must be set to "Helm"; annotation validation error: missing key "meta.helm.sh/release-name": must be set to "pvl-bike2school-dev-web"; annotation validation error: missing key "meta.helm.sh/release-namespace": must be set to "pvl-bike2school-dev"
- */
-exports.default = async (vorpal) => vorpal
-    .command("project-migrate-helm3 <envComponent>", "Do manual step for helm2 to helm3 migration")
-    .autocomplete((await (0, autocompletions_1.envAndComponents)()).filter((e) => !e.startsWith("local") && !e.startsWith("review")))
-    .action(async function ({ envComponent }) {
-    try {
-        const { env, componentName } = (0, getProjectConfig_1.parseChoice)(envComponent);
-        const result = await (0, child_process_promise_1.exec)("helm version --short");
-        const version = result.stdout;
-        this.log(`your helm version: ${version}`);
-        if (!version.startsWith("v3")) {
-            throw new Error("no helm3");
-        }
-        try {
-            await (0, child_process_promise_1.exec)("helm plugin install https://github.com/helm/helm-2to3.git");
-            this.log("successfully installed plugin https://github.com/helm/helm-2to3.git");
-        }
-        catch (e) {
-            // ignore
-        }
-        // we use the app full name as the release name
-        const releaseName = (await (0, getProjectConfig_1.getEnvironment)(env, componentName)).fullName;
-        this.log(`helm release name: ${releaseName}`);
-        this.log("");
-        this.log("migrating now... 😼. This may take a moment");
-        this.log("");
-        const r = await (0, child_process_promise_1.exec)(`helm 2to3 convert --delete-v2-releases ${releaseName}`);
-        this.log(r);
-    }
-    catch (e) {
-        (0, log_1.logError)(this, e.message);
-        this.log("make sure that you have installed latest helm3 locally");
-        this.log("(e.g. brew upgrade helm)");
-        this.log("");
-    }
-});
-//# sourceMappingURL=commandMigrateHelm3.js.map

package/dist/cli/src/apps/cli/commands/project/commandMigrateHelm3.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"commandMigrateHelm3.js","sourceRoot":"","sources":["../../../../../../../src/apps/cli/commands/project/commandMigrateHelm3.ts"],"names":[],"mappings":";;AAAA,iEAA6C;AAE7C,0EAG6C;AAC7C,+CAAiD;AAEjD,6DAA2D;AAE3D;;;GAGG;AACH,kBAAe,KAAK,EAAE,MAAc,EAAE,EAAE,CACtC,MAAM;KACH,OAAO,CACN,sCAAsC,EACtC,6CAA6C,CAC9C;KACA,YAAY,CACX,CAAC,MAAM,IAAA,kCAAgB,GAAE,CAAC,CAAC,MAAM,CAC/B,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,CACzD,CACF;KACA,MAAM,CAAC,KAAK,WAAW,EAAE,YAAY,EAAE;IACtC,IAAI,CAAC;QACH,MAAM,EAAE,GAAG,EAAE,aAAa,EAAE,GAAG,IAAA,8BAAW,EAAC,YAAY,CAAC,CAAC;QACzD,MAAM,MAAM,GAAG,MAAM,IAAA,4BAAI,EAAC,sBAAsB,CAAC,CAAC;QAClD,MAAM,OAAO,GAAG,MAAM,CAAC,MAAgB,CAAC;QACxC,IAAI,CAAC,GAAG,CAAC,sBAAsB,OAAO,EAAE,CAAC,CAAC;QAC1C,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;YAC9B,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,CAAC;QAC9B,CAAC;QACD,IAAI,CAAC;YACH,MAAM,IAAA,4BAAI,EACR,2DAA2D,CAC5D,CAAC;YACF,IAAI,CAAC,GAAG,CACN,qEAAqE,CACtE,CAAC;QACJ,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,SAAS;QACX,CAAC;QAED,+CAA+C;QAC/C,MAAM,WAAW,GAAG,CAAC,MAAM,IAAA,iCAAc,EAAC,GAAG,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC;QAExE,IAAI,CAAC,GAAG,CAAC,sBAAsB,WAAW,EAAE,CAAC,CAAC;QAC9C,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACb,IAAI,CAAC,GAAG,CAAC,6CAA6C,CAAC,CAAC;QACxD,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACb,MAAM,CAAC,GAAG,MAAM,IAAA,4BAAI,EAClB,0CAA0C,WAAW,EAAE,CACxD,CAAC;QACF,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACd,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,IAAA,cAAQ,EAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;QAC1B,IAAI,CAAC,GAAG,CAAC,wDAAwD,CAAC,CAAC;QACnE,IAAI,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;QACrC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACf,CAAC;AACH,CAAC,CAAC,CAAC"}

package/dist/cli/src/apps/cli/commands/project/commandOpenCostDashboard.d.ts

@@ -1,3 +0,0 @@
-import type Vorpal from "vorpal";
-declare const _default: (vorpal: Vorpal) => Promise<Vorpal.Command>;
-export default _default;

package/dist/cli/src/apps/cli/commands/project/commandOpenCostDashboard.js

@@ -1,22 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const open_1 = __importDefault(require("open"));
-const constants_1 = require("../../../../config/constants");
-const portForward_1 = require("../../../../kubernetes/portForward");
-const projects_1 = require("../../../../utils/projects");
-const autocompletions_1 = require("./utils/autocompletions");
-const ensureCluster_1 = __importDefault(require("./utils/ensureCluster"));
-exports.default = async (vorpal) => vorpal
-    .command("project-check-costs <envComponent>", "Shows you how much you're spending")
-    .autocomplete(await (0, autocompletions_1.envAndComponents)())
-    .action(async function ({ envComponent }) {
-    await ensureCluster_1.default.call(this, envComponent);
-    const namespace = await (0, projects_1.getProjectNamespace)(envComponent);
-    const url = `http://localhost:${constants_1.GRAFANA_PROXY_LOCAL_PORT}/namespace.html?name=${namespace}`;
-    await (0, portForward_1.startKubePortForward)("deployment/kubecost-cost-analyzer", constants_1.GRAFANA_PROXY_LOCAL_PORT, constants_1.GRAFANA_PROXY_TARGET_PORT, "kubecost");
-    (0, open_1.default)(url);
-});
-//# sourceMappingURL=commandOpenCostDashboard.js.map

package/dist/cli/src/apps/cli/commands/project/commandOpenCostDashboard.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"commandOpenCostDashboard.js","sourceRoot":"","sources":["../../../../../../../src/apps/cli/commands/project/commandOpenCostDashboard.ts"],"names":[],"mappings":";;;;;AAAA,gDAAwB;AAExB,4DAGsC;AAEtC,oEAA0E;AAE1E,yDAAiE;AAEjE,6DAA2D;AAC3D,0EAAkD;AAClD,kBAAe,KAAK,EAAE,MAAc,EAAE,EAAE,CACtC,MAAM;KACH,OAAO,CACN,oCAAoC,EACpC,oCAAoC,CACrC;KACA,YAAY,CAAC,MAAM,IAAA,kCAAgB,GAAE,CAAC;KACtC,MAAM,CAAC,KAAK,WAAW,EAAE,YAAY,EAAE;IACtC,MAAM,uBAAa,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;IAC7C,MAAM,SAAS,GAAG,MAAM,IAAA,8BAAmB,EAAC,YAAY,CAAC,CAAC;IAC1D,MAAM,GAAG,GAAG,oBAAoB,oCAAwB,wBAAwB,SAAS,EAAE,CAAC;IAC5F,MAAM,IAAA,kCAAoB,EACxB,mCAAmC,EACnC,oCAAwB,EACxB,qCAAyB,EACzB,UAAU,CACX,CAAC;IACF,IAAA,cAAI,EAAC,GAAG,CAAC,CAAC;AACZ,CAAC,CAAC,CAAC"}

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

@@ -1,3 +0,0 @@
-import type Vorpal from "vorpal";
-declare const _default: (vorpal: Vorpal) => Promise<Vorpal.Command>;
-export default _default;

package/dist/cli/src/apps/cli/commands/project/commandOpenDashboard.js

@@ -1,22 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const pipeline_1 = require("../../../../../../pipeline/src/index.js");
-const getProjectConfig_1 = require("../../../../config/getProjectConfig");
-const openCloudRunDashboards_1 = require("../../../../gcloud/cloudRun/openCloudRunDashboards");
-const openKubernetesDashboards_1 = require("../../../../kubernetes/openKubernetesDashboards");
-const autocompletions_1 = require("./utils/autocompletions");
-exports.default = async (vorpal) => vorpal
-    .command("project-open-dashboard <envComponent>", "open an apps dashboard (kubernetes or cloudrun)")
-    .autocomplete(await (0, autocompletions_1.envAndComponents)())
-    .action(async function ({ envComponent }) {
-    var _a, _b;
-    const { env, componentName } = (0, getProjectConfig_1.parseChoice)(envComponent);
-    const context = await (0, getProjectConfig_1.getPipelineContextByChoice)(env, componentName);
-    if ((0, pipeline_1.isOfDeployType)((_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config, "kubernetes")) {
-        await (0, openKubernetesDashboards_1.openGoogleCloudKubernetesDashboard)(this, context);
-    }
-    if ((0, pipeline_1.isOfDeployType)((_b = context.deploy) === null || _b === void 0 ? void 0 : _b.config, "google-cloudrun")) {
-        await (0, openCloudRunDashboards_1.openGoogleCloudRunDashboard)(this, context);
-    }
-});
-//# sourceMappingURL=commandOpenDashboard.js.map

package/dist/cli/src/apps/cli/commands/project/commandOpenDashboard.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"commandOpenDashboard.js","sourceRoot":"","sources":["../../../../../../../src/apps/cli/commands/project/commandOpenDashboard.ts"],"names":[],"mappings":";;AAAA,kDAAqD;AAErD,0EAG6C;AAC7C,+FAAiG;AACjG,8FAAqG;AAErG,6DAA2D;AAE3D,kBAAe,KAAK,EAAE,MAAc,EAAE,EAAE,CACtC,MAAM;KACH,OAAO,CACN,uCAAuC,EACvC,iDAAiD,CAClD;KACA,YAAY,CAAC,MAAM,IAAA,kCAAgB,GAAE,CAAC;KACtC,MAAM,CAAC,KAAK,WAAW,EAAE,YAAY,EAAE;;IACtC,MAAM,EAAE,GAAG,EAAE,aAAa,EAAE,GAAG,IAAA,8BAAW,EAAC,YAAY,CAAC,CAAC;IACzD,MAAM,OAAO,GAAG,MAAM,IAAA,6CAA0B,EAAC,GAAG,EAAE,aAAa,CAAC,CAAC;IACrE,IAAI,IAAA,yBAAc,EAAC,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,EAAE,YAAY,CAAC,EAAE,CAAC;QACzD,MAAM,IAAA,6DAAkC,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC1D,CAAC;IACD,IAAI,IAAA,yBAAc,EAAC,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,EAAE,iBAAiB,CAAC,EAAE,CAAC;QAC9D,MAAM,IAAA,oDAA2B,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACnD,CAAC;AACH,CAAC,CAAC,CAAC"}

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

@@ -1,63 +0,0 @@
-import { exec } from "child-process-promise";
-import type Vorpal from "vorpal";
-import {
-  getEnvironment,
-  parseChoice,
-} from "../../../../config/getProjectConfig";
-import { logError } from "../../../../utils/log";
-
-import { envAndComponents } from "./utils/autocompletions";
-
-/**
- * Error: rendered manifests contain a resource that already exists.
- * Unable to continue with install: ConfigMap "web-app-env" in namespace "pvl-bike2school-dev" exists and cannot be imported into the current release: invalid ownership metadata; label validation error: missing key "app.kubernetes.io/managed-by": must be set to "Helm"; annotation validation error: missing key "meta.helm.sh/release-name": must be set to "pvl-bike2school-dev-web"; annotation validation error: missing key "meta.helm.sh/release-namespace": must be set to "pvl-bike2school-dev"
- */
-export default async (vorpal: Vorpal) =>
-  vorpal
-    .command(
-      "project-migrate-helm3 <envComponent>",
-      "Do manual step for helm2 to helm3 migration",
-    )
-    .autocomplete(
-      (await envAndComponents()).filter(
-        (e) => !e.startsWith("local") && !e.startsWith("review"),
-      ),
-    )
-    .action(async function ({ envComponent }) {
-      try {
-        const { env, componentName } = parseChoice(envComponent);
-        const result = await exec("helm version --short");
-        const version = result.stdout as string;
-        this.log(`your helm version: ${version}`);
-        if (!version.startsWith("v3")) {
-          throw new Error("no helm3");
-        }
-        try {
-          await exec(
-            "helm plugin install https://github.com/helm/helm-2to3.git",
-          );
-          this.log(
-            "successfully installed plugin https://github.com/helm/helm-2to3.git",
-          );
-        } catch (e) {
-          // ignore
-        }
-
-        // we use the app full name as the release name
-        const releaseName = (await getEnvironment(env, componentName)).fullName;
-
-        this.log(`helm release name: ${releaseName}`);
-        this.log("");
-        this.log("migrating now... 😼. This may take a moment");
-        this.log("");
-        const r = await exec(
-          `helm 2to3 convert --delete-v2-releases ${releaseName}`,
-        );
-        this.log(r);
-      } catch (e) {
-        logError(this, e.message);
-        this.log("make sure that you have installed latest helm3 locally");
-        this.log("(e.g. brew upgrade helm)");
-        this.log("");
-      }
-    });

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

@@ -1,32 +0,0 @@
-import open from "open";
-import type Vorpal from "vorpal";
-import {
-  GRAFANA_PROXY_LOCAL_PORT,
-  GRAFANA_PROXY_TARGET_PORT,
-} from "../../../../config/constants";
-
-import { startKubePortForward } from "../../../../kubernetes/portForward";
-
-import { getProjectNamespace } from "../../../../utils/projects";
-
-import { envAndComponents } from "./utils/autocompletions";
-import ensureCluster from "./utils/ensureCluster";
-export default async (vorpal: Vorpal) =>
-  vorpal
-    .command(
-      "project-check-costs <envComponent>",
-      "Shows you how much you're spending",
-    )
-    .autocomplete(await envAndComponents())
-    .action(async function ({ envComponent }) {
-      await ensureCluster.call(this, envComponent);
-      const namespace = await getProjectNamespace(envComponent);
-      const url = `http://localhost:${GRAFANA_PROXY_LOCAL_PORT}/namespace.html?name=${namespace}`;
-      await startKubePortForward(
-        "deployment/kubecost-cost-analyzer",
-        GRAFANA_PROXY_LOCAL_PORT,
-        GRAFANA_PROXY_TARGET_PORT,
-        "kubecost",
-      );
-      open(url);
-    });

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

@@ -1,28 +0,0 @@
-import { isOfDeployType } from "@catladder/pipeline";
-import type Vorpal from "vorpal";
-import {
-  getPipelineContextByChoice,
-  parseChoice,
-} from "../../../../config/getProjectConfig";
-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 an apps dashboard (kubernetes or cloudrun)",
-    )
-    .autocomplete(await envAndComponents())
-    .action(async function ({ envComponent }) {
-      const { env, componentName } = parseChoice(envComponent);
-      const context = await getPipelineContextByChoice(env, componentName);
-      if (isOfDeployType(context.deploy?.config, "kubernetes")) {
-        await openGoogleCloudKubernetesDashboard(this, context);
-      }
-      if (isOfDeployType(context.deploy?.config, "google-cloudrun")) {
-        await openGoogleCloudRunDashboard(this, context);
-      }
-    });