@catladder/cli 1.0.1 → 1.0.5

package/package.json

@@ -16,29 +16,22 @@
     "catladder": "./bin/catladder"
   },
   "dependencies": {
-    "@bitwarden/cli": "^1.8.0",
-    "@catladder/pipeline": "1.0.1",
+    "@catladder/pipeline": "1.0.5",
     "@kubernetes/client-node": "^0.16.1",
     "child-process-promise": "^2.2.1",
-    "clipboardy": "^2.2.0",
     "command-exists-promise": "^2.0.2",
     "common-tags": "^1.8.0",
     "dayjs": "^1.10.4",
     "fs-extra": "^7.0.1",
-    "git-repo-name": "^1.0.1",
     "gitlab": "^4.4.1",
     "js-yaml": "^3.12.0",
-    "lodash": "^4.17.11",
+    "lodash": "^4.17.21",
     "memoizee": "^0.4.14",
     "node-fetch": "^2.3.0",
     "open": "^8.4.0",
-    "open-editor": "^2.0.1",
-    "open-in-editor": "^2.2.0",
     "tmp-promise": "^2.0.2",
     "update-notifier": "^2.5.0",
-    "vorpal": "^1.12.0",
-    "yargs": "^13.2.4",
-    "yawn-yaml": "^1.3.4"
+    "vorpal": "^1.12.0"
   },
   "engines": {
     "node": ">=12.0.0"
@@ -60,5 +53,5 @@
     "eslint": "^8.7.0",
     "typescript": "^4.5.4"
   },
-  "version": "1.0.1"
+  "version": "1.0.5"
 }

package/src/apps/cli/cli.ts

@@ -1,5 +1,4 @@
 import Vorpal from "vorpal";
-import { config } from "yargs";
 // tslint:disable-next-line:no-var-requires
 import packageInfos from "../../packageInfos";
 import { stopAllPortForwards } from "../../utils/portForward";
@@ -8,7 +7,6 @@ import mongodb from "./commands/mongodb";
 import project from "./commands/project";
 import theStuffThatReallyMatters from "./commands/theStuffThatReallyMatters";
 
-import { getProjectConfig } from "../../config/getProjectConfig";
 import { verify } from "./verify";
 import { showProjectBanner } from "./commands/project/utils/showProjectBanner";
 

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

@@ -34,10 +34,14 @@ const resolveJson = (v: Record<string, Record<string, string>>) =>
       ];
     })
   );
-const getEnvVarsToEdit = async (env: string, componentName: string) => {
+const getEnvVarsToEdit = async (
+  instance: CommandInstance,
+  env: string,
+  componentName: string
+) => {
   const { secretEnvVarKeys } = await getEnvironment(env, componentName);
 
-  const allEnvVars = await getEnvVars(this, env, componentName);
+  const allEnvVars = await getEnvVars(instance, env, componentName);
   return Object.fromEntries(
     secretEnvVarKeys.map((key) => [key, allEnvVars[key]])
   );
@@ -51,7 +55,7 @@ const doItFor = async (
     await Promise.all(
       components.map(async (componentName) => [
         componentName,
-        await getEnvVarsToEdit(env, componentName),
+        await getEnvVarsToEdit(instance, env, componentName),
       ])
     )
   );
@@ -110,7 +114,7 @@ const doItFor = async (
 
   for (const componentName of components) {
     await upsertAllVariables(
-      this,
+      instance,
       valuesToEdit[componentName],
       env,
       componentName
@@ -126,7 +130,7 @@ const doItFor = async (
         context.componentConfig.deploy.values?.cloudsql?.enabled
       ) {
         await upsertAllVariables(
-          this,
+          instance,
           {
             cloudsqlProxyCredentials: await readPass(
               GOOGLE_CLOUD_SQL_PASS_PATH

package/src/apps/cli/verify/migration/fromv2.ts

@@ -15,7 +15,6 @@ import {
 import { isEmpty } from "lodash";
 import { join } from "path";
 import Vorpal from "vorpal";
-import { string } from "yargs";
 import {
   getGitlabCi,
   getGitlabCiFilePath,

package/dist/utils/dashboardToken.d.ts

@@ -1,2 +0,0 @@
-export declare const getToken: () => Promise<any>;
-export declare function printToken(): Promise<void>;

package/dist/utils/dashboardToken.js

@@ -1,89 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-exports.__esModule = true;
-exports.printToken = exports.getToken = void 0;
-var child_process_promise_1 = require("child-process-promise");
-var clipboardy_1 = __importDefault(require("clipboardy"));
-var getToken = function () { return __awaiter(void 0, void 0, void 0, function () {
-    var stdout;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0: return [4 /*yield*/, (0, child_process_promise_1.exec)("kubectl -n kube-system describe secret $(kubectl -n kube-system get secret | awk '/^deployment-controller-token-/{print $1}') | awk '$1==\"token:\"{print $2}'")];
-            case 1:
-                stdout = (_a.sent()).stdout;
-                return [2 /*return*/, stdout];
-        }
-    });
-}); };
-exports.getToken = getToken;
-function printToken() {
-    return __awaiter(this, void 0, void 0, function () {
-        var token;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, this.log("you will need to pass a token to the dashboard. We will copy it to your clipboard!")];
-                case 1:
-                    _a.sent();
-                    return [4 /*yield*/, (0, exports.getToken)()];
-                case 2:
-                    token = _a.sent();
-                    return [4 /*yield*/, this.log("")];
-                case 3:
-                    _a.sent();
-                    return [4 /*yield*/, this.log(token)];
-                case 4:
-                    _a.sent();
-                    return [4 /*yield*/, this.log("")];
-                case 5:
-                    _a.sent();
-                    return [4 /*yield*/, clipboardy_1["default"].write(token)];
-                case 6:
-                    _a.sent();
-                    return [4 /*yield*/, this.log("")];
-                case 7:
-                    _a.sent();
-                    return [2 /*return*/];
-            }
-        });
-    });
-}
-exports.printToken = printToken;
-//# sourceMappingURL=dashboardToken.js.map

package/dist/utils/dashboardToken.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"dashboardToken.js","sourceRoot":"","sources":["../../src/utils/dashboardToken.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+DAA6C;AAC7C,0DAAoC;AAC7B,IAAM,QAAQ,GAAG;;;;oBACH,qBAAM,IAAA,4BAAI,EAC3B,gKAA8J,CAC/J,EAAA;;gBAFO,MAAM,GAAK,CAAA,SAElB,CAAA,OAFa;gBAGd,sBAAO,MAAM,EAAC;;;KACf,CAAC;AALW,QAAA,QAAQ,YAKnB;AAEF,SAAsB,UAAU;;;;;wBAC9B,qBAAM,IAAI,CAAC,GAAG,CACZ,oFAAoF,CACrF,EAAA;;oBAFD,SAEC,CAAC;oBACY,qBAAM,IAAA,gBAAQ,GAAE,EAAA;;oBAAxB,KAAK,GAAG,SAAgB;oBAC9B,qBAAM,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,EAAA;;oBAAlB,SAAkB,CAAC;oBACnB,qBAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,EAAA;;oBAArB,SAAqB,CAAC;oBACtB,qBAAM,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,EAAA;;oBAAlB,SAAkB,CAAC;oBACnB,qBAAM,uBAAU,CAAC,KAAK,CAAC,KAAK,CAAC,EAAA;;oBAA7B,SAA6B,CAAC;oBAC9B,qBAAM,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,EAAA;;oBAAlB,SAAkB,CAAC;;;;;CACpB;AAVD,gCAUC"}

package/src/types/git-repo-name.d.ts

@@ -1 +0,0 @@
-declare module "git-repo-name";

package/src/types/yawn-yaml.d.ts

@@ -1 +0,0 @@
-declare module "yawn-yaml/cjs";

package/src/utils/dashboardToken.ts

@@ -1,20 +0,0 @@
-import { exec } from "child-process-promise";
-import clipboardy from "clipboardy";
-export const getToken = async () => {
-  const { stdout } = await exec(
-    `kubectl -n kube-system describe secret $(kubectl -n kube-system get secret | awk '/^deployment-controller-token-/{print $1}') | awk '$1=="token:"{print $2}'`
-  );
-  return stdout;
-};
-
-export async function printToken() {
-  await this.log(
-    "you will need to pass a token to the dashboard. We will copy it to your clipboard!"
-  );
-  const token = await getToken();
-  await this.log("");
-  await this.log(token);
-  await this.log("");
-  await clipboardy.write(token);
-  await this.log("");
-}