@catladder/cli 0.0.0-main-5bebb92e → 0.0.0-main-405bf8b1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/apps/cli/verify/migration/fromv2.js +19 -13
- package/dist/apps/cli/verify/migration/fromv2.js.map +1 -1
- package/dist/apps/cli/verify/migration/migrateSecrets.d.ts +2 -2
- package/dist/apps/cli/verify/migration/migrateSecrets.js +28 -15
- package/dist/apps/cli/verify/migration/migrateSecrets.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -2
- package/src/apps/cli/verify/migration/fromv2.ts +5 -2
- package/src/apps/cli/verify/migration/migrateSecrets.ts +18 -13
|
@@ -64,6 +64,7 @@ var lodash_1 = require("lodash");
|
|
|
64
64
|
var path_1 = require("path");
|
|
65
65
|
var getProjectConfig_1 = require("../../../../config/getProjectConfig");
|
|
66
66
|
var files_1 = require("../../../../utils/files");
|
|
67
|
+
var passwordstore_1 = require("../../../../utils/passwordstore");
|
|
67
68
|
var projects_1 = require("../../../../utils/projects");
|
|
68
69
|
var writeConfig_1 = require("../../config/writeConfig");
|
|
69
70
|
var migrateSecrets_1 = require("./migrateSecrets");
|
|
@@ -158,7 +159,7 @@ var migrateV2 = function (vorpal) { return __awaiter(void 0, void 0, void 0, fun
|
|
|
158
159
|
vorpal.log("💪😼 ok, let's go...");
|
|
159
160
|
vorpal.log("");
|
|
160
161
|
vorpal.log("");
|
|
161
|
-
if (!shouldContinue) return [3 /*break*/,
|
|
162
|
+
if (!shouldContinue) return [3 /*break*/, 16];
|
|
162
163
|
createComponent_1 = function (dir, ciFile) { return __awaiter(_this, void 0, void 0, function () {
|
|
163
164
|
var _a, env, baseValues, startCommand;
|
|
164
165
|
var _b;
|
|
@@ -249,7 +250,7 @@ var migrateV2 = function (vorpal) { return __awaiter(void 0, void 0, void 0, fun
|
|
|
249
250
|
case 3:
|
|
250
251
|
_e = {};
|
|
251
252
|
_a = COMPONENT_NAME;
|
|
252
|
-
return [4 /*yield*/, createComponent_1(
|
|
253
|
+
return [4 /*yield*/, createComponent_1(APP_DIR, gitlabCi)];
|
|
253
254
|
case 4:
|
|
254
255
|
components = (_e[_a] = _f.sent(),
|
|
255
256
|
_e);
|
|
@@ -285,24 +286,29 @@ var migrateV2 = function (vorpal) { return __awaiter(void 0, void 0, void 0, fun
|
|
|
285
286
|
_f.sent();
|
|
286
287
|
this.log("-------------------");
|
|
287
288
|
this.log("migrate secrets");
|
|
288
|
-
|
|
289
|
-
_f.label = 11;
|
|
289
|
+
return [4 /*yield*/, (0, passwordstore_1.syncBitwarden)()];
|
|
290
290
|
case 11:
|
|
291
|
-
if (!(_i < LEGACY_ENVS_1.length)) return [3 /*break*/, 14];
|
|
292
|
-
env = LEGACY_ENVS_1[_i];
|
|
293
|
-
return [4 /*yield*/, (0, migrateSecrets_1.migrateSecrets)(this, gitlabCi, env)];
|
|
294
|
-
case 12:
|
|
295
291
|
_f.sent();
|
|
296
|
-
|
|
292
|
+
_i = 0, LEGACY_ENVS_1 = exports.LEGACY_ENVS;
|
|
293
|
+
_f.label = 12;
|
|
294
|
+
case 12:
|
|
295
|
+
if (!(_i < LEGACY_ENVS_1.length)) return [3 /*break*/, 15];
|
|
296
|
+
env = LEGACY_ENVS_1[_i];
|
|
297
|
+
if (env === "stage" && !STAGING_ENABLED)
|
|
298
|
+
return [2 /*return*/];
|
|
299
|
+
return [4 /*yield*/, (0, migrateSecrets_1.migrateSecrets)(this, config, env)];
|
|
297
300
|
case 13:
|
|
298
|
-
|
|
299
|
-
|
|
301
|
+
_f.sent();
|
|
302
|
+
_f.label = 14;
|
|
300
303
|
case 14:
|
|
304
|
+
_i++;
|
|
305
|
+
return [3 /*break*/, 12];
|
|
306
|
+
case 15:
|
|
301
307
|
this.log("-------------------");
|
|
302
308
|
this.log("done!");
|
|
303
309
|
this.log("-------------------");
|
|
304
|
-
_f.label =
|
|
305
|
-
case
|
|
310
|
+
_f.label = 16;
|
|
311
|
+
case 16: return [2 /*return*/];
|
|
306
312
|
}
|
|
307
313
|
});
|
|
308
314
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fromv2.js","sourceRoot":"","sources":["../../../../../src/apps/cli/verify/migration/fromv2.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"fromv2.js","sourceRoot":"","sources":["../../../../../src/apps/cli/verify/migration/fromv2.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAOA,qCAMkB;AAClB,iCAAiC;AACjC,6BAA4B;AAE5B,wEAG6C;AAC7C,iDAAmD;AACnD,iEAAgE;AAChE,uDAAwD;AACxD,wDAAuD;AACvD,mDAAkD;AAClD,6CAAmE;AACtD,QAAA,WAAW,GAAG;IACzB,WAAW;IACX,KAAK;IACL,QAAQ;IACR,OAAO;IACP,MAAM;CACE,CAAC;AAEX,IAAM,aAAa,GAAG,UAAC,GAAuB;IAC5C,IAAI,CAAC,GAAG;QAAE,OAAO,SAAS,CAAC;IAC3B,OAAO,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,UAAC,EAAiB;QAAf,IAAA,IAAI,UAAA,EAAK,IAAI,cAAf,QAAiB,CAAF;QAAO,OAAA,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;KAAA,CAAC,CAAC,CAAC;AAC1E,CAAC,CAAC;AAEF,IAAM,aAAa,GAAG,UAAC,OAItB;IACC,IAAI,OAAO,CAAC,eAAe,EAAE;QAC3B,OAAO,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAC;KACvD;IAED,OAAO;QACL,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS;KACjE,CAAC;AACJ,CAAC,CAAC;AAEF,IAAM,2BAA2B,GAAG,UAAC,GAAW;IAC9C,OAAO,IAAA,sBAAW,EAAC,GAAG,CAAC;SACpB,MAAM,CAAC,UAAC,IAAI,IAAK,OAAA,IAAA,oBAAS,EAAC,IAAI,CAAC,CAAC,WAAW,EAAE,EAA7B,CAA6B,CAAC;SAC/C,GAAG,CAAC,UAAC,GAAG,IAAK,OAAA,CAAC;QACb,GAAG,KAAA;QACH,EAAE,EAAE,IAAA,WAAI,EAAC,GAAG,EAAE,gBAAgB,CAAC;KAChC,CAAC,EAHY,CAGZ,CAAC;SACF,MAAM,CAAC,UAAC,EAAM;YAAJ,EAAE,QAAA;QAAO,OAAA,IAAA,qBAAU,EAAC,EAAE,CAAC;IAAd,CAAc,CAAC,CAAC;AACxC,CAAC,CAAC;AAEF,IAAM,eAAe,GAAG,UACtB,QAA6B;;IAE7B,IAAI,IAAA,gBAAO,EAAC,QAAQ,CAAC,EAAE;QACrB,OAAO,SAAS,CAAC;KAClB;IACM,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,WAAW,+CAAE,QAAQ,CAAC;IAChC,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,WAAW,+CAAE,OAAO,CAAC;IAEtC,6BACK,QAAQ,KACX,IAAI,EAAE,aAAa,CAAC,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,CAAC,EACnC,QAAQ,EAAE,aAAa,CAAC,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,QAAQ,CAAC,IAC3C;AACJ,CAAC,CAAC;AACK,IAAM,SAAS,GAAG,UAAO,MAAc;;;;oBACV,qBAAM,IAAA,8BAAW,GAAE,EAAA;;gBAA/C,QAAQ,GAAoB,SAAmB;gBACrC,qBAAM,IAAA,qBAAU,GAAE,EAAA;;gBAA5B,OAAO,GAAG,SAAkB;gBAE5B,KAOF,QAAQ,CAAC,SAAS,EANpB,aAAa,mBAAA,EACb,QAAQ,cAAA,EACR,cAAc,oBAAA,EACd,OAAO,aAAA,EACP,YAAY,kBAAA,EACZ,eAAe,qBAAA,CACM;gBAEvB,MAAM;qBACH,OAAO,CAAC,SAAS,CAAC;qBAElB,MAAM,CAAC;;;;;;;;oCACN,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oCACb,IAAI,CAAC,GAAG,CAAC,4CAA4C,CAAC,CAAC;oCACvD,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oCACb,IAAI,CAAC,GAAG,CACN,0EAA0E,CAC3E,CAAC;oCACF,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oCACb,IAAI,CAAC,GAAG,CACN,kEAAkE,CACnE,CAAC;oCACF,IAAI,CAAC,GAAG,CACN,4FAA4F,CAC7F,CAAC;oCACF,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oCACb,IAAI,CAAC,GAAG,CACN,kFAAkF,CACnF,CAAC;oCACF,IAAI,CAAC,GAAG,CACN,yEAAyE,CAC1E,CAAC;oCACF,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oCACc,qBAAM,IAAI,CAAC,MAAM,CAAC;4CAC3C,SAAO,EAAE,IAAI;4CACb,OAAO,EAAE,yBAAyB;4CAClC,IAAI,EAAE,gBAAgB;4CACtB,IAAI,EAAE,SAAS;yCAChB,CAAC,EAAA;;oCALM,cAAc,GAAK,CAAA,SAKzB,CAAA,eALoB;oCAMtB,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oCACf,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oCACf,MAAM,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;oCACnC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oCACf,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;yCAEX,cAAc,EAAd,yBAAc;oCACV,oBAAkB,UACtB,GAAW,EACX,MAAuB;;;;;;;wDAGpB,qBAAM,IAAA,gBAAQ,EAAC,GAAG,GAAG,aAAa,CAAC,EAAA;;oDADhC,KACJ,MAAA,CAAC,SAAmC,CAAC,mCAAI,EAAE,EADrC,GAAG,SAAA,EAAK,UAAU,cAApB,OAAsB,CAAF;oDAGpB,YAAY,GAAG,MAAA,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,WAAW,0CAAE,OAAO,0CAAE,IAAI,CAAC,GAAG,CAAC,CAAC;;wDAE/D,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS;wDAC1C,GAAG,EAAE,GAAG;wDACR,KAAK,EAAE;4DACL,IAAI,EAAE,IAAA,+BAAiB,EAAC,MAAM,CAAC;4DAC/B,YAAY,EAAE,YAAY;yDACZ;wDAChB,MAAM,EAAE;4DACN,IAAI,EAAE,YAAY;4DAClB,MAAM,EAAE,eAAe,CAAC,UAAU,CAAC;4DACnC,OAAO,EAAE,YAAY;yDACtB;;oDACI,qBAAM,mBAAW,CAAC,MAAM,CAC3B,UAAO,GAAG,EAAE,OAAO;;;;;;;6EACb,CAAA,OAAO,KAAK,OAAO,IAAI,CAAC,eAAe,CAAA,EAAvC,wBAAuC;;wEAEnC,qBAAM,GAAG,EAAA;4EADf,gFACK,CAAC,SAAS,CAAC,kBACb,OAAO,IAAG,KAAK,SAChB;;wEAEE,UAAU,GAAG,OAAO,KAAK,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;wEAG5D,qBAAM,IAAA,gBAAQ,EAAC,GAAG,GAAG,kBAAW,OAAO,SAAM,CAAC,EAAA;;wEAD3C,SAAS,GACb,MAAA,CAAC,SAA8C,CAAC,mCAAI,EAAE;wEAChD,GAAG,GAAc,SAAS,IAAvB,EAAK,IAAI,UAAK,SAAS,EAA5B,OAAgB,CAAF,CAAe;wEAC7B,QAAQ,GAAG,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,WAAW,0CAAE,QAAQ,CAAC;wEACvC,MAAM,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC;;wEAE/B,qBAAM,GAAG,EAAA;4EADf,gFACK,CAAC,SAAS,CAAC,kBACb,UAAU,IAAG;gFACZ,QAAQ,EAAE,QAAQ;gFAClB,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS;gFAC1C,MAAM,EAAE,MAAM;oFACZ,CAAC,CAAC;wFACE,MAAM,EAAE,MAAM;qFACf;oFACH,CAAC,CAAC,SAAS;6EACd,SACD;;;6DACH,EACD,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CACpB,EAAA;wDAzCH,uBAYE,MAAG,GAAE,SA6BJ;6DACD;;;yCACH,CAAC;oCACE,UAAU,SAAiC,CAAC;yCAC5C,CAAA,IAAA,+BAAiB,EAAC,QAAQ,CAAC,KAAK,UAAU,CAAA,EAA1C,wBAA0C;oCAC/B,qBAAM,2BAA2B,CAAC,OAAO,CAAC,CAAC,MAAM,CAE5D,UAAO,GAAG,EAAE,EAAE;;;;;;;wDAER,qBAAM,GAAG,EAAA;;gGAAV,CAAC,SAAS,CAAC;;wDACb,KAAA,EAAE,CAAC,GAAG,CAAA;wDAAS,KAAA,iBAAe,CAAA;8DAAC,EAAE,CAAC,GAAG;wDAAE,qBAAM,IAAA,gBAAQ,EAAC,EAAE,CAAC,EAAE,CAAC,EAAA;4DAAnD,qBAAM,4BAAwB,SAAqB,GAAC,EAAA;4DAFhE,kEAEY,SAAoD,UAC9D;;;6CACH,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,EAAA;;oCAPvB,UAAU,GAAG,SAOU,CAAC;;;;oCAGrB,KAAA,cAAc,CAAA;oCAAG,qBAAM,iBAAe,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAA;;oCAD5D,UAAU,IACR,SAAkB,SAAwC;2CAC3D,CAAC;;;oCAGE,MAAM,GAAW;wCACrB,YAAY,EAAE,aAAa;wCAC3B,OAAO,EAAE,QAAQ;wCACjB,UAAU,YAAA;qCACX,CAAC;oCAGA,KAAA,0BAA0B,CAAA;oCACnB,KAAA,mBAAQ,CAAA;oCAAC,qBAAM,IAAA,sCAAmB,GAAE,EAAA;wCAA1C,qBAAM,kBAAS,SAA2B,EAAE;4CAC3C,QAAQ,EAAE,OAAO;yCAClB,EAAC,EAAA;;oCAJE,OAAO,GACX;wCACA,CAAC,SAEC,CAAC;oCAEL,IAAI,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;oCAChC,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;oCAC3B,qBAAM,IAAA,yBAAW,EAAC,IAAI,EAAE,MAAM,EAAE;4CAC9B,UAAU,EAAE,OAAO;yCACpB,CAAC,EAAA;;oCAFF,SAEE,CAAC;oCACH,IAAI,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;oCAC1B,KAAA,oBAAS,CAAA;oCACb,qBAAM,IAAA,sCAAmB,GAAE,EAAA;wCAD7B,qBAAM,kBACJ,SAA2B,EAC3B,sHAAsH;wCACtH,EAAE,QAAQ,EAAE,OAAO,EAAE,EACtB,EAAA;;oCAJD,SAIC,CAAC;oCAEF,IAAI,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;oCAChC,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;oCAC5B,qBAAM,IAAA,6BAAa,GAAE,EAAA;;oCAArB,SAAqB,CAAC;0CACO,EAAX,gBAAA,mBAAW;;;yCAAX,CAAA,yBAAW,CAAA;oCAAlB,GAAG;oCACZ,IAAI,GAAG,KAAK,OAAO,IAAI,CAAC,eAAe;wCAAE,sBAAO;oCAChD,qBAAM,IAAA,+BAAc,EAAC,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,EAAA;;oCAAvC,SAAuC,CAAC;;;oCAFxB,IAAW,CAAA;;;oCAK7B,IAAI,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;oCAEhC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;oCAElB,IAAI,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;;;;;;iBAEnC,CAAC,CAAC;gBAEL,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;;;;KACxB,CAAC;AAhKW,QAAA,SAAS,aAgKpB"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
+
import { Config } from "@catladder/pipeline";
|
|
1
2
|
import { CommandInstance } from "vorpal";
|
|
2
3
|
import { LEGACY_ENVS } from "./fromv2";
|
|
3
|
-
|
|
4
|
-
export declare const migrateSecrets: (vorpal: CommandInstance, gitlabCi: OldGitlabCiFile, env: typeof LEGACY_ENVS[number]) => Promise<void>;
|
|
4
|
+
export declare const migrateSecrets: (vorpal: CommandInstance, newConfig: Config, oldEnv: typeof LEGACY_ENVS[number]) => Promise<void>;
|
|
@@ -37,37 +37,50 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
37
37
|
};
|
|
38
38
|
exports.__esModule = true;
|
|
39
39
|
exports.migrateSecrets = void 0;
|
|
40
|
+
var pipeline_1 = require("@catladder/pipeline");
|
|
40
41
|
var js_yaml_1 = require("js-yaml");
|
|
42
|
+
var lodash_1 = require("lodash");
|
|
41
43
|
var gitlab_1 = require("../../../../utils/gitlab");
|
|
42
44
|
var passwordstore_1 = require("../../../../utils/passwordstore");
|
|
43
|
-
var getPassPath = function (
|
|
44
|
-
return "".concat(
|
|
45
|
+
var getPassPath = function (newConfig, env) {
|
|
46
|
+
return "".concat(newConfig.customerName, "/").concat(newConfig.appName, "/").concat(env, "/secrets.yml");
|
|
45
47
|
};
|
|
46
|
-
var migrateSecrets = function (vorpal,
|
|
47
|
-
var path, yamlstring,
|
|
48
|
+
var migrateSecrets = function (vorpal, newConfig, oldEnv) { return __awaiter(void 0, void 0, void 0, function () {
|
|
49
|
+
var newEnv, path, yamlstring, secrets_1, e_1;
|
|
48
50
|
return __generator(this, function (_a) {
|
|
49
51
|
switch (_a.label) {
|
|
50
52
|
case 0:
|
|
51
|
-
|
|
53
|
+
newEnv = oldEnv === "dev-local" ? "local" : oldEnv;
|
|
54
|
+
path = getPassPath(newConfig, oldEnv);
|
|
52
55
|
_a.label = 1;
|
|
53
56
|
case 1:
|
|
54
|
-
_a.trys.push([1,
|
|
57
|
+
_a.trys.push([1, 4, , 5]);
|
|
55
58
|
return [4 /*yield*/, (0, passwordstore_1.readPass)(path)];
|
|
56
59
|
case 2:
|
|
57
60
|
yamlstring = _a.sent();
|
|
58
|
-
|
|
59
|
-
|
|
61
|
+
secrets_1 = (0, js_yaml_1.load)(yamlstring);
|
|
62
|
+
Object.keys(newConfig.components).forEach(function (componentName) { return __awaiter(void 0, void 0, void 0, function () {
|
|
63
|
+
var environment;
|
|
64
|
+
return __generator(this, function (_a) {
|
|
65
|
+
switch (_a.label) {
|
|
66
|
+
case 0:
|
|
67
|
+
environment = (0, pipeline_1.getEnvironment)(newConfig, componentName, newEnv);
|
|
68
|
+
return [4 /*yield*/, (0, gitlab_1.upsertAllVariables)(vorpal, (0, lodash_1.pick)(secrets_1, environment.secretEnvVarKeys), newEnv, componentName)];
|
|
69
|
+
case 1:
|
|
70
|
+
_a.sent();
|
|
71
|
+
return [2 /*return*/];
|
|
72
|
+
}
|
|
73
|
+
});
|
|
74
|
+
}); });
|
|
75
|
+
return [4 /*yield*/, (0, passwordstore_1.trashItem)(path)];
|
|
60
76
|
case 3:
|
|
61
77
|
_a.sent();
|
|
62
|
-
return [
|
|
78
|
+
return [3 /*break*/, 5];
|
|
63
79
|
case 4:
|
|
64
|
-
_a.sent();
|
|
65
|
-
return [3 /*break*/, 6];
|
|
66
|
-
case 5:
|
|
67
80
|
e_1 = _a.sent();
|
|
68
|
-
console.warn("could not migrate secrets for env '".concat(
|
|
69
|
-
return [3 /*break*/,
|
|
70
|
-
case
|
|
81
|
+
console.warn("could not migrate secrets for env '".concat(oldEnv, "': ").concat(e_1));
|
|
82
|
+
return [3 /*break*/, 5];
|
|
83
|
+
case 5: return [2 /*return*/];
|
|
71
84
|
}
|
|
72
85
|
});
|
|
73
86
|
}); };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrateSecrets.js","sourceRoot":"","sources":["../../../../../src/apps/cli/verify/migration/migrateSecrets.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mCAA+B;
|
|
1
|
+
{"version":3,"file":"migrateSecrets.js","sourceRoot":"","sources":["../../../../../src/apps/cli/verify/migration/migrateSecrets.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAA6D;AAC7D,mCAA+B;AAC/B,iCAA8B;AAE9B,mDAA8D;AAC9D,iEAAsE;AAGtE,IAAM,WAAW,GAAG,UAAC,SAAiB,EAAE,GAAW;IACjD,OAAO,UAAG,SAAS,CAAC,YAAY,cAAI,SAAS,CAAC,OAAO,cAAI,GAAG,iBAAc,CAAC;AAC7E,CAAC,CAAC;AAEK,IAAM,cAAc,GAAG,UAC5B,MAAuB,EACvB,SAAiB,EACjB,MAAkC;;;;;gBAE5B,MAAM,GAAG,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;gBACnD,IAAI,GAAG,WAAW,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;;;;gBAEvB,qBAAM,IAAA,wBAAQ,EAAC,IAAI,CAAC,EAAA;;gBAAjC,UAAU,GAAG,SAAoB;gBACjC,YAAU,IAAA,cAAI,EAAC,UAAU,CAAC,CAAC;gBAEjC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,UAAO,aAAa;;;;;gCACtD,WAAW,GAAG,IAAA,yBAAc,EAAC,SAAS,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;gCACrE,qBAAM,IAAA,2BAAkB,EACtB,MAAM,EACN,IAAA,aAAI,EAAC,SAAO,EAAE,WAAW,CAAC,gBAAgB,CAAC,EAC3C,MAAM,EACN,aAAa,CACd,EAAA;;gCALD,SAKC,CAAC;;;;qBACH,CAAC,CAAC;gBACH,qBAAM,IAAA,yBAAS,EAAC,IAAI,CAAC,EAAA;;gBAArB,SAAqB,CAAC;;;;gBAEtB,OAAO,CAAC,IAAI,CAAC,6CAAsC,MAAM,gBAAM,GAAC,CAAE,CAAC,CAAC;;;;;KAEvE,CAAC;AAxBW,QAAA,cAAc,kBAwBzB"}
|