@catladder/cli 3.39.0 → 3.39.1
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.
- package/dist/bundles/catenv/index.js +1 -1
- package/dist/bundles/cli/index.js +1 -1
- package/dist/pipeline/src/deploy/cloudRun/createJobs/execute/onDeploy.js +12 -20
- package/dist/pipeline/src/deploy/cloudRun/createJobs/execute/onDeploy.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -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((
|
|
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
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
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,
|
|
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,
|
|
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
|
];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"onDeploy.js","sourceRoot":"","sources":["../../../../../../../../pipeline/src/deploy/cloudRun/createJobs/execute/onDeploy.ts"],"names":[],"mappings":";;;AAEA,6CAAgD;AAGhD,mEAAgE;AAChE,yEAAiF;AACjF,iDAAqD;AACrD,kDAA2D;AAC3D,sCAImB;
|
|
1
|
+
{"version":3,"file":"onDeploy.js","sourceRoot":"","sources":["../../../../../../../../pipeline/src/deploy/cloudRun/createJobs/execute/onDeploy.ts"],"names":[],"mappings":";;;AAEA,6CAAgD;AAGhD,mEAAgE;AAChE,yEAAiF;AACjF,iDAAqD;AACrD,kDAA2D;AAC3D,sCAImB;AAKZ,MAAM,wBAAwB,GAAG,CACtC,OAAyB,EACzB,IAAiD,EACjD,EAAE;IACF,MAAM,QAAQ,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IAEtC,OAAO,QAAQ;SACZ,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,IAAI,CAAC;SACxC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QACnB,OAAO,yBAAyB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACrD,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAXW,QAAA,wBAAwB,4BAWnC;AAEF,MAAM,WAAW,GAAG,CAAC,OAAyB,EAAa,EAAE;;IAC3D,MAAM,YAAY,GAAG,IAAA,gCAAuB,EAAC,OAAO,CAAC,CAAC;IACtD,OAAO;QACL,GAAG,iBAAiB,CAAC,OAAO,CAAC;QAC7B,GAAG,MAAM,CAAC,OAAO,CAAC,MAAA,YAAY,CAAC,OAAO,mCAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;YACrE,+BAA+B;YAC/B,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,OAAO,EAAE,CAAC;YACZ,CAAC;YACD,OAAO,CAAC,KAAgB,CAAC,CAAC;QAC5B,CAAC,CAAC;KACH,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,CAAC,OAAyB,EAAa,EAAE;IACjE,MAAM,aAAa,GAAG,IAAA,uCAAwB,EAAC,OAAO,CAAC,CAAC;IAExD,OAAO,aAAa,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE;QAChD,IACE,CAAC,GAAG,CAAC,IAAI;YACT,CAAC,CAAC,WAAW,EAAE,YAAY,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,EACtE,CAAC;YACD,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,OAAO;YACL;gBACE,GAAG,EAAE,OAAO;gBACZ,IAAI,EAAE,KAAK;gBACX,IAAI,EAAE,GAAG,CAAC,IAAI;gBACd,GAAG,CAAC,GAAG,CAAC,IAAI,KAAK,WAAW,IAAI,GAAG,CAAC,IAAI,KAAK,YAAY;oBACvD,CAAC,CAAC;wBACE,iBAAiB,EAAE,GAAG,CAAC,iBAAiB;qBACzC;oBACH,CAAC,CAAC,EAAE,CAAC;aACG;SACb,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,yBAAyB,GAAG,CAChC,OAAyB,EACzB,MAAe,EACL,EAAE;;IACZ,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;IACzB,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;QACtB,OAAO,IAAA,mBAAW,EAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACpC,CAAC;SAAM,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;QAC1B,MAAM,UAAU,GAAG,IAAA,8BAAqB,EAAC,OAAO,CAAC,CAAC;QAElD,2DAA2D;QAC3D,gEAAgE;QAChE,MAAM,iBAAiB,GAAG,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC;YACrE,CAAC,CAAC,IAAI,CAAC,SAAS;YAChB,CAAC,CAAC,mBAAmB,IAAI,MAAM;gBAC7B,CAAC,CAAC,CAAC,MAAA,MAAM,CAAC,iBAAiB,mCAAI,KAAK,CAAC,CAAC,oBAAoB;gBAC1D,CAAC,CAAC,KAAK,CAAC;QAEZ,MAAM,SAAS,GAAG,IAAA,mCAAgB,EAAC;YACjC,GAAG,UAAU;YACb,IAAI,EAAE,iBAAiB,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS;YACnD,IAAI,EAAE,IAAA,oDAA8B,EAAC,MAAM,CAAC,IAAI,CAAC;SAClD,CAAC,CAAC;QACH,MAAM,WAAW,GAAG,IAAA,wBAAc,EAAC,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;QACxD,OAAO;YACL,GAAG,IAAA,qBAAY,GAAE,iBAAiB,WAAW,CAAC,QAAQ,EAAE,IAAI,SAAS,EAAE;SACxE,CAAC;IACJ,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,6BAA6B,IAAI,EAAE,CAAC,CAAC;AACvD,CAAC,CAAC"}
|