@catladder/cli 0.0.0-remove-env-mode-none-9b62fbb1 → 0.0.0-remove-sbom-91cda0a4

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 (104) hide show
  1. package/dist/bundles/catci/index.js +2028 -2142
  2. package/dist/bundles/catenv/index.js +1774 -1692
  3. package/dist/bundles/cli/index.js +9668 -9694
  4. package/dist/cli/src/apps/catenv/catenv.d.ts +4 -1
  5. package/dist/cli/src/apps/catenv/catenv.js +5 -1
  6. package/dist/cli/src/apps/catenv/catenv.js.map +1 -1
  7. package/dist/cli/src/apps/catenv/verboseBanner.d.ts +1 -0
  8. package/dist/cli/src/apps/catenv/verboseBanner.js +30 -0
  9. package/dist/cli/src/apps/catenv/verboseBanner.js.map +1 -0
  10. package/dist/cli/src/apps/cli/commands/project/cloudSql/commandProjectRestoreDb.js +40 -14
  11. package/dist/cli/src/apps/cli/commands/project/cloudSql/commandProjectRestoreDb.js.map +1 -1
  12. package/dist/cli/src/catenv.js +5 -2
  13. package/dist/cli/src/catenv.js.map +1 -1
  14. package/dist/cli/src/config/getProjectConfig.d.ts +3 -1
  15. package/dist/cli/src/config/getProjectConfig.js +2 -2
  16. package/dist/cli/src/config/getProjectConfig.js.map +1 -1
  17. package/dist/cli/src/gcloud/cloudSql/copyDb.js +6 -3
  18. package/dist/cli/src/gcloud/cloudSql/copyDb.js.map +1 -1
  19. package/dist/cli/src/gcloud/cloudSql/parseConnectionString.d.ts +9 -0
  20. package/dist/cli/src/gcloud/cloudSql/parseConnectionString.js +22 -0
  21. package/dist/cli/src/gcloud/cloudSql/parseConnectionString.js.map +1 -0
  22. package/dist/pipeline/src/build/artifacts/createBuildJobArtifact.js +7 -2
  23. package/dist/pipeline/src/build/artifacts/createBuildJobArtifact.js.map +1 -1
  24. package/dist/pipeline/src/build/base/index.js +0 -3
  25. package/dist/pipeline/src/build/base/index.js.map +1 -1
  26. package/dist/pipeline/src/build/custom/testJob.js +22 -11
  27. package/dist/pipeline/src/build/custom/testJob.js.map +1 -1
  28. package/dist/pipeline/src/build/docker.d.ts +1 -1
  29. package/dist/pipeline/src/build/docker.js +21 -7
  30. package/dist/pipeline/src/build/docker.js.map +1 -1
  31. package/dist/pipeline/src/build/node/cache.js +14 -2
  32. package/dist/pipeline/src/build/node/cache.js.map +1 -1
  33. package/dist/pipeline/src/build/node/testJob.js +22 -11
  34. package/dist/pipeline/src/build/node/testJob.js.map +1 -1
  35. package/dist/pipeline/src/build/node/yarn.d.ts +2 -1
  36. package/dist/pipeline/src/build/node/yarn.js +16 -3
  37. package/dist/pipeline/src/build/node/yarn.js.map +1 -1
  38. package/dist/pipeline/src/build/rails/index.js +2 -2
  39. package/dist/pipeline/src/build/rails/index.js.map +1 -1
  40. package/dist/pipeline/src/build/rails/{test.js → testJob.js} +1 -1
  41. package/dist/pipeline/src/build/rails/testJob.js.map +1 -0
  42. package/dist/pipeline/src/build/types.d.ts +25 -11
  43. package/dist/pipeline/src/build/types.js.map +1 -1
  44. package/dist/pipeline/src/config/readConfig.js +20 -1
  45. package/dist/pipeline/src/config/readConfig.js.map +1 -1
  46. package/dist/pipeline/src/context/getEnvironmentVariables.d.ts +4 -4
  47. package/dist/pipeline/src/context/getEnvironmentVariables.js +8 -8
  48. package/dist/pipeline/src/context/getEnvironmentVariables.js.map +1 -1
  49. package/dist/pipeline/src/defaults/index.js +0 -1
  50. package/dist/pipeline/src/defaults/index.js.map +1 -1
  51. package/dist/pipeline/src/deploy/base/deploy.js +34 -35
  52. package/dist/pipeline/src/deploy/base/deploy.js.map +1 -1
  53. package/dist/pipeline/src/deploy/base/stop.js +0 -6
  54. package/dist/pipeline/src/deploy/base/stop.js.map +1 -1
  55. package/dist/pipeline/src/deploy/cloudRun/createJobs/cloudRunServices.js +1 -0
  56. package/dist/pipeline/src/deploy/cloudRun/createJobs/cloudRunServices.js.map +1 -1
  57. package/dist/pipeline/src/deploy/cloudRun/createJobs/execute/onDeploy.js +39 -36
  58. package/dist/pipeline/src/deploy/cloudRun/createJobs/execute/onDeploy.js.map +1 -1
  59. package/dist/pipeline/src/deploy/cloudRun/createJobs/getCloudRunDeployScripts.js +0 -2
  60. package/dist/pipeline/src/deploy/cloudRun/createJobs/getCloudRunDeployScripts.js.map +1 -1
  61. package/dist/pipeline/src/deploy/cloudRun/createJobs/getCloudRunStopScripts.js +0 -2
  62. package/dist/pipeline/src/deploy/cloudRun/createJobs/getCloudRunStopScripts.js.map +1 -1
  63. package/dist/pipeline/src/deploy/custom/deployJob.js +1 -6
  64. package/dist/pipeline/src/deploy/custom/deployJob.js.map +1 -1
  65. package/dist/pipeline/src/deploy/kubernetes/deployJob.js +1 -7
  66. package/dist/pipeline/src/deploy/kubernetes/deployJob.js.map +1 -1
  67. package/dist/pipeline/src/deploy/kubernetes/mongodb.d.ts +4 -0
  68. package/dist/pipeline/src/deploy/kubernetes/mongodb.js +4 -0
  69. package/dist/pipeline/src/deploy/kubernetes/mongodb.js.map +1 -1
  70. package/dist/pipeline/src/deploy/types/executeBase.d.ts +24 -0
  71. package/dist/pipeline/src/deploy/types/executeBase.js +3 -0
  72. package/dist/pipeline/src/deploy/types/executeBase.js.map +1 -0
  73. package/dist/pipeline/src/deploy/types/googleCloudRun.d.ts +13 -5
  74. package/dist/pipeline/src/deploy/types/googleCloudRun.js.map +1 -1
  75. package/dist/pipeline/src/index.d.ts +1 -0
  76. package/dist/pipeline/src/index.js +1 -0
  77. package/dist/pipeline/src/index.js.map +1 -1
  78. package/dist/pipeline/src/pipeline/gitlab/gitlabReleaseJobs.d.ts +2 -0
  79. package/dist/pipeline/src/pipeline/gitlab/gitlabReleaseJobs.js +5 -3
  80. package/dist/pipeline/src/pipeline/gitlab/gitlabReleaseJobs.js.map +1 -1
  81. package/dist/pipeline/src/types/config.d.ts +5 -1
  82. package/dist/pipeline/src/utils/measureTime.d.ts +6 -0
  83. package/dist/pipeline/src/utils/measureTime.js +42 -0
  84. package/dist/pipeline/src/utils/measureTime.js.map +1 -0
  85. package/dist/tsconfig.tsbuildinfo +1 -1
  86. package/package.json +3 -3
  87. package/src/apps/catenv/catenv.ts +8 -2
  88. package/src/apps/catenv/verboseBanner.ts +33 -0
  89. package/src/apps/cli/commands/project/cloudSql/commandProjectRestoreDb.ts +41 -16
  90. package/src/catenv.ts +6 -2
  91. package/src/config/getProjectConfig.ts +2 -1
  92. package/src/gcloud/cloudSql/copyDb.ts +7 -3
  93. package/src/gcloud/cloudSql/parseConnectionString.ts +28 -0
  94. package/dist/pipeline/src/build/rails/test.js.map +0 -1
  95. package/dist/pipeline/src/build/sbom.d.ts +0 -5
  96. package/dist/pipeline/src/build/sbom.js +0 -45
  97. package/dist/pipeline/src/build/sbom.js.map +0 -1
  98. package/dist/pipeline/src/deploy/sbom.d.ts +0 -4
  99. package/dist/pipeline/src/deploy/sbom.js +0 -30
  100. package/dist/pipeline/src/deploy/sbom.js.map +0 -1
  101. package/dist/pipeline/src/pipeline/yarn/yarnUtils.d.ts +0 -5
  102. package/dist/pipeline/src/pipeline/yarn/yarnUtils.js +0 -51
  103. package/dist/pipeline/src/pipeline/yarn/yarnUtils.js.map +0 -1
  104. /package/dist/pipeline/src/build/rails/{test.d.ts → testJob.d.ts} +0 -0
@@ -1,6 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.getOnDeployExecuteScript = void 0;
4
+ const utils_1 = require("../../../../utils");
4
5
  const createArgsString_1 = require("../../utils/createArgsString");
5
6
  const getJobOrServiceArgs_1 = require("../../utils/getJobOrServiceArgs");
6
7
  const jobName_1 = require("../../utils/jobName");
@@ -9,8 +10,8 @@ const common_1 = require("../common");
9
10
  const getOnDeployExecuteScript = (context, when) => {
10
11
  const executes = getExecutes(context);
11
12
  return executes
12
- .filter(({ config }) => config.when === when)
13
- .map((execute) => {
13
+ .filter((config) => config.when === when)
14
+ .flatMap((execute) => {
14
15
  return getJobRunScriptForExecute(context, execute);
15
16
  });
16
17
  };
@@ -21,15 +22,11 @@ const getExecutes = (context) => {
21
22
  return [
22
23
  ...getLegacyExecutes(context),
23
24
  ...Object.entries((_a = deployConfig.execute) !== null && _a !== void 0 ? _a : {}).flatMap(([key, value]) => {
24
- if (!value || (value.when !== "schedule" && value.type !== "job")) {
25
+ // remove all schedule executes
26
+ if (!value) {
25
27
  return [];
26
28
  }
27
- return [
28
- {
29
- jobName: key,
30
- config: value,
31
- },
32
- ];
29
+ return [value];
33
30
  }),
34
31
  ];
35
32
  };
@@ -42,37 +39,43 @@ const getLegacyExecutes = (context) => {
42
39
  }
43
40
  return [
44
41
  {
45
- jobName,
46
- config: {
47
- job: jobName,
48
- type: "job",
49
- when: job.when,
50
- ...(job.when === "preDeploy" || job.when === "postDeploy"
51
- ? {
52
- waitForCompletion: job.waitForCompletion,
53
- }
54
- : {}),
55
- },
42
+ job: jobName,
43
+ type: "job",
44
+ when: job.when,
45
+ ...(job.when === "preDeploy" || job.when === "postDeploy"
46
+ ? {
47
+ waitForCompletion: job.waitForCompletion,
48
+ }
49
+ : {}),
56
50
  },
57
51
  ];
58
52
  });
59
53
  };
60
- const getJobRunScriptForExecute = (context, { jobName, config }) => {
54
+ const getJobRunScriptForExecute = (context, config) => {
61
55
  var _a;
62
- const commonArgs = (0, common_1.getCommonCloudRunArgs)(context);
63
- // always wait for completion for preStop and postStop jobs
64
- // since stop will delete the jobs afterwards, so they will fail
65
- const waitForCompletion = ["preStop", "postStop"].includes(config.when)
66
- ? true // always
67
- : "waitForCompletion" in config
68
- ? ((_a = config.waitForCompletion) !== null && _a !== void 0 ? _a : false) // depends on config
69
- : false;
70
- const argString = (0, createArgsString_1.createArgsString)({
71
- ...commonArgs,
72
- wait: waitForCompletion === true ? true : undefined,
73
- args: (0, getJobOrServiceArgs_1.getCloudRunServiceOrJobArgsArg)(config.args),
74
- });
75
- const fullJobName = (0, jobName_1.getFullJobName)(context, jobName);
76
- return `${(0, common_1.gcloudRunCmd)()} jobs execute ${fullJobName.toString()} ${argString}`;
56
+ const type = config.type;
57
+ if (type === "script") {
58
+ return (0, utils_1.ensureArray)(config.script);
59
+ }
60
+ else if (type === "job") {
61
+ const commonArgs = (0, common_1.getCommonCloudRunArgs)(context);
62
+ // always wait for completion for preStop and postStop jobs
63
+ // since stop will delete the jobs afterwards, so they will fail
64
+ const waitForCompletion = ["preStop", "postStop"].includes(config.when)
65
+ ? true // always
66
+ : "waitForCompletion" in config
67
+ ? ((_a = config.waitForCompletion) !== null && _a !== void 0 ? _a : false) // depends on config
68
+ : false;
69
+ const argString = (0, createArgsString_1.createArgsString)({
70
+ ...commonArgs,
71
+ wait: waitForCompletion === true ? true : undefined,
72
+ args: (0, getJobOrServiceArgs_1.getCloudRunServiceOrJobArgsArg)(config.args),
73
+ });
74
+ const fullJobName = (0, jobName_1.getFullJobName)(context, config.job);
75
+ return [
76
+ `${(0, common_1.gcloudRunCmd)()} jobs execute ${fullJobName.toString()} ${argString}`,
77
+ ];
78
+ }
79
+ throw new Error(`unsupported execute type: ${type}`);
77
80
  };
78
81
  //# sourceMappingURL=onDeploy.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"onDeploy.js","sourceRoot":"","sources":["../../../../../../../../pipeline/src/deploy/cloudRun/createJobs/execute/onDeploy.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"onDeploy.js","sourceRoot":"","sources":["../../../../../../../../pipeline/src/deploy/cloudRun/createJobs/execute/onDeploy.ts"],"names":[],"mappings":"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"}
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.getCloudRunDeployScripts = void 0;
4
4
  const lodash_1 = require("lodash");
5
5
  const gitlab_1 = require("../../../utils/gitlab");
6
- const sbom_1 = require("../../sbom");
7
6
  const __1 = require("..");
8
7
  const bashYaml_1 = require("../../../bash/bashYaml");
9
8
  const cleanup_1 = require("../cleanup");
@@ -41,7 +40,6 @@ function getCloudRunDeployScripts(context) {
41
40
  ...(0, onDeploy_1.getOnDeployExecuteScript)(context, "postDeploy"),
42
41
  ]),
43
42
  ...(0, gitlab_1.collapseableSection)("cleanup", "Cleanup")((0, cleanup_1.getRemoveOldRevisionsAndImagesCommand)(context, "postDeploy")),
44
- ...(0, sbom_1.getDependencyTrackUploadScript)(context),
45
43
  ];
46
44
  }
47
45
  exports.getCloudRunDeployScripts = getCloudRunDeployScripts;
@@ -1 +1 @@
1
- {"version":3,"file":"getCloudRunDeployScripts.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/getCloudRunDeployScripts.ts"],"names":[],"mappings":";;;AAAA,mCAA8B;AAE9B,kDAA4D;AAC5D,qCAA4D;AAE5D,0BAAmD;AACnD,qDAAmE;AACnE,wCAAmE;AACnE,gDAA4D;AAC5D,kGAA+F;AAC/F,iDAAqD;AACrD,iDAA8D;AAC9D,yDAA4D;AAC5D,qCAGkB;AAClB,2CAAgD;AAChD,mDAA8D;AAG9D,SAAgB,wBAAwB,CAAC,OAAyB;;IAChE,MAAM,YAAY,GAAG,IAAA,gCAAuB,EAAC,OAAO,CAAC,CAAC;IACtD,MAAM,UAAU,GAAG,IAAA,aAAI,EACrB,OAAO,CAAC,WAAW,CAAC,OAAO,EAC3B,iCAA6B,CAC9B,CAAC;IAEF,OAAO;QACL,GAAG,IAAA,4BAAmB,EACpB,SAAS,EACT,YAAY,CACb,CAAC;YACA,GAAG,IAAA,qEAAiC,EAAC,OAAO,CAAC;YAC7C,GAAG,IAAA,qCAA4B,EAAC,YAAY,CAAC;SAC9C,CAAC;QACF,GAAG,IAAA,4BAAmB,EACpB,cAAc,EACd,wBAAwB,CACzB,CAAC,IAAA,oCAAyB,EAAC,UAAU,EAAE,6BAAiB,CAAC,CAAC;QAE3D,GAAG,IAAA,4BAAmB,EACpB,QAAQ,EACR,qBAAqB,CACtB,CAAC;YACA,GAAG,CAAC,YAAY,CAAC,QAAQ;gBACvB,CAAC,CAAC,IAAA,kCAAuB,EAAC,OAAO,EAAE,YAAY,CAAC,CAAC,6DAA6D;gBAC9G,CAAC,CAAC,EAAE,CAAC;YACP,GAAG,IAAA,mCAAuB,EAAC,OAAO,CAAC;YACnC,GAAG,IAAA,kCAAmB,EAAC,OAAO,CAAC;YAC/B,GAAG,IAAA,mCAAwB,EAAC,OAAO,EAAE,WAAW,CAAC;YAEjD,GAAG,CAAC,YAAY,CAAC,OAAO,KAAK,KAAK;gBAChC,CAAC,CAAC,CAAC,IAAA,yCAAsB,EAAC,OAAO,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;gBACzD,CAAC,CAAC,EAAE,CAAC;YACP,GAAG,MAAM,CAAC,OAAO,CAAC,MAAA,YAAY,CAAC,kBAAkB,mCAAI,EAAE,CAAC;iBACrD,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,OAAO,KAAK,KAAK,IAAI,OAAO,KAAK,IAAI,CAAC;iBAC/D,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,EAAE,CACvB,IAAA,yCAAsB,EACpB,OAAO,EACP,OAAsC,EACtC,GAAG,GAAG,IAAI,CACX,CACF;YACH,GAAG,IAAA,mCAAwB,EAAC,OAAO,EAAE,YAAY,CAAC;SACnD,CAAC;QACF,GAAG,IAAA,4BAAmB,EACpB,SAAS,EACT,SAAS,CACV,CACC,IAAA,+CAAqC,EAAC,OAAO,EAAE,YAAY,CAAC,CAC7D;QACD,GAAG,IAAA,qCAA8B,EAAC,OAAO,CAAC;KAC3C,CAAC;AACJ,CAAC;AArDD,4DAqDC"}
1
+ {"version":3,"file":"getCloudRunDeployScripts.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/getCloudRunDeployScripts.ts"],"names":[],"mappings":";;;AAAA,mCAA8B;AAE9B,kDAA4D;AAE5D,0BAAmD;AACnD,qDAAmE;AACnE,wCAAmE;AACnE,gDAA4D;AAC5D,kGAA+F;AAC/F,iDAAqD;AACrD,iDAA8D;AAC9D,yDAA4D;AAC5D,qCAGkB;AAClB,2CAAgD;AAChD,mDAA8D;AAG9D,SAAgB,wBAAwB,CAAC,OAAyB;;IAChE,MAAM,YAAY,GAAG,IAAA,gCAAuB,EAAC,OAAO,CAAC,CAAC;IACtD,MAAM,UAAU,GAAG,IAAA,aAAI,EACrB,OAAO,CAAC,WAAW,CAAC,OAAO,EAC3B,iCAA6B,CAC9B,CAAC;IAEF,OAAO;QACL,GAAG,IAAA,4BAAmB,EACpB,SAAS,EACT,YAAY,CACb,CAAC;YACA,GAAG,IAAA,qEAAiC,EAAC,OAAO,CAAC;YAC7C,GAAG,IAAA,qCAA4B,EAAC,YAAY,CAAC;SAC9C,CAAC;QACF,GAAG,IAAA,4BAAmB,EACpB,cAAc,EACd,wBAAwB,CACzB,CAAC,IAAA,oCAAyB,EAAC,UAAU,EAAE,6BAAiB,CAAC,CAAC;QAE3D,GAAG,IAAA,4BAAmB,EACpB,QAAQ,EACR,qBAAqB,CACtB,CAAC;YACA,GAAG,CAAC,YAAY,CAAC,QAAQ;gBACvB,CAAC,CAAC,IAAA,kCAAuB,EAAC,OAAO,EAAE,YAAY,CAAC,CAAC,6DAA6D;gBAC9G,CAAC,CAAC,EAAE,CAAC;YACP,GAAG,IAAA,mCAAuB,EAAC,OAAO,CAAC;YACnC,GAAG,IAAA,kCAAmB,EAAC,OAAO,CAAC;YAC/B,GAAG,IAAA,mCAAwB,EAAC,OAAO,EAAE,WAAW,CAAC;YAEjD,GAAG,CAAC,YAAY,CAAC,OAAO,KAAK,KAAK;gBAChC,CAAC,CAAC,CAAC,IAAA,yCAAsB,EAAC,OAAO,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;gBACzD,CAAC,CAAC,EAAE,CAAC;YACP,GAAG,MAAM,CAAC,OAAO,CAAC,MAAA,YAAY,CAAC,kBAAkB,mCAAI,EAAE,CAAC;iBACrD,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,OAAO,KAAK,KAAK,IAAI,OAAO,KAAK,IAAI,CAAC;iBAC/D,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,EAAE,CACvB,IAAA,yCAAsB,EACpB,OAAO,EACP,OAAsC,EACtC,GAAG,GAAG,IAAI,CACX,CACF;YACH,GAAG,IAAA,mCAAwB,EAAC,OAAO,EAAE,YAAY,CAAC;SACnD,CAAC;QACF,GAAG,IAAA,4BAAmB,EACpB,SAAS,EACT,SAAS,CACV,CACC,IAAA,+CAAqC,EAAC,OAAO,EAAE,YAAY,CAAC,CAC7D;KACF,CAAC;AACJ,CAAC;AApDD,4DAoDC"}
@@ -1,7 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.getCloudRunStopScripts = void 0;
4
- const sbom_1 = require("../../sbom");
5
4
  const cleanup_1 = require("../cleanup");
6
5
  const database_1 = require("../utils/database");
7
6
  const gcloudServiceAccountLoginCommands_1 = require("../utils/gcloudServiceAccountLoginCommands");
@@ -27,7 +26,6 @@ function getCloudRunStopScripts(context) {
27
26
  ? (0, database_1.getDatabaseDeleteScript)(context, deployConfig)
28
27
  : []),
29
28
  ...(0, cleanup_1.getRemoveOldRevisionsAndImagesCommand)(context, "onStop"), // we cleanup inactive images both on deploy and stop
30
- ...(0, sbom_1.getDependencyTrackDeleteScript)(context),
31
29
  ];
32
30
  }
33
31
  exports.getCloudRunStopScripts = getCloudRunStopScripts;
@@ -1 +1 @@
1
- {"version":3,"file":"getCloudRunStopScripts.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/getCloudRunStopScripts.ts"],"names":[],"mappings":";;;AACA,qCAA4D;AAE5D,wCAAmE;AACnE,gDAA4D;AAC5D,kGAA+F;AAC/F,iDAAsD;AACtD,iDAA8D;AAC9D,mDAA+D;AAC/D,yDAA4D;AAC5D,qCAAmD;AAEnD,SAAgB,sBAAsB,CAAC,OAAyB;;IAC9D,MAAM,YAAY,GAAG,IAAA,gCAAuB,EAAC,OAAO,CAAC,CAAC;IACtD,OAAO;QACL,GAAG,IAAA,qEAAiC,EAAC,OAAO,CAAC;QAC7C,GAAG,IAAA,mCAAwB,EAAC,OAAO,EAAE,SAAS,CAAC;QAC/C,GAAG,CAAC,YAAY,CAAC,OAAO,KAAK,KAAK,CAAC,CAAC,CAAC,IAAA,yCAAsB,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1E,GAAG,MAAM,CAAC,OAAO,CAAC,MAAA,YAAY,CAAC,kBAAkB,mCAAI,EAAE,CAAC;aACrD,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,OAAO,KAAK,KAAK,IAAI,OAAO,KAAK,IAAI,CAAC;aAC/D,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,IAAA,yCAAsB,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAC7D,GAAG,IAAA,mCAAwB,EAAC,OAAO,EAAE,UAAU,CAAC;QAChD,GAAG,IAAA,oCAAwB,EAAC,OAAO,CAAC;QACpC,GAAG,IAAA,mCAAoB,EAAC,OAAO,CAAC;QAChC,GAAG,CAAC,YAAY,CAAC,QAAQ,IAAI,YAAY,CAAC,QAAQ,CAAC,oBAAoB;YACrE,CAAC,CAAC,IAAA,kCAAuB,EAAC,OAAO,EAAE,YAAY,CAAC;YAChD,CAAC,CAAC,EAAE,CAAC;QAEP,GAAG,IAAA,+CAAqC,EAAC,OAAO,EAAE,QAAQ,CAAC,EAAE,qDAAqD;QAClH,GAAG,IAAA,qCAA8B,EAAC,OAAO,CAAC;KAC3C,CAAC;AACJ,CAAC;AAnBD,wDAmBC"}
1
+ {"version":3,"file":"getCloudRunStopScripts.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/getCloudRunStopScripts.ts"],"names":[],"mappings":";;;AAEA,wCAAmE;AACnE,gDAA4D;AAC5D,kGAA+F;AAC/F,iDAAsD;AACtD,iDAA8D;AAC9D,mDAA+D;AAC/D,yDAA4D;AAC5D,qCAAmD;AAEnD,SAAgB,sBAAsB,CAAC,OAAyB;;IAC9D,MAAM,YAAY,GAAG,IAAA,gCAAuB,EAAC,OAAO,CAAC,CAAC;IACtD,OAAO;QACL,GAAG,IAAA,qEAAiC,EAAC,OAAO,CAAC;QAC7C,GAAG,IAAA,mCAAwB,EAAC,OAAO,EAAE,SAAS,CAAC;QAC/C,GAAG,CAAC,YAAY,CAAC,OAAO,KAAK,KAAK,CAAC,CAAC,CAAC,IAAA,yCAAsB,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1E,GAAG,MAAM,CAAC,OAAO,CAAC,MAAA,YAAY,CAAC,kBAAkB,mCAAI,EAAE,CAAC;aACrD,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,OAAO,KAAK,KAAK,IAAI,OAAO,KAAK,IAAI,CAAC;aAC/D,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,IAAA,yCAAsB,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAC7D,GAAG,IAAA,mCAAwB,EAAC,OAAO,EAAE,UAAU,CAAC;QAChD,GAAG,IAAA,oCAAwB,EAAC,OAAO,CAAC;QACpC,GAAG,IAAA,mCAAoB,EAAC,OAAO,CAAC;QAChC,GAAG,CAAC,YAAY,CAAC,QAAQ,IAAI,YAAY,CAAC,QAAQ,CAAC,oBAAoB;YACrE,CAAC,CAAC,IAAA,kCAAuB,EAAC,OAAO,EAAE,YAAY,CAAC;YAChD,CAAC,CAAC,EAAE,CAAC;QAEP,GAAG,IAAA,+CAAqC,EAAC,OAAO,EAAE,QAAQ,CAAC,EAAE,qDAAqD;KACnH,CAAC;AACJ,CAAC;AAlBD,wDAkBC"}
@@ -5,7 +5,6 @@ const getAllCacheConfigsFromConfig_1 = require("../../build/cache/getAllCacheCon
5
5
  const yarn_1 = require("../../build/node/yarn");
6
6
  const runner_1 = require("../../runner");
7
7
  const base_1 = require("../base");
8
- const sbom_1 = require("../sbom");
9
8
  const types_1 = require("../types");
10
9
  const createCustomDeployJobs = (context) => {
11
10
  var _a, _b, _c;
@@ -26,17 +25,13 @@ const createCustomDeployJobs = (context) => {
26
25
  `cd ${context.build.dir}`,
27
26
  ...(deployConfig.requiresYarnInstall ? yarnInstall : []),
28
27
  ...deployConfig.script,
29
- ...(0, sbom_1.getDependencyTrackUploadScript)(context),
30
28
  ],
31
29
  variables: {},
32
30
  },
33
31
  stop: deployConfig.stopScript
34
32
  ? {
35
33
  image: (_c = deployConfig.jobImage) !== null && _c !== void 0 ? _c : (0, runner_1.getRunnerImage)("jobs-default"),
36
- script: [
37
- ...deployConfig.stopScript,
38
- ...(0, sbom_1.getDependencyTrackDeleteScript)(context),
39
- ],
34
+ script: [...deployConfig.stopScript],
40
35
  variables: {},
41
36
  }
42
37
  : undefined,
@@ -1 +1 @@
1
- {"version":3,"file":"deployJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/custom/deployJob.ts"],"names":[],"mappings":";;;AAAA,iGAA8F;AAC9F,gDAAuD;AACvD,yCAA8C;AAG9C,kCAAgD;AAChD,kCAGiB;AACjB,oCAA0C;AAEnC,MAAM,sBAAsB,GAAG,CACpC,OAAyB,EACT,EAAE;;IAClB,MAAM,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,MAAM,WAAW,GAAG,IAAA,qBAAc,EAAC,OAAO,EAAE;QAC1C,mBAAmB,EAAE,IAAI;KAC1B,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,IAAA,4BAAqB,EAAC,OAAO,EAAE;QAC5C,MAAM,EAAE;YACN,KAAK,EAAE,MAAA,YAAY,CAAC,QAAQ,mCAAI,IAAA,uBAAc,EAAC,cAAc,CAAC;YAC9D,KAAK,EAAE,IAAA,2DAA4B,EAAC,OAAO,EAAE,YAAY,CAAC;YAC1D,MAAM,EAAE;gBACN,MAAM,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE;gBACzB,GAAG,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;gBACxD,GAAG,YAAY,CAAC,MAAM;gBACtB,GAAG,IAAA,qCAA8B,EAAC,OAAO,CAAC;aAC3C;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,EAAE;oBACN,GAAG,YAAY,CAAC,UAAU;oBAC1B,GAAG,IAAA,qCAA8B,EAAC,OAAO,CAAC;iBAC3C;gBACD,SAAS,EAAE,EAAE;aACd;YACH,CAAC,CAAC,SAAS;KACd,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAtCW,QAAA,sBAAsB,0BAsCjC"}
1
+ {"version":3,"file":"deployJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/custom/deployJob.ts"],"names":[],"mappings":";;;AAAA,iGAA8F;AAC9F,gDAAuD;AACvD,yCAA8C;AAG9C,kCAAgD;AAEhD,oCAA0C;AAEnC,MAAM,sBAAsB,GAAG,CACpC,OAAyB,EACT,EAAE;;IAClB,MAAM,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,MAAM,WAAW,GAAG,IAAA,qBAAc,EAAC,OAAO,EAAE;QAC1C,mBAAmB,EAAE,IAAI;KAC1B,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,IAAA,4BAAqB,EAAC,OAAO,EAAE;QAC5C,MAAM,EAAE;YACN,KAAK,EAAE,MAAA,YAAY,CAAC,QAAQ,mCAAI,IAAA,uBAAc,EAAC,cAAc,CAAC;YAC9D,KAAK,EAAE,IAAA,2DAA4B,EAAC,OAAO,EAAE,YAAY,CAAC;YAC1D,MAAM,EAAE;gBACN,MAAM,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE;gBACzB,GAAG,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;gBACxD,GAAG,YAAY,CAAC,MAAM;aACvB;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,EAAE,CAAC,GAAG,YAAY,CAAC,UAAU,CAAC;gBACpC,SAAS,EAAE,EAAE;aACd;YACH,CAAC,CAAC,SAAS;KACd,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAlCW,QAAA,sBAAsB,0BAkCjC"}
@@ -4,7 +4,6 @@ exports.createKubernetesDeployJobs = void 0;
4
4
  const getEnvironmentVariables_1 = require("../../context/getEnvironmentVariables");
5
5
  const runner_1 = require("../../runner");
6
6
  const base_1 = require("../base");
7
- const sbom_1 = require("../sbom");
8
7
  const types_1 = require("../types");
9
8
  const kubeValues_1 = require("./kubeValues");
10
9
  const bashYaml_1 = require("../../bash/bashYaml");
@@ -57,17 +56,12 @@ const createKubernetesDeployJobs = (context) => {
57
56
  ...(0, gitlab_1.collapseableSection)("writeallvalues", "Write " + ALL_VALUES_FILE + " for helm deployment")((0, bashYaml_1.writeBashYamlToFileScript)((0, kubeValues_1.createKubeValues)(context), ALL_VALUES_FILE)),
58
57
  "kubernetesCreateSecret",
59
58
  "kubernetesDeploy",
60
- ...(0, sbom_1.getDependencyTrackUploadScript)(context),
61
59
  "echo deployment successful 😻",
62
60
  ],
63
61
  },
64
62
  stop: {
65
63
  ...shared,
66
- script: [
67
- ...connectContext,
68
- "kubernetesDelete",
69
- ...(0, sbom_1.getDependencyTrackDeleteScript)(context),
70
- ],
64
+ script: [...connectContext, "kubernetesDelete"],
71
65
  },
72
66
  rollback: {
73
67
  ...shared,
@@ -1 +1 @@
1
- {"version":3,"file":"deployJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/kubernetes/deployJob.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"deployJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/kubernetes/deployJob.ts"],"names":[],"mappings":";;;AAAA,mFAAmF;AACnF,yCAA8C;AAG9C,kCAAgD;AAEhD,oCAA0C;AAC1C,6CAAgD;AAEhD,kDAAgE;AAChE,+CAAyD;AAEzD,MAAM,eAAe,GAAG,kBAAkB,CAAC;AACpC,MAAM,0BAA0B,GAAG,CACxC,OAAyB,EACT,EAAE;;IAClB,MAAM,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,MAAM,MAAM,GAA4D;QACtE,KAAK,EAAE,IAAA,uBAAc,EAAC,YAAY,CAAC;QACnC,GAAG,CAAC,YAAY,CAAC,KAAK;YACpB,CAAC,CAAC;gBACE,SAAS,EAAE;oBACT,KAAK,EAAE;wBACL,eAAe,EAAE,QAAQ;qBAC1B;oBACD,IAAI,EAAE,QAAQ;iBACf;aACF;YACH,CAAC,CAAC,EAAE,CAAC;QACP,SAAS,EAAE;YACT,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO;YAC9B,YAAY,EAAE,OAAO,CAAC,WAAW,CAAC,QAAQ;YAC1C,qBAAqB,EAAE,GAAG;YAC1B,6BAA6B,EAAE,mBAAmB,OAAO,CAAC,IAAI,EAAE;YAChE,sBAAsB,EACpB,MAAA,YAAY,CAAC,SAAS,mCAAI,+BAA+B;YAC3D,SAAS,EAAE;gBACT,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC1C,GAAG,CAAC,MAAA,YAAY,CAAC,kBAAkB,mCAAI,EAAE,CAAC;aAC3C,CAAC,IAAI,CAAC,GAAG,CAAC;YACX,cAAc,EAAE,OAAO,CAAC,IAAI;SAC7B;KACF,CAAC;IAEF,MAAM,WAAW,GAAG,QAAQ,OAAO,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC;IAC3D,MAAM,cAAc,GAAG;QACrB,+BAA+B,WAAW,gBAAgB,IAAA,oDAA0B,EAClF,OAAO,EACP,UAAU,CACX,qCAAqC,IAAA,oDAA0B,EAC9D,OAAO,EACP,aAAa,CACd,kCAAkC;QACnC,mCAAmC,WAAW,eAAe,IAAA,oDAA0B,EACrF,OAAO,EACP,YAAY,CACb,GAAG;QACJ,+BAA+B,WAAW,gBAAgB,WAAW,aAAa,WAAW,kBAAkB,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,cAAc,GAAG;QAC5J,+BAA+B,WAAW,GAAG;KAC9C,CAAC;IAEF,OAAO,IAAA,4BAAqB,EAAC,OAAO,EAAE;QACpC,MAAM,EAAE;YACN,GAAG,MAAM;YACT,MAAM,EAAE;gBACN,GAAG,cAAc;gBACjB,GAAG,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;gBAElB,+BAA+B;aAChC;SACF;QACD,IAAI,EAAE;YACJ,GAAG,MAAM;YACT,MAAM,EAAE,CAAC,GAAG,cAAc,EAAE,kBAAkB,CAAC;SAChD;QACD,QAAQ,EAAE;YACR,GAAG,MAAM;YACT,MAAM,EAAE,CAAC,GAAG,cAAc,EAAE,oBAAoB,CAAC;SAClD;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AA/EW,QAAA,0BAA0B,8BA+ErC"}
@@ -10,6 +10,10 @@ export declare const createMongodbBaseConfig: (context: ComponentContext) => {
10
10
  persistence: {
11
11
  storageClass: string;
12
12
  };
13
+ image: {
14
+ registry: string;
15
+ repository: string;
16
+ };
13
17
  backup: {
14
18
  enabled: boolean;
15
19
  hostToBackup: string;
@@ -88,6 +88,10 @@ const createMongodbBaseConfig = (context) => {
88
88
  persistence: {
89
89
  storageClass: "standard-rwo",
90
90
  },
91
+ image: {
92
+ registry: "bitnamilegacy",
93
+ repository: "mongodb",
94
+ },
91
95
  backup: createMongoBackupDefaultConfig(context),
92
96
  },
93
97
  env: {
@@ -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":";;;AAAA,mCAA+B;AAC/B,mFAAmF;AAEnF,oCAA0C;AAE1C,MAAM,mBAAmB,GAAG,CAAC,OAAyB,EAAE,EAAE,CACxD,SAAS,IAAA,oDAA0B,EAAC,OAAO,EAAE,uBAAuB,CAAC,GAAG,CAAC;AAC3E,MAAM,cAAc,GAAG,CAAC,OAAyB,EAAE,IAAY,EAAE,EAAE;IACjE,MAAM,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,cAAc,CAAC;IAC7D,OAAO,GAAG,IAAI,IAAI,SAAS,0BAA0B,CAAC;AACxD,CAAC,CAAC;AAEF,MAAM,wBAAwB,GAAG,CAAC,OAAyB,EAAE,EAAE;IAC7D,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,aAAa,CAAC;IAC9D,OAAO,cAAc,CAAC,OAAO,EAAE,GAAG,WAAW,UAAU,CAAC,CAAC;AAC3D,CAAC,CAAC;AAEF,MAAM,wBAAwB,GAAG,CAAC,OAAyB,EAAE,KAAa,EAAE,EAAE;IAC5E,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,aAAa,CAAC;IAC9D,OAAO,cAAc,CACnB,OAAO,EACP,GAAG,WAAW,YAAY,KAAK,IAAI,WAAW,mBAAmB,CAClE,CAAC;AACJ,CAAC,CAAC;AACF,MAAM,gBAAgB,GAAG,CAAC,OAAyB,EAAE,MAAc,EAAE,EAAE;;IACrE,IAAI,CAAC,IAAA,sBAAc,EAAC,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,EAAE,YAAY,CAAC,EAAE,CAAC;QAC1D,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;IACpE,CAAC;IACD,MAAM,aAAa,GAAG,MAAA,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC,MAAM,0CAAE,OAAO,CAAC;IAE7D,IAAI,WAAW,GAAuB,SAAS,CAAC;IAEhD,IAAI,KAAK,GAAG,EAAE,CAAC;IACf,IAAI,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,YAAY,MAAK,YAAY,EAAE,CAAC;QACjD,KAAK,GAAG,IAAA,cAAK,EAAC,CAAC,EAAE,MAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,YAAY,mCAAI,CAAC,CAAC;aAC/C,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,wBAAwB,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;aAChD,IAAI,CAAC,GAAG,CAAC,CAAC;QAEb,WAAW,GAAG,iCAAiC,CAAC;IAClD,CAAC;SAAM,CAAC;QACN,KAAK,GAAG,wBAAwB,CAAC,OAAO,CAAC,CAAC;QAC1C,WAAW,GAAG,kBAAkB,CAAC;IACnC,CAAC;IAED,OAAO,aAAa,mBAAmB,CAAC,OAAO,CAAC,GAAG,KAAK,IAAI,MAAM,GAChE,WAAW,CAAC,CAAC,CAAC,IAAI,WAAW,EAAE,CAAC,CAAC,CAAC,EACpC,EAAE,CAAC;AACL,CAAC,CAAC;AACF,MAAM,8BAA8B,GAAG,CAAC,OAAyB,EAAE,EAAE;;IACnE,IAAI,CAAC,IAAA,sBAAc,EAAC,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,EAAE,YAAY,CAAC,EAAE,CAAC;QAC1D,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAC;IAC9E,CAAC;IACD,MAAM,aAAa,GAAG,MAAA,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC,MAAM,0CAAE,OAAO,CAAC;IAC7D,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,aAAa,CAAC;IAC9D,MAAM,aAAa,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAE9E,IAAI,YAAoB,CAAC;IACzB,IAAI,WAAmB,CAAC;IAExB,IAAI,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,YAAY,MAAK,YAAY,EAAE,CAAC;QACjD,yDAAyD;QACzD,8IAA8I;QAC9I,MAAM,eAAe,GACnB,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,YAAY,MAAK,YAAY;YAC5C,aAAa,CAAC,YAAY;YAC1B,aAAa,CAAC,YAAY,GAAG,CAAC;YAC5B,CAAC,CAAC,CAAC;YACH,CAAC,CAAC,CAAC,CAAC;QAER,YAAY,GAAG,wBAAwB,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;QAClE,WAAW,GAAG,WAAW,WAAW,YAAY,eAAe,EAAE,CAAC;IACpE,CAAC;SAAM,CAAC;QACN,YAAY,GAAG,wBAAwB,CAAC,OAAO,CAAC,CAAC;QACjD,WAAW,GAAG,GAAG,WAAW,UAAU,CAAC;IACzC,CAAC;IAED,OAAO;QACL,OAAO,EAAE,aAAa;QACtB,YAAY;QACZ,WAAW;QACX,KAAK,EAAE,gCAAgC;QACvC,QAAQ,EAAE,WAAW;QACrB,mBAAmB,EAAE,eAAe;KACrC,CAAC;AACJ,CAAC,CAAC;AACK,MAAM,uBAAuB,GAAG,CAAC,OAAyB,EAAE,EAAE;;IACnE,IAAI,CAAC,IAAA,sBAAc,EAAC,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,EAAE,YAAY,CAAC,EAAE,CAAC;QAC1D,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAC;IAC9E,CAAC;IACD,MAAM,aAAa,GAAG,MAAA,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC,MAAM,0CAAE,OAAO,CAAC;IAE7D,OAAO;QACL,OAAO,EAAE;YACP,OAAO,EAAE,IAAI;YACb,IAAI,EAAE;gBACJ,OAAO,EAAE,IAAI;gBACb,YAAY,EACV,GAAG,GAAG,IAAA,oDAA0B,EAAC,OAAO,EAAE,uBAAuB,CAAC;gBACpE,aAAa,EACX,GAAG,GAAG,IAAA,oDAA0B,EAAC,OAAO,EAAE,wBAAwB,CAAC;aACtE;YACD,WAAW,EAAE;gBACX,YAAY,EAAE,cAAc;aAC7B;YACD,KAAK,EAAE;gBACL,QAAQ,EAAE,eAAe;gBACzB,UAAU,EAAE,SAAS;aACtB;YACD,MAAM,EAAE,8BAA8B,CAAC,OAAO,CAAC;SAChD;QACD,GAAG,EAAE;YACH,MAAM,EAAE;gBACN,SAAS,EAAE,gBAAgB,CAAC,OAAO,EAAE,MAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,MAAM,mCAAI,KAAK,CAAC;gBACpE,GAAG,CAAC,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,YAAY,MAAK,YAAY;oBAC9C,CAAC,CAAC,EAAE,eAAe,EAAE,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,CAAC,oCAAoC;oBAC9F,CAAC,CAAC,EAAE,CAAC;aACR;SACF;KACF,CAAC;AACJ,CAAC,CAAC;AAlCW,QAAA,uBAAuB,2BAkClC"}
@@ -0,0 +1,24 @@
1
+ type DeployConfigBaseExecuteScript = {
2
+ type: "script";
3
+ script: string | string[];
4
+ };
5
+ /**
6
+ * currently only supported for cloud run deployments
7
+ */
8
+ export type DeployConfigBaseExecuteOnDeploy = DeployConfigBaseExecuteScript & ({
9
+ /**
10
+ * run the job before or after the deploy
11
+ */
12
+ when: "preDeploy" | "postDeploy";
13
+ /**
14
+ * whether to wait for completion of the job
15
+ */
16
+ waitForCompletion?: boolean;
17
+ } | {
18
+ /**
19
+ * run the job before or after the environment is stopped
20
+ */
21
+ when: "preStop" | "postStop";
22
+ });
23
+ export type DeployConfigBaseExecute = DeployConfigBaseExecuteOnDeploy;
24
+ export {};
@@ -0,0 +1,3 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ //# sourceMappingURL=executeBase.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"executeBase.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/types/executeBase.ts"],"names":[],"mappings":""}
@@ -1,5 +1,6 @@
1
1
  import type { DBVariablesMode } from "../cloudRun/utils/database";
2
2
  import type { DeployConfigBase } from "./base";
3
+ import type { DeployConfigBaseExecute } from "./executeBase";
3
4
  export type Gcloudregion = "asia-east1" | "asia-northeast1" | "asia-northeast2" | "europe-north1" | "europe-southwest1" | "europe-west1" | "europe-west4" | "europe-west8" | "europe-west9" | "me-west1" | "us-central1" | "us-east1" | "us-east4" | "us-east5" | "us-south1" | "us-west1" | "asia-east2" | "asia-northeast3" | "asia-southeast1" | "asia-southeast2" | "asia-south1" | "asia-south2" | "australia-southeast1" | "australia-southeast2" | "europe-central2" | "europe-west2" | "europe-west3" | "europe-west6" | "northamerica-northeast1" | "northamerica-northeast2" | "southamerica-east1" | "southamerica-west1" | "us-west2" | "us-west3" | "us-west4";
4
5
  export type DeployConfigCloudRunCloudSql = {
5
6
  type: "unmanaged";
@@ -142,6 +143,13 @@ export type DeployConfigCloudRunService = {
142
143
  * If you specify an image, you usually want to disable the build by setting build: false
143
144
  */
144
145
  image?: string;
146
+ /**
147
+ * whether to enable session affinity. When enabled, Cloud Run will try to route
148
+ * requests from the same client to the same instance.
149
+ *
150
+ * Passed as `--session-affinity` to gcloud.
151
+ */
152
+ sessionAffinity?: boolean;
145
153
  /**
146
154
  * args to pass to the command
147
155
  */
@@ -315,7 +323,7 @@ export type DeployConfigCloudRunWithVolumes = {
315
323
  volumes?: DeployConfigCloudRunVolumes;
316
324
  };
317
325
  export type DeployConfigCloudRunJob = DeployConfigCloudRunJobNormal | DeployConfigCloudRunJobWithSchedule;
318
- export type DeployConfigCloudRun = {
326
+ export type DeployConfigCloudRun = Omit<DeployConfigBase, "execute"> & {
319
327
  /**
320
328
  * cloud run deployment.
321
329
  *
@@ -354,7 +362,7 @@ export type DeployConfigCloudRun = {
354
362
  */
355
363
  execute?: Record<string, DeployConfigCloudRunExecute | null>;
356
364
  debug?: boolean;
357
- } & DeployConfigBase;
365
+ };
358
366
  export type DeployConfigCloudRunVolumes = Record<string, DeployConfigCloudRunVolume>;
359
367
  export type DeployConfigCloudRunVolume = {
360
368
  type: "cloud-storage";
@@ -409,7 +417,7 @@ export type DeployConfigCloudRunExecuteOnDeploy = DeployConfigCloudRunExecuteJob
409
417
  */
410
418
  when: "preStop" | "postStop";
411
419
  });
412
- export type DeployConfigCloudRunExecuteJob = DeployConfigCloudRunExecuteJobScheduled | DeployConfigCloudRunExecuteOnDeploy;
420
+ export type DeployConfigCloudRunExecuteJob = DeployConfigBaseExecute | DeployConfigCloudRunExecuteJobScheduled | DeployConfigCloudRunExecuteOnDeploy;
413
421
  export type DeployConfigCloudRunExecuteHttp = {
414
422
  /**
415
423
  * set to "http" to run a http request
@@ -422,7 +430,7 @@ export type DeployConfigCloudRunExecuteHttp = {
422
430
  /**
423
431
  * the http-method to use. Defaults to "POST" (as specified by google cloud scheduler)
424
432
  */
425
- method?: "GET" | "POST" | "PUT" | "DELETE" | "PATCH";
433
+ method?: "GET" | "POST" | "PUT" | "DELETE" | "PATCH" | "PURGE";
426
434
  /**
427
435
  * the body to send
428
436
  */
@@ -432,6 +440,6 @@ export type DeployConfigCloudRunExecuteHttp = {
432
440
  */
433
441
  headers?: Record<string, string>;
434
442
  } & WithSchedule;
435
- export type DeployConfigCloudRunExecute = DeployConfigCloudRunExecuteJob | DeployConfigCloudRunExecuteHttp;
443
+ export type DeployConfigCloudRunExecute = DeployConfigBaseExecute | DeployConfigCloudRunExecuteJob | DeployConfigCloudRunExecuteHttp;
436
444
  export type DeployConfigCloudRunExecuteWithSchedule = Extract<DeployConfigCloudRunExecute, WithSchedule>;
437
445
  export {};
@@ -1 +1 @@
1
- {"version":3,"file":"googleCloudRun.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/types/googleCloudRun.ts"],"names":[],"mappings":";;;AAuOa,QAAA,mBAAmB,GAA8B;IAC5D,IAAI,EAAE,OAAO;IACb,IAAI,EAAE,WAAW;IAEjB,mBAAmB,EAAE,CAAC;IACtB,cAAc,EAAE,CAAC;IACjB,aAAa,EAAE,EAAE;IACjB,gBAAgB,EAAE,CAAC;CACpB,CAAC;AAEW,QAAA,oBAAoB,GAA8B;IAC7D,GAAG,2BAAmB;IAEtB,mBAAmB,EAAE,CAAC;IACtB,cAAc,EAAE,EAAE;IAClB,aAAa,EAAE,EAAE;IACjB,gBAAgB,EAAE,CAAC;CACpB,CAAC"}
1
+ {"version":3,"file":"googleCloudRun.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/types/googleCloudRun.ts"],"names":[],"mappings":";;;AAmPa,QAAA,mBAAmB,GAA8B;IAC5D,IAAI,EAAE,OAAO;IACb,IAAI,EAAE,WAAW;IAEjB,mBAAmB,EAAE,CAAC;IACtB,cAAc,EAAE,CAAC;IACjB,aAAa,EAAE,EAAE;IACjB,gBAAgB,EAAE,CAAC;CACpB,CAAC;AAEW,QAAA,oBAAoB,GAA8B;IAC7D,GAAG,2BAAmB;IAEtB,mBAAmB,EAAE,CAAC;IACtB,cAAc,EAAE,EAAE;IAClB,aAAa,EAAE,EAAE;IACjB,gBAAgB,EAAE,CAAC;CACpB,CAAC"}
@@ -7,6 +7,7 @@ export * from "./context";
7
7
  export * from "./build";
8
8
  export * from "./deploy";
9
9
  export * from "./utils/writeFiles";
10
+ export * from "./utils/measureTime";
10
11
  export * from "./variables/VariableValue";
11
12
  export * from "./bash";
12
13
  export * from "./catenv";
@@ -23,6 +23,7 @@ __exportStar(require("./context"), exports);
23
23
  __exportStar(require("./build"), exports);
24
24
  __exportStar(require("./deploy"), exports);
25
25
  __exportStar(require("./utils/writeFiles"), exports);
26
+ __exportStar(require("./utils/measureTime"), exports);
26
27
  __exportStar(require("./variables/VariableValue"), exports);
27
28
  __exportStar(require("./bash"), exports);
28
29
  __exportStar(require("./catenv"), exports);
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../pipeline/src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,6CAA2B;AAC3B,0CAAwB;AACxB,0CAAwB;AACxB,2CAAyB;AACzB,2CAAyB;AACzB,4CAA0B;AAC1B,0CAAwB;AACxB,2CAAyB;AACzB,qDAAmC;AACnC,4DAA0C;AAC1C,yCAAuB;AACvB,2CAAyB"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../pipeline/src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,6CAA2B;AAC3B,0CAAwB;AACxB,0CAAwB;AACxB,2CAAyB;AACzB,2CAAyB;AACzB,4CAA0B;AAC1B,0CAAwB;AACxB,2CAAyB;AACzB,qDAAmC;AACnC,sDAAoC;AACpC,4DAA0C;AAC1C,yCAAuB;AACvB,2CAAyB"}
@@ -4,6 +4,7 @@ export declare const getGitlabReleaseJobs: (config: Config) => {
4
4
  stage: string;
5
5
  image: string;
6
6
  script: string[];
7
+ after_script: string[];
7
8
  rules: {
8
9
  if?: string;
9
10
  changes?: import("../../types/gitlab-ci-yml").Changes;
@@ -19,6 +20,7 @@ export declare const getGitlabReleaseJobs: (config: Config) => {
19
20
  stage: string;
20
21
  image: string;
21
22
  script: string[];
23
+ after_script: string[];
22
24
  needs: any[];
23
25
  rules: {
24
26
  if?: string;
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.getGitlabReleaseJobs = void 0;
4
4
  const rules_1 = require("../../rules");
5
5
  const runner_1 = require("../../runner");
6
- const EXPIRED_TOKEN_HELP = "echo '👉 The project access token might be invald - run `project-renew-token` in catladder CLI to fix.'";
6
+ const EXPIRED_TOKEN_HELP = "echo '👉 If this job failed with access denied, the project access token might be invald - run `project-renew-token` in catladder CLI to fix.'";
7
7
  const baseReleaseRules = [
8
8
  rules_1.RULE_NEVER_ON_RELEASE_COMMIT,
9
9
  rules_1.RULE_NEVER_ON_AGENT_TRIGGER,
@@ -15,7 +15,8 @@ const getGitlabReleaseJobs = (config) => {
15
15
  ["create release"]: {
16
16
  stage: "release",
17
17
  image: (0, runner_1.getRunnerImage)("semantic-release"),
18
- script: ["semanticRelease", EXPIRED_TOKEN_HELP],
18
+ script: ["semanticRelease"],
19
+ after_script: [EXPIRED_TOKEN_HELP],
19
20
  rules: [
20
21
  ...baseReleaseRules,
21
22
  {
@@ -31,7 +32,8 @@ const getGitlabReleaseJobs = (config) => {
31
32
  ["⚠️ force create release"]: {
32
33
  stage: "release",
33
34
  image: (0, runner_1.getRunnerImage)("semantic-release"),
34
- script: ["semanticRelease", EXPIRED_TOKEN_HELP],
35
+ script: ["semanticRelease"],
36
+ after_script: [EXPIRED_TOKEN_HELP],
35
37
  needs: [],
36
38
  rules: [
37
39
  ...baseReleaseRules,
@@ -1 +1 @@
1
- {"version":3,"file":"gitlabReleaseJobs.js","sourceRoot":"","sources":["../../../../../../pipeline/src/pipeline/gitlab/gitlabReleaseJobs.ts"],"names":[],"mappings":";;;AAAA,uCAMqB;AACrB,yCAA8C;AAI9C,MAAM,kBAAkB,GACtB,yGAAyG,CAAC;AAE5G,MAAM,gBAAgB,GAAG;IACvB,oCAA4B;IAC5B,mCAA2B;IAC3B,8BAAsB;CACvB,CAAC;AACK,MAAM,oBAAoB,GAAG,CAAC,MAAc,EAAE,EAAE;;IACrD,OAAO;QACL,CAAC,gBAAgB,CAAC,EAAE;YAClB,KAAK,EAAE,SAAS;YAChB,KAAK,EAAE,IAAA,uBAAc,EAAC,kBAAkB,CAAC;YACzC,MAAM,EAAE,CAAC,iBAAiB,EAAE,kBAAkB,CAAC;YAC/C,KAAK,EAAE;gBACL,GAAG,gBAAgB;gBACnB;oBACE,EAAE,EAAE,kCAA0B;oBAC9B,IAAI,EAAE,CAAA,MAAA,MAAM,CAAC,QAAQ,0CAAE,IAAI,MAAK,MAAM,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ;iBACjE;gBACD;oBACE,EAAE,EAAE,oCAA4B;oBAChC,IAAI,EAAE,QAAQ;iBACf;aACqB;SACzB;QACD,CAAC,yBAAyB,CAAC,EAAE;YAC3B,KAAK,EAAE,SAAS;YAChB,KAAK,EAAE,IAAA,uBAAc,EAAC,kBAAkB,CAAC;YACzC,MAAM,EAAE,CAAC,iBAAiB,EAAE,kBAAkB,CAAC;YAC/C,KAAK,EAAE,EAAE;YACT,KAAK,EAAE;gBACL,GAAG,gBAAgB;gBACnB;oBACE,EAAE,EAAE,kCAA0B;oBAC9B,IAAI,EAAE,QAAQ;iBACf;gBACD;oBACE,EAAE,EAAE,oCAA4B;oBAChC,IAAI,EAAE,QAAQ;iBACf;aACqB;SACzB;KACF,CAAC;AACJ,CAAC,CAAC;AApCW,QAAA,oBAAoB,wBAoC/B"}
1
+ {"version":3,"file":"gitlabReleaseJobs.js","sourceRoot":"","sources":["../../../../../../pipeline/src/pipeline/gitlab/gitlabReleaseJobs.ts"],"names":[],"mappings":";;;AAAA,uCAMqB;AACrB,yCAA8C;AAI9C,MAAM,kBAAkB,GACtB,gJAAgJ,CAAC;AAEnJ,MAAM,gBAAgB,GAAG;IACvB,oCAA4B;IAC5B,mCAA2B;IAC3B,8BAAsB;CACvB,CAAC;AACK,MAAM,oBAAoB,GAAG,CAAC,MAAc,EAAE,EAAE;;IACrD,OAAO;QACL,CAAC,gBAAgB,CAAC,EAAE;YAClB,KAAK,EAAE,SAAS;YAChB,KAAK,EAAE,IAAA,uBAAc,EAAC,kBAAkB,CAAC;YACzC,MAAM,EAAE,CAAC,iBAAiB,CAAC;YAC3B,YAAY,EAAE,CAAC,kBAAkB,CAAC;YAClC,KAAK,EAAE;gBACL,GAAG,gBAAgB;gBACnB;oBACE,EAAE,EAAE,kCAA0B;oBAC9B,IAAI,EAAE,CAAA,MAAA,MAAM,CAAC,QAAQ,0CAAE,IAAI,MAAK,MAAM,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ;iBACjE;gBACD;oBACE,EAAE,EAAE,oCAA4B;oBAChC,IAAI,EAAE,QAAQ;iBACf;aACqB;SACzB;QACD,CAAC,yBAAyB,CAAC,EAAE;YAC3B,KAAK,EAAE,SAAS;YAChB,KAAK,EAAE,IAAA,uBAAc,EAAC,kBAAkB,CAAC;YACzC,MAAM,EAAE,CAAC,iBAAiB,CAAC;YAC3B,YAAY,EAAE,CAAC,kBAAkB,CAAC;YAClC,KAAK,EAAE,EAAE;YACT,KAAK,EAAE;gBACL,GAAG,gBAAgB;gBACnB;oBACE,EAAE,EAAE,kCAA0B;oBAC9B,IAAI,EAAE,QAAQ;iBACf;gBACD;oBACE,EAAE,EAAE,oCAA4B;oBAChC,IAAI,EAAE,QAAQ;iBACf;aACqB;SACzB;KACF,CAAC;AACJ,CAAC,CAAC;AAtCW,QAAA,oBAAoB,wBAsC/B"}
@@ -74,7 +74,11 @@ export type DefaultEnvConfig = {
74
74
  };
75
75
  export type DevLocalEnvConfig = {
76
76
  vars?: EnvVars;
77
- port?: number;
77
+ /**
78
+ * port that is used. If not set, 3000 is used.
79
+ * set false to not set a port at all
80
+ */
81
+ port?: number | false;
78
82
  };
79
83
  type AddOverrideFunction<T> = {
80
84
  [K in keyof T]: T[K] | ((defaultValue: T[K]) => T[K]) | (T[K] extends Record<string, unknown> | undefined ? AddOverrideFunction<T[K]> : never);
@@ -0,0 +1,6 @@
1
+ /// <reference types="node" />
2
+ export declare const measureTime: (logLevel: string, label: string, meta: Record<string, any>) => {
3
+ done: () => void;
4
+ [Symbol.dispose]: () => void;
5
+ addMeta: (meta: Record<string, any>) => void;
6
+ };
@@ -0,0 +1,42 @@
1
+ "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
5
+ Object.defineProperty(exports, "__esModule", { value: true });
6
+ exports.measureTime = void 0;
7
+ const crypto_1 = __importDefault(require("crypto"));
8
+ const measureTime = (logLevel, label, meta) => {
9
+ const shortId = crypto_1.default.randomUUID().slice(0, 8);
10
+ const start = performance.now();
11
+ let logMeta = { ...meta };
12
+ const addMeta = (meta) => {
13
+ logMeta = {
14
+ ...logMeta,
15
+ ...meta,
16
+ };
17
+ };
18
+ console.log(logLevel, `[${shortId}] [START] ${label} `, {
19
+ shortId,
20
+ ...logMeta,
21
+ });
22
+ let disposed = false;
23
+ const done = () => {
24
+ if (disposed)
25
+ return;
26
+ disposed = true;
27
+ const durationMs = Math.round(performance.now() - start);
28
+ const durationS = `${durationMs / 1000}s`;
29
+ console.log(logLevel, `[${shortId}] [END] ${label} | ${durationS}`, {
30
+ shortId,
31
+ durationS,
32
+ ...logMeta,
33
+ });
34
+ };
35
+ return {
36
+ done,
37
+ [Symbol.dispose]: done,
38
+ addMeta,
39
+ };
40
+ };
41
+ exports.measureTime = measureTime;
42
+ //# sourceMappingURL=measureTime.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"measureTime.js","sourceRoot":"","sources":["../../../../../pipeline/src/utils/measureTime.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA4B;AACrB,MAAM,WAAW,GAAG,CACzB,QAAgB,EAChB,KAAa,EACb,IAAyB,EACzB,EAAE;IACF,MAAM,OAAO,GAAG,gBAAM,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAChD,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;IAEhC,IAAI,OAAO,GAAG,EAAE,GAAG,IAAI,EAAE,CAAC;IAC1B,MAAM,OAAO,GAAG,CAAC,IAAyB,EAAE,EAAE;QAC5C,OAAO,GAAG;YACR,GAAG,OAAO;YACV,GAAG,IAAI;SACR,CAAC;IACJ,CAAC,CAAC;IAEF,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,OAAO,aAAa,KAAK,GAAG,EAAE;QACtD,OAAO;QACP,GAAG,OAAO;KACX,CAAC,CAAC;IAEH,IAAI,QAAQ,GAAG,KAAK,CAAC;IAErB,MAAM,IAAI,GAAG,GAAG,EAAE;QAChB,IAAI,QAAQ;YAAE,OAAO;QACrB,QAAQ,GAAG,IAAI,CAAC;QAEhB,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,CAAC;QACzD,MAAM,SAAS,GAAG,GAAG,UAAU,GAAG,IAAI,GAAG,CAAC;QAC1C,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,OAAO,WAAW,KAAK,MAAM,SAAS,EAAE,EAAE;YAClE,OAAO;YACP,SAAS;YACT,GAAG,OAAO;SACX,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,OAAO;QACL,IAAI;QACJ,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,IAAI;QACtB,OAAO;KACR,CAAC;AACJ,CAAC,CAAC;AAzCW,QAAA,WAAW,eAyCtB"}