@catladder/cli 0.0.0-fix-migrate-string-cmd-508a469f → 0.0.0-fix-values-as-files-73f39da5

package/dist/utils/cluster.js

@@ -42,7 +42,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 exports.__esModule = true;
 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, zx_1.$)(templateObject_1 || (templateObject_1 = __makeTemplateObject(["kubectl config current-context"], ["kubectl config current-context"])))];
@@ -65,7 +64,6 @@ var connectToCluster = function (fullname) { return __awaiter(void 0, void 0, vo
             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*/];
         }
     });

package/dist/utils/cluster.js.map

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"cluster.js","sourceRoot":"","sources":["../../src/utils/cluster.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yBAAuB;AAEhB,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;;;;KACjD,CAAC;AAFW,QAAA,gBAAgB,oBAE3B"}

package/dist/utils/gitlab.d.ts

@@ -17,5 +17,6 @@ declare type GitlabVariable = {
     environment_scope: string;
 };
 export declare const getAllVariables: ((vorpal: CommandInstance) => Promise<Array<GitlabVariable>>) & memoizee.Memoized<(vorpal: CommandInstance) => Promise<Array<GitlabVariable>>>;
+export declare const getVariableValueByRawName: (vorpal: CommandInstance, rawName: string) => Promise<string>;
 export declare const upsertAllVariables: (vorpal: CommandInstance, variables: Record<string, any>, env: string, componentName: string) => Promise<void>;
 export {};

package/dist/utils/gitlab.js

@@ -48,7 +48,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
-exports.upsertAllVariables = exports.getAllVariables = exports.getProjectInfo = exports.doGitlabRequest = exports.getGitlabToken = exports.setupGitlabToken = exports.hasGitlabToken = void 0;
+exports.upsertAllVariables = exports.getVariableValueByRawName = exports.getAllVariables = exports.getProjectInfo = exports.doGitlabRequest = exports.getGitlabToken = exports.setupGitlabToken = exports.hasGitlabToken = void 0;
 var child_process_promise_1 = require("child-process-promise");
 var pipeline_1 = require("@catladder/pipeline");
 var lodash_1 = require("lodash");
@@ -145,6 +145,9 @@ var doGitlabRequest = function (vorpal, path, data, update) {
                     if (result.status >= 200 && result.status < 400) {
                         return [2 /*return*/, result.json()];
                     }
+                    if (result.status === 404) {
+                        throw new Error("not found");
+                    }
                     _a = Error.bind;
                     _c = (_b = "Could not send request to gitlab api ".concat(path, ": ").concat(result.status, " \"").concat(result.statusText, "\".\nResponse: ")).concat;
                     _e = (_d = JSON).stringify;
@@ -196,6 +199,19 @@ exports.getAllVariables = (0, memoizee_1["default"])(function (vorpal) { return
         }
     });
 }); }, { promise: true });
+var getVariableValueByRawName = function (vorpal, rawName) { return __awaiter(void 0, void 0, void 0, function () {
+    var allVariables;
+    var _a;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
+            case 0: return [4 /*yield*/, (0, exports.getAllVariables)(vorpal)];
+            case 1:
+                allVariables = _b.sent();
+                return [2 /*return*/, (_a = allVariables.find(function (v) { return v.key === rawName; })) === null || _a === void 0 ? void 0 : _a.value];
+        }
+    });
+}); };
+exports.getVariableValueByRawName = getVariableValueByRawName;
 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 () {

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

@@ -39,15 +39,12 @@ 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.getProjectPodNames = exports.getProjectPvcs = exports.getProjectPods = exports.getProjectNamespace = exports.hasGitlabCiFile = exports.readRootGitlabCiFile = exports.getRootGitlabCiFile = exports.getGitRoot = void 0;
 var zx_1 = require("zx");
 var path_1 = require("path");
 var getProjectConfig_1 = require("../../config/getProjectConfig");
-var k8sApi_1 = __importDefault(require("../../k8sApi"));
+var k8sApi_1 = require("../../k8sApi");
 var files_1 = require("../files");
 var getGitRoot = function () { return __awaiter(void 0, void 0, void 0, function () {
     return __generator(this, function (_a) {
@@ -109,13 +106,14 @@ var getProjectNamespace = function (envComponent) { return __awaiter(void 0, voi
 }); };
 exports.getProjectNamespace = getProjectNamespace;
 var getProjectPods = function (envComponent) { return __awaiter(void 0, void 0, void 0, function () {
-    var namespace, res;
+    var namespace, k8sApi, res;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0: return [4 /*yield*/, (0, exports.getProjectNamespace)(envComponent)];
             case 1:
                 namespace = _a.sent();
-                return [4 /*yield*/, k8sApi_1["default"].listNamespacedPod(namespace)];
+                k8sApi = (0, k8sApi_1.getk8sApi)();
+                return [4 /*yield*/, k8sApi.listNamespacedPod(namespace)];
             case 2:
                 res = _a.sent();
                 return [2 /*return*/, res.body.items];
@@ -124,13 +122,14 @@ var getProjectPods = function (envComponent) { return __awaiter(void 0, void 0,
 }); };
 exports.getProjectPods = getProjectPods;
 var getProjectPvcs = function (envComponent) { return __awaiter(void 0, void 0, void 0, function () {
-    var namespace, res;
+    var namespace, k8sApi, res;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0: return [4 /*yield*/, (0, exports.getProjectNamespace)(envComponent)];
             case 1:
                 namespace = _a.sent();
-                return [4 /*yield*/, k8sApi_1["default"].listNamespacedPersistentVolumeClaim(namespace)];
+                k8sApi = (0, k8sApi_1.getk8sApi)();
+                return [4 /*yield*/, k8sApi.listNamespacedPersistentVolumeClaim(namespace)];
             case 2:
                 res = _a.sent();
                 return [2 /*return*/, res.body.items];

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

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/projects/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yBAAuB;AACvB,6BAA4B;AAC5B,kEAA8E;AAC9E,uCAAyC;AACzC,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;gBACnD,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;gBACf,qBAAM,MAAM,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAA;;gBAA/C,GAAG,GAAG,SAAyC;gBAErD,sBAAO,GAAG,CAAC,IAAI,CAAC,KAAK,EAAC;;;KACvB,CAAC;AANW,QAAA,cAAc,kBAMzB;AAEK,IAAM,cAAc,GAAG,UAAO,YAAoB;;;;oBACrC,qBAAM,IAAA,2BAAmB,EAAC,YAAY,CAAC,EAAA;;gBAAnD,SAAS,GAAG,SAAuC;gBACnD,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;gBACf,qBAAM,MAAM,CAAC,mCAAmC,CAAC,SAAS,CAAC,EAAA;;gBAAjE,GAAG,GAAG,SAA2D;gBAEvE,sBAAO,GAAG,CAAC,IAAI,CAAC,KAAK,EAAC;;;KACvB,CAAC;AANW,QAAA,cAAc,kBAMzB;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,7 +16,7 @@
     "catladder": "./bin/catladder"
   },
   "dependencies": {
-    "@catladder/pipeline": "0.0.0-fix-migrate-string-cmd-508a469f",
+    "@catladder/pipeline": "0.0.0-fix-values-as-files-73f39da5",
     "@kubernetes/client-node": "^0.16.2",
     "child-process-promise": "^2.2.1",
     "command-exists-promise": "^2.0.2",
@@ -24,7 +24,7 @@
     "dayjs": "^1.10.4",
     "fs-extra": "^7.0.1",
     "gitlab": "^4.4.1",
-    "js-yaml": "^3.12.0",
+    "js-yaml": "^4.1.0",
     "lodash": "^4.17.21",
     "memoizee": "^0.4.14",
     "node-fetch": "^2.3.0",
@@ -55,6 +55,6 @@
     "eslint": "^8.7.0",
     "typescript": "^4.5.4"
   },
-  "version": "0.0.0-fix-migrate-string-cmd-508a469f",
+  "version": "0.0.0-fix-values-as-files-73f39da5",
   "stableVersion": "0.0.0"
 }

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

@@ -1,10 +1,7 @@
 import memoizee from "memoizee";
 import Vorpal from "vorpal";
-import k8sApi from "../../../../k8sApi";
-import {
-  getCurrentConnectedClusterName,
-  getCurrentContext,
-} from "../../../../utils/cluster";
+import { getk8sApi } from "../../../../k8sApi";
+import { getCurrentContext } from "../../../../utils/cluster";
 import { logError } from "../../../../utils/log";
 import { syncBitwarden } from "../../../../utils/passwordstore";
 import {
@@ -12,13 +9,12 @@ import {
   stopPortForward,
 } from "../../../../utils/portForward";
 import { getShell } from "../../../../utils/shell";
-import { getGoogleAuthUserNumber } from "../../utils/getGoogleAuthUserNumber";
-import { openGoogleCloudLogs } from "../shared";
 import { namespaceAutoCompletion } from "./namespaceAutoCompletion";
 import portForward from "./portForward";
 
 const getAllNamespaces = memoizee(
   async () => {
+    const k8sApi = getk8sApi();
     const res = await k8sApi.listNamespace();
     return res.body.items;
   },
@@ -45,6 +41,7 @@ export default async (vorpal: Vorpal) => {
     .command("list-secrets <namespace>", "show secrets")
     .autocomplete(namespaceAutoCompletion)
     .action(async function ({ namespace }) {
+      const k8sApi = getk8sApi();
       const res = await k8sApi.listNamespacedSecret(namespace);
 
       this.log(res.body.items.map((n) => n.metadata.name).join("\n"));
@@ -59,6 +56,7 @@ export default async (vorpal: Vorpal) => {
     .command("list-pods <namespace>", "list all pods of namespace")
     .autocomplete(namespaceAutoCompletion)
     .action(async function ({ namespace }) {
+      const k8sApi = getk8sApi();
       const res = await k8sApi.listNamespacedPod(namespace);
       this.log(res.body.items.map((n) => n.metadata.name).join("\n"));
     });
@@ -74,6 +72,7 @@ export default async (vorpal: Vorpal) => {
     .command("get-shell <namespace>", "get a shell to a pod in the environment")
     .autocomplete(namespaceAutoCompletion)
     .action(async function ({ namespace }) {
+      const k8sApi = getk8sApi();
       const res = await k8sApi.listNamespacedPod(namespace);
       if (res.body.items.length === 0) {
         logError(this, "sorry, no pods found");

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

@@ -3,7 +3,7 @@ import { logError } from "../../../../utils/log";
 
 import { startPortForward } from "../../../../utils/portForward";
 
-import k8sApi from "../../../../k8sApi";
+import { getk8sApi } from "../../../../k8sApi";
 import { namespaceAutoCompletion } from "./namespaceAutoCompletion";
 
 export default async (vorpal: Vorpal) =>
@@ -11,6 +11,7 @@ export default async (vorpal: Vorpal) =>
     .command("port-forward <namespace>", "start port-forwarding")
     .autocomplete(namespaceAutoCompletion)
     .action(async function ({ namespace }) {
+      const k8sApi = getk8sApi();
       const res = await k8sApi.listNamespacedPod(namespace);
       if (res.body.items.length === 0) {
         logError(this, "sorry, no pods found");

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

@@ -3,14 +3,13 @@ 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 } from "../../../../config/constants";
 import {
   getEnvVars,
+  getGitlabVar,
   getPipelineContextByChoice,
   getProjectConfig,
   parseChoice,
 } from "../../../../config/getProjectConfig";
-import { readPass } from "../../../../utils/passwordstore";
 import { envAndComponents } from "./utils/autocompletions";
 
 export default async (vorpal: Vorpal) =>
@@ -30,15 +29,20 @@ export default async (vorpal: Vorpal) =>
         message: "Local port: ",
       });
 
-      const POSTGRESQL_PASSWORD = (await getEnvVars(this, env, componentName))
-        ?.POSTGRESQL_PASSWORD;
+      const envVars = await getEnvVars(this, env, componentName);
+      const POSTGRESQL_PASSWORD = envVars?.POSTGRESQL_PASSWORD;
 
       const context = await getPipelineContextByChoice(env, componentName);
       if (!isOfDeployType(context.componentConfig.deploy, "kubernetes")) {
         throw new Error("currently only supported for kubernetes deployment");
       }
+      this.log("");
       this.log(`postgres-PW: ${POSTGRESQL_PASSWORD}`);
       this.log("");
+      this.log(
+        `POSTGRESQL_URL=postgresql://postgres:${POSTGRESQL_PASSWORD}@localhost:${localPort}/${context.environment.envVars.KUBE_APP_NAME}?schema=public`
+      );
+      this.log("");
 
       const values = context.componentConfig.deploy.values;
 
@@ -54,9 +58,23 @@ export default async (vorpal: Vorpal) =>
 
       const instanceName = `${projectId}:${region}:${instanceId}=tcp:${localPort}`;
 
-      const cloudsqlCredentials = await readPass(GOOGLE_CLOUD_SQL_PASS_PATH);
+      const cloudsqlProxyCredentials = await getGitlabVar(
+        this,
+        env,
+        componentName,
+        "cloudsqlProxyCredentials"
+      );
+
+      if (!cloudsqlProxyCredentials) {
+        // we store cloudsqlProxyCredentials on gitlab, but its currently get pushed via bitwarden due to legacy reasons
+        // this will be fixed with when https://git.panter.ch/catladder/catladder/-/merge_requests/32/ is merged
+        this.log(
+          "cloudsqlProxyCredentials env var missing in gitlab. Please contact gilde-ci-cd about that."
+        );
+        throw new Error("cloudsqlProxyCredentials missing in secrets");
+      }
       await withFile(async ({ path: tmpFilePath }) => {
-        await writeFile(tmpFilePath, cloudsqlCredentials);
+        await writeFile(tmpFilePath, cloudsqlProxyCredentials);
 
         await spawn(
           "cloud_sql_proxy",

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

@@ -4,6 +4,7 @@ import { difference } from "lodash";
 import Vorpal, { CommandInstance } from "vorpal";
 import { GOOGLE_CLOUD_SQL_PASS_PATH } from "../../../../config/constants";
 import {
+  getAllComponentsWithAllEnvsHierarchical,
   getEnvironment,
   getEnvVars,
   getPipelineContextByChoice,
@@ -16,20 +17,30 @@ import { hasBitwarden, readPass } from "../../../../utils/passwordstore";
 import { delay } from "../../../../utils/promise";
 import { allEnvsAndAllComponents } from "./utils/autocompletions";
 
+type Vars = {
+  [env: string]: {
+    [componentName: string]: Record<string, string>;
+  };
+};
 /* for convenience, parse json objects. that makes it easier to edit secrets that are object */
-const resolveJson = (v: Record<string, Record<string, string>>) =>
+const resolveJson = (v: Vars) =>
   Object.fromEntries(
-    Object.entries(v).map(([c, secrets]) => {
+    Object.entries(v).map(([componentName, envs]) => {
       return [
-        c,
+        componentName,
         Object.fromEntries(
-          Object.entries(secrets).map(([key, value]) => {
-            try {
-              return [key, JSON.parse(value)];
-            } catch (e) {
-              return [key, value];
-            }
-          })
+          Object.entries(envs).map(([env, secrets]) => [
+            env,
+            Object.fromEntries(
+              Object.entries(secrets).map(([key, value]) => {
+                try {
+                  return [key, JSON.parse(value)];
+                } catch (e) {
+                  return [key, value];
+                }
+              })
+            ),
+          ])
         ),
       ];
     })
@@ -48,14 +59,22 @@ const getEnvVarsToEdit = async (
 };
 const doItFor = async (
   instance: CommandInstance,
-  env: string,
-  components: string[]
+  envAndComponents: {
+    [componentName: string]: string[];
+  }
 ) => {
-  let valuesToEdit: Record<string, Record<string, string>> = Object.fromEntries(
+  let valuesToEdit: Vars = Object.fromEntries(
     await Promise.all(
-      components.map(async (componentName) => [
+      Object.entries(envAndComponents).map(async ([componentName, envs]) => [
         componentName,
-        await getEnvVarsToEdit(instance, env, componentName),
+        Object.fromEntries(
+          await Promise.all(
+            envs.map(async (env) => [
+              env,
+              await getEnvVarsToEdit(instance, env, componentName),
+            ])
+          )
+        ),
       ])
     )
   );
@@ -64,82 +83,125 @@ const doItFor = async (
     valuesToEdit = await editAsFile(
       resolveJson(valuesToEdit),
       stripIndents`
-        Please fill in all secrets for: ${components.join(", ")}
+        Please fill in all secrets for: 
+
+        ${Object.entries(envAndComponents)
+          .map(
+            ([componentName, envs]) => `- ${componentName}: ${envs.join(", ")}`
+          )
+          .join("\n")}
 
         `
     );
     // check for errors
     hasErrors = false;
-    for (const componentName of components) {
-      const usedKeys = valuesToEdit[componentName]
-        ? Object.keys(valuesToEdit[componentName])
-        : [];
-      // check whether newValues have the exact number of keys
-      const { secretEnvVarKeys } = await getEnvironment(env, componentName);
-      const extranous = difference(usedKeys, secretEnvVarKeys);
-      const missing = difference(secretEnvVarKeys, usedKeys);
+    for (const [componentName, envs] of Object.entries(envAndComponents)) {
+      for (const env of envs) {
+        const usedKeys = valuesToEdit[componentName][env]
+          ? Object.keys(valuesToEdit[componentName][env])
+          : [];
+        // check whether newValues have the exact number of keys
+        const { secretEnvVarKeys } = await getEnvironment(env, componentName);
+        const extranous = difference(usedKeys, secretEnvVarKeys);
+        const missing = difference(secretEnvVarKeys, usedKeys);
 
-      if (extranous.length > 0 || missing.length > 0) {
-        instance.log("");
-        instance.log(
-          `😿 Oh no! There is something wrong with "${componentName}"`
-        );
-        instance.log("");
-        if (extranous.length > 0) {
-          instance.log("these secrets are not declared in the config");
-          extranous.forEach((key) => instance.log(key));
+        if (extranous.length > 0 || missing.length > 0) {
           instance.log("");
-        }
-        if (missing.length > 0) {
-          instance.log("these secrets have not been provided:");
-          missing.forEach((key) => instance.log(key));
+          instance.log(
+            `😿 Oh no! There is something wrong with "${componentName}"`
+          );
           instance.log("");
-        }
+          if (extranous.length > 0) {
+            instance.log("these secrets are not declared in the config");
+            extranous.forEach((key) => instance.log(key));
+            instance.log("");
+          }
+          if (missing.length > 0) {
+            instance.log("these secrets have not been provided:");
+            missing.forEach((key) => instance.log(key));
+            instance.log("");
+          }
 
-        await delay(1000);
-        const { shouldContinue } = await instance.prompt({
-          default: true,
-          message: "Try again? 🤔",
-          name: "shouldContinue",
-          type: "confirm",
-        });
+          await delay(1000);
+          const { shouldContinue } = await instance.prompt({
+            default: true,
+            message: "Try again? 🤔",
+            name: "shouldContinue",
+            type: "confirm",
+          });
 
-        if (!shouldContinue) {
-          throw new Error("abort");
+          if (!shouldContinue) {
+            throw new Error("abort");
+          }
+          hasErrors = true;
         }
-        hasErrors = true;
       }
     }
   }
+  instance.log("upserting all variables, please wait...");
+  instance.log("");
+  for (const [componentName, envs] of Object.entries(envAndComponents)) {
+    for (const env of envs) {
+      await upsertAllVariables(
+        instance,
+        valuesToEdit[componentName][env],
+        env,
+        componentName
+      );
 
-  for (const componentName of components) {
-    await upsertAllVariables(
-      instance,
-      valuesToEdit[componentName],
-      env,
-      componentName
-    );
+      if (hasBitwarden()) {
+        // add cloud sql secret if needed.
+        // TODO: this is legacy, in the future we want to have one service account per app
+        try {
+          const context = await getPipelineContextByChoice(env, componentName);
+          if (
+            context.componentConfig.deploy &&
+            context.componentConfig.deploy.values?.cloudsql?.enabled
+          ) {
+            await upsertAllVariables(
+              instance,
+              {
+                cloudsqlProxyCredentials: await readPass(
+                  GOOGLE_CLOUD_SQL_PASS_PATH
+                ),
+              },
+              env,
+              componentName
+            );
+          }
+        } catch (e) {
+          // ignore atm
+        }
+      }
+      instance.log("✅ " + env + ":" + componentName);
+    }
+  }
+  instance.log("done! 😻");
+  instance.log("");
+};
 
-    if (hasBitwarden()) {
-      // add cloud sql secret if needed.
-      // TODO: this is legacy, in the future we want to have one service account per app
+export const projectConfigSecrets = async (
+  vorpal: CommandInstance,
+  envComponent?: string
+) => {
+  if (!envComponent) {
+    const allEnvAndcomponents = await getAllComponentsWithAllEnvsHierarchical();
+    await doItFor(vorpal, allEnvAndcomponents);
+  } else {
+    const { env, componentName } = parseChoice(envComponent);
 
-      const context = await getPipelineContextByChoice(env, componentName);
-      if (
-        context.componentConfig.deploy &&
-        context.componentConfig.deploy.values?.cloudsql?.enabled
-      ) {
-        await upsertAllVariables(
-          instance,
-          {
-            cloudsqlProxyCredentials: await readPass(
-              GOOGLE_CLOUD_SQL_PASS_PATH
-            ),
-          },
-          env,
-          componentName
-        );
-      }
+    // componentName can be null. in this case, iterate over all  components
+    if (!componentName) {
+      const components = await getProjectComponents();
+      await doItFor(
+        vorpal,
+        Object.fromEntries(components.map((c) => [c, [env]]))
+      );
+    }
+    if (componentName) {
+      await doItFor(vorpal, {
+        [componentName]: [env],
+      });
     }
   }
 };
@@ -147,62 +209,11 @@ const doItFor = async (
 export default async (vorpal: Vorpal) => {
   vorpal
     .command(
-      "project-config-secrets <envComponent>",
+      "project-config-secrets [envComponent]",
       "setup/update secrets stored in pass"
     )
     .autocomplete(await allEnvsAndAllComponents())
     .action(async function ({ envComponent }) {
-      const { env, componentName } = parseChoice(envComponent);
-
-      // componentName can be null. in this case, iterate over all  components
-      if (!componentName) {
-        const components = await getProjectComponents();
-        await doItFor(this, env, components);
-      }
-      if (componentName) {
-        await doItFor(this, env, [componentName]);
-      }
-
-      /*
-
-      
-        // adding gcloud sql proxy secret
-        const cloudsqlCredentials = await readPass(GOOGLE_CLOUD_SQL_PASS_PATH);
-        await createKubernetesSecret.call(
-          this,
-          namespace,
-          "cloudsql-instance-credentials",
-          {
-            "credentials.json": cloudsqlCredentials,
-          }
-        );
-        this.log("");
-        this.log(
-          "⚠️  You need to delete/restart pods in order to make them pick up the new config"
-        );
-        this.log(`you can use project-delete-pods ${env} to do that`);
-        this.log("");
-        this.log("");
-        await delay(1000);
-      }
-      this.log("");
-      this.log("😻 success!!!!!");
-      this.log("");
-      */
+      return await projectConfigSecrets(this, envComponent);
     });
-}; /*
-async function createNewEnvInPass(env: any, secretEnvVarsMapping: ISecrets) {
-  // const passPath = await getPassPath(env);
-  this.log(
-    "Your selected env is not yet in pass. Do you want to copy it from another env? "
-  );
-  const noAnswer = "No, I will create a new one from scratch.";
-  const { sourceEnv } = await this.prompt({
-    type: "list",
-    name: "sourceEnv",
-    choices: [...(await envAndComponents()).filter((e) => e !== env), noAnswer],
-    message: "Do you want to copy an env?",
-  });
-  // TODO: reimplenent
-}
-*/
+};