@catladder/cli 0.0.0-refactor-gcloud-api-ee7f86ef → 0.0.0-refactor-gcloud-api-6e4348f1
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/cli.js +2 -2
- package/dist/apps/cli/cli.js.map +1 -1
- package/dist/apps/cli/commands/general/index.js +11 -11
- package/dist/apps/cli/commands/general/index.js.map +1 -1
- package/dist/apps/cli/commands/general/portForward.js +3 -3
- package/dist/apps/cli/commands/general/portForward.js.map +1 -1
- package/dist/apps/cli/commands/mongodb/projectMongoPortForward.js +2 -2
- package/dist/apps/cli/commands/mongodb/projectMongoPortForward.js.map +1 -1
- package/dist/apps/cli/commands/project/commandOpenCostDashboard.js +2 -2
- package/dist/apps/cli/commands/project/commandOpenCostDashboard.js.map +1 -1
- package/dist/apps/cli/commands/project/commandOpenGrafana.js +2 -2
- package/dist/apps/cli/commands/project/commandOpenGrafana.js.map +1 -1
- package/dist/apps/cli/commands/project/commandOpenGrafanaPod.js +2 -2
- package/dist/apps/cli/commands/project/commandOpenGrafanaPod.js.map +1 -1
- package/dist/apps/cli/commands/project/commandPortForward.js +97 -36
- package/dist/apps/cli/commands/project/commandPortForward.js.map +1 -1
- package/dist/bundles/catenv/index.js +113 -28
- package/dist/bundles/cli/index.js +317 -105
- package/dist/kubernetes/portForward.d.ts +1 -0
- package/dist/kubernetes/portForward.js +55 -0
- package/dist/kubernetes/portForward.js.map +1 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/utils/portForwards.d.ts +12 -0
- package/dist/utils/{portForward.js → portForwards.js} +20 -16
- package/dist/utils/portForwards.js.map +1 -0
- package/package.json +2 -2
- package/src/apps/cli/cli.ts +1 -1
- package/src/apps/cli/commands/general/index.ts +10 -7
- package/src/apps/cli/commands/general/portForward.ts +3 -3
- package/src/apps/cli/commands/mongodb/projectMongoPortForward.ts +2 -2
- package/src/apps/cli/commands/project/commandOpenCostDashboard.ts +2 -2
- package/src/apps/cli/commands/project/commandOpenGrafana.ts +2 -2
- package/src/apps/cli/commands/project/commandOpenGrafanaPod.ts +2 -2
- package/src/apps/cli/commands/project/commandPortForward.ts +72 -29
- package/src/kubernetes/portForward.ts +15 -0
- package/src/utils/{portForward.ts → portForwards.ts} +27 -22
- package/dist/utils/portForward.d.ts +0 -4
- package/dist/utils/portForward.js.map +0 -1
|
@@ -49,7 +49,7 @@ exports.__esModule = true;
|
|
|
49
49
|
var vorpal_1 = __importDefault(__nccwpck_require__(71491));
|
|
50
50
|
// tslint:disable-next-line:no-var-requires
|
|
51
51
|
var packageInfos_1 = __importDefault(__nccwpck_require__(71628));
|
|
52
|
-
var
|
|
52
|
+
var portForwards_1 = __nccwpck_require__(15237);
|
|
53
53
|
var general_1 = __importDefault(__nccwpck_require__(3605));
|
|
54
54
|
var mongodb_1 = __importDefault(__nccwpck_require__(52934));
|
|
55
55
|
var cloudSQL_1 = __importDefault(__nccwpck_require__(6675));
|
|
@@ -81,7 +81,7 @@ exports["default"] = (function () { return __awaiter(void 0, void 0, void 0, fun
|
|
|
81
81
|
(0, mongodb_1["default"])(vorpal);
|
|
82
82
|
(0, theStuffThatReallyMatters_1["default"])(vorpal);
|
|
83
83
|
process.on("exit", function () {
|
|
84
|
-
(0,
|
|
84
|
+
(0, portForwards_1.stopAllPortForwards)();
|
|
85
85
|
});
|
|
86
86
|
return [2 /*return*/];
|
|
87
87
|
}
|
|
@@ -398,10 +398,10 @@ var k8sApi_1 = __nccwpck_require__(54756);
|
|
|
398
398
|
var cluster_1 = __nccwpck_require__(66894);
|
|
399
399
|
var log_1 = __nccwpck_require__(37851);
|
|
400
400
|
var passwordstore_1 = __nccwpck_require__(37234);
|
|
401
|
-
var
|
|
401
|
+
var portForwards_1 = __nccwpck_require__(15237);
|
|
402
402
|
var shell_1 = __nccwpck_require__(60983);
|
|
403
403
|
var namespaceAutoCompletion_1 = __nccwpck_require__(79176);
|
|
404
|
-
var
|
|
404
|
+
var portForward_1 = __importDefault(__nccwpck_require__(75059));
|
|
405
405
|
var getAllNamespaces = (0, memoizee_1["default"])(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
406
406
|
var k8sApi, res;
|
|
407
407
|
return __generator(this, function (_a) {
|
|
@@ -429,7 +429,7 @@ var getAllNamespacesNames = function () { return __awaiter(void 0, void 0, void
|
|
|
429
429
|
exports.getAllNamespacesNames = getAllNamespacesNames;
|
|
430
430
|
exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void 0, function () {
|
|
431
431
|
return __generator(this, function (_a) {
|
|
432
|
-
vorpal.command("current-context").action(function () {
|
|
432
|
+
vorpal.command("kube-current-context").action(function () {
|
|
433
433
|
return __awaiter(this, void 0, void 0, function () {
|
|
434
434
|
var _a;
|
|
435
435
|
return __generator(this, function (_b) {
|
|
@@ -445,7 +445,7 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
|
|
|
445
445
|
});
|
|
446
446
|
});
|
|
447
447
|
vorpal
|
|
448
|
-
.command("list-namespaces", "list all namespaces")
|
|
448
|
+
.command("kube-list-namespaces", "list all namespaces")
|
|
449
449
|
.action(function () {
|
|
450
450
|
return __awaiter(this, void 0, void 0, function () {
|
|
451
451
|
var namespaces;
|
|
@@ -461,7 +461,7 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
|
|
|
461
461
|
});
|
|
462
462
|
});
|
|
463
463
|
vorpal
|
|
464
|
-
.command("list-secrets <namespace>", "show secrets")
|
|
464
|
+
.command("kube-list-secrets <namespace>", "show secrets")
|
|
465
465
|
.autocomplete(namespaceAutoCompletion_1.namespaceAutoCompletion)
|
|
466
466
|
.action(function (_a) {
|
|
467
467
|
var namespace = _a.namespace;
|
|
@@ -494,7 +494,7 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
|
|
|
494
494
|
});
|
|
495
495
|
});
|
|
496
496
|
vorpal
|
|
497
|
-
.command("list-pods <namespace>", "list all pods of namespace")
|
|
497
|
+
.command("kube-list-pods <namespace>", "list all pods of namespace")
|
|
498
498
|
.autocomplete(namespaceAutoCompletion_1.namespaceAutoCompletion)
|
|
499
499
|
.action(function (_a) {
|
|
500
500
|
var namespace = _a.namespace;
|
|
@@ -514,21 +514,21 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
|
|
|
514
514
|
});
|
|
515
515
|
});
|
|
516
516
|
vorpal
|
|
517
|
-
.command("stop-portforward <name>", "stop a running port forward")
|
|
517
|
+
.command("kube-stop-portforward <name>", "stop a running port forward")
|
|
518
518
|
.autocomplete({ data: function () { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
|
|
519
|
-
return [2 /*return*/, (0,
|
|
519
|
+
return [2 /*return*/, (0, portForwards_1.getAllRunningPortForwards)()];
|
|
520
520
|
}); }); } })
|
|
521
521
|
.action(function (_a) {
|
|
522
522
|
var name = _a.name;
|
|
523
523
|
return __awaiter(this, void 0, void 0, function () {
|
|
524
524
|
return __generator(this, function (_b) {
|
|
525
|
-
(0,
|
|
525
|
+
(0, portForwards_1.stopPortForward)(name.trim());
|
|
526
526
|
return [2 /*return*/];
|
|
527
527
|
});
|
|
528
528
|
});
|
|
529
529
|
});
|
|
530
530
|
vorpal
|
|
531
|
-
.command("get-shell <namespace>", "get a shell to a pod in the environment")
|
|
531
|
+
.command("kube-get-shell <namespace>", "get a shell to a pod in the environment")
|
|
532
532
|
.autocomplete(namespaceAutoCompletion_1.namespaceAutoCompletion)
|
|
533
533
|
.action(function (_a) {
|
|
534
534
|
var namespace = _a.namespace;
|
|
@@ -562,7 +562,7 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
|
|
|
562
562
|
});
|
|
563
563
|
});
|
|
564
564
|
});
|
|
565
|
-
(0,
|
|
565
|
+
(0, portForward_1["default"])(vorpal);
|
|
566
566
|
return [2 /*return*/];
|
|
567
567
|
});
|
|
568
568
|
}); });
|
|
@@ -676,13 +676,13 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
676
676
|
};
|
|
677
677
|
exports.__esModule = true;
|
|
678
678
|
var log_1 = __nccwpck_require__(37851);
|
|
679
|
-
var portForward_1 = __nccwpck_require__(
|
|
679
|
+
var portForward_1 = __nccwpck_require__(20417);
|
|
680
680
|
var k8sApi_1 = __nccwpck_require__(54756);
|
|
681
681
|
var namespaceAutoCompletion_1 = __nccwpck_require__(79176);
|
|
682
682
|
exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void 0, function () {
|
|
683
683
|
return __generator(this, function (_a) {
|
|
684
684
|
return [2 /*return*/, vorpal
|
|
685
|
-
.command("port-forward <namespace>", "start port-forwarding")
|
|
685
|
+
.command("kube-port-forward <namespace>", "start port-forwarding")
|
|
686
686
|
.autocomplete(namespaceAutoCompletion_1.namespaceAutoCompletion)
|
|
687
687
|
.action(function (_a) {
|
|
688
688
|
var namespace = _a.namespace;
|
|
@@ -726,7 +726,7 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
|
|
|
726
726
|
})];
|
|
727
727
|
case 4:
|
|
728
728
|
remotePort = (_b.sent()).remotePort;
|
|
729
|
-
return [2 /*return*/, (0, portForward_1.
|
|
729
|
+
return [2 /*return*/, (0, portForward_1.startKubePortForward)(podName, localPort, remotePort, namespace)];
|
|
730
730
|
}
|
|
731
731
|
});
|
|
732
732
|
});
|
|
@@ -1145,7 +1145,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
1145
1145
|
exports.__esModule = true;
|
|
1146
1146
|
var getProjectConfig_1 = __nccwpck_require__(24146);
|
|
1147
1147
|
var log_1 = __nccwpck_require__(37851);
|
|
1148
|
-
var portForward_1 = __nccwpck_require__(
|
|
1148
|
+
var portForward_1 = __nccwpck_require__(20417);
|
|
1149
1149
|
var projects_1 = __nccwpck_require__(41619);
|
|
1150
1150
|
var autocompletions_1 = __nccwpck_require__(41373);
|
|
1151
1151
|
var ensureCluster_1 = __importDefault(__nccwpck_require__(8722));
|
|
@@ -1214,7 +1214,7 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
|
|
|
1214
1214
|
this.log("");
|
|
1215
1215
|
this.log("👆 connection string has been copied to your clipboard!");
|
|
1216
1216
|
this.log("");
|
|
1217
|
-
return [2 /*return*/, (0, portForward_1.
|
|
1217
|
+
return [2 /*return*/, (0, portForward_1.startKubePortForward)(podName, localPort, 27017, namespace)];
|
|
1218
1218
|
}
|
|
1219
1219
|
});
|
|
1220
1220
|
});
|
|
@@ -2923,7 +2923,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
2923
2923
|
exports.__esModule = true;
|
|
2924
2924
|
var open_1 = __importDefault(__nccwpck_require__(14247));
|
|
2925
2925
|
var constants_1 = __nccwpck_require__(3032);
|
|
2926
|
-
var portForward_1 = __nccwpck_require__(
|
|
2926
|
+
var portForward_1 = __nccwpck_require__(20417);
|
|
2927
2927
|
var projects_1 = __nccwpck_require__(41619);
|
|
2928
2928
|
var autocompletions_1 = __nccwpck_require__(41373);
|
|
2929
2929
|
var ensureCluster_1 = __importDefault(__nccwpck_require__(8722));
|
|
@@ -2950,7 +2950,7 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
|
|
|
2950
2950
|
case 2:
|
|
2951
2951
|
namespace = _b.sent();
|
|
2952
2952
|
url = "http://localhost:".concat(constants_1.GRAFANA_PROXY_LOCAL_PORT, "/namespace.html?name=").concat(namespace);
|
|
2953
|
-
return [4 /*yield*/, (0, portForward_1.
|
|
2953
|
+
return [4 /*yield*/, (0, portForward_1.startKubePortForward)("deployment/kubecost-cost-analyzer", constants_1.GRAFANA_PROXY_LOCAL_PORT, constants_1.GRAFANA_PROXY_TARGET_PORT, "kubecost")];
|
|
2954
2954
|
case 3:
|
|
2955
2955
|
_b.sent();
|
|
2956
2956
|
(0, open_1["default"])(url);
|
|
@@ -3253,7 +3253,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3253
3253
|
};
|
|
3254
3254
|
exports.__esModule = true;
|
|
3255
3255
|
var open_1 = __importDefault(__nccwpck_require__(14247));
|
|
3256
|
-
var portForward_1 = __nccwpck_require__(
|
|
3256
|
+
var portForward_1 = __nccwpck_require__(20417);
|
|
3257
3257
|
var constants_1 = __nccwpck_require__(3032);
|
|
3258
3258
|
var projects_1 = __nccwpck_require__(41619);
|
|
3259
3259
|
var autocompletions_1 = __nccwpck_require__(41373);
|
|
@@ -3281,7 +3281,7 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
|
|
|
3281
3281
|
case 2:
|
|
3282
3282
|
namespace = _b.sent();
|
|
3283
3283
|
url = "http://localhost:".concat(constants_1.GRAFANA_PROXY_LOCAL_PORT, "/grafana/d/at-cost-analysis-namespace2/namespace-utilization-metrics?var-namespace=").concat(namespace);
|
|
3284
|
-
return [4 /*yield*/, (0, portForward_1.
|
|
3284
|
+
return [4 /*yield*/, (0, portForward_1.startKubePortForward)("deployment/kubecost-cost-analyzer", constants_1.GRAFANA_PROXY_LOCAL_PORT, constants_1.GRAFANA_PROXY_TARGET_PORT, "kubecost")];
|
|
3285
3285
|
case 3:
|
|
3286
3286
|
_b.sent();
|
|
3287
3287
|
(0, open_1["default"])(url);
|
|
@@ -3346,7 +3346,7 @@ var open_1 = __importDefault(__nccwpck_require__(14247));
|
|
|
3346
3346
|
var constants_1 = __nccwpck_require__(3032);
|
|
3347
3347
|
var kubernetes_1 = __nccwpck_require__(80606);
|
|
3348
3348
|
var log_1 = __nccwpck_require__(37851);
|
|
3349
|
-
var portForward_1 = __nccwpck_require__(
|
|
3349
|
+
var portForward_1 = __nccwpck_require__(20417);
|
|
3350
3350
|
var projects_1 = __nccwpck_require__(41619);
|
|
3351
3351
|
var autocompletions_1 = __nccwpck_require__(41373);
|
|
3352
3352
|
var ensureCluster_1 = __importDefault(__nccwpck_require__(8722));
|
|
@@ -3388,7 +3388,7 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
|
|
|
3388
3388
|
case 4:
|
|
3389
3389
|
namespace = _b.sent();
|
|
3390
3390
|
url = "http://localhost:".concat(constants_1.GRAFANA_PROXY_LOCAL_PORT, "/grafana/d/at-cost-analysis-pod/pod-cost-and-utilization-metrics?var-namespace=").concat(namespace, "&var-pod=").concat(podName);
|
|
3391
|
-
return [4 /*yield*/, (0, portForward_1.
|
|
3391
|
+
return [4 /*yield*/, (0, portForward_1.startKubePortForward)("deployment/kubecost-cost-analyzer", constants_1.GRAFANA_PROXY_LOCAL_PORT, constants_1.GRAFANA_PROXY_TARGET_PORT, "kubecost")];
|
|
3392
3392
|
case 5:
|
|
3393
3393
|
_b.sent();
|
|
3394
3394
|
(0, open_1["default"])(url);
|
|
@@ -3636,10 +3636,90 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3636
3636
|
exports.__esModule = true;
|
|
3637
3637
|
var kubernetes_1 = __nccwpck_require__(80606);
|
|
3638
3638
|
var log_1 = __nccwpck_require__(37851);
|
|
3639
|
-
var portForward_1 = __nccwpck_require__(
|
|
3639
|
+
var portForward_1 = __nccwpck_require__(20417);
|
|
3640
3640
|
var projects_1 = __nccwpck_require__(41619);
|
|
3641
3641
|
var autocompletions_1 = __nccwpck_require__(41373);
|
|
3642
3642
|
var ensureCluster_1 = __importDefault(__nccwpck_require__(8722));
|
|
3643
|
+
var parseChoice_1 = __nccwpck_require__(3319);
|
|
3644
|
+
var getProjectConfig_1 = __nccwpck_require__(24146);
|
|
3645
|
+
var pipeline_1 = __nccwpck_require__(25355);
|
|
3646
|
+
var portForwards_1 = __nccwpck_require__(15237);
|
|
3647
|
+
var open_1 = __importDefault(__nccwpck_require__(14247));
|
|
3648
|
+
var kubePortForward = function (cmd, envComponent) { return __awaiter(void 0, void 0, void 0, function () {
|
|
3649
|
+
var namespace, podNames, podName, localPort, remotePort;
|
|
3650
|
+
return __generator(this, function (_a) {
|
|
3651
|
+
switch (_a.label) {
|
|
3652
|
+
case 0: return [4 /*yield*/, ensureCluster_1["default"].call(cmd, envComponent)];
|
|
3653
|
+
case 1:
|
|
3654
|
+
_a.sent();
|
|
3655
|
+
return [4 /*yield*/, (0, projects_1.getProjectNamespace)(envComponent)];
|
|
3656
|
+
case 2:
|
|
3657
|
+
namespace = _a.sent();
|
|
3658
|
+
return [4 /*yield*/, (0, kubernetes_1.getProjectPodNames)(envComponent)];
|
|
3659
|
+
case 3:
|
|
3660
|
+
podNames = _a.sent();
|
|
3661
|
+
if (podNames.length === 0) {
|
|
3662
|
+
(0, log_1.logError)(cmd, "sorry, no pods found");
|
|
3663
|
+
return [2 /*return*/];
|
|
3664
|
+
}
|
|
3665
|
+
return [4 /*yield*/, cmd.prompt({
|
|
3666
|
+
type: "list",
|
|
3667
|
+
name: "podName",
|
|
3668
|
+
choices: podNames,
|
|
3669
|
+
message: "Which pod? 🤔"
|
|
3670
|
+
})];
|
|
3671
|
+
case 4:
|
|
3672
|
+
podName = (_a.sent()).podName;
|
|
3673
|
+
return [4 /*yield*/, cmd.prompt({
|
|
3674
|
+
type: "number",
|
|
3675
|
+
name: "localPort",
|
|
3676
|
+
message: "Local port: "
|
|
3677
|
+
})];
|
|
3678
|
+
case 5:
|
|
3679
|
+
localPort = (_a.sent()).localPort;
|
|
3680
|
+
return [4 /*yield*/, cmd.prompt({
|
|
3681
|
+
type: "number",
|
|
3682
|
+
name: "remotePort",
|
|
3683
|
+
message: "Remote port: "
|
|
3684
|
+
})];
|
|
3685
|
+
case 6:
|
|
3686
|
+
remotePort = (_a.sent()).remotePort;
|
|
3687
|
+
return [2 /*return*/, (0, portForward_1.startKubePortForward)(podName, localPort, remotePort, namespace)];
|
|
3688
|
+
}
|
|
3689
|
+
});
|
|
3690
|
+
}); };
|
|
3691
|
+
var cloudRunPortForward = function (cmd, context) { return __awaiter(void 0, void 0, void 0, function () {
|
|
3692
|
+
var fullName, serviceName, mr, _a, projectId, region, command;
|
|
3693
|
+
return __generator(this, function (_b) {
|
|
3694
|
+
switch (_b.label) {
|
|
3695
|
+
case 0:
|
|
3696
|
+
if (!(0, pipeline_1.isOfDeployType)(context.componentConfig.deploy, "google-cloudrun")) {
|
|
3697
|
+
throw new Error("not cloud run");
|
|
3698
|
+
}
|
|
3699
|
+
fullName = context.environment.fullName;
|
|
3700
|
+
serviceName = fullName;
|
|
3701
|
+
if (!(context.environment.envType === "review")) return [3 /*break*/, 2];
|
|
3702
|
+
return [4 /*yield*/, cmd.prompt({
|
|
3703
|
+
type: "number",
|
|
3704
|
+
name: "mr",
|
|
3705
|
+
message: "Which mr 🤔 "
|
|
3706
|
+
})];
|
|
3707
|
+
case 1:
|
|
3708
|
+
mr = (_b.sent()).mr;
|
|
3709
|
+
// poor mans solution
|
|
3710
|
+
serviceName = serviceName.replace("-review-", "-review-mr" + mr + "-");
|
|
3711
|
+
_b.label = 2;
|
|
3712
|
+
case 2:
|
|
3713
|
+
_a = context.componentConfig.deploy, projectId = _a.projectId, region = _a.region;
|
|
3714
|
+
command = "gcloud beta run services proxy ".concat(serviceName, " --project ").concat(projectId, " --region ").concat(region);
|
|
3715
|
+
return [4 /*yield*/, (0, portForwards_1.startPortForwardCommand)("cloudRun/".concat(serviceName), command)];
|
|
3716
|
+
case 3:
|
|
3717
|
+
_b.sent();
|
|
3718
|
+
(0, open_1["default"])("http://localhost:8080");
|
|
3719
|
+
return [2 /*return*/];
|
|
3720
|
+
}
|
|
3721
|
+
});
|
|
3722
|
+
}); };
|
|
3643
3723
|
exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void 0, function () {
|
|
3644
3724
|
var _a, _b;
|
|
3645
3725
|
return __generator(this, function (_c) {
|
|
@@ -3653,45 +3733,26 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
|
|
|
3653
3733
|
.action(function (_a) {
|
|
3654
3734
|
var envComponent = _a.envComponent;
|
|
3655
3735
|
return __awaiter(this, void 0, void 0, function () {
|
|
3656
|
-
var
|
|
3657
|
-
return __generator(this, function (
|
|
3658
|
-
switch (
|
|
3659
|
-
case 0:
|
|
3736
|
+
var _b, env, componentName, context;
|
|
3737
|
+
return __generator(this, function (_c) {
|
|
3738
|
+
switch (_c.label) {
|
|
3739
|
+
case 0:
|
|
3740
|
+
_b = (0, parseChoice_1.parseChoice)(envComponent), env = _b.env, componentName = _b.componentName;
|
|
3741
|
+
return [4 /*yield*/, (0, getProjectConfig_1.getPipelineContextByChoice)(env, componentName)];
|
|
3660
3742
|
case 1:
|
|
3661
|
-
|
|
3662
|
-
|
|
3743
|
+
context = _c.sent();
|
|
3744
|
+
if (!(0, pipeline_1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) return [3 /*break*/, 3];
|
|
3745
|
+
return [4 /*yield*/, kubePortForward(this, envComponent)];
|
|
3663
3746
|
case 2:
|
|
3664
|
-
|
|
3665
|
-
|
|
3747
|
+
_c.sent();
|
|
3748
|
+
_c.label = 3;
|
|
3666
3749
|
case 3:
|
|
3667
|
-
|
|
3668
|
-
|
|
3669
|
-
(0, log_1.logError)(this, "sorry, no pods found");
|
|
3670
|
-
return [2 /*return*/];
|
|
3671
|
-
}
|
|
3672
|
-
return [4 /*yield*/, this.prompt({
|
|
3673
|
-
type: "list",
|
|
3674
|
-
name: "podName",
|
|
3675
|
-
choices: podNames,
|
|
3676
|
-
message: "Which pod? 🤔"
|
|
3677
|
-
})];
|
|
3750
|
+
if (!(0, pipeline_1.isOfDeployType)(context.componentConfig.deploy, "google-cloudrun")) return [3 /*break*/, 5];
|
|
3751
|
+
return [4 /*yield*/, cloudRunPortForward(this, context)];
|
|
3678
3752
|
case 4:
|
|
3679
|
-
|
|
3680
|
-
|
|
3681
|
-
|
|
3682
|
-
name: "localPort",
|
|
3683
|
-
message: "Local port: "
|
|
3684
|
-
})];
|
|
3685
|
-
case 5:
|
|
3686
|
-
localPort = (_b.sent()).localPort;
|
|
3687
|
-
return [4 /*yield*/, this.prompt({
|
|
3688
|
-
type: "number",
|
|
3689
|
-
name: "remotePort",
|
|
3690
|
-
message: "Remote port: "
|
|
3691
|
-
})];
|
|
3692
|
-
case 6:
|
|
3693
|
-
remotePort = (_b.sent()).remotePort;
|
|
3694
|
-
return [2 /*return*/, (0, portForward_1.startPortForward)(podName, localPort, remotePort, namespace)];
|
|
3753
|
+
_c.sent();
|
|
3754
|
+
_c.label = 5;
|
|
3755
|
+
case 5: return [2 /*return*/];
|
|
3695
3756
|
}
|
|
3696
3757
|
});
|
|
3697
3758
|
});
|
|
@@ -7179,6 +7240,68 @@ exports.openGoogleCloudKubernetesDashboard = openGoogleCloudKubernetesDashboard;
|
|
|
7179
7240
|
|
|
7180
7241
|
/***/ }),
|
|
7181
7242
|
|
|
7243
|
+
/***/ 20417:
|
|
7244
|
+
/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
|
|
7245
|
+
|
|
7246
|
+
"use strict";
|
|
7247
|
+
|
|
7248
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
7249
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
7250
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
7251
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
7252
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7253
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7254
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
7255
|
+
});
|
|
7256
|
+
};
|
|
7257
|
+
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
7258
|
+
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
|
|
7259
|
+
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
7260
|
+
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
7261
|
+
function step(op) {
|
|
7262
|
+
if (f) throw new TypeError("Generator is already executing.");
|
|
7263
|
+
while (_) try {
|
|
7264
|
+
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
7265
|
+
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
7266
|
+
switch (op[0]) {
|
|
7267
|
+
case 0: case 1: t = op; break;
|
|
7268
|
+
case 4: _.label++; return { value: op[1], done: false };
|
|
7269
|
+
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
7270
|
+
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
7271
|
+
default:
|
|
7272
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
7273
|
+
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
7274
|
+
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
7275
|
+
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
7276
|
+
if (t[2]) _.ops.pop();
|
|
7277
|
+
_.trys.pop(); continue;
|
|
7278
|
+
}
|
|
7279
|
+
op = body.call(thisArg, _);
|
|
7280
|
+
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
7281
|
+
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
7282
|
+
}
|
|
7283
|
+
};
|
|
7284
|
+
exports.__esModule = true;
|
|
7285
|
+
exports.startKubePortForward = void 0;
|
|
7286
|
+
var portForwards_1 = __nccwpck_require__(15237);
|
|
7287
|
+
var startKubePortForward = function (podname, localPort, remotePort, namespace) { return __awaiter(void 0, void 0, void 0, function () {
|
|
7288
|
+
var name;
|
|
7289
|
+
return __generator(this, function (_a) {
|
|
7290
|
+
switch (_a.label) {
|
|
7291
|
+
case 0:
|
|
7292
|
+
name = "kube/".concat(namespace, "/").concat(podname, "/").concat(localPort, ":").concat(remotePort);
|
|
7293
|
+
return [4 /*yield*/, (0, portForwards_1.startPortForwardCommand)(name, "kubectl port-forward ".concat(podname, " ").concat(localPort, ":").concat(remotePort, " -n ").concat(namespace))];
|
|
7294
|
+
case 1:
|
|
7295
|
+
_a.sent();
|
|
7296
|
+
return [2 /*return*/];
|
|
7297
|
+
}
|
|
7298
|
+
});
|
|
7299
|
+
}); };
|
|
7300
|
+
exports.startKubePortForward = startKubePortForward;
|
|
7301
|
+
//# sourceMappingURL=portForward.js.map
|
|
7302
|
+
|
|
7303
|
+
/***/ }),
|
|
7304
|
+
|
|
7182
7305
|
/***/ 71628:
|
|
7183
7306
|
/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
|
|
7184
7307
|
|
|
@@ -8273,7 +8396,7 @@ exports.trashItem = trashItem;
|
|
|
8273
8396
|
|
|
8274
8397
|
/***/ }),
|
|
8275
8398
|
|
|
8276
|
-
/***/
|
|
8399
|
+
/***/ 15237:
|
|
8277
8400
|
/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
|
|
8278
8401
|
|
|
8279
8402
|
"use strict";
|
|
@@ -8326,7 +8449,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
8326
8449
|
}
|
|
8327
8450
|
};
|
|
8328
8451
|
exports.__esModule = true;
|
|
8329
|
-
exports.stopAllPortForwards = exports.
|
|
8452
|
+
exports.stopAllPortForwards = exports.startPortForwardCommand = exports.getAllRunningPortForwards = exports.stopPortForward = void 0;
|
|
8330
8453
|
var child_process_promise_1 = __nccwpck_require__(75763);
|
|
8331
8454
|
var portForwards = new Map();
|
|
8332
8455
|
var stopPortForward = function (name) { return __awaiter(void 0, void 0, void 0, function () {
|
|
@@ -8359,30 +8482,34 @@ var getAllRunningPortForwards = function () {
|
|
|
8359
8482
|
return Array.from(portForwards.keys());
|
|
8360
8483
|
};
|
|
8361
8484
|
exports.getAllRunningPortForwards = getAllRunningPortForwards;
|
|
8362
|
-
var
|
|
8363
|
-
|
|
8364
|
-
|
|
8365
|
-
|
|
8366
|
-
|
|
8367
|
-
|
|
8485
|
+
var addPortForward = function (name, portForward) {
|
|
8486
|
+
portForwards.set(name, portForward);
|
|
8487
|
+
};
|
|
8488
|
+
var startPortForwardCommand = function (name, command) { return __awaiter(void 0, void 0, void 0, function () {
|
|
8489
|
+
var _a, cmd, args, promise;
|
|
8490
|
+
return __generator(this, function (_b) {
|
|
8491
|
+
switch (_b.label) {
|
|
8492
|
+
case 0:
|
|
8493
|
+
// stop if already there
|
|
8494
|
+
return [4 /*yield*/, (0, exports.stopPortForward)(name)];
|
|
8495
|
+
case 1:
|
|
8368
8496
|
// stop if already there
|
|
8369
|
-
|
|
8370
|
-
|
|
8371
|
-
|
|
8372
|
-
promise = (0, child_process_promise_1.spawn)("kubectl", ["port-forward", podname, "".concat(localPort, ":").concat(remotePort), "-n", namespace], {
|
|
8497
|
+
_b.sent();
|
|
8498
|
+
_a = command.split(" "), cmd = _a[0], args = _a.slice(1);
|
|
8499
|
+
promise = (0, child_process_promise_1.spawn)(cmd, args, {
|
|
8373
8500
|
env: __assign(__assign({}, process.env), { DEBUG: "" })
|
|
8374
8501
|
});
|
|
8375
|
-
|
|
8502
|
+
addPortForward(name, promise);
|
|
8376
8503
|
// wait a moment so that is surley started, unfortunatly we don't know that
|
|
8377
8504
|
return [4 /*yield*/, new Promise(function (r) { return setTimeout(r, 1000); })];
|
|
8378
|
-
case
|
|
8505
|
+
case 2:
|
|
8379
8506
|
// wait a moment so that is surley started, unfortunatly we don't know that
|
|
8380
|
-
|
|
8507
|
+
_b.sent();
|
|
8381
8508
|
return [2 /*return*/];
|
|
8382
8509
|
}
|
|
8383
8510
|
});
|
|
8384
8511
|
}); };
|
|
8385
|
-
exports.
|
|
8512
|
+
exports.startPortForwardCommand = startPortForwardCommand;
|
|
8386
8513
|
var stopAllPortForwards = function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
8387
8514
|
return __generator(this, function (_a) {
|
|
8388
8515
|
(0, exports.getAllRunningPortForwards)().forEach(function (name) {
|
|
@@ -8392,7 +8519,7 @@ var stopAllPortForwards = function () { return __awaiter(void 0, void 0, void 0,
|
|
|
8392
8519
|
});
|
|
8393
8520
|
}); };
|
|
8394
8521
|
exports.stopAllPortForwards = stopAllPortForwards;
|
|
8395
|
-
//# sourceMappingURL=
|
|
8522
|
+
//# sourceMappingURL=portForwards.js.map
|
|
8396
8523
|
|
|
8397
8524
|
/***/ }),
|
|
8398
8525
|
|
|
@@ -1118268,7 +1118395,7 @@ exports.readConfigSync = readConfigSync;
|
|
|
1118268
1118395
|
|
|
1118269
1118396
|
exports.__esModule = true;
|
|
1118270
1118397
|
exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
|
|
1118271
|
-
exports.PIPELINE_IMAGE_TAG = "refactor-gcloud-api-
|
|
1118398
|
+
exports.PIPELINE_IMAGE_TAG = "refactor-gcloud-api-6e4348f1" || 0;
|
|
1118272
1118399
|
exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
|
|
1118273
1118400
|
|
|
1118274
1118401
|
/***/ }),
|
|
@@ -1119406,6 +1119533,16 @@ exports.getBaseRollbackJob = getBaseRollbackJob;
|
|
|
1119406
1119533
|
"use strict";
|
|
1119407
1119534
|
|
|
1119408
1119535
|
|
|
1119536
|
+
var __assign = this && this.__assign || function () {
|
|
1119537
|
+
__assign = Object.assign || function (t) {
|
|
1119538
|
+
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
1119539
|
+
s = arguments[i];
|
|
1119540
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
|
|
1119541
|
+
}
|
|
1119542
|
+
return t;
|
|
1119543
|
+
};
|
|
1119544
|
+
return __assign.apply(this, arguments);
|
|
1119545
|
+
};
|
|
1119409
1119546
|
var __read = this && this.__read || function (o, n) {
|
|
1119410
1119547
|
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
1119411
1119548
|
if (!m) return o;
|
|
@@ -1119451,6 +1119588,7 @@ var gcloudServiceAccountLoginCommands_1 = __nccwpck_require__(22607);
|
|
|
1119451
1119588
|
var database_1 = __nccwpck_require__(41384);
|
|
1119452
1119589
|
var gitlab_1 = __nccwpck_require__(84997);
|
|
1119453
1119590
|
var jobName_1 = __nccwpck_require__(77311);
|
|
1119591
|
+
var createArgsString_1 = __nccwpck_require__(8686);
|
|
1119454
1119592
|
var setExtraVarsScripts = function (deployConfig) {
|
|
1119455
1119593
|
return ["export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe ".concat(deployConfig.projectId, " --format=\"value(projectNumber)\")"), "echo \"GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER\""];
|
|
1119456
1119594
|
};
|
|
@@ -1119476,9 +1119614,16 @@ var createGoogleCloudRunDeployJobs = function (context) {
|
|
|
1119476
1119614
|
value = _b[1];
|
|
1119477
1119615
|
return "".concat(key, "=").concat(value);
|
|
1119478
1119616
|
}).join(",");
|
|
1119479
|
-
var commonArgs =
|
|
1119480
|
-
|
|
1119481
|
-
|
|
1119617
|
+
var commonArgs = {
|
|
1119618
|
+
project: deployConfig.projectId,
|
|
1119619
|
+
region: deployConfig.region
|
|
1119620
|
+
};
|
|
1119621
|
+
var commonDeployArgs = __assign(__assign({
|
|
1119622
|
+
image: gcloudImageName
|
|
1119623
|
+
}, commonArgs), {
|
|
1119624
|
+
"set-cloudsql-instances": deployConfig.cloudSql ? deployConfig.cloudSql.instanceConnectionName : undefined,
|
|
1119625
|
+
labels: labelsString
|
|
1119626
|
+
});
|
|
1119482
1119627
|
var serviceName = context.environment.fullName.toLowerCase();
|
|
1119483
1119628
|
var getFullJobName = function (name) {
|
|
1119484
1119629
|
return (0, jobName_1.getCloudRunJobName)(context.environment.fullName, name);
|
|
@@ -1119508,35 +1119653,33 @@ var createGoogleCloudRunDeployJobs = function (context) {
|
|
|
1119508
1119653
|
};
|
|
1119509
1119654
|
});
|
|
1119510
1119655
|
var getServiceDeployScript = function (service, nameSuffix) {
|
|
1119511
|
-
var _a;
|
|
1119656
|
+
var _a, _b;
|
|
1119512
1119657
|
var customConfig = service !== true ? service : undefined;
|
|
1119513
1119658
|
var command = service !== true ? (_a = service === null || service === void 0 ? void 0 : service.command) !== null && _a !== void 0 ? _a : context.componentConfig.build.startCommand : undefined;
|
|
1119514
|
-
var
|
|
1119515
|
-
|
|
1119516
|
-
|
|
1119659
|
+
var argsString = (0, createArgsString_1.createArgsString)(__assign(__assign({
|
|
1119660
|
+
command: command ? '"' + command.split(" ").join(",") + '"' : undefined
|
|
1119661
|
+
}, commonDeployArgs), {
|
|
1119662
|
+
"env-vars-file": "____envvars.yaml",
|
|
1119517
1119663
|
"min-instances": customConfig === null || customConfig === void 0 ? void 0 : customConfig.minInstances,
|
|
1119518
1119664
|
"max-instances": customConfig === null || customConfig === void 0 ? void 0 : customConfig.maxInstances,
|
|
1119519
1119665
|
"no-cpu-throttling": customConfig === null || customConfig === void 0 ? void 0 : customConfig.noCpuThrottling
|
|
1119520
|
-
};
|
|
1119521
|
-
var
|
|
1119522
|
-
|
|
1119523
|
-
value = _b[1];
|
|
1119524
|
-
return !(0, lodash_1.isNil)(value);
|
|
1119525
|
-
}).map(function (_a) {
|
|
1119526
|
-
var _b = __read(_a, 2),
|
|
1119527
|
-
key = _b[0],
|
|
1119528
|
-
value = _b[1];
|
|
1119529
|
-
return "--".concat(key).concat(value !== true ? "=".concat(value) : "");
|
|
1119530
|
-
}).join(" ");
|
|
1119531
|
-
return "gcloud run deploy ".concat(serviceName).concat(nameSuffix !== null && nameSuffix !== void 0 ? nameSuffix : "", " ").concat(commandArg, " ").concat(commonDeployArgs, " --env-vars-file=____envvars.yaml ").concat(argsString);
|
|
1119666
|
+
}));
|
|
1119667
|
+
var authenticationString = ((_b = customConfig === null || customConfig === void 0 ? void 0 : customConfig.allowUnauthenticated) !== null && _b !== void 0 ? _b : true) ? "--allow-unauthenticated" : "--no-allow-unauthenticated";
|
|
1119668
|
+
return "gcloud run deploy ".concat(serviceName).concat(nameSuffix !== null && nameSuffix !== void 0 ? nameSuffix : "", " ").concat(argsString, " ").concat(authenticationString);
|
|
1119532
1119669
|
};
|
|
1119533
1119670
|
var getJobCreateScriptsForJob = function (jobName, job) {
|
|
1119534
1119671
|
// due to some oversight from google, jobs create does not accept `--env-vars-file` 🤦
|
|
1119535
1119672
|
// lucky, update on the other hand accepts it... so let's just imediatly update it
|
|
1119536
1119673
|
// also we cannot upsert a job, so we have to create it and catch the error and then update
|
|
1119537
|
-
var
|
|
1119538
|
-
|
|
1119674
|
+
var commonDeployArgsString = (0, createArgsString_1.createArgsString)(__assign(__assign({
|
|
1119675
|
+
command: '"' + job.command.split(" ").join(",") + '"'
|
|
1119676
|
+
}, commonDeployArgs), {
|
|
1119677
|
+
memory: job.memory || "512Mi"
|
|
1119678
|
+
}));
|
|
1119679
|
+
var argsString = "".concat(jobName, " ").concat(commonDeployArgsString);
|
|
1119680
|
+
return __spreadArray(__spreadArray([], __read((0, gitlab_1.allowFailureInScripts)(["gcloud beta run jobs create ".concat(argsString)])), false), ["gcloud beta run jobs update ".concat(argsString, " --env-vars-file=____envvars.yaml")], false);
|
|
1119539
1119681
|
};
|
|
1119682
|
+
var commonArgsString = (0, createArgsString_1.createArgsString)(commonArgs);
|
|
1119540
1119683
|
var getJobCreateScripts = function () {
|
|
1119541
1119684
|
return jobsWithNames.map(function (_a) {
|
|
1119542
1119685
|
var job = _a.job,
|
|
@@ -1119545,7 +1119688,7 @@ var createGoogleCloudRunDeployJobs = function (context) {
|
|
|
1119545
1119688
|
}).flat();
|
|
1119546
1119689
|
};
|
|
1119547
1119690
|
var getJobRunScriptForJob = function (jobName) {
|
|
1119548
|
-
return "gcloud beta run jobs execute ".concat(jobName, " ").concat(
|
|
1119691
|
+
return "gcloud beta run jobs execute ".concat(jobName, " ").concat(commonArgsString);
|
|
1119549
1119692
|
};
|
|
1119550
1119693
|
var getJobRunScripts = function (when) {
|
|
1119551
1119694
|
return jobsWithNames.filter(function (_a) {
|
|
@@ -1119561,20 +1119704,32 @@ var createGoogleCloudRunDeployJobs = function (context) {
|
|
|
1119561
1119704
|
var job = _a.job,
|
|
1119562
1119705
|
jobName = _a.jobName,
|
|
1119563
1119706
|
schedulerName = _a.schedulerName;
|
|
1119564
|
-
var
|
|
1119707
|
+
var argsString = (0, createArgsString_1.createArgsString)({
|
|
1119708
|
+
project: deployConfig.projectId,
|
|
1119709
|
+
location: deployConfig.region,
|
|
1119710
|
+
schedule: "\"".concat(job.schedule, "\""),
|
|
1119711
|
+
uri: "\"https://".concat(deployConfig.region, "-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/").concat(deployConfig.projectId, "/jobs/").concat(jobName, ":run\""),
|
|
1119712
|
+
"http-method": "POST",
|
|
1119713
|
+
"oauth-service-account-email": "$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com"
|
|
1119714
|
+
});
|
|
1119715
|
+
var commonArgs = "http ".concat(schedulerName, " ").concat(argsString);
|
|
1119565
1119716
|
return __spreadArray(__spreadArray([], __read((0, gitlab_1.allowFailureInScripts)(["gcloud scheduler jobs create ".concat(commonArgs)])), false), ["gcloud scheduler jobs update ".concat(commonArgs)], false);
|
|
1119566
1119717
|
}).flat();
|
|
1119567
1119718
|
};
|
|
1119568
1119719
|
var getDeleteSchedulesScripts = function () {
|
|
1119720
|
+
var argsString = (0, createArgsString_1.createArgsString)({
|
|
1119721
|
+
project: deployConfig.projectId,
|
|
1119722
|
+
location: deployConfig.region
|
|
1119723
|
+
});
|
|
1119569
1119724
|
return jobsWithSchedule.map(function (_a) {
|
|
1119570
1119725
|
var schedulerName = _a.schedulerName;
|
|
1119571
|
-
return __spreadArray([], __read((0, gitlab_1.allowFailureInScripts)(["gcloud scheduler jobs delete ".concat(schedulerName, "
|
|
1119726
|
+
return __spreadArray([], __read((0, gitlab_1.allowFailureInScripts)(["gcloud scheduler jobs delete ".concat(schedulerName, " ").concat(argsString)])), false);
|
|
1119572
1119727
|
}).flat();
|
|
1119573
1119728
|
};
|
|
1119574
1119729
|
var getDeleteJobsScripts = function () {
|
|
1119575
1119730
|
return jobsWithNames.map(function (_a) {
|
|
1119576
1119731
|
var jobName = _a.jobName;
|
|
1119577
|
-
return "gcloud beta run jobs delete ".concat(jobName, " ").concat(
|
|
1119732
|
+
return "gcloud beta run jobs delete ".concat(jobName, " ").concat(commonArgsString);
|
|
1119578
1119733
|
});
|
|
1119579
1119734
|
};
|
|
1119580
1119735
|
var deployScripts = __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read(setExtraVarsScripts(deployConfig)), false), __read(pushImageToArtifactsRegistry), false), ["echo \"$ENV_VARS\" > ____envvars.yaml"], false), __read(deployConfig.cloudSql ? (0, database_1.getDatabaseCreateScript)(context, deployConfig) // we create the db, so that we can also delete it afterwards
|
|
@@ -1119584,10 +1119739,10 @@ var createGoogleCloudRunDeployJobs = function (context) {
|
|
|
1119584
1119739
|
service = _b[1];
|
|
1119585
1119740
|
return getServiceDeployScript(service, "-" + name);
|
|
1119586
1119741
|
})), false), __read(getJobRunScripts("postDeploy")), false), ["docker image rm ".concat(gcloudImageName)], false);
|
|
1119587
|
-
var stopScripts = __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read(deployConfig.service !== false ? ["gcloud run services delete ".concat(serviceName, " ").concat(
|
|
1119742
|
+
var stopScripts = __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read(deployConfig.service !== false ? ["gcloud run services delete ".concat(serviceName, " ").concat(commonArgsString)] : []), false), __read(Object.entries((_c = deployConfig.additionalServices) !== null && _c !== void 0 ? _c : {}).map(function (_a) {
|
|
1119588
1119743
|
var _b = __read(_a, 1),
|
|
1119589
1119744
|
name = _b[0];
|
|
1119590
|
-
return "gcloud run services delete ".concat(serviceName, "-").concat(name, " ").concat(
|
|
1119745
|
+
return "gcloud run services delete ".concat(serviceName, "-").concat(name, " ").concat(commonArgsString);
|
|
1119591
1119746
|
})), false), __read(getDeleteSchedulesScripts()), false), __read(getDeleteJobsScripts()), false), __read(deployConfig.cloudSql && deployConfig.cloudSql.deleteDatabaseOnStop ? (0, database_1.getDatabaseDeleteScript)(context, deployConfig) : []), false);
|
|
1119592
1119747
|
return [(0, lodash_1.merge)({}, baseDeploymentJob, (0, docker_1.getDockerJobBaseProps)(context), {
|
|
1119593
1119748
|
artifacts: {
|
|
@@ -1119733,6 +1119888,63 @@ exports.GCLOUD_RUN_DEPLOY_TYPE = {
|
|
|
1119733
1119888
|
|
|
1119734
1119889
|
/***/ }),
|
|
1119735
1119890
|
|
|
1119891
|
+
/***/ 8686:
|
|
1119892
|
+
/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
|
|
1119893
|
+
|
|
1119894
|
+
"use strict";
|
|
1119895
|
+
|
|
1119896
|
+
|
|
1119897
|
+
var __read = this && this.__read || function (o, n) {
|
|
1119898
|
+
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
1119899
|
+
if (!m) return o;
|
|
1119900
|
+
var i = m.call(o),
|
|
1119901
|
+
r,
|
|
1119902
|
+
ar = [],
|
|
1119903
|
+
e;
|
|
1119904
|
+
try {
|
|
1119905
|
+
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
1119906
|
+
} catch (error) {
|
|
1119907
|
+
e = {
|
|
1119908
|
+
error: error
|
|
1119909
|
+
};
|
|
1119910
|
+
} finally {
|
|
1119911
|
+
try {
|
|
1119912
|
+
if (r && !r.done && (m = i["return"])) m.call(i);
|
|
1119913
|
+
} finally {
|
|
1119914
|
+
if (e) throw e.error;
|
|
1119915
|
+
}
|
|
1119916
|
+
}
|
|
1119917
|
+
return ar;
|
|
1119918
|
+
};
|
|
1119919
|
+
exports.__esModule = true;
|
|
1119920
|
+
exports.createArgsString = void 0;
|
|
1119921
|
+
var lodash_1 = __nccwpck_require__(23255);
|
|
1119922
|
+
/**
|
|
1119923
|
+
* creates arguments string:
|
|
1119924
|
+
*
|
|
1119925
|
+
* --key=value
|
|
1119926
|
+
*
|
|
1119927
|
+
* - undefined or null values will get removed completly
|
|
1119928
|
+
* - true will just be "--key"
|
|
1119929
|
+
* @param args args record
|
|
1119930
|
+
* @returns
|
|
1119931
|
+
*/
|
|
1119932
|
+
var createArgsString = function (args) {
|
|
1119933
|
+
return Object.entries(args).filter(function (_a) {
|
|
1119934
|
+
var _b = __read(_a, 2),
|
|
1119935
|
+
value = _b[1];
|
|
1119936
|
+
return !(0, lodash_1.isNil)(value);
|
|
1119937
|
+
}).map(function (_a) {
|
|
1119938
|
+
var _b = __read(_a, 2),
|
|
1119939
|
+
key = _b[0],
|
|
1119940
|
+
value = _b[1];
|
|
1119941
|
+
return "--".concat(key).concat(value !== true ? "=".concat(value) : "");
|
|
1119942
|
+
}).join(" ");
|
|
1119943
|
+
};
|
|
1119944
|
+
exports.createArgsString = createArgsString;
|
|
1119945
|
+
|
|
1119946
|
+
/***/ }),
|
|
1119947
|
+
|
|
1119736
1119948
|
/***/ 41384:
|
|
1119737
1119949
|
/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
|
|
1119738
1119950
|
|