@catladder/cli 0.0.0-main-d0a1e9f1 → 0.0.0-main-67fbbdf8

package/dist/utils/files.js

@@ -64,13 +64,18 @@ var readFileOrError = function (filePath) { return __awaiter(void 0, void 0, voi
 }); };
 exports.readFileOrError = readFileOrError;
 var readYaml = function (filename) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, _b;
+    var _a, _b, e_2;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0:
+                _c.trys.push([0, 2, , 3]);
                 _b = (_a = js_yaml_1["default"]).load;
                 return [4 /*yield*/, readFile(filename)];
             case 1: return [2 /*return*/, _b.apply(_a, [_c.sent()])];
+            case 2:
+                e_2 = _c.sent();
+                return [2 /*return*/, null];
+            case 3: return [2 /*return*/];
         }
     });
 }); };

package/dist/utils/files.js.map

@@ -1 +1 @@
-{"version":3,"file":"files.js","sourceRoot":"","sources":["../../src/utils/files.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sDAA0B;AAC1B,oDAA2B;AAE3B,IAAM,QAAQ,GAAG,UAAO,IAAY;IAClC,sBAAA,qBAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,EAAA;SAAA,CAAC;AAEpC,IAAM,eAAe,GAAG,UAAO,QAAgB;;;;;;gBAErC,qBAAM,QAAQ,CAAC,QAAQ,CAAC,EAAA;;gBAA/B,IAAI,GAAG,SAAwB;gBACrC,sBAAO,CAAC,IAAI,EAAE,IAAI,CAAC,EAAC;;;gBAEpB,sBAAO,CAAC,GAAC,CAAC,EAAC;;;;KAEd,CAAC;AAPW,QAAA,eAAe,mBAO1B;AAEK,IAAM,QAAQ,GAAG,UAAO,QAAgB;;;;;gBACtC,KAAA,CAAA,KAAA,oBAAI,CAAA,CAAC,IAAI,CAAA;gBAAC,qBAAM,QAAQ,CAAC,QAAQ,CAAC,EAAA;oBAAzC,sBAAO,cAAU,SAAwB,EAAC,EAAC;;;KAC5C,CAAC;AAFW,QAAA,QAAQ,YAEnB"}
+{"version":3,"file":"files.js","sourceRoot":"","sources":["../../src/utils/files.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sDAA0B;AAC1B,oDAA2B;AAE3B,IAAM,QAAQ,GAAG,UAAO,IAAY;IAClC,sBAAA,qBAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,EAAA;SAAA,CAAC;AAEpC,IAAM,eAAe,GAAG,UAAO,QAAgB;;;;;;gBAErC,qBAAM,QAAQ,CAAC,QAAQ,CAAC,EAAA;;gBAA/B,IAAI,GAAG,SAAwB;gBACrC,sBAAO,CAAC,IAAI,EAAE,IAAI,CAAC,EAAC;;;gBAEpB,sBAAO,CAAC,GAAC,CAAC,EAAC;;;;KAEd,CAAC;AAPW,QAAA,eAAe,mBAO1B;AAEK,IAAM,QAAQ,GAAG,UAAO,QAAgB;;;;;;gBAEpC,KAAA,CAAA,KAAA,oBAAI,CAAA,CAAC,IAAI,CAAA;gBAAC,qBAAM,QAAQ,CAAC,QAAQ,CAAC,EAAA;oBAAzC,sBAAO,cAAU,SAAwB,EAAC,EAAC;;;gBAE3C,sBAAO,IAAI,EAAC;;;;KAEf,CAAC;AANW,QAAA,QAAQ,YAMnB"}

package/dist/utils/gitlab.d.ts

@@ -15,5 +15,5 @@ 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 upsertAllVariables: (vorpal: CommandInstance, variables: Record<string, string>, env: string, componentName: string) => Promise<void>;
+export declare const upsertAllVariables: (vorpal: CommandInstance, variables: Record<string, any>, env: string, componentName: string) => Promise<void>;
 export {};

package/dist/utils/gitlab.js

@@ -35,12 +35,22 @@ 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 __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 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 = void 0;
 var child_process_promise_1 = require("child-process-promise");
+var lodash_1 = require("lodash");
 var memoizee_1 = __importDefault(require("memoizee"));
 var node_fetch_1 = __importDefault(require("node-fetch"));
 var open_1 = __importDefault(require("open"));
@@ -138,14 +148,27 @@ var getProjectInfo = function (vorpal) { return __awaiter(void 0, void 0, void 0
 }); };
 exports.getProjectInfo = getProjectInfo;
 exports.getAllVariables = (0, memoizee_1["default"])(function (vorpal) { return __awaiter(void 0, void 0, void 0, function () {
-    var id;
+    var id, all, result, page;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0: return [4 /*yield*/, (0, exports.getProjectInfo)(vorpal)];
             case 1:
                 id = (_a.sent()).id;
-                return [4 /*yield*/, (0, exports.doGitlabRequest)(vorpal, "projects/".concat(id, "/variables"))];
-            case 2: return [2 /*return*/, _a.sent()];
+                all = [];
+                page = 1;
+                _a.label = 2;
+            case 2: return [4 /*yield*/, (0, exports.doGitlabRequest)(vorpal, 
+                // 100 is max page size
+                "projects/".concat(id, "/variables?per_page=100&page=").concat(page))];
+            case 3:
+                result = _a.sent();
+                page++;
+                all = __spreadArray(__spreadArray([], all, true), result, true);
+                _a.label = 4;
+            case 4:
+                if ((result === null || result === void 0 ? void 0 : result.length) > 0) return [3 /*break*/, 2];
+                _a.label = 5;
+            case 5: return [2 /*return*/, all];
         }
     });
 }); }, { promise: true });
@@ -171,7 +194,7 @@ var updateVariable = function (vorpal, projectId, key, value) { return __awaiter
     });
 }); };
 var upsertAllVariables = function (vorpal, variables, env, componentName) { return __awaiter(void 0, void 0, void 0, function () {
-    var id, _i, _a, _b, key, value, fullKey, e_1;
+    var id, _i, _a, _b, key, value, fullKey, valueSanitized, e_1;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4 /*yield*/, (0, exports.getProjectInfo)(vorpal)];
@@ -183,16 +206,17 @@ var upsertAllVariables = function (vorpal, variables, env, componentName) { retu
                 if (!(_i < _a.length)) return [3 /*break*/, 9];
                 _b = _a[_i], key = _b[0], value = _b[1];
                 fullKey = "CL_" + env + "_" + componentName + "_" + key;
+                valueSanitized = (0, lodash_1.isObject)(value) ? JSON.stringify(value) : "".concat(value);
                 _c.label = 3;
             case 3:
                 _c.trys.push([3, 5, 7, 8]);
-                return [4 /*yield*/, updateVariable(vorpal, id, fullKey, value)];
+                return [4 /*yield*/, updateVariable(vorpal, id, fullKey, valueSanitized)];
             case 4:
                 _c.sent();
                 return [3 /*break*/, 8];
             case 5:
                 e_1 = _c.sent();
-                return [4 /*yield*/, createVariable(vorpal, id, fullKey, value)];
+                return [4 /*yield*/, createVariable(vorpal, id, fullKey, valueSanitized)];
             case 6:
                 _c.sent();
                 return [3 /*break*/, 8];

package/dist/utils/gitlab.js.map

@@ -1 +1 @@
-{"version":3,"file":"gitlab.js","sourceRoot":"","sources":["../../src/utils/gitlab.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+DAA6C;AAC7C,sDAAgC;AAChC,0DAA+B;AAC/B,8CAAwB;AAExB,6CAA4E;AAE5E,IAAM,SAAS,GAAG,8BAA8B,CAAC;AAC1C,IAAM,cAAc,GAAG,UAAO,MAAuB;;;;oBACpD,qBAAM,IAAA,2BAAa,EAAC,SAAS,CAAC,EAAA;;qBAAhC,CAAC,CAAC,SAA8B,CAAC,EAAjC,wBAAiC;gBACnC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBACf,MAAM,CAAC,GAAG,CACR,+DAA+D,CAChE,CAAC;gBACF,MAAM,CAAC,GAAG,CAAC,mDAAmD,CAAC,CAAC;gBAChE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBACf,MAAM,CAAC,GAAG,CAAC,yCAAyC,CAAC,CAAC;gBACtD,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBACY,qBAAM,MAAM,CAAC,MAAM,CAAC;wBAC7C,SAAO,EAAE,IAAI;wBACb,OAAO,EAAE,IAAI;wBACb,IAAI,EAAE,gBAAgB;wBACtB,IAAI,EAAE,QAAQ;qBACf,CAAC,EAAA;;gBALM,cAAc,GAAK,CAAA,SAKzB,CAAA,eALoB;gBAOtB,IAAA,iBAAI,EAAC,wDAAwD,CAAC,CAAC;gBAE/D,MAAM,CAAC,GAAG,CAAC,+CAA+C,CAAC,CAAC;gBAElC,qBAAM,MAAM,CAAC,MAAM,CAAC;wBAC5C,IAAI,EAAE,QAAQ;wBACd,IAAI,EAAE,eAAe;wBACrB,SAAO,EAAE,EAAE;wBACX,OAAO,EAAE,6BAA6B;qBACvC,CAAC,EAAA;;gBALM,aAAa,GAAK,CAAA,SAKxB,CAAA,cALmB;qBAMjB,aAAa,EAAb,wBAAa;gBACf,qBAAM,IAAA,2BAAa,EAAC,SAAS,EAAE,aAAa,CAAC,EAAA;;gBAA7C,SAA6C,CAAC;;oBAGlD,sBAAO,IAAA,2BAAa,EAAC,SAAS,CAAC,EAAC;;;KACjC,CAAC;AAhCW,QAAA,cAAc,kBAgCzB;AAEK,IAAM,eAAe,GAAG,UAC7B,MAAuB,EACvB,IAAY,EACZ,IAAqB,EACrB,MAAgB;IADhB,qBAAA,EAAA,gBAAqB;;;;;wBAGH,qBAAM,IAAA,sBAAc,EAAC,MAAM,CAAC,EAAA;;oBAAxC,SAAS,GAAG,SAA4B;oBAExC,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;oBAEzC,qBAAM,IAAA,uBAAK,EAAC,uCAAgC,IAAI,CAAE,EAAE;4BACjE,MAAM,QAAA;4BACN,OAAO,EAAE;gCACP,cAAc,EAAE,kBAAkB;gCAClC,eAAe,EAAE,SAAS;6BAC3B;4BACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;yBAC3B,CAAC,EAAA;;oBAPI,MAAM,GAAG,SAOb;oBAEF,IAAI,MAAM,CAAC,MAAM,IAAI,GAAG,IAAI,MAAM,CAAC,MAAM,GAAG,GAAG,EAAE;wBAC/C,sBAAO,MAAM,CAAC,IAAI,EAAE,EAAC;qBACtB;oBAED,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;yBAEV,KAAK;+EAC4B,MAAM,CAAC,MAAM,gBACpD,MAAM,CAAC,UAAU;oBACF,KAAA,CAAA,KAAA,IAAI,CAAA,CAAC,SAAS,CAAA;oBAAC,qBAAM,MAAM,CAAC,IAAI,EAAE,EAAA;wBAHrD,MAAM,cAAI,KAAK,WACb,cAEiB,cAAe,SAAmB,EAAE,IAAI,EAAE,CAAC,EAAC,EAAE,KAChE,CAAC;;;;CACH,CAAC;AA9BW,QAAA,eAAe,mBA8B1B;AAEK,IAAM,cAAc,GAAG,UAC5B,MAAuB;;;;oBAGrB,qBAAM,IAAA,4BAAI,EAAC,oCAAoC,CAAC,EAAA;;gBAD5C,kBAAkB,GAAG,CACzB,SAAgD,CACjD,CAAC,MAAM,CAAC,IAAI,EAAE;gBACT,WAAW,GAAG,gDAAgD,CAAC,IAAI,CACvE,kBAAkB,CACnB,CAAC;gBACc,qBAAM,IAAA,uBAAe,EACnC,MAAM,EACN,mBAAY,kBAAkB,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAE,CACjD,EAAA;;gBAHK,OAAO,GAAG,SAGf;gBACD,sBAAO,OAAO,EAAC;;;KAChB,CAAC;AAdW,QAAA,cAAc,kBAczB;AAUW,QAAA,eAAe,GAAG,IAAA,qBAAQ,EACrC,UAAO,MAAuB;;;;oBACb,qBAAM,IAAA,sBAAc,EAAC,MAAM,CAAC,EAAA;;gBAAnC,EAAE,GAAK,CAAA,SAA4B,CAAA,GAAjC;gBACH,qBAAM,IAAA,uBAAe,EAAC,MAAM,EAAE,mBAAY,EAAE,eAAY,CAAC,EAAA;oBAAhE,sBAAO,SAAyD,EAAC;;;KAClE,EACD,EAAE,OAAO,EAAE,IAAI,EAAE,CAClB,CAAC;AAEF,IAAM,cAAc,GAAG,UACrB,MAAuB,EACvB,SAAiB,EACjB,GAAW,EACX,KAAa;;;oBAEN,qBAAM,IAAA,uBAAe,EAAC,MAAM,EAAE,mBAAY,SAAS,eAAY,EAAE;oBACtE,GAAG,KAAA;oBACH,KAAK,OAAA;iBACN,CAAC,EAAA;oBAHF,sBAAO,SAGL,EAAC;;;KACJ,CAAC;AAEF,IAAM,cAAc,GAAG,UACrB,MAAuB,EACvB,SAAiB,EACjB,GAAW,EACX,KAAa;;;oBAEN,qBAAM,IAAA,uBAAe,EAC1B,MAAM,EACN,mBAAY,SAAS,wBAAc,GAAG,CAAE,EACxC;oBACE,KAAK,OAAA;iBACN,EACD,IAAI,CACL,EAAA;oBAPD,sBAAO,SAON,EAAC;;;KACH,CAAC;AACK,IAAM,kBAAkB,GAAG,UAChC,MAAuB,EACvB,SAAiC,EACjC,GAAW,EACX,aAAqB;;;;oBAEN,qBAAM,IAAA,sBAAc,EAAC,MAAM,CAAC,EAAA;;gBAAnC,EAAE,GAAK,CAAA,SAA4B,CAAA,GAAjC;sBAEgD,EAA/B,KAAA,MAAM,CAAC,OAAO,CAAC,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,EAAE,CAAC;;;qBAA/B,CAAA,cAA+B,CAAA;gBAA/C,WAAY,EAAX,GAAG,QAAA,EAAE,KAAK,QAAA;gBACd,OAAO,GAAG,KAAK,GAAG,GAAG,GAAG,GAAG,GAAG,aAAa,GAAG,GAAG,GAAG,GAAG,CAAC;;;;gBAG5D,qBAAM,cAAc,CAAC,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,EAAA;;gBAAhD,SAAgD,CAAC;;;;gBAEjD,qBAAM,cAAc,CAAC,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,EAAA;;gBAAhD,SAAgD,CAAC;;;gBAEjD,uBAAe,CAAC,KAAK,EAAE,CAAC;;;gBARD,IAA+B,CAAA;;;;;KAW3D,CAAC;AAnBW,QAAA,kBAAkB,sBAmB7B"}
+{"version":3,"file":"gitlab.js","sourceRoot":"","sources":["../../src/utils/gitlab.ts"],"names":[],"mappings":"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"}

package/dist/utils/passwordstore/index.d.ts

@@ -4,5 +4,5 @@ export declare const hasBitwarden: () => any;
 export declare const readPass: (path: string) => Promise<any>;
 export declare const syncBitwarden: (force?: boolean) => Promise<void>;
 export declare const insertPass: (path: string, content: string) => Promise<void>;
+export declare const trashItem: (path: string) => Promise<any>;
 export declare const editPass: (path: string) => Promise<void>;
-export declare const readPassEnvVars: (path: string) => Promise<{}>;

package/dist/utils/passwordstore/index.js

@@ -50,14 +50,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
-exports.readPassEnvVars = exports.editPass = exports.insertPass = exports.syncBitwarden = exports.readPass = exports.hasBitwarden = exports.getOrganization = exports.getCollection = void 0;
+exports.editPass = exports.trashItem = exports.insertPass = exports.syncBitwarden = exports.readPass = exports.hasBitwarden = exports.getOrganization = exports.getCollection = void 0;
 var child_process_promise_1 = require("child-process-promise");
 var command_exists_promise_1 = __importDefault(require("command-exists-promise"));
 var dayjs_1 = __importDefault(require("dayjs"));
 var fs_extra_1 = require("fs-extra");
-var js_yaml_1 = __importDefault(require("js-yaml"));
 var tmp_promise_1 = require("tmp-promise");
-var formatEnvVars_1 = __importDefault(require("../formatEnvVars"));
 var getEditor_1 = __importDefault(require("../getEditor"));
 var preferences_1 = require("../preferences");
 var DEBUG = false;
@@ -164,10 +162,7 @@ var execBitwardenCommand = function (command) { return __awaiter(void 0, void 0,
             case 10:
                 _a.sent();
                 return [2 /*return*/, execBitwardenCommand(command)];
-            case 11:
-                console.error(e_1);
-                console.log("wooops", e_1.message);
-                _a.label = 12;
+            case 11: throw e_1;
             case 12: return [3 /*break*/, 13];
             case 13: return [2 /*return*/];
         }
@@ -327,6 +322,21 @@ var share = function (itemId) { return __awaiter(void 0, void 0, void 0, functio
         }
     });
 }); };
+var trashItem = function (path) { return __awaiter(void 0, void 0, void 0, function () {
+    var item, result;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0: return [4 /*yield*/, getItem(path)];
+            case 1:
+                item = _a.sent();
+                return [4 /*yield*/, execBitwardenCommand("delete item ".concat(item.id))];
+            case 2:
+                result = _a.sent();
+                return [2 /*return*/, result];
+        }
+    });
+}); };
+exports.trashItem = trashItem;
 var editPass = function (path) { return __awaiter(void 0, void 0, void 0, function () {
     var item;
     return __generator(this, function (_a) {
@@ -365,17 +375,4 @@ var editPass = function (path) { return __awaiter(void 0, void 0, void 0, functi
     });
 }); };
 exports.editPass = editPass;
-var readPassEnvVars = function (path) { return __awaiter(void 0, void 0, void 0, function () {
-    var yamlstring;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0: return [4 /*yield*/, (0, exports.readPass)(path)];
-            case 1:
-                yamlstring = _a.sent();
-                // if a value is an object, we convert it to strings
-                return [2 /*return*/, (0, formatEnvVars_1["default"])(js_yaml_1["default"].load(yamlstring))];
-        }
-    });
-}); };
-exports.readPassEnvVars = readPassEnvVars;
 //# sourceMappingURL=index.js.map

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

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

package/dist/utils/projects/index.d.ts

@@ -1,4 +1,4 @@
-export declare const getGitRoot: () => Promise<any>;
+export declare const getGitRoot: () => Promise<string>;
 export declare const getRootGitlabCiFile: () => Promise<string>;
 export declare const readRootGitlabCiFile: () => Promise<any[]>;
 export declare const hasGitlabCiFile: () => Promise<boolean>;

package/package.json

@@ -17,7 +17,7 @@
   },
   "dependencies": {
     "@bitwarden/cli": "^1.8.0",
-    "@catladder/pipeline": "0.0.0-fudi",
+    "@catladder/pipeline": "0.0.0",
     "@kubernetes/client-node": "^0.16.1",
     "child-process-promise": "^2.2.1",
     "clipboardy": "^2.2.0",
@@ -60,5 +60,5 @@
     "eslint": "^8.7.0",
     "typescript": "^4.5.4"
   },
-  "version": "0.0.0-main-d0a1e9f1"
+  "version": "0.0.0-main-67fbbdf8"
 }

package/src/apps/cli/cli.ts

@@ -9,12 +9,13 @@ import project from "./commands/project";
 import theStuffThatReallyMatters from "./commands/theStuffThatReallyMatters";
 
 import { getProjectConfig } from "../../config/getProjectConfig";
+import { verify } from "./verify";
 
 export default async () => {
-  const projectConfig = await getProjectConfig();
-  const welcomeMessage = `catladder 2022 😻 version ${packageInfos.version}`;
-
   const vorpal = new Vorpal();
+  verify(vorpal);
+  const welcomeMessage = `catladder 2022 😻 version ${packageInfos.version}`;
+  const projectConfig = await getProjectConfig();
 
   vorpal
     .delimiter("catladder $") // emoji messes with cursor :-( https://github.com/dthree/vorpal/issues/332
@@ -26,6 +27,7 @@ export default async () => {
   if (projectConfig) {
     vorpal.log("project: " + projectConfig.appName);
     vorpal.log("customer: " + projectConfig.customerName);
+    vorpal.log("");
   }
 
   general(vorpal);

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

@@ -13,6 +13,24 @@ import { upsertAllVariables } from "../../../../utils/gitlab";
 import { delay } from "../../../../utils/promise";
 import { allEnvsAndAllComponents } from "./utils/autocompletions";
 
+/* for convenience, parse json objects. that makes it easier to edit secrets that are object */
+const resolveJson = (v: Record<string, Record<string, string>>) =>
+  Object.fromEntries(
+    Object.entries(v).map(([c, secrets]) => {
+      return [
+        c,
+        Object.fromEntries(
+          Object.entries(secrets).map(([key, value]) => {
+            try {
+              return [key, JSON.parse(value)];
+            } catch (e) {
+              return [key, value];
+            }
+          })
+        ),
+      ];
+    })
+  );
 const getEnvVarsToEdit = async (env: string, componentName: string) => {
   const { secretEnvVarKeys } = await getEnvironment(env, componentName);
 
@@ -26,7 +44,7 @@ const doItFor = async (
   env: string,
   components: string[]
 ) => {
-  let valuesToEdit = Object.fromEntries(
+  let valuesToEdit: Record<string, Record<string, string>> = Object.fromEntries(
     await Promise.all(
       components.map(async (componentName) => [
         componentName,
@@ -37,7 +55,7 @@ const doItFor = async (
   let hasErrors = true;
   while (hasErrors) {
     valuesToEdit = await editAsFile(
-      valuesToEdit,
+      resolveJson(valuesToEdit),
       stripIndents`
         Please fill in all secrets for: ${components.join(", ")}
 
@@ -87,6 +105,8 @@ const doItFor = async (
     }
   }
 
+  console.log(JSON.stringify(valuesToEdit, null, 2));
+
   for (const componentName of components) {
     await upsertAllVariables(
       this,

package/src/apps/cli/config/writeConfig.ts

@@ -0,0 +1,61 @@
+import { Config } from "@catladder/pipeline";
+import { spawn } from "child-process-promise";
+import { writeFile } from "fs-extra";
+import { safeDump } from "js-yaml";
+import { format } from "prettier";
+import { CommandInstance } from "vorpal";
+import { getGitRoot } from "../../../utils/projects";
+
+export const writeConfig = async (
+  vorpal: CommandInstance,
+  config: Config,
+  options?: {
+    endComment?: string;
+  }
+) => {
+  const gitRoot = await getGitRoot();
+  const TS = "typescript (recommended)";
+  const { configType } = await vorpal.prompt({
+    type: "list",
+    name: "configType",
+    choices: [TS, "yaml"],
+    message: "In which format do you want the config? 🤔",
+  });
+  if (configType === TS) {
+    const content = format(`
+      import type { Config } from "@catladder/pipeline";
+      
+      const config: Config = ${JSON.stringify(config)};
+
+      export default config;
+
+     
+      ${options?.endComment ? `/*${options.endComment}*/` : ""}
+      
+      `);
+
+    await writeFile(gitRoot + "/catladder.ts", content, {
+      encoding: "utf-8",
+    });
+    vorpal.log("adding type @catladder/pipeline....");
+    await spawn("yarn add @catladder/pipeline -D", {
+      shell: true,
+    });
+  } else {
+    const content = safeDump(config);
+
+    await writeFile(
+      gitRoot + "/catladder.yml",
+      content +
+        "\n\n" +
+        (options.endComment
+          ? "# " + options.endComment.split("\n").join("\n# ")
+          : ""),
+      {
+        encoding: "utf-8",
+      }
+    );
+  }
+  vorpal.log("done!");
+  vorpal.log("");
+};

package/src/apps/cli/verify/index.ts

@@ -0,0 +1,24 @@
+import Vorpal from "vorpal";
+import {
+  getGitlabCi,
+  getProjectConfig,
+} from "../../../config/getProjectConfig";
+import { migrateV2 } from "./migration/fromv2";
+
+export const verify = async (vorpal: Vorpal) => {
+  const projectConfig = await getProjectConfig();
+  try {
+    const gitlabCi = getGitlabCi();
+
+    if (!gitlabCi) {
+      vorpal.log("not initialized");
+    }
+
+    if (!projectConfig) {
+      vorpal.log("no project config, needs migration");
+      await migrateV2(vorpal);
+    }
+  } catch (e) {
+    // no gitroot, ignore
+  }
+};

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

@@ -0,0 +1,157 @@
+import {
+  BuildConfig,
+  Config,
+  DeployConfigKubernetes,
+  Env,
+} from "@catladder/pipeline";
+import { readFile, writeFile } from "fs-extra";
+import { isEmpty } from "lodash";
+import Vorpal from "vorpal";
+import {
+  getGitlabCi,
+  getGitlabCiFilePath,
+} from "../../../../config/getProjectConfig";
+import { readYaml } from "../../../../utils/files";
+import { getGitRoot } from "../../../../utils/projects";
+import { writeConfig } from "../../config/writeConfig";
+import { migrateSecrets } from "./migrateSecrets";
+import { detectBuildConfig, OldGitlabCiFile } from "./oldGitlabCi";
+export const LEGACY_ENVS = [
+  "dev-local",
+  "dev",
+  "review",
+  "stage",
+  "prod",
+] as const;
+
+const arrayToRecord = (arr: { name: string }[]): Record<string, any> => {
+  if (!arr) return undefined;
+  return Object.fromEntries(arr.map(({ name, ...rest }) => [name, rest]));
+};
+
+const transformVars = (rawVars: {
+  public: Record<string, any>;
+  secret: Record<string, any>;
+  fromCommponents: any;
+}) => {
+  if (rawVars.fromCommponents) {
+    console.warn("cant transform legacy fromCommponents");
+  }
+
+  return {
+    public: rawVars.public,
+    secret: rawVars.secret ? Object.keys(rawVars.secret) : undefined,
+  };
+};
+
+const transformValues = (
+  valuesIn: Record<string, any>
+): DeployConfigKubernetes["values"] => {
+  if (isEmpty(valuesIn)) {
+    return undefined;
+  }
+  delete valuesIn?.application?.hostname;
+  delete valuesIn?.application?.command;
+
+  return {
+    ...valuesIn,
+    jobs: arrayToRecord(valuesIn?.jobs),
+    cronjobs: arrayToRecord(valuesIn?.cronjobs),
+  };
+};
+export const migrateV2 = async (vorpal: Vorpal) => {
+  const gitlabCi: OldGitlabCiFile = await getGitlabCi();
+  const gitRoot = await getGitRoot();
+
+  const { CUSTOMER_NAME, APP_NAME, COMPONENT_NAME, APP_DIR, CLUSTER_NAME } =
+    gitlabCi.variables;
+
+  vorpal
+    .command("migrate")
+
+    .action(async function () {
+      this.log("⚠️ this project uses legacy catladder (v2)");
+      this.log("migrate project?");
+      const { shouldContinue } = await this.prompt({
+        default: true,
+        message: "Migrate? 🤔",
+        name: "shouldContinue",
+        type: "confirm",
+      });
+
+      if (shouldContinue) {
+        const { env, ...baseValues } =
+          (await readYaml(gitRoot + "/values.yml")) ?? {};
+
+        const startCommand = baseValues?.application?.command?.join(" ");
+
+        // we only have one component
+        const config: Config = {
+          customerName: CUSTOMER_NAME,
+          appName: APP_NAME,
+          components: {
+            [COMPONENT_NAME]: {
+              vars: env ? transformVars(env) : undefined,
+              dir: APP_DIR ?? ".",
+              build: {
+                type: detectBuildConfig(gitlabCi),
+                startCommand: startCommand,
+              } as BuildConfig,
+              deploy: {
+                type: "kubernetes",
+                values: transformValues(baseValues),
+                cluster: CLUSTER_NAME,
+              },
+              env: await LEGACY_ENVS.reduce<Promise<Env>>(
+                async (acc, envName) => {
+                  const newEnvName =
+                    envName === "dev-local" ? "local" : envName;
+
+                  const envValues =
+                    (await readYaml(gitRoot + `/values-${envName}.yml`)) ?? {};
+                  const { env, ...rest } = envValues;
+                  const hostname = rest?.application?.hostname;
+                  const values = transformValues(rest);
+                  return {
+                    ...(await acc),
+                    [newEnvName]: {
+                      hostname: hostname,
+                      vars: env ? transformVars(env) : undefined,
+                      deploy: values
+                        ? {
+                            values: values,
+                          }
+                        : undefined,
+                    },
+                  };
+                },
+                Promise.resolve({})
+              ),
+            },
+          },
+        };
+        this.log("migrate secrets");
+        for (const env of LEGACY_ENVS) {
+          await migrateSecrets(this, gitlabCi, env);
+        }
+
+        const comment =
+          "Old migrated config:\n\n" +
+          (await readFile(await getGitlabCiFilePath(), {
+            encoding: "utf-8",
+          }));
+        this.log("write config");
+        await writeConfig(this, config, {
+          endComment: comment,
+        });
+        this.log("write gitlab-ci.yml");
+        await writeFile(
+          await getGitlabCiFilePath(),
+          "include: https://git.panter.ch/api/v4/projects/catladder%2Fcatladder/packages/generic/ci-includes/main/gitlab-ci.yml",
+          { encoding: "utf-8" }
+        );
+      }
+    });
+
+  vorpal.exec("migrate");
+};

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

@@ -0,0 +1,32 @@
+import { load } from "js-yaml";
+import { CommandInstance } from "vorpal";
+import { upsertAllVariables } from "../../../../utils/gitlab";
+import { readPass, trashItem } from "../../../../utils/passwordstore";
+import { LEGACY_ENVS } from "./fromv2";
+import { OldGitlabCiFile } from "./oldGitlabCi";
+
+const getPassPath = (gitlabCi: OldGitlabCiFile, env: string) => {
+  return `${gitlabCi.variables.CUSTOMER_NAME}/${gitlabCi.variables.APP_NAME}/${env}/secrets.yml`;
+};
+
+export const migrateSecrets = async (
+  vorpal: CommandInstance,
+  gitlabCi: OldGitlabCiFile,
+  env: typeof LEGACY_ENVS[number]
+) => {
+  const path = getPassPath(gitlabCi, env);
+  try {
+    const yamlstring = await readPass(path);
+    const secrets = load(yamlstring);
+
+    await upsertAllVariables(
+      vorpal,
+      secrets,
+      env === "dev-local" ? "local" : env,
+      gitlabCi.variables.COMPONENT_NAME
+    );
+    await trashItem(path);
+  } catch (e) {
+    console.warn(`could not migrate secrets for env '${env}': ${e}`);
+  }
+};