@catladder/cli 0.0.0-refactor-args-30342529 → 0.0.0-refactor-args-52277d47
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/bundles/catenv/index.js +64 -12
- package/dist/bundles/cli/index.js +64 -12
- package/package.json +2 -2
|
@@ -40074,7 +40074,7 @@ exports.readConfigSync = readConfigSync;
|
|
|
40074
40074
|
|
|
40075
40075
|
exports.__esModule = true;
|
|
40076
40076
|
exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
|
|
40077
|
-
exports.PIPELINE_IMAGE_TAG = "refactor-args-
|
|
40077
|
+
exports.PIPELINE_IMAGE_TAG = "refactor-args-52277d47" || 0;
|
|
40078
40078
|
exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
|
|
40079
40079
|
|
|
40080
40080
|
/***/ }),
|
|
@@ -41257,6 +41257,7 @@ var gcloudServiceAccountLoginCommands_1 = __nccwpck_require__(2607);
|
|
|
41257
41257
|
var database_1 = __nccwpck_require__(1384);
|
|
41258
41258
|
var gitlab_1 = __nccwpck_require__(4997);
|
|
41259
41259
|
var jobName_1 = __nccwpck_require__(7311);
|
|
41260
|
+
var createArgsString_1 = __nccwpck_require__(8686);
|
|
41260
41261
|
var setExtraVarsScripts = function (deployConfig) {
|
|
41261
41262
|
return ["export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe ".concat(deployConfig.projectId, " --format=\"value(projectNumber)\")"), "echo \"GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER\""];
|
|
41262
41263
|
};
|
|
@@ -41282,7 +41283,10 @@ var createGoogleCloudRunDeployJobs = function (context) {
|
|
|
41282
41283
|
value = _b[1];
|
|
41283
41284
|
return "".concat(key, "=").concat(value);
|
|
41284
41285
|
}).join(",");
|
|
41285
|
-
var commonArgs =
|
|
41286
|
+
var commonArgs = (0, createArgsString_1.createArgsString)({
|
|
41287
|
+
project: deployConfig.projectId,
|
|
41288
|
+
region: deployConfig.region
|
|
41289
|
+
});
|
|
41286
41290
|
var cloudRunArgs = deployConfig.cloudSql ? "--set-cloudsql-instances=".concat(deployConfig.cloudSql.instanceConnectionName) : "";
|
|
41287
41291
|
var commonDeployArgs = "--image=".concat(gcloudImageName, " ").concat(commonArgs, " ").concat(cloudRunArgs, " --labels=").concat(labelsString);
|
|
41288
41292
|
var serviceName = context.environment.fullName.toLowerCase();
|
|
@@ -41324,16 +41328,7 @@ var createGoogleCloudRunDeployJobs = function (context) {
|
|
|
41324
41328
|
"max-instances": customConfig === null || customConfig === void 0 ? void 0 : customConfig.maxInstances,
|
|
41325
41329
|
"no-cpu-throttling": customConfig === null || customConfig === void 0 ? void 0 : customConfig.noCpuThrottling
|
|
41326
41330
|
};
|
|
41327
|
-
var argsString =
|
|
41328
|
-
var _b = __read(_a, 2),
|
|
41329
|
-
value = _b[1];
|
|
41330
|
-
return !(0, lodash_1.isNil)(value);
|
|
41331
|
-
}).map(function (_a) {
|
|
41332
|
-
var _b = __read(_a, 2),
|
|
41333
|
-
key = _b[0],
|
|
41334
|
-
value = _b[1];
|
|
41335
|
-
return "--".concat(key).concat(value !== true ? "=".concat(value) : "");
|
|
41336
|
-
}).join(" ");
|
|
41331
|
+
var argsString = (0, createArgsString_1.createArgsString)(args);
|
|
41337
41332
|
return "gcloud run deploy ".concat(serviceName).concat(nameSuffix !== null && nameSuffix !== void 0 ? nameSuffix : "", " ").concat(commandArg, " ").concat(commonDeployArgs, " --env-vars-file=____envvars.yaml ").concat(argsString);
|
|
41338
41333
|
};
|
|
41339
41334
|
var getJobCreateScriptsForJob = function (jobName, job) {
|
|
@@ -41539,6 +41534,63 @@ exports.GCLOUD_RUN_DEPLOY_TYPE = {
|
|
|
41539
41534
|
|
|
41540
41535
|
/***/ }),
|
|
41541
41536
|
|
|
41537
|
+
/***/ 8686:
|
|
41538
|
+
/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
|
|
41539
|
+
|
|
41540
|
+
"use strict";
|
|
41541
|
+
|
|
41542
|
+
|
|
41543
|
+
var __read = this && this.__read || function (o, n) {
|
|
41544
|
+
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
41545
|
+
if (!m) return o;
|
|
41546
|
+
var i = m.call(o),
|
|
41547
|
+
r,
|
|
41548
|
+
ar = [],
|
|
41549
|
+
e;
|
|
41550
|
+
try {
|
|
41551
|
+
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
41552
|
+
} catch (error) {
|
|
41553
|
+
e = {
|
|
41554
|
+
error: error
|
|
41555
|
+
};
|
|
41556
|
+
} finally {
|
|
41557
|
+
try {
|
|
41558
|
+
if (r && !r.done && (m = i["return"])) m.call(i);
|
|
41559
|
+
} finally {
|
|
41560
|
+
if (e) throw e.error;
|
|
41561
|
+
}
|
|
41562
|
+
}
|
|
41563
|
+
return ar;
|
|
41564
|
+
};
|
|
41565
|
+
exports.__esModule = true;
|
|
41566
|
+
exports.createArgsString = void 0;
|
|
41567
|
+
var lodash_1 = __nccwpck_require__(3255);
|
|
41568
|
+
/**
|
|
41569
|
+
* creates arguments string:
|
|
41570
|
+
*
|
|
41571
|
+
* --key=value
|
|
41572
|
+
*
|
|
41573
|
+
* - undefined or null values will get removed completly
|
|
41574
|
+
* - true will just be "--key"
|
|
41575
|
+
* @param args args record
|
|
41576
|
+
* @returns
|
|
41577
|
+
*/
|
|
41578
|
+
var createArgsString = function (args) {
|
|
41579
|
+
return Object.entries(args).filter(function (_a) {
|
|
41580
|
+
var _b = __read(_a, 2),
|
|
41581
|
+
value = _b[1];
|
|
41582
|
+
return !(0, lodash_1.isNil)(value);
|
|
41583
|
+
}).map(function (_a) {
|
|
41584
|
+
var _b = __read(_a, 2),
|
|
41585
|
+
key = _b[0],
|
|
41586
|
+
value = _b[1];
|
|
41587
|
+
return "--".concat(key).concat(value !== true ? "=".concat(value) : "");
|
|
41588
|
+
}).join(" ");
|
|
41589
|
+
};
|
|
41590
|
+
exports.createArgsString = createArgsString;
|
|
41591
|
+
|
|
41592
|
+
/***/ }),
|
|
41593
|
+
|
|
41542
41594
|
/***/ 1384:
|
|
41543
41595
|
/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
|
|
41544
41596
|
|
|
@@ -351199,7 +351199,7 @@ exports.readConfigSync = readConfigSync;
|
|
|
351199
351199
|
|
|
351200
351200
|
exports.__esModule = true;
|
|
351201
351201
|
exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
|
|
351202
|
-
exports.PIPELINE_IMAGE_TAG = "refactor-args-
|
|
351202
|
+
exports.PIPELINE_IMAGE_TAG = "refactor-args-52277d47" || 0;
|
|
351203
351203
|
exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
|
|
351204
351204
|
|
|
351205
351205
|
/***/ }),
|
|
@@ -352382,6 +352382,7 @@ var gcloudServiceAccountLoginCommands_1 = __nccwpck_require__(22607);
|
|
|
352382
352382
|
var database_1 = __nccwpck_require__(41384);
|
|
352383
352383
|
var gitlab_1 = __nccwpck_require__(84997);
|
|
352384
352384
|
var jobName_1 = __nccwpck_require__(77311);
|
|
352385
|
+
var createArgsString_1 = __nccwpck_require__(8686);
|
|
352385
352386
|
var setExtraVarsScripts = function (deployConfig) {
|
|
352386
352387
|
return ["export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe ".concat(deployConfig.projectId, " --format=\"value(projectNumber)\")"), "echo \"GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER\""];
|
|
352387
352388
|
};
|
|
@@ -352407,7 +352408,10 @@ var createGoogleCloudRunDeployJobs = function (context) {
|
|
|
352407
352408
|
value = _b[1];
|
|
352408
352409
|
return "".concat(key, "=").concat(value);
|
|
352409
352410
|
}).join(",");
|
|
352410
|
-
var commonArgs =
|
|
352411
|
+
var commonArgs = (0, createArgsString_1.createArgsString)({
|
|
352412
|
+
project: deployConfig.projectId,
|
|
352413
|
+
region: deployConfig.region
|
|
352414
|
+
});
|
|
352411
352415
|
var cloudRunArgs = deployConfig.cloudSql ? "--set-cloudsql-instances=".concat(deployConfig.cloudSql.instanceConnectionName) : "";
|
|
352412
352416
|
var commonDeployArgs = "--image=".concat(gcloudImageName, " ").concat(commonArgs, " ").concat(cloudRunArgs, " --labels=").concat(labelsString);
|
|
352413
352417
|
var serviceName = context.environment.fullName.toLowerCase();
|
|
@@ -352449,16 +352453,7 @@ var createGoogleCloudRunDeployJobs = function (context) {
|
|
|
352449
352453
|
"max-instances": customConfig === null || customConfig === void 0 ? void 0 : customConfig.maxInstances,
|
|
352450
352454
|
"no-cpu-throttling": customConfig === null || customConfig === void 0 ? void 0 : customConfig.noCpuThrottling
|
|
352451
352455
|
};
|
|
352452
|
-
var argsString =
|
|
352453
|
-
var _b = __read(_a, 2),
|
|
352454
|
-
value = _b[1];
|
|
352455
|
-
return !(0, lodash_1.isNil)(value);
|
|
352456
|
-
}).map(function (_a) {
|
|
352457
|
-
var _b = __read(_a, 2),
|
|
352458
|
-
key = _b[0],
|
|
352459
|
-
value = _b[1];
|
|
352460
|
-
return "--".concat(key).concat(value !== true ? "=".concat(value) : "");
|
|
352461
|
-
}).join(" ");
|
|
352456
|
+
var argsString = (0, createArgsString_1.createArgsString)(args);
|
|
352462
352457
|
return "gcloud run deploy ".concat(serviceName).concat(nameSuffix !== null && nameSuffix !== void 0 ? nameSuffix : "", " ").concat(commandArg, " ").concat(commonDeployArgs, " --env-vars-file=____envvars.yaml ").concat(argsString);
|
|
352463
352458
|
};
|
|
352464
352459
|
var getJobCreateScriptsForJob = function (jobName, job) {
|
|
@@ -352664,6 +352659,63 @@ exports.GCLOUD_RUN_DEPLOY_TYPE = {
|
|
|
352664
352659
|
|
|
352665
352660
|
/***/ }),
|
|
352666
352661
|
|
|
352662
|
+
/***/ 8686:
|
|
352663
|
+
/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
|
|
352664
|
+
|
|
352665
|
+
"use strict";
|
|
352666
|
+
|
|
352667
|
+
|
|
352668
|
+
var __read = this && this.__read || function (o, n) {
|
|
352669
|
+
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
352670
|
+
if (!m) return o;
|
|
352671
|
+
var i = m.call(o),
|
|
352672
|
+
r,
|
|
352673
|
+
ar = [],
|
|
352674
|
+
e;
|
|
352675
|
+
try {
|
|
352676
|
+
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
352677
|
+
} catch (error) {
|
|
352678
|
+
e = {
|
|
352679
|
+
error: error
|
|
352680
|
+
};
|
|
352681
|
+
} finally {
|
|
352682
|
+
try {
|
|
352683
|
+
if (r && !r.done && (m = i["return"])) m.call(i);
|
|
352684
|
+
} finally {
|
|
352685
|
+
if (e) throw e.error;
|
|
352686
|
+
}
|
|
352687
|
+
}
|
|
352688
|
+
return ar;
|
|
352689
|
+
};
|
|
352690
|
+
exports.__esModule = true;
|
|
352691
|
+
exports.createArgsString = void 0;
|
|
352692
|
+
var lodash_1 = __nccwpck_require__(23255);
|
|
352693
|
+
/**
|
|
352694
|
+
* creates arguments string:
|
|
352695
|
+
*
|
|
352696
|
+
* --key=value
|
|
352697
|
+
*
|
|
352698
|
+
* - undefined or null values will get removed completly
|
|
352699
|
+
* - true will just be "--key"
|
|
352700
|
+
* @param args args record
|
|
352701
|
+
* @returns
|
|
352702
|
+
*/
|
|
352703
|
+
var createArgsString = function (args) {
|
|
352704
|
+
return Object.entries(args).filter(function (_a) {
|
|
352705
|
+
var _b = __read(_a, 2),
|
|
352706
|
+
value = _b[1];
|
|
352707
|
+
return !(0, lodash_1.isNil)(value);
|
|
352708
|
+
}).map(function (_a) {
|
|
352709
|
+
var _b = __read(_a, 2),
|
|
352710
|
+
key = _b[0],
|
|
352711
|
+
value = _b[1];
|
|
352712
|
+
return "--".concat(key).concat(value !== true ? "=".concat(value) : "");
|
|
352713
|
+
}).join(" ");
|
|
352714
|
+
};
|
|
352715
|
+
exports.createArgsString = createArgsString;
|
|
352716
|
+
|
|
352717
|
+
/***/ }),
|
|
352718
|
+
|
|
352667
352719
|
/***/ 41384:
|
|
352668
352720
|
/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
|
|
352669
352721
|
|
package/package.json
CHANGED
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
"node": ">=12.0.0"
|
|
25
25
|
},
|
|
26
26
|
"devDependencies": {
|
|
27
|
-
"@catladder/pipeline": "0.0.0-refactor-args-
|
|
27
|
+
"@catladder/pipeline": "0.0.0-refactor-args-52277d47",
|
|
28
28
|
"@kubernetes/client-node": "^0.16.2",
|
|
29
29
|
"@tsconfig/node14": "^1.0.1",
|
|
30
30
|
"@types/common-tags": "^1.8.0",
|
|
@@ -57,6 +57,6 @@
|
|
|
57
57
|
"typescript": "^4.5.4",
|
|
58
58
|
"vorpal": "^1.12.0"
|
|
59
59
|
},
|
|
60
|
-
"version": "0.0.0-refactor-args-
|
|
60
|
+
"version": "0.0.0-refactor-args-52277d47",
|
|
61
61
|
"stableVersion": "0.0.0"
|
|
62
62
|
}
|