@catladder/pipeline 2.6.3 → 2.7.1

package/src/deploy/cloudRun/createJobs/cloudRunJobs.ts

@@ -38,16 +38,14 @@ const getJobRunScriptForJob = (
 
 export const getDeleteSchedulesScripts = (context: ComponentContext) => {
   const deployConfig = getCloudRunDeployConfig(context);
-  const jobsWithSchedule = getCloudRunJobsWithSchedule(context);
+  const schedules = getSchedules(context);
   const argsString = createArgsString({
     project: deployConfig.projectId,
     location: deployConfig.region,
   });
-  return jobsWithSchedule
-    .map(({ schedulerName }) => {
-      return [
-        `${gcloudSchedulerCmd()} jobs delete ${schedulerName} ${argsString}`,
-      ];
+  return schedules
+    .map(({ name }) => {
+      return [`${gcloudSchedulerCmd()} jobs delete ${name} ${argsString}`];
     })
     .flat();
 };
@@ -86,24 +84,10 @@ export const getJobRunScripts = (
 
 export const getJobCreateScripts = (context: ComponentContext): string[] =>
   getCloudRunJobsWithNames(context).map(
-    (
-      {
-        job: {
-          command,
-          image,
-          cpu,
-          memory = "512Mi",
-          timeout = "10m",
-          parallelism = 1,
-          volumes,
-        },
-        jobName,
-      },
-      jobIndex,
-    ): string => {
-      const commandArray = Array.isArray(command)
-        ? command
-        : command.split(" ");
+    ({ job, jobName }, jobIndex): string => {
+      const commandArray = Array.isArray(job.command)
+        ? job.command
+        : job.command.split(" ");
 
       const {
         image: commonImage,
@@ -115,18 +99,26 @@ export const getJobCreateScripts = (context: ComponentContext): string[] =>
         {
           command: `"${commandArray.join(",")}"`,
           labels: `"${makeLabelString(getLabels(context))},cloud-run-job-name=$current_job_name"`,
-          image: `"${image ?? commonImage}"`,
+          image: `"${job.image ?? commonImage}"`,
           project,
           region,
-          cpu,
-          memory,
-          parallelism,
-          "task-timeout": timeout,
+          cpu: job.cpu,
+          memory: job.memory ?? "512Mi",
+          parallelism: job.parallelism ?? 1,
+
+          "task-timeout": job.timeout ?? "10m",
           "env-vars-file": ENV_VARS_FILENAME,
           "max-retries": 0,
+
           ...deployArgs,
+
+          // network
+          "vpc-connector": job?.vpcConnector,
+          "vpc-egress": job?.vpcEgress,
+          network: job?.network,
+          subnet: job?.subnet,
         },
-        ...createVolumeConfig(volumes, "job"),
+        ...createVolumeConfig(job.volumes, "job"),
       );
 
       return [
@@ -148,48 +140,62 @@ export const getJobCreateScripts = (context: ComponentContext): string[] =>
 export const getCreateScheduleScripts = (
   context: ComponentContext,
 ): string[] => {
-  const jobsWithSchedule = getCloudRunJobsWithSchedule(context);
+  const schedules = getSchedules(context);
   const { region: location, projectId: project } =
     getCloudRunDeployConfig(context);
 
-  const uriBase = `https://${location}-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/${project}/jobs`;
-  const gcloudArgs = {
-    project,
-    location,
-    uri: `"$current_job_uri"`,
-    "http-method": "POST",
-    "oauth-service-account-email": `"$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com"`,
-  };
-
-  return jobsWithSchedule.map(
-    (
-      { job: { maxRetryAttempts, schedule }, jobName, schedulerName },
-      jobIndex,
-    ): string => {
-      const argsString = createArgsString({
-        ...gcloudArgs,
-        schedule: `"${schedule}"`,
-        "max-retry-attempts": maxRetryAttempts ?? 0,
-      });
-      return [
-        jobIndex === 0
-          ? `exist_scheduler_names="$(\n  ${gcloudSchedulerCmd()} jobs list --filter='httpTarget.uri ~ ${context.env}.*${context.name}' --format='value(name)' --limit=999 --location='${location}' --project='${project}'\n)"`
-          : null,
-        `current_job_uri="${uriBase}/${jobName}:run"`,
-        `current_scheduler_name="${schedulerName}"`,
-        `if grep "$current_scheduler_name" <<<"$exist_scheduler_names" >/dev/null; then`,
-        `  ${gcloudSchedulerCmd()} jobs update http "$current_scheduler_name" ${argsString}`,
-        `else`,
-        `  ${gcloudSchedulerCmd()} jobs create http "$current_scheduler_name" ${argsString}`,
-        `fi`,
-      ]
-        .filter(notNil)
-        .join("\n");
-    },
-  );
+  return schedules.map((scheduler, jobIndex): string => {
+    const uri = getSchedulerUrl(scheduler, context);
+
+    const argsString = createArgsString({
+      project,
+      location,
+      uri: `"$current_job_uri"`,
+      "http-method": "POST",
+      "oauth-service-account-email": `"$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com"`,
+      schedule: `"${scheduler.schedule}"`,
+      "max-retry-attempts": scheduler.maxRetryAttempts ?? 0,
+    });
+    return [
+      jobIndex === 0
+        ? `exist_scheduler_names="$(\n  ${gcloudSchedulerCmd()} jobs list --filter='httpTarget.uri ~ ${context.env}.*${context.name}' --format='value(name)' --limit=999 --location='${location}' --project='${project}'\n)"`
+        : null,
+      `current_job_uri="${uri}"`,
+      `current_scheduler_name="${scheduler.name}"`,
+      `if grep "$current_scheduler_name" <<<"$exist_scheduler_names" >/dev/null; then`,
+      `  ${gcloudSchedulerCmd()} jobs update http "$current_scheduler_name" ${argsString}`,
+      `else`,
+      `  ${gcloudSchedulerCmd()} jobs create http "$current_scheduler_name" ${argsString}`,
+      `fi`,
+    ]
+      .filter(notNil)
+      .join("\n");
+  });
+};
+
+type Scheduler = {
+  name: StringOrBashExpression;
+  maxRetryAttempts?: number;
+  schedule: string;
+} & {
+  type: "cloudRunJob";
+  jobName: StringOrBashExpression;
+};
+
+const getSchedulerUrl = (scheduler: Scheduler, context: ComponentContext) => {
+  if (scheduler.type === "cloudRunJob") {
+    const { region: location, projectId: project } =
+      getCloudRunDeployConfig(context);
+
+    const uriBase = `https://${location}-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/${project}/jobs`;
+
+    return `${uriBase}/${scheduler.jobName}:run`;
+  }
+
+  throw new Error(`Unknown scheduler type: ${scheduler.type}`);
 };
 
-const getCloudRunJobsWithSchedule = (context: ComponentContext) => {
+const getSchedules = (context: ComponentContext): Scheduler[] => {
   const jobsWithNames = getCloudRunJobsWithNames(context);
 
   return jobsWithNames
@@ -202,12 +208,16 @@ const getCloudRunJobsWithSchedule = (context: ComponentContext) => {
         jobKey: string;
       } => entry.job.when === "schedule",
     )
-    .map(({ job, jobName, jobKey }) => ({
-      job,
-      jobName,
-      jobKey,
-      schedulerName: jobName.concat("-scheduler"),
-    }));
+    .map(({ job: { maxRetryAttempts, schedule }, jobName }) => {
+      const schedulerName = jobName.concat("-scheduler");
+      return {
+        name: schedulerName,
+        maxRetryAttempts,
+        schedule,
+        type: "cloudRunJob",
+        jobName,
+      };
+    });
 };
 
 const getCloudRunJobsWithNames = (context: ComponentContext) => {

package/src/deploy/types/googleCloudRun.ts

@@ -158,6 +158,20 @@ export type DeployConfigCloudRunService = {
    */
   executionEnvironment?: "gen2" | "gen1";
 
+  /**
+   * Use http2 end-to-end. See https://cloud.google.com/run/docs/configuring/http2
+   *
+   * Defaults to false.
+   *
+   * Your service needs to be able to handle http2 requests.
+   * Its recommended to use http2 without tls, since cloud run handles the encryption for you. (so called "h2c" (http2 cleartext))
+   *
+   */
+  http2?: boolean;
+} & DeployConfigCloudRunWithVolumes &
+  DeployConfigCloudRunNetworkConfig;
+
+export type DeployConfigCloudRunNetworkConfig = {
   /* the vpc network, see https://cloud.google.com/sdk/gcloud/reference/run/deploy#--network  */
   network?: string;
 
@@ -174,18 +188,7 @@ export type DeployConfigCloudRunService = {
    * vpc connector
    */
   vpcConnector?: string;
-
-  /**
-   * Use http2 end-to-end. See https://cloud.google.com/run/docs/configuring/http2
-   *
-   * Defaults to false.
-   *
-   * Your service needs to be able to handle http2 requests.
-   * Its recommended to use http2 without tls, since cloud run handles the encryption for you. (so called "h2c" (http2 cleartext))
-   *
-   */
-  http2?: boolean;
-} & DeployConfigCloudRunWithVolumes;
+};
 
 export type DeployConfigCloudRunJobBase = {
   /**
@@ -219,7 +222,8 @@ export type DeployConfigCloudRunJobBase = {
    * number of tasks that may run concurrently, defaults to 1
    */
   parallelism?: number;
-} & DeployConfigCloudRunWithVolumes;
+} & DeployConfigCloudRunWithVolumes &
+  DeployConfigCloudRunNetworkConfig;
 
 type Minute = string;
 type Hour = string;