@catladder/cli 0.0.0-next-e9e5af68 → 0.0.0-next-1c65899f

package/dist/pipeline/src/deploy/cloudRun/createJobs/cloudRunWorkerPools.d.ts

@@ -1,4 +1,4 @@
 import type { ComponentContext } from "../../../types/context";
 import type { DeployConfigCloudRunWorkerPool } from "../../types/googleCloudRun";
 export declare const getWorkerPoolDeployScript: (context: ComponentContext, workerPool: DeployConfigCloudRunWorkerPool, nameSuffix: string) => string;
-export declare const getWorkerPoolDeleteScript: (context: ComponentContext, workerPoolSuffix: string) => string[];
+export declare const getWorkerPoolDeleteScript: (context: ComponentContext, workerPoolSuffix: string) => string[];

package/dist/pipeline/src/deploy/cloudRun/createJobs/cloudRunWorkerPools.js

@@ -1,8 +1,5 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.getWorkerPoolDeleteScript = exports.getWorkerPoolDeployScript = void 0;
 const getLabels_1 = require("../../../context/getLabels");
 const createArgsString_1 = require("../utils/createArgsString");
@@ -12,41 +9,44 @@ const common_1 = require("./common");
 const constants_1 = require("./constants");
 const volumes_1 = require("./volumes");
 const getWorkerPoolDeployScript = (context, workerPool, nameSuffix) => {
-  var _a, _b, _c, _d;
-  const commonDeployArgs = (0, common_1.getCommonDeployArgs)(context);
-  const serviceName = (0, getServiceName_1.getServiceName)(context);
-  const command = workerPool.command;
-  const commandArray = Array.isArray(command) ? command : command.split(" ");
-  const fullWorkerPoolName = `${serviceName}-${nameSuffix}`;
-  const argsString = (0, createArgsString_1.createArgsString)({
-    command: '"' + commandArray.join(",") + '"',
-    args: (0, getJobOrServiceArgs_1.getCloudRunServiceOrJobArgsArg)(workerPool.args),
-    ...commonDeployArgs,
-    image: (_a = workerPool.image) !== null && _a !== void 0 ? _a : commonDeployArgs.image,
-    labels: (0, common_1.makeLabelString)({
-      ...(0, getLabels_1.getLabels)(context),
-      "cloud-run-worker-pool-name": fullWorkerPoolName
-    }),
-    "env-vars-file": constants_1.ENV_VARS_FILENAME,
-    instances: (_b = workerPool.instances) !== null && _b !== void 0 ? _b : 1,
-    cpu: (_c = workerPool.cpu) !== null && _c !== void 0 ? _c : 1,
-    memory: (_d = workerPool.memory) !== null && _d !== void 0 ? _d : "512Mi",
-    "vpc-connector": workerPool.vpcConnector,
-    "vpc-egress": workerPool.vpcEgress,
-    network: workerPool.network,
-    subnet: workerPool.subnet,
-    gpu: workerPool.gpu,
-    "gpu-type": workerPool.gpuType
-  }, ...(0, volumes_1.createVolumeConfig)(workerPool.volumes, "worker-pool"));
-  // Worker pools are in beta and require the beta command
-  return `${(0, common_1.gcloudRunCmd)("beta")} worker-pools deploy ${fullWorkerPoolName} ${argsString}`;
+    var _a, _b, _c, _d;
+    const commonDeployArgs = (0, common_1.getCommonDeployArgs)(context);
+    const serviceName = (0, getServiceName_1.getServiceName)(context);
+    const command = workerPool.command;
+    const commandArray = Array.isArray(command) ? command : command.split(" ");
+    const fullWorkerPoolName = `${serviceName}-${nameSuffix}`;
+    const argsString = (0, createArgsString_1.createArgsString)({
+        command: '"' + commandArray.join(",") + '"',
+        args: (0, getJobOrServiceArgs_1.getCloudRunServiceOrJobArgsArg)(workerPool.args),
+        ...commonDeployArgs,
+        image: (_a = workerPool.image) !== null && _a !== void 0 ? _a : commonDeployArgs.image,
+        labels: (0, common_1.makeLabelString)({
+            ...(0, getLabels_1.getLabels)(context),
+            "cloud-run-worker-pool-name": fullWorkerPoolName,
+        }),
+        "env-vars-file": constants_1.ENV_VARS_FILENAME,
+        instances: (_b = workerPool.instances) !== null && _b !== void 0 ? _b : 1,
+        cpu: (_c = workerPool.cpu) !== null && _c !== void 0 ? _c : 1,
+        memory: (_d = workerPool.memory) !== null && _d !== void 0 ? _d : "512Mi",
+        "vpc-connector": workerPool.vpcConnector,
+        "vpc-egress": workerPool.vpcEgress,
+        network: workerPool.network,
+        subnet: workerPool.subnet,
+        gpu: workerPool.gpu,
+        "gpu-type": workerPool.gpuType,
+    }, ...(0, volumes_1.createVolumeConfig)(workerPool.volumes, "worker-pool"));
+    // Worker pools are in beta and require the beta command
+    return `${(0, common_1.gcloudRunCmd)("beta")} worker-pools deploy ${fullWorkerPoolName} ${argsString}`;
 };
 exports.getWorkerPoolDeployScript = getWorkerPoolDeployScript;
 const getWorkerPoolDeleteScript = (context, workerPoolSuffix) => {
-  const commonArgs = (0, common_1.getCommonCloudRunArgs)(context);
-  const commonArgsString = (0, createArgsString_1.createArgsString)(commonArgs);
-  const serviceName = (0, getServiceName_1.getServiceName)(context);
-  const fullWorkerPoolName = `${serviceName}-${workerPoolSuffix}`;
-  return [`${(0, common_1.gcloudRunCmd)("beta")} worker-pools delete ${fullWorkerPoolName} ${commonArgsString}`];
+    const commonArgs = (0, common_1.getCommonCloudRunArgs)(context);
+    const commonArgsString = (0, createArgsString_1.createArgsString)(commonArgs);
+    const serviceName = (0, getServiceName_1.getServiceName)(context);
+    const fullWorkerPoolName = `${serviceName}-${workerPoolSuffix}`;
+    return [
+        `${(0, common_1.gcloudRunCmd)("beta")} worker-pools delete ${fullWorkerPoolName} ${commonArgsString}`,
+    ];
 };
-exports.getWorkerPoolDeleteScript = getWorkerPoolDeleteScript;
+exports.getWorkerPoolDeleteScript = getWorkerPoolDeleteScript;
+//# sourceMappingURL=cloudRunWorkerPools.js.map

package/dist/pipeline/src/deploy/cloudRun/createJobs/common.d.ts

@@ -10,12 +10,12 @@ export declare const getComputeServiceAccountEmail: (context: ComponentContext)
 export declare const makeLabelString: (obj: Record<string, unknown>) => string;
 export declare const getCloudRunDeployConfig: (context: ComponentContext) => import("../../types").DeployConfigCloudRun;
 export declare function getCommonCloudRunArgs(context: ComponentContext): {
-  project: string;
-  region: import("../../types").Gcloudregion;
+    project: string;
+    region: import("../../types").Gcloudregion;
 };
 export declare function getCommonDeployArgs(context: ComponentContext): {
-  "set-cloudsql-instances": string;
-  project: string;
-  region: import("../../types").Gcloudregion;
-  image: string;
-};
+    "set-cloudsql-instances": string;
+    project: string;
+    region: import("../../types").Gcloudregion;
+    image: string;
+};

package/dist/pipeline/src/deploy/cloudRun/createJobs/common.js

@@ -1,60 +1,62 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCommonDeployArgs = exports.getCommonCloudRunArgs = exports.getCloudRunDeployConfig = exports.makeLabelString = exports.getComputeServiceAccountEmail = exports.gcloudSchedulerCmd = exports.gcloudRunCmd = exports.gcloudCmd = void 0;
 const store_1 = require("../../../store");
 const types_1 = require("../../types");
 const artifactsRegistry_1 = require("../artifactsRegistry");
-const gcloudCmd = version => {
-  return version ? `gcloud ${version}` : "gcloud";
+const gcloudCmd = (version) => {
+    return version ? `gcloud ${version}` : "gcloud";
 };
 exports.gcloudCmd = gcloudCmd;
-const gcloudRunCmd = version => {
-  return `${(0, exports.gcloudCmd)(version)} run`;
+const gcloudRunCmd = (version) => {
+    return `${(0, exports.gcloudCmd)(version)} run`;
 };
 exports.gcloudRunCmd = gcloudRunCmd;
-const gcloudSchedulerCmd = version => {
-  return `${(0, exports.gcloudCmd)(version)} scheduler`;
+const gcloudSchedulerCmd = (version) => {
+    return `${(0, exports.gcloudCmd)(version)} scheduler`;
 };
 exports.gcloudSchedulerCmd = gcloudSchedulerCmd;
 /**
  * the default compute service account of the gcloud project — used by
  * cloud scheduler to authenticate its calls
  */
-const getComputeServiceAccountEmail = context => {
-  const deployConfig = (0, exports.getCloudRunDeployConfig)(context);
-  return `${(0, store_1.getGcloudProjectNumber)(context.fullConfig, deployConfig.projectId)}-compute@developer.gserviceaccount.com`;
+const getComputeServiceAccountEmail = (context) => {
+    const deployConfig = (0, exports.getCloudRunDeployConfig)(context);
+    return `${(0, store_1.getGcloudProjectNumber)(context.fullConfig, deployConfig.projectId)}-compute@developer.gserviceaccount.com`;
 };
 exports.getComputeServiceAccountEmail = getComputeServiceAccountEmail;
-const makeLabelString = obj => Object.entries(obj).map(([key, value]) => `${key}=${value}`).join(",");
+const makeLabelString = (obj) => Object.entries(obj)
+    .map(([key, value]) => `${key}=${value}`)
+    .join(",");
 exports.makeLabelString = makeLabelString;
-const getCloudRunDeployConfig = context => {
-  var _a;
-  const deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
-  if (!(0, types_1.isOfDeployType)(deployConfig, "google-cloudrun")) {
-    // should not happen
-    throw new Error("deploy config is wrong");
-  }
-  return deployConfig;
+const getCloudRunDeployConfig = (context) => {
+    var _a;
+    const deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
+    if (!(0, types_1.isOfDeployType)(deployConfig, "google-cloudrun")) {
+        // should not happen
+        throw new Error("deploy config is wrong");
+    }
+    return deployConfig;
 };
 exports.getCloudRunDeployConfig = getCloudRunDeployConfig;
 function getCommonCloudRunArgs(context) {
-  const deployConfig = (0, exports.getCloudRunDeployConfig)(context);
-  return {
-    project: deployConfig.projectId,
-    region: deployConfig.region
-  };
+    const deployConfig = (0, exports.getCloudRunDeployConfig)(context);
+    return {
+        project: deployConfig.projectId,
+        region: deployConfig.region,
+    };
 }
 exports.getCommonCloudRunArgs = getCommonCloudRunArgs;
 function getCommonDeployArgs(context) {
-  const commonArgs = getCommonCloudRunArgs(context);
-  const deployConfig = (0, exports.getCloudRunDeployConfig)(context);
-  return {
-    image: (0, artifactsRegistry_1.getArtifactsRegistryImage)(context),
-    ...commonArgs,
-    "set-cloudsql-instances": deployConfig.cloudSql ? deployConfig.cloudSql.instanceConnectionName : undefined
-  };
+    const commonArgs = getCommonCloudRunArgs(context);
+    const deployConfig = (0, exports.getCloudRunDeployConfig)(context);
+    return {
+        image: (0, artifactsRegistry_1.getArtifactsRegistryImage)(context),
+        ...commonArgs,
+        "set-cloudsql-instances": deployConfig.cloudSql
+            ? deployConfig.cloudSql.instanceConnectionName
+            : undefined,
+    };
 }
-exports.getCommonDeployArgs = getCommonDeployArgs;
+exports.getCommonDeployArgs = getCommonDeployArgs;
+//# sourceMappingURL=common.js.map

package/dist/pipeline/src/deploy/cloudRun/createJobs/constants.d.ts

@@ -8,4 +8,4 @@ export declare const ENV_VARS_FILENAME = "____envvars.yaml";
  * (runner-images/docker-build/Dockerfile: GCLOUD_SDK_VERSION); bump both
  * together.
  */
-export declare const CLOUD_SDK_IMAGE = "google/cloud-sdk:525.0.0";
+export declare const CLOUD_SDK_IMAGE = "google/cloud-sdk:525.0.0";

package/dist/pipeline/src/deploy/cloudRun/createJobs/constants.js

@@ -1,8 +1,5 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.CLOUD_SDK_IMAGE = exports.ENV_VARS_FILENAME = void 0;
 exports.ENV_VARS_FILENAME = "____envvars.yaml";
 /**
@@ -14,4 +11,5 @@ exports.ENV_VARS_FILENAME = "____envvars.yaml";
  * (runner-images/docker-build/Dockerfile: GCLOUD_SDK_VERSION); bump both
  * together.
  */
-exports.CLOUD_SDK_IMAGE = "google/cloud-sdk:525.0.0";
+exports.CLOUD_SDK_IMAGE = "google/cloud-sdk:525.0.0";
+//# sourceMappingURL=constants.js.map

package/dist/pipeline/src/deploy/cloudRun/createJobs/execute/onDeploy.d.ts

@@ -1,3 +1,3 @@
 import type { ComponentContext } from "../../../../types/context";
 import type { DeployConfigCloudRunExecuteOnDeploy } from "../../../types/googleCloudRun";
-export declare const getOnDeployExecuteScript: (context: ComponentContext, when: DeployConfigCloudRunExecuteOnDeploy["when"]) => string[];
+export declare const getOnDeployExecuteScript: (context: ComponentContext, when: DeployConfigCloudRunExecuteOnDeploy["when"]) => string[];

package/dist/pipeline/src/deploy/cloudRun/createJobs/execute/onDeploy.js

@@ -1,8 +1,5 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOnDeployExecuteScript = void 0;
 const utils_1 = require("../../../../utils");
 const createArgsString_1 = require("../../utils/createArgsString");
@@ -11,61 +8,74 @@ const jobName_1 = require("../../utils/jobName");
 const cloudRunJobs_1 = require("../cloudRunJobs");
 const common_1 = require("../common");
 const getOnDeployExecuteScript = (context, when) => {
-  const executes = getExecutes(context);
-  return executes.filter(config => config.when === when).flatMap(execute => {
-    return getJobRunScriptForExecute(context, execute);
-  });
+    const executes = getExecutes(context);
+    return executes
+        .filter((config) => config.when === when)
+        .flatMap((execute) => {
+        return getJobRunScriptForExecute(context, execute);
+    });
 };
 exports.getOnDeployExecuteScript = getOnDeployExecuteScript;
-const getExecutes = context => {
-  var _a;
-  const deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
-  return [...getLegacyExecutes(context), ...Object.entries((_a = deployConfig.execute) !== null && _a !== void 0 ? _a : {}).flatMap(([key, value]) => {
-    // remove all schedule executes
-    if (!value) {
-      return [];
-    }
-    return [value];
-  })];
+const getExecutes = (context) => {
+    var _a;
+    const deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
+    return [
+        ...getLegacyExecutes(context),
+        ...Object.entries((_a = deployConfig.execute) !== null && _a !== void 0 ? _a : {}).flatMap(([key, value]) => {
+            // remove all schedule executes
+            if (!value) {
+                return [];
+            }
+            return [value];
+        }),
+    ];
 };
-const getLegacyExecutes = context => {
-  const jobsWithNames = (0, cloudRunJobs_1.getCloudRunJobsWithNames)(context);
-  return jobsWithNames.flatMap(({
-    jobName,
-    job
-  }) => {
-    if (!job.when || !["preDeploy", "postDeploy", "preStop", "postStop"].includes(job.when)) {
-      return [];
-    }
-    return [{
-      job: jobName,
-      type: "job",
-      when: job.when,
-      ...(job.when === "preDeploy" || job.when === "postDeploy" ? {
-        waitForCompletion: job.waitForCompletion
-      } : {})
-    }];
-  });
+const getLegacyExecutes = (context) => {
+    const jobsWithNames = (0, cloudRunJobs_1.getCloudRunJobsWithNames)(context);
+    return jobsWithNames.flatMap(({ jobName, job }) => {
+        if (!job.when ||
+            !["preDeploy", "postDeploy", "preStop", "postStop"].includes(job.when)) {
+            return [];
+        }
+        return [
+            {
+                job: jobName,
+                type: "job",
+                when: job.when,
+                ...(job.when === "preDeploy" || job.when === "postDeploy"
+                    ? {
+                        waitForCompletion: job.waitForCompletion,
+                    }
+                    : {}),
+            },
+        ];
+    });
 };
 const getJobRunScriptForExecute = (context, config) => {
-  var _a;
-  const type = config.type;
-  if (type === "script") {
-    return (0, utils_1.ensureArray)(config.script);
-  } else if (type === "job") {
-    const commonArgs = (0, common_1.getCommonCloudRunArgs)(context);
-    // always wait for completion for preStop and postStop jobs
-    // since stop will delete the jobs afterwards, so they will fail
-    const waitForCompletion = ["preStop", "postStop"].includes(config.when) ? true // always
-    : "waitForCompletion" in config ? (_a = config.waitForCompletion) !== null && _a !== void 0 ? _a : false // depends on config
-    : false;
-    const argString = (0, createArgsString_1.createArgsString)({
-      ...commonArgs,
-      wait: waitForCompletion === true ? true : undefined,
-      args: (0, getJobOrServiceArgs_1.getCloudRunServiceOrJobArgsArg)(config.args)
-    });
-    const fullJobName = (0, jobName_1.getFullJobName)(context, config.job);
-    return [`${(0, common_1.gcloudRunCmd)()} jobs execute ${fullJobName.toString()} ${argString}`];
-  }
-  throw new Error(`unsupported execute type: ${type}`);
-};
+    var _a;
+    const type = config.type;
+    if (type === "script") {
+        return (0, utils_1.ensureArray)(config.script);
+    }
+    else if (type === "job") {
+        const commonArgs = (0, common_1.getCommonCloudRunArgs)(context);
+        // always wait for completion for preStop and postStop jobs
+        // since stop will delete the jobs afterwards, so they will fail
+        const waitForCompletion = ["preStop", "postStop"].includes(config.when)
+            ? true // always
+            : "waitForCompletion" in config
+                ? ((_a = config.waitForCompletion) !== null && _a !== void 0 ? _a : false) // depends on config
+                : false;
+        const argString = (0, createArgsString_1.createArgsString)({
+            ...commonArgs,
+            wait: waitForCompletion === true ? true : undefined,
+            args: (0, getJobOrServiceArgs_1.getCloudRunServiceOrJobArgsArg)(config.args),
+        });
+        const fullJobName = (0, jobName_1.getFullJobName)(context, config.job);
+        return [
+            `${(0, common_1.gcloudRunCmd)()} jobs execute ${fullJobName.toString()} ${argString}`,
+        ];
+    }
+    throw new Error(`unsupported execute type: ${type}`);
+};
+//# sourceMappingURL=onDeploy.js.map

package/dist/pipeline/src/deploy/cloudRun/createJobs/execute/schedules.d.ts

@@ -1,3 +1,3 @@
 import type { ComponentContext } from "../../../../types/context";
 export declare const getDeleteSchedulesScript: (context: ComponentContext) => string[];
-export declare const getCreateScheduleScript: (context: ComponentContext) => string[];
+export declare const getCreateScheduleScript: (context: ComponentContext) => string[];