@catladder/cli 2.6.3 → 2.7.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 +3 -3
- package/dist/bundles/cli/index.js +1 -1
- package/dist/pipeline/src/deploy/cloudRun/createJobs/cloudRunJobs.js +52 -38
- package/dist/pipeline/src/deploy/cloudRun/createJobs/cloudRunJobs.js.map +1 -1
- package/dist/pipeline/src/deploy/types/googleCloudRun.d.ts +14 -12
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -15,16 +15,14 @@ const getJobRunScriptForJob = (context, jobName, wait) => {
|
|
|
15
15
|
};
|
|
16
16
|
const getDeleteSchedulesScripts = (context) => {
|
|
17
17
|
const deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
|
|
18
|
-
const
|
|
18
|
+
const schedules = getSchedules(context);
|
|
19
19
|
const argsString = (0, createArgsString_1.createArgsString)({
|
|
20
20
|
project: deployConfig.projectId,
|
|
21
21
|
location: deployConfig.region,
|
|
22
22
|
});
|
|
23
|
-
return
|
|
24
|
-
.map(({
|
|
25
|
-
return [
|
|
26
|
-
`${(0, common_1.gcloudSchedulerCmd)()} jobs delete ${schedulerName} ${argsString}`,
|
|
27
|
-
];
|
|
23
|
+
return schedules
|
|
24
|
+
.map(({ name }) => {
|
|
25
|
+
return [`${(0, common_1.gcloudSchedulerCmd)()} jobs delete ${name} ${argsString}`];
|
|
28
26
|
})
|
|
29
27
|
.flat();
|
|
30
28
|
};
|
|
@@ -57,25 +55,31 @@ const getJobRunScripts = (context, when) => {
|
|
|
57
55
|
});
|
|
58
56
|
};
|
|
59
57
|
exports.getJobRunScripts = getJobRunScripts;
|
|
60
|
-
const getJobCreateScripts = (context) => getCloudRunJobsWithNames(context).map(({ job
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
58
|
+
const getJobCreateScripts = (context) => getCloudRunJobsWithNames(context).map(({ job, jobName }, jobIndex) => {
|
|
59
|
+
var _a, _b, _c, _d;
|
|
60
|
+
const commandArray = Array.isArray(job.command)
|
|
61
|
+
? job.command
|
|
62
|
+
: job.command.split(" ");
|
|
64
63
|
const { image: commonImage, project, region, ...deployArgs } = (0, common_1.getCommonDeployArgs)(context);
|
|
65
64
|
const commonDeployArgsString = (0, createArgsString_1.createArgsString)({
|
|
66
65
|
command: `"${commandArray.join(",")}"`,
|
|
67
66
|
labels: `"${(0, common_1.makeLabelString)((0, getLabels_1.getLabels)(context))},cloud-run-job-name=$current_job_name"`,
|
|
68
|
-
image: `"${image !== null &&
|
|
67
|
+
image: `"${(_a = job.image) !== null && _a !== void 0 ? _a : commonImage}"`,
|
|
69
68
|
project,
|
|
70
69
|
region,
|
|
71
|
-
cpu,
|
|
72
|
-
memory,
|
|
73
|
-
parallelism,
|
|
74
|
-
"task-timeout": timeout,
|
|
70
|
+
cpu: job.cpu,
|
|
71
|
+
memory: (_b = job.memory) !== null && _b !== void 0 ? _b : "512Mi",
|
|
72
|
+
parallelism: (_c = job.parallelism) !== null && _c !== void 0 ? _c : 1,
|
|
73
|
+
"task-timeout": (_d = job.timeout) !== null && _d !== void 0 ? _d : "10m",
|
|
75
74
|
"env-vars-file": constants_1.ENV_VARS_FILENAME,
|
|
76
75
|
"max-retries": 0,
|
|
77
76
|
...deployArgs,
|
|
78
|
-
|
|
77
|
+
// network
|
|
78
|
+
"vpc-connector": job === null || job === void 0 ? void 0 : job.vpcConnector,
|
|
79
|
+
"vpc-egress": job === null || job === void 0 ? void 0 : job.vpcEgress,
|
|
80
|
+
network: job === null || job === void 0 ? void 0 : job.network,
|
|
81
|
+
subnet: job === null || job === void 0 ? void 0 : job.subnet,
|
|
82
|
+
}, ...(0, volumes_1.createVolumeConfig)(job.volumes, "job"));
|
|
79
83
|
return [
|
|
80
84
|
jobIndex === 0
|
|
81
85
|
? `exist_job_names="$(\n ${(0, common_1.gcloudRunCmd)()} jobs list --filter='metadata.name ~ ${context.env}.*${context.name}' --format='value(name)' --limit=999 --project='${project}' --region='${region}'\n)"`
|
|
@@ -92,28 +96,26 @@ const getJobCreateScripts = (context) => getCloudRunJobsWithNames(context).map((
|
|
|
92
96
|
});
|
|
93
97
|
exports.getJobCreateScripts = getJobCreateScripts;
|
|
94
98
|
const getCreateScheduleScripts = (context) => {
|
|
95
|
-
const
|
|
99
|
+
const schedules = getSchedules(context);
|
|
96
100
|
const { region: location, projectId: project } = (0, common_1.getCloudRunDeployConfig)(context);
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
location,
|
|
101
|
-
uri: `"$current_job_uri"`,
|
|
102
|
-
"http-method": "POST",
|
|
103
|
-
"oauth-service-account-email": `"$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com"`,
|
|
104
|
-
};
|
|
105
|
-
return jobsWithSchedule.map(({ job: { maxRetryAttempts, schedule }, jobName, schedulerName }, jobIndex) => {
|
|
101
|
+
return schedules.map((scheduler, jobIndex) => {
|
|
102
|
+
var _a;
|
|
103
|
+
const uri = getSchedulerUrl(scheduler, context);
|
|
106
104
|
const argsString = (0, createArgsString_1.createArgsString)({
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
"
|
|
105
|
+
project,
|
|
106
|
+
location,
|
|
107
|
+
uri: `"$current_job_uri"`,
|
|
108
|
+
"http-method": "POST",
|
|
109
|
+
"oauth-service-account-email": `"$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com"`,
|
|
110
|
+
schedule: `"${scheduler.schedule}"`,
|
|
111
|
+
"max-retry-attempts": (_a = scheduler.maxRetryAttempts) !== null && _a !== void 0 ? _a : 0,
|
|
110
112
|
});
|
|
111
113
|
return [
|
|
112
114
|
jobIndex === 0
|
|
113
115
|
? `exist_scheduler_names="$(\n ${(0, common_1.gcloudSchedulerCmd)()} jobs list --filter='httpTarget.uri ~ ${context.env}.*${context.name}' --format='value(name)' --limit=999 --location='${location}' --project='${project}'\n)"`
|
|
114
116
|
: null,
|
|
115
|
-
`current_job_uri="${
|
|
116
|
-
`current_scheduler_name="${
|
|
117
|
+
`current_job_uri="${uri}"`,
|
|
118
|
+
`current_scheduler_name="${scheduler.name}"`,
|
|
117
119
|
`if grep "$current_scheduler_name" <<<"$exist_scheduler_names" >/dev/null; then`,
|
|
118
120
|
` ${(0, common_1.gcloudSchedulerCmd)()} jobs update http "$current_scheduler_name" ${argsString}`,
|
|
119
121
|
`else`,
|
|
@@ -125,16 +127,28 @@ const getCreateScheduleScripts = (context) => {
|
|
|
125
127
|
});
|
|
126
128
|
};
|
|
127
129
|
exports.getCreateScheduleScripts = getCreateScheduleScripts;
|
|
128
|
-
const
|
|
130
|
+
const getSchedulerUrl = (scheduler, context) => {
|
|
131
|
+
if (scheduler.type === "cloudRunJob") {
|
|
132
|
+
const { region: location, projectId: project } = (0, common_1.getCloudRunDeployConfig)(context);
|
|
133
|
+
const uriBase = `https://${location}-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/${project}/jobs`;
|
|
134
|
+
return `${uriBase}/${scheduler.jobName}:run`;
|
|
135
|
+
}
|
|
136
|
+
throw new Error(`Unknown scheduler type: ${scheduler.type}`);
|
|
137
|
+
};
|
|
138
|
+
const getSchedules = (context) => {
|
|
129
139
|
const jobsWithNames = getCloudRunJobsWithNames(context);
|
|
130
140
|
return jobsWithNames
|
|
131
141
|
.filter((entry) => entry.job.when === "schedule")
|
|
132
|
-
.map(({ job,
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
142
|
+
.map(({ job: { maxRetryAttempts, schedule }, jobName }) => {
|
|
143
|
+
const schedulerName = jobName.concat("-scheduler");
|
|
144
|
+
return {
|
|
145
|
+
name: schedulerName,
|
|
146
|
+
maxRetryAttempts,
|
|
147
|
+
schedule,
|
|
148
|
+
type: "cloudRunJob",
|
|
149
|
+
jobName,
|
|
150
|
+
};
|
|
151
|
+
});
|
|
138
152
|
};
|
|
139
153
|
const getCloudRunJobsWithNames = (context) => {
|
|
140
154
|
var _a;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloudRunJobs.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/cloudRunJobs.ts"],"names":[],"mappings":";;;AAMA,gEAA6D;AAC7D,8CAAsD;AACtD,qCAOkB;AAClB,0DAAuD;AACvD,uCAA+C;AAK/C,2CAAgD;AAChD,0CAAwC;AAExC,MAAM,qBAAqB,GAAG,CAC5B,OAAyB,EACzB,OAA+B,EAC/B,IAAa,EACb,EAAE;IACF,MAAM,UAAU,GAAG,IAAA,8BAAqB,EAAC,OAAO,CAAC,CAAC;IAElD,MAAM,gBAAgB,GAAG,IAAA,mCAAgB,EAAC,UAAU,CAAC,CAAC;IACtD,OAAO,GAAG,IAAA,qBAAY,GAAE,iBAAiB,OAAO,CAAC,QAAQ,EAAE,IAAI,gBAAgB,GAC7E,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EACrB,EAAE,CAAC;AACL,CAAC,CAAC;AAEK,MAAM,yBAAyB,GAAG,CAAC,OAAyB,EAAE,EAAE;IACrE,MAAM,YAAY,GAAG,IAAA,gCAAuB,EAAC,OAAO,CAAC,CAAC;IACtD,MAAM,
|
|
1
|
+
{"version":3,"file":"cloudRunJobs.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/cloudRunJobs.ts"],"names":[],"mappings":"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"}
|
|
@@ -106,6 +106,18 @@ export type DeployConfigCloudRunService = {
|
|
|
106
106
|
* defaults to gen1 according to gcloud
|
|
107
107
|
*/
|
|
108
108
|
executionEnvironment?: "gen2" | "gen1";
|
|
109
|
+
/**
|
|
110
|
+
* Use http2 end-to-end. See https://cloud.google.com/run/docs/configuring/http2
|
|
111
|
+
*
|
|
112
|
+
* Defaults to false.
|
|
113
|
+
*
|
|
114
|
+
* Your service needs to be able to handle http2 requests.
|
|
115
|
+
* Its recommended to use http2 without tls, since cloud run handles the encryption for you. (so called "h2c" (http2 cleartext))
|
|
116
|
+
*
|
|
117
|
+
*/
|
|
118
|
+
http2?: boolean;
|
|
119
|
+
} & DeployConfigCloudRunWithVolumes & DeployConfigCloudRunNetworkConfig;
|
|
120
|
+
export type DeployConfigCloudRunNetworkConfig = {
|
|
109
121
|
network?: string;
|
|
110
122
|
/**
|
|
111
123
|
* vpc subnet to use, see https://cloud.google.com/sdk/gcloud/reference/run/deploy#--subnet
|
|
@@ -119,17 +131,7 @@ export type DeployConfigCloudRunService = {
|
|
|
119
131
|
* vpc connector
|
|
120
132
|
*/
|
|
121
133
|
vpcConnector?: string;
|
|
122
|
-
|
|
123
|
-
* Use http2 end-to-end. See https://cloud.google.com/run/docs/configuring/http2
|
|
124
|
-
*
|
|
125
|
-
* Defaults to false.
|
|
126
|
-
*
|
|
127
|
-
* Your service needs to be able to handle http2 requests.
|
|
128
|
-
* Its recommended to use http2 without tls, since cloud run handles the encryption for you. (so called "h2c" (http2 cleartext))
|
|
129
|
-
*
|
|
130
|
-
*/
|
|
131
|
-
http2?: boolean;
|
|
132
|
-
} & DeployConfigCloudRunWithVolumes;
|
|
134
|
+
};
|
|
133
135
|
export type DeployConfigCloudRunJobBase = {
|
|
134
136
|
/**
|
|
135
137
|
* command
|
|
@@ -157,7 +159,7 @@ export type DeployConfigCloudRunJobBase = {
|
|
|
157
159
|
* number of tasks that may run concurrently, defaults to 1
|
|
158
160
|
*/
|
|
159
161
|
parallelism?: number;
|
|
160
|
-
} & DeployConfigCloudRunWithVolumes;
|
|
162
|
+
} & DeployConfigCloudRunWithVolumes & DeployConfigCloudRunNetworkConfig;
|
|
161
163
|
type Minute = string;
|
|
162
164
|
type Hour = string;
|
|
163
165
|
type DayOfMonth = string;
|