@catladder/cli 0.0.0-main-b7c3d587 → 0.0.0-main-c6987376

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.
Files changed (10) hide show
  1. package/dist/apps/cli/commands/project/commandConfigSecrets.js +15 -4
  2. package/dist/apps/cli/commands/project/commandConfigSecrets.js.map +1 -1
  3. package/dist/apps/cli/verify/migration/migrateSecrets.js +3 -1
  4. package/dist/apps/cli/verify/migration/migrateSecrets.js.map +1 -1
  5. package/dist/bundles/catenv/index.js +28 -8
  6. package/dist/bundles/cli/index.js +46 -13
  7. package/dist/tsconfig.tsbuildinfo +1 -1
  8. package/package.json +2 -2
  9. package/src/apps/cli/commands/project/commandConfigSecrets.ts +16 -2
  10. package/src/apps/cli/verify/migration/migrateSecrets.ts +6 -1
package/dist/apps/cli/commands/project/commandConfigSecrets.js CHANGED
@@ -74,13 +74,24 @@ var resolveJson = function (v) {
74
74
  ];
75
75
  }));
76
76
  };
77
- var getEnvVarsToEdit = function (instance, env, componentName) { return __awaiter(void 0, void 0, void 0, function () {
78
- var secretEnvVarKeys, allEnvVars;
77
+ var getNonHiddenSecretEnvVarKeys = function (env, componentName) { return __awaiter(void 0, void 0, void 0, function () {
78
+ var secretEnvVarKeys;
79
79
  return __generator(this, function (_a) {
80
80
  switch (_a.label) {
81
81
  case 0: return [4 /*yield*/, (0, getProjectConfig_1.getEnvironment)(env, componentName)];
82
82
  case 1:
83
83
  secretEnvVarKeys = (_a.sent()).secretEnvVarKeys;
84
+ return [2 /*return*/, secretEnvVarKeys.filter(function (k) { return !k.hidden; }).map(function (k) { return k.key; })];
85
+ }
86
+ });
87
+ }); };
88
+ var getEnvVarsToEdit = function (instance, env, componentName) { return __awaiter(void 0, void 0, void 0, function () {
89
+ var secretEnvVarKeys, allEnvVars;
90
+ return __generator(this, function (_a) {
91
+ switch (_a.label) {
92
+ case 0: return [4 /*yield*/, getNonHiddenSecretEnvVarKeys(env, componentName)];
93
+ case 1:
94
+ secretEnvVarKeys = _a.sent();
84
95
  return [4 /*yield*/, (0, getProjectConfig_1.getEnvVars)(instance, env, componentName)];
85
96
  case 2:
86
97
  allEnvVars = _a.sent();
@@ -157,9 +168,9 @@ var doItFor = function (instance, envAndComponents) { return __awaiter(void 0, v
157
168
  usedKeys = valuesToEdit[componentName][env]
158
169
  ? Object.keys(valuesToEdit[componentName][env])
159
170
  : [];
160
- return [4 /*yield*/, (0, getProjectConfig_1.getEnvironment)(env, componentName)];
171
+ return [4 /*yield*/, getNonHiddenSecretEnvVarKeys(env, componentName)];
161
172
  case 6:
162
- secretEnvVarKeys = (_k.sent()).secretEnvVarKeys;
173
+ secretEnvVarKeys = _k.sent();
163
174
  extranous = (0, lodash_1.difference)(usedKeys, secretEnvVarKeys);
164
175
  missing = (0, lodash_1.difference)(secretEnvVarKeys, usedKeys);
165
176
  if (!(extranous.length > 0 || missing.length > 0)) return [3 /*break*/, 9];
package/dist/apps/cli/commands/project/commandConfigSecrets.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"commandConfigSecrets.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/commandConfigSecrets.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"commandConfigSecrets.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/commandConfigSecrets.ts"],"names":[],"mappings":"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"}
package/dist/apps/cli/verify/migration/migrateSecrets.js CHANGED
@@ -66,7 +66,9 @@ var migrateSecrets = function (vorpal, newConfig, oldEnv) { return __awaiter(voi
66
66
  case 0: return [4 /*yield*/, (0, pipeline_1.getEnvironment)(newConfig, componentName, newEnv)];
67
67
  case 1:
68
68
  environment = _a.sent();
69
- return [4 /*yield*/, (0, gitlab_1.upsertAllVariables)(vorpal, (0, lodash_1.pick)(secrets_1, environment.secretEnvVarKeys), newEnv, componentName)];
69
+ return [4 /*yield*/, (0, gitlab_1.upsertAllVariables)(vorpal, (0, lodash_1.pick)(secrets_1, environment.secretEnvVarKeys
70
+ .filter(function (k) { return !k.hidden; })
71
+ .map(function (k) { return k.key; })), newEnv, componentName)];
70
72
  case 2:
71
73
  _a.sent();
72
74
  return [2 /*return*/];
package/dist/apps/cli/verify/migration/migrateSecrets.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"migrateSecrets.js","sourceRoot":"","sources":["../../../../../src/apps/cli/verify/migration/migrateSecrets.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAAqD;AACrD,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;;;;oCACxC,qBAAM,IAAA,yBAAc,EACtC,SAAS,EACT,aAAa,EACb,MAAM,CACP,EAAA;;gCAJK,WAAW,GAAG,SAInB;gCACD,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;AA5BW,QAAA,cAAc,kBA4BzB"}
1
+ {"version":3,"file":"migrateSecrets.js","sourceRoot":"","sources":["../../../../../src/apps/cli/verify/migration/migrateSecrets.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAAqD;AACrD,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;;;;oCACxC,qBAAM,IAAA,yBAAc,EACtC,SAAS,EACT,aAAa,EACb,MAAM,CACP,EAAA;;gCAJK,WAAW,GAAG,SAInB;gCACD,qBAAM,IAAA,2BAAkB,EACtB,MAAM,EACN,IAAA,aAAI,EACF,SAAO,EACP,WAAW,CAAC,gBAAgB;yCACzB,MAAM,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,CAAC,MAAM,EAAT,CAAS,CAAC;yCACxB,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,GAAG,EAAL,CAAK,CAAC,CACrB,EACD,MAAM,EACN,aAAa,CACd,EAAA;;gCAVD,SAUC,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;AAjCW,QAAA,cAAc,kBAiCzB"}
package/dist/bundles/catenv/index.js CHANGED
@@ -40107,7 +40107,7 @@ exports.readConfigSync = readConfigSync;
40107
40107
 
40108
40108
  exports.__esModule = true;
40109
40109
  exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
40110
- exports.PIPELINE_IMAGE_TAG = "main-b7c3d587" || 0;
40110
+ exports.PIPELINE_IMAGE_TAG = "main-c6987376" || 0;
40111
40111
  exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
40112
40112
 
40113
40113
  /***/ }),
@@ -40564,8 +40564,13 @@ var getEnvironmentVariables = function (config, componentName, env, commitInfo,
40564
40564
  }
40565
40565
  publicEnvVarsRaw = (_e = (_d = envConfigRaw.vars) === null || _d === void 0 ? void 0 : _d.public) !== null && _e !== void 0 ? _e : {};
40566
40566
  additionalSecretKeys = deployConfigRaw ? deploy_1.DEPLOY_TYPES[deployConfigRaw.type].additionalSecretKeys(environmentContext) : [];
40567
- secretEnvVarKeys = __spreadArray(__spreadArray([], __read((_g = (_f = envConfigRaw.vars) === null || _f === void 0 ? void 0 : _f.secret) !== null && _g !== void 0 ? _g : []), false), __read(additionalSecretKeys), false);
40568
- secretEnvVars = Object.fromEntries(secretEnvVarKeys.map(function (key) {
40567
+ secretEnvVarKeys = __spreadArray(__spreadArray([], __read(((_g = (_f = envConfigRaw.vars) === null || _f === void 0 ? void 0 : _f.secret) !== null && _g !== void 0 ? _g : []).map(function (key) {
40568
+ return {
40569
+ key: key
40570
+ };
40571
+ })), false), __read(additionalSecretKeys), false);
40572
+ secretEnvVars = Object.fromEntries(secretEnvVarKeys.map(function (_a) {
40573
+ var key = _a.key;
40569
40574
  return [key, "$".concat((0, exports.getSecretVarName)(env, componentName, key))];
40570
40575
  }));
40571
40576
  legacyFromComponents = (_j = (_h = envConfigRaw.vars) === null || _h === void 0 ? void 0 : _h.fromComponents) !== null && _j !== void 0 ? _j : {};
@@ -41585,7 +41590,15 @@ exports.GCLOUD_RUN_DEPLOY_TYPE = {
41585
41590
  return {};
41586
41591
  },
41587
41592
  additionalSecretKeys: function (ctx) {
41588
- return __spreadArray([exports.GCLOUD_DEPLOY_CREDENTIALS_KEY], __read(ctx.deployConfigRaw && ctx.deployConfigRaw.cloudSql ? ["DB_PASSWORD"] : []), false);
41593
+ return __spreadArray([{
41594
+ key: exports.GCLOUD_DEPLOY_CREDENTIALS_KEY,
41595
+ hidden: true
41596
+ }, {
41597
+ key: exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX,
41598
+ hidden: true
41599
+ }], __read(ctx.deployConfigRaw && ctx.deployConfigRaw.cloudSql ? [{
41600
+ key: "DB_PASSWORD"
41601
+ }] : []), false);
41589
41602
  },
41590
41603
  getAdditionalEnvVars: function (ctx) {
41591
41604
  var _a;
@@ -41818,7 +41831,7 @@ var runner_1 = __nccwpck_require__(5071);
41818
41831
  var base_1 = __nccwpck_require__(9177);
41819
41832
  var types_1 = __nccwpck_require__(3109);
41820
41833
  var createCustomDeployJobs = function (context) {
41821
- var _a, _b;
41834
+ var _a, _b, _c;
41822
41835
  var deployConfig = context.componentConfig.deploy;
41823
41836
  if (deployConfig === false) {
41824
41837
  return [];
@@ -41829,11 +41842,14 @@ var createCustomDeployJobs = function (context) {
41829
41842
  }
41830
41843
  var baseDeploymentJob = (0, base_1.getBaseDeploymentJob)(context);
41831
41844
  var yarnInstall = (0, yarn_1.getYarnInstall)(context);
41832
- return [(0, lodash_1.merge)({}, baseDeploymentJob, {
41845
+ return __spreadArray([(0, lodash_1.merge)({}, baseDeploymentJob, {
41833
41846
  image: (_a = deployConfig.jobImage) !== null && _a !== void 0 ? _a : (0, runner_1.getRunnerImage)("jobs-default"),
41834
41847
  cache: (_b = deployConfig.jobCache) !== null && _b !== void 0 ? _b : [],
41835
41848
  script: __spreadArray(__spreadArray(["cd ".concat(context.componentConfig.dir)], __read(deployConfig.requiresYarnInstall ? yarnInstall : []), false), __read(deployConfig.script), false)
41836
- })];
41849
+ })], __read(deployConfig.stopScript ? [(0, lodash_1.merge)({}, (0, base_1.getBaseDeploymentStopJob)(context), {
41850
+ image: (_c = deployConfig.jobImage) !== null && _c !== void 0 ? _c : (0, runner_1.getRunnerImage)("jobs-default"),
41851
+ script: deployConfig.stopScript
41852
+ })] : []), false);
41837
41853
  };
41838
41854
  exports.createCustomDeployJobs = createCustomDeployJobs;
41839
41855
 
@@ -41983,7 +41999,11 @@ var additionalKubernetesSecretKeys = function (_a) {
41983
41999
  keys.push("POSTGRESQL_PASSWORD");
41984
42000
  keys.push("cloudsqlProxyCredentials");
41985
42001
  }
41986
- return keys;
42002
+ return keys.map(function (key) {
42003
+ return {
42004
+ key: key
42005
+ };
42006
+ });
41987
42007
  };
41988
42008
  exports.additionalKubernetesSecretKeys = additionalKubernetesSecretKeys;
41989
42009
 
package/dist/bundles/cli/index.js CHANGED
@@ -1700,13 +1700,24 @@ var resolveJson = function (v) {
1700
1700
  ];
1701
1701
  }));
1702
1702
  };
1703
- var getEnvVarsToEdit = function (instance, env, componentName) { return __awaiter(void 0, void 0, void 0, function () {
1704
- var secretEnvVarKeys, allEnvVars;
1703
+ var getNonHiddenSecretEnvVarKeys = function (env, componentName) { return __awaiter(void 0, void 0, void 0, function () {
1704
+ var secretEnvVarKeys;
1705
1705
  return __generator(this, function (_a) {
1706
1706
  switch (_a.label) {
1707
1707
  case 0: return [4 /*yield*/, (0, getProjectConfig_1.getEnvironment)(env, componentName)];
1708
1708
  case 1:
1709
1709
  secretEnvVarKeys = (_a.sent()).secretEnvVarKeys;
1710
+ return [2 /*return*/, secretEnvVarKeys.filter(function (k) { return !k.hidden; }).map(function (k) { return k.key; })];
1711
+ }
1712
+ });
1713
+ }); };
1714
+ var getEnvVarsToEdit = function (instance, env, componentName) { return __awaiter(void 0, void 0, void 0, function () {
1715
+ var secretEnvVarKeys, allEnvVars;
1716
+ return __generator(this, function (_a) {
1717
+ switch (_a.label) {
1718
+ case 0: return [4 /*yield*/, getNonHiddenSecretEnvVarKeys(env, componentName)];
1719
+ case 1:
1720
+ secretEnvVarKeys = _a.sent();
1710
1721
  return [4 /*yield*/, (0, getProjectConfig_1.getEnvVars)(instance, env, componentName)];
1711
1722
  case 2:
1712
1723
  allEnvVars = _a.sent();
@@ -1783,9 +1794,9 @@ var doItFor = function (instance, envAndComponents) { return __awaiter(void 0, v
1783
1794
  usedKeys = valuesToEdit[componentName][env]
1784
1795
  ? Object.keys(valuesToEdit[componentName][env])
1785
1796
  : [];
1786
- return [4 /*yield*/, (0, getProjectConfig_1.getEnvironment)(env, componentName)];
1797
+ return [4 /*yield*/, getNonHiddenSecretEnvVarKeys(env, componentName)];
1787
1798
  case 6:
1788
- secretEnvVarKeys = (_k.sent()).secretEnvVarKeys;
1799
+ secretEnvVarKeys = _k.sent();
1789
1800
  extranous = (0, lodash_1.difference)(usedKeys, secretEnvVarKeys);
1790
1801
  missing = (0, lodash_1.difference)(secretEnvVarKeys, usedKeys);
1791
1802
  if (!(extranous.length > 0 || missing.length > 0)) return [3 /*break*/, 9];
@@ -6105,7 +6116,9 @@ var migrateSecrets = function (vorpal, newConfig, oldEnv) { return __awaiter(voi
6105
6116
  case 0: return [4 /*yield*/, (0, pipeline_1.getEnvironment)(newConfig, componentName, newEnv)];
6106
6117
  case 1:
6107
6118
  environment = _a.sent();
6108
- return [4 /*yield*/, (0, gitlab_1.upsertAllVariables)(vorpal, (0, lodash_1.pick)(secrets_1, environment.secretEnvVarKeys), newEnv, componentName)];
6119
+ return [4 /*yield*/, (0, gitlab_1.upsertAllVariables)(vorpal, (0, lodash_1.pick)(secrets_1, environment.secretEnvVarKeys
6120
+ .filter(function (k) { return !k.hidden; })
6121
+ .map(function (k) { return k.key; })), newEnv, componentName)];
6109
6122
  case 2:
6110
6123
  _a.sent();
6111
6124
  return [2 /*return*/];
@@ -351493,7 +351506,7 @@ exports.readConfigSync = readConfigSync;
351493
351506
 
351494
351507
  exports.__esModule = true;
351495
351508
  exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
351496
- exports.PIPELINE_IMAGE_TAG = "main-b7c3d587" || 0;
351509
+ exports.PIPELINE_IMAGE_TAG = "main-c6987376" || 0;
351497
351510
  exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
351498
351511
 
351499
351512
  /***/ }),
@@ -351950,8 +351963,13 @@ var getEnvironmentVariables = function (config, componentName, env, commitInfo,
351950
351963
  }
351951
351964
  publicEnvVarsRaw = (_e = (_d = envConfigRaw.vars) === null || _d === void 0 ? void 0 : _d.public) !== null && _e !== void 0 ? _e : {};
351952
351965
  additionalSecretKeys = deployConfigRaw ? deploy_1.DEPLOY_TYPES[deployConfigRaw.type].additionalSecretKeys(environmentContext) : [];
351953
- secretEnvVarKeys = __spreadArray(__spreadArray([], __read((_g = (_f = envConfigRaw.vars) === null || _f === void 0 ? void 0 : _f.secret) !== null && _g !== void 0 ? _g : []), false), __read(additionalSecretKeys), false);
351954
- secretEnvVars = Object.fromEntries(secretEnvVarKeys.map(function (key) {
351966
+ secretEnvVarKeys = __spreadArray(__spreadArray([], __read(((_g = (_f = envConfigRaw.vars) === null || _f === void 0 ? void 0 : _f.secret) !== null && _g !== void 0 ? _g : []).map(function (key) {
351967
+ return {
351968
+ key: key
351969
+ };
351970
+ })), false), __read(additionalSecretKeys), false);
351971
+ secretEnvVars = Object.fromEntries(secretEnvVarKeys.map(function (_a) {
351972
+ var key = _a.key;
351955
351973
  return [key, "$".concat((0, exports.getSecretVarName)(env, componentName, key))];
351956
351974
  }));
351957
351975
  legacyFromComponents = (_j = (_h = envConfigRaw.vars) === null || _h === void 0 ? void 0 : _h.fromComponents) !== null && _j !== void 0 ? _j : {};
@@ -352971,7 +352989,15 @@ exports.GCLOUD_RUN_DEPLOY_TYPE = {
352971
352989
  return {};
352972
352990
  },
352973
352991
  additionalSecretKeys: function (ctx) {
352974
- return __spreadArray([exports.GCLOUD_DEPLOY_CREDENTIALS_KEY], __read(ctx.deployConfigRaw && ctx.deployConfigRaw.cloudSql ? ["DB_PASSWORD"] : []), false);
352992
+ return __spreadArray([{
352993
+ key: exports.GCLOUD_DEPLOY_CREDENTIALS_KEY,
352994
+ hidden: true
352995
+ }, {
352996
+ key: exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX,
352997
+ hidden: true
352998
+ }], __read(ctx.deployConfigRaw && ctx.deployConfigRaw.cloudSql ? [{
352999
+ key: "DB_PASSWORD"
353000
+ }] : []), false);
352975
353001
  },
352976
353002
  getAdditionalEnvVars: function (ctx) {
352977
353003
  var _a;
@@ -353204,7 +353230,7 @@ var runner_1 = __nccwpck_require__(55071);
353204
353230
  var base_1 = __nccwpck_require__(89177);
353205
353231
  var types_1 = __nccwpck_require__(63109);
353206
353232
  var createCustomDeployJobs = function (context) {
353207
- var _a, _b;
353233
+ var _a, _b, _c;
353208
353234
  var deployConfig = context.componentConfig.deploy;
353209
353235
  if (deployConfig === false) {
353210
353236
  return [];
@@ -353215,11 +353241,14 @@ var createCustomDeployJobs = function (context) {
353215
353241
  }
353216
353242
  var baseDeploymentJob = (0, base_1.getBaseDeploymentJob)(context);
353217
353243
  var yarnInstall = (0, yarn_1.getYarnInstall)(context);
353218
- return [(0, lodash_1.merge)({}, baseDeploymentJob, {
353244
+ return __spreadArray([(0, lodash_1.merge)({}, baseDeploymentJob, {
353219
353245
  image: (_a = deployConfig.jobImage) !== null && _a !== void 0 ? _a : (0, runner_1.getRunnerImage)("jobs-default"),
353220
353246
  cache: (_b = deployConfig.jobCache) !== null && _b !== void 0 ? _b : [],
353221
353247
  script: __spreadArray(__spreadArray(["cd ".concat(context.componentConfig.dir)], __read(deployConfig.requiresYarnInstall ? yarnInstall : []), false), __read(deployConfig.script), false)
353222
- })];
353248
+ })], __read(deployConfig.stopScript ? [(0, lodash_1.merge)({}, (0, base_1.getBaseDeploymentStopJob)(context), {
353249
+ image: (_c = deployConfig.jobImage) !== null && _c !== void 0 ? _c : (0, runner_1.getRunnerImage)("jobs-default"),
353250
+ script: deployConfig.stopScript
353251
+ })] : []), false);
353223
353252
  };
353224
353253
  exports.createCustomDeployJobs = createCustomDeployJobs;
353225
353254
 
@@ -353369,7 +353398,11 @@ var additionalKubernetesSecretKeys = function (_a) {
353369
353398
  keys.push("POSTGRESQL_PASSWORD");
353370
353399
  keys.push("cloudsqlProxyCredentials");
353371
353400
  }
353372
- return keys;
353401
+ return keys.map(function (key) {
353402
+ return {
353403
+ key: key
353404
+ };
353405
+ });
353373
353406
  };
353374
353407
  exports.additionalKubernetesSecretKeys = additionalKubernetesSecretKeys;
353375
353408