@catladder/pipeline 1.54.0 → 1.55.0

package/dist/constants.js

@@ -2,5 +2,5 @@
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "v1-54-0-a367bcd6" || "";
+exports.PIPELINE_IMAGE_TAG = "v1-55-0-40141b86" || "";
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || "";

package/dist/deploy/cloudRun/deployJob.js

@@ -57,13 +57,15 @@ var types_1 = require("../types");
 var gcloudServiceAccountLoginCommands_1 = require("./utils/gcloudServiceAccountLoginCommands");
 
 var createGoogleCloudRunDeployJobs = function (context) {
+  var _a, _b;
+
   var deployConfig = context.componentConfig.deploy;
 
   if (deployConfig === false) {
     return [];
   }
 
-  if (!(0, types_1.isOfDeployType)(deployConfig, "google-cloudrun", "google-cloudrun-job")) {
+  if (!(0, types_1.isOfDeployType)(deployConfig, "google-cloudrun")) {
     // should not happen
     throw new Error("deploy config is wrong");
   }
@@ -84,44 +86,76 @@ var createGoogleCloudRunDeployJobs = function (context) {
     return "".concat(key, "=").concat(value);
   }).join(",");
   var commonArgs = "--project ".concat(deployConfig.projectId, " --region=").concat(deployConfig.region);
+  var commonDeployArgs = "--image ".concat(gcloudImageName, " ").concat(commonArgs, " --labels ").concat(labelsString);
+  var serviceName = context.environment.fullName.toLowerCase();
 
-  var getDeployCommand = function () {
+  var getServiceDeployScript = function (service) {
     var _a;
 
-    var name = context.environment.fullName.toLowerCase();
-    var command = (_a = deployConfig.command) !== null && _a !== void 0 ? _a : context.componentConfig.build.startCommand;
+    var command = service !== true ? (_a = service === null || service === void 0 ? void 0 : service.command) !== null && _a !== void 0 ? _a : context.componentConfig.build.startCommand : undefined;
     var commandArg = command ? "--command=\"".concat(command.split(" ").join(","), "\"") : "";
-    var commonDeployArgs = "".concat(commandArg, " --image ").concat(gcloudImageName, " ").concat(commonArgs, " --env-vars-file=____envvars.yaml --labels ").concat(labelsString);
+    return "gcloud run deploy ".concat(serviceName, " ").concat(commandArg, " ").concat(commonDeployArgs, " --env-vars-file=____envvars.yaml --allow-unauthenticated");
+  };
 
-    if (deployConfig.type === "google-cloudrun") {
-      return "gcloud run deploy ".concat(name, " ").concat(commonDeployArgs, " --allow-unauthenticated");
-    }
+  var getJobDeployScripts = function (jobName, job) {
+    // due to some oversight from google, jobs create does not accept `--env-vars-file` 🤦
+    // lucky, update on the other hand accepts it... so let's just imediatly update it
+    // also we cannot upsert a job, so we have to create it and catch the error and then update
+    var args = "".concat(jobName, " --command=\"").concat(job.command.split(" ").join(","), "\" ").concat(commonDeployArgs);
+    return ["set +e", "gcloud beta run jobs create ".concat(args), "set -e", "gcloud beta run jobs update ".concat(args, " --env-vars-file=____envvars.yaml")];
+  };
 
-    if (deployConfig.type === "google-cloudrun-job") {
-      return "gcloud beta run jobs create ".concat(name, " ").concat(commonDeployArgs);
-    }
+  var getJobRunScript = function (jobName) {
+    return "gcloud beta run jobs execute ".concat(jobName, " ").concat(commonArgs);
   };
 
-  var getStopCommand = function () {
-    var name = context.environment.fullName.toLowerCase();
-    var commonStopArgs = "".concat(commonArgs, " --quiet");
+  var getFullJobName = function (name) {
+    return context.environment.fullName.toLowerCase() + "-" + name;
+  };
 
-    if (deployConfig.type === "google-cloudrun") {
-      return "gcloud run services delete ".concat(name, " ").concat(commonStopArgs);
-    }
+  var jobsWithNames = Object.entries((_a = deployConfig.jobs) !== null && _a !== void 0 ? _a : {}).map(function (_a) {
+    var _b = __read(_a, 2),
+        name = _b[0],
+        job = _b[1];
 
-    if (deployConfig.type === "google-cloudrun-job") {
-      return "gcloud beta run jobs delete ".concat(name, " ").concat(commonStopArgs);
-    }
-  };
+    return [getFullJobName(name), job];
+  });
+
+  var cloudRunDeployScripts = __spreadArray(__spreadArray(__spreadArray(__spreadArray(["echo \"$ENV_VARS\" > ____envvars.yaml"], __read(jobsWithNames.map(function (_a) {
+    var _b = __read(_a, 2),
+        name = _b[0],
+        job = _b[1];
+
+    return getJobDeployScripts(name, job);
+  }).flat()), false), __read(deployConfig.service !== false ? [getServiceDeployScript(deployConfig.service)] : []), false), __read(jobsWithNames.filter(function (_a) {
+    var _b = __read(_a, 2),
+        name = _b[0],
+        job = _b[1];
+
+    return job.when === "postDeploy";
+  }).map(function (_a) {
+    var _b = __read(_a, 2),
+        name = _b[0],
+        job = _b[1];
+
+    return getJobRunScript(name);
+  })), false), ["docker image rm ".concat(gcloudImageName)], false);
+
+  var cloudRunStopScripts = __spreadArray(__spreadArray([], __read(deployConfig.service !== false ? ["gcloud run services delete ".concat(serviceName)] : []), false), __read(Object.entries((_b = deployConfig.jobs) !== null && _b !== void 0 ? _b : {}).map(function (_a) {
+    var _b = __read(_a, 2),
+        jobName = _b[0],
+        job = _b[1];
+
+    return "gcloud beta run jobs delete ".concat(jobName);
+  })), false);
 
-  var cloudRunDeploy = ["echo \"$ENV_VARS\" > ____envvars.yaml", getDeployCommand(), "docker image rm ".concat(gcloudImageName)];
   var baseStopJob = (0, base_1.getBaseDeploymentStopJob)(context);
   return [(0, lodash_1.merge)({}, baseDeploymentJob, (0, docker_1.getDockerJobBaseProps)(context), {
     artifacts: {
       paths: ["____envvars.yaml"]
     },
     variables: {
+      CLOUDSDK_CORE_DISABLE_PROMPTS: "1",
       ENV_VARS: (0, js_yaml_1.dump)(allEnvVars, {
         lineWidth: -1,
         quotingType: "'",
@@ -129,10 +163,13 @@ var createGoogleCloudRunDeployJobs = function (context) {
       })
     },
     image: (0, runner_1.getRunnerImage)("gcloud"),
-    script: __spreadArray(__spreadArray([], __read(pushImageToArtifactsRegistry), false), __read(cloudRunDeploy), false)
+    script: __spreadArray(__spreadArray([], __read(pushImageToArtifactsRegistry), false), __read(cloudRunDeployScripts), false)
   }), (0, lodash_1.merge)({}, baseStopJob, {
     image: (0, runner_1.getRunnerImage)("gcloud"),
-    script: __spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), [getStopCommand()], false)
+    variables: {
+      CLOUDSDK_CORE_DISABLE_PROMPTS: "1"
+    },
+    script: __spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read(cloudRunStopScripts), false)
   })];
 };
 

package/dist/deploy/cloudRun/index.d.ts

@@ -1,9 +1,4 @@
 import type { DeployTypeDefinition } from "..";
 export declare const GCLOUD_DEPLOY_CREDENTIALS_KEY = "GCLOUD_DEPLOY_credentialsKey";
 export declare const GCLOUD_RUN_CANONICAL_HOST_SUFFIX = "GCLOUD_RUN_canonicalHostSuffix";
-export declare const GCLOUD_RUN_DEPLOY_TYPE: DeployTypeDefinition<"google-cloudrun">;
-export declare const GCLOUD_RUN_JOB_DEPLOY_TYPE: DeployTypeDefinition<"google-cloudrun-job">;
-export declare const GCLOUD_RUN_DEPLOY_TYPES: {
-  "google-cloudrun": DeployTypeDefinition<"google-cloudrun">;
-  "google-cloudrun-job": DeployTypeDefinition<"google-cloudrun-job">;
-};
+export declare const GCLOUD_RUN_DEPLOY_TYPE: DeployTypeDefinition<"google-cloudrun">;

package/dist/deploy/cloudRun/index.js

@@ -1,7 +1,46 @@
 "use strict";
 
+var __assign = this && this.__assign || function () {
+  __assign = Object.assign || function (t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+      s = arguments[i];
+
+      for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+    }
+
+    return t;
+  };
+
+  return __assign.apply(this, arguments);
+};
+
+var __read = this && this.__read || function (o, n) {
+  var m = typeof Symbol === "function" && o[Symbol.iterator];
+  if (!m) return o;
+  var i = m.call(o),
+      r,
+      ar = [],
+      e;
+
+  try {
+    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+  } catch (error) {
+    e = {
+      error: error
+    };
+  } finally {
+    try {
+      if (r && !r.done && (m = i["return"])) m.call(i);
+    } finally {
+      if (e) throw e.error;
+    }
+  }
+
+  return ar;
+};
+
 exports.__esModule = true;
-exports.GCLOUD_RUN_DEPLOY_TYPES = exports.GCLOUD_RUN_JOB_DEPLOY_TYPE = exports.GCLOUD_RUN_DEPLOY_TYPE = exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX = exports.GCLOUD_DEPLOY_CREDENTIALS_KEY = void 0;
+exports.GCLOUD_RUN_DEPLOY_TYPE = exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX = exports.GCLOUD_DEPLOY_CREDENTIALS_KEY = void 0;
 
 var context_1 = require("../../context");
 
@@ -20,37 +59,18 @@ exports.GCLOUD_RUN_DEPLOY_TYPE = {
   getAdditionalEnvVars: function (_a) {
     var fullName = _a.fullName,
         env = _a.env,
-        componentName = _a.componentName;
+        componentName = _a.componentName,
+        deployConfig = _a.deployConfig;
     var HOST_CANONICAL = fullName.toLowerCase() + "-" + process.env[(0, context_1.getSecretVarName)(env, componentName, exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX)];
-    return {
-      HOST_CANONICAL: HOST_CANONICAL
-    };
-  }
-};
-exports.GCLOUD_RUN_JOB_DEPLOY_TYPE = {
-  jobs: deployJob_1.createGoogleCloudRunDeployJobs,
-  defaults: function () {
-    return {};
-  },
-  additionalSecretKeys: function () {
-    return [exports.GCLOUD_DEPLOY_CREDENTIALS_KEY];
-  },
-  getAdditionalEnvVars: function (_a) {
-    var deployConfig = _a.deployConfig,
-        fullName = _a.fullName;
-
-    if (!deployConfig) {
-      return {};
-    }
+    var jobTriggers = deployConfig && deployConfig.jobs ? Object.fromEntries(Object.entries(deployConfig.jobs).map(function (_a) {
+      var _b = __read(_a, 2),
+          name = _b[0],
+          job = _b[1];
 
-    var jobName = fullName.toLowerCase();
-    var CLOUD_RUN_JOB_TRIGGER_URL = "https://".concat(deployConfig.region, "-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/").concat(deployConfig.projectId, "/jobs/").concat(jobName, ":run");
-    return {
-      CLOUD_RUN_JOB_TRIGGER_URL: CLOUD_RUN_JOB_TRIGGER_URL
-    };
+      return ["CLOUD_RUN_JOB_TRIGGER_URL_" + name, "https://".concat(deployConfig.region, "-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/").concat(deployConfig.projectId, "/jobs/").concat(name, ":run")];
+    })) : {};
+    return __assign({
+      HOST_CANONICAL: HOST_CANONICAL
+    }, jobTriggers);
   }
-};
-exports.GCLOUD_RUN_DEPLOY_TYPES = {
-  "google-cloudrun": exports.GCLOUD_RUN_DEPLOY_TYPE,
-  "google-cloudrun-job": exports.GCLOUD_RUN_JOB_DEPLOY_TYPE
 };

package/dist/deploy/index.js

@@ -1,19 +1,5 @@
 "use strict";
 
-var __assign = this && this.__assign || function () {
-  __assign = Object.assign || function (t) {
-    for (var s, i = 1, n = arguments.length; i < n; i++) {
-      s = arguments[i];
-
-      for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
-    }
-
-    return t;
-  };
-
-  return __assign.apply(this, arguments);
-};
-
 var __createBinding = this && this.__createBinding || (Object.create ? function (o, m, k, k2) {
   if (k2 === undefined) k2 = k;
   Object.defineProperty(o, k2, {
@@ -52,8 +38,9 @@ __exportStar(require("./cloudSql"), exports);
 
 __exportStar(require("./cloudRun"), exports);
 
-exports.DEPLOY_TYPES = __assign({
+exports.DEPLOY_TYPES = {
   kubernetes: kubernetes_1.KUBERNETES_DEPLOY_TYPE,
   custom: custom_1.CUSTOM_DEPLOY_TYPE,
-  dockerTag: dockerTag_1.DOCKER_TAG_DEPLOY_TYPE
-}, cloudRun_1.GCLOUD_RUN_DEPLOY_TYPES);
+  dockerTag: dockerTag_1.DOCKER_TAG_DEPLOY_TYPE,
+  "google-cloudrun": cloudRun_1.GCLOUD_RUN_DEPLOY_TYPE
+};

package/dist/deploy/types/googleCloudRun.d.ts

@@ -1,22 +1,19 @@
 import type { DeployConfigBase } from "./base";
 export declare type Gcloudregion = "asia-east1" | "asia-northeast1" | "asia-northeast2" | "europe-north1" | "europe-southwest1" | "europe-west1" | "europe-west4" | "europe-west8" | "europe-west9" | "me-west1" | "us-central1" | "us-east1" | "us-east4" | "us-east5" | "us-south1" | "us-west1" | "asia-east2" | "asia-northeast3" | "asia-southeast1" | "asia-southeast2" | "asia-south1" | "asia-south2" | "australia-southeast1" | "australia-southeast2" | "europe-central2" | "europe-west2" | "europe-west3" | "europe-west6" | "northamerica-northeast1" | "northamerica-northeast2" | "southamerica-east1" | "southamerica-west1" | "us-west2" | "us-west3" | "us-west4";
-export declare type DeployConfigCloudRunBase = {
-  /**
-   * the google cloud porject id
-   */
-  projectId: string;
-  /**
-   * the region. Set to europe-west6 for switzerland
-   */
-
-  region: Gcloudregion;
+export declare type DeployConfigCloudRunService = {
   /**
    * command / entrypoint, fallsback to buildConfig.startcommand
    */
-
   command?: string;
-} & DeployConfigBase;
-export declare type DeployConfigCloudRunService = {
+};
+export declare type DeployConfigCloudRunJob = {
+  /**
+   * command
+   */
+  command: string;
+  when: "manual" | "postDeploy";
+};
+export declare type DeployConfigCloudRun = {
   /**
    * EXPERIMENTAL cloud run deployment.
    *
@@ -25,15 +22,22 @@ export declare type DeployConfigCloudRunService = {
    * Requires that cloud run is enabled on the project, as well as cloud run api and artifacts registry.
    */
   type: "google-cloudrun";
-} & DeployConfigCloudRunBase;
-export declare type DeployConfigCloudRunJob = {
   /**
-   * EXPERIMENTAL cloud run job.
-   *
-   * This will deploy a cloud run job. This does not do much currently, but will be later used for cronjobs
-   *
-   * Requires that cloud run is enabled on the project, as well as cloud run api and artifacts registry.
+   * the google cloud porject id
    */
-  type: "google-cloudrun-job";
-} & DeployConfigCloudRunBase;
-export declare type DeployConfigCloudRun = DeployConfigCloudRunService | DeployConfigCloudRunJob;
+
+  projectId: string;
+  /**
+   * the region. Set to europe-west6 for switzerland
+   */
+
+  region: Gcloudregion;
+  /**
+   * whether to enable the service, defaults to true
+   */
+
+  service?: boolean | DeployConfigCloudRunService;
+  jobs?: {
+    [name: string]: DeployConfigCloudRunJob;
+  };
+} & DeployConfigBase;

package/dist/deploy/types/index.d.ts

@@ -11,13 +11,11 @@ export declare type DeployConfigType = DeployConfig["type"];
 export declare type DeployConfigGeneric<T extends DeployConfigType> = Extract<DeployConfig, {
   type: T;
 }>;
-export declare const isOfDeployType: <T extends ("custom" | "dockerTag" | "google-cloudrun" | "google-cloudrun-job" | "kubernetes")[]>(t: DeployConfig | false, ...types: T) => t is Extract<DeployConfigCustom, {
+export declare const isOfDeployType: <T extends ("custom" | "dockerTag" | "google-cloudrun" | "kubernetes")[]>(t: DeployConfig | false, ...types: T) => t is Extract<DeployConfigCustom, {
   type: T[number];
 }> | Extract<DeployConfigDockerTag, {
   type: T[number];
-}> | Extract<import("./googleCloudRun").DeployConfigCloudRunService, {
-  type: T[number];
-}> | Extract<import("./googleCloudRun").DeployConfigCloudRunJob, {
+}> | Extract<DeployConfigCloudRun, {
   type: T[number];
 }> | Extract<DeployConfigKubernetes, {
   type: T[number];