@catladder/cli 0.0.0-fix-scripts-set-e-ae9c708f → 0.0.0-fix-values-as-files-73f39da5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (59) hide show
  1. package/README.md +2 -1
  2. package/dist/apps/cli/commands/general/index.js +17 -9
  3. package/dist/apps/cli/commands/general/index.js.map +1 -1
  4. package/dist/apps/cli/commands/general/portForward.js +5 -6
  5. package/dist/apps/cli/commands/general/portForward.js.map +1 -1
  6. package/dist/apps/cli/commands/project/commandCloudSqlProxy.js +24 -19
  7. package/dist/apps/cli/commands/project/commandCloudSqlProxy.js.map +1 -1
  8. package/dist/apps/cli/commands/project/commandConfigSecrets.js +21 -14
  9. package/dist/apps/cli/commands/project/commandConfigSecrets.js.map +1 -1
  10. package/dist/apps/cli/commands/project/commandDeletePods.js +4 -3
  11. package/dist/apps/cli/commands/project/commandDeletePods.js.map +1 -1
  12. package/dist/apps/cli/commands/project/commandTriggerCronjob.js +2 -2
  13. package/dist/apps/cli/commands/project/commandTriggerCronjob.js.map +1 -1
  14. package/dist/apps/cli/commands/project/index.js +0 -2
  15. package/dist/apps/cli/commands/project/index.js.map +1 -1
  16. package/dist/apps/cli/commands/project/setup/setupAccessTokens.js +23 -14
  17. package/dist/apps/cli/commands/project/setup/setupAccessTokens.js.map +1 -1
  18. package/dist/apps/cli/commands/project/utils/ensureNamespace.js +6 -8
  19. package/dist/apps/cli/commands/project/utils/ensureNamespace.js.map +1 -1
  20. package/dist/apps/cli/config/writeConfig.js +1 -4
  21. package/dist/apps/cli/config/writeConfig.js.map +1 -1
  22. package/dist/config/getProjectConfig.d.ts +3 -3
  23. package/dist/config/getProjectConfig.js +58 -31
  24. package/dist/config/getProjectConfig.js.map +1 -1
  25. package/dist/k8sApi/index.d.ts +7 -5
  26. package/dist/k8sApi/index.js +23 -9
  27. package/dist/k8sApi/index.js.map +1 -1
  28. package/dist/tsconfig.tsbuildinfo +1 -1
  29. package/dist/utils/cluster.js +0 -2
  30. package/dist/utils/cluster.js.map +1 -1
  31. package/dist/utils/gitlab.d.ts +1 -0
  32. package/dist/utils/gitlab.js +17 -1
  33. package/dist/utils/gitlab.js.map +1 -1
  34. package/dist/utils/projects/index.js +7 -8
  35. package/dist/utils/projects/index.js.map +1 -1
  36. package/package.json +2 -2
  37. package/src/apps/cli/commands/general/index.ts +6 -7
  38. package/src/apps/cli/commands/general/portForward.ts +2 -1
  39. package/src/apps/cli/commands/project/commandCloudSqlProxy.ts +19 -6
  40. package/src/apps/cli/commands/project/commandConfigSecrets.ts +19 -16
  41. package/src/apps/cli/commands/project/commandDeletePods.ts +2 -1
  42. package/src/apps/cli/commands/project/commandTriggerCronjob.ts +3 -3
  43. package/src/apps/cli/commands/project/index.ts +0 -2
  44. package/src/apps/cli/commands/project/setup/setupAccessTokens.ts +7 -5
  45. package/src/apps/cli/commands/project/utils/ensureNamespace.ts +2 -1
  46. package/src/apps/cli/config/writeConfig.ts +0 -2
  47. package/src/config/getProjectConfig.ts +52 -28
  48. package/src/k8sApi/index.ts +20 -8
  49. package/src/utils/cluster.ts +0 -2
  50. package/src/utils/gitlab.ts +11 -0
  51. package/src/utils/projects/index.ts +3 -1
  52. package/dist/apps/cli/commands/project/commandReloadConfig.d.ts +0 -3
  53. package/dist/apps/cli/commands/project/commandReloadConfig.js +0 -62
  54. package/dist/apps/cli/commands/project/commandReloadConfig.js.map +0 -1
  55. package/dist/utils/formatEnvVars.d.ts +0 -2
  56. package/dist/utils/formatEnvVars.js +0 -10
  57. package/dist/utils/formatEnvVars.js.map +0 -1
  58. package/src/apps/cli/commands/project/commandReloadConfig.ts +0 -12
  59. package/src/utils/formatEnvVars.ts +0 -7
package/README.md CHANGED
@@ -13,11 +13,12 @@ or npm users
13
13
  _Note: if you have `@panter/catladder` installed upgrade it to >=4.0.0 before installing `@catladder/cli`_
14
14
 
15
15
  ## Getting started
16
+
16
17
  You'll need
18
+
17
19
  - Google Cloud SDK ([see installation instructions](https://cloud.google.com/sdk/docs/install))
18
20
  - Kubectl ([see installation instructions](https://kubernetes.io/docs/tasks/tools/))
19
21
  - Cloud SQL Auth proxy ([see installation instructions](https://cloud.google.com/sql/docs/postgres/sql-proxy#install))
20
- - Bitwarden CLI ([see installation instructions](https://bitwarden.com/help/article/cli/))
21
22
 
22
23
  Afterwards you need to connect to your cluster, e.g. `gcloud container clusters get-credentials clustername --zone google-zone --project google-project-id`
23
24
  In most cases you'll find the details on the Google Cloud [cluster overview ](https://console.cloud.google.com/kubernetes/list?project=skynet-164509)
@@ -41,7 +41,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
41
41
  exports.__esModule = true;
42
42
  exports.getAllNamespacesNames = void 0;
43
43
  var memoizee_1 = __importDefault(require("memoizee"));
44
- var k8sApi_1 = __importDefault(require("../../../../k8sApi"));
44
+ var k8sApi_1 = require("../../../../k8sApi");
45
45
  var cluster_1 = require("../../../../utils/cluster");
46
46
  var log_1 = require("../../../../utils/log");
47
47
  var passwordstore_1 = require("../../../../utils/passwordstore");
@@ -50,10 +50,12 @@ var shell_1 = require("../../../../utils/shell");
50
50
  var namespaceAutoCompletion_1 = require("./namespaceAutoCompletion");
51
51
  var portForward_2 = __importDefault(require("./portForward"));
52
52
  var getAllNamespaces = (0, memoizee_1["default"])(function () { return __awaiter(void 0, void 0, void 0, function () {
53
- var res;
53
+ var k8sApi, res;
54
54
  return __generator(this, function (_a) {
55
55
  switch (_a.label) {
56
- case 0: return [4 /*yield*/, k8sApi_1["default"].listNamespace()];
56
+ case 0:
57
+ k8sApi = (0, k8sApi_1.getk8sApi)();
58
+ return [4 /*yield*/, k8sApi.listNamespace()];
57
59
  case 1:
58
60
  res = _a.sent();
59
61
  return [2 /*return*/, res.body.items];
@@ -111,10 +113,12 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
111
113
  .action(function (_a) {
112
114
  var namespace = _a.namespace;
113
115
  return __awaiter(this, void 0, void 0, function () {
114
- var res;
116
+ var k8sApi, res;
115
117
  return __generator(this, function (_b) {
116
118
  switch (_b.label) {
117
- case 0: return [4 /*yield*/, k8sApi_1["default"].listNamespacedSecret(namespace)];
119
+ case 0:
120
+ k8sApi = (0, k8sApi_1.getk8sApi)();
121
+ return [4 /*yield*/, k8sApi.listNamespacedSecret(namespace)];
118
122
  case 1:
119
123
  res = _b.sent();
120
124
  this.log(res.body.items.map(function (n) { return n.metadata.name; }).join("\n"));
@@ -142,10 +146,12 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
142
146
  .action(function (_a) {
143
147
  var namespace = _a.namespace;
144
148
  return __awaiter(this, void 0, void 0, function () {
145
- var res;
149
+ var k8sApi, res;
146
150
  return __generator(this, function (_b) {
147
151
  switch (_b.label) {
148
- case 0: return [4 /*yield*/, k8sApi_1["default"].listNamespacedPod(namespace)];
152
+ case 0:
153
+ k8sApi = (0, k8sApi_1.getk8sApi)();
154
+ return [4 /*yield*/, k8sApi.listNamespacedPod(namespace)];
149
155
  case 1:
150
156
  res = _b.sent();
151
157
  this.log(res.body.items.map(function (n) { return n.metadata.name; }).join("\n"));
@@ -174,10 +180,12 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
174
180
  .action(function (_a) {
175
181
  var namespace = _a.namespace;
176
182
  return __awaiter(this, void 0, void 0, function () {
177
- var res, podNames, podName;
183
+ var k8sApi, res, podNames, podName;
178
184
  return __generator(this, function (_b) {
179
185
  switch (_b.label) {
180
- case 0: return [4 /*yield*/, k8sApi_1["default"].listNamespacedPod(namespace)];
186
+ case 0:
187
+ k8sApi = (0, k8sApi_1.getk8sApi)();
188
+ return [4 /*yield*/, k8sApi.listNamespacedPod(namespace)];
181
189
  case 1:
182
190
  res = _b.sent();
183
191
  if (res.body.items.length === 0) {
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/general/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sDAAgC;AAEhC,8DAAwC;AACxC,qDAGmC;AACnC,6CAAiD;AACjD,iEAAgE;AAChE,6DAGuC;AACvC,iDAAmD;AAGnD,qEAAoE;AACpE,8DAAwC;AAExC,IAAM,gBAAgB,GAAG,IAAA,qBAAQ,EAC/B;;;;oBACc,qBAAM,mBAAM,CAAC,aAAa,EAAE,EAAA;;gBAAlC,GAAG,GAAG,SAA4B;gBACxC,sBAAO,GAAG,CAAC,IAAI,CAAC,KAAK,EAAC;;;KACvB,EACD,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,CACjC,CAAC;AAEK,IAAM,qBAAqB,GAAG;;;;oBAChB,qBAAM,gBAAgB,EAAE,EAAA;;gBAArC,UAAU,GAAG,SAAwB;gBAC3C,sBAAO,UAAU,CAAC,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAf,CAAe,CAAC,EAAC;;;KAC/C,CAAC;AAHW,QAAA,qBAAqB,yBAGhC;AACF,sBAAe,UAAO,MAAc;;QAClC,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAAC;;;;;;4BACvC,KAAA,IAAI,CAAC,GAAG,CAAA;4BAAC,qBAAM,IAAA,2BAAiB,GAAE,EAAA;;4BAAlC,SAAA,IAAI,GAAK,SAAyB,EAAC,CAAC;;;;;SACrC,CAAC,CAAC;QAEH,MAAM;aACH,OAAO,CAAC,iBAAiB,EAAE,qBAAqB,CAAC;aACjD,MAAM,CAAC;;;;;gCACa,qBAAM,IAAA,6BAAqB,GAAE,EAAA;;4BAA1C,UAAU,GAAG,SAA6B;4BAChD,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;;;;;SACjC,CAAC,CAAC;QAEL,MAAM;aACH,OAAO,CAAC,0BAA0B,EAAE,cAAc,CAAC;aACnD,YAAY,CAAC,iDAAuB,CAAC;aACrC,MAAM,CAAC,UAAgB,EAAa;gBAAX,SAAS,eAAA;;;;;gCACrB,qBAAM,mBAAM,CAAC,oBAAoB,CAAC,SAAS,CAAC,EAAA;;4BAAlD,GAAG,GAAG,SAA4C;4BAExD,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAf,CAAe,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;;;;;SACjE,CAAC,CAAC;QAEL,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,sBAAsB,CAAC,CAAC,MAAM,CAAC;;;;gCACvD,qBAAM,IAAA,6BAAa,EAAC,IAAI,CAAC,EAAA;;4BAAzB,SAAyB,CAAC;4BAC1B,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;;;;;SAClB,CAAC,CAAC;QAEH,MAAM;aACH,OAAO,CAAC,uBAAuB,EAAE,4BAA4B,CAAC;aAC9D,YAAY,CAAC,iDAAuB,CAAC;aACrC,MAAM,CAAC,UAAgB,EAAa;gBAAX,SAAS,eAAA;;;;;gCACrB,qBAAM,mBAAM,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAA;;4BAA/C,GAAG,GAAG,SAAyC;4BACrD,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAf,CAAe,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;;;;;SACjE,CAAC,CAAC;QAEL,MAAM;aACH,OAAO,CAAC,yBAAyB,EAAE,6BAA6B,CAAC;aACjE,YAAY,CAAC,EAAE,IAAI,EAAE;gBAAY,sBAAA,IAAA,uCAAyB,GAAE,EAAA;qBAAA,EAAE,CAAC;aAC/D,MAAM,CAAC,UAAgB,EAAQ;gBAAN,IAAI,UAAA;;;oBAC5B,IAAA,6BAAe,EAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;;;;SAC9B,CAAC,CAAC;QAEL,MAAM;aACH,OAAO,CAAC,uBAAuB,EAAE,yCAAyC,CAAC;aAC3E,YAAY,CAAC,iDAAuB,CAAC;aACrC,MAAM,CAAC,UAAgB,EAAa;gBAAX,SAAS,eAAA;;;;;gCACrB,qBAAM,mBAAM,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAA;;4BAA/C,GAAG,GAAG,SAAyC;4BACrD,IAAI,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;gCAC/B,IAAA,cAAQ,EAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;gCACvC,sBAAO;6BACR;4BACK,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAf,CAAe,CAAC,CAAC;4BACxC,qBAAM,IAAI,CAAC,MAAM,CAAC;oCACpC,IAAI,EAAE,MAAM;oCACZ,IAAI,EAAE,SAAS;oCACf,OAAO,EAAE,QAAQ;oCACjB,OAAO,EAAE,eAAe;iCACzB,CAAC,EAAA;;4BALM,OAAO,GAAK,CAAA,SAKlB,CAAA,QALa;4BAOf,qBAAM,IAAA,gBAAQ,EAAC,SAAS,EAAE,OAAO,CAAC,EAAA;;4BAAlC,SAAkC,CAAC;;;;;SACpC,CAAC,CAAC;QAEL,IAAA,wBAAW,EAAC,MAAM,CAAC,CAAC;;;KACrB,EAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/general/index.ts"],"names":[],"mappings":"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"}
@@ -35,13 +35,10 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
35
35
  if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
36
36
  }
37
37
  };
38
- var __importDefault = (this && this.__importDefault) || function (mod) {
39
- return (mod && mod.__esModule) ? mod : { "default": mod };
40
- };
41
38
  exports.__esModule = true;
42
39
  var log_1 = require("../../../../utils/log");
43
40
  var portForward_1 = require("../../../../utils/portForward");
44
- var k8sApi_1 = __importDefault(require("../../../../k8sApi"));
41
+ var k8sApi_1 = require("../../../../k8sApi");
45
42
  var namespaceAutoCompletion_1 = require("./namespaceAutoCompletion");
46
43
  exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void 0, function () {
47
44
  return __generator(this, function (_a) {
@@ -51,10 +48,12 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
51
48
  .action(function (_a) {
52
49
  var namespace = _a.namespace;
53
50
  return __awaiter(this, void 0, void 0, function () {
54
- var res, podNames, podName, localPort, remotePort;
51
+ var k8sApi, res, podNames, podName, localPort, remotePort;
55
52
  return __generator(this, function (_b) {
56
53
  switch (_b.label) {
57
- case 0: return [4 /*yield*/, k8sApi_1["default"].listNamespacedPod(namespace)];
54
+ case 0:
55
+ k8sApi = (0, k8sApi_1.getk8sApi)();
56
+ return [4 /*yield*/, k8sApi.listNamespacedPod(namespace)];
58
57
  case 1:
59
58
  res = _b.sent();
60
59
  if (res.body.items.length === 0) {
@@ -1 +1 @@
1
- {"version":3,"file":"portForward.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/general/portForward.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,6CAAiD;AAEjD,6DAAiE;AAEjE,8DAAwC;AACxC,qEAAoE;AAEpE,sBAAe,UAAO,MAAc;;QAClC,sBAAA,MAAM;iBACH,OAAO,CAAC,0BAA0B,EAAE,uBAAuB,CAAC;iBAC5D,YAAY,CAAC,iDAAuB,CAAC;iBACrC,MAAM,CAAC,UAAgB,EAAa;oBAAX,SAAS,eAAA;;;;;oCACrB,qBAAM,mBAAM,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAA;;gCAA/C,GAAG,GAAG,SAAyC;gCACrD,IAAI,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;oCAC/B,IAAA,cAAQ,EAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;oCACvC,sBAAO;iCACR;gCACK,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAf,CAAe,CAAC,CAAC;gCAE5D,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;oCACzB,IAAA,cAAQ,EAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;oCACvC,sBAAO;iCACR;gCACmB,qBAAM,IAAI,CAAC,MAAM,CAAC;wCACpC,IAAI,EAAE,MAAM;wCACZ,IAAI,EAAE,SAAS;wCACf,OAAO,EAAE,QAAQ;wCACjB,OAAO,EAAE,eAAe;qCACzB,CAAC,EAAA;;gCALM,OAAO,GAAK,CAAA,SAKlB,CAAA,QALa;gCAOO,qBAAM,IAAI,CAAC,MAAM,CAAC;wCACtC,IAAI,EAAE,QAAQ;wCACd,IAAI,EAAE,WAAW;wCAEjB,OAAO,EAAE,cAAc;qCACxB,CAAC,EAAA;;gCALM,SAAS,GAAK,CAAA,SAKpB,CAAA,UALe;gCAOM,qBAAM,IAAI,CAAC,MAAM,CAAC;wCACvC,IAAI,EAAE,QAAQ;wCACd,IAAI,EAAE,YAAY;wCAElB,OAAO,EAAE,eAAe;qCACzB,CAAC,EAAA;;gCALM,UAAU,GAAK,CAAA,SAKrB,CAAA,WALgB;gCAOlB,sBAAO,IAAA,8BAAgB,EAAC,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,CAAC,EAAC;;;;aACpE,CAAC,EAAA;;KAAA,EAAC"}
1
+ {"version":3,"file":"portForward.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/general/portForward.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,6CAAiD;AAEjD,6DAAiE;AAEjE,6CAA+C;AAC/C,qEAAoE;AAEpE,sBAAe,UAAO,MAAc;;QAClC,sBAAA,MAAM;iBACH,OAAO,CAAC,0BAA0B,EAAE,uBAAuB,CAAC;iBAC5D,YAAY,CAAC,iDAAuB,CAAC;iBACrC,MAAM,CAAC,UAAgB,EAAa;oBAAX,SAAS,eAAA;;;;;;gCAC3B,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;gCACf,qBAAM,MAAM,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAA;;gCAA/C,GAAG,GAAG,SAAyC;gCACrD,IAAI,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;oCAC/B,IAAA,cAAQ,EAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;oCACvC,sBAAO;iCACR;gCACK,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAf,CAAe,CAAC,CAAC;gCAE5D,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;oCACzB,IAAA,cAAQ,EAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;oCACvC,sBAAO;iCACR;gCACmB,qBAAM,IAAI,CAAC,MAAM,CAAC;wCACpC,IAAI,EAAE,MAAM;wCACZ,IAAI,EAAE,SAAS;wCACf,OAAO,EAAE,QAAQ;wCACjB,OAAO,EAAE,eAAe;qCACzB,CAAC,EAAA;;gCALM,OAAO,GAAK,CAAA,SAKlB,CAAA,QALa;gCAOO,qBAAM,IAAI,CAAC,MAAM,CAAC;wCACtC,IAAI,EAAE,QAAQ;wCACd,IAAI,EAAE,WAAW;wCAEjB,OAAO,EAAE,cAAc;qCACxB,CAAC,EAAA;;gCALM,SAAS,GAAK,CAAA,SAKpB,CAAA,UALe;gCAOM,qBAAM,IAAI,CAAC,MAAM,CAAC;wCACvC,IAAI,EAAE,QAAQ;wCACd,IAAI,EAAE,YAAY;wCAElB,OAAO,EAAE,eAAe;qCACzB,CAAC,EAAA;;gCALM,UAAU,GAAK,CAAA,SAKrB,CAAA,WALgB;gCAOlB,sBAAO,IAAA,8BAAgB,EAAC,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,CAAC,EAAC;;;;aACpE,CAAC,EAAA;;KAAA,EAAC"}
@@ -40,9 +40,7 @@ var pipeline_1 = require("@catladder/pipeline");
40
40
  var child_process_promise_1 = require("child-process-promise");
41
41
  var fs_extra_1 = require("fs-extra");
42
42
  var tmp_promise_1 = require("tmp-promise");
43
- var constants_1 = require("../../../../config/constants");
44
43
  var getProjectConfig_1 = require("../../../../config/getProjectConfig");
45
- var passwordstore_1 = require("../../../../utils/passwordstore");
46
44
  var autocompletions_1 = require("./utils/autocompletions");
47
45
  exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void 0, function () {
48
46
  var _a, _b;
@@ -55,18 +53,18 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
55
53
  return [4 /*yield*/, (0, autocompletions_1.envAndComponents)()];
56
54
  case 1: return [2 /*return*/, _b.apply(_a, [_c.sent()])
57
55
  .action(function (_a) {
58
- var _b, _c, _d, _e, _f;
56
+ var _b, _c, _d, _e;
59
57
  var envComponent = _a.envComponent;
60
58
  return __awaiter(this, void 0, void 0, function () {
61
- var _g, env, componentName, config, localPort, POSTGRESQL_PASSWORD, context, values, projectId, defaultInstanceId, instanceId, defaultRegion, region, instanceName, cloudsqlCredentials;
59
+ var _f, env, componentName, config, localPort, envVars, POSTGRESQL_PASSWORD, context, values, projectId, defaultInstanceId, instanceId, defaultRegion, region, instanceName, cloudsqlProxyCredentials;
62
60
  var _this = this;
63
- return __generator(this, function (_h) {
64
- switch (_h.label) {
61
+ return __generator(this, function (_g) {
62
+ switch (_g.label) {
65
63
  case 0:
66
- _g = (0, getProjectConfig_1.parseChoice)(envComponent), env = _g.env, componentName = _g.componentName;
64
+ _f = (0, getProjectConfig_1.parseChoice)(envComponent), env = _f.env, componentName = _f.componentName;
67
65
  return [4 /*yield*/, (0, getProjectConfig_1.getProjectConfig)()];
68
66
  case 1:
69
- config = _h.sent();
67
+ config = _g.sent();
70
68
  return [4 /*yield*/, this.prompt({
71
69
  type: "number",
72
70
  name: "localPort",
@@ -74,13 +72,14 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
74
72
  message: "Local port: "
75
73
  })];
76
74
  case 2:
77
- localPort = (_h.sent()).localPort;
75
+ localPort = (_g.sent()).localPort;
78
76
  return [4 /*yield*/, (0, getProjectConfig_1.getEnvVars)(this, env, componentName)];
79
77
  case 3:
80
- POSTGRESQL_PASSWORD = (_b = (_h.sent())) === null || _b === void 0 ? void 0 : _b.POSTGRESQL_PASSWORD;
78
+ envVars = _g.sent();
79
+ POSTGRESQL_PASSWORD = envVars === null || envVars === void 0 ? void 0 : envVars.POSTGRESQL_PASSWORD;
81
80
  return [4 /*yield*/, (0, getProjectConfig_1.getPipelineContextByChoice)(env, componentName)];
82
81
  case 4:
83
- context = _h.sent();
82
+ context = _g.sent();
84
83
  if (!(0, pipeline_1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) {
85
84
  throw new Error("currently only supported for kubernetes deployment");
86
85
  }
@@ -90,22 +89,28 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
90
89
  this.log("POSTGRESQL_URL=postgresql://postgres:".concat(POSTGRESQL_PASSWORD, "@localhost:").concat(localPort, "/").concat(context.environment.envVars.KUBE_APP_NAME, "?schema=public"));
91
90
  this.log("");
92
91
  values = context.componentConfig.deploy.values;
93
- projectId = ((_c = values === null || values === void 0 ? void 0 : values.cloudsql) === null || _c === void 0 ? void 0 : _c.projectId) ||
94
- ((_d = context.componentConfig.deploy.cluster) === null || _d === void 0 ? void 0 : _d.projectId);
92
+ projectId = ((_b = values === null || values === void 0 ? void 0 : values.cloudsql) === null || _b === void 0 ? void 0 : _b.projectId) ||
93
+ ((_c = context.componentConfig.deploy.cluster) === null || _c === void 0 ? void 0 : _c.projectId);
95
94
  defaultInstanceId = "".concat(config.customerName, "-").concat(config.appName, "-").concat(env);
96
- instanceId = ((_e = values === null || values === void 0 ? void 0 : values.cloudsql) === null || _e === void 0 ? void 0 : _e.instanceId) || defaultInstanceId;
95
+ instanceId = ((_d = values === null || values === void 0 ? void 0 : values.cloudsql) === null || _d === void 0 ? void 0 : _d.instanceId) || defaultInstanceId;
97
96
  defaultRegion = "europe-west6";
98
- region = ((_f = values === null || values === void 0 ? void 0 : values.cloudsql) === null || _f === void 0 ? void 0 : _f.region) || defaultRegion;
97
+ region = ((_e = values === null || values === void 0 ? void 0 : values.cloudsql) === null || _e === void 0 ? void 0 : _e.region) || defaultRegion;
99
98
  instanceName = "".concat(projectId, ":").concat(region, ":").concat(instanceId, "=tcp:").concat(localPort);
100
- return [4 /*yield*/, (0, passwordstore_1.readPass)(constants_1.GOOGLE_CLOUD_SQL_PASS_PATH)];
99
+ return [4 /*yield*/, (0, getProjectConfig_1.getGitlabVar)(this, env, componentName, "cloudsqlProxyCredentials")];
101
100
  case 5:
102
- cloudsqlCredentials = _h.sent();
101
+ cloudsqlProxyCredentials = _g.sent();
102
+ if (!cloudsqlProxyCredentials) {
103
+ // we store cloudsqlProxyCredentials on gitlab, but its currently get pushed via bitwarden due to legacy reasons
104
+ // this will be fixed with when https://git.panter.ch/catladder/catladder/-/merge_requests/32/ is merged
105
+ this.log("cloudsqlProxyCredentials env var missing in gitlab. Please contact gilde-ci-cd about that.");
106
+ throw new Error("cloudsqlProxyCredentials missing in secrets");
107
+ }
103
108
  return [4 /*yield*/, (0, tmp_promise_1.withFile)(function (_a) {
104
109
  var tmpFilePath = _a.path;
105
110
  return __awaiter(_this, void 0, void 0, function () {
106
111
  return __generator(this, function (_b) {
107
112
  switch (_b.label) {
108
- case 0: return [4 /*yield*/, (0, fs_extra_1.writeFile)(tmpFilePath, cloudsqlCredentials)];
113
+ case 0: return [4 /*yield*/, (0, fs_extra_1.writeFile)(tmpFilePath, cloudsqlProxyCredentials)];
109
114
  case 1:
110
115
  _b.sent();
111
116
  return [4 /*yield*/, (0, child_process_promise_1.spawn)("cloud_sql_proxy", ["-instances", instanceName, "-credential_file", tmpFilePath], {
@@ -120,7 +125,7 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
120
125
  });
121
126
  })];
122
127
  case 6:
123
- _h.sent();
128
+ _g.sent();
124
129
  return [2 /*return*/];
125
130
  }
126
131
  });
@@ -1 +1 @@
1
- {"version":3,"file":"commandCloudSqlProxy.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/commandCloudSqlProxy.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"commandCloudSqlProxy.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/commandCloudSqlProxy.ts"],"names":[],"mappings":"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"}
@@ -90,7 +90,7 @@ var getEnvVarsToEdit = function (instance, env, componentName) { return __awaite
90
90
  });
91
91
  }); };
92
92
  var doItFor = function (instance, envAndComponents) { return __awaiter(void 0, void 0, void 0, function () {
93
- var valuesToEdit, _a, _b, hasErrors, _i, _c, _d, componentName, envs, _e, envs_1, env, usedKeys, secretEnvVarKeys, extranous, missing, shouldContinue, _f, _g, _h, componentName, envs, _j, envs_2, env, context, _k, _l;
93
+ var valuesToEdit, _a, _b, hasErrors, _i, _c, _d, componentName, envs, _e, envs_1, env, usedKeys, secretEnvVarKeys, extranous, missing, shouldContinue, _f, _g, _h, componentName, envs, _j, envs_2, env, context, _k, _l, e_1;
94
94
  var _m;
95
95
  var _o, _p;
96
96
  return __generator(this, function (_q) {
@@ -203,42 +203,49 @@ var doItFor = function (instance, envAndComponents) { return __awaiter(void 0, v
203
203
  _f = 0, _g = Object.entries(envAndComponents);
204
204
  _q.label = 13;
205
205
  case 13:
206
- if (!(_f < _g.length)) return [3 /*break*/, 22];
206
+ if (!(_f < _g.length)) return [3 /*break*/, 25];
207
207
  _h = _g[_f], componentName = _h[0], envs = _h[1];
208
208
  _j = 0, envs_2 = envs;
209
209
  _q.label = 14;
210
210
  case 14:
211
- if (!(_j < envs_2.length)) return [3 /*break*/, 21];
211
+ if (!(_j < envs_2.length)) return [3 /*break*/, 24];
212
212
  env = envs_2[_j];
213
213
  return [4 /*yield*/, (0, gitlab_1.upsertAllVariables)(instance, valuesToEdit[componentName][env], env, componentName)];
214
214
  case 15:
215
215
  _q.sent();
216
- if (!(0, passwordstore_1.hasBitwarden)()) return [3 /*break*/, 19];
217
- return [4 /*yield*/, (0, getProjectConfig_1.getPipelineContextByChoice)(env, componentName)];
216
+ if (!(0, passwordstore_1.hasBitwarden)()) return [3 /*break*/, 22];
217
+ _q.label = 16;
218
218
  case 16:
219
+ _q.trys.push([16, 21, , 22]);
220
+ return [4 /*yield*/, (0, getProjectConfig_1.getPipelineContextByChoice)(env, componentName)];
221
+ case 17:
219
222
  context = _q.sent();
220
223
  if (!(context.componentConfig.deploy &&
221
- ((_p = (_o = context.componentConfig.deploy.values) === null || _o === void 0 ? void 0 : _o.cloudsql) === null || _p === void 0 ? void 0 : _p.enabled))) return [3 /*break*/, 19];
224
+ ((_p = (_o = context.componentConfig.deploy.values) === null || _o === void 0 ? void 0 : _o.cloudsql) === null || _p === void 0 ? void 0 : _p.enabled))) return [3 /*break*/, 20];
222
225
  _k = gitlab_1.upsertAllVariables;
223
226
  _l = [instance];
224
227
  _m = {};
225
228
  return [4 /*yield*/, (0, passwordstore_1.readPass)(constants_1.GOOGLE_CLOUD_SQL_PASS_PATH)];
226
- case 17: return [4 /*yield*/, _k.apply(void 0, _l.concat([(_m.cloudsqlProxyCredentials = _q.sent(),
229
+ case 18: return [4 /*yield*/, _k.apply(void 0, _l.concat([(_m.cloudsqlProxyCredentials = _q.sent(),
227
230
  _m), env,
228
231
  componentName]))];
229
- case 18:
230
- _q.sent();
231
- _q.label = 19;
232
232
  case 19:
233
- instance.log("✅ " + env + ":" + componentName);
233
+ _q.sent();
234
234
  _q.label = 20;
235
- case 20:
235
+ case 20: return [3 /*break*/, 22];
236
+ case 21:
237
+ e_1 = _q.sent();
238
+ return [3 /*break*/, 22];
239
+ case 22:
240
+ instance.log("✅ " + env + ":" + componentName);
241
+ _q.label = 23;
242
+ case 23:
236
243
  _j++;
237
244
  return [3 /*break*/, 14];
238
- case 21:
245
+ case 24:
239
246
  _f++;
240
247
  return [3 /*break*/, 13];
241
- case 22:
248
+ case 25:
242
249
  instance.log("done! 😻");
243
250
  instance.log("");
244
251
  return [2 /*return*/];
@@ -1 +1 @@
1
- {"version":3,"file":"commandConfigSecrets.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/commandConfigSecrets.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"commandConfigSecrets.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/commandConfigSecrets.ts"],"names":[],"mappings":"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"}
@@ -39,7 +39,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
39
39
  return (mod && mod.__esModule) ? mod : { "default": mod };
40
40
  };
41
41
  exports.__esModule = true;
42
- var k8sApi_1 = __importDefault(require("../../../../k8sApi"));
42
+ var k8sApi_1 = require("../../../../k8sApi");
43
43
  var log_1 = require("../../../../utils/log");
44
44
  var projects_1 = require("../../../../utils/projects");
45
45
  var autocompletions_1 = require("./utils/autocompletions");
@@ -57,7 +57,7 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
57
57
  .action(function (_a) {
58
58
  var envComponent = _a.envComponent;
59
59
  return __awaiter(this, void 0, void 0, function () {
60
- var namespace, podNames, selectedPodNames, shouldContinue, _i, selectedPodNames_1, podName;
60
+ var namespace, podNames, selectedPodNames, shouldContinue, k8sApi, _i, selectedPodNames_1, podName;
61
61
  var _this = this;
62
62
  return __generator(this, function (_b) {
63
63
  switch (_b.label) {
@@ -94,13 +94,14 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
94
94
  case 5:
95
95
  shouldContinue = (_b.sent()).shouldContinue;
96
96
  this.log("");
97
+ k8sApi = (0, k8sApi_1.getk8sApi)();
97
98
  if (!shouldContinue) return [3 /*break*/, 9];
98
99
  _i = 0, selectedPodNames_1 = selectedPodNames;
99
100
  _b.label = 6;
100
101
  case 6:
101
102
  if (!(_i < selectedPodNames_1.length)) return [3 /*break*/, 9];
102
103
  podName = selectedPodNames_1[_i];
103
- return [4 /*yield*/, k8sApi_1["default"].deleteNamespacedPod(podName, namespace, "true")];
104
+ return [4 /*yield*/, k8sApi.deleteNamespacedPod(podName, namespace, "true")];
104
105
  case 7:
105
106
  _b.sent();
106
107
  this.log("deleted pod '".concat(podName, "'"));
@@ -1 +1 @@
1
- {"version":3,"file":"commandDeletePods.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/commandDeletePods.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,8DAAwC;AAExC,6CAAiD;AACjD,uDAGoC;AACpC,2DAA2D;AAC3D,wEAAkD;AAElD,sBAAe,UAAO,MAAc;;;;;gBAClC,KAAA,CAAA,KAAA,MAAM;qBACH,OAAO,CAAC,oCAAoC,EAAE,uBAAuB,CAAC,CAAA;qBACtE,YAAY,CAAA;gBAAC,qBAAM,IAAA,kCAAgB,GAAE,EAAA;oBAFxC,sBAAA,cAEgB,SAAwB,EAAC;qBACtC,MAAM,CAAC,UAAgB,EAAgB;wBAAd,YAAY,kBAAA;;;;;;wCACpC,qBAAM,0BAAa,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,EAAA;;oCAA5C,SAA4C,CAAC;oCAC3B,qBAAM,IAAA,8BAAmB,EAAC,YAAY,CAAC,EAAA;;oCAAnD,SAAS,GAAG,SAAuC;oCACxC,qBAAM,IAAA,6BAAkB,EAAC,YAAY,CAAC,EAAA;;oCAAjD,QAAQ,GAAG,SAAsC;oCACvD,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;wCACzB,IAAA,cAAQ,EAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;wCACvC,sBAAO;qCACR;oCAC4B,qBAAM,IAAI,CAAC,MAAM,CAAC;4CAC7C,IAAI,EAAE,UAAU;4CAChB,IAAI,EAAE,kBAAkB;4CACxB,OAAO,EAAE,QAAQ;4CACjB,OAAO,EAAE,uCAAuC;yCACjD,CAAC,EAAA;;oCALM,gBAAgB,GAAK,CAAA,SAK3B,CAAA,iBALsB;oCAOxB,IAAI,CAAC,GAAG,CACN,oEAAoE,CACrE,CAAC;oCACF,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oCACb,gBAAgB,CAAC,OAAO,CAAC,UAAC,CAAS,IAAK,OAAA,KAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAX,CAAW,CAAC,CAAC;oCACrD,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oCACc,qBAAM,IAAI,CAAC,MAAM,CAAC;4CAC3C,IAAI,EAAE,SAAS;4CACf,IAAI,EAAE,gBAAgB;4CACtB,OAAO,EAAE,iBAAiB;yCAC3B,CAAC,EAAA;;oCAJM,cAAc,GAAK,CAAA,SAIzB,CAAA,eAJoB;oCAKtB,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;yCACT,cAAc,EAAd,wBAAc;0CACsB,EAAhB,qCAAgB;;;yCAAhB,CAAA,8BAAgB,CAAA;oCAA3B,OAAO;oCAChB,qBAAM,mBAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,EAAA;;oCAA5D,SAA4D,CAAC;oCAC7D,IAAI,CAAC,GAAG,CAAC,uBAAgB,OAAO,MAAG,CAAC,CAAC;;;oCAFjB,IAAgB,CAAA;;;;;;iBAKzC,CAAC,EAAA;;;KAAA,EAAC"}
1
+ {"version":3,"file":"commandDeletePods.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/commandDeletePods.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,6CAA+C;AAE/C,6CAAiD;AACjD,uDAGoC;AACpC,2DAA2D;AAC3D,wEAAkD;AAElD,sBAAe,UAAO,MAAc;;;;;gBAClC,KAAA,CAAA,KAAA,MAAM;qBACH,OAAO,CAAC,oCAAoC,EAAE,uBAAuB,CAAC,CAAA;qBACtE,YAAY,CAAA;gBAAC,qBAAM,IAAA,kCAAgB,GAAE,EAAA;oBAFxC,sBAAA,cAEgB,SAAwB,EAAC;qBACtC,MAAM,CAAC,UAAgB,EAAgB;wBAAd,YAAY,kBAAA;;;;;;wCACpC,qBAAM,0BAAa,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,EAAA;;oCAA5C,SAA4C,CAAC;oCAC3B,qBAAM,IAAA,8BAAmB,EAAC,YAAY,CAAC,EAAA;;oCAAnD,SAAS,GAAG,SAAuC;oCACxC,qBAAM,IAAA,6BAAkB,EAAC,YAAY,CAAC,EAAA;;oCAAjD,QAAQ,GAAG,SAAsC;oCACvD,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;wCACzB,IAAA,cAAQ,EAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;wCACvC,sBAAO;qCACR;oCAC4B,qBAAM,IAAI,CAAC,MAAM,CAAC;4CAC7C,IAAI,EAAE,UAAU;4CAChB,IAAI,EAAE,kBAAkB;4CACxB,OAAO,EAAE,QAAQ;4CACjB,OAAO,EAAE,uCAAuC;yCACjD,CAAC,EAAA;;oCALM,gBAAgB,GAAK,CAAA,SAK3B,CAAA,iBALsB;oCAOxB,IAAI,CAAC,GAAG,CACN,oEAAoE,CACrE,CAAC;oCACF,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oCACb,gBAAgB,CAAC,OAAO,CAAC,UAAC,CAAS,IAAK,OAAA,KAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAX,CAAW,CAAC,CAAC;oCACrD,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oCACc,qBAAM,IAAI,CAAC,MAAM,CAAC;4CAC3C,IAAI,EAAE,SAAS;4CACf,IAAI,EAAE,gBAAgB;4CACtB,OAAO,EAAE,iBAAiB;yCAC3B,CAAC,EAAA;;oCAJM,cAAc,GAAK,CAAA,SAIzB,CAAA,eAJoB;oCAKtB,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oCACP,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;yCACvB,cAAc,EAAd,wBAAc;0CACsB,EAAhB,qCAAgB;;;yCAAhB,CAAA,8BAAgB,CAAA;oCAA3B,OAAO;oCAChB,qBAAM,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,EAAA;;oCAA5D,SAA4D,CAAC;oCAC7D,IAAI,CAAC,GAAG,CAAC,uBAAgB,OAAO,MAAG,CAAC,CAAC;;;oCAFjB,IAAgB,CAAA;;;;;;iBAKzC,CAAC,EAAA;;;KAAA,EAAC"}
@@ -51,7 +51,7 @@ function triggerCronjob(namespace) {
51
51
  var jobs, jobNames, jobName, cronjob, jobSpec, job, metadata, result, e_1;
52
52
  return __generator(this, function (_a) {
53
53
  switch (_a.label) {
54
- case 0: return [4 /*yield*/, k8sApi_1.k8sApiBatchBeta.listNamespacedCronJob(namespace)];
54
+ case 0: return [4 /*yield*/, (0, k8sApi_1.getk8sApiBatchBeta)().listNamespacedCronJob(namespace)];
55
55
  case 1:
56
56
  jobs = (_a.sent()).body.items;
57
57
  jobNames = jobs.map(function (j) { return j.metadata.name; });
@@ -74,7 +74,7 @@ function triggerCronjob(namespace) {
74
74
  _a.label = 3;
75
75
  case 3:
76
76
  _a.trys.push([3, 5, , 6]);
77
- return [4 /*yield*/, k8sApi_1.k8sApiBatch.createNamespacedJob(namespace, job)];
77
+ return [4 /*yield*/, (0, k8sApi_1.getk8sApiBatch)().createNamespacedJob(namespace, job)];
78
78
  case 4:
79
79
  result = _a.sent();
80
80
  this.log("");
@@ -1 +1 @@
1
- {"version":3,"file":"commandTriggerCronjob.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/commandTriggerCronjob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAA8D;AAG9D,6CAAkE;AAClE,6CAAiD;AACjD,8EAA6E;AAE7E,uDAAiE;AACjE,2DAA2D;AAC3D,wEAAkD;AAElD,SAAe,cAAc,CAAC,SAAiB;;;;;wBAGzC,qBAAM,wBAAe,CAAC,qBAAqB,CAAC,SAAS,CAAC,EAAA;;oBADzC,IAAI,GACjB,CAAA,SAAsD,CAAA,WADrC;oBAGf,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAf,CAAe,CAAC,CAAC;oBAE9B,qBAAM,IAAI,CAAC,MAAM,CAAC;4BACpC,IAAI,EAAE,MAAM;4BACZ,IAAI,EAAE,SAAS;4BACf,OAAO,EAAE,QAAQ;4BACjB,OAAO,EAAE,mBAAmB;yBAC7B,CAAC,EAAA;;oBALM,OAAO,GAAK,CAAA,SAKlB,CAAA,QALa;oBAOT,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,QAAQ,CAAC,IAAI,KAAK,OAAO,EAA3B,CAA2B,CAAC,CAAC;oBACxD,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;oBAExC,GAAG,GAAG,IAAI,mBAAK,EAAE,CAAC;oBAClB,QAAQ,GAA0B;wBACtC,IAAI,EAAE,iBAAU,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,cAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAE;qBACzE,CAAC;oBAEF,GAAG,CAAC,QAAQ,GAAG,QAAwB,CAAC;oBACxC,GAAG,CAAC,IAAI,GAAG,OAAO,CAAC;;;;oBAEF,qBAAM,oBAAW,CAAC,mBAAmB,CAAC,SAAS,EAAE,GAAG,CAAC,EAAA;;oBAA9D,MAAM,GAAG,SAAqD;oBAEpE,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oBACb,IAAI,CAAC,GAAG,CAAC,iDAAgC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAE,CAAC,CAAC;oBACtE,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;;;;oBAEb,IAAA,cAAQ,EAAC,IAAI,EAAE,gBAAgB,EAAE,GAAC,CAAC,IAAI,CAAC,CAAC;;;;;;CAE5C;AACD,sBAAe,UAAO,MAAc;;;;;gBAClC,MAAM;qBACH,OAAO,CAAC,6BAA6B,EAAE,iBAAiB,CAAC;qBACzD,YAAY,CAAC,iDAAuB,CAAC;qBACrC,MAAM,CAAC,UAAgB,EAAa;wBAAX,SAAS,eAAA;;;;wCACjC,qBAAM,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,EAAA;;oCAA1C,SAA0C,CAAC;;;;;iBAC5C,CAAC,CAAC;gBACL,KAAA,CAAA,KAAA,MAAM;qBACH,OAAO,CAAC,wCAAwC,EAAE,iBAAiB,CAAC,CAAA;qBACpE,YAAY,CAAA;gBAAC,qBAAM,IAAA,kCAAgB,GAAE,EAAA;;gBAFxC,cAEgB,SAAwB,EAAC;qBACtC,MAAM,CAAC,UAAgB,EAAgB;wBAAd,YAAY,kBAAA;;;;;wCACpC,qBAAM,0BAAa,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,EAAA;;oCAA5C,SAA4C,CAAC;oCAC3B,qBAAM,IAAA,8BAAmB,EAAC,YAAY,CAAC,EAAA;;oCAAnD,SAAS,GAAG,SAAuC;oCACzD,qBAAM,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,EAAA;;oCAA1C,SAA0C,CAAC;;;;;iBAC5C,CAAC,CAAC;;;;KACN,EAAC"}
1
+ {"version":3,"file":"commandTriggerCronjob.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/commandTriggerCronjob.ts"],"names":[],"mappings":"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"}
@@ -63,10 +63,8 @@ var commandOpenGrafana_1 = __importDefault(require("./commandOpenGrafana"));
63
63
  var commandPortForward_1 = __importDefault(require("./commandPortForward"));
64
64
  var commandTriggerCronjob_1 = __importDefault(require("./commandTriggerCronjob"));
65
65
  var commandOpenGrafanaPod_1 = __importDefault(require("./commandOpenGrafanaPod"));
66
- var commandReloadConfig_1 = __importDefault(require("./commandReloadConfig"));
67
66
  exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void 0, function () {
68
67
  return __generator(this, function (_a) {
69
- (0, commandReloadConfig_1["default"])(vorpal);
70
68
  (0, commandSetup_1["default"])(vorpal);
71
69
  (0, commandEnvVars_1["default"])(vorpal);
72
70
  (0, commandNamespace_1["default"])(vorpal);
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gFAA0D;AAC1D,gFAA0D;AAC1D,kEAA4C;AAC5C,0EAAoD;AACpD,gFAA0D;AAC1D,oEAA8C;AAC9C,0FAAoE;AACpE,sEAAgD;AAChD,sEAAgD;AAChD,gEAA0C;AAC1C,4DAA4D;AAC5D,sEAAgD;AAChD,8EAAwD;AACxD,wEAAkD;AAClD,wFAAkE;AAClE,gFAA0D;AAC1D,oEAA8C;AAC9C,oEAA8C;AAC9C,sEAAgD;AAChD,8EAAwD;AACxD,4EAAsD;AACtD,4EAAsD;AACtD,kFAA4D;AAE5D,kFAA4D;AAC5D,8EAAwD;AAExD,sBAAe,UAAO,MAAc;;QAClC,IAAA,gCAAmB,EAAC,MAAM,CAAC,CAAC;QAC5B,IAAA,yBAAY,EAAC,MAAM,CAAC,CAAC;QAErB,IAAA,2BAAc,EAAC,MAAM,CAAC,CAAC;QAEvB,IAAA,6BAAgB,EAAC,MAAM,CAAC,CAAC;QACzB,IAAA,4BAAe,EAAC,MAAM,CAAC,CAAC;QACxB,IAAA,gCAAmB,EAAC,MAAM,CAAC,CAAC;QAC5B,IAAA,iCAAoB,EAAC,MAAM,CAAC,CAAC;QAE7B,IAAA,iCAAoB,EAAC,MAAM,CAAC,CAAC;QAE7B,IAAA,4BAAe,EAAC,MAAM,CAAC,CAAC;QAExB,IAAA,qCAAwB,EAAC,MAAM,CAAC,CAAC;QAEjC,IAAA,+BAAkB,EAAC,MAAM,CAAC,CAAC;QAC3B,IAAA,kCAAqB,EAAC,MAAM,CAAC,CAAC;QAC9B,IAAA,iCAAoB,EAAC,MAAM,CAAC,CAAC;QAC7B,IAAA,2BAAc,EAAC,MAAM,CAAC,CAAC;QACvB,IAAA,2BAAc,EAAC,MAAM,CAAC,CAAC;QACvB,IAAA,kCAAqB,EAAC,MAAM,CAAC,CAAC;QAC9B,IAAA,iCAAoB,EAAC,MAAM,CAAC,CAAC;QAC7B,IAAA,8BAAiB,EAAC,MAAM,CAAC,CAAC;QAC1B,IAAA,0BAAa,EAAC,MAAM,CAAC,CAAC;QAEtB,IAAA,4BAAe,EAAC,MAAM,CAAC,CAAC;QACxB,IAAA,+BAAkB,EAAC,MAAM,CAAC,CAAC;QAE3B,IAAA,4BAAe,EAAC,MAAM,CAAC,CAAC;QAExB,IAAA,sCAAyB,EAAC,MAAM,CAAC,CAAC;QAClC,IAAA,gCAAmB,EAAC,MAAM,CAAC,CAAC;;;KAC7B,EAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gFAA0D;AAC1D,gFAA0D;AAC1D,kEAA4C;AAC5C,0EAAoD;AACpD,gFAA0D;AAC1D,oEAA8C;AAC9C,0FAAoE;AACpE,sEAAgD;AAChD,sEAAgD;AAChD,gEAA0C;AAC1C,4DAA4D;AAC5D,sEAAgD;AAChD,8EAAwD;AACxD,wEAAkD;AAClD,wFAAkE;AAClE,gFAA0D;AAC1D,oEAA8C;AAC9C,oEAA8C;AAC9C,sEAAgD;AAChD,8EAAwD;AACxD,4EAAsD;AACtD,4EAAsD;AACtD,kFAA4D;AAE5D,kFAA4D;AAE5D,sBAAe,UAAO,MAAc;;QAClC,IAAA,yBAAY,EAAC,MAAM,CAAC,CAAC;QAErB,IAAA,2BAAc,EAAC,MAAM,CAAC,CAAC;QAEvB,IAAA,6BAAgB,EAAC,MAAM,CAAC,CAAC;QACzB,IAAA,4BAAe,EAAC,MAAM,CAAC,CAAC;QACxB,IAAA,gCAAmB,EAAC,MAAM,CAAC,CAAC;QAC5B,IAAA,iCAAoB,EAAC,MAAM,CAAC,CAAC;QAE7B,IAAA,iCAAoB,EAAC,MAAM,CAAC,CAAC;QAE7B,IAAA,4BAAe,EAAC,MAAM,CAAC,CAAC;QAExB,IAAA,qCAAwB,EAAC,MAAM,CAAC,CAAC;QAEjC,IAAA,+BAAkB,EAAC,MAAM,CAAC,CAAC;QAC3B,IAAA,kCAAqB,EAAC,MAAM,CAAC,CAAC;QAC9B,IAAA,iCAAoB,EAAC,MAAM,CAAC,CAAC;QAC7B,IAAA,2BAAc,EAAC,MAAM,CAAC,CAAC;QACvB,IAAA,2BAAc,EAAC,MAAM,CAAC,CAAC;QACvB,IAAA,kCAAqB,EAAC,MAAM,CAAC,CAAC;QAC9B,IAAA,iCAAoB,EAAC,MAAM,CAAC,CAAC;QAC7B,IAAA,8BAAiB,EAAC,MAAM,CAAC,CAAC;QAC1B,IAAA,0BAAa,EAAC,MAAM,CAAC,CAAC;QAEtB,IAAA,4BAAe,EAAC,MAAM,CAAC,CAAC;QACxB,IAAA,+BAAkB,EAAC,MAAM,CAAC,CAAC;QAE3B,IAAA,4BAAe,EAAC,MAAM,CAAC,CAAC;QAExB,IAAA,sCAAyB,EAAC,MAAM,CAAC,CAAC;QAClC,IAAA,gCAAmB,EAAC,MAAM,CAAC,CAAC;;;KAC7B,EAAC"}
@@ -43,16 +43,25 @@ exports.setupAccessTokens = void 0;
43
43
  var open_1 = __importDefault(require("open"));
44
44
  var gitlab_1 = require("../../../../../utils/gitlab");
45
45
  var setupAccessTokens = function (instance) { return __awaiter(void 0, void 0, void 0, function () {
46
- var _a, projectId, projectWebUrl, variables, understood, GL_TOKEN, deploy_tokens;
46
+ var _a, projectId, projectWebUrl, e_1, understood, GL_TOKEN, deploy_tokens;
47
47
  return __generator(this, function (_b) {
48
48
  switch (_b.label) {
49
49
  case 0: return [4 /*yield*/, (0, gitlab_1.getProjectInfo)(instance)];
50
50
  case 1:
51
51
  _a = _b.sent(), projectId = _a.id, projectWebUrl = _a.web_url;
52
- return [4 /*yield*/, (0, gitlab_1.doGitlabRequest)(instance, "projects/".concat(projectId, "/variables"))];
52
+ _b.label = 2;
53
53
  case 2:
54
- variables = _b.sent();
55
- if (!!variables.find(function (v) { return v.key === "GL_TOKEN"; })) return [3 /*break*/, 6];
54
+ _b.trys.push([2, 4, , 8]);
55
+ return [4 /*yield*/, (0, gitlab_1.doGitlabRequest)(instance, "projects/".concat(projectId, "/variables/GL_TOKEN"))];
56
+ case 3:
57
+ _b.sent();
58
+ return [3 /*break*/, 8];
59
+ case 4:
60
+ e_1 = _b.sent();
61
+ if (e_1.message !== "not found") {
62
+ throw e_1;
63
+ }
64
+ // not found
56
65
  instance.log("I need add a GL_TOKEN to the project, so that semantic release will work\n");
57
66
  instance.log("👉 Please please create a project access token in gitlab and copy its value into clipboard\n\n - name: something like 'semantic-release'\n - expires: leave empty\n - scopes: api, read_repository");
58
67
  instance.log("\n");
@@ -62,7 +71,7 @@ var setupAccessTokens = function (instance) { return __awaiter(void 0, void 0, v
62
71
  name: "understood",
63
72
  type: "confirm"
64
73
  })];
65
- case 3:
74
+ case 5:
66
75
  understood = (_b.sent()).understood;
67
76
  if (!understood) {
68
77
  instance.log("continuing anyway...");
@@ -76,29 +85,29 @@ var setupAccessTokens = function (instance) { return __awaiter(void 0, void 0, v
76
85
  name: "GL_TOKEN",
77
86
  message: "Access Token: "
78
87
  })];
79
- case 4:
88
+ case 6:
80
89
  GL_TOKEN = (_b.sent()).GL_TOKEN;
81
90
  return [4 /*yield*/, (0, gitlab_1.doGitlabRequest)(instance, "projects/".concat(projectId, "/variables"), {
82
91
  key: "GL_TOKEN",
83
92
  value: GL_TOKEN
84
93
  })];
85
- case 5:
86
- _b.sent();
87
- _b.label = 6;
88
- case 6: return [4 /*yield*/, (0, gitlab_1.doGitlabRequest)(instance, "projects/".concat(projectId, "/deploy_tokens"))];
89
94
  case 7:
95
+ _b.sent();
96
+ return [3 /*break*/, 8];
97
+ case 8: return [4 /*yield*/, (0, gitlab_1.doGitlabRequest)(instance, "projects/".concat(projectId, "/deploy_tokens"))];
98
+ case 9:
90
99
  deploy_tokens = _b.sent();
91
- if (!!deploy_tokens.find(function (v) { return v.name === "gitlab-deploy-token"; })) return [3 /*break*/, 9];
100
+ if (!!deploy_tokens.find(function (v) { return v.name === "gitlab-deploy-token"; })) return [3 /*break*/, 11];
92
101
  instance.log("I will setup the 'GitLab Deploy Token', so Kubernetes can pull images from this project.");
93
102
  return [4 /*yield*/, (0, gitlab_1.doGitlabRequest)(instance, "projects/".concat(projectId, "/deploy_tokens"), {
94
103
  id: projectId,
95
104
  name: "gitlab-deploy-token",
96
105
  scopes: ["read_registry"]
97
106
  })];
98
- case 8:
107
+ case 10:
99
108
  _b.sent();
100
- _b.label = 9;
101
- case 9: return [2 /*return*/];
109
+ _b.label = 11;
110
+ case 11: return [2 /*return*/];
102
111
  }
103
112
  });
104
113
  }); };
@@ -1 +1 @@
1
- {"version":3,"file":"setupAccessTokens.js","sourceRoot":"","sources":["../../../../../../src/apps/cli/commands/project/setup/setupAccessTokens.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAwB;AAExB,sDAA8E;AAEvE,IAAM,iBAAiB,GAAG,UAAO,QAAyB;;;;oBACb,qBAAM,IAAA,uBAAc,EACpE,QAAQ,CACT,EAAA;;gBAFK,KAA4C,SAEjD,EAFW,SAAS,QAAA,EAAW,aAAa,aAAA;gBAG3B,qBAAM,IAAA,wBAAe,EACrC,QAAQ,EACR,mBAAY,SAAS,eAAY,CAClC,EAAA;;gBAHK,SAAS,GAAG,SAGjB;qBAEG,CAAC,SAAS,CAAC,IAAI,CAAC,UAAC,CAAM,IAAK,OAAA,CAAC,CAAC,GAAG,KAAK,UAAU,EAApB,CAAoB,CAAC,EAAjD,wBAAiD;gBACnD,QAAQ,CAAC,GAAG,CACV,4EAA4E,CAC7E,CAAC;gBACF,QAAQ,CAAC,GAAG,CACV,oMAAoM,CACrM,CAAC;gBACF,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBAEI,qBAAM,QAAQ,CAAC,MAAM,CAAC;wBAC3C,SAAO,EAAE,IAAI;wBACb,OAAO,EAAE,oCAAoC;wBAC7C,IAAI,EAAE,YAAY;wBAClB,IAAI,EAAE,SAAS;qBAChB,CAAC,EAAA;;gBALM,UAAU,GAAK,CAAA,SAKrB,CAAA,WALgB;gBAMlB,IAAI,CAAC,UAAU,EAAE;oBACf,QAAQ,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;iBACtC;gBACD,IAAA,iBAAI,EAAC,UAAG,aAAa,8BAA2B,CAAC,CAAC;gBAElD,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBAEnB,QAAQ,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAC;gBAE9C,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBACE,qBAAM,QAAQ,CAAC,MAAM,CAAC;wBACzC,IAAI,EAAE,UAAU;wBAChB,IAAI,EAAE,UAAU;wBAChB,OAAO,EAAE,gBAAgB;qBAC1B,CAAC,EAAA;;gBAJM,QAAQ,GAAK,CAAA,SAInB,CAAA,SAJc;gBAKhB,qBAAM,IAAA,wBAAe,EAAC,QAAQ,EAAE,mBAAY,SAAS,eAAY,EAAE;wBACjE,GAAG,EAAE,UAAU;wBACf,KAAK,EAAE,QAAQ;qBAChB,CAAC,EAAA;;gBAHF,SAGE,CAAC;;oBAGiB,qBAAM,IAAA,wBAAe,EACzC,QAAQ,EACR,mBAAY,SAAS,mBAAgB,CACtC,EAAA;;gBAHK,aAAa,GAAG,SAGrB;qBAGC,CAAC,aAAa,CAAC,IAAI,CACjB,UAAC,CAAmB,IAAK,OAAA,CAAC,CAAC,IAAI,KAAK,qBAAqB,EAAhC,CAAgC,CAC1D,EAFD,wBAEC;gBAED,QAAQ,CAAC,GAAG,CACV,0FAA0F,CAC3F,CAAC;gBAEF,qBAAM,IAAA,wBAAe,EAAC,QAAQ,EAAE,mBAAY,SAAS,mBAAgB,EAAE;wBACrE,EAAE,EAAE,SAAS;wBACb,IAAI,EAAE,qBAAqB;wBAC3B,MAAM,EAAE,CAAC,eAAe,CAAC;qBAC1B,CAAC,EAAA;;gBAJF,SAIE,CAAC;;;;;KAEN,CAAC;AAjEW,QAAA,iBAAiB,qBAiE5B"}
1
+ {"version":3,"file":"setupAccessTokens.js","sourceRoot":"","sources":["../../../../../../src/apps/cli/commands/project/setup/setupAccessTokens.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAwB;AAExB,sDAA8E;AAEvE,IAAM,iBAAiB,GAAG,UAAO,QAAyB;;;;oBACb,qBAAM,IAAA,uBAAc,EACpE,QAAQ,CACT,EAAA;;gBAFK,KAA4C,SAEjD,EAFW,SAAS,QAAA,EAAW,aAAa,aAAA;;;;gBAI3C,qBAAM,IAAA,wBAAe,EAAC,QAAQ,EAAE,mBAAY,SAAS,wBAAqB,CAAC,EAAA;;gBAA3E,SAA2E,CAAC;;;;gBAE5E,IAAI,GAAC,CAAC,OAAO,KAAK,WAAW,EAAE;oBAC7B,MAAM,GAAC,CAAC;iBACT;gBACD,YAAY;gBAEZ,QAAQ,CAAC,GAAG,CACV,4EAA4E,CAC7E,CAAC;gBACF,QAAQ,CAAC,GAAG,CACV,oMAAoM,CACrM,CAAC;gBACF,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBAEI,qBAAM,QAAQ,CAAC,MAAM,CAAC;wBAC3C,SAAO,EAAE,IAAI;wBACb,OAAO,EAAE,oCAAoC;wBAC7C,IAAI,EAAE,YAAY;wBAClB,IAAI,EAAE,SAAS;qBAChB,CAAC,EAAA;;gBALM,UAAU,GAAK,CAAA,SAKrB,CAAA,WALgB;gBAMlB,IAAI,CAAC,UAAU,EAAE;oBACf,QAAQ,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;iBACtC;gBACD,IAAA,iBAAI,EAAC,UAAG,aAAa,8BAA2B,CAAC,CAAC;gBAElD,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBAEnB,QAAQ,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAC;gBAE9C,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBACE,qBAAM,QAAQ,CAAC,MAAM,CAAC;wBACzC,IAAI,EAAE,UAAU;wBAChB,IAAI,EAAE,UAAU;wBAChB,OAAO,EAAE,gBAAgB;qBAC1B,CAAC,EAAA;;gBAJM,QAAQ,GAAK,CAAA,SAInB,CAAA,SAJc;gBAKhB,qBAAM,IAAA,wBAAe,EAAC,QAAQ,EAAE,mBAAY,SAAS,eAAY,EAAE;wBACjE,GAAG,EAAE,UAAU;wBACf,KAAK,EAAE,QAAQ;qBAChB,CAAC,EAAA;;gBAHF,SAGE,CAAC;;oBAGiB,qBAAM,IAAA,wBAAe,EACzC,QAAQ,EACR,mBAAY,SAAS,mBAAgB,CACtC,EAAA;;gBAHK,aAAa,GAAG,SAGrB;qBAGC,CAAC,aAAa,CAAC,IAAI,CACjB,UAAC,CAAmB,IAAK,OAAA,CAAC,CAAC,IAAI,KAAK,qBAAqB,EAAhC,CAAgC,CAC1D,EAFD,yBAEC;gBAED,QAAQ,CAAC,GAAG,CACV,0FAA0F,CAC3F,CAAC;gBAEF,qBAAM,IAAA,wBAAe,EAAC,QAAQ,EAAE,mBAAY,SAAS,mBAAgB,EAAE;wBACrE,EAAE,EAAE,SAAS;wBACb,IAAI,EAAE,qBAAqB;wBAC3B,MAAM,EAAE,CAAC,eAAe,CAAC;qBAC1B,CAAC,EAAA;;gBAJF,SAIE,CAAC;;;;;KAEN,CAAC;AAnEW,QAAA,iBAAiB,qBAmE5B"}
@@ -46,17 +46,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
46
46
  if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
47
47
  }
48
48
  };
49
- var __importDefault = (this && this.__importDefault) || function (mod) {
50
- return (mod && mod.__esModule) ? mod : { "default": mod };
51
- };
52
49
  exports.__esModule = true;
53
50
  var pipeline_1 = require("@catladder/pipeline");
54
51
  var client_node_1 = require("@kubernetes/client-node");
55
- var k8sApi_1 = __importDefault(require("../../../../../k8sApi"));
52
+ var k8sApi_1 = require("../../../../../k8sApi");
56
53
  function default_1(context) {
57
54
  var _a, _b, _c, _d, _e;
58
55
  return __awaiter(this, void 0, void 0, function () {
59
- var namespace, namespaceBody, metadata, e_1;
56
+ var namespace, namespaceBody, metadata, k8sApi, e_1;
60
57
  return __generator(this, function (_f) {
61
58
  switch (_f.label) {
62
59
  case 0:
@@ -75,13 +72,14 @@ function default_1(context) {
75
72
  }))), ((_b = (_a = context.fullConfig.meta) === null || _a === void 0 ? void 0 : _a.labels) !== null && _b !== void 0 ? _b : {}))
76
73
  };
77
74
  namespaceBody.metadata = metadata;
75
+ k8sApi = (0, k8sApi_1.getk8sApi)();
78
76
  _f.label = 1;
79
77
  case 1:
80
78
  _f.trys.push([1, 4, , 8]);
81
- return [4 /*yield*/, k8sApi_1["default"].readNamespace(namespace)];
79
+ return [4 /*yield*/, k8sApi.readNamespace(namespace)];
82
80
  case 2:
83
81
  _f.sent();
84
- return [4 /*yield*/, k8sApi_1["default"].patchNamespace(namespace, namespaceBody, undefined, undefined, undefined, undefined, { headers: { "content-type": "application/merge-patch+json" } } // see https://github.com/kubernetes-client/javascript/issues/443
82
+ return [4 /*yield*/, k8sApi.patchNamespace(namespace, namespaceBody, undefined, undefined, undefined, undefined, { headers: { "content-type": "application/merge-patch+json" } } // see https://github.com/kubernetes-client/javascript/issues/443
85
83
  )];
86
84
  case 3:
87
85
  _f.sent(); // update meta data
@@ -89,7 +87,7 @@ function default_1(context) {
89
87
  case 4:
90
88
  e_1 = _f.sent();
91
89
  if (!(((_d = (_c = e_1.response) === null || _c === void 0 ? void 0 : _c.body) === null || _d === void 0 ? void 0 : _d.reason) === "NotFound")) return [3 /*break*/, 6];
92
- return [4 /*yield*/, k8sApi_1["default"].createNamespace(namespaceBody)];
90
+ return [4 /*yield*/, k8sApi.createNamespace(namespaceBody)];
93
91
  case 5:
94
92
  _f.sent();
95
93
  return [3 /*break*/, 7];