@catladder/cli 1.146.2 → 1.148.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.
Files changed (113) hide show
  1. package/dist/bundles/catenv/index.js +3 -3
  2. package/dist/bundles/cli/index.js +1 -1
  3. package/dist/cli/src/apps/cli/commands/project/commandCloudSqlProxy.js +22 -19
  4. package/dist/cli/src/apps/cli/commands/project/commandCloudSqlProxy.js.map +1 -1
  5. package/dist/cli/src/apps/cli/commands/project/commandOpenDashboard.js +10 -9
  6. package/dist/cli/src/apps/cli/commands/project/commandOpenDashboard.js.map +1 -1
  7. package/dist/cli/src/apps/cli/commands/project/commandPortForward.js +18 -16
  8. package/dist/cli/src/apps/cli/commands/project/commandPortForward.js.map +1 -1
  9. package/dist/cli/src/apps/cli/commands/project/setup/setupCloudRun.js +10 -9
  10. package/dist/cli/src/apps/cli/commands/project/setup/setupCloudRun.js.map +1 -1
  11. package/dist/cli/src/apps/cli/commands/project/setup/setupContext.js +9 -8
  12. package/dist/cli/src/apps/cli/commands/project/setup/setupContext.js.map +1 -1
  13. package/dist/cli/src/apps/cli/commands/project/setup/setupKubernetes.js +23 -22
  14. package/dist/cli/src/apps/cli/commands/project/setup/setupKubernetes.js.map +1 -1
  15. package/dist/cli/src/apps/cli/commands/project/utils/ensureCluster.js +10 -9
  16. package/dist/cli/src/apps/cli/commands/project/utils/ensureCluster.js.map +1 -1
  17. package/dist/cli/src/gcloud/cloudRun/openCloudRunDashboards.js +6 -5
  18. package/dist/cli/src/gcloud/cloudRun/openCloudRunDashboards.js.map +1 -1
  19. package/dist/cli/src/kubernetes/openKubernetesDashboards.js +10 -8
  20. package/dist/cli/src/kubernetes/openKubernetesDashboards.js.map +1 -1
  21. package/dist/pipeline/src/build/base/createAppBuildJob.js +8 -6
  22. package/dist/pipeline/src/build/base/createAppBuildJob.js.map +1 -1
  23. package/dist/pipeline/src/build/base/writeBuildInfo.js +1 -1
  24. package/dist/pipeline/src/build/base/writeBuildInfo.js.map +1 -1
  25. package/dist/pipeline/src/build/base/writeDotEnv.js +1 -1
  26. package/dist/pipeline/src/build/base/writeDotEnv.js.map +1 -1
  27. package/dist/pipeline/src/build/custom/buildJob.js +6 -6
  28. package/dist/pipeline/src/build/custom/buildJob.js.map +1 -1
  29. package/dist/pipeline/src/build/custom/testJob.js +5 -5
  30. package/dist/pipeline/src/build/custom/testJob.js.map +1 -1
  31. package/dist/pipeline/src/build/docker.d.ts +26 -5
  32. package/dist/pipeline/src/build/docker.js +50 -17
  33. package/dist/pipeline/src/build/docker.js.map +1 -1
  34. package/dist/pipeline/src/build/node/buildJob.js +11 -11
  35. package/dist/pipeline/src/build/node/buildJob.js.map +1 -1
  36. package/dist/pipeline/src/build/node/cache.js +1 -1
  37. package/dist/pipeline/src/build/node/cache.js.map +1 -1
  38. package/dist/pipeline/src/build/node/meteor.js +10 -10
  39. package/dist/pipeline/src/build/node/meteor.js.map +1 -1
  40. package/dist/pipeline/src/build/node/testJob.js +12 -12
  41. package/dist/pipeline/src/build/node/testJob.js.map +1 -1
  42. package/dist/pipeline/src/build/rails/build.js +3 -3
  43. package/dist/pipeline/src/build/rails/build.js.map +1 -1
  44. package/dist/pipeline/src/build/rails/test.js +4 -4
  45. package/dist/pipeline/src/build/rails/test.js.map +1 -1
  46. package/dist/pipeline/src/build/sbom.js +3 -3
  47. package/dist/pipeline/src/build/sbom.js.map +1 -1
  48. package/dist/pipeline/src/build/types.d.ts +33 -25
  49. package/dist/pipeline/src/build/types.js.map +1 -1
  50. package/dist/pipeline/src/context/getLabels.js +1 -1
  51. package/dist/pipeline/src/context/getLabels.js.map +1 -1
  52. package/dist/pipeline/src/context/index.js +37 -15
  53. package/dist/pipeline/src/context/index.js.map +1 -1
  54. package/dist/pipeline/src/deploy/base/deploy.js +10 -17
  55. package/dist/pipeline/src/deploy/base/deploy.js.map +1 -1
  56. package/dist/pipeline/src/deploy/cloudRun/artifactsRegistry.d.ts +1 -1
  57. package/dist/pipeline/src/deploy/cloudRun/artifactsRegistry.js +8 -9
  58. package/dist/pipeline/src/deploy/cloudRun/artifactsRegistry.js.map +1 -1
  59. package/dist/pipeline/src/deploy/cloudRun/cloudRunRevisions.js +4 -5
  60. package/dist/pipeline/src/deploy/cloudRun/cloudRunRevisions.js.map +1 -1
  61. package/dist/pipeline/src/deploy/cloudRun/createJobs/cloudRunServices.js +1 -1
  62. package/dist/pipeline/src/deploy/cloudRun/createJobs/cloudRunServices.js.map +1 -1
  63. package/dist/pipeline/src/deploy/cloudRun/createJobs/common.d.ts +4 -4
  64. package/dist/pipeline/src/deploy/cloudRun/createJobs/common.js +2 -1
  65. package/dist/pipeline/src/deploy/cloudRun/createJobs/common.js.map +1 -1
  66. package/dist/pipeline/src/deploy/cloudRun/createJobs/index.js +2 -4
  67. package/dist/pipeline/src/deploy/cloudRun/createJobs/index.js.map +1 -1
  68. package/dist/pipeline/src/deploy/custom/deployJob.js +7 -10
  69. package/dist/pipeline/src/deploy/custom/deployJob.js.map +1 -1
  70. package/dist/pipeline/src/deploy/dockerTag/deployJob.js +3 -5
  71. package/dist/pipeline/src/deploy/dockerTag/deployJob.js.map +1 -1
  72. package/dist/pipeline/src/deploy/kubernetes/cloudSql/index.js +11 -9
  73. package/dist/pipeline/src/deploy/kubernetes/cloudSql/index.js.map +1 -1
  74. package/dist/pipeline/src/deploy/kubernetes/deployJob.js +3 -6
  75. package/dist/pipeline/src/deploy/kubernetes/deployJob.js.map +1 -1
  76. package/dist/pipeline/src/deploy/kubernetes/kubeEnv.js +2 -1
  77. package/dist/pipeline/src/deploy/kubernetes/kubeEnv.js.map +1 -1
  78. package/dist/pipeline/src/deploy/kubernetes/kubeValues.js +6 -6
  79. package/dist/pipeline/src/deploy/kubernetes/kubeValues.js.map +1 -1
  80. package/dist/pipeline/src/deploy/kubernetes/mongodb.js +11 -11
  81. package/dist/pipeline/src/deploy/kubernetes/mongodb.js.map +1 -1
  82. package/dist/pipeline/src/deploy/sbom.js +1 -2
  83. package/dist/pipeline/src/deploy/sbom.js.map +1 -1
  84. package/dist/pipeline/src/deploy/types/index.d.ts +1 -1
  85. package/dist/pipeline/src/deploy/types/index.js +1 -1
  86. package/dist/pipeline/src/deploy/types/index.js.map +1 -1
  87. package/dist/pipeline/src/deploy/utils.js +2 -1
  88. package/dist/pipeline/src/deploy/utils.js.map +1 -1
  89. package/dist/pipeline/src/pipeline/createJobsForComponent.js +6 -8
  90. package/dist/pipeline/src/pipeline/createJobsForComponent.js.map +1 -1
  91. package/dist/pipeline/src/pipeline/generatePipelineFiles.js +36 -9
  92. package/dist/pipeline/src/pipeline/generatePipelineFiles.js.map +1 -1
  93. package/dist/pipeline/src/pipeline/gitlab/createGitlabJobs.js +2 -8
  94. package/dist/pipeline/src/pipeline/gitlab/createGitlabJobs.js.map +1 -1
  95. package/dist/pipeline/src/pipeline/gitlab/sortGitLabJobDefProps.d.ts +7 -0
  96. package/dist/pipeline/src/pipeline/gitlab/sortGitLabJobDefProps.js +59 -0
  97. package/dist/pipeline/src/pipeline/gitlab/sortGitLabJobDefProps.js.map +1 -0
  98. package/dist/pipeline/src/types/config.d.ts +1 -1
  99. package/dist/pipeline/src/types/context.d.ts +13 -1
  100. package/dist/pipeline/src/utils/removeUndefined.d.ts +1 -0
  101. package/dist/pipeline/src/utils/removeUndefined.js +27 -0
  102. package/dist/pipeline/src/utils/removeUndefined.js.map +1 -0
  103. package/dist/tsconfig.tsbuildinfo +1 -1
  104. package/package.json +1 -1
  105. package/src/apps/cli/commands/project/commandCloudSqlProxy.ts +6 -9
  106. package/src/apps/cli/commands/project/commandOpenDashboard.ts +2 -2
  107. package/src/apps/cli/commands/project/commandPortForward.ts +4 -4
  108. package/src/apps/cli/commands/project/setup/setupCloudRun.ts +2 -2
  109. package/src/apps/cli/commands/project/setup/setupContext.ts +2 -2
  110. package/src/apps/cli/commands/project/setup/setupKubernetes.ts +1 -1
  111. package/src/apps/cli/commands/project/utils/ensureCluster.ts +2 -4
  112. package/src/gcloud/cloudRun/openCloudRunDashboards.ts +2 -2
  113. package/src/kubernetes/openKubernetesDashboards.ts +2 -2
@@ -49,7 +49,7 @@ var getServiceDeployScript = function (context, service, nameSuffix) {
49
49
  var serviceName = (0, getServiceName_1.getServiceName)(context);
50
50
  var customConfig = service !== true ? service : undefined;
51
51
  var command = service !== true
52
- ? (_a = service === null || service === void 0 ? void 0 : service.command) !== null && _a !== void 0 ? _a : context.componentConfig.build.startCommand
52
+ ? (_a = service === null || service === void 0 ? void 0 : service.command) !== null && _a !== void 0 ? _a : context.build.config.startCommand
53
53
  : undefined;
54
54
  var commandArray = command
55
55
  ? Array.isArray(command)
@@ -1 +1 @@
1
- {"version":3,"file":"cloudRunServices.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/cloudRunServices.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"cloudRunServices.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/cloudRunServices.ts"],"names":[],"mappings":"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"}
@@ -1,16 +1,16 @@
1
- import type { ComponentContext } from "../../../types/context";
1
+ import type { Context } from "../../../types/context";
2
2
  import type { DeployConfigCloudRun } from "../../types/googleCloudRun";
3
3
  export declare const gcloudCmd: (version?: "beta") => string;
4
4
  export declare const gcloudRunCmd: (version?: "beta") => string;
5
5
  export declare const gcloudSchedulerCmd: (version?: "beta") => string;
6
6
  export declare const setGoogleProjectNumberScript: (deployConfig: DeployConfigCloudRun) => string[];
7
7
  export declare const makeLabelString: (obj: Record<string, unknown>) => string;
8
- export declare const getCloudRunDeployConfig: (context: ComponentContext) => DeployConfigCloudRun;
9
- export declare function getCommonCloudRunArgs(context: ComponentContext): {
8
+ export declare const getCloudRunDeployConfig: (context: Context) => DeployConfigCloudRun;
9
+ export declare function getCommonCloudRunArgs(context: Context): {
10
10
  project: string;
11
11
  region: import("../../types").Gcloudregion;
12
12
  };
13
- export declare function getCommonDeployArgs(context: ComponentContext): {
13
+ export declare function getCommonDeployArgs(context: Context): {
14
14
  "set-cloudsql-instances": string;
15
15
  project: string;
16
16
  region: import("../../types").Gcloudregion;
@@ -57,7 +57,8 @@ var makeLabelString = function (obj) {
57
57
  };
58
58
  exports.makeLabelString = makeLabelString;
59
59
  var getCloudRunDeployConfig = function (context) {
60
- var deployConfig = context.componentConfig.deploy;
60
+ var _a;
61
+ var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
61
62
  if (!(0, types_1.isOfDeployType)(deployConfig, "google-cloudrun")) {
62
63
  // should not happen
63
64
  throw new Error("deploy config is wrong");
@@ -1 +1 @@
1
- {"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/common.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,qCAA6C;AAE7C,0DAAiE;AAE1D,IAAM,SAAS,GAAG,UAAC,OAAgB;IACxC,OAAO,OAAO,CAAC,CAAC,CAAC,iBAAU,OAAO,CAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;AAClD,CAAC,CAAC;AAFW,QAAA,SAAS,aAEpB;AACK,IAAM,YAAY,GAAG,UAAC,OAAgB;IAC3C,OAAO,UAAG,IAAA,iBAAS,EAAC,OAAO,CAAC,SAAM,CAAC;AACrC,CAAC,CAAC;AAFW,QAAA,YAAY,gBAEvB;AAEK,IAAM,kBAAkB,GAAG,UAAC,OAAgB;IACjD,OAAO,UAAG,IAAA,iBAAS,EAAC,OAAO,CAAC,eAAY,CAAC;AAC3C,CAAC,CAAC;AAFW,QAAA,kBAAkB,sBAE7B;AAEK,IAAM,4BAA4B,GAAG,UAC1C,YAAkC,IAC/B,OAAA;IACH,yCAAkC,IAAA,iBAAS,GAAE,gCAC3C,YAAY,CAAC,SAAS,wCACW;IACnC,wDAAsD;CACvD,EALI,CAKJ,CAAC;AAPW,QAAA,4BAA4B,gCAOvC;AAEK,IAAM,eAAe,GAAG,UAAC,GAA4B;IAC1D,OAAA,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC;SAChB,GAAG,CAAC,UAAC,EAAY;YAAZ,KAAA,aAAY,EAAX,GAAG,QAAA,EAAE,KAAK,QAAA;QAAM,OAAA,UAAG,GAAG,cAAI,KAAK,CAAE;IAAjB,CAAiB,CAAC;SACxC,IAAI,CAAC,GAAG,CAAC;AAFZ,CAEY,CAAC;AAHF,QAAA,eAAe,mBAGb;AAER,IAAM,uBAAuB,GAAG,UAAC,OAAyB;IAC/D,IAAM,YAAY,GAAG,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC;IACpD,IAAI,CAAC,IAAA,sBAAc,EAAC,YAAY,EAAE,iBAAiB,CAAC,EAAE,CAAC;QACrD,oBAAoB;QACpB,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC5C,CAAC;IACD,OAAO,YAAY,CAAC;AACtB,CAAC,CAAC;AAPW,QAAA,uBAAuB,2BAOlC;AAEF,SAAgB,qBAAqB,CAAC,OAAyB;IAC7D,IAAM,YAAY,GAAG,IAAA,+BAAuB,EAAC,OAAO,CAAC,CAAC;IACtD,OAAO;QACL,OAAO,EAAE,YAAY,CAAC,SAAS;QAC/B,MAAM,EAAE,YAAY,CAAC,MAAM;KAC5B,CAAC;AACJ,CAAC;AAND,sDAMC;AAED,SAAgB,mBAAmB,CAAC,OAAyB;IAC3D,IAAM,UAAU,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAC;IAClD,IAAM,YAAY,GAAG,IAAA,+BAAuB,EAAC,OAAO,CAAC,CAAC;IACtD,2BACE,KAAK,EAAE,IAAA,6CAAyB,EAAC,OAAO,CAAC,IACtC,UAAU,KACb,wBAAwB,EAAE,YAAY,CAAC,QAAQ;YAC7C,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,sBAAsB;YAC9C,CAAC,CAAC,SAAS,IACb;AACJ,CAAC;AAVD,kDAUC"}
1
+ {"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/common.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,qCAA6C;AAE7C,0DAAiE;AAE1D,IAAM,SAAS,GAAG,UAAC,OAAgB;IACxC,OAAO,OAAO,CAAC,CAAC,CAAC,iBAAU,OAAO,CAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;AAClD,CAAC,CAAC;AAFW,QAAA,SAAS,aAEpB;AACK,IAAM,YAAY,GAAG,UAAC,OAAgB;IAC3C,OAAO,UAAG,IAAA,iBAAS,EAAC,OAAO,CAAC,SAAM,CAAC;AACrC,CAAC,CAAC;AAFW,QAAA,YAAY,gBAEvB;AAEK,IAAM,kBAAkB,GAAG,UAAC,OAAgB;IACjD,OAAO,UAAG,IAAA,iBAAS,EAAC,OAAO,CAAC,eAAY,CAAC;AAC3C,CAAC,CAAC;AAFW,QAAA,kBAAkB,sBAE7B;AAEK,IAAM,4BAA4B,GAAG,UAC1C,YAAkC,IAC/B,OAAA;IACH,yCAAkC,IAAA,iBAAS,GAAE,gCAC3C,YAAY,CAAC,SAAS,wCACW;IACnC,wDAAsD;CACvD,EALI,CAKJ,CAAC;AAPW,QAAA,4BAA4B,gCAOvC;AAEK,IAAM,eAAe,GAAG,UAAC,GAA4B;IAC1D,OAAA,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC;SAChB,GAAG,CAAC,UAAC,EAAY;YAAZ,KAAA,aAAY,EAAX,GAAG,QAAA,EAAE,KAAK,QAAA;QAAM,OAAA,UAAG,GAAG,cAAI,KAAK,CAAE;IAAjB,CAAiB,CAAC;SACxC,IAAI,CAAC,GAAG,CAAC;AAFZ,CAEY,CAAC;AAHF,QAAA,eAAe,mBAGb;AAER,IAAM,uBAAuB,GAAG,UAAC,OAAgB;;IACtD,IAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAC5C,IAAI,CAAC,IAAA,sBAAc,EAAC,YAAY,EAAE,iBAAiB,CAAC,EAAE,CAAC;QACrD,oBAAoB;QACpB,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC5C,CAAC;IACD,OAAO,YAAY,CAAC;AACtB,CAAC,CAAC;AAPW,QAAA,uBAAuB,2BAOlC;AAEF,SAAgB,qBAAqB,CAAC,OAAgB;IACpD,IAAM,YAAY,GAAG,IAAA,+BAAuB,EAAC,OAAO,CAAC,CAAC;IACtD,OAAO;QACL,OAAO,EAAE,YAAY,CAAC,SAAS;QAC/B,MAAM,EAAE,YAAY,CAAC,MAAM;KAC5B,CAAC;AACJ,CAAC;AAND,sDAMC;AAED,SAAgB,mBAAmB,CAAC,OAAgB;IAClD,IAAM,UAAU,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAC;IAClD,IAAM,YAAY,GAAG,IAAA,+BAAuB,EAAC,OAAO,CAAC,CAAC;IACtD,2BACE,KAAK,EAAE,IAAA,6CAAyB,EAAC,OAAO,CAAC,IACtC,UAAU,KACb,wBAAwB,EAAE,YAAY,CAAC,QAAQ;YAC7C,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,sBAAsB;YAC9C,CAAC,CAAC,SAAS,IACb;AACJ,CAAC;AAVD,kDAUC"}
@@ -20,10 +20,8 @@ var constants_1 = require("./constants");
20
20
  var getCloudRunDeployScripts_1 = require("./getCloudRunDeployScripts");
21
21
  var getCloudRunStopScripts_1 = require("./getCloudRunStopScripts");
22
22
  var createGoogleCloudRunDeployJobs = function (context) {
23
- var deployConfig = context.componentConfig.deploy;
24
- if (deployConfig === false) {
25
- return [];
26
- }
23
+ var _a;
24
+ var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
27
25
  if (!(0, types_1.isOfDeployType)(deployConfig, "google-cloudrun")) {
28
26
  // should not happen
29
27
  throw new Error("deploy config is wrong");
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,0CAAiD;AAGjD,gDAA8D;AAC9D,mCAAmD;AAEnD,qCAA6C;AAC7C,yCAAgD;AAChD,uEAAsE;AACtE,mEAAkE;AAE3D,IAAM,8BAA8B,GAAG,UAC5C,OAAyB;IAEzB,IAAM,YAAY,GAAG,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC;IACpD,IAAI,YAAY,KAAK,KAAK,EAAE,CAAC;QAC3B,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,IAAI,CAAC,IAAA,sBAAc,EAAC,YAAY,EAAE,iBAAiB,CAAC,EAAE,CAAC;QACrD,oBAAoB;QACpB,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC5C,CAAC;IAED,IAAM,aAAa,GAAG,IAAA,mDAAwB,EAAC,OAAO,CAAC,CAAC;IACxD,IAAM,WAAW,GAAG,IAAA,+CAAsB,EAAC,OAAO,CAAC,CAAC;IAEpD,OAAO,IAAA,4BAAqB,EAAC,OAAO,EAAE;QACpC,MAAM,sBACJ,SAAS,EAAE;gBACT,6BAA6B,EAAE,GAAG;aACnC,IACE,CAAC,YAAY,CAAC,KAAK;YACpB,CAAC,CAAC;gBACE,SAAS,EAAE;oBACT,KAAK,EAAE;wBACL,6BAAiB,EAAE,QAAQ;qBAC5B;oBACD,IAAI,EAAE,QAAQ;iBACf;aACF;YACH,CAAC,CAAC,EAAE,CAAC,KAEP,KAAK,EAAE,IAAA,uBAAc,EAAC,QAAQ,CAAC,EAC/B,MAAM,EAAE,aAAa,GACtB;QACD,IAAI,EAAE;YACJ,KAAK,EAAE,IAAA,uBAAc,EAAC,QAAQ,CAAC;YAC/B,SAAS,EAAE;gBACT,6BAA6B,EAAE,GAAG;aACnC;YACD,MAAM,EAAE,IAAA,8BAAqB,EAAC,WAAW,CAAC;SAC3C;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AA1CW,QAAA,8BAA8B,kCA0CzC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,0CAAiD;AAGjD,gDAA8D;AAC9D,mCAAmD;AAEnD,qCAA6C;AAC7C,yCAAgD;AAChD,uEAAsE;AACtE,mEAAkE;AAE3D,IAAM,8BAA8B,GAAG,UAC5C,OAAyB;;IAEzB,IAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAC5C,IAAI,CAAC,IAAA,sBAAc,EAAC,YAAY,EAAE,iBAAiB,CAAC,EAAE,CAAC;QACrD,oBAAoB;QACpB,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC5C,CAAC;IAED,IAAM,aAAa,GAAG,IAAA,mDAAwB,EAAC,OAAO,CAAC,CAAC;IACxD,IAAM,WAAW,GAAG,IAAA,+CAAsB,EAAC,OAAO,CAAC,CAAC;IAEpD,OAAO,IAAA,4BAAqB,EAAC,OAAO,EAAE;QACpC,MAAM,sBACJ,SAAS,EAAE;gBACT,6BAA6B,EAAE,GAAG;aACnC,IACE,CAAC,YAAY,CAAC,KAAK;YACpB,CAAC,CAAC;gBACE,SAAS,EAAE;oBACT,KAAK,EAAE;wBACL,6BAAiB,EAAE,QAAQ;qBAC5B;oBACD,IAAI,EAAE,QAAQ;iBACf;aACF;YACH,CAAC,CAAC,EAAE,CAAC,KAEP,KAAK,EAAE,IAAA,uBAAc,EAAC,QAAQ,CAAC,EAC/B,MAAM,EAAE,aAAa,GACtB;QACD,IAAI,EAAE;YACJ,KAAK,EAAE,IAAA,uBAAc,EAAC,QAAQ,CAAC;YAC/B,SAAS,EAAE;gBACT,6BAA6B,EAAE,GAAG;aACnC;YACD,MAAM,EAAE,IAAA,8BAAqB,EAAC,WAAW,CAAC;SAC3C;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AAvCW,QAAA,8BAA8B,kCAuCzC"}
@@ -32,31 +32,28 @@ var base_1 = require("../base");
32
32
  var sbom_1 = require("../sbom");
33
33
  var types_1 = require("../types");
34
34
  var createCustomDeployJobs = function (context) {
35
- var _a, _b, _c;
36
- var deployConfig = context.componentConfig.deploy;
37
- if (deployConfig === false) {
38
- return [];
39
- }
35
+ var _a, _b, _c, _d;
36
+ var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
40
37
  if (!(0, types_1.isOfDeployType)(deployConfig, "custom")) {
41
38
  // should not happen
42
39
  throw new Error("deploy config is not custom");
43
40
  }
44
41
  // FIXME: custom deploy currently assumes yarn-based project
45
- var yarnInstall = (0, yarn_1.getYarnInstall)(context.buildContext, {
42
+ var yarnInstall = (0, yarn_1.getYarnInstall)(context.build, {
46
43
  noCustomPostInstall: true,
47
44
  });
48
45
  return (0, base_1.createDeployementJobs)(context, {
49
46
  deploy: {
50
- image: (_a = deployConfig.jobImage) !== null && _a !== void 0 ? _a : (0, runner_1.getRunnerImage)("jobs-default"),
51
- cache: (_b = deployConfig.jobCache) !== null && _b !== void 0 ? _b : [],
47
+ image: (_b = deployConfig.jobImage) !== null && _b !== void 0 ? _b : (0, runner_1.getRunnerImage)("jobs-default"),
48
+ cache: (_c = deployConfig.jobCache) !== null && _c !== void 0 ? _c : [],
52
49
  script: __spreadArray(__spreadArray(__spreadArray([
53
- "cd ".concat(context.componentConfig.dir)
50
+ "cd ".concat(context.build.dir)
54
51
  ], __read((deployConfig.requiresYarnInstall ? yarnInstall : [])), false), __read(deployConfig.script), false), __read((0, sbom_1.getDependencyTrackUploadScript)(context)), false),
55
52
  variables: {},
56
53
  },
57
54
  stop: deployConfig.stopScript
58
55
  ? {
59
- image: (_c = deployConfig.jobImage) !== null && _c !== void 0 ? _c : (0, runner_1.getRunnerImage)("jobs-default"),
56
+ image: (_d = deployConfig.jobImage) !== null && _d !== void 0 ? _d : (0, runner_1.getRunnerImage)("jobs-default"),
60
57
  script: __spreadArray(__spreadArray([], __read(deployConfig.stopScript), false), __read((0, sbom_1.getDependencyTrackDeleteScript)(context)), false),
61
58
  variables: {},
62
59
  }
@@ -1 +1 @@
1
- {"version":3,"file":"deployJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/custom/deployJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAuD;AACvD,uCAA8C;AAG9C,gCAAgD;AAChD,gCAGiB;AACjB,kCAA0C;AAEnC,IAAM,sBAAsB,GAAG,UACpC,OAAyB;;IAEzB,IAAM,YAAY,GAAG,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC;IACpD,IAAI,YAAY,KAAK,KAAK,EAAE,CAAC;QAC3B,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,IAAI,CAAC,IAAA,sBAAc,EAAC,YAAY,EAAE,QAAQ,CAAC,EAAE,CAAC;QAC5C,oBAAoB;QACpB,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;IACD,4DAA4D;IAC5D,IAAM,WAAW,GAAG,IAAA,qBAAc,EAAC,OAAO,CAAC,YAAY,EAAE;QACvD,mBAAmB,EAAE,IAAI;KAC1B,CAAC,CAAC;IACH,OAAO,IAAA,4BAAqB,EAAC,OAAO,EAAE;QACpC,MAAM,EAAE;YACN,KAAK,EAAE,MAAA,YAAY,CAAC,QAAQ,mCAAI,IAAA,uBAAc,EAAC,cAAc,CAAC;YAC9D,KAAK,EAAE,MAAA,YAAY,CAAC,QAAQ,mCAAI,EAAE;YAClC,MAAM;gBACJ,aAAM,OAAO,CAAC,eAAe,CAAC,GAAG,CAAE;sBAChC,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,kBACrD,YAAY,CAAC,MAAM,kBACnB,IAAA,qCAA8B,EAAC,OAAO,CAAC,SAC3C;YACD,SAAS,EAAE,EAAE;SACd;QACD,IAAI,EAAE,YAAY,CAAC,UAAU;YAC3B,CAAC,CAAC;gBACE,KAAK,EAAE,MAAA,YAAY,CAAC,QAAQ,mCAAI,IAAA,uBAAc,EAAC,cAAc,CAAC;gBAC9D,MAAM,yCACD,YAAY,CAAC,UAAU,kBACvB,IAAA,qCAA8B,EAAC,OAAO,CAAC,SAC3C;gBACD,SAAS,EAAE,EAAE;aACd;YACH,CAAC,CAAC,SAAS;KACd,CAAC,CAAC;AACL,CAAC,CAAC;AAtCW,QAAA,sBAAsB,0BAsCjC"}
1
+ {"version":3,"file":"deployJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/custom/deployJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAuD;AACvD,uCAA8C;AAG9C,gCAAgD;AAChD,gCAGiB;AACjB,kCAA0C;AAEnC,IAAM,sBAAsB,GAAG,UACpC,OAAyB;;IAEzB,IAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAE5C,IAAI,CAAC,IAAA,sBAAc,EAAC,YAAY,EAAE,QAAQ,CAAC,EAAE,CAAC;QAC5C,oBAAoB;QACpB,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;IACD,4DAA4D;IAC5D,IAAM,WAAW,GAAG,IAAA,qBAAc,EAAC,OAAO,CAAC,KAAK,EAAE;QAChD,mBAAmB,EAAE,IAAI;KAC1B,CAAC,CAAC;IACH,OAAO,IAAA,4BAAqB,EAAC,OAAO,EAAE;QACpC,MAAM,EAAE;YACN,KAAK,EAAE,MAAA,YAAY,CAAC,QAAQ,mCAAI,IAAA,uBAAc,EAAC,cAAc,CAAC;YAC9D,KAAK,EAAE,MAAA,YAAY,CAAC,QAAQ,mCAAI,EAAE;YAClC,MAAM;gBACJ,aAAM,OAAO,CAAC,KAAK,CAAC,GAAG,CAAE;sBACtB,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,kBACrD,YAAY,CAAC,MAAM,kBACnB,IAAA,qCAA8B,EAAC,OAAO,CAAC,SAC3C;YACD,SAAS,EAAE,EAAE;SACd;QACD,IAAI,EAAE,YAAY,CAAC,UAAU;YAC3B,CAAC,CAAC;gBACE,KAAK,EAAE,MAAA,YAAY,CAAC,QAAQ,mCAAI,IAAA,uBAAc,EAAC,cAAc,CAAC;gBAC9D,MAAM,yCACD,YAAY,CAAC,UAAU,kBACvB,IAAA,qCAA8B,EAAC,OAAO,CAAC,SAC3C;gBACD,SAAS,EAAE,EAAE;aACd;YACH,CAAC,CAAC,SAAS;KACd,CAAC,CAAC;AACL,CAAC,CAAC;AApCW,QAAA,sBAAsB,0BAoCjC"}
@@ -41,17 +41,15 @@ var docker_1 = require("../../build/docker");
41
41
  var base_1 = require("../base");
42
42
  var types_1 = require("../types");
43
43
  var createDockerTagDeployJobs = function (context) {
44
- var deployConfig = context.componentConfig.deploy;
45
- if (deployConfig === false) {
46
- return [];
47
- }
44
+ var _a;
45
+ var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
48
46
  if (!(0, types_1.isOfDeployType)(deployConfig, "dockerTag")) {
49
47
  // should not happen
50
48
  throw new Error("deploy config is not dockerTag");
51
49
  }
52
50
  var tag = deployConfig.tag;
53
51
  return (0, base_1.createDeployementJobs)(context, {
54
- deploy: __assign(__assign({}, (0, docker_1.getDockerJobBaseProps)(context)), { script: __spreadArray(__spreadArray([], __read((0, docker_1.gitlabDockerLogin)(context)), false), [
52
+ deploy: __assign(__assign({}, (0, docker_1.getDockerJobBaseProps)()), { script: __spreadArray(__spreadArray([], __read((0, docker_1.gitlabDockerLogin)(context)), false), [
55
53
  "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
56
54
  "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_IMAGE:".concat(tag),
57
55
  "docker push $DOCKER_IMAGE:".concat(tag),
@@ -1 +1 @@
1
- {"version":3,"file":"deployJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/dockerTag/deployJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAA8E;AAI9E,gCAAgD;AAChD,kCAA0C;AAEnC,IAAM,yBAAyB,GAAG,UACvC,OAAyB;IAEzB,IAAM,YAAY,GAAG,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC;IACpD,IAAI,YAAY,KAAK,KAAK,EAAE,CAAC;QAC3B,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,IAAI,CAAC,IAAA,sBAAc,EAAC,YAAY,EAAE,WAAW,CAAC,EAAE,CAAC;QAC/C,oBAAoB;QACpB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;IACpD,CAAC;IACD,IAAM,GAAG,GAAG,YAAY,CAAC,GAAG,CAAC;IAC7B,OAAO,IAAA,4BAAqB,EAAC,OAAO,EAAE;QACpC,MAAM,wBACD,IAAA,8BAAqB,EAAC,OAAO,CAAC,KACjC,MAAM,yCACD,IAAA,0BAAiB,EAAC,OAAO,CAAC;gBAC7B,6CAA6C;gBAC7C,mEAA4D,GAAG,CAAE;gBACjE,oCAA6B,GAAG,CAAE;gBAClC,yCAAiC,GAAG,OAAG;wBAE1C;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AAxBW,QAAA,yBAAyB,6BAwBpC"}
1
+ {"version":3,"file":"deployJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/dockerTag/deployJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAA8E;AAI9E,gCAAgD;AAChD,kCAA0C;AAEnC,IAAM,yBAAyB,GAAG,UACvC,OAAyB;;IAEzB,IAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAC5C,IAAI,CAAC,IAAA,sBAAc,EAAC,YAAY,EAAE,WAAW,CAAC,EAAE,CAAC;QAC/C,oBAAoB;QACpB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;IACpD,CAAC;IACD,IAAM,GAAG,GAAG,YAAY,CAAC,GAAG,CAAC;IAC7B,OAAO,IAAA,4BAAqB,EAAC,OAAO,EAAE;QACpC,MAAM,wBACD,IAAA,8BAAqB,GAAE,KAC1B,MAAM,yCACD,IAAA,0BAAiB,EAAC,OAAO,CAAC;gBAC7B,6CAA6C;gBAC7C,mEAA4D,GAAG,CAAE;gBACjE,oCAA6B,GAAG,CAAE;gBAClC,yCAAiC,GAAG,OAAG;wBAE1C;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AArBW,QAAA,yBAAyB,6BAqBpC"}
@@ -5,32 +5,34 @@ var context_1 = require("../../../context");
5
5
  var utils_1 = require("../../cloudSql/utils");
6
6
  var types_1 = require("../../types");
7
7
  var hasKubernetesCloudSQL = function (context) {
8
- var _a, _b;
9
- if ((0, types_1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) {
10
- return (_b = (_a = context.componentConfig.deploy.values) === null || _a === void 0 ? void 0 : _a.cloudsql) === null || _b === void 0 ? void 0 : _b.enabled;
8
+ var _a, _b, _c;
9
+ var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
10
+ if ((0, types_1.isOfDeployType)(deployConfig, "kubernetes")) {
11
+ return (_c = (_b = deployConfig.values) === null || _b === void 0 ? void 0 : _b.cloudsql) === null || _c === void 0 ? void 0 : _c.enabled;
11
12
  }
12
13
  return false;
13
14
  };
14
15
  exports.hasKubernetesCloudSQL = hasKubernetesCloudSQL;
15
16
  var createKubernetesCloudsqlBaseValues = function (context) {
16
- var _a, _b, _c, _d, _e, _f;
17
- if (!(0, types_1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) {
17
+ var _a, _b, _c, _d, _e, _f, _g;
18
+ var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
19
+ if (!(0, types_1.isOfDeployType)(deployConfig, "kubernetes")) {
18
20
  throw new Error("cannot get cloud sql config");
19
21
  }
20
- var config = (_a = context.componentConfig.deploy.values) === null || _a === void 0 ? void 0 : _a.cloudsql;
22
+ var config = (_b = deployConfig.values) === null || _b === void 0 ? void 0 : _b.cloudsql;
21
23
  if (!config) {
22
24
  throw new Error("cannot get cloud sql config");
23
25
  }
24
26
  var proxyCredentials = "$".concat((0, context_1.getSecretVarNameForContext)(context, "cloudsqlProxyCredentials"));
25
27
  if ((config === null || config === void 0 ? void 0 : config.type) !== "unmanaged") {
26
- var instanceConnectionName = "".concat((_b = config.projectId) !== null && _b !== void 0 ? _b : "skynet-164509", ":").concat((_c = config.region) !== null && _c !== void 0 ? _c : "europe-west6", ":").concat((_d = config.instanceId) !== null && _d !== void 0 ? _d : context.environment.envVars.KUBE_NAMESPACE);
28
+ var instanceConnectionName = "".concat((_c = config.projectId) !== null && _c !== void 0 ? _c : "skynet-164509", ":").concat((_d = config.region) !== null && _d !== void 0 ? _d : "europe-west6", ":").concat((_e = config.instanceId) !== null && _e !== void 0 ? _e : context.environment.envVars.KUBE_NAMESPACE);
27
29
  return {
28
30
  cloudsql: {
29
31
  enabled: config.enabled,
30
32
  dbUser: "postgres",
31
33
  instanceConnectionName: instanceConnectionName,
32
34
  proxyCredentials: proxyCredentials,
33
- fullDbName: (_e = context.environment.envVars.KUBE_APP_NAME) !== null && _e !== void 0 ? _e : "",
35
+ fullDbName: (_f = context.environment.envVars.KUBE_APP_NAME) !== null && _f !== void 0 ? _f : "",
34
36
  },
35
37
  };
36
38
  }
@@ -38,7 +40,7 @@ var createKubernetesCloudsqlBaseValues = function (context) {
38
40
  return {
39
41
  cloudsql: {
40
42
  enabled: config.enabled,
41
- dbUser: (_f = config.dbUser) !== null && _f !== void 0 ? _f : "postgres",
43
+ dbUser: (_g = config.dbUser) !== null && _g !== void 0 ? _g : "postgres",
42
44
  instanceConnectionName: config.instanceConnectionName,
43
45
  proxyCredentials: proxyCredentials,
44
46
  fullDbName: (0, utils_1.getFullDbName)(config, context.fullConfig, context.environment.slugPrefix, context.componentName),
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/kubernetes/cloudSql/index.ts"],"names":[],"mappings":";;;AACA,4CAA8D;AAE9D,8CAAqD;AACrD,qCAA6C;AAEtC,IAAM,qBAAqB,GAAG,UAAC,OAAyB;;IAC7D,IAAI,IAAA,sBAAc,EAAC,OAAO,CAAC,eAAe,CAAC,MAAM,EAAE,YAAY,CAAC,EAAE,CAAC;QACjE,OAAO,MAAA,MAAA,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC,MAAM,0CAAE,QAAQ,0CAAE,OAAO,CAAC;IAClE,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AALW,QAAA,qBAAqB,yBAKhC;AAUK,IAAM,kCAAkC,GAAG,UAChD,OAAyB;;IAIzB,IAAI,CAAC,IAAA,sBAAc,EAAC,OAAO,CAAC,eAAe,CAAC,MAAM,EAAE,YAAY,CAAC,EAAE,CAAC;QAClE,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;IAED,IAAM,MAAM,GAAG,MAAA,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC,MAAM,0CAAE,QAAQ,CAAC;IAE/D,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;IAED,IAAM,gBAAgB,GAAG,WAAI,IAAA,oCAA0B,EACrD,OAAO,EACP,0BAA0B,CAC3B,CAAE,CAAC;IACJ,IAAI,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,MAAK,WAAW,EAAE,CAAC;QACjC,IAAM,sBAAsB,GAAG,UAAG,MAAA,MAAM,CAAC,SAAS,mCAAI,eAAe,cACnE,MAAA,MAAM,CAAC,MAAM,mCAAI,cAAc,cAC7B,MAAA,MAAM,CAAC,UAAU,mCAAI,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,cAAc,CAAE,CAAC;QAEtE,OAAO;YACL,QAAQ,EAAE;gBACR,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,MAAM,EAAE,UAAU;gBAClB,sBAAsB,wBAAA;gBACtB,gBAAgB,kBAAA;gBAChB,UAAU,EAAE,MAAA,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,aAAa,mCAAI,EAAE;aAC5D;SACF,CAAC;IACJ,CAAC;SAAM,IAAI,MAAM,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;QACvC,OAAO;YACL,QAAQ,EAAE;gBACR,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,MAAM,EAAE,MAAA,MAAM,CAAC,MAAM,mCAAI,UAAU;gBACnC,sBAAsB,EAAE,MAAM,CAAC,sBAAsB;gBACrD,gBAAgB,kBAAA;gBAChB,UAAU,EAAE,IAAA,qBAAa,EACvB,MAAM,EACN,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,WAAW,CAAC,UAAU,EAC9B,OAAO,CAAC,aAAa,CACtB;aACF;SACF,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;IAClC,CAAC;AACH,CAAC,CAAC;AAnDW,QAAA,kCAAkC,sCAmD7C"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/kubernetes/cloudSql/index.ts"],"names":[],"mappings":";;;AACA,4CAA8D;AAE9D,8CAAqD;AACrD,qCAA6C;AAEtC,IAAM,qBAAqB,GAAG,UAAC,OAAyB;;IAC7D,IAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAE5C,IAAI,IAAA,sBAAc,EAAC,YAAY,EAAE,YAAY,CAAC,EAAE,CAAC;QAC/C,OAAO,MAAA,MAAA,YAAY,CAAC,MAAM,0CAAE,QAAQ,0CAAE,OAAO,CAAC;IAChD,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAPW,QAAA,qBAAqB,yBAOhC;AAUK,IAAM,kCAAkC,GAAG,UAChD,OAAyB;;IAIzB,IAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAC5C,IAAI,CAAC,IAAA,sBAAc,EAAC,YAAY,EAAE,YAAY,CAAC,EAAE,CAAC;QAChD,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;IAED,IAAM,MAAM,GAAG,MAAA,YAAY,CAAC,MAAM,0CAAE,QAAQ,CAAC;IAE7C,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;IAED,IAAM,gBAAgB,GAAG,WAAI,IAAA,oCAA0B,EACrD,OAAO,EACP,0BAA0B,CAC3B,CAAE,CAAC;IACJ,IAAI,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,MAAK,WAAW,EAAE,CAAC;QACjC,IAAM,sBAAsB,GAAG,UAAG,MAAA,MAAM,CAAC,SAAS,mCAAI,eAAe,cACnE,MAAA,MAAM,CAAC,MAAM,mCAAI,cAAc,cAC7B,MAAA,MAAM,CAAC,UAAU,mCAAI,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,cAAc,CAAE,CAAC;QAEtE,OAAO;YACL,QAAQ,EAAE;gBACR,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,MAAM,EAAE,UAAU;gBAClB,sBAAsB,wBAAA;gBACtB,gBAAgB,kBAAA;gBAChB,UAAU,EAAE,MAAA,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,aAAa,mCAAI,EAAE;aAC5D;SACF,CAAC;IACJ,CAAC;SAAM,IAAI,MAAM,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;QACvC,OAAO;YACL,QAAQ,EAAE;gBACR,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,MAAM,EAAE,MAAA,MAAM,CAAC,MAAM,mCAAI,UAAU;gBACnC,sBAAsB,EAAE,MAAM,CAAC,sBAAsB;gBACrD,gBAAgB,kBAAA;gBAChB,UAAU,EAAE,IAAA,qBAAa,EACvB,MAAM,EACN,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,WAAW,CAAC,UAAU,EAC9B,OAAO,CAAC,aAAa,CACtB;aACF;SACF,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;IAClC,CAAC;AACH,CAAC,CAAC;AApDW,QAAA,kCAAkC,sCAoD7C"}
@@ -47,11 +47,8 @@ var bashYaml_1 = require("../../bash/bashYaml");
47
47
  var gitlab_1 = require("../../utils/gitlab");
48
48
  var ALL_VALUES_FILE = "__all_values.yml";
49
49
  var createKubernetesDeployJobs = function (context) {
50
- var _a, _b;
51
- var deployConfig = context.componentConfig.deploy;
52
- if (deployConfig === false) {
53
- return [];
54
- }
50
+ var _a, _b, _c;
51
+ var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
55
52
  if (!(0, types_1.isOfDeployType)(deployConfig, "kubernetes")) {
56
53
  // should not happen
57
54
  throw new Error("deploy config is not kubernetes");
@@ -65,7 +62,7 @@ var createKubernetesDeployJobs = function (context) {
65
62
  when: "always",
66
63
  },
67
64
  }
68
- : {})), { variables: __assign(__assign({}, context.environment.envVars), { RELEASE_NAME: context.environment.fullName, HELM_EXPERIMENTAL_OCI: "1", KUBE_DOCKER_IMAGE_PULL_SECRET: "gitlab-registry-".concat(context.componentName), HELM_GITLAB_CHART_NAME: (_a = deployConfig.chartName) !== null && _a !== void 0 ? _a : "/helm-charts/the-panter-chart", HELM_ARGS: __spreadArray(__spreadArray([], __read((deployConfig.debug ? ["--debug"] : [])), false), __read(((_b = deployConfig.additionalHelmArgs) !== null && _b !== void 0 ? _b : [])), false).join(" "), COMPONENT_NAME: context.componentName,
65
+ : {})), { variables: __assign(__assign({}, context.environment.envVars), { RELEASE_NAME: context.environment.fullName, HELM_EXPERIMENTAL_OCI: "1", KUBE_DOCKER_IMAGE_PULL_SECRET: "gitlab-registry-".concat(context.componentName), HELM_GITLAB_CHART_NAME: (_b = deployConfig.chartName) !== null && _b !== void 0 ? _b : "/helm-charts/the-panter-chart", HELM_ARGS: __spreadArray(__spreadArray([], __read((deployConfig.debug ? ["--debug"] : [])), false), __read(((_c = deployConfig.additionalHelmArgs) !== null && _c !== void 0 ? _c : [])), false).join(" "), COMPONENT_NAME: context.componentName,
69
66
  /** @deprecated */
70
67
  BUILD_ID: context.environment.envVars.BUILD_INFO_BUILD_ID }) });
71
68
  var clusterName = "kube-".concat(context.environment.fullName);
@@ -1 +1 @@
1
- {"version":3,"file":"deployJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/kubernetes/deployJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iFAAmF;AACnF,uCAA8C;AAG9C,gCAAgD;AAChD,gCAGiB;AACjB,kCAA0C;AAC1C,2CAAgD;AAEhD,gDAAgE;AAChE,6CAAyD;AAEzD,IAAM,eAAe,GAAG,kBAAkB,CAAC;AACpC,IAAM,0BAA0B,GAAG,UACxC,OAAyB;;IAEzB,IAAM,YAAY,GAAG,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC;IACpD,IAAI,YAAY,KAAK,KAAK,EAAE,CAAC;QAC3B,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,IAAI,CAAC,IAAA,sBAAc,EAAC,YAAY,EAAE,YAAY,CAAC,EAAE,CAAC;QAChD,oBAAoB;QACpB,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;IACrD,CAAC;IAED,IAAM,MAAM,uBACV,KAAK,EAAE,IAAA,uBAAc,EAAC,YAAY,CAAC,IAChC,CAAC,YAAY,CAAC,KAAK;QACpB,CAAC,CAAC;YACE,SAAS,EAAE;gBACT,KAAK,EAAE;oBACL,eAAe,EAAE,QAAQ;iBAC1B;gBACD,IAAI,EAAE,QAAQ;aACf;SACF;QACH,CAAC,CAAC,EAAE,CAAC,KACP,SAAS,wBACJ,OAAO,CAAC,WAAW,CAAC,OAAO,KAC9B,YAAY,EAAE,OAAO,CAAC,WAAW,CAAC,QAAQ,EAC1C,qBAAqB,EAAE,GAAG,EAC1B,6BAA6B,EAAE,0BAAmB,OAAO,CAAC,aAAa,CAAE,EACzE,sBAAsB,EACpB,MAAA,YAAY,CAAC,SAAS,mCAAI,+BAA+B,EAC3D,SAAS,EAAE,uCACN,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,kBACvC,CAAC,MAAA,YAAY,CAAC,kBAAkB,mCAAI,EAAE,CAAC,UAC1C,IAAI,CAAC,GAAG,CAAC,EACX,cAAc,EAAE,OAAO,CAAC,aAAa;YACrC,kBAAkB;YAClB,QAAQ,EAAE,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,MAE5D,CAAC;IAEF,IAAM,WAAW,GAAG,eAAQ,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAE,CAAC;IAC3D,IAAM,cAAc,GAAG;QACrB,uCAA+B,WAAW,4BAAgB,IAAA,oDAA0B,EAClF,OAAO,EACP,UAAU,CACX,gDAAqC,IAAA,oDAA0B,EAC9D,OAAO,EACP,aAAa,CACd,qCAAkC;QACnC,2CAAmC,WAAW,2BAAe,IAAA,oDAA0B,EACrF,OAAO,EACP,YAAY,CACb,OAAG;QACJ,uCAA+B,WAAW,4BAAgB,WAAW,yBAAa,WAAW,8BAAkB,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,cAAc,OAAG;QAC5J,uCAA+B,WAAW,OAAG;KAC9C,CAAC;IAEF,OAAO,IAAA,4BAAqB,EAAC,OAAO,EAAE;QACpC,MAAM,wBACD,MAAM,KACT,MAAM,mFACD,cAAc,kBACd,IAAA,4BAAmB,EACpB,gBAAgB,EAChB,QAAQ,GAAG,eAAe,GAAG,sBAAsB,CACpD,CACC,IAAA,oCAAyB,EAAC,IAAA,6BAAgB,EAAC,OAAO,CAAC,EAAE,eAAe,CAAC,CACtE;gBACD,wBAAwB;gBACxB,kBAAkB;8BACf,IAAA,qCAA8B,EAAC,OAAO,CAAC;gBAC1C,+BAA+B;wBAElC;QACD,IAAI,wBACC,MAAM,KACT,MAAM,uDACD,cAAc;gBACjB,kBAAkB;8BACf,IAAA,qCAA8B,EAAC,OAAO,CAAC,YAE7C;QACD,QAAQ,wBACH,MAAM,KACT,MAAM,yCAAM,cAAc,YAAE,oBAAoB,YACjD;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AAxFW,QAAA,0BAA0B,8BAwFrC"}
1
+ {"version":3,"file":"deployJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/kubernetes/deployJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iFAAmF;AACnF,uCAA8C;AAG9C,gCAAgD;AAChD,gCAGiB;AACjB,kCAA0C;AAC1C,2CAAgD;AAEhD,gDAAgE;AAChE,6CAAyD;AAEzD,IAAM,eAAe,GAAG,kBAAkB,CAAC;AACpC,IAAM,0BAA0B,GAAG,UACxC,OAAyB;;IAEzB,IAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAC5C,IAAI,CAAC,IAAA,sBAAc,EAAC,YAAY,EAAE,YAAY,CAAC,EAAE,CAAC;QAChD,oBAAoB;QACpB,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;IACrD,CAAC;IAED,IAAM,MAAM,uBACV,KAAK,EAAE,IAAA,uBAAc,EAAC,YAAY,CAAC,IAChC,CAAC,YAAY,CAAC,KAAK;QACpB,CAAC,CAAC;YACE,SAAS,EAAE;gBACT,KAAK,EAAE;oBACL,eAAe,EAAE,QAAQ;iBAC1B;gBACD,IAAI,EAAE,QAAQ;aACf;SACF;QACH,CAAC,CAAC,EAAE,CAAC,KACP,SAAS,wBACJ,OAAO,CAAC,WAAW,CAAC,OAAO,KAC9B,YAAY,EAAE,OAAO,CAAC,WAAW,CAAC,QAAQ,EAC1C,qBAAqB,EAAE,GAAG,EAC1B,6BAA6B,EAAE,0BAAmB,OAAO,CAAC,aAAa,CAAE,EACzE,sBAAsB,EACpB,MAAA,YAAY,CAAC,SAAS,mCAAI,+BAA+B,EAC3D,SAAS,EAAE,uCACN,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,kBACvC,CAAC,MAAA,YAAY,CAAC,kBAAkB,mCAAI,EAAE,CAAC,UAC1C,IAAI,CAAC,GAAG,CAAC,EACX,cAAc,EAAE,OAAO,CAAC,aAAa;YACrC,kBAAkB;YAClB,QAAQ,EAAE,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,MAE5D,CAAC;IAEF,IAAM,WAAW,GAAG,eAAQ,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAE,CAAC;IAC3D,IAAM,cAAc,GAAG;QACrB,uCAA+B,WAAW,4BAAgB,IAAA,oDAA0B,EAClF,OAAO,EACP,UAAU,CACX,gDAAqC,IAAA,oDAA0B,EAC9D,OAAO,EACP,aAAa,CACd,qCAAkC;QACnC,2CAAmC,WAAW,2BAAe,IAAA,oDAA0B,EACrF,OAAO,EACP,YAAY,CACb,OAAG;QACJ,uCAA+B,WAAW,4BAAgB,WAAW,yBAAa,WAAW,8BAAkB,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,cAAc,OAAG;QAC5J,uCAA+B,WAAW,OAAG;KAC9C,CAAC;IAEF,OAAO,IAAA,4BAAqB,EAAC,OAAO,EAAE;QACpC,MAAM,wBACD,MAAM,KACT,MAAM,mFACD,cAAc,kBACd,IAAA,4BAAmB,EACpB,gBAAgB,EAChB,QAAQ,GAAG,eAAe,GAAG,sBAAsB,CACpD,CACC,IAAA,oCAAyB,EAAC,IAAA,6BAAgB,EAAC,OAAO,CAAC,EAAE,eAAe,CAAC,CACtE;gBACD,wBAAwB;gBACxB,kBAAkB;8BACf,IAAA,qCAA8B,EAAC,OAAO,CAAC;gBAC1C,+BAA+B;wBAElC;QACD,IAAI,wBACC,MAAM,KACT,MAAM,uDACD,cAAc;gBACjB,kBAAkB;8BACf,IAAA,qCAA8B,EAAC,OAAO,CAAC,YAE7C;QACD,QAAQ,wBACH,MAAM,KACT,MAAM,yCAAM,cAAc,YAAE,oBAAoB,YACjD;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AArFW,QAAA,0BAA0B,8BAqFrC"}
@@ -43,7 +43,8 @@ var shouldGoIntoSecrets = function (key, value) {
43
43
  * we evalulate the actual values later, but want to store the secrets in kubernetes secrets
44
44
  */
45
45
  var createKubeEnv = function (context) {
46
- if (!(0, types_1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) {
46
+ var _a;
47
+ if (!(0, types_1.isOfDeployType)((_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config, "kubernetes")) {
47
48
  // should not happen
48
49
  throw new Error("deploy config is not kubernetes");
49
50
  }
@@ -1 +1 @@
1
- {"version":3,"file":"kubeEnv.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/kubernetes/kubeEnv.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,kCAA0C;AAE1C,IAAM,mBAAmB,GAAG,UAAC,GAAW,EAAE,KAAyB;;IACjE,IAAI,CAAC,KAAK;QAAE,OAAO,KAAK,CAAC;IACzB,IAAI,MAAA,MAAM,CAAC,KAAK,CAAC,0CAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;QACpC,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF;;;GAGG;AACI,IAAM,aAAa,GAAG,UAAC,OAAyB;IACrD,IAAI,CAAC,IAAA,sBAAc,EAAC,OAAO,CAAC,eAAe,CAAC,MAAM,EAAE,YAAY,CAAC,EAAE,CAAC;QAClE,oBAAoB;QACpB,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;IACrD,CAAC;IAED,IAAM,UAAU,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC;IAE/C,IAAM,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,MAAM,CAI3C,UAAC,GAAG,EAAE,EAAY;;YAAZ,KAAA,aAAY,EAAX,GAAG,QAAA,EAAE,KAAK,QAAA;QACf,IAAI,mBAAmB,CAAC,GAAG,EAAE,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;YAChD,GAAG,CAAC,MAAM,yBACL,GAAG,CAAC,MAAM,gBACZ,GAAG,IAAG,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,EAAE,MACnB,CAAC;YACF,OAAO,GAAG,CAAC;QACb,CAAC;QACD,GAAG,CAAC,MAAM,yBACL,GAAG,CAAC,MAAM,gBACZ,GAAG,IAAG,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,EAAE,MACnB,CAAC;QACF,OAAO,GAAG,CAAC;IACb,CAAC,EACD;QACE,MAAM,EAAE,EAAE;QACV,MAAM,EAAE,EAAE;KACX,CACF,CAAC;IAEF,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAjCW,QAAA,aAAa,iBAiCxB"}
1
+ {"version":3,"file":"kubeEnv.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/kubernetes/kubeEnv.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,kCAA0C;AAE1C,IAAM,mBAAmB,GAAG,UAAC,GAAW,EAAE,KAAyB;;IACjE,IAAI,CAAC,KAAK;QAAE,OAAO,KAAK,CAAC;IACzB,IAAI,MAAA,MAAM,CAAC,KAAK,CAAC,0CAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;QACpC,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF;;;GAGG;AACI,IAAM,aAAa,GAAG,UAAC,OAAyB;;IACrD,IAAI,CAAC,IAAA,sBAAc,EAAC,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,EAAE,YAAY,CAAC,EAAE,CAAC;QAC1D,oBAAoB;QACpB,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;IACrD,CAAC;IAED,IAAM,UAAU,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC;IAE/C,IAAM,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,MAAM,CAI3C,UAAC,GAAG,EAAE,EAAY;;YAAZ,KAAA,aAAY,EAAX,GAAG,QAAA,EAAE,KAAK,QAAA;QACf,IAAI,mBAAmB,CAAC,GAAG,EAAE,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;YAChD,GAAG,CAAC,MAAM,yBACL,GAAG,CAAC,MAAM,gBACZ,GAAG,IAAG,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,EAAE,MACnB,CAAC;YACF,OAAO,GAAG,CAAC;QACb,CAAC;QACD,GAAG,CAAC,MAAM,yBACL,GAAG,CAAC,MAAM,gBACZ,GAAG,IAAG,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,EAAE,MACnB,CAAC;QACF,OAAO,GAAG,CAAC;IACb,CAAC,EACD;QACE,MAAM,EAAE,EAAE;QACV,MAAM,EAAE,EAAE;KACX,CACF,CAAC;IAEF,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAjCW,QAAA,aAAa,iBAiCxB"}
@@ -55,7 +55,7 @@ var createAppConfig = function (context, application) {
55
55
  var _a = application !== null && application !== void 0 ? application : {}, healthRoute = _a.healthRoute, command = _a.command, rest = __rest(_a, ["healthRoute", "command"]);
56
56
  return (0, utils_1.mergeWithMergingArrays)({
57
57
  host: context.environment.host,
58
- command: command !== null && command !== void 0 ? command : context.componentConfig.build.startCommand,
58
+ command: command !== null && command !== void 0 ? command : context.build.config.startCommand,
59
59
  livenessProbe: {
60
60
  httpGet: {
61
61
  path: healthRoute !== null && healthRoute !== void 0 ? healthRoute : "__health",
@@ -83,9 +83,9 @@ var removeFalsy = function (record) {
83
83
  }));
84
84
  };
85
85
  var createKubeValues = function (context) {
86
- var _a, _b;
87
- var deployConfig = context.componentConfig.deploy;
88
- if (deployConfig === false) {
86
+ var _a, _b, _c;
87
+ var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
88
+ if (!deployConfig) {
89
89
  return [];
90
90
  }
91
91
  if (!(0, types_1.isOfDeployType)(deployConfig, "kubernetes")) {
@@ -95,14 +95,14 @@ var createKubeValues = function (context) {
95
95
  var values = deployConfig.values;
96
96
  // we remove the application config because it can be just the value `false` which is a convenience feature, but not supported in the helm chart
97
97
  // we only merge the rest of the values in
98
- var _c = values !== null && values !== void 0 ? values : {}, application = _c.application, jobs = _c.jobs, cronjobs = _c.cronjobs, rest = __rest(_c, ["application", "jobs", "cronjobs"]);
98
+ var _d = values !== null && values !== void 0 ? values : {}, application = _d.application, jobs = _d.jobs, cronjobs = _d.cronjobs, rest = __rest(_d, ["application", "jobs", "cronjobs"]);
99
99
  var env = (0, kubeEnv_1.createKubeEnv)(context);
100
100
  var defaultKubeValues = (0, lodash_1.merge)({
101
101
  env: env,
102
102
  application: createAppConfig(context, application),
103
103
  }, (0, cloudSql_1.hasKubernetesCloudSQL)(context)
104
104
  ? (0, cloudSql_1.createKubernetesCloudsqlBaseValues)(context)
105
- : {}, ((_b = (_a = deployConfig.values) === null || _a === void 0 ? void 0 : _a.mongodb) === null || _b === void 0 ? void 0 : _b.enabled)
105
+ : {}, ((_c = (_b = deployConfig.values) === null || _b === void 0 ? void 0 : _b.mongodb) === null || _c === void 0 ? void 0 : _c.enabled)
106
106
  ? (0, mongodb_1.createMongodbBaseConfig)(context)
107
107
  : {});
108
108
  var kubeValues = (0, processSecretsAsFiles_1.processSecretsAsFiles)((0, utils_1.mergeWithMergingArrays)(defaultKubeValues, __assign({ jobs: removeFalsy(jobs), cronjobs: removeFalsy(cronjobs) }, rest)));
@@ -1 +1 @@
1
- {"version":3,"file":"kubeValues.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/kubernetes/kubeValues.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"kubeValues.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/kubernetes/kubeValues.ts"],"names":[],"mappings":"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"}
@@ -31,15 +31,15 @@ var getMongodbReplicasetHost = function (context, index) {
31
31
  return getMongodbHost(context, "".concat(fullAppname, "-mongodb-").concat(index, ".").concat(fullAppname, "-mongodb-headless"));
32
32
  };
33
33
  var createMongodbUrl = function (context, dbName) {
34
- var _a, _b;
35
- if (!(0, types_1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) {
34
+ var _a, _b, _c, _d;
35
+ if (!(0, types_1.isOfDeployType)((_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config, "kubernetes")) {
36
36
  throw new Error("can only createMongodbUrl on supported deploys");
37
37
  }
38
- var mongodbConfig = (_a = context.componentConfig.deploy.values) === null || _a === void 0 ? void 0 : _a.mongodb;
38
+ var mongodbConfig = (_c = (_b = context.deploy) === null || _b === void 0 ? void 0 : _b.config.values) === null || _c === void 0 ? void 0 : _c.mongodb;
39
39
  var queryParams = undefined;
40
40
  var hosts = "";
41
41
  if ((mongodbConfig === null || mongodbConfig === void 0 ? void 0 : mongodbConfig.architecture) === "replicaset") {
42
- hosts = (0, lodash_1.range)(0, (_b = mongodbConfig === null || mongodbConfig === void 0 ? void 0 : mongodbConfig.replicaCount) !== null && _b !== void 0 ? _b : 2)
42
+ hosts = (0, lodash_1.range)(0, (_d = mongodbConfig === null || mongodbConfig === void 0 ? void 0 : mongodbConfig.replicaCount) !== null && _d !== void 0 ? _d : 2)
43
43
  .map(function (i) { return getMongodbReplicasetHost(context, i); })
44
44
  .join(",");
45
45
  queryParams = "replicaSet=rs0&authSource=admin";
@@ -51,11 +51,11 @@ var createMongodbUrl = function (context, dbName) {
51
51
  return "mongodb://".concat(getCredentialString(context)).concat(hosts, "/").concat(dbName).concat(queryParams ? "?".concat(queryParams) : "");
52
52
  };
53
53
  var createMongoBackupDefaultConfig = function (context) {
54
- var _a;
55
- if (!(0, types_1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) {
54
+ var _a, _b, _c;
55
+ if (!(0, types_1.isOfDeployType)((_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config, "kubernetes")) {
56
56
  throw new Error("can only create mongodb base config on supported deploys");
57
57
  }
58
- var mongodbConfig = (_a = context.componentConfig.deploy.values) === null || _a === void 0 ? void 0 : _a.mongodb;
58
+ var mongodbConfig = (_c = (_b = context.deploy) === null || _b === void 0 ? void 0 : _b.config.values) === null || _c === void 0 ? void 0 : _c.mongodb;
59
59
  var fullAppName = context.environment.envVars.KUBE_APP_NAME;
60
60
  var backupEnabled = ["prod", "stage"].includes(context.environment.envType);
61
61
  var hostToBackup;
@@ -85,11 +85,11 @@ var createMongoBackupDefaultConfig = function (context) {
85
85
  };
86
86
  };
87
87
  var createMongodbBaseConfig = function (context) {
88
- var _a, _b;
89
- if (!(0, types_1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) {
88
+ var _a, _b, _c, _d;
89
+ if (!(0, types_1.isOfDeployType)((_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config, "kubernetes")) {
90
90
  throw new Error("can only create mongodb base config on supported deploys");
91
91
  }
92
- var mongodbConfig = (_a = context.componentConfig.deploy.values) === null || _a === void 0 ? void 0 : _a.mongodb;
92
+ var mongodbConfig = (_c = (_b = context.deploy) === null || _b === void 0 ? void 0 : _b.config.values) === null || _c === void 0 ? void 0 : _c.mongodb;
93
93
  return {
94
94
  mongodb: {
95
95
  enabled: true,
@@ -104,7 +104,7 @@ var createMongodbBaseConfig = function (context) {
104
104
  backup: createMongoBackupDefaultConfig(context),
105
105
  },
106
106
  env: {
107
- secret: __assign({ MONGO_URL: createMongodbUrl(context, (_b = mongodbConfig === null || mongodbConfig === void 0 ? void 0 : mongodbConfig.dbName) !== null && _b !== void 0 ? _b : "app") }, ((mongodbConfig === null || mongodbConfig === void 0 ? void 0 : mongodbConfig.architecture) === "replicaset"
107
+ secret: __assign({ MONGO_URL: createMongodbUrl(context, (_d = mongodbConfig === null || mongodbConfig === void 0 ? void 0 : mongodbConfig.dbName) !== null && _d !== void 0 ? _d : "app") }, ((mongodbConfig === null || mongodbConfig === void 0 ? void 0 : mongodbConfig.architecture) === "replicaset"
108
108
  ? { MONGO_OPLOG_URL: createMongodbUrl(context, "local") } // oplog only works with replicasets
109
109
  : {})),
110
110
  },
@@ -1 +1 @@
1
- {"version":3,"file":"mongodb.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/kubernetes/mongodb.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"mongodb.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/kubernetes/mongodb.ts"],"names":[],"mappings":"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"}
@@ -3,8 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.getDependencyTrackDeleteScript = exports.getDependencyTrackUploadScript = exports.sbomDeactivated = void 0;
4
4
  var sbom_1 = require("../build/sbom");
5
5
  var sbomDeactivated = function (context) {
6
- return context.componentConfig.build.type === "custom" &&
7
- context.componentConfig.build.sbom === false;
6
+ return context.build.config.type === "custom" && context.build.config.sbom === false;
8
7
  };
9
8
  exports.sbomDeactivated = sbomDeactivated;
10
9
  var getDependencyTrackUploadScript = function (context) {
@@ -1 +1 @@
1
- {"version":3,"file":"sbom.js","sourceRoot":"","sources":["../../../../../pipeline/src/deploy/sbom.ts"],"names":[],"mappings":";;;AACA,sCAA0C;AAEnC,IAAM,eAAe,GAAG,UAAC,OAAyB;IACvD,OAAA,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,KAAK,QAAQ;QAC/C,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,KAAK,KAAK;AAD5C,CAC4C,CAAC;AAFlC,QAAA,eAAe,mBAEmB;AAExC,IAAM,8BAA8B,GAAG,UAC5C,OAAyB;IAEzB,OAAO,IAAA,uBAAe,EAAC,OAAO,CAAC;QAC7B,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC;YACE,yCAAyC;YACzC,8EAAoE,OAAO,CAAC,UAAU,CAAC,YAAY,cAAI,OAAO,CAAC,UAAU,CAAC,OAAO,cAAI,OAAO,CAAC,aAAa,kBAAM,OAAO,CAAC,WAAW,CAAC,GAAG,kBAAM,gBAAS,wBAAoB;SAC3N,CAAC;AACR,CAAC,CAAC;AATW,QAAA,8BAA8B,kCASzC;AAEK,IAAM,8BAA8B,GAAG,UAC5C,OAAyB;IAEzB,OAAO,IAAA,uBAAe,EAAC,OAAO,CAAC;QAC7B,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC;YACE,8CAA8C;YAC9C,+EAAqE,OAAO,CAAC,UAAU,CAAC,YAAY,cAAI,OAAO,CAAC,UAAU,CAAC,OAAO,cAAI,OAAO,CAAC,aAAa,kBAAM,OAAO,CAAC,WAAW,CAAC,GAAG,eAAW;SACpM,CAAC;AACR,CAAC,CAAC;AATW,QAAA,8BAA8B,kCASzC"}
1
+ {"version":3,"file":"sbom.js","sourceRoot":"","sources":["../../../../../pipeline/src/deploy/sbom.ts"],"names":[],"mappings":";;;AACA,sCAA0C;AAEnC,IAAM,eAAe,GAAG,UAAC,OAAyB;IACvD,OAAA,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,KAAK,QAAQ,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,KAAK,KAAK;AAA7E,CAA6E,CAAC;AADnE,QAAA,eAAe,mBACoD;AAEzE,IAAM,8BAA8B,GAAG,UAC5C,OAAyB;IAEzB,OAAO,IAAA,uBAAe,EAAC,OAAO,CAAC;QAC7B,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC;YACE,yCAAyC;YACzC,8EAAoE,OAAO,CAAC,UAAU,CAAC,YAAY,cAAI,OAAO,CAAC,UAAU,CAAC,OAAO,cAAI,OAAO,CAAC,aAAa,kBAAM,OAAO,CAAC,WAAW,CAAC,GAAG,kBAAM,gBAAS,wBAAoB;SAC3N,CAAC;AACR,CAAC,CAAC;AATW,QAAA,8BAA8B,kCASzC;AAEK,IAAM,8BAA8B,GAAG,UAC5C,OAAyB;IAEzB,OAAO,IAAA,uBAAe,EAAC,OAAO,CAAC;QAC7B,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC;YACE,8CAA8C;YAC9C,+EAAqE,OAAO,CAAC,UAAU,CAAC,YAAY,cAAI,OAAO,CAAC,UAAU,CAAC,OAAO,cAAI,OAAO,CAAC,aAAa,kBAAM,OAAO,CAAC,WAAW,CAAC,GAAG,eAAW;SACpM,CAAC;AACR,CAAC,CAAC;AATW,QAAA,8BAA8B,kCASzC"}
@@ -11,7 +11,7 @@ export type DeployConfigType = DeployConfig["type"];
11
11
  export type DeployConfigGeneric<T extends DeployConfigType> = Extract<DeployConfig, {
12
12
  type: T;
13
13
  }>;
14
- export declare const isOfDeployType: <T extends ("custom" | "kubernetes" | "dockerTag" | "google-cloudrun")[]>(t: DeployConfig | false, ...types: T) => t is Extract<DeployConfigCustom, {
14
+ export declare const isOfDeployType: <T extends ("custom" | "kubernetes" | "dockerTag" | "google-cloudrun")[]>(t: DeployConfig | false | null | undefined, ...types: T) => t is Extract<DeployConfigCustom, {
15
15
  type: T[number];
16
16
  }> | Extract<DeployConfigDockerTag, {
17
17
  type: T[number];
@@ -24,7 +24,7 @@ var isOfDeployType = function (t) {
24
24
  for (var _i = 1; _i < arguments.length; _i++) {
25
25
  types[_i - 1] = arguments[_i];
26
26
  }
27
- return t && types.includes(t.type);
27
+ return t && types.includes(t.type) ? true : false;
28
28
  };
29
29
  exports.isOfDeployType = isOfDeployType;
30
30
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/types/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAKA,2CAAyB;AACzB,mDAAiC;AACjC,+CAA6B;AAC7B,8CAA4B;AAcrB,IAAM,cAAc,GAAG,UAC5B,CAAuB;IACvB,eAAW;SAAX,UAAW,EAAX,qBAAW,EAAX,IAAW;QAAX,8BAAW;;IAEX,OAAO,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;AACrC,CAAC,CAAC;AALW,QAAA,cAAc,kBAKzB"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/types/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAKA,2CAAyB;AACzB,mDAAiC;AACjC,+CAA6B;AAC7B,8CAA4B;AAcrB,IAAM,cAAc,GAAG,UAC5B,CAA0C;IAC1C,eAAW;SAAX,UAAW,EAAX,qBAAW,EAAX,IAAW;QAAX,8BAAW;;IAEX,OAAO,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;AACpD,CAAC,CAAC;AALW,QAAA,cAAc,kBAKzB"}
@@ -13,7 +13,8 @@ var getKubernetesNamespace = function (config, env) {
13
13
  };
14
14
  exports.getKubernetesNamespace = getKubernetesNamespace;
15
15
  var contextIsStoppable = function (context) {
16
- var deployConfig = context.componentConfig.deploy;
16
+ var _a;
17
+ var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
17
18
  if ((0, types_1.isOfDeployType)(deployConfig, "kubernetes")) {
18
19
  return true;
19
20
  }
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../pipeline/src/deploy/utils.ts"],"names":[],"mappings":";;;AAEA,iCAAyC;AAElC,IAAM,4BAA4B,GAAG,UAC1C,OAAsC;IAEtC,IAAI,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,cAAO,OAAO,CAAC,SAAS,cAAI,OAAO,CAAC,MAAM,cAAI,OAAO,CAAC,IAAI,CAAE,CAAC;IACtE,CAAC;AACH,CAAC,CAAC;AANW,QAAA,4BAA4B,gCAMvC;AAEK,IAAM,sBAAsB,GAAG,UACpC,MAAgD,EAChD,GAAW;IAEX,OAAO,UAAG,MAAM,CAAC,YAAY,cAAI,MAAM,CAAC,OAAO,cAAI,GAAG,CAAE,CAAC;AAC3D,CAAC,CAAC;AALW,QAAA,sBAAsB,0BAKjC;AAEK,IAAM,kBAAkB,GAAG,UAAC,OAAyB;IAC1D,IAAM,YAAY,GAAG,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC;IACpD,IAAI,IAAA,sBAAc,EAAC,YAAY,EAAE,YAAY,CAAC,EAAE,CAAC;QAC/C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,IAAA,sBAAc,EAAC,YAAY,EAAE,iBAAiB,CAAC,EAAE,CAAC;QACpD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,IAAA,sBAAc,EAAC,YAAY,EAAE,QAAQ,CAAC,IAAI,YAAY,CAAC,UAAU,EAAE,CAAC;QACtE,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAdW,QAAA,kBAAkB,sBAc7B"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../pipeline/src/deploy/utils.ts"],"names":[],"mappings":";;;AAEA,iCAAyC;AAElC,IAAM,4BAA4B,GAAG,UAC1C,OAAsC;IAEtC,IAAI,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,cAAO,OAAO,CAAC,SAAS,cAAI,OAAO,CAAC,MAAM,cAAI,OAAO,CAAC,IAAI,CAAE,CAAC;IACtE,CAAC;AACH,CAAC,CAAC;AANW,QAAA,4BAA4B,gCAMvC;AAEK,IAAM,sBAAsB,GAAG,UACpC,MAAgD,EAChD,GAAW;IAEX,OAAO,UAAG,MAAM,CAAC,YAAY,cAAI,MAAM,CAAC,OAAO,cAAI,GAAG,CAAE,CAAC;AAC3D,CAAC,CAAC;AALW,QAAA,sBAAsB,0BAKjC;AAEK,IAAM,kBAAkB,GAAG,UAAC,OAAyB;;IAC1D,IAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAC5C,IAAI,IAAA,sBAAc,EAAC,YAAY,EAAE,YAAY,CAAC,EAAE,CAAC;QAC/C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,IAAA,sBAAc,EAAC,YAAY,EAAE,iBAAiB,CAAC,EAAE,CAAC;QACpD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,IAAA,sBAAc,EAAC,YAAY,EAAE,QAAQ,CAAC,IAAI,YAAY,CAAC,UAAU,EAAE,CAAC;QACtE,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAdW,QAAA,kBAAkB,sBAc7B"}
@@ -84,7 +84,6 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
84
84
  };
85
85
  Object.defineProperty(exports, "__esModule", { value: true });
86
86
  exports.createJobsForComponent = void 0;
87
- var lodash_1 = require("lodash");
88
87
  var build_1 = require("../build");
89
88
  var context_1 = require("../context");
90
89
  var deploy_1 = require("../deploy");
@@ -97,18 +96,17 @@ var injectDefaultVarsInCustomJobs = function (context, jobs) {
97
96
  });
98
97
  };
99
98
  var getCustomJobs = function (context) {
100
- if (!context.componentConfig.customJobs) {
99
+ if (!context.customJobs) {
101
100
  return [];
102
101
  }
103
- var rawJobs = (0, lodash_1.isFunction)(context.componentConfig.customJobs)
104
- ? context.componentConfig.customJobs(context)
105
- : context.componentConfig.customJobs;
102
+ var rawJobs = context.customJobs;
106
103
  return injectDefaultVarsInCustomJobs(context, rawJobs);
107
104
  };
108
105
  var createRawJobs = function (context) {
109
- var buildJobs = build_1.BUILD_TYPES[context.componentConfig.build.type].jobs(context);
110
- var deployJobs = context.componentConfig.deploy !== false
111
- ? deploy_1.DEPLOY_TYPES[context.componentConfig.deploy.type].jobs(context)
106
+ var _a, _b;
107
+ var buildJobs = build_1.BUILD_TYPES[context.build.config.type].jobs(context);
108
+ var deployJobs = ((_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config)
109
+ ? deploy_1.DEPLOY_TYPES[(_b = context.deploy) === null || _b === void 0 ? void 0 : _b.config.type].jobs(context)
112
110
  : [];
113
111
  var customJobs = getCustomJobs(context);
114
112
  return __spreadArray(__spreadArray(__spreadArray([], __read(buildJobs), false), __read(deployJobs), false), __read(customJobs), false);
@@ -1 +1 @@
1
- {"version":3,"file":"createJobsForComponent.js","sourceRoot":"","sources":["../../../../../pipeline/src/pipeline/createJobsForComponent.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAAoC;AACpC,kCAAuC;AAEvC,sCAAoD;AACpD,oCAAyC;AAOzC,mDAAyD;AAEzD,IAAM,6BAA6B,GAAG,UACpC,OAAyB,EACzB,IAAoB;IAEpB,OAAA,IAAI,CAAC,GAAG,CAAC,UAAC,EAAqB;;QAAnB,IAAA,SAAS,eAAA,EAAK,GAAG,cAAnB,aAAqB,CAAF;QAAO,OAAA,YAClC,SAAS,wBACJ,CAAC,MAAA,OAAO,CAAC,WAAW,CAAC,OAAO,mCAAI,EAAE,CAAC,GACnC,CAAC,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,EAAE,CAAC,KAEnB,GAAG,EACN,CAAA;KAAA,CAAC;AANH,CAMG,CAAC;AACN,IAAM,aAAa,GAAG,UAAC,OAAyB;IAC9C,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,UAAU,EAAE,CAAC;QACxC,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,IAAM,OAAO,GAAG,IAAA,mBAAU,EAAC,OAAO,CAAC,eAAe,CAAC,UAAU,CAAC;QAC5D,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,UAAU,CAAC,OAAO,CAAC;QAC7C,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,UAAU,CAAC;IACvC,OAAO,6BAA6B,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AACzD,CAAC,CAAC;AACF,IAAM,aAAa,GAAG,UAAC,OAAgB;IACrC,IAAM,SAAS,GACb,mBAAW,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAChE,IAAM,UAAU,GACd,OAAO,CAAC,eAAe,CAAC,MAAM,KAAK,KAAK;QACtC,CAAC,CAAC,qBAAY,CAAC,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC;QACjE,CAAC,CAAC,EAAE,CAAC;IAET,IAAM,UAAU,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;IAC1C,4DAAW,SAAS,kBAAK,UAAU,kBAAK,UAAU,UAAE;AACtD,CAAC,CAAC;AAEK,IAAM,sBAAsB,GAAG,UACpC,cAAyE;;;;oBAE9C,qBAAM,IAAA,sCAAqB,EACpD,cAAc,CAAC,MAAM,EACrB,cAAc,CAAC,aAAa,CAC7B,EAAA;;gBAHK,kBAAkB,GAAG,SAG1B;gBAEe,qBAAM,IAAA,gCAAsB,wBACvC,cAAc,KACjB,kBAAkB,oBAAA,IAClB,EAAA;;gBAHI,OAAO,GAAG,SAGd;gBACF,sBAAO,aAAa,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,UAAC,GAAG,IAAK,OAAA,uBAAM,GAAG,KAAE,OAAO,SAAA,IAAG,EAArB,CAAqB,CAAC,EAAC;;;KACnE,CAAC;AAbW,QAAA,sBAAsB,0BAajC"}
1
+ {"version":3,"file":"createJobsForComponent.js","sourceRoot":"","sources":["../../../../../pipeline/src/pipeline/createJobsForComponent.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,kCAAuC;AAEvC,sCAAoD;AACpD,oCAAyC;AAOzC,mDAAyD;AAEzD,IAAM,6BAA6B,GAAG,UACpC,OAAyB,EACzB,IAAoB;IAEpB,OAAA,IAAI,CAAC,GAAG,CAAC,UAAC,EAAqB;;QAAnB,IAAA,SAAS,eAAA,EAAK,GAAG,cAAnB,aAAqB,CAAF;QAAO,OAAA,YAClC,SAAS,wBACJ,CAAC,MAAA,OAAO,CAAC,WAAW,CAAC,OAAO,mCAAI,EAAE,CAAC,GACnC,CAAC,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,EAAE,CAAC,KAEnB,GAAG,EACN,CAAA;KAAA,CAAC;AANH,CAMG,CAAC;AACN,IAAM,aAAa,GAAG,UAAC,OAAyB;IAC9C,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;QACxB,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,IAAM,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;IACnC,OAAO,6BAA6B,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AACzD,CAAC,CAAC;AACF,IAAM,aAAa,GAAG,UAAC,OAAgB;;IACrC,IAAM,SAAS,GAAG,mBAAW,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACvE,IAAM,UAAU,GAAG,CAAA,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM;QACvC,CAAC,CAAC,qBAAY,CAAC,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC;QACzD,CAAC,CAAC,EAAE,CAAC;IAEP,IAAM,UAAU,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;IAC1C,4DAAW,SAAS,kBAAK,UAAU,kBAAK,UAAU,UAAE;AACtD,CAAC,CAAC;AAEK,IAAM,sBAAsB,GAAG,UACpC,cAAyE;;;;oBAE9C,qBAAM,IAAA,sCAAqB,EACpD,cAAc,CAAC,MAAM,EACrB,cAAc,CAAC,aAAa,CAC7B,EAAA;;gBAHK,kBAAkB,GAAG,SAG1B;gBAEe,qBAAM,IAAA,gCAAsB,wBACvC,cAAc,KACjB,kBAAkB,oBAAA,IAClB,EAAA;;gBAHI,OAAO,GAAG,SAGd;gBACF,sBAAO,aAAa,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,UAAC,GAAG,IAAK,OAAA,uBAAM,GAAG,KAAE,OAAO,SAAA,IAAG,EAArB,CAAqB,CAAC,EAAC;;;KACnE,CAAC;AAbW,QAAA,sBAAsB,0BAajC"}