@catladder/cli 0.0.0-main-fae18d69 → 0.0.0-main-23485eda

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 (6) hide show
  1. package/dist/bundles/catenv/index.js +12 -20
  2. package/dist/bundles/cli/index.js +12 -20
  3. package/dist/pipeline/src/deploy/cloudRun/createJobs/execute/onDeploy.js +12 -20
  4. package/dist/pipeline/src/deploy/cloudRun/createJobs/execute/onDeploy.js.map +1 -1
  5. package/dist/tsconfig.tsbuildinfo +1 -1
  6. package/package.json +1 -1
package/dist/bundles/catenv/index.js CHANGED
@@ -4337,7 +4337,7 @@ const common_1 = __nccwpck_require__(4884);
4337
4337
  const getOnDeployExecuteScript = (context, when) => {
4338
4338
  const executes = getExecutes(context);
4339
4339
  return executes
4340
- .filter(({ config }) => config.when === when)
4340
+ .filter((config) => config.when === when)
4341
4341
  .flatMap((execute) => {
4342
4342
  return getJobRunScriptForExecute(context, execute);
4343
4343
  });
@@ -4353,12 +4353,7 @@ const getExecutes = (context) => {
4353
4353
  if (!value) {
4354
4354
  return [];
4355
4355
  }
4356
- return [
4357
- {
4358
- jobName: key,
4359
- config: value,
4360
- },
4361
- ];
4356
+ return [value];
4362
4357
  }),
4363
4358
  ];
4364
4359
  };
@@ -4371,22 +4366,19 @@ const getLegacyExecutes = (context) => {
4371
4366
  }
4372
4367
  return [
4373
4368
  {
4374
- jobName,
4375
- config: {
4376
- job: jobName,
4377
- type: "job",
4378
- when: job.when,
4379
- ...(job.when === "preDeploy" || job.when === "postDeploy"
4380
- ? {
4381
- waitForCompletion: job.waitForCompletion,
4382
- }
4383
- : {}),
4384
- },
4369
+ job: jobName,
4370
+ type: "job",
4371
+ when: job.when,
4372
+ ...(job.when === "preDeploy" || job.when === "postDeploy"
4373
+ ? {
4374
+ waitForCompletion: job.waitForCompletion,
4375
+ }
4376
+ : {}),
4385
4377
  },
4386
4378
  ];
4387
4379
  });
4388
4380
  };
4389
- const getJobRunScriptForExecute = (context, { jobName, config }) => {
4381
+ const getJobRunScriptForExecute = (context, config) => {
4390
4382
  var _a;
4391
4383
  const type = config.type;
4392
4384
  if (type === "script") {
@@ -4406,7 +4398,7 @@ const getJobRunScriptForExecute = (context, { jobName, config }) => {
4406
4398
  wait: waitForCompletion === true ? true : undefined,
4407
4399
  args: (0, getJobOrServiceArgs_1.getCloudRunServiceOrJobArgsArg)(config.args),
4408
4400
  });
4409
- const fullJobName = (0, jobName_1.getFullJobName)(context, jobName);
4401
+ const fullJobName = (0, jobName_1.getFullJobName)(context, config.job);
4410
4402
  return [
4411
4403
  `${(0, common_1.gcloudRunCmd)()} jobs execute ${fullJobName.toString()} ${argString}`,
4412
4404
  ];
package/dist/bundles/cli/index.js CHANGED
@@ -7603,7 +7603,7 @@ const common_1 = __nccwpck_require__(54884);
7603
7603
  const getOnDeployExecuteScript = (context, when) => {
7604
7604
  const executes = getExecutes(context);
7605
7605
  return executes
7606
- .filter(({ config }) => config.when === when)
7606
+ .filter((config) => config.when === when)
7607
7607
  .flatMap((execute) => {
7608
7608
  return getJobRunScriptForExecute(context, execute);
7609
7609
  });
@@ -7619,12 +7619,7 @@ const getExecutes = (context) => {
7619
7619
  if (!value) {
7620
7620
  return [];
7621
7621
  }
7622
- return [
7623
- {
7624
- jobName: key,
7625
- config: value,
7626
- },
7627
- ];
7622
+ return [value];
7628
7623
  }),
7629
7624
  ];
7630
7625
  };
@@ -7637,22 +7632,19 @@ const getLegacyExecutes = (context) => {
7637
7632
  }
7638
7633
  return [
7639
7634
  {
7640
- jobName,
7641
- config: {
7642
- job: jobName,
7643
- type: "job",
7644
- when: job.when,
7645
- ...(job.when === "preDeploy" || job.when === "postDeploy"
7646
- ? {
7647
- waitForCompletion: job.waitForCompletion,
7648
- }
7649
- : {}),
7650
- },
7635
+ job: jobName,
7636
+ type: "job",
7637
+ when: job.when,
7638
+ ...(job.when === "preDeploy" || job.when === "postDeploy"
7639
+ ? {
7640
+ waitForCompletion: job.waitForCompletion,
7641
+ }
7642
+ : {}),
7651
7643
  },
7652
7644
  ];
7653
7645
  });
7654
7646
  };
7655
- const getJobRunScriptForExecute = (context, { jobName, config }) => {
7647
+ const getJobRunScriptForExecute = (context, config) => {
7656
7648
  var _a;
7657
7649
  const type = config.type;
7658
7650
  if (type === "script") {
@@ -7672,7 +7664,7 @@ const getJobRunScriptForExecute = (context, { jobName, config }) => {
7672
7664
  wait: waitForCompletion === true ? true : undefined,
7673
7665
  args: (0, getJobOrServiceArgs_1.getCloudRunServiceOrJobArgsArg)(config.args),
7674
7666
  });
7675
- const fullJobName = (0, jobName_1.getFullJobName)(context, jobName);
7667
+ const fullJobName = (0, jobName_1.getFullJobName)(context, config.job);
7676
7668
  return [
7677
7669
  `${(0, common_1.gcloudRunCmd)()} jobs execute ${fullJobName.toString()} ${argString}`,
7678
7670
  ];
package/dist/pipeline/src/deploy/cloudRun/createJobs/execute/onDeploy.js CHANGED
@@ -10,7 +10,7 @@ const common_1 = require("../common");
10
10
  const getOnDeployExecuteScript = (context, when) => {
11
11
  const executes = getExecutes(context);
12
12
  return executes
13
- .filter(({ config }) => config.when === when)
13
+ .filter((config) => config.when === when)
14
14
  .flatMap((execute) => {
15
15
  return getJobRunScriptForExecute(context, execute);
16
16
  });
@@ -26,12 +26,7 @@ const getExecutes = (context) => {
26
26
  if (!value) {
27
27
  return [];
28
28
  }
29
- return [
30
- {
31
- jobName: key,
32
- config: value,
33
- },
34
- ];
29
+ return [value];
35
30
  }),
36
31
  ];
37
32
  };
@@ -44,22 +39,19 @@ const getLegacyExecutes = (context) => {
44
39
  }
45
40
  return [
46
41
  {
47
- jobName,
48
- config: {
49
- job: jobName,
50
- type: "job",
51
- when: job.when,
52
- ...(job.when === "preDeploy" || job.when === "postDeploy"
53
- ? {
54
- waitForCompletion: job.waitForCompletion,
55
- }
56
- : {}),
57
- },
42
+ job: jobName,
43
+ type: "job",
44
+ when: job.when,
45
+ ...(job.when === "preDeploy" || job.when === "postDeploy"
46
+ ? {
47
+ waitForCompletion: job.waitForCompletion,
48
+ }
49
+ : {}),
58
50
  },
59
51
  ];
60
52
  });
61
53
  };
62
- const getJobRunScriptForExecute = (context, { jobName, config }) => {
54
+ const getJobRunScriptForExecute = (context, config) => {
63
55
  var _a;
64
56
  const type = config.type;
65
57
  if (type === "script") {
@@ -79,7 +71,7 @@ const getJobRunScriptForExecute = (context, { jobName, config }) => {
79
71
  wait: waitForCompletion === true ? true : undefined,
80
72
  args: (0, getJobOrServiceArgs_1.getCloudRunServiceOrJobArgsArg)(config.args),
81
73
  });
82
- const fullJobName = (0, jobName_1.getFullJobName)(context, jobName);
74
+ const fullJobName = (0, jobName_1.getFullJobName)(context, config.job);
83
75
  return [
84
76
  `${(0, common_1.gcloudRunCmd)()} jobs execute ${fullJobName.toString()} ${argString}`,
85
77
  ];
package/dist/pipeline/src/deploy/cloudRun/createJobs/execute/onDeploy.js.map CHANGED
@@ -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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"}