@catladder/cli 1.1.2 → 1.2.0

package/dist/utils/cluster.d.ts

@@ -1,12 +1,3 @@
-export declare const getCurrentContext: () => Promise<any>;
+export declare const getCurrentContext: () => Promise<string>;
 export declare const getCurrentConnectedClusterName: () => Promise<string>;
-export declare const getClusterByFullName: (fullName: string) => {
-    name: string;
-    cluster: import("../config/clusters").Cluster;
-};
-export declare const getClusterByName: (name: string) => import("../config/clusters").Cluster;
-export declare const getAllClusters: () => {
-    [clustername: string]: import("../config/clusters").Cluster;
-};
-export declare const getAllClusterNames: () => string[];
-export declare const connectToCluster: (clusterName: string) => Promise<void>;
+export declare const connectToCluster: (fullname: string) => Promise<void>;

package/dist/utils/cluster.js

@@ -1,4 +1,8 @@
 "use strict";
+var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cooked, raw) {
+    if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; }
+    return cooked;
+};
 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) {
@@ -35,66 +39,37 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         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.connectToCluster = exports.getAllClusterNames = exports.getAllClusters = exports.getClusterByName = exports.getClusterByFullName = exports.getCurrentConnectedClusterName = exports.getCurrentContext = void 0;
-var child_process_promise_1 = require("child-process-promise");
-var lodash_1 = require("lodash");
-var clusters_1 = __importDefault(require("../config/clusters"));
+exports.connectToCluster = exports.getCurrentConnectedClusterName = exports.getCurrentContext = void 0;
+var zx_1 = require("zx");
+var k8sApi_1 = require("../k8sApi");
 var getCurrentContext = function () { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
     switch (_a.label) {
-        case 0: return [4 /*yield*/, (0, child_process_promise_1.exec)("kubectl config current-context")];
+        case 0: return [4 /*yield*/, (0, zx_1.$)(templateObject_1 || (templateObject_1 = __makeTemplateObject(["kubectl config current-context"], ["kubectl config current-context"])))];
         case 1: return [2 /*return*/, (_a.sent()).stdout.trim()];
     }
 }); }); };
 exports.getCurrentContext = getCurrentContext;
 var getCurrentConnectedClusterName = function () { return __awaiter(void 0, void 0, void 0, function () {
-    var currentContext;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0: return [4 /*yield*/, (0, exports.getCurrentContext)()];
-            case 1:
-                currentContext = _a.sent();
-                return [2 /*return*/, (0, lodash_1.findKey)(clusters_1["default"], { fullName: currentContext })];
+            case 1: return [2 /*return*/, _a.sent()];
         }
     });
 }); };
 exports.getCurrentConnectedClusterName = getCurrentConnectedClusterName;
-var getClusterByFullName = function (fullName) {
-    var found = Object.entries((0, exports.getAllClusters)()).find(function (_a) {
-        var config = _a[1];
-        return config.fullName === fullName;
-    });
-    if (found) {
-        return { name: found[0], cluster: found[1] };
-    }
-    else {
-        return null;
-    }
-};
-exports.getClusterByFullName = getClusterByFullName;
-var getClusterByName = function (name) { return (0, exports.getAllClusters)()[name]; };
-exports.getClusterByName = getClusterByName;
-var getAllClusters = function () {
-    return clusters_1["default"];
-};
-exports.getAllClusters = getAllClusters;
-var getAllClusterNames = function () { return Object.keys(clusters_1["default"]); };
-exports.getAllClusterNames = getAllClusterNames;
-var connectToCluster = function (clusterName) { return __awaiter(void 0, void 0, void 0, function () {
-    var connect;
+var connectToCluster = function (fullname) { return __awaiter(void 0, void 0, void 0, function () {
     return __generator(this, function (_a) {
         switch (_a.label) {
-            case 0:
-                connect = (0, exports.getClusterByName)(clusterName).connect;
-                return [4 /*yield*/, connect()];
+            case 0: return [4 /*yield*/, (0, zx_1.$)(templateObject_2 || (templateObject_2 = __makeTemplateObject(["kubectl config use-context ", ""], ["kubectl config use-context ", ""])), fullname)];
             case 1:
                 _a.sent();
+                (0, k8sApi_1.reload)();
                 return [2 /*return*/];
         }
     });
 }); };
 exports.connectToCluster = connectToCluster;
+var templateObject_1, templateObject_2;
 //# sourceMappingURL=cluster.js.map

package/dist/utils/cluster.js.map

@@ -1 +1 @@
-{"version":3,"file":"cluster.js","sourceRoot":"","sources":["../../src/utils/cluster.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+DAA6C;AAC7C,iCAAiC;AACjC,gEAA0C;AACnC,IAAM,iBAAiB,GAAG;;gBAC9B,qBAAM,IAAA,4BAAI,EAAC,gCAAgC,CAAC,EAAA;gBAA7C,sBAAA,CAAC,SAA4C,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,EAAA;;SAAA,CAAC;AADlD,QAAA,iBAAiB,qBACiC;AAExD,IAAM,8BAA8B,GAAG;;;;oBACrB,qBAAM,IAAA,yBAAiB,GAAE,EAAA;;gBAA1C,cAAc,GAAG,SAAyB;gBAChD,sBAAO,IAAA,gBAAO,EAAC,qBAAQ,EAAE,EAAE,QAAQ,EAAE,cAAc,EAAE,CAAC,EAAC;;;KACxD,CAAC;AAHW,QAAA,8BAA8B,kCAGzC;AAEK,IAAM,oBAAoB,GAAG,UAAC,QAAgB;IACnD,IAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,IAAA,sBAAc,GAAE,CAAC,CAAC,IAAI,CACjD,UAAC,EAAU;YAAP,MAAM,QAAA;QAAM,OAAA,MAAM,CAAC,QAAQ,KAAK,QAAQ;IAA5B,CAA4B,CAC7C,CAAC;IACF,IAAI,KAAK,EAAE;QACT,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;KAC9C;SAAM;QACL,OAAO,IAAI,CAAC;KACb;AACH,CAAC,CAAC;AATW,QAAA,oBAAoB,wBAS/B;AAEK,IAAM,gBAAgB,GAAG,UAAC,IAAY,IAAK,OAAA,IAAA,sBAAc,GAAE,CAAC,IAAI,CAAC,EAAtB,CAAsB,CAAC;AAA5D,QAAA,gBAAgB,oBAA4C;AAElE,IAAM,cAAc,GAAG;IAC5B,OAAO,qBAAQ,CAAC;AAClB,CAAC,CAAC;AAFW,QAAA,cAAc,kBAEzB;AAEK,IAAM,kBAAkB,GAAG,cAAM,OAAA,MAAM,CAAC,IAAI,CAAC,qBAAQ,CAAC,EAArB,CAAqB,CAAC;AAAjD,QAAA,kBAAkB,sBAA+B;AAEvD,IAAM,gBAAgB,GAAG,UAAO,WAAmB;;;;;gBAChD,OAAO,GAAK,IAAA,wBAAgB,EAAC,WAAW,CAAC,QAAlC,CAAmC;gBAClD,qBAAM,OAAO,EAAE,EAAA;;gBAAf,SAAe,CAAC;;;;KACjB,CAAC;AAHW,QAAA,gBAAgB,oBAG3B"}
+{"version":3,"file":"cluster.js","sourceRoot":"","sources":["../../src/utils/cluster.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yBAAuB;AACvB,oCAAmC;AAE5B,IAAM,iBAAiB,GAAG;;gBAC9B,yBAAM,MAAC,oGAAA,gCAAgC,MAAA;gBAAxC,sBAAA,CAAC,SAAuC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,EAAA;;SAAA,CAAC;AAD7C,QAAA,iBAAiB,qBAC4B;AAEnD,IAAM,8BAA8B,GAAG;;;oBACrC,qBAAM,IAAA,yBAAiB,GAAE,EAAA;oBAAhC,sBAAO,SAAyB,EAAC;;;KAClC,CAAC;AAFW,QAAA,8BAA8B,kCAEzC;AAEK,IAAM,gBAAgB,GAAG,UAAO,QAAgB;;;oBACrD,yBAAM,MAAC,qGAAA,6BAA8B,EAAQ,EAAE,KAAV,QAAQ,GAAE;;gBAA/C,SAA+C,CAAC;gBAChD,IAAA,eAAM,GAAE,CAAC;;;;KACV,CAAC;AAHW,QAAA,gBAAgB,oBAG3B"}

package/dist/utils/gitlab.js

@@ -196,12 +196,15 @@ exports.getAllVariables = (0, memoizee_1["default"])(function (vorpal) { return
         }
     });
 }); }, { promise: true });
+var maskableRegex = new RegExp("^[a-zA-Z0-9_+=/@:.~-]{8,}$"); // SEE https://gitlab.com/gitlab-org/gitlab-foss/-/blob/master/spec/frontend/ci_variable_list/components/ci_variable_modal_spec.js#L20
+var isMaskable = function (value) { return maskableRegex.test(value); };
 var createVariable = function (vorpal, projectId, key, value) { return __awaiter(void 0, void 0, void 0, function () {
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0: return [4 /*yield*/, (0, exports.doGitlabRequest)(vorpal, "projects/".concat(projectId, "/variables"), {
                     key: key,
-                    value: value
+                    value: value,
+                    masked: isMaskable(value)
                 })];
             case 1: return [2 /*return*/, _a.sent()];
         }
@@ -211,7 +214,8 @@ var updateVariable = function (vorpal, projectId, key, value) { return __awaiter
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0: return [4 /*yield*/, (0, exports.doGitlabRequest)(vorpal, "projects/".concat(projectId, "/variables/").concat(key), {
-                    value: value
+                    value: value,
+                    masked: isMaskable(value)
                 }, true)];
             case 1: return [2 /*return*/, _a.sent()];
         }

package/dist/utils/gitlab.js.map

@@ -1 +1 @@
-{"version":3,"file":"gitlab.js","sourceRoot":"","sources":["../../src/utils/gitlab.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"gitlab.js","sourceRoot":"","sources":["../../src/utils/gitlab.ts"],"names":[],"mappings":"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"}

package/dist/utils/projects/index.js

@@ -1,4 +1,8 @@
 "use strict";
+var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cooked, raw) {
+    if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; }
+    return cooked;
+};
 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) {
@@ -40,17 +44,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 exports.__esModule = true;
 exports.getProjectPodNames = exports.getProjectPvcs = exports.getProjectPods = exports.getProjectNamespace = exports.hasGitlabCiFile = exports.readRootGitlabCiFile = exports.getRootGitlabCiFile = exports.getGitRoot = void 0;
-var child_process_promise_1 = require("child-process-promise");
+var zx_1 = require("zx");
 var path_1 = require("path");
 var getProjectConfig_1 = require("../../config/getProjectConfig");
 var k8sApi_1 = __importDefault(require("../../k8sApi"));
 var files_1 = require("../files");
 var getGitRoot = function () { return __awaiter(void 0, void 0, void 0, function () {
-    var _a;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
-            case 0: return [4 /*yield*/, (0, child_process_promise_1.exec)("git rev-parse --show-toplevel")];
-            case 1: return [2 /*return*/, (_a = (_b.sent()).stdout) === null || _a === void 0 ? void 0 : _a.trim()];
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0: return [4 /*yield*/, (0, zx_1.$)(templateObject_1 || (templateObject_1 = __makeTemplateObject(["git rev-parse --show-toplevel"], ["git rev-parse --show-toplevel"])))];
+            case 1: return [2 /*return*/, (_a.sent()).stdout.trim()];
         }
     });
 }); };
@@ -147,4 +150,5 @@ var getProjectPodNames = function (envComponent) { return __awaiter(void 0, void
     });
 }); };
 exports.getProjectPodNames = getProjectPodNames;
+var templateObject_1;
 //# sourceMappingURL=index.js.map

package/dist/utils/projects/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/projects/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+DAA6C;AAE7C,6BAA4B;AAC5B,kEAA8E;AAC9E,wDAAkC;AAClC,kCAA2C;AAEpC,IAAM,UAAU,GAAG;;;;oBAChB,qBAAM,IAAA,4BAAI,EAAC,+BAA+B,CAAC,EAAA;oBAAnD,sBAAO,MAAA,CAAC,SAA2C,CAAC,CAAC,MAAM,0CAAE,IAAI,EAAE,EAAC;;;KACrE,CAAC;AAFW,QAAA,UAAU,cAErB;AAEK,IAAM,mBAAmB,GAAG;;;;oBACjB,qBAAM,IAAA,kBAAU,GAAE,EAAA;;gBAA5B,OAAO,GAAG,SAAkB;gBAClC,sBAAO,IAAA,WAAI,EAAC,OAAO,EAAE,gBAAgB,CAAC,EAAC;;;KACxC,CAAC;AAHW,QAAA,mBAAmB,uBAG9B;AAEK,IAAM,oBAAoB,GAAG;;;YAClC,KAAA,uBAAe,CAAA;YAAC,qBAAM,IAAA,2BAAmB,GAAE,EAAA;gBAA3C,sBAAA,kBAAgB,SAA2B,EAAC,EAAA;;SAAA,CAAC;AADlC,QAAA,oBAAoB,wBACc;AAExC,IAAM,eAAe,GAAG;;;;oBACP,qBAAM,IAAA,4BAAoB,GAAE,EAAA;;gBAA5C,KAAgB,SAA4B,EAA3C,KAAK,QAAA,EAAE,IAAI,QAAA;gBAClB,IAAI,KAAK,EAAE;oBACT,sBAAO,KAAK,EAAC;iBACd;gBACD,sBAAO,IAAI,EAAC;;;KACb,CAAC;AANW,QAAA,eAAe,mBAM1B;AAEK,IAAM,mBAAmB,GAAG,UAAO,YAAoB;;;;;gBACpD,GAAG,GAAK,IAAA,8BAAW,EAAC,YAAY,CAAC,IAA9B,CAA+B;gBAC3B,qBAAM,IAAA,mCAAgB,GAAE,EAAA;;gBAAjC,MAAM,GAAG,SAAwB;gBACvC,sBAAO,UAAG,MAAM,CAAC,YAAY,cAAI,MAAM,CAAC,OAAO,cAAI,GAAG,CAAE,EAAC;;;KAC1D,CAAC;AAJW,QAAA,mBAAmB,uBAI9B;AAEK,IAAM,cAAc,GAAG,UAAO,YAAoB;;;;oBACrC,qBAAM,IAAA,2BAAmB,EAAC,YAAY,CAAC,EAAA;;gBAAnD,SAAS,GAAG,SAAuC;gBAC7C,qBAAM,mBAAM,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAA;;gBAA/C,GAAG,GAAG,SAAyC;gBAErD,sBAAO,GAAG,CAAC,IAAI,CAAC,KAAK,EAAC;;;KACvB,CAAC;AALW,QAAA,cAAc,kBAKzB;AAEK,IAAM,cAAc,GAAG,UAAO,YAAoB;;;;oBACrC,qBAAM,IAAA,2BAAmB,EAAC,YAAY,CAAC,EAAA;;gBAAnD,SAAS,GAAG,SAAuC;gBAC7C,qBAAM,mBAAM,CAAC,mCAAmC,CAAC,SAAS,CAAC,EAAA;;gBAAjE,GAAG,GAAG,SAA2D;gBAEvE,sBAAO,GAAG,CAAC,IAAI,CAAC,KAAK,EAAC;;;KACvB,CAAC;AALW,QAAA,cAAc,kBAKzB;AAEK,IAAM,kBAAkB,GAAG,UAAO,YAAoB;;;;oBAC9C,qBAAM,IAAA,sBAAc,EAAC,YAAY,CAAC,EAAA;;gBAAzC,IAAI,GAAG,SAAkC;gBAC/C,sBAAO,IAAI,CAAC,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAf,CAAe,CAAC,EAAC;;;KACzC,CAAC;AAHW,QAAA,kBAAkB,sBAG7B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/projects/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yBAAuB;AACvB,6BAA4B;AAC5B,kEAA8E;AAC9E,wDAAkC;AAClC,kCAA2C;AAEpC,IAAM,UAAU,GAAG;;;oBAChB,yBAAM,MAAC,mGAAA,+BAA+B,MAAA;oBAA9C,sBAAO,CAAC,SAAsC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,EAAC;;;KAC/D,CAAC;AAFW,QAAA,UAAU,cAErB;AAEK,IAAM,mBAAmB,GAAG;;;;oBACjB,qBAAM,IAAA,kBAAU,GAAE,EAAA;;gBAA5B,OAAO,GAAG,SAAkB;gBAClC,sBAAO,IAAA,WAAI,EAAC,OAAO,EAAE,gBAAgB,CAAC,EAAC;;;KACxC,CAAC;AAHW,QAAA,mBAAmB,uBAG9B;AAEK,IAAM,oBAAoB,GAAG;;;YAClC,KAAA,uBAAe,CAAA;YAAC,qBAAM,IAAA,2BAAmB,GAAE,EAAA;gBAA3C,sBAAA,kBAAgB,SAA2B,EAAC,EAAA;;SAAA,CAAC;AADlC,QAAA,oBAAoB,wBACc;AAExC,IAAM,eAAe,GAAG;;;;oBACP,qBAAM,IAAA,4BAAoB,GAAE,EAAA;;gBAA5C,KAAgB,SAA4B,EAA3C,KAAK,QAAA,EAAE,IAAI,QAAA;gBAClB,IAAI,KAAK,EAAE;oBACT,sBAAO,KAAK,EAAC;iBACd;gBACD,sBAAO,IAAI,EAAC;;;KACb,CAAC;AANW,QAAA,eAAe,mBAM1B;AAEK,IAAM,mBAAmB,GAAG,UAAO,YAAoB;;;;;gBACpD,GAAG,GAAK,IAAA,8BAAW,EAAC,YAAY,CAAC,IAA9B,CAA+B;gBAC3B,qBAAM,IAAA,mCAAgB,GAAE,EAAA;;gBAAjC,MAAM,GAAG,SAAwB;gBACvC,sBAAO,UAAG,MAAM,CAAC,YAAY,cAAI,MAAM,CAAC,OAAO,cAAI,GAAG,CAAE,EAAC;;;KAC1D,CAAC;AAJW,QAAA,mBAAmB,uBAI9B;AAEK,IAAM,cAAc,GAAG,UAAO,YAAoB;;;;oBACrC,qBAAM,IAAA,2BAAmB,EAAC,YAAY,CAAC,EAAA;;gBAAnD,SAAS,GAAG,SAAuC;gBAC7C,qBAAM,mBAAM,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAA;;gBAA/C,GAAG,GAAG,SAAyC;gBAErD,sBAAO,GAAG,CAAC,IAAI,CAAC,KAAK,EAAC;;;KACvB,CAAC;AALW,QAAA,cAAc,kBAKzB;AAEK,IAAM,cAAc,GAAG,UAAO,YAAoB;;;;oBACrC,qBAAM,IAAA,2BAAmB,EAAC,YAAY,CAAC,EAAA;;gBAAnD,SAAS,GAAG,SAAuC;gBAC7C,qBAAM,mBAAM,CAAC,mCAAmC,CAAC,SAAS,CAAC,EAAA;;gBAAjE,GAAG,GAAG,SAA2D;gBAEvE,sBAAO,GAAG,CAAC,IAAI,CAAC,KAAK,EAAC;;;KACvB,CAAC;AALW,QAAA,cAAc,kBAKzB;AAEK,IAAM,kBAAkB,GAAG,UAAO,YAAoB;;;;oBAC9C,qBAAM,IAAA,sBAAc,EAAC,YAAY,CAAC,EAAA;;gBAAzC,IAAI,GAAG,SAAkC;gBAC/C,sBAAO,IAAI,CAAC,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAf,CAAe,CAAC,EAAC;;;KACzC,CAAC;AAHW,QAAA,kBAAkB,sBAG7B"}

package/package.json

@@ -16,8 +16,8 @@
     "catladder": "./bin/catladder"
   },
   "dependencies": {
-    "@catladder/pipeline": "1.1.2",
-    "@kubernetes/client-node": "^0.16.1",
+    "@catladder/pipeline": "1.2.0",
+    "@kubernetes/client-node": "^0.16.2",
     "child-process-promise": "^2.2.1",
     "command-exists-promise": "^2.0.2",
     "common-tags": "^1.8.0",
@@ -31,7 +31,8 @@
     "open": "^8.4.0",
     "tmp-promise": "^2.0.2",
     "update-notifier": "^2.5.0",
-    "vorpal": "^1.12.0"
+    "vorpal": "^1.12.0",
+    "zx": "^4.3.0"
   },
   "engines": {
     "node": ">=12.0.0"
@@ -53,5 +54,5 @@
     "eslint": "^8.7.0",
     "typescript": "^4.5.4"
   },
-  "version": "1.1.2"
+  "version": "1.2.0"
 }

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

@@ -2,8 +2,6 @@ import memoizee from "memoizee";
 import Vorpal from "vorpal";
 import k8sApi from "../../../../k8sApi";
 import {
-  connectToCluster,
-  getAllClusterNames,
   getCurrentConnectedClusterName,
   getCurrentContext,
 } from "../../../../utils/cluster";
@@ -15,10 +13,7 @@ import {
 } from "../../../../utils/portForward";
 import { getShell } from "../../../../utils/shell";
 import { getGoogleAuthUserNumber } from "../../utils/getGoogleAuthUserNumber";
-import {
-  openGoogleCloudKubernetesDashboard,
-  openGoogleCloudLogs,
-} from "../shared";
+import { openGoogleCloudLogs } from "../shared";
 import { namespaceAutoCompletion } from "./namespaceAutoCompletion";
 import portForward from "./portForward";
 
@@ -35,13 +30,6 @@ export const getAllNamespacesNames = async () => {
   return namespaces.map((n) => n.metadata.name);
 };
 export default async (vorpal: Vorpal) => {
-  vorpal
-    .command("connect-cluster <clustername>")
-    .autocomplete(getAllClusterNames())
-    .action(async function ({ clustername }) {
-      this.log(`connecting to ${clustername}`);
-      await connectToCluster(clustername);
-    });
   vorpal.command("current-context").action(async function () {
     this.log(await getCurrentContext());
   });
@@ -82,32 +70,6 @@ export default async (vorpal: Vorpal) => {
       stopPortForward(name.trim());
     });
 
-  vorpal
-    .command("open-dashboard <namespace>", "open kubernetes dashboard")
-    .autocomplete(namespaceAutoCompletion)
-    .action(async function ({ namespace }) {
-      const clustername = await getCurrentConnectedClusterName();
-      const authGoogleNumber = await getGoogleAuthUserNumber.call(this, vorpal);
-
-      await openGoogleCloudKubernetesDashboard(
-        authGoogleNumber,
-        clustername,
-        namespace
-      );
-    });
-  vorpal
-    .command(
-      "open-logs <namespace>",
-      "open google cloud logs (stackdriver stuff)"
-    )
-    .autocomplete(namespaceAutoCompletion)
-    .action(async function ({ namespace }) {
-      const clustername = await getCurrentConnectedClusterName();
-      const authGoogleNumber = await getGoogleAuthUserNumber.call(this, vorpal);
-
-      await openGoogleCloudLogs(authGoogleNumber, clustername, namespace);
-    });
-
   vorpal
     .command("get-shell <namespace>", "get a shell to a pod in the environment")
     .autocomplete(namespaceAutoCompletion)

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

@@ -3,10 +3,7 @@ import { spawn } from "child-process-promise";
 import { writeFile } from "fs-extra";
 import { withFile } from "tmp-promise";
 import Vorpal from "vorpal";
-import {
-  GOOGLE_CLOUD_SQL_PASS_PATH,
-  GOOGLE_PROJECT,
-} from "../../../../config/constants";
+import { GOOGLE_CLOUD_SQL_PASS_PATH } from "../../../../config/constants";
 import {
   getEnvVars,
   getPipelineContextByChoice,
@@ -45,7 +42,9 @@ export default async (vorpal: Vorpal) =>
 
       const values = context.componentConfig.deploy.values;
 
-      const projectId = values?.cloudsql?.projectId || GOOGLE_PROJECT;
+      const projectId =
+        values?.cloudsql?.projectId ||
+        context.componentConfig.deploy.cluster?.projectId;
 
       const defaultInstanceId = `${config.customerName}-${config.appName}-${env}`;
       const instanceId = values?.cloudsql?.instanceId || defaultInstanceId;

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

@@ -1,9 +1,6 @@
 import { spawn } from "child-process-promise";
 import Vorpal from "vorpal";
-import {
-  GOOGLE_CLOUD_SQL_PASS_PATH,
-  GOOGLE_PROJECT,
-} from "../../../../config/constants";
+import { GOOGLE_CLOUD_SQL_PASS_PATH } from "../../../../config/constants";
 import {
   getEnvVars,
   getProjectConfig,
@@ -34,6 +31,8 @@ export default async (vorpal: Vorpal) =>
         return;
       }
 
+      // TODO: reimpleent with new config
+      throw new Error("needs reimplementation with new config");
       const GOOGLE_CLOUD_SQL_REGION = "europe-west6"; // currently hardcoded
       const { POSTGRESQL_PASSWORD } = await getEnvVars(
         this,
@@ -43,7 +42,7 @@ export default async (vorpal: Vorpal) =>
 
       const LOCAL_PORT = 54321;
 
-      const instanceName = `${GOOGLE_PROJECT}:${GOOGLE_CLOUD_SQL_REGION}:${customerName}-${appName}-${env}=tcp:${LOCAL_PORT}`;
+      const instanceName = `${"xxxxxx reimplement shoulld be project id"}:${GOOGLE_CLOUD_SQL_REGION}:${customerName}-${appName}-${env}=tcp:${LOCAL_PORT}`;
       const cloudsqlCredentials = await readPass(GOOGLE_CLOUD_SQL_PASS_PATH);
 
       const { POSTGRESQL_URL } = process.env;

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

@@ -1,14 +1,14 @@
-import { isOfDeployType } from "@catladder/pipeline";
-import open from "open";
+import {
+  getFullKubernetesClusterName,
+  isOfDeployType,
+  getKubernetesNamespace,
+} from "@catladder/pipeline";
 import Vorpal from "vorpal";
+import { $ } from "zx";
 import { getAllPipelineContexts } from "../../../../config/getProjectConfig";
-import {
-  getClusterByFullName,
-  getClusterByName,
-} from "../../../../utils/cluster";
-import { doGitlabRequest, getProjectInfo } from "../../../../utils/gitlab";
-import { readPass } from "../../../../utils/passwordstore";
-import { getProjectNamespace } from "../../../../utils/projects";
+import { connectToCluster } from "../../../../utils/cluster";
+import { upsertAllVariables } from "../../../../utils/gitlab";
+import ensureNamespace from "./utils/ensureNamespace";
 
 export default async (vorpal: Vorpal) =>
   vorpal
@@ -17,78 +17,128 @@ export default async (vorpal: Vorpal) =>
       "Initializes the gitlab repo, e.g. connects the cluster to it"
     )
     .action(async function () {
-      const { id: projectId, web_url: projectWebUrl } = await getProjectInfo(
-        this
-      );
-      const existingGitlabClusters = await doGitlabRequest<{ name: string }[]>(
-        this,
-        `projects/${projectId}/clusters`
-      );
+      const allContext = await getAllPipelineContexts();
+
+      for (const context of allContext) {
+        const deployConfig = context.componentConfig.deploy;
+        if (isOfDeployType(deployConfig, "kubernetes")) {
+          const fullName = getFullKubernetesClusterName(deployConfig.cluster);
+          this.log(
+            `connecting ${context.environment.shortName}:${context.componentName} ${fullName}`
+          );
+
+          await connectToCluster(fullName);
 
-      const existingClusters = existingGitlabClusters.map(
-        (c: { name: string }) => {
-          const found = getClusterByFullName(c.name);
+          const namespace = getKubernetesNamespace(
+            context.fullConfig,
+            context.environment.shortName
+          );
+          await ensureNamespace(namespace);
+
+          //$.verbose = true;
+
+          // we name the service account and the role and the role binding with the same name
+          // we currently create one per component to better separate them
+          const serviceAccountName = `cl-${context.componentName}-deploy`;
+          const KUBE_URL =
+            await $`TERM=dumb kubectl cluster-info | grep -E 'Kubernetes master|Kubernetes control plane' | awk '/http/ {print $NF}'`.then(
+              (s) => s.stdout.trim()
+            );
+
+          // first upsert service acount in the ns
+          try {
+            await $`kubectl delete serviceaccount --namespace ${namespace} ${serviceAccountName}`;
+            await $`kubectl delete rolebinding --namespace ${namespace} ${serviceAccountName}`;
+            await $`kubectl delete role --namespace ${namespace} ${serviceAccountName}`;
+          } catch (e) {
+            // ignore
+          }
 
-          return {
-            name: found ? found.name : null,
-            fullName: c.name,
+          await $`kubectl create serviceaccount --namespace ${namespace} ${serviceAccountName}`;
+
+          // upsert role in the ns
+
+          await $`cat <<EOF | kubectl apply -f -
+kind: Role
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  namespace: ${namespace}
+  name: ${serviceAccountName}
+rules:
+- apiGroups: ["", "extensions", "apps", "networking.k8s.io", "batch"]
+  resources: ["deployments", "replicasets", "pods", "secrets", "configmaps", "services", "ingresses", "serviceaccounts", "jobs", "cronjobs"]
+  verbs: ["get", "list", "watch", "create", "update", "patch", "delete"] # You can also use ["*"]
+---
+kind: RoleBinding
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: ${serviceAccountName}
+  namespace: ${namespace}
+subjects:
+  - kind: ServiceAccount
+    name: ${serviceAccountName}
+    namespace:  ${namespace}
+roleRef:
+  kind: Role
+  name: ${serviceAccountName}
+  apiGroup: rbac.authorization.k8s.io
+EOF
+            `;
+
+          // get token name
+          const tokenName =
+            await $`kubectl get serviceaccount --namespace ${namespace} ${serviceAccountName} -o jsonpath='{.secrets[0].name}'`;
+
+          const KUBE_CA_PEM =
+            await $`kubectl get secret ${tokenName} --namespace ${namespace} -o jsonpath="{['data']['ca\\.crt']}"`.then(
+              (c) => c.stdout.trim()
+            );
+          const KUBE_TOKEN =
+            await $`kubectl get secret ${tokenName} --namespace ${namespace} -o jsonpath="{['data']['token']}" | base64 --decode`.then(
+              (c) => c.stdout.trim()
+            );
+
+          const vars = {
+            KUBE_TOKEN,
+            KUBE_CA_PEM,
+            KUBE_URL,
           };
-        }
-      );
 
-      if (existingClusters.length === 0) {
-        this.log("");
-        this.log("there is no cluster on the current project?");
-      } else {
-        this.log("there are already these clusters on the gitlab: ");
-        this.log("");
-        existingClusters.forEach((cluster) =>
-          this.log(` - ${cluster.name || "unknown"} (${cluster.fullName})`)
-        );
+          await upsertAllVariables(
+            this,
+            vars,
+            context.environment.shortName,
+            context.componentName
+          );
+        }
       }
 
-      this.log("");
-      this.log("your project specifies the following clusters:");
-      this.log("");
-      const allContext = await getAllPipelineContexts();
-      const allDeployments = allContext.map((c) => c.componentConfig.deploy);
-
-      const configuredClusterNames = allDeployments.reduce<string[]>(
-        (acc, c) => {
-          if (
-            isOfDeployType(c, "kubernetes") &&
-            !acc.includes(c.cluster || "production")
-          ) {
-            return [...acc, c.cluster || "production"];
-          }
-          return acc;
-        },
-        []
-      );
-      const configuredClusters = configuredClusterNames.map((c) => ({
-        name: c,
-        config: getClusterByName(c),
-      }));
-      configuredClusters.forEach((cluster) =>
-        this.log(` - ${cluster.name || "unknown"} (${cluster.config.fullName})`)
+      // there is a constraint, see https://git.panter.ch/catladder/catladder/-/issues/2#note_345677
+      // any two components have to use the same custer per env, so e.g. dev:api and dev:www cannot use two different namespaces
+      // in practise, that is often not an issue, but it might happen because the config allows it
+      /*
+      Object.entries(configuredClusters).forEach(([fullname, config]) =>
+        this.log(` - ${config.cluster.name || "unknown"} (${fullname})`)
       );
       this.log("");
 
-      const missingClusters = configuredClusters.filter(
-        (c) => !existingClusters.some((exist) => exist.name === c.name)
+      const missingClusters = Object.fromEntries(
+        Object.entries(configuredClusters).filter(
+          ([c]) => !existingClusters.some((exist) => exist === c)
+        )
       );
 
       this.log("");
       this.log("These clusters are not configured yet on gitlab:");
       this.log("");
 
-      missingClusters.forEach((cluster) =>
-        this.log(` - ${cluster.name || "unknown"} (${cluster.config.fullName})`)
+      Object.entries(missingClusters).forEach(([fullname, config]) =>
+        this.log(` - ${config.cluster.name || "unknown"} (${fullname})`)
       );
       this.log("");
 
-      for (const cluster of missingClusters) {
-        this.log(`${cluster} (${cluster.config.fullName})`);
+      for (const [fullname, config] of Object.entries(missingClusters)) {
+        this.log(`${config.name} (${fullname})`);
         this.log("");
         const { shouldContinue } = await this.prompt({
           type: "confirm",
@@ -97,22 +147,20 @@ export default async (vorpal: Vorpal) =>
         });
         this.log("");
         if (shouldContinue) {
-          const { api_url, passCredentials } = cluster.config;
-          if (!api_url) {
-            throw new Error("no api_url on this cluster!");
-          }
-          if (!passCredentials) {
-            throw new Error("no passCredentials on this cluster!");
-          }
-          const token = await readPass(passCredentials.token);
-          const ca_cert = await readPass(passCredentials.ca_cert);
-
+          await connectToCluster(fullname);
+          const { stdout: api_url } =
+            await $`kubectl cluster-info | grep -E 'Kubernetes master|Kubernetes control plane' | awk '/http/ {print $NF}'`;
+          const { stdout: ca_cert } =
+            await $`kubectl get secret default-token-69xv4 -o jsonpath="{['data']['ca\.crt']}" | base64 --decode`;
+          const { stdout: token } =
+            await $`kubectl get secret default-token-69xv4 -o jsonpath="{['data']['token']}" | base64 --decode`;
           const postResult = await doGitlabRequest(
             this,
             `projects/${projectId}/clusters/user`,
             {
-              name: cluster.config.fullName,
+              name: fullname,
               managed: false,
+              environment_scope: "*",
               platform_kubernetes_attributes: {
                 api_url,
                 ca_cert,
@@ -200,4 +248,5 @@ export default async (vorpal: Vorpal) =>
       ].forEach((tip) => this.log(` - ${tip}`));
       this.log("\n");
       this.log("\n");
+      */
     });

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

@@ -3,11 +3,9 @@ import {
   getPipelineContextByChoice,
   parseChoice,
 } from "../../../../config/getProjectConfig";
-import { getCurrentConnectedClusterName } from "../../../../utils/cluster";
 import { getGoogleAuthUserNumber } from "../../utils/getGoogleAuthUserNumber";
 import { openGoogleCloudKubernetesDashboard } from "../shared";
 import { envAndComponents } from "./utils/autocompletions";
-import ensureCluster from "./utils/ensureCluster";
 export default async (vorpal: Vorpal) =>
   vorpal
     .command(
@@ -30,16 +28,21 @@ export default async (vorpal: Vorpal) =>
           "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;
-      await ensureCluster.call(this, envComponent); // TODO: implement
-      const clustername = await getCurrentConnectedClusterName();
 
       const authGoogleNumber = await getGoogleAuthUserNumber.call(this, vorpal);
 
       openGoogleCloudKubernetesDashboard(
-        authGoogleNumber,
-        clustername,
-        namespace
+        componentConfig.deploy.cluster,
+        namespace,
+        authGoogleNumber
       );
     });