@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
@@ -1 +1 @@
1
- {"version":3,"file":"ensureNamespace.js","sourceRoot":"","sources":["../../../../../../src/apps/cli/commands/project/utils/ensureNamespace.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAsE;AACtE,uDAAoE;AACpE,iEAA2C;AAE3C,mBAA+B,OAAgB;;;;;;;oBACvC,SAAS,GAAG,IAAA,iCAAsB,EACtC,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,WAAW,CAAC,SAAS,CAC9B,CAAC;oBACI,aAAa,GAAG,IAAI,yBAAW,EAAE,CAAC;oBAClC,QAAQ,GAAiB;wBAC7B,IAAI,EAAE,SAAS;wBACf,MAAM,sBACJ,YAAY,EAAE,OAAO,CAAC,UAAU,CAAC,YAAY,EAC7C,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,EACnC,WAAW,EAAE,OAAO,CAAC,WAAW,CAAC,SAAS,EAC1C,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAChE,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC;iCACrD,GAAG,CAAC,UAAC,MAAM,IAAK,OAAA,MAAM,CAAC,KAAK,CAAC,IAAI,EAAjB,CAAiB,CAAC;iCAClC,IAAI,CAAC,GAAG,CAAC,IACT,MAAM,CAAC,WAAW,CACnB,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,GAAG,CAC/C,UAAC,EAAuB;gCAAtB,aAAa,QAAA,EAAE,MAAM,QAAA;4BAAM,OAAA;gCAC3B,YAAY,GAAG,aAAa;gCAC5B,MAAM,CAAC,KAAK,CAAC,IAAI;6BAClB;wBAH4B,CAG5B,CACF,CACF,GACE,CAAC,MAAA,MAAA,OAAO,CAAC,UAAU,CAAC,IAAI,0CAAE,MAAM,mCAAI,EAAE,CAAC,CAC3C;qBACF,CAAC;oBAEF,aAAa,CAAC,QAAQ,GAAG,QAAQ,CAAC;;;;oBAEhC,qBAAM,mBAAM,CAAC,aAAa,CAAC,SAAS,CAAC,EAAA;;oBAArC,SAAqC,CAAC;oBAEtC,qBAAM,mBAAM,CAAC,cAAc,CACzB,SAAS,EACT,aAAa,EACb,SAAS,EACT,SAAS,EACT,SAAS,EACT,SAAS,EACT,EAAE,OAAO,EAAE,EAAE,cAAc,EAAE,8BAA8B,EAAE,EAAE,CAAC,iEAAiE;yBAClI,EAAA;;oBARD,SAQC,CAAC,CAAC,mBAAmB;;;;yBAElB,CAAA,CAAA,MAAA,MAAA,GAAC,CAAC,QAAQ,0CAAE,IAAI,0CAAE,MAAM,MAAK,UAAU,CAAA,EAAvC,wBAAuC;oBACzC,qBAAM,mBAAM,CAAC,eAAe,CAAC,aAAa,CAAC,EAAA;;oBAA3C,SAA2C,CAAC;;;oBAE5C,OAAO,CAAC,KAAK,CAAC,MAAA,GAAC,CAAC,QAAQ,0CAAE,IAAI,CAAC,CAAC;oBAChC,MAAM,GAAC,CAAC;;wBAGZ,sBAAO,SAAS,EAAC;;;;CAClB;AAlDD,+BAkDC"}
1
+ {"version":3,"file":"ensureNamespace.js","sourceRoot":"","sources":["../../../../../../src/apps/cli/commands/project/utils/ensureNamespace.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAsE;AACtE,uDAAoE;AACpE,gDAAkD;AAElD,mBAA+B,OAAgB;;;;;;;oBACvC,SAAS,GAAG,IAAA,iCAAsB,EACtC,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,WAAW,CAAC,SAAS,CAC9B,CAAC;oBACI,aAAa,GAAG,IAAI,yBAAW,EAAE,CAAC;oBAClC,QAAQ,GAAiB;wBAC7B,IAAI,EAAE,SAAS;wBACf,MAAM,sBACJ,YAAY,EAAE,OAAO,CAAC,UAAU,CAAC,YAAY,EAC7C,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,EACnC,WAAW,EAAE,OAAO,CAAC,WAAW,CAAC,SAAS,EAC1C,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAChE,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC;iCACrD,GAAG,CAAC,UAAC,MAAM,IAAK,OAAA,MAAM,CAAC,KAAK,CAAC,IAAI,EAAjB,CAAiB,CAAC;iCAClC,IAAI,CAAC,GAAG,CAAC,IACT,MAAM,CAAC,WAAW,CACnB,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,GAAG,CAC/C,UAAC,EAAuB;gCAAtB,aAAa,QAAA,EAAE,MAAM,QAAA;4BAAM,OAAA;gCAC3B,YAAY,GAAG,aAAa;gCAC5B,MAAM,CAAC,KAAK,CAAC,IAAI;6BAClB;wBAH4B,CAG5B,CACF,CACF,GACE,CAAC,MAAA,MAAA,OAAO,CAAC,UAAU,CAAC,IAAI,0CAAE,MAAM,mCAAI,EAAE,CAAC,CAC3C;qBACF,CAAC;oBAEF,aAAa,CAAC,QAAQ,GAAG,QAAQ,CAAC;oBAC5B,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;;;;oBAEzB,qBAAM,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,EAAA;;oBAArC,SAAqC,CAAC;oBAEtC,qBAAM,MAAM,CAAC,cAAc,CACzB,SAAS,EACT,aAAa,EACb,SAAS,EACT,SAAS,EACT,SAAS,EACT,SAAS,EACT,EAAE,OAAO,EAAE,EAAE,cAAc,EAAE,8BAA8B,EAAE,EAAE,CAAC,iEAAiE;yBAClI,EAAA;;oBARD,SAQC,CAAC,CAAC,mBAAmB;;;;yBAElB,CAAA,CAAA,MAAA,MAAA,GAAC,CAAC,QAAQ,0CAAE,IAAI,0CAAE,MAAM,MAAK,UAAU,CAAA,EAAvC,wBAAuC;oBACzC,qBAAM,MAAM,CAAC,eAAe,CAAC,aAAa,CAAC,EAAA;;oBAA3C,SAA2C,CAAC;;;oBAE5C,OAAO,CAAC,KAAK,CAAC,MAAA,GAAC,CAAC,QAAQ,0CAAE,IAAI,CAAC,CAAC;oBAChC,MAAM,GAAC,CAAC;;wBAGZ,sBAAO,SAAS,EAAC;;;;CAClB;AAnDD,+BAmDC"}
@@ -41,7 +41,6 @@ var child_process_promise_1 = require("child-process-promise");
41
41
  var fs_extra_1 = require("fs-extra");
42
42
  var js_yaml_1 = require("js-yaml");
43
43
  var prettier_1 = require("prettier");
44
- var getProjectConfig_1 = require("../../../config/getProjectConfig");
45
44
  var projects_1 = require("../../../utils/projects");
46
45
  var writeConfig = function (vorpal, config, options) { return __awaiter(void 0, void 0, void 0, function () {
47
46
  var gitRoot, TS, configType, file, content, file, content;
@@ -96,9 +95,7 @@ var writeConfig = function (vorpal, config, options) { return __awaiter(void 0,
96
95
  case 8:
97
96
  _a.sent();
98
97
  _a.label = 9;
99
- case 9: return [4 /*yield*/, (0, getProjectConfig_1.reloadConfig)()];
100
- case 10:
101
- _a.sent();
98
+ case 9:
102
99
  vorpal.log("done!");
103
100
  vorpal.log("");
104
101
  return [2 /*return*/];
@@ -1 +1 @@
1
- {"version":3,"file":"writeConfig.js","sourceRoot":"","sources":["../../../../src/apps/cli/config/writeConfig.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,+DAAoD;AACpD,qCAAqC;AACrC,mCAA+B;AAC/B,qCAAkC;AAElC,qEAAgE;AAChE,oDAAqD;AAE9C,IAAM,WAAW,GAAG,UACzB,MAAuB,EACvB,MAAc,EACd,OAEC;;;;oBAEe,qBAAM,IAAA,qBAAU,GAAE,EAAA;;gBAA5B,OAAO,GAAG,SAAkB;gBAC5B,EAAE,GAAG,0BAA0B,CAAC;gBACf,qBAAM,MAAM,CAAC,MAAM,CAAC;wBACzC,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,YAAY;wBAClB,OAAO,EAAE,CAAC,EAAE,EAAE,MAAM,CAAC;wBACrB,OAAO,EAAE,4CAA4C;qBACtD,CAAC,EAAA;;gBALM,UAAU,GAAK,CAAA,SAKrB,CAAA,WALgB;gBAMlB,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;qBACX,CAAA,UAAU,KAAK,EAAE,CAAA,EAAjB,wBAAiB;gBACb,IAAI,GAAG,OAAO,GAAG,eAAe,CAAC;gBACjC,OAAO,GAAG,IAAA,iBAAM,EACpB,6GAGyB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,+DAK7C,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU,EAAC,CAAC,CAAC,YAAK,OAAO,CAAC,UAAU,OAAI,CAAC,CAAC,CAAC,EAAE,qBAEvD,EACD;oBACE,MAAM,EAAE,OAAO;iBAChB,CACF,CAAC;gBAEF,qBAAM,IAAA,oBAAS,EAAC,IAAI,EAAE,OAAO,EAAE;wBAC7B,QAAQ,EAAE,OAAO;qBAClB,CAAC,EAAA;;gBAFF,SAEE,CAAC;gBACH,MAAM,CAAC,GAAG,CAAC,qCAAqC,CAAC,CAAC;gBAClD,qBAAM,IAAA,6BAAK,EAAC,oDAAoD,EAAE;wBAChE,KAAK,EAAE,IAAI;qBACZ,CAAC,EAAA;;gBAFF,SAEE,CAAC;gBACH,qBAAM,IAAA,4BAAI,EAAC,UAAU,GAAG,IAAI,CAAC,EAAA;;gBAA7B,SAA6B,CAAC;;;gBAExB,IAAI,GAAG,OAAO,GAAG,gBAAgB,CAAC;gBAClC,OAAO,GAAG,IAAA,cAAI,EAAC,MAAM,CAAC,CAAC;gBAE7B,qBAAM,IAAA,oBAAS,EACb,IAAI,EACJ,OAAO;wBACL,MAAM;wBACN,CAAC,OAAO,CAAC,UAAU;4BACjB,CAAC,CAAC,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC;4BACpD,CAAC,CAAC,EAAE,CAAC,EACT;wBACE,QAAQ,EAAE,OAAO;qBAClB,CACF,EAAA;;gBAVD,SAUC,CAAC;gBACF,qBAAM,IAAA,4BAAI,EAAC,UAAU,GAAG,IAAI,CAAC,EAAA;;gBAA7B,SAA6B,CAAC;;oBAEhC,qBAAM,IAAA,+BAAY,GAAE,EAAA;;gBAApB,SAAoB,CAAC;gBACrB,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBACpB,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;;;;KAChB,CAAC;AA/DW,QAAA,WAAW,eA+DtB"}
1
+ {"version":3,"file":"writeConfig.js","sourceRoot":"","sources":["../../../../src/apps/cli/config/writeConfig.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,+DAAoD;AACpD,qCAAqC;AACrC,mCAA+B;AAC/B,qCAAkC;AAElC,oDAAqD;AAE9C,IAAM,WAAW,GAAG,UACzB,MAAuB,EACvB,MAAc,EACd,OAEC;;;;oBAEe,qBAAM,IAAA,qBAAU,GAAE,EAAA;;gBAA5B,OAAO,GAAG,SAAkB;gBAC5B,EAAE,GAAG,0BAA0B,CAAC;gBACf,qBAAM,MAAM,CAAC,MAAM,CAAC;wBACzC,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,YAAY;wBAClB,OAAO,EAAE,CAAC,EAAE,EAAE,MAAM,CAAC;wBACrB,OAAO,EAAE,4CAA4C;qBACtD,CAAC,EAAA;;gBALM,UAAU,GAAK,CAAA,SAKrB,CAAA,WALgB;gBAMlB,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;qBACX,CAAA,UAAU,KAAK,EAAE,CAAA,EAAjB,wBAAiB;gBACb,IAAI,GAAG,OAAO,GAAG,eAAe,CAAC;gBACjC,OAAO,GAAG,IAAA,iBAAM,EACpB,6GAGyB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,+DAK7C,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU,EAAC,CAAC,CAAC,YAAK,OAAO,CAAC,UAAU,OAAI,CAAC,CAAC,CAAC,EAAE,qBAEvD,EACD;oBACE,MAAM,EAAE,OAAO;iBAChB,CACF,CAAC;gBAEF,qBAAM,IAAA,oBAAS,EAAC,IAAI,EAAE,OAAO,EAAE;wBAC7B,QAAQ,EAAE,OAAO;qBAClB,CAAC,EAAA;;gBAFF,SAEE,CAAC;gBACH,MAAM,CAAC,GAAG,CAAC,qCAAqC,CAAC,CAAC;gBAClD,qBAAM,IAAA,6BAAK,EAAC,oDAAoD,EAAE;wBAChE,KAAK,EAAE,IAAI;qBACZ,CAAC,EAAA;;gBAFF,SAEE,CAAC;gBACH,qBAAM,IAAA,4BAAI,EAAC,UAAU,GAAG,IAAI,CAAC,EAAA;;gBAA7B,SAA6B,CAAC;;;gBAExB,IAAI,GAAG,OAAO,GAAG,gBAAgB,CAAC;gBAClC,OAAO,GAAG,IAAA,cAAI,EAAC,MAAM,CAAC,CAAC;gBAE7B,qBAAM,IAAA,oBAAS,EACb,IAAI,EACJ,OAAO;wBACL,MAAM;wBACN,CAAC,OAAO,CAAC,UAAU;4BACjB,CAAC,CAAC,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC;4BACpD,CAAC,CAAC,EAAE,CAAC,EACT;wBACE,QAAQ,EAAE,OAAO;qBAClB,CACF,EAAA;;gBAVD,SAUC,CAAC;gBACF,qBAAM,IAAA,4BAAI,EAAC,UAAU,GAAG,IAAI,CAAC,EAAA;;gBAA7B,SAA6B,CAAC;;;gBAEhC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBACpB,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;;;;KAChB,CAAC;AA9DW,QAAA,WAAW,eA8DtB"}
@@ -1,7 +1,6 @@
1
+ import { Config } from "@catladder/pipeline";
1
2
  import { CommandInstance } from "vorpal";
2
- import memoizee from "memoizee";
3
- export declare const getProjectConfig: (() => Promise<import("@catladder/pipeline").Config>) & memoizee.Memoized<() => Promise<import("@catladder/pipeline").Config>>;
4
- export declare const reloadConfig: () => Promise<import("@catladder/pipeline").Config>;
3
+ export declare const getProjectConfig: () => Promise<Config>;
5
4
  export declare const getGitlabCiFilePath: () => Promise<string>;
6
5
  export declare const getGitlabCi: <T = Record<string, any>>() => Promise<T>;
7
6
  export declare const getProjectComponents: () => Promise<string[]>;
@@ -19,6 +18,7 @@ export declare const getAllComponentsWithAllEnvsHierarchical: () => Promise<{
19
18
  }>;
20
19
  export declare const getAllPipelineContexts: () => Promise<import("@catladder/pipeline").Context[]>;
21
20
  export declare const getEnvironment: (env: string, componentName: string) => Promise<import("@catladder/pipeline").Environment>;
21
+ export declare const getGitlabVar: (vorpal: CommandInstance, env: string, componentName: string, variableName: string) => Promise<string>;
22
22
  export declare const getEnvVars: (vorpal: CommandInstance, env: string, componentName: string) => Promise<{
23
23
  [k: string]: string;
24
24
  }>;
@@ -35,37 +35,53 @@ 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
- exports.getEnvVars = exports.getEnvironment = exports.getAllPipelineContexts = exports.getAllComponentsWithAllEnvsHierarchical = exports.getAllComponentsWithAllEnvsFlat = exports.getPipelineContextByChoice = exports.parseChoice = exports.getProjectComponents = exports.getGitlabCi = exports.getGitlabCiFilePath = exports.reloadConfig = exports.getProjectConfig = void 0;
39
+ exports.getEnvVars = exports.getGitlabVar = exports.getEnvironment = exports.getAllPipelineContexts = exports.getAllComponentsWithAllEnvsHierarchical = exports.getAllComponentsWithAllEnvsFlat = exports.getPipelineContextByChoice = exports.parseChoice = exports.getProjectComponents = exports.getGitlabCi = exports.getGitlabCiFilePath = exports.getProjectConfig = void 0;
43
40
  var pipeline_1 = require("@catladder/pipeline");
44
41
  var gitlab_1 = require("../utils/gitlab");
45
- var memoizee_1 = __importDefault(require("memoizee"));
46
42
  var projects_1 = require("../utils/projects");
47
43
  var files_1 = require("../utils/files");
48
- // currently cant change
49
- exports.getProjectConfig = (0, memoizee_1["default"])(function () { return __awaiter(void 0, void 0, void 0, function () {
50
- var gitRoot, e_1;
44
+ var fs_1 = require("fs");
45
+ var currentConfig = null;
46
+ // reload the config on change
47
+ var reloadConfigAndObserve = function () { return __awaiter(void 0, void 0, void 0, function () {
48
+ var gitRoot, result, config, path, watcher;
51
49
  return __generator(this, function (_a) {
52
50
  switch (_a.label) {
53
- case 0:
54
- _a.trys.push([0, 2, , 3]);
55
- return [4 /*yield*/, (0, projects_1.getGitRoot)()];
51
+ case 0: return [4 /*yield*/, (0, projects_1.getGitRoot)()];
56
52
  case 1:
57
53
  gitRoot = _a.sent();
58
- return [2 /*return*/, (0, pipeline_1.readConfigSync)(gitRoot)];
59
- case 2:
60
- e_1 = _a.sent();
61
- // ignore
62
- return [2 /*return*/, null];
63
- case 3: return [2 /*return*/];
54
+ result = (0, pipeline_1.readConfigSync)(gitRoot);
55
+ if (!result) {
56
+ // can't do anything, there is no config
57
+ return [2 /*return*/];
58
+ }
59
+ config = result.config, path = result.path;
60
+ watcher = (0, fs_1.watch)(path, function () {
61
+ watcher.close();
62
+ reloadConfigAndObserve();
63
+ });
64
+ currentConfig = config;
65
+ return [2 /*return*/];
64
66
  }
65
67
  });
66
- }); }, { promise: true });
67
- var reloadConfig = function () { return exports.getProjectConfig.clear(); };
68
- exports.reloadConfig = reloadConfig;
68
+ }); };
69
+ var getProjectConfig = function () { return __awaiter(void 0, void 0, void 0, function () {
70
+ return __generator(this, function (_a) {
71
+ switch (_a.label) {
72
+ case 0:
73
+ if (!!currentConfig) return [3 /*break*/, 2];
74
+ // initially
75
+ return [4 /*yield*/, reloadConfigAndObserve()];
76
+ case 1:
77
+ // initially
78
+ _a.sent();
79
+ _a.label = 2;
80
+ case 2: return [2 /*return*/, currentConfig];
81
+ }
82
+ });
83
+ }); };
84
+ exports.getProjectConfig = getProjectConfig;
69
85
  var getGitlabCiFilePath = function () { return __awaiter(void 0, void 0, void 0, function () {
70
86
  var gitRoot;
71
87
  return __generator(this, function (_a) {
@@ -79,7 +95,7 @@ var getGitlabCiFilePath = function () { return __awaiter(void 0, void 0, void 0,
79
95
  }); };
80
96
  exports.getGitlabCiFilePath = getGitlabCiFilePath;
81
97
  var getGitlabCi = function () { return __awaiter(void 0, void 0, void 0, function () {
82
- var _a, e_2;
98
+ var _a, e_1;
83
99
  return __generator(this, function (_b) {
84
100
  switch (_b.label) {
85
101
  case 0:
@@ -88,7 +104,7 @@ var getGitlabCi = function () { return __awaiter(void 0, void 0, void 0, functio
88
104
  return [4 /*yield*/, (0, exports.getGitlabCiFilePath)()];
89
105
  case 1: return [2 /*return*/, _a.apply(void 0, [_b.sent()])];
90
106
  case 2:
91
- e_2 = _b.sent();
107
+ e_1 = _b.sent();
92
108
  // ignore
93
109
  return [2 /*return*/, null];
94
110
  case 3: return [2 /*return*/];
@@ -191,6 +207,18 @@ var getEnvironment = function (env, componentName) { return __awaiter(void 0, vo
191
207
  });
192
208
  }); };
193
209
  exports.getEnvironment = getEnvironment;
210
+ var getGitlabVar = function (vorpal, env, componentName, variableName) { return __awaiter(void 0, void 0, void 0, function () {
211
+ var rawVariableName;
212
+ return __generator(this, function (_a) {
213
+ switch (_a.label) {
214
+ case 0:
215
+ rawVariableName = (0, pipeline_1.getSecretVarName)(env, componentName, variableName);
216
+ return [4 /*yield*/, (0, gitlab_1.getVariableValueByRawName)(vorpal, rawVariableName)];
217
+ case 1: return [2 /*return*/, _a.sent()];
218
+ }
219
+ });
220
+ }); };
221
+ exports.getGitlabVar = getGitlabVar;
194
222
  var resolveSecrets = function (vorpal, allEnvVars) { return __awaiter(void 0, void 0, void 0, function () {
195
223
  var allVariablesInGitlab;
196
224
  return __generator(this, function (_a) {
@@ -201,16 +229,13 @@ var resolveSecrets = function (vorpal, allEnvVars) { return __awaiter(void 0, vo
201
229
  return [2 /*return*/, Object.fromEntries(Object.entries(allEnvVars).map(function (_a) {
202
230
  var _b, _c;
203
231
  var key = _a[0], value = _a[1];
204
- var isSecret = (_c = (_b = String(value)) === null || _b === void 0 ? void 0 : _b.startsWith) === null || _c === void 0 ? void 0 : _c.call(_b, "$CL_");
205
- if (isSecret) {
206
- // secrets have CL_XXXX structure
207
- var found = allVariablesInGitlab.find(function (v) { return "$" + v.key === value; });
208
- if (found) {
209
- return [key, found.value];
210
- }
211
- else {
212
- return [key, ""];
232
+ var containsSecret = (_c = (_b = String(value)) === null || _b === void 0 ? void 0 : _b.includes) === null || _c === void 0 ? void 0 : _c.call(_b, "$CL_");
233
+ if (containsSecret) {
234
+ for (var _i = 0, allVariablesInGitlab_1 = allVariablesInGitlab; _i < allVariablesInGitlab_1.length; _i++) {
235
+ var variable = allVariablesInGitlab_1[_i];
236
+ value = value.replace(new RegExp("\\$" + variable.key, "g"), variable.value);
213
237
  }
238
+ return [key, value];
214
239
  }
215
240
  return [key, value];
216
241
  }))];
@@ -224,6 +249,8 @@ var getEnvVars = function (vorpal, env, componentName) { return __awaiter(void 0
224
249
  case 0: return [4 /*yield*/, (0, exports.getEnvironment)(env, componentName)];
225
250
  case 1:
226
251
  envionment = _a.sent();
252
+ // in the pipeline the secrets alreadyy exists and bash will expand them
253
+ // but here we need to manually load them
227
254
  return [2 /*return*/, resolveSecrets(vorpal, envionment.envVars)];
228
255
  }
229
256
  });
@@ -1 +1 @@
1
- {"version":3,"file":"getProjectConfig.js","sourceRoot":"","sources":["../../src/config/getProjectConfig.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"getProjectConfig.js","sourceRoot":"","sources":["../../src/config/getProjectConfig.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,8 @@
1
1
  import { CoreV1Api, BatchV1Api, BatchV1beta1Api } from "@kubernetes/client-node";
2
- export declare const reload: () => void;
3
- declare const k8sApi: CoreV1Api;
4
- export declare const k8sApiBatch: BatchV1Api;
5
- export declare const k8sApiBatchBeta: BatchV1beta1Api;
6
- export default k8sApi;
2
+ /**
3
+ * get kubernetes client. avoid reusing the instance when context get changed
4
+ * @returns kuberenetes client
5
+ */
6
+ export declare const getk8sApi: () => CoreV1Api;
7
+ export declare const getk8sApiBatch: () => BatchV1Api;
8
+ export declare const getk8sApiBatchBeta: () => BatchV1beta1Api;
@@ -1,15 +1,29 @@
1
1
  "use strict";
2
2
  exports.__esModule = true;
3
- exports.k8sApiBatchBeta = exports.k8sApiBatch = exports.reload = void 0;
3
+ exports.getk8sApiBatchBeta = exports.getk8sApiBatch = exports.getk8sApi = void 0;
4
4
  var client_node_1 = require("@kubernetes/client-node");
5
- var kc = new client_node_1.KubeConfig();
6
- var reload = function () {
5
+ var getKubeConfig = function () {
6
+ var kc = new client_node_1.KubeConfig();
7
7
  kc.loadFromDefault();
8
+ return kc;
8
9
  };
9
- exports.reload = reload;
10
- (0, exports.reload)();
11
- var k8sApi = kc.makeApiClient(client_node_1.CoreV1Api);
12
- exports.k8sApiBatch = kc.makeApiClient(client_node_1.BatchV1Api);
13
- exports.k8sApiBatchBeta = kc.makeApiClient(client_node_1.BatchV1beta1Api);
14
- exports["default"] = k8sApi;
10
+ /**
11
+ * get kubernetes client. avoid reusing the instance when context get changed
12
+ * @returns kuberenetes client
13
+ */
14
+ var getk8sApi = function () {
15
+ var kc = getKubeConfig();
16
+ return kc.makeApiClient(client_node_1.CoreV1Api);
17
+ };
18
+ exports.getk8sApi = getk8sApi;
19
+ var getk8sApiBatch = function () {
20
+ var kc = getKubeConfig();
21
+ return kc.makeApiClient(client_node_1.BatchV1Api);
22
+ };
23
+ exports.getk8sApiBatch = getk8sApiBatch;
24
+ var getk8sApiBatchBeta = function () {
25
+ var kc = getKubeConfig();
26
+ return kc.makeApiClient(client_node_1.BatchV1beta1Api);
27
+ };
28
+ exports.getk8sApiBatchBeta = getk8sApiBatchBeta;
15
29
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/k8sApi/index.ts"],"names":[],"mappings":";;;AAAA,uDAKiC;AAEjC,IAAM,EAAE,GAAG,IAAI,wBAAU,EAAE,CAAC;AAErB,IAAM,MAAM,GAAG;IACpB,EAAE,CAAC,eAAe,EAAE,CAAC;AACvB,CAAC,CAAC;AAFW,QAAA,MAAM,UAEjB;AAEF,IAAA,cAAM,GAAE,CAAC;AAET,IAAM,MAAM,GAAG,EAAE,CAAC,aAAa,CAAC,uBAAS,CAAC,CAAC;AAE9B,QAAA,WAAW,GAAG,EAAE,CAAC,aAAa,CAAC,wBAAU,CAAC,CAAC;AAC3C,QAAA,eAAe,GAAG,EAAE,CAAC,aAAa,CAAC,6BAAe,CAAC,CAAC;AAEjE,qBAAe,MAAM,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/k8sApi/index.ts"],"names":[],"mappings":";;;AAAA,uDAKiC;AAEjC,IAAM,aAAa,GAAG;IACpB,IAAM,EAAE,GAAG,IAAI,wBAAU,EAAE,CAAC;IAC5B,EAAE,CAAC,eAAe,EAAE,CAAC;IACrB,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC;AACF;;;GAGG;AACI,IAAM,SAAS,GAAG;IACvB,IAAM,EAAE,GAAG,aAAa,EAAE,CAAC;IAE3B,OAAO,EAAE,CAAC,aAAa,CAAC,uBAAS,CAAC,CAAC;AACrC,CAAC,CAAC;AAJW,QAAA,SAAS,aAIpB;AAEK,IAAM,cAAc,GAAG;IAC5B,IAAM,EAAE,GAAG,aAAa,EAAE,CAAC;IAE3B,OAAO,EAAE,CAAC,aAAa,CAAC,wBAAU,CAAC,CAAC;AACtC,CAAC,CAAC;AAJW,QAAA,cAAc,kBAIzB;AAEK,IAAM,kBAAkB,GAAG;IAChC,IAAM,EAAE,GAAG,aAAa,EAAE,CAAC;IAE3B,OAAO,EAAE,CAAC,aAAa,CAAC,6BAAe,CAAC,CAAC;AAC3C,CAAC,CAAC;AAJW,QAAA,kBAAkB,sBAI7B"}