@catladder/cli 1.146.2 → 1.147.0
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 +1 -1
- package/dist/bundles/cli/index.js +1 -1
- package/dist/cli/src/apps/cli/commands/project/commandCloudSqlProxy.js +22 -19
- package/dist/cli/src/apps/cli/commands/project/commandCloudSqlProxy.js.map +1 -1
- package/dist/cli/src/apps/cli/commands/project/commandOpenDashboard.js +10 -9
- package/dist/cli/src/apps/cli/commands/project/commandOpenDashboard.js.map +1 -1
- package/dist/cli/src/apps/cli/commands/project/commandPortForward.js +18 -16
- package/dist/cli/src/apps/cli/commands/project/commandPortForward.js.map +1 -1
- package/dist/cli/src/apps/cli/commands/project/setup/setupCloudRun.js +10 -9
- package/dist/cli/src/apps/cli/commands/project/setup/setupCloudRun.js.map +1 -1
- package/dist/cli/src/apps/cli/commands/project/setup/setupContext.js +9 -8
- package/dist/cli/src/apps/cli/commands/project/setup/setupContext.js.map +1 -1
- package/dist/cli/src/apps/cli/commands/project/setup/setupKubernetes.js +23 -22
- package/dist/cli/src/apps/cli/commands/project/setup/setupKubernetes.js.map +1 -1
- package/dist/cli/src/apps/cli/commands/project/utils/ensureCluster.js +10 -9
- package/dist/cli/src/apps/cli/commands/project/utils/ensureCluster.js.map +1 -1
- package/dist/cli/src/gcloud/cloudRun/openCloudRunDashboards.js +6 -5
- package/dist/cli/src/gcloud/cloudRun/openCloudRunDashboards.js.map +1 -1
- package/dist/cli/src/kubernetes/openKubernetesDashboards.js +10 -8
- package/dist/cli/src/kubernetes/openKubernetesDashboards.js.map +1 -1
- package/dist/pipeline/src/build/base/createAppBuildJob.js +8 -6
- package/dist/pipeline/src/build/base/createAppBuildJob.js.map +1 -1
- package/dist/pipeline/src/build/base/writeBuildInfo.js +1 -1
- package/dist/pipeline/src/build/base/writeBuildInfo.js.map +1 -1
- package/dist/pipeline/src/build/base/writeDotEnv.js +1 -1
- package/dist/pipeline/src/build/base/writeDotEnv.js.map +1 -1
- package/dist/pipeline/src/build/custom/buildJob.js +6 -6
- package/dist/pipeline/src/build/custom/buildJob.js.map +1 -1
- package/dist/pipeline/src/build/custom/testJob.js +5 -5
- package/dist/pipeline/src/build/custom/testJob.js.map +1 -1
- package/dist/pipeline/src/build/docker.d.ts +26 -5
- package/dist/pipeline/src/build/docker.js +50 -17
- package/dist/pipeline/src/build/docker.js.map +1 -1
- package/dist/pipeline/src/build/node/buildJob.js +11 -11
- package/dist/pipeline/src/build/node/buildJob.js.map +1 -1
- package/dist/pipeline/src/build/node/cache.js +1 -1
- package/dist/pipeline/src/build/node/cache.js.map +1 -1
- package/dist/pipeline/src/build/node/meteor.js +10 -10
- package/dist/pipeline/src/build/node/meteor.js.map +1 -1
- package/dist/pipeline/src/build/node/testJob.js +12 -12
- package/dist/pipeline/src/build/node/testJob.js.map +1 -1
- package/dist/pipeline/src/build/rails/build.js +3 -3
- package/dist/pipeline/src/build/rails/build.js.map +1 -1
- package/dist/pipeline/src/build/rails/test.js +4 -4
- package/dist/pipeline/src/build/rails/test.js.map +1 -1
- package/dist/pipeline/src/build/sbom.js +3 -3
- package/dist/pipeline/src/build/sbom.js.map +1 -1
- package/dist/pipeline/src/build/types.d.ts +33 -25
- package/dist/pipeline/src/build/types.js.map +1 -1
- package/dist/pipeline/src/context/getLabels.js +1 -1
- package/dist/pipeline/src/context/getLabels.js.map +1 -1
- package/dist/pipeline/src/context/index.js +37 -15
- package/dist/pipeline/src/context/index.js.map +1 -1
- package/dist/pipeline/src/deploy/base/deploy.js +10 -17
- package/dist/pipeline/src/deploy/base/deploy.js.map +1 -1
- package/dist/pipeline/src/deploy/cloudRun/artifactsRegistry.d.ts +1 -1
- package/dist/pipeline/src/deploy/cloudRun/artifactsRegistry.js +8 -9
- package/dist/pipeline/src/deploy/cloudRun/artifactsRegistry.js.map +1 -1
- package/dist/pipeline/src/deploy/cloudRun/cloudRunRevisions.js +4 -5
- package/dist/pipeline/src/deploy/cloudRun/cloudRunRevisions.js.map +1 -1
- package/dist/pipeline/src/deploy/cloudRun/createJobs/cloudRunServices.js +1 -1
- package/dist/pipeline/src/deploy/cloudRun/createJobs/cloudRunServices.js.map +1 -1
- package/dist/pipeline/src/deploy/cloudRun/createJobs/common.d.ts +4 -4
- package/dist/pipeline/src/deploy/cloudRun/createJobs/common.js +2 -1
- package/dist/pipeline/src/deploy/cloudRun/createJobs/common.js.map +1 -1
- package/dist/pipeline/src/deploy/cloudRun/createJobs/index.js +2 -4
- package/dist/pipeline/src/deploy/cloudRun/createJobs/index.js.map +1 -1
- package/dist/pipeline/src/deploy/custom/deployJob.js +7 -10
- package/dist/pipeline/src/deploy/custom/deployJob.js.map +1 -1
- package/dist/pipeline/src/deploy/dockerTag/deployJob.js +3 -5
- package/dist/pipeline/src/deploy/dockerTag/deployJob.js.map +1 -1
- package/dist/pipeline/src/deploy/kubernetes/cloudSql/index.js +11 -9
- package/dist/pipeline/src/deploy/kubernetes/cloudSql/index.js.map +1 -1
- package/dist/pipeline/src/deploy/kubernetes/deployJob.js +3 -6
- package/dist/pipeline/src/deploy/kubernetes/deployJob.js.map +1 -1
- package/dist/pipeline/src/deploy/kubernetes/kubeEnv.js +2 -1
- package/dist/pipeline/src/deploy/kubernetes/kubeEnv.js.map +1 -1
- package/dist/pipeline/src/deploy/kubernetes/kubeValues.js +6 -6
- package/dist/pipeline/src/deploy/kubernetes/kubeValues.js.map +1 -1
- package/dist/pipeline/src/deploy/kubernetes/mongodb.js +11 -11
- package/dist/pipeline/src/deploy/kubernetes/mongodb.js.map +1 -1
- package/dist/pipeline/src/deploy/sbom.js +1 -2
- package/dist/pipeline/src/deploy/sbom.js.map +1 -1
- package/dist/pipeline/src/deploy/types/index.d.ts +1 -1
- package/dist/pipeline/src/deploy/types/index.js +1 -1
- package/dist/pipeline/src/deploy/types/index.js.map +1 -1
- package/dist/pipeline/src/deploy/utils.js +2 -1
- package/dist/pipeline/src/deploy/utils.js.map +1 -1
- package/dist/pipeline/src/pipeline/createJobsForComponent.js +6 -8
- package/dist/pipeline/src/pipeline/createJobsForComponent.js.map +1 -1
- package/dist/pipeline/src/types/config.d.ts +1 -1
- package/dist/pipeline/src/types/context.d.ts +13 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/apps/cli/commands/project/commandCloudSqlProxy.ts +6 -9
- package/src/apps/cli/commands/project/commandOpenDashboard.ts +2 -2
- package/src/apps/cli/commands/project/commandPortForward.ts +4 -4
- package/src/apps/cli/commands/project/setup/setupCloudRun.ts +2 -2
- package/src/apps/cli/commands/project/setup/setupContext.ts +2 -2
- package/src/apps/cli/commands/project/setup/setupKubernetes.ts +1 -1
- package/src/apps/cli/commands/project/utils/ensureCluster.ts +2 -4
- package/src/gcloud/cloudRun/openCloudRunDashboards.ts +2 -2
- package/src/kubernetes/openKubernetesDashboards.ts +2 -2
|
@@ -53,9 +53,10 @@ exports.default = (function (vorpal) { return __awaiter(void 0, void 0, void 0,
|
|
|
53
53
|
.action(function (_a) {
|
|
54
54
|
return __awaiter(this, arguments, void 0, function (_b) {
|
|
55
55
|
var _c, env, componentName, context, proxyInfo, DB_PASSWORD, DB_NAME, DB_USER, instanceName, localPort;
|
|
56
|
+
var _d, _e;
|
|
56
57
|
var envComponent = _b.envComponent;
|
|
57
|
-
return __generator(this, function (
|
|
58
|
-
switch (
|
|
58
|
+
return __generator(this, function (_f) {
|
|
59
|
+
switch (_f.label) {
|
|
59
60
|
case 0:
|
|
60
61
|
_c = (0, getProjectConfig_1.parseChoice)(envComponent), env = _c.env, componentName = _c.componentName;
|
|
61
62
|
if (!componentName) {
|
|
@@ -64,20 +65,20 @@ exports.default = (function (vorpal) { return __awaiter(void 0, void 0, void 0,
|
|
|
64
65
|
}
|
|
65
66
|
return [4 /*yield*/, (0, getProjectConfig_1.getPipelineContextByChoice)(env, componentName)];
|
|
66
67
|
case 1:
|
|
67
|
-
context =
|
|
68
|
+
context = _f.sent();
|
|
68
69
|
if (env === "review") {
|
|
69
70
|
vorpal.log("⚠️ connection string does not include mr information on review environments");
|
|
70
71
|
}
|
|
71
|
-
if (!(0, pipeline_1.isOfDeployType)(context.
|
|
72
|
+
if (!(0, pipeline_1.isOfDeployType)((_d = context.deploy) === null || _d === void 0 ? void 0 : _d.config, "kubernetes")) return [3 /*break*/, 3];
|
|
72
73
|
return [4 /*yield*/, getProxyInfoForKubernetes(this, context)];
|
|
73
74
|
case 2:
|
|
74
|
-
proxyInfo =
|
|
75
|
+
proxyInfo = _f.sent();
|
|
75
76
|
return [3 /*break*/, 6];
|
|
76
77
|
case 3:
|
|
77
|
-
if (!(0, pipeline_1.isOfDeployType)(context.
|
|
78
|
+
if (!(0, pipeline_1.isOfDeployType)((_e = context.deploy) === null || _e === void 0 ? void 0 : _e.config, "google-cloudrun")) return [3 /*break*/, 5];
|
|
78
79
|
return [4 /*yield*/, getProxyInfoForCloudRun(this, context)];
|
|
79
80
|
case 4:
|
|
80
|
-
proxyInfo =
|
|
81
|
+
proxyInfo = _f.sent();
|
|
81
82
|
return [3 /*break*/, 6];
|
|
82
83
|
case 5: throw new Error("unsupported environment");
|
|
83
84
|
case 6:
|
|
@@ -89,7 +90,7 @@ exports.default = (function (vorpal) { return __awaiter(void 0, void 0, void 0,
|
|
|
89
90
|
message: "Local port: ",
|
|
90
91
|
})];
|
|
91
92
|
case 7:
|
|
92
|
-
localPort = (
|
|
93
|
+
localPort = (_f.sent()).localPort;
|
|
93
94
|
this.log("");
|
|
94
95
|
this.log("postgres-PW: ".concat(DB_PASSWORD));
|
|
95
96
|
this.log("");
|
|
@@ -104,7 +105,7 @@ exports.default = (function (vorpal) { return __awaiter(void 0, void 0, void 0,
|
|
|
104
105
|
localPort: localPort,
|
|
105
106
|
})];
|
|
106
107
|
case 8:
|
|
107
|
-
|
|
108
|
+
_f.sent();
|
|
108
109
|
return [2 /*return*/];
|
|
109
110
|
}
|
|
110
111
|
});
|
|
@@ -115,15 +116,16 @@ exports.default = (function (vorpal) { return __awaiter(void 0, void 0, void 0,
|
|
|
115
116
|
}); });
|
|
116
117
|
var getProxyInfoForKubernetes = function (vorpal, context) { return __awaiter(void 0, void 0, void 0, function () {
|
|
117
118
|
var envVars, cloudSqlValues, DB_PASSWORD, DB_NAME, instanceName;
|
|
118
|
-
|
|
119
|
-
|
|
119
|
+
var _a;
|
|
120
|
+
return __generator(this, function (_b) {
|
|
121
|
+
switch (_b.label) {
|
|
120
122
|
case 0:
|
|
121
|
-
if (!(0, pipeline_1.isOfDeployType)(context.
|
|
123
|
+
if (!(0, pipeline_1.isOfDeployType)((_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config, "kubernetes")) {
|
|
122
124
|
throw new Error("unsupported");
|
|
123
125
|
}
|
|
124
126
|
return [4 /*yield*/, (0, getProjectConfig_1.getEnvVarsResolved)(vorpal, context.environment.shortName, context.componentName)];
|
|
125
127
|
case 1:
|
|
126
|
-
envVars =
|
|
128
|
+
envVars = _b.sent();
|
|
127
129
|
cloudSqlValues = (0, pipeline_1.createKubernetesCloudsqlBaseValues)(context);
|
|
128
130
|
DB_PASSWORD = (envVars === null || envVars === void 0 ? void 0 : envVars.DB_PASSWORD) || (envVars === null || envVars === void 0 ? void 0 : envVars.POSTGRESQL_PASSWORD);
|
|
129
131
|
DB_NAME = cloudSqlValues.cloudsql.fullDbName.toString();
|
|
@@ -139,21 +141,22 @@ var getProxyInfoForKubernetes = function (vorpal, context) { return __awaiter(vo
|
|
|
139
141
|
}); };
|
|
140
142
|
var getProxyInfoForCloudRun = function (vorpal, context) { return __awaiter(void 0, void 0, void 0, function () {
|
|
141
143
|
var envVars, DB_PASSWORD, DB_USER, DB_NAME;
|
|
142
|
-
|
|
143
|
-
|
|
144
|
+
var _a, _b, _c;
|
|
145
|
+
return __generator(this, function (_d) {
|
|
146
|
+
switch (_d.label) {
|
|
144
147
|
case 0:
|
|
145
|
-
if (!(0, pipeline_1.isOfDeployType)(context.
|
|
146
|
-
!context.
|
|
148
|
+
if (!(0, pipeline_1.isOfDeployType)((_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config, "google-cloudrun") ||
|
|
149
|
+
!((_b = context.deploy) === null || _b === void 0 ? void 0 : _b.config.cloudSql)) {
|
|
147
150
|
throw new Error("unsupported");
|
|
148
151
|
}
|
|
149
152
|
return [4 /*yield*/, (0, getProjectConfig_1.getEnvVarsResolved)(vorpal, context.environment.shortName, context.componentName)];
|
|
150
153
|
case 1:
|
|
151
|
-
envVars =
|
|
154
|
+
envVars = _d.sent();
|
|
152
155
|
DB_PASSWORD = envVars === null || envVars === void 0 ? void 0 : envVars.DB_PASSWORD;
|
|
153
156
|
DB_USER = envVars === null || envVars === void 0 ? void 0 : envVars.DB_USER;
|
|
154
157
|
DB_NAME = context.environment.envVars.DB_NAME.toString();
|
|
155
158
|
return [2 /*return*/, {
|
|
156
|
-
instanceName: context.
|
|
159
|
+
instanceName: (_c = context.deploy) === null || _c === void 0 ? void 0 : _c.config.cloudSql.instanceConnectionName,
|
|
157
160
|
DB_PASSWORD: DB_PASSWORD,
|
|
158
161
|
DB_NAME: DB_NAME,
|
|
159
162
|
DB_USER: DB_USER,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commandCloudSqlProxy.js","sourceRoot":"","sources":["../../../../../../../src/apps/cli/commands/project/commandCloudSqlProxy.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAG6B;AAG7B,wEAI6C;AAC7C,2DAA2D;AAC3D,qEAA0F;AAQ1F,mBAAe,UAAO,MAAc;;;;;gBAClC,KAAA,CAAA,KAAA,MAAM;qBACH,OAAO,CAAC,wCAAwC,EAAE,uBAAuB,CAAC,CAAA;qBAC1E,YAAY,CAAA;gBAAC,qBAAM,IAAA,kCAAgB,GAAE,EAAA;oBAFxC,sBAAA,cAEgB,SAAwB,EAAC;qBACtC,MAAM,CAAC;wEAAgB,EAAgB
|
|
1
|
+
{"version":3,"file":"commandCloudSqlProxy.js","sourceRoot":"","sources":["../../../../../../../src/apps/cli/commands/project/commandCloudSqlProxy.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAG6B;AAG7B,wEAI6C;AAC7C,2DAA2D;AAC3D,qEAA0F;AAQ1F,mBAAe,UAAO,MAAc;;;;;gBAClC,KAAA,CAAA,KAAA,MAAM;qBACH,OAAO,CAAC,wCAAwC,EAAE,uBAAuB,CAAC,CAAA;qBAC1E,YAAY,CAAA;gBAAC,qBAAM,IAAA,kCAAgB,GAAE,EAAA;oBAFxC,sBAAA,cAEgB,SAAwB,EAAC;qBACtC,MAAM,CAAC;wEAAgB,EAAgB;;;4BAAd,YAAY,kBAAA;;;;oCAC9B,KAAyB,IAAA,8BAAW,EAAC,YAAY,CAAC,EAAhD,GAAG,SAAA,EAAE,aAAa,mBAAA,CAA+B;oCACzD,IAAI,CAAC,aAAa,EAAE,CAAC;wCACnB,IAAI,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;wCAC/B,sBAAO;oCACT,CAAC;oCAEe,qBAAM,IAAA,6CAA0B,EAAC,GAAG,EAAE,aAAa,CAAC,EAAA;;oCAA9D,OAAO,GAAG,SAAoD;oCAGpE,IAAI,GAAG,KAAK,QAAQ,EAAE,CAAC;wCACrB,MAAM,CAAC,GAAG,CACR,6EAA6E,CAC9E,CAAC;oCACJ,CAAC;yCACG,IAAA,yBAAc,EAAC,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,EAAE,YAAY,CAAC,EAApD,wBAAoD;oCAC1C,qBAAM,yBAAyB,CAAC,IAAI,EAAE,OAAO,CAAC,EAAA;;oCAA1D,SAAS,GAAG,SAA8C,CAAC;;;yCAClD,IAAA,yBAAc,EAAC,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,EAAE,iBAAiB,CAAC,EAAzD,wBAAyD;oCACtD,qBAAM,uBAAuB,CAAC,IAAI,EAAE,OAAO,CAAC,EAAA;;oCAAxD,SAAS,GAAG,SAA4C,CAAC;;wCAEzD,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;;oCAIrC,WAAW,GAAqC,SAAS,YAA9C,EAAE,OAAO,GAA4B,SAAS,QAArC,EAAE,OAAO,GAAmB,SAAS,QAA5B,EAAE,YAAY,GAAK,SAAS,aAAd,CAAe;oCAC5C,qBAAM,IAAI,CAAC,MAAM,CAAC;4CACtC,IAAI,EAAE,QAAQ;4CACd,IAAI,EAAE,WAAW;4CACjB,OAAO,EAAE,OAAO;4CAChB,OAAO,EAAE,cAAc;yCACxB,CAAC,EAAA;;oCALM,SAAS,GAAK,CAAA,SAKpB,CAAA,UALe;oCAOjB,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oCACb,IAAI,CAAC,GAAG,CAAC,uBAAgB,WAAW,CAAE,CAAC,CAAC;oCACxC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oCACb,IAAI,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;oCAChC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oCACb,IAAI,CAAC,GAAG,CACN,oCAA6B,OAAO,cAAI,WAAW,wBAAc,SAAS,cAAI,OAAO,mBAAgB,CACtG,CAAC;oCACF,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oCACb,IAAI,CAAC,GAAG,CACN,wDAAiD,SAAS,cAAI,OAAO,iCAAuB,OAAO,uBAAa,WAAW,CAAE,CAC9H,CAAC;oCACF,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oCAEb,qBAAM,IAAA,6CAAgC,EAAC;4CACrC,YAAY,cAAA;4CACZ,SAAS,WAAA;yCACV,CAAC,EAAA;;oCAHF,SAGE,CAAC;;;;;iBACJ,CAAC,EAAA;;;KAAA,EAAC;AAEP,IAAM,yBAAyB,GAAG,UAChC,MAAuB,EACvB,OAAyB;;;;;;gBAEzB,IAAI,CAAC,IAAA,yBAAc,EAAC,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,EAAE,YAAY,CAAC,EAAE,CAAC;oBAC1D,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC;gBACjC,CAAC;gBAEe,qBAAM,IAAA,qCAAkB,EACtC,MAAM,EACN,OAAO,CAAC,WAAW,CAAC,SAAS,EAC7B,OAAO,CAAC,aAAa,CACtB,EAAA;;gBAJK,OAAO,GAAG,SAIf;gBAEK,cAAc,GAAG,IAAA,6CAAkC,EAAC,OAAO,CAAC,CAAC;gBAE7D,WAAW,GAAG,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,MAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,mBAAmB,CAAA,CAAC;gBAEnE,OAAO,GAAG,cAAc,CAAC,QAAQ,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;gBAExD,YAAY,GAAG,cAAc,CAAC,QAAQ,CAAC,sBAAsB,CAAC;gBAEpE,sBAAO;wBACL,YAAY,cAAA;wBACZ,WAAW,aAAA;wBACX,OAAO,SAAA;wBACP,OAAO,EAAE,UAAU;qBACpB,EAAC;;;KACH,CAAC;AAEF,IAAM,uBAAuB,GAAG,UAC9B,MAAuB,EACvB,OAAyB;;;;;;gBAEzB,IACE,CAAC,IAAA,yBAAc,EAAC,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,EAAE,iBAAiB,CAAC;oBAC1D,CAAC,CAAA,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC,QAAQ,CAAA,EAChC,CAAC;oBACD,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC;gBACjC,CAAC;gBAEe,qBAAM,IAAA,qCAAkB,EACtC,MAAM,EACN,OAAO,CAAC,WAAW,CAAC,SAAS,EAC7B,OAAO,CAAC,aAAa,CACtB,EAAA;;gBAJK,OAAO,GAAG,SAIf;gBAEK,WAAW,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,CAAC;gBACnC,OAAO,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC;gBAE3B,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;gBAE/D,sBAAO;wBACL,YAAY,EAAE,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC,QAAQ,CAAC,sBAAsB;wBACpE,WAAW,aAAA;wBACX,OAAO,SAAA;wBACP,OAAO,SAAA;qBACR,EAAC;;;KACH,CAAC"}
|
|
@@ -54,25 +54,26 @@ exports.default = (function (vorpal) { return __awaiter(void 0, void 0, void 0,
|
|
|
54
54
|
.action(function (_a) {
|
|
55
55
|
return __awaiter(this, arguments, void 0, function (_b) {
|
|
56
56
|
var _c, env, componentName, context;
|
|
57
|
+
var _d, _e;
|
|
57
58
|
var envComponent = _b.envComponent;
|
|
58
|
-
return __generator(this, function (
|
|
59
|
-
switch (
|
|
59
|
+
return __generator(this, function (_f) {
|
|
60
|
+
switch (_f.label) {
|
|
60
61
|
case 0:
|
|
61
62
|
_c = (0, getProjectConfig_1.parseChoice)(envComponent), env = _c.env, componentName = _c.componentName;
|
|
62
63
|
return [4 /*yield*/, (0, getProjectConfig_1.getPipelineContextByChoice)(env, componentName)];
|
|
63
64
|
case 1:
|
|
64
|
-
context =
|
|
65
|
-
if (!(0, pipeline_1.isOfDeployType)(context.
|
|
65
|
+
context = _f.sent();
|
|
66
|
+
if (!(0, pipeline_1.isOfDeployType)((_d = context.deploy) === null || _d === void 0 ? void 0 : _d.config, "kubernetes")) return [3 /*break*/, 3];
|
|
66
67
|
return [4 /*yield*/, (0, openKubernetesDashboards_1.openGoogleCloudKubernetesDashboard)(this, context)];
|
|
67
68
|
case 2:
|
|
68
|
-
|
|
69
|
-
|
|
69
|
+
_f.sent();
|
|
70
|
+
_f.label = 3;
|
|
70
71
|
case 3:
|
|
71
|
-
if (!(0, pipeline_1.isOfDeployType)(context.
|
|
72
|
+
if (!(0, pipeline_1.isOfDeployType)((_e = context.deploy) === null || _e === void 0 ? void 0 : _e.config, "google-cloudrun")) return [3 /*break*/, 5];
|
|
72
73
|
return [4 /*yield*/, (0, openCloudRunDashboards_1.openGoogleCloudRunDashboard)(this, context)];
|
|
73
74
|
case 4:
|
|
74
|
-
|
|
75
|
-
|
|
75
|
+
_f.sent();
|
|
76
|
+
_f.label = 5;
|
|
76
77
|
case 5: return [2 /*return*/];
|
|
77
78
|
}
|
|
78
79
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commandOpenDashboard.js","sourceRoot":"","sources":["../../../../../../../src/apps/cli/commands/project/commandOpenDashboard.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAqD;AAErD,wEAG6C;AAC7C,6FAAiG;AACjG,4FAAqG;AAErG,2DAA2D;AAE3D,mBAAe,UAAO,MAAc;;;;;gBAClC,KAAA,CAAA,KAAA,MAAM;qBACH,OAAO,CACN,uCAAuC,EACvC,iDAAiD,CAClD,CAAA;qBACA,YAAY,CAAA;gBAAC,qBAAM,IAAA,kCAAgB,GAAE,EAAA;oBALxC,sBAAA,cAKgB,SAAwB,EAAC;qBACtC,MAAM,CAAC;wEAAgB,EAAgB
|
|
1
|
+
{"version":3,"file":"commandOpenDashboard.js","sourceRoot":"","sources":["../../../../../../../src/apps/cli/commands/project/commandOpenDashboard.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAqD;AAErD,wEAG6C;AAC7C,6FAAiG;AACjG,4FAAqG;AAErG,2DAA2D;AAE3D,mBAAe,UAAO,MAAc;;;;;gBAClC,KAAA,CAAA,KAAA,MAAM;qBACH,OAAO,CACN,uCAAuC,EACvC,iDAAiD,CAClD,CAAA;qBACA,YAAY,CAAA;gBAAC,qBAAM,IAAA,kCAAgB,GAAE,EAAA;oBALxC,sBAAA,cAKgB,SAAwB,EAAC;qBACtC,MAAM,CAAC;wEAAgB,EAAgB;;;4BAAd,YAAY,kBAAA;;;;oCAC9B,KAAyB,IAAA,8BAAW,EAAC,YAAY,CAAC,EAAhD,GAAG,SAAA,EAAE,aAAa,mBAAA,CAA+B;oCACzC,qBAAM,IAAA,6CAA0B,EAAC,GAAG,EAAE,aAAa,CAAC,EAAA;;oCAA9D,OAAO,GAAG,SAAoD;yCAChE,IAAA,yBAAc,EAAC,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,EAAE,YAAY,CAAC,EAApD,wBAAoD;oCACtD,qBAAM,IAAA,6DAAkC,EAAC,IAAI,EAAE,OAAO,CAAC,EAAA;;oCAAvD,SAAuD,CAAC;;;yCAEtD,IAAA,yBAAc,EAAC,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,EAAE,iBAAiB,CAAC,EAAzD,wBAAyD;oCAC3D,qBAAM,IAAA,oDAA2B,EAAC,IAAI,EAAE,OAAO,CAAC,EAAA;;oCAAhD,SAAgD,CAAC;;;;;;iBAEpD,CAAC,EAAA;;;KAAA,EAAC"}
|
|
@@ -95,10 +95,11 @@ var kubePortForward = function (cmd, envComponent) { return __awaiter(void 0, vo
|
|
|
95
95
|
}); };
|
|
96
96
|
var cloudRunPortForward = function (cmd, context) { return __awaiter(void 0, void 0, void 0, function () {
|
|
97
97
|
var fullName, serviceName, mr, _a, projectId, region, command;
|
|
98
|
-
|
|
99
|
-
|
|
98
|
+
var _b;
|
|
99
|
+
return __generator(this, function (_c) {
|
|
100
|
+
switch (_c.label) {
|
|
100
101
|
case 0:
|
|
101
|
-
if (!(0, pipeline_1.isOfDeployType)(context.
|
|
102
|
+
if (!(0, pipeline_1.isOfDeployType)((_b = context.deploy) === null || _b === void 0 ? void 0 : _b.config, "google-cloudrun")) {
|
|
102
103
|
throw new Error("not cloud run");
|
|
103
104
|
}
|
|
104
105
|
fullName = context.environment.fullName;
|
|
@@ -110,18 +111,18 @@ var cloudRunPortForward = function (cmd, context) { return __awaiter(void 0, voi
|
|
|
110
111
|
message: "Which mr 🤔 ",
|
|
111
112
|
})];
|
|
112
113
|
case 1:
|
|
113
|
-
mr = (
|
|
114
|
+
mr = (_c.sent()).mr;
|
|
114
115
|
// poor mans solution
|
|
115
116
|
serviceName = serviceName
|
|
116
117
|
.toString()
|
|
117
118
|
.replace("-review-", "-review-mr" + mr + "-");
|
|
118
|
-
|
|
119
|
+
_c.label = 2;
|
|
119
120
|
case 2:
|
|
120
|
-
_a = context.
|
|
121
|
+
_a = context.deploy.config, projectId = _a.projectId, region = _a.region;
|
|
121
122
|
command = "gcloud beta run services proxy ".concat(serviceName, " --project ").concat(projectId, " --region ").concat(region);
|
|
122
123
|
return [4 /*yield*/, (0, portForwards_1.startPortForwardCommand)("cloudRun/".concat(serviceName), command)];
|
|
123
124
|
case 3:
|
|
124
|
-
|
|
125
|
+
_c.sent();
|
|
125
126
|
(0, open_1.default)("http://localhost:8080");
|
|
126
127
|
return [2 /*return*/];
|
|
127
128
|
}
|
|
@@ -140,25 +141,26 @@ exports.default = (function (vorpal) { return __awaiter(void 0, void 0, void 0,
|
|
|
140
141
|
.action(function (_a) {
|
|
141
142
|
return __awaiter(this, arguments, void 0, function (_b) {
|
|
142
143
|
var _c, env, componentName, context;
|
|
144
|
+
var _d, _e;
|
|
143
145
|
var envComponent = _b.envComponent;
|
|
144
|
-
return __generator(this, function (
|
|
145
|
-
switch (
|
|
146
|
+
return __generator(this, function (_f) {
|
|
147
|
+
switch (_f.label) {
|
|
146
148
|
case 0:
|
|
147
149
|
_c = (0, parseChoice_1.parseChoice)(envComponent), env = _c.env, componentName = _c.componentName;
|
|
148
150
|
return [4 /*yield*/, (0, getProjectConfig_1.getPipelineContextByChoice)(env, componentName)];
|
|
149
151
|
case 1:
|
|
150
|
-
context =
|
|
151
|
-
if (!(0, pipeline_1.isOfDeployType)(context.
|
|
152
|
+
context = _f.sent();
|
|
153
|
+
if (!(0, pipeline_1.isOfDeployType)((_d = context.deploy) === null || _d === void 0 ? void 0 : _d.config, "kubernetes")) return [3 /*break*/, 3];
|
|
152
154
|
return [4 /*yield*/, kubePortForward(this, envComponent)];
|
|
153
155
|
case 2:
|
|
154
|
-
|
|
155
|
-
|
|
156
|
+
_f.sent();
|
|
157
|
+
_f.label = 3;
|
|
156
158
|
case 3:
|
|
157
|
-
if (!(0, pipeline_1.isOfDeployType)(context.
|
|
159
|
+
if (!(0, pipeline_1.isOfDeployType)((_e = context.deploy) === null || _e === void 0 ? void 0 : _e.config, "google-cloudrun")) return [3 /*break*/, 5];
|
|
158
160
|
return [4 /*yield*/, cloudRunPortForward(this, context)];
|
|
159
161
|
case 4:
|
|
160
|
-
|
|
161
|
-
|
|
162
|
+
_f.sent();
|
|
163
|
+
_f.label = 5;
|
|
162
164
|
case 5: return [2 /*return*/];
|
|
163
165
|
}
|
|
164
166
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commandPortForward.js","sourceRoot":"","sources":["../../../../../../../src/apps/cli/commands/project/commandPortForward.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,qDAA4D;AAC5D,6CAAiD;AACjD,kEAA0E;AAC1E,uDAAiE;AACjE,2DAA2D;AAC3D,wEAAkD;AAElD,8DAA6D;AAC7D,wEAAiF;AAEjF,gDAAqD;AACrD,+DAAyE;AACzE,8CAAwB;AACxB,IAAM,eAAe,GAAG,UAAO,GAAoB,EAAE,YAAoB;;;;oBACvE,qBAAM,uBAAa,CAAC,IAAI,CAAC,GAAG,EAAE,YAAY,CAAC,EAAA;;gBAA3C,SAA2C,CAAC;gBAC1B,qBAAM,IAAA,8BAAmB,EAAC,YAAY,CAAC,EAAA;;gBAAnD,SAAS,GAAG,SAAuC;gBACxC,qBAAM,IAAA,+BAAkB,EAAC,YAAY,CAAC,EAAA;;gBAAjD,QAAQ,GAAG,SAAsC;gBACvD,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBAC1B,IAAA,cAAQ,EAAC,GAAG,EAAE,sBAAsB,CAAC,CAAC;oBACtC,sBAAO;gBACT,CAAC;gBACmB,qBAAM,GAAG,CAAC,MAAM,CAAC;wBACnC,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,SAAS;wBACf,OAAO,EAAE,QAAQ;wBACjB,OAAO,EAAE,eAAe;qBACzB,CAAC,EAAA;;gBALM,OAAO,GAAK,CAAA,SAKlB,CAAA,QALa;gBAOO,qBAAM,GAAG,CAAC,MAAM,CAAC;wBACrC,IAAI,EAAE,QAAQ;wBACd,IAAI,EAAE,WAAW;wBAEjB,OAAO,EAAE,cAAc;qBACxB,CAAC,EAAA;;gBALM,SAAS,GAAK,CAAA,SAKpB,CAAA,UALe;gBAOM,qBAAM,GAAG,CAAC,MAAM,CAAC;wBACtC,IAAI,EAAE,QAAQ;wBACd,IAAI,EAAE,YAAY;wBAElB,OAAO,EAAE,eAAe;qBACzB,CAAC,EAAA;;gBALM,UAAU,GAAK,CAAA,SAKrB,CAAA,WALgB;gBAOlB,sBAAO,IAAA,kCAAoB,EAAC,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,CAAC,EAAC;;;KACxE,CAAC;AAEF,IAAM,mBAAmB,GAAG,UAC1B,GAAoB,EACpB,OAAyB
|
|
1
|
+
{"version":3,"file":"commandPortForward.js","sourceRoot":"","sources":["../../../../../../../src/apps/cli/commands/project/commandPortForward.ts"],"names":[],"mappings":"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"}
|
|
@@ -71,13 +71,14 @@ var gitlab_1 = require("../../../../../utils/gitlab");
|
|
|
71
71
|
var setupCloudRun = function (instance, context) { return __awaiter(void 0, void 0, void 0, function () {
|
|
72
72
|
var config, suffix;
|
|
73
73
|
var _a;
|
|
74
|
-
|
|
75
|
-
|
|
74
|
+
var _b, _c;
|
|
75
|
+
return __generator(this, function (_d) {
|
|
76
|
+
switch (_d.label) {
|
|
76
77
|
case 0:
|
|
77
|
-
if (!(0, pipeline_1.isOfDeployType)(context.
|
|
78
|
+
if (!(0, pipeline_1.isOfDeployType)((_b = context.deploy) === null || _b === void 0 ? void 0 : _b.config, "google-cloudrun")) {
|
|
78
79
|
throw new Error("deploy config is not of type 'google-cloudrun'");
|
|
79
80
|
}
|
|
80
|
-
config = context.
|
|
81
|
+
config = (_c = context.deploy) === null || _c === void 0 ? void 0 : _c.config;
|
|
81
82
|
// enable services
|
|
82
83
|
instance.log("enable required services...");
|
|
83
84
|
return [4 /*yield*/, (0, enableServices_1.enableGCloudServices)(__spreadArray([
|
|
@@ -89,11 +90,11 @@ var setupCloudRun = function (instance, context) { return __awaiter(void 0, void
|
|
|
89
90
|
? ["sqladmin.googleapis.com", "sql-component.googleapis.com"]
|
|
90
91
|
: [])), false), config)];
|
|
91
92
|
case 1:
|
|
92
|
-
|
|
93
|
+
_d.sent();
|
|
93
94
|
instance.log("upsert artifacts registry...");
|
|
94
95
|
return [4 /*yield*/, (0, artifactsRegistry_1.upsertGcloudArtifactsRegistry)(config)];
|
|
95
96
|
case 2:
|
|
96
|
-
|
|
97
|
+
_d.sent();
|
|
97
98
|
instance.log("upsert deploy service account...");
|
|
98
99
|
return [4 /*yield*/, (0, serviceAccounts_1.upsertGcloudServiceAccountAndSaveSecret)(instance, context, {
|
|
99
100
|
projectId: config.projectId,
|
|
@@ -109,7 +110,7 @@ var setupCloudRun = function (instance, context) { return __awaiter(void 0, void
|
|
|
109
110
|
], __read((config.cloudSql ? ["roles/cloudsql.admin"] : [])), false),
|
|
110
111
|
}, pipeline_1.GCLOUD_DEPLOY_CREDENTIALS_KEY)];
|
|
111
112
|
case 3:
|
|
112
|
-
|
|
113
|
+
_d.sent();
|
|
113
114
|
// gcloud run automatically gives us a hostname
|
|
114
115
|
// but the pipeline need to know it before deployment
|
|
115
116
|
// so we get this through some magic and add this as a ci/cd variable
|
|
@@ -117,14 +118,14 @@ var setupCloudRun = function (instance, context) { return __awaiter(void 0, void
|
|
|
117
118
|
instance.log("get service domain suffix... that might take a while initially");
|
|
118
119
|
return [4 /*yield*/, (0, getCloudRunDomainSuffix_1.getCloudRunDomainSuffix)(config)];
|
|
119
120
|
case 4:
|
|
120
|
-
suffix =
|
|
121
|
+
suffix = _d.sent();
|
|
121
122
|
instance.log("domain suffix: " + suffix);
|
|
122
123
|
return [4 /*yield*/, (0, gitlab_1.upsertAllVariables)(instance, (_a = {},
|
|
123
124
|
_a[pipeline_1.GCLOUD_RUN_CANONICAL_HOST_SUFFIX] = suffix,
|
|
124
125
|
_a), context.environment.shortName, context.componentName, false, // backup
|
|
125
126
|
false)];
|
|
126
127
|
case 5:
|
|
127
|
-
|
|
128
|
+
_d.sent();
|
|
128
129
|
return [2 /*return*/];
|
|
129
130
|
}
|
|
130
131
|
});
|
|
@@ -1 +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,OAAyB
|
|
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,OAAyB;;;;;;;gBAEzB,IAAI,CAAC,IAAA,yBAAc,EAAC,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,EAAE,iBAAiB,CAAC,EAAE,CAAC;oBAC/D,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;gBACpE,CAAC;gBAEK,MAAM,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;gBAEtC,kBAAkB;gBAElB,QAAQ,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;gBAC5C,qBAAM,IAAA,qCAAoB;wBAEtB,oBAAoB;wBACpB,iCAAiC;wBACjC,+BAA+B,EAAE,sBAAsB;wBACvD,qCAAqC;8BAClC,CAAC,MAAM,CAAC,QAAQ;wBACjB,CAAC,CAAC,CAAC,yBAAyB,EAAE,8BAA8B,CAAC;wBAC7D,CAAC,CAAC,EAAE,CAAC,WAET,MAAM,CACP,EAAA;;gBAXD,SAWC,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;4BACH,kCAAkC;4BAClC,iBAAiB;4BACjB,8BAA8B;4BAC9B,4BAA4B;kCACzB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,SACrD;qBACF,EACD,wCAA6B,CAC9B,EAAA;;gBAlBD,SAkBC,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,CACN,EAAA;;gBATD,SASC,CAAC;;;;KACH,CAAC;AArEW,QAAA,aAAa,iBAqExB"}
|
|
@@ -42,8 +42,9 @@ var setupCloudRun_1 = require("./setupCloudRun");
|
|
|
42
42
|
var setupKubernetes_1 = require("./setupKubernetes");
|
|
43
43
|
var setupContext = function (instance, context) { return __awaiter(void 0, void 0, void 0, function () {
|
|
44
44
|
var deployConfig;
|
|
45
|
-
|
|
46
|
-
|
|
45
|
+
var _a, _b;
|
|
46
|
+
return __generator(this, function (_c) {
|
|
47
|
+
switch (_c.label) {
|
|
47
48
|
case 0:
|
|
48
49
|
instance.log("");
|
|
49
50
|
instance.log("==================================================================================");
|
|
@@ -53,18 +54,18 @@ var setupContext = function (instance, context) { return __awaiter(void 0, void
|
|
|
53
54
|
context.componentName +
|
|
54
55
|
"...");
|
|
55
56
|
instance.log("");
|
|
56
|
-
if (!(0, pipeline_1.isOfDeployType)(context.
|
|
57
|
+
if (!(0, pipeline_1.isOfDeployType)((_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config, "google-cloudrun")) return [3 /*break*/, 2];
|
|
57
58
|
return [4 /*yield*/, (0, setupCloudRun_1.setupCloudRun)(instance, context)];
|
|
58
59
|
case 1:
|
|
59
|
-
|
|
60
|
-
|
|
60
|
+
_c.sent();
|
|
61
|
+
_c.label = 2;
|
|
61
62
|
case 2:
|
|
62
|
-
deployConfig = context.
|
|
63
|
+
deployConfig = (_b = context.deploy) === null || _b === void 0 ? void 0 : _b.config;
|
|
63
64
|
if (!(0, pipeline_1.isOfDeployType)(deployConfig, "kubernetes")) return [3 /*break*/, 4];
|
|
64
65
|
return [4 /*yield*/, (0, setupKubernetes_1.setupKubernetes)(instance, context)];
|
|
65
66
|
case 3:
|
|
66
|
-
|
|
67
|
-
|
|
67
|
+
_c.sent();
|
|
68
|
+
_c.label = 4;
|
|
68
69
|
case 4:
|
|
69
70
|
instance.log("");
|
|
70
71
|
instance.log("✅ " +
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupContext.js","sourceRoot":"","sources":["../../../../../../../../src/apps/cli/commands/project/setup/setupContext.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAAqD;AAErD,iDAAgD;AAEhD,qDAAoD;AAE7C,IAAM,YAAY,GAAG,UAC1B,QAAyB,EACzB,OAAyB
|
|
1
|
+
{"version":3,"file":"setupContext.js","sourceRoot":"","sources":["../../../../../../../../src/apps/cli/commands/project/setup/setupContext.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAAqD;AAErD,iDAAgD;AAEhD,qDAAoD;AAE7C,IAAM,YAAY,GAAG,UAC1B,QAAyB,EACzB,OAAyB;;;;;;gBAEzB,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBACjB,QAAQ,CAAC,GAAG,CACV,oFAAoF,CACrF,CAAC;gBAEF,QAAQ,CAAC,GAAG,CACV,mBAAmB;oBACjB,OAAO,CAAC,WAAW,CAAC,SAAS;oBAC7B,GAAG;oBACH,OAAO,CAAC,aAAa;oBACrB,KAAK,CACR,CAAC;gBACF,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;qBACb,IAAA,yBAAc,EAAC,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,EAAE,iBAAiB,CAAC,EAAzD,wBAAyD;gBAC3D,qBAAM,IAAA,6BAAa,EAAC,QAAQ,EAAE,OAAO,CAAC,EAAA;;gBAAtC,SAAsC,CAAC;;;gBAGnC,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;qBACxC,IAAA,yBAAc,EAAC,YAAY,EAAE,YAAY,CAAC,EAA1C,wBAA0C;gBAC5C,qBAAM,IAAA,iCAAe,EAAC,QAAQ,EAAE,OAAO,CAAC,EAAA;;gBAAxC,SAAwC,CAAC;;;gBAG3C,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBACjB,QAAQ,CAAC,GAAG,CACV,IAAI;oBACF,OAAO,CAAC,WAAW,CAAC,SAAS;oBAC7B,GAAG;oBACH,OAAO,CAAC,aAAa;oBACrB,QAAQ,CACX,CAAC;gBAEF,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;;;;KAClB,CAAC;AApCW,QAAA,YAAY,gBAoCvB"}
|
|
@@ -47,19 +47,20 @@ var gitlab_1 = require("../../../../../utils/gitlab");
|
|
|
47
47
|
var ensureNamespace_1 = __importDefault(require("../utils/ensureNamespace"));
|
|
48
48
|
var setupKubernetes = function (instance, context) { return __awaiter(void 0, void 0, void 0, function () {
|
|
49
49
|
var deployConfig, projectId, deploy_tokens, fullName, namespace, serviceAccountName, KUBE_URL, e_1, secretName, KUBE_CA_PEM, KUBE_TOKEN, vars, missing;
|
|
50
|
-
|
|
51
|
-
|
|
50
|
+
var _a;
|
|
51
|
+
return __generator(this, function (_b) {
|
|
52
|
+
switch (_b.label) {
|
|
52
53
|
case 0:
|
|
53
|
-
deployConfig = context.
|
|
54
|
+
deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
|
|
54
55
|
if (!(0, pipeline_1.isOfDeployType)(deployConfig, "kubernetes")) {
|
|
55
56
|
throw new Error("cannot run setupKubernetes on non-kubernetes deployments");
|
|
56
57
|
}
|
|
57
58
|
return [4 /*yield*/, (0, gitlab_1.getProjectInfo)(instance)];
|
|
58
59
|
case 1:
|
|
59
|
-
projectId = (
|
|
60
|
+
projectId = (_b.sent()).id;
|
|
60
61
|
return [4 /*yield*/, (0, gitlab_1.doGitlabRequest)(instance, "projects/".concat(projectId, "/deploy_tokens"))];
|
|
61
62
|
case 2:
|
|
62
|
-
deploy_tokens =
|
|
63
|
+
deploy_tokens = _b.sent();
|
|
63
64
|
if (!!deploy_tokens.find(function (v) { return v.name === "gitlab-deploy-token"; })) return [3 /*break*/, 4];
|
|
64
65
|
instance.log("I will setup the 'GitLab Deploy Token', so Kubernetes can pull images from this project.");
|
|
65
66
|
return [4 /*yield*/, (0, gitlab_1.doGitlabRequest)(instance, "projects/".concat(projectId, "/deploy_tokens"), {
|
|
@@ -68,19 +69,19 @@ var setupKubernetes = function (instance, context) { return __awaiter(void 0, vo
|
|
|
68
69
|
scopes: ["read_registry"],
|
|
69
70
|
}, "POST")];
|
|
70
71
|
case 3:
|
|
71
|
-
|
|
72
|
-
|
|
72
|
+
_b.sent();
|
|
73
|
+
_b.label = 4;
|
|
73
74
|
case 4:
|
|
74
75
|
fullName = (0, pipeline_1.getFullKubernetesClusterName)(deployConfig.cluster);
|
|
75
76
|
instance.log("cluster: ".concat(fullName));
|
|
76
77
|
return [4 /*yield*/, (0, cluster_1.connectToCluster)(fullName)];
|
|
77
78
|
case 5:
|
|
78
|
-
|
|
79
|
+
_b.sent();
|
|
79
80
|
instance.log("");
|
|
80
81
|
instance.log("ensuring namespace ...");
|
|
81
82
|
return [4 /*yield*/, (0, ensureNamespace_1.default)(context)];
|
|
82
83
|
case 6:
|
|
83
|
-
namespace =
|
|
84
|
+
namespace = _b.sent();
|
|
84
85
|
instance.log("Namespace " + namespace + " created / updated!");
|
|
85
86
|
instance.log("");
|
|
86
87
|
//$.verbose = true;
|
|
@@ -90,43 +91,43 @@ var setupKubernetes = function (instance, context) { return __awaiter(void 0, vo
|
|
|
90
91
|
serviceAccountName = "cl-".concat(context.componentName, "-deploy");
|
|
91
92
|
return [4 /*yield*/, (0, child_process_promise_1.exec)("TERM=dumb kubectl cluster-info | grep -E 'Kubernetes master|Kubernetes control plane' | awk '/http/ {print $NF}'").then(function (s) { return s.stdout.trim(); })];
|
|
92
93
|
case 7:
|
|
93
|
-
KUBE_URL =
|
|
94
|
-
|
|
94
|
+
KUBE_URL = _b.sent();
|
|
95
|
+
_b.label = 8;
|
|
95
96
|
case 8:
|
|
96
|
-
|
|
97
|
+
_b.trys.push([8, 12, , 13]);
|
|
97
98
|
return [4 /*yield*/, (0, child_process_promise_1.exec)("kubectl delete serviceaccount --namespace ".concat(namespace, " ").concat(serviceAccountName))];
|
|
98
99
|
case 9:
|
|
99
|
-
|
|
100
|
+
_b.sent();
|
|
100
101
|
return [4 /*yield*/, (0, child_process_promise_1.exec)("kubectl delete rolebinding --namespace ".concat(namespace, " ").concat(serviceAccountName))];
|
|
101
102
|
case 10:
|
|
102
|
-
|
|
103
|
+
_b.sent();
|
|
103
104
|
return [4 /*yield*/, (0, child_process_promise_1.exec)("kubectl delete role --namespace ".concat(namespace, " ").concat(serviceAccountName))];
|
|
104
105
|
case 11:
|
|
105
|
-
|
|
106
|
+
_b.sent();
|
|
106
107
|
return [3 /*break*/, 13];
|
|
107
108
|
case 12:
|
|
108
|
-
e_1 =
|
|
109
|
+
e_1 = _b.sent();
|
|
109
110
|
return [3 /*break*/, 13];
|
|
110
111
|
case 13: return [4 /*yield*/, (0, child_process_promise_1.exec)("kubectl create serviceaccount --namespace ".concat(namespace, " ").concat(serviceAccountName))];
|
|
111
112
|
case 14:
|
|
112
|
-
|
|
113
|
+
_b.sent();
|
|
113
114
|
// upsert role in the ns
|
|
114
115
|
return [4 /*yield*/, (0, child_process_promise_1.exec)("cat <<EOF | kubectl apply -f -\nkind: Role\napiVersion: rbac.authorization.k8s.io/v1\nmetadata:\n namespace: ".concat(namespace, "\n name: ").concat(serviceAccountName, "\nrules:\n- apiGroups: [\"\", \"extensions\", \"apps\", \"networking.k8s.io\", \"batch\", \"autoscaling\", \"rbac.authorization.k8s.io\",\"snapshot.storage.k8s.io\"]\n resources: [\"deployments\", \"replicasets\", \"statefulsets\", \"pods\", \"secrets\", \"configmaps\", \"services\", \"ingresses\", \"serviceaccounts\", \"roles\", \"rolebindings\", \"jobs\", \"cronjobs\", \"horizontalpodautoscalers\", \"persistentvolumeclaims\", \"volumesnapshots\"]\n verbs: [\"*\"]\n---\nkind: RoleBinding\napiVersion: rbac.authorization.k8s.io/v1\nmetadata:\n name: ").concat(serviceAccountName, "\n namespace: ").concat(namespace, "\nsubjects:\n - kind: ServiceAccount\n name: ").concat(serviceAccountName, "\n namespace: ").concat(namespace, "\nroleRef:\n kind: Role\n name: ").concat(serviceAccountName, "\n apiGroup: rbac.authorization.k8s.io\nEOF\n"))];
|
|
115
116
|
case 15:
|
|
116
117
|
// upsert role in the ns
|
|
117
|
-
|
|
118
|
+
_b.sent();
|
|
118
119
|
secretName = "".concat(serviceAccountName, "-secret");
|
|
119
120
|
// create token for the service account
|
|
120
121
|
return [4 /*yield*/, (0, child_process_promise_1.exec)("\nkubectl apply -f - <<EOF\napiVersion: v1\nkind: Secret\nmetadata:\n name: ".concat(secretName, "\n namespace: ").concat(namespace, "\n annotations:\n kubernetes.io/service-account.name: ").concat(serviceAccountName, "\ntype: kubernetes.io/service-account-token\nEOF\n "))];
|
|
121
122
|
case 16:
|
|
122
123
|
// create token for the service account
|
|
123
|
-
|
|
124
|
+
_b.sent();
|
|
124
125
|
return [4 /*yield*/, (0, child_process_promise_1.exec)("kubectl get secret ".concat(secretName, " --namespace ").concat(namespace, " -o jsonpath=\"{['data']['ca\\.crt']}\"")).then(function (c) { return c.stdout.trim(); })];
|
|
125
126
|
case 17:
|
|
126
|
-
KUBE_CA_PEM =
|
|
127
|
+
KUBE_CA_PEM = _b.sent();
|
|
127
128
|
return [4 /*yield*/, (0, child_process_promise_1.exec)("kubectl get secret ".concat(secretName, " --namespace ").concat(namespace, " -o jsonpath=\"{['data']['token']}\" | base64 --decode")).then(function (c) { return c.stdout.trim(); })];
|
|
128
129
|
case 18:
|
|
129
|
-
KUBE_TOKEN =
|
|
130
|
+
KUBE_TOKEN = _b.sent();
|
|
130
131
|
vars = {
|
|
131
132
|
KUBE_TOKEN: KUBE_TOKEN,
|
|
132
133
|
KUBE_CA_PEM: KUBE_CA_PEM,
|
|
@@ -145,7 +146,7 @@ var setupKubernetes = function (instance, context) { return __awaiter(void 0, vo
|
|
|
145
146
|
instance.log("pusing secrets to gitlab...");
|
|
146
147
|
return [4 /*yield*/, (0, gitlab_1.upsertAllVariables)(instance, vars, context.environment.shortName, context.componentName, false)];
|
|
147
148
|
case 19:
|
|
148
|
-
|
|
149
|
+
_b.sent();
|
|
149
150
|
instance.log("done!");
|
|
150
151
|
return [2 /*return*/];
|
|
151
152
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupKubernetes.js","sourceRoot":"","sources":["../../../../../../../../src/apps/cli/commands/project/setup/setupKubernetes.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAG6B;AAE7B,+DAA6C;AAC7C,wDAAgE;AAChE,sDAIqC;AACrC,6EAAuD;AAEhD,IAAM,eAAe,GAAG,UAC7B,QAAyB,EACzB,OAAyB
|
|
1
|
+
{"version":3,"file":"setupKubernetes.js","sourceRoot":"","sources":["../../../../../../../../src/apps/cli/commands/project/setup/setupKubernetes.ts"],"names":[],"mappings":"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"}
|
|
@@ -42,20 +42,21 @@ var cluster_1 = require("../../../../../utils/cluster");
|
|
|
42
42
|
function default_1(envComponent) {
|
|
43
43
|
return __awaiter(this, void 0, void 0, function () {
|
|
44
44
|
var _a, env, componentName, context, cluster, connectedClusterName, shouldContinue;
|
|
45
|
-
|
|
46
|
-
|
|
45
|
+
var _b, _c;
|
|
46
|
+
return __generator(this, function (_d) {
|
|
47
|
+
switch (_d.label) {
|
|
47
48
|
case 0:
|
|
48
49
|
_a = (0, getProjectConfig_1.parseChoice)(envComponent), env = _a.env, componentName = _a.componentName;
|
|
49
50
|
return [4 /*yield*/, (0, getProjectConfig_1.getPipelineContextByChoice)(env, componentName)];
|
|
50
51
|
case 1:
|
|
51
|
-
context =
|
|
52
|
-
if (!(0, pipeline_1.isOfDeployType)(context.
|
|
52
|
+
context = _d.sent();
|
|
53
|
+
if (!(0, pipeline_1.isOfDeployType)((_b = context.deploy) === null || _b === void 0 ? void 0 : _b.config, "kubernetes")) {
|
|
53
54
|
throw new Error("can't ensure cluster for non-kubernetes deployments");
|
|
54
55
|
}
|
|
55
|
-
cluster = (0, pipeline_1.getFullKubernetesClusterName)(context.
|
|
56
|
+
cluster = (0, pipeline_1.getFullKubernetesClusterName)((_c = context.deploy) === null || _c === void 0 ? void 0 : _c.config.cluster);
|
|
56
57
|
return [4 /*yield*/, (0, cluster_1.getCurrentConnectedClusterName)()];
|
|
57
58
|
case 2:
|
|
58
|
-
connectedClusterName =
|
|
59
|
+
connectedClusterName = _d.sent();
|
|
59
60
|
if (!(cluster !== connectedClusterName)) return [3 /*break*/, 6];
|
|
60
61
|
this.log("you are currently connected to cluster '".concat(connectedClusterName, "'"));
|
|
61
62
|
this.log("but the project requires cluster '".concat(cluster, "'"));
|
|
@@ -66,15 +67,15 @@ function default_1(envComponent) {
|
|
|
66
67
|
message: "Do you want to connect to '".concat(cluster, "'?"),
|
|
67
68
|
})];
|
|
68
69
|
case 3:
|
|
69
|
-
shouldContinue = (
|
|
70
|
+
shouldContinue = (_d.sent()).shouldContinue;
|
|
70
71
|
if (!!shouldContinue) return [3 /*break*/, 4];
|
|
71
72
|
this.log("abort");
|
|
72
73
|
return [3 /*break*/, 6];
|
|
73
74
|
case 4: return [4 /*yield*/, (0, cluster_1.connectToCluster)(cluster)];
|
|
74
75
|
case 5:
|
|
75
|
-
|
|
76
|
+
_d.sent();
|
|
76
77
|
this.log("connected to cluster '".concat(cluster, "'"));
|
|
77
|
-
|
|
78
|
+
_d.label = 6;
|
|
78
79
|
case 6: return [2 /*return*/];
|
|
79
80
|
}
|
|
80
81
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ensureCluster.js","sourceRoot":"","sources":["../../../../../../../../src/apps/cli/commands/project/utils/ensureCluster.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAG6B;AAC7B,2EAGgD;AAChD,wDAGsC;AACtC,mBAA+B,YAAoB
|
|
1
|
+
{"version":3,"file":"ensureCluster.js","sourceRoot":"","sources":["../../../../../../../../src/apps/cli/commands/project/utils/ensureCluster.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAG6B;AAC7B,2EAGgD;AAChD,wDAGsC;AACtC,mBAA+B,YAAoB;;;;;;;oBAC3C,KAAyB,IAAA,8BAAW,EAAC,YAAY,CAAC,EAAhD,GAAG,SAAA,EAAE,aAAa,mBAAA,CAA+B;oBACzC,qBAAM,IAAA,6CAA0B,EAAC,GAAG,EAAE,aAAa,CAAC,EAAA;;oBAA9D,OAAO,GAAG,SAAoD;oBACpE,IAAI,CAAC,IAAA,yBAAc,EAAC,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,EAAE,YAAY,CAAC,EAAE,CAAC;wBAC1D,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;oBACzE,CAAC;oBACK,OAAO,GAAG,IAAA,uCAA4B,EAAC,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC,OAAO,CAAC,CAAC;oBAChD,qBAAM,IAAA,wCAA8B,GAAE,EAAA;;oBAA7D,oBAAoB,GAAG,SAAsC;yBAE/D,CAAA,OAAO,KAAK,oBAAoB,CAAA,EAAhC,wBAAgC;oBAClC,IAAI,CAAC,GAAG,CACN,kDAA2C,oBAAoB,MAAG,CACnE,CAAC;oBACF,IAAI,CAAC,GAAG,CAAC,4CAAqC,OAAO,MAAG,CAAC,CAAC;oBAC/B,qBAAM,IAAI,CAAC,MAAM,CAAC;4BAC3C,IAAI,EAAE,SAAS;4BACf,IAAI,EAAE,gBAAgB;4BACtB,OAAO,EAAE,IAAI;4BACb,OAAO,EAAE,qCAA8B,OAAO,OAAI;yBACnD,CAAC,EAAA;;oBALM,cAAc,GAAK,CAAA,SAKzB,CAAA,eALoB;yBAMlB,CAAC,cAAc,EAAf,wBAAe;oBACjB,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;;wBAElB,qBAAM,IAAA,0BAAgB,EAAC,OAAO,CAAC,EAAA;;oBAA/B,SAA+B,CAAC;oBAChC,IAAI,CAAC,GAAG,CAAC,gCAAyB,OAAO,MAAG,CAAC,CAAC;;;;;;CAGnD;AA3BD,4BA2BC"}
|
|
@@ -41,19 +41,20 @@ var pipeline_1 = require("../../../../pipeline/src/index.js");
|
|
|
41
41
|
var openDashboard_1 = require("../openDashboard");
|
|
42
42
|
var openGoogleCloudRunDashboard = function (instance, context) { return __awaiter(void 0, void 0, void 0, function () {
|
|
43
43
|
var fullName, _a, region, projectId;
|
|
44
|
-
|
|
45
|
-
|
|
44
|
+
var _b;
|
|
45
|
+
return __generator(this, function (_c) {
|
|
46
|
+
switch (_c.label) {
|
|
46
47
|
case 0:
|
|
47
|
-
if (!(0, pipeline_1.isOfDeployType)(context.
|
|
48
|
+
if (!(0, pipeline_1.isOfDeployType)((_b = context.deploy) === null || _b === void 0 ? void 0 : _b.config, "google-cloudrun")) {
|
|
48
49
|
throw new Error("deploy type is not google-cloudrun ");
|
|
49
50
|
}
|
|
50
51
|
fullName = context.environment.fullName;
|
|
51
|
-
_a = context.
|
|
52
|
+
_a = context.deploy.config, region = _a.region, projectId = _a.projectId;
|
|
52
53
|
return [4 /*yield*/, (0, openDashboard_1.openGoogleCloudDashboard)(instance, "run/detail/".concat(region, "/").concat(fullName, "/metrics"), {
|
|
53
54
|
project: projectId,
|
|
54
55
|
})];
|
|
55
56
|
case 1:
|
|
56
|
-
|
|
57
|
+
_c.sent();
|
|
57
58
|
return [2 /*return*/];
|
|
58
59
|
}
|
|
59
60
|
});
|