@catladder/cli 0.0.0-inventory-8c6dd3ed → 0.0.0-inventory-e13bc72d

package/dist/apps/cli/commands/project/setup/setupCloudRun.js

@@ -88,7 +88,9 @@ var setupCloudRun = function (instance, context) { return __awaiter(void 0, void
                 instance.log("domain suffix: " + suffix);
                 return [4 /*yield*/, (0, gitlab_1.upsertAllVariables)(instance, (_a = {},
                         _a[pipeline_1.GCLOUD_RUN_CANONICAL_HOST_SUFFIX] = suffix,
-                        _a), context.environment.shortName, context.componentName)];
+                        _a), context.environment.shortName, context.componentName, false, // backup
+                    false // masked
+                    )];
             case 5:
                 _b.sent();
                 return [2 /*return*/];

package/dist/apps/cli/commands/project/setup/setupCloudRun.js.map

@@ -1 +1 @@
-{"version":3,"file":"setupCloudRun.js","sourceRoot":"","sources":["../../../../../../src/apps/cli/commands/project/setup/setupCloudRun.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAI6B;AAG7B,6EAAwF;AACxF,kGAAiG;AACjG,uEAA4E;AAC5E,yEAAgG;AAChG,sDAAiE;AAE1D,IAAM,aAAa,GAAG,UAC3B,QAAyB,EACzB,OAAgB;;;;;;gBAEhB,IAAI,CAAC,IAAA,yBAAc,EAAC,OAAO,CAAC,eAAe,CAAC,MAAM,EAAE,iBAAiB,CAAC,EAAE;oBACtE,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;iBACnE;gBAEK,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC;gBAE9C,kBAAkB;gBAElB,QAAQ,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;gBAC3C,qBAAM,IAAA,qCAAoB,EACxB,CAAC,oBAAoB,EAAE,iCAAiC,CAAC,EACzD,MAAM,CACP,EAAA;;gBAHD,SAGC,CAAC;gBACF,QAAQ,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC;gBAC7C,qBAAM,IAAA,iDAA6B,EAAC,MAAM,CAAC,EAAA;;gBAA3C,SAA2C,CAAC;gBAE5C,QAAQ,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAC;gBACjD,qBAAM,IAAA,yDAAuC,EAC3C,QAAQ,EACR,OAAO,EACP;wBACE,SAAS,EAAE,MAAM,CAAC,SAAS;wBAC3B,WAAW,EAAE,yBAAyB;wBACtC,WAAW,EAAE,8CAA8C;wBAC3D,IAAI,EAAE,MAAM;wBACZ,yLAAyL;wBACzL,KAAK,EAAE;4BACL,kCAAkC;4BAClC,iBAAiB;4BACjB,8BAA8B;yBAC/B;qBACF,EACD,wCAA6B,CAC9B,EAAA;;gBAhBD,SAgBC,CAAC;gBAEF,+CAA+C;gBAC/C,qDAAqD;gBACrD,qEAAqE;gBACrE,iEAAiE;gBACjE,QAAQ,CAAC,GAAG,CACV,gEAAgE,CACjE,CAAC;gBACa,qBAAM,IAAA,iDAAuB,EAAC,MAAM,CAAC,EAAA;;gBAA9C,MAAM,GAAG,SAAqC;gBACpD,QAAQ,CAAC,GAAG,CAAC,iBAAiB,GAAG,MAAM,CAAC,CAAC;gBAEzC,qBAAM,IAAA,2BAAkB,EACtB,QAAQ;wBAEN,GAAC,2CAAgC,IAAG,MAAM;6BAE5C,OAAO,CAAC,WAAW,CAAC,SAAS,EAC7B,OAAO,CAAC,aAAa,CACtB,EAAA;;gBAPD,SAOC,CAAC;;;;KACH,CAAC;AAzDW,QAAA,aAAa,iBAyDxB"}
+{"version":3,"file":"setupCloudRun.js","sourceRoot":"","sources":["../../../../../../src/apps/cli/commands/project/setup/setupCloudRun.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAI6B;AAG7B,6EAAwF;AACxF,kGAAiG;AACjG,uEAA4E;AAC5E,yEAAgG;AAChG,sDAAiE;AAE1D,IAAM,aAAa,GAAG,UAC3B,QAAyB,EACzB,OAAgB;;;;;;gBAEhB,IAAI,CAAC,IAAA,yBAAc,EAAC,OAAO,CAAC,eAAe,CAAC,MAAM,EAAE,iBAAiB,CAAC,EAAE;oBACtE,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;iBACnE;gBAEK,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC;gBAE9C,kBAAkB;gBAElB,QAAQ,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;gBAC3C,qBAAM,IAAA,qCAAoB,EACxB,CAAC,oBAAoB,EAAE,iCAAiC,CAAC,EACzD,MAAM,CACP,EAAA;;gBAHD,SAGC,CAAC;gBACF,QAAQ,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC;gBAC7C,qBAAM,IAAA,iDAA6B,EAAC,MAAM,CAAC,EAAA;;gBAA3C,SAA2C,CAAC;gBAE5C,QAAQ,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAC;gBACjD,qBAAM,IAAA,yDAAuC,EAC3C,QAAQ,EACR,OAAO,EACP;wBACE,SAAS,EAAE,MAAM,CAAC,SAAS;wBAC3B,WAAW,EAAE,yBAAyB;wBACtC,WAAW,EAAE,8CAA8C;wBAC3D,IAAI,EAAE,MAAM;wBACZ,yLAAyL;wBACzL,KAAK,EAAE;4BACL,kCAAkC;4BAClC,iBAAiB;4BACjB,8BAA8B;yBAC/B;qBACF,EACD,wCAA6B,CAC9B,EAAA;;gBAhBD,SAgBC,CAAC;gBAEF,+CAA+C;gBAC/C,qDAAqD;gBACrD,qEAAqE;gBACrE,iEAAiE;gBACjE,QAAQ,CAAC,GAAG,CACV,gEAAgE,CACjE,CAAC;gBACa,qBAAM,IAAA,iDAAuB,EAAC,MAAM,CAAC,EAAA;;gBAA9C,MAAM,GAAG,SAAqC;gBACpD,QAAQ,CAAC,GAAG,CAAC,iBAAiB,GAAG,MAAM,CAAC,CAAC;gBAEzC,qBAAM,IAAA,2BAAkB,EACtB,QAAQ;wBAEN,GAAC,2CAAgC,IAAG,MAAM;6BAE5C,OAAO,CAAC,WAAW,CAAC,SAAS,EAC7B,OAAO,CAAC,aAAa,EACrB,KAAK,EAAE,SAAS;oBAChB,KAAK,CAAC,SAAS;qBAChB,EAAA;;gBATD,SASC,CAAC;;;;KACH,CAAC;AA3DW,QAAA,aAAa,iBA2DxB"}

package/dist/bundles/catenv/index.js

@@ -779,7 +779,8 @@ var getVariableValueByRawName = function (vorpal, rawName) { return __awaiter(vo
 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, environment_scope) {
+var createVariable = function (vorpal, projectId, key, value, masked, environment_scope) {
+    if (masked === void 0) { masked = true; }
     if (environment_scope === void 0) { environment_scope = "*"; }
     return __awaiter(void 0, void 0, void 0, function () {
         return __generator(this, function (_a) {
@@ -787,7 +788,7 @@ var createVariable = function (vorpal, projectId, key, value, environment_scope)
                 case 0: return [4 /*yield*/, (0, exports.doGitlabRequest)(vorpal, "projects/".concat(projectId, "/variables"), {
                         key: key,
                         value: value,
-                        masked: isMaskable(value),
+                        masked: masked && isMaskable(value),
                         environment_scope: environment_scope
                     })];
                 case 1: return [2 /*return*/, _a.sent()];
@@ -795,17 +796,20 @@ var createVariable = function (vorpal, projectId, key, value, environment_scope)
         });
     });
 };
-var updateVariable = 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/").concat(key), {
-                    value: value,
-                    masked: isMaskable(value)
-                }, true)];
-            case 1: return [2 /*return*/, _a.sent()];
-        }
+var updateVariable = function (vorpal, projectId, key, value, masked) {
+    if (masked === void 0) { masked = true; }
+    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/").concat(key), {
+                        value: value,
+                        masked: masked && isMaskable(value)
+                    }, true)];
+                case 1: return [2 /*return*/, _a.sent()];
+            }
+        });
     });
-}); };
+};
 var getAllCatladderEnvVarsInGitlab = function (vorpal) { return __awaiter(void 0, void 0, void 0, function () {
     var allVariables;
     return __generator(this, function (_a) {
@@ -835,8 +839,10 @@ var getAllCatladderEnvVarsInGitlab = function (vorpal) { return __awaiter(void 0
         }
     });
 }); };
-var upsertAllVariables = function (vorpal, variables, env, componentName, backup) {
+var upsertAllVariables = function (vorpal, variables, env, componentName, backup, masked // FIXME: would be better to have this per variable
+) {
     if (backup === void 0) { backup = true; }
+    if (masked === void 0) { masked = true; }
     return __awaiter(void 0, void 0, void 0, function () {
         var id, existingVariables, _i, _a, _b, key, value, fullKey, valueSanitized, exists, oldValue, changed;
         var _c;
@@ -861,18 +867,18 @@ var upsertAllVariables = function (vorpal, variables, env, componentName, backup
                     if (!changed) return [3 /*break*/, 10];
                     if (!exists) return [3 /*break*/, 7];
                     vorpal.log("changed: ".concat(key));
-                    return [4 /*yield*/, updateVariable(vorpal, id, fullKey, valueSanitized)];
+                    return [4 /*yield*/, updateVariable(vorpal, id, fullKey, valueSanitized, masked)];
                 case 4:
                     _d.sent();
                     if (!backup) return [3 /*break*/, 6];
-                    return [4 /*yield*/, createVariable(vorpal, id, fullKey + "_backup_" + new Date().getTime(), oldValue, "_backup")];
+                    return [4 /*yield*/, createVariable(vorpal, id, fullKey + "_backup_" + new Date().getTime(), oldValue, true, "_backup")];
                 case 5:
                     _d.sent();
                     _d.label = 6;
                 case 6: return [3 /*break*/, 9];
                 case 7:
                     vorpal.log("new    : ".concat(key));
-                    return [4 /*yield*/, createVariable(vorpal, id, fullKey, valueSanitized)];
+                    return [4 /*yield*/, createVariable(vorpal, id, fullKey, valueSanitized, masked)];
                 case 8:
                     _d.sent();
                     _d.label = 9;
@@ -39832,7 +39838,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "inventory-8c6dd3ed" || 0;
+exports.PIPELINE_IMAGE_TAG = "inventory-e13bc72d" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -42225,7 +42231,14 @@ var createInventoryReporitngJob = function (context) {
     name: "inventory:reporting",
     stage: "reporting",
     variables: {},
-    script: [printReportComand]
+    script: [printReportComand],
+    needsStages: [{
+      stage: "build",
+      artifacts: true
+    }, {
+      stage: "deploy",
+      artifacts: true
+    }]
   };
 };
 

package/dist/bundles/cli/index.js

@@ -4112,7 +4112,9 @@ var setupCloudRun = function (instance, context) { return __awaiter(void 0, void
                 instance.log("domain suffix: " + suffix);
                 return [4 /*yield*/, (0, gitlab_1.upsertAllVariables)(instance, (_a = {},
                         _a[pipeline_1.GCLOUD_RUN_CANONICAL_HOST_SUFFIX] = suffix,
-                        _a), context.environment.shortName, context.componentName)];
+                        _a), context.environment.shortName, context.componentName, false, // backup
+                    false // masked
+                    )];
             case 5:
                 _b.sent();
                 return [2 /*return*/];
@@ -7300,7 +7302,8 @@ var getVariableValueByRawName = function (vorpal, rawName) { return __awaiter(vo
 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, environment_scope) {
+var createVariable = function (vorpal, projectId, key, value, masked, environment_scope) {
+    if (masked === void 0) { masked = true; }
     if (environment_scope === void 0) { environment_scope = "*"; }
     return __awaiter(void 0, void 0, void 0, function () {
         return __generator(this, function (_a) {
@@ -7308,7 +7311,7 @@ var createVariable = function (vorpal, projectId, key, value, environment_scope)
                 case 0: return [4 /*yield*/, (0, exports.doGitlabRequest)(vorpal, "projects/".concat(projectId, "/variables"), {
                         key: key,
                         value: value,
-                        masked: isMaskable(value),
+                        masked: masked && isMaskable(value),
                         environment_scope: environment_scope
                     })];
                 case 1: return [2 /*return*/, _a.sent()];
@@ -7316,17 +7319,20 @@ var createVariable = function (vorpal, projectId, key, value, environment_scope)
         });
     });
 };
-var updateVariable = 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/").concat(key), {
-                    value: value,
-                    masked: isMaskable(value)
-                }, true)];
-            case 1: return [2 /*return*/, _a.sent()];
-        }
+var updateVariable = function (vorpal, projectId, key, value, masked) {
+    if (masked === void 0) { masked = true; }
+    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/").concat(key), {
+                        value: value,
+                        masked: masked && isMaskable(value)
+                    }, true)];
+                case 1: return [2 /*return*/, _a.sent()];
+            }
+        });
     });
-}); };
+};
 var getAllCatladderEnvVarsInGitlab = function (vorpal) { return __awaiter(void 0, void 0, void 0, function () {
     var allVariables;
     return __generator(this, function (_a) {
@@ -7356,8 +7362,10 @@ var getAllCatladderEnvVarsInGitlab = function (vorpal) { return __awaiter(void 0
         }
     });
 }); };
-var upsertAllVariables = function (vorpal, variables, env, componentName, backup) {
+var upsertAllVariables = function (vorpal, variables, env, componentName, backup, masked // FIXME: would be better to have this per variable
+) {
     if (backup === void 0) { backup = true; }
+    if (masked === void 0) { masked = true; }
     return __awaiter(void 0, void 0, void 0, function () {
         var id, existingVariables, _i, _a, _b, key, value, fullKey, valueSanitized, exists, oldValue, changed;
         var _c;
@@ -7382,18 +7390,18 @@ var upsertAllVariables = function (vorpal, variables, env, componentName, backup
                     if (!changed) return [3 /*break*/, 10];
                     if (!exists) return [3 /*break*/, 7];
                     vorpal.log("changed: ".concat(key));
-                    return [4 /*yield*/, updateVariable(vorpal, id, fullKey, valueSanitized)];
+                    return [4 /*yield*/, updateVariable(vorpal, id, fullKey, valueSanitized, masked)];
                 case 4:
                     _d.sent();
                     if (!backup) return [3 /*break*/, 6];
-                    return [4 /*yield*/, createVariable(vorpal, id, fullKey + "_backup_" + new Date().getTime(), oldValue, "_backup")];
+                    return [4 /*yield*/, createVariable(vorpal, id, fullKey + "_backup_" + new Date().getTime(), oldValue, true, "_backup")];
                 case 5:
                     _d.sent();
                     _d.label = 6;
                 case 6: return [3 /*break*/, 9];
                 case 7:
                     vorpal.log("new    : ".concat(key));
-                    return [4 /*yield*/, createVariable(vorpal, id, fullKey, valueSanitized)];
+                    return [4 /*yield*/, createVariable(vorpal, id, fullKey, valueSanitized, masked)];
                 case 8:
                     _d.sent();
                     _d.label = 9;
@@ -350602,7 +350610,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "inventory-8c6dd3ed" || 0;
+exports.PIPELINE_IMAGE_TAG = "inventory-e13bc72d" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -352995,7 +353003,14 @@ var createInventoryReporitngJob = function (context) {
     name: "inventory:reporting",
     stage: "reporting",
     variables: {},
-    script: [printReportComand]
+    script: [printReportComand],
+    needsStages: [{
+      stage: "build",
+      artifacts: true
+    }, {
+      stage: "deploy",
+      artifacts: true
+    }]
   };
 };