@catladder/pipeline 0.0.0-refactor-untangle-gitlab-api-requests-from-vorpal-57cf3cf2 → 0.0.0-reference-database-url-1befbbee

package/dist/build/artifacts/createBuildJobArtifact.js

@@ -79,7 +79,7 @@ var createBuildJobArtifacts = function (context) {
 exports.createBuildJobArtifacts = createBuildJobArtifacts;
 var getArtifactsPathForComponent = function (c, additionalPaths) {
   var _a, _b;
-  return (_b = __spreadArray(__spreadArray([], __read((_a = c.build.config.artifactsPaths) !== null && _a !== void 0 ? _a : []), false), __read(additionalPaths !== null && additionalPaths !== void 0 ? additionalPaths : []), false)) === null || _b === void 0 ? void 0 : _b.flatMap(function (artifact) {
+  return (_b = __spreadArray(__spreadArray([], __read(c.build.type !== "disabled" ? (_a = c.build.config.artifactsPaths) !== null && _a !== void 0 ? _a : [] : []), false), __read(additionalPaths !== null && additionalPaths !== void 0 ? additionalPaths : []), false)) === null || _b === void 0 ? void 0 : _b.flatMap(function (artifact) {
     return c.build
     // in theory, we only need "direct",
     // but in some cases project may have packages in the workspace that create build artifacts, which aren't components

package/dist/build/base/index.d.ts

@@ -1,8 +1,7 @@
-import type { WorkspaceContext } from "../../types/context";
-import { type ComponentContext } from "../../types/context";
+import type { ComponentContextWithBuild, WorkspaceContext } from "../../types/context";
 import type { AppBuildJobDefinition, DockerBuildJobDefinition } from "../../types/jobDefinition";
 import type { CatladderJob } from "../../types/jobs";
-export declare const createComponentBuildJobs: (context: ComponentContext, definitions: {
+export declare const createComponentBuildJobs: (context: ComponentContextWithBuild, definitions: {
   appBuild?: AppBuildJobDefinition;
   dockerBuild: DockerBuildJobDefinition;
 }) => CatladderJob[];

package/dist/build/cache/getAllCacheConfigsFromConfig.js

@@ -54,11 +54,11 @@ var getAllCacheConfigsFromConfig = function (context, configWithCache) {
   // we would probably need to introduce a path to the right config property (build-->test or so)
   context.components.flatMap(function (componentContext) {
     var _a;
-    return (_a = (0, index_1.ensureArray)(componentContext.build.config.cache).map(function (c) {
+    return componentContext.build.type !== "disabled" ? (_a = (0, index_1.ensureArray)(componentContext.build.config.cache).map(function (c) {
       return __assign(__assign({}, c), {
         baseDir: componentContext.build.dir
       });
-    })) !== null && _a !== void 0 ? _a : [];
+    })) !== null && _a !== void 0 ? _a : [] : [];
   }) : []), false);
 };
 exports.getAllCacheConfigsFromConfig = getAllCacheConfigsFromConfig;

package/dist/build/custom/buildJob.d.ts

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

package/dist/build/custom/index.d.ts

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

package/dist/build/custom/testJob.d.ts

@@ -1,7 +1,7 @@
 import type { Artifacts } from "../../types";
-import type { ComponentContext } from "../../types/context";
+import type { ComponentContextWithBuild } from "../../types/context";
 import type { CatladderJob } from "../../types/jobs";
-export declare const createCustomTestJobs: (context: ComponentContext) => CatladderJob[];
+export declare const createCustomTestJobs: (context: ComponentContextWithBuild) => CatladderJob[];
 export type OptionalArtifacts = {
   artifacts: Artifacts;
 } | undefined;

package/dist/build/docker.d.ts

@@ -1,5 +1,5 @@
 import type { BuildConfigDocker } from ".";
-import type { ComponentContext, DockerBuildJobDefinition } from "../types";
+import type { ComponentContext, ComponentContextWithBuild, DockerBuildJobDefinition } from "../types";
 import type { CatladderJob } from "../types/jobs";
 export declare const getDockerImageVariables: (context: ComponentContext) => {
   DOCKER_IMAGE_TAG: string;
@@ -17,7 +17,7 @@ export declare const getDockerImageVariables: (context: ComponentContext) => {
  * Weather the context requires a docker build
  */
 export declare const requiresDockerBuild: (context: ComponentContext) => boolean;
-export declare const getDockerBuildVariables: (context: ComponentContext) => {
+export declare const getDockerBuildVariables: (context: ComponentContextWithBuild) => {
   DOCKER_IMAGE_TAG: string;
   DOCKER_REGISTRY: string;
   DOCKER_IMAGE: import("..").StringOrBashExpression;
@@ -58,12 +58,12 @@ export declare const getDockerBuildVariables: (context: ComponentContext) => {
 };
 export declare const DOCKER_BUILD_JOB_NAME = "\uD83D\uDD28 docker";
 export declare const getDockerJobBaseProps: () => Pick<CatladderJob, "image" | "services" | "variables" | "runnerVariables">;
-export declare const createDockerBuildJobBase: (context: ComponentContext, {
+export declare const createDockerBuildJobBase: (context: ComponentContextWithBuild, {
   script,
   cache,
   ...def
 }: DockerBuildJobDefinition) => CatladderJob;
 export declare const gitlabDockerLogin: (context: ComponentContext) => string[];
-export declare const getDockerBuildScriptWithBuiltInDockerFile: (context: ComponentContext, defaultType?: BuildConfigDocker["type"]) => (string | undefined)[];
+export declare const getDockerBuildScriptWithBuiltInDockerFile: (context: ComponentContextWithBuild, defaultType?: BuildConfigDocker["type"]) => (string | undefined)[];
 export declare const getDockerBuildDefaultScript: (context: ComponentContext, ensureDockerFileScript?: string | null) => (string | undefined)[];
 export declare const hasDockerfile: (context: ComponentContext) => boolean;

package/dist/build/docker.js

@@ -104,7 +104,7 @@ exports.requiresDockerBuild = requiresDockerBuild;
 // those need to be runner variables
 var getDockerBuildRunnerVariables = function () {
   return {
-    DOCKER_HOST: "tcp://0.0.0.0:2375",
+    DOCKER_HOST: "tcp://docker:2375",
     DOCKER_TLS_CERTDIR: "",
     DOCKER_DRIVER: "overlay2",
     DOCKER_BUILDKIT: "1" // see https://docs.docker.com/develop/develop-images/build_enhancements/

package/dist/build/index.d.ts

@@ -1,11 +1,11 @@
-import type { ComponentContext, WorkspaceContext } from "../types/context";
+import type { ComponentContextWithBuild, WorkspaceContext } from "../types/context";
 import type { EnvironmentContext } from "../types/environmentContext";
 import type { CatladderJob } from "../types/jobs";
 import type { BuildConfig, BuildConfigStandaloneType, WorkspaceBuildConfig } from "./types";
 export * from "./node";
 export * from "./types";
 export type BuildTypes = { [type in BuildConfigStandaloneType]: {
-  jobs: (context: ComponentContext) => CatladderJob[];
+  jobs: (context: ComponentContextWithBuild) => CatladderJob[];
   defaults: (envContext: EnvironmentContext) => Partial<Extract<BuildConfig, {
     type: type;
   }>>;

package/dist/build/index.js

@@ -78,10 +78,9 @@ exports.BUILD_TYPES = {
     jobs: rails_1.createRailsJobs,
     defaults: function () {
       return {
-        startCommand: "/cnb/process/web",
         cnbBuilder: {
-          image: "heroku/builder:22",
-          packVersion: "0.32.1"
+          image: "heroku/builder:24",
+          packVersion: "0.36.4"
         }
       };
     }

package/dist/build/node/buildJob.d.ts

@@ -1,7 +1,9 @@
-import type { BuildContextStandalone, WorkspaceContext } from "../../types/context";
+import type { BuildContextStandalone, ComponentContextWithBuild, WorkspaceContext } from "../../types/context";
 import { type ComponentContext } from "../../types/context";
 import type { AppBuildJobDefinition, DockerBuildJobDefinition } from "../../types/jobDefinition";
 import type { CatladderJob } from "../../types/jobs";
-export declare const createNodeBuildJobs: (context: ComponentContext | WorkspaceContext) => CatladderJob[];
+export declare const createNodeBuildJobs: (context: ComponentContextWithBuild | WorkspaceContext) => CatladderJob[];
 export declare const createNodeBuildJobDefinition: (context: ComponentContext<BuildContextStandalone> | WorkspaceContext) => AppBuildJobDefinition | undefined;
-export declare const createNodeDockerJobDefinition: (context: ComponentContext) => DockerBuildJobDefinition;
+type NewType = ComponentContextWithBuild;
+export declare const createNodeDockerJobDefinition: (context: NewType) => DockerBuildJobDefinition;
+export {};

package/dist/build/node/index.d.ts

@@ -1,5 +1,5 @@
-import type { ComponentContext, WorkspaceContext } from "../../types/context";
+import type { ComponentContextWithBuild, WorkspaceContext } from "../../types/context";
 import type { CatladderJob } from "../../types/jobs";
-export declare const createNodeJobs: (context: ComponentContext | WorkspaceContext) => CatladderJob[];
-export declare const createStorybookJobs: (context: ComponentContext) => CatladderJob[];
-export declare const createMeteorJobs: (context: ComponentContext) => CatladderJob[];
+export declare const createNodeJobs: (context: ComponentContextWithBuild | WorkspaceContext) => CatladderJob[];
+export declare const createStorybookJobs: (context: ComponentContextWithBuild) => CatladderJob[];
+export declare const createMeteorJobs: (context: ComponentContextWithBuild) => CatladderJob[];

package/dist/build/node/meteor.d.ts

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

package/dist/build/node/yarn.d.ts

@@ -1,5 +1,5 @@
 import { BashExpression } from "../../bash/BashExpression";
-import type { Context } from "../../types";
+import { type Context } from "../../types";
 export declare const ensureNodeVersion: (context: Context) => string[];
 export declare const getYarnInstall: (context: Context, options?: {
   noCustomPostInstall: boolean;

package/dist/build/node/yarn.js

@@ -52,7 +52,7 @@ var ensureNodeVersion = function (context) {
 };
 exports.ensureNodeVersion = ensureNodeVersion;
 var getYarnInstall = function (context, options) {
-  var postInstall = context.type !== "workspace" && "postInstall" in context.build.config ? context.build.config.postInstall : null;
+  var postInstall = context.type !== "workspace" && context.build.type !== "disabled" && "postInstall" in context.build.config ? context.build.config.postInstall : null;
   return __spreadArray(__spreadArray(__spreadArray([], __read((0, exports.ensureNodeVersion)(context)), false), __read((0, gitlab_1.collapseableSection)("yarninstall", "Yarn install")([getYarnInstallCommand(context)])), false), __read(postInstall && !(options === null || options === void 0 ? void 0 : options.noCustomPostInstall) ? (0, gitlab_1.collapseableSection)("postinstall", "Custom post install")((0, utils_1.ensureArray)(postInstall)) : []), false);
 };
 exports.getYarnInstall = getYarnInstall;

package/dist/build/rails/build.d.ts

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

package/dist/build/rails/build.js

@@ -81,7 +81,7 @@ var createRailsBuildJobs = function (context) {
     dockerBuild: {
       variables: __assign({}, context.environment.jobOnlyVars.build.envVars),
       // custom script
-      script: __spreadArray(__spreadArray([], __read((0, docker_1.gitlabDockerLogin)(context)), false), ["cd ".concat(context.build.dir), "docker pull $DOCKER_CACHE_IMAGE || true", "wget --output-document=- https://github.com/buildpacks/pack/releases/download/v".concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packVersion, "/pack-v").concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packVersion, "-linux.tgz | tar -zx --directory /usr/local/bin pack"), "chmod +x /usr/local/bin/pack",
+      script: __spreadArray(__spreadArray([], __read((0, docker_1.gitlabDockerLogin)(context)), false), ["cd ".concat(context.build.dir), "wget --output-document=- https://github.com/buildpacks/pack/releases/download/v".concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packVersion, "/pack-v").concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packVersion, "-linux.tgz | tar -zx --directory /usr/local/bin pack"), "chmod +x /usr/local/bin/pack",
       //  replace private git ssh gem sources with https to make bundler with credentials via env var work
       "sed --in-place 's|git@\\([^:]*\\):|https://\\1/|g' Gemfile Gemfile.lock", "pack build \"$DOCKER_IMAGE:$DOCKER_IMAGE_TAG\" --builder '".concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.image, "' --publish --cache-image \"$DOCKER_CACHE_IMAGE\" ").concat(packEnvArgs, " ").concat((_c = (_b = cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packExtraArgs) === null || _b === void 0 ? void 0 : _b.join(" ")) !== null && _c !== void 0 ? _c : "")], false)
     }

package/dist/build/rails/index.d.ts

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

package/dist/build/rails/test.js

@@ -48,7 +48,7 @@ exports.createRailsTestJobs = void 0;
 var __1 = require("../..");
 var utils_1 = require("../../utils");
 var createRailsTestJobs = function (context) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
   // don't run tests after release
   // TODO: this will be replaced by using rules
   if (context.trigger === "taggedRelease") {
@@ -95,7 +95,18 @@ var createRailsTestJobs = function (context) {
   }, base), {
     cache: bundlerCache,
     image: (_o = (_m = (_l = buildConfig.test) === null || _l === void 0 ? void 0 : _l.jobImage) !== null && _m !== void 0 ? _m : buildConfig.jobImage) !== null && _o !== void 0 ? _o : defaultImage,
-    script: __spreadArray(__spreadArray(["cd ".concat(context.build.dir)], __read(bundlerInstall), false), __read((_q = (0, utils_1.ensureArrayOrNull)((_p = buildConfig.test) === null || _p === void 0 ? void 0 : _p.command)) !== null && _q !== void 0 ? _q : ["bundle exec rspec"]), false)
+    script: __spreadArray(__spreadArray(["cd ".concat(context.build.dir)], __read(bundlerInstall), false), __read((_q = (0, utils_1.ensureArrayOrNull)((_p = buildConfig.test) === null || _p === void 0 ? void 0 : _p.command)) !== null && _q !== void 0 ? _q : ["bundle exec rake db:test:prepare", "bundle exec rake assets:precompile assets:clean", "bundle exec rspec"]), false),
+    runnerVariables: {
+      RAILS_ENV: "test",
+      DATABASE_URL: "postgresql://postgres@database"
+    },
+    services: [{
+      name: buildConfig.test && "databaseImage" in buildConfig.test ? (_s = (_r = buildConfig === null || buildConfig === void 0 ? void 0 : buildConfig.test) === null || _r === void 0 ? void 0 : _r.databaseImage) !== null && _s !== void 0 ? _s : "docker.io/postgres:latest" : "docker.io/postgres:latest",
+      alias: "database",
+      variables: {
+        POSTGRES_HOST_AUTH_METHOD: "trust"
+      }
+    }]
   }) : null;
   return [auditJob, lintJob, testJob].filter(utils_1.notNil);
 };

package/dist/build/sbom.d.ts

@@ -1,5 +1,5 @@
-import type { ComponentContext } from "../types/context";
+import type { ComponentContextWithBuild } from "../types/context";
 import type { CatladderJob } from "../types/jobs";
 export declare const SBOM_BUILD_JOB_NAME = "\uD83E\uDDFE sbom";
 export declare const SBOM_FILE = "__sbom.json";
-export declare const createSbomBuildJob: (context: ComponentContext) => CatladderJob;
+export declare const createSbomBuildJob: (context: ComponentContextWithBuild) => CatladderJob;

package/dist/build/sbom.js

@@ -11,7 +11,10 @@ exports.SBOM_FILE = "__sbom.json";
 var createSbomBuildJob = function (context) {
   var _a, _b, _c, _d;
   var buildConfig = context.build.config;
-  var defaultImage = "aquasec/trivy:0.38.3";
+  var defaultImage = {
+    name: "aquasec/trivy:0.58.2",
+    entrypoint: [""]
+  };
   var defaultScript = ["trivy fs --quiet --format cyclonedx --output \"".concat(exports.SBOM_FILE, "\" ").concat(context.packageManagerInfo.componentIsInWorkspace ? "." : context.build.dir)];
   var image = (0, _1.isStandaloneBuildConfig)(buildConfig) && buildConfig.type === "custom" && buildConfig.sbom !== false ? (_b = (_a = buildConfig.sbom) === null || _a === void 0 ? void 0 : _a.jobImage) !== null && _b !== void 0 ? _b : defaultImage : defaultImage;
   var script = (0, _1.isStandaloneBuildConfig)(buildConfig) && buildConfig.type === "custom" && buildConfig.sbom !== false ? (_d = (0, utils_1.ensureArrayOrNull)((_c = buildConfig.sbom) === null || _c === void 0 ? void 0 : _c.command)) !== null && _d !== void 0 ? _d : defaultScript : defaultScript;

package/dist/build/types.d.ts

@@ -220,6 +220,14 @@ export type BuildConfigCustom = Omit<BuildConfigBase, "lint" | "test" | "audit">
 };
 export type BuildConfigRails = BuildConfigBase & {
   type: "rails";
+  test?: Pick<BuildConfigBase, "test"> & {
+    /**
+     * The container image to use as the database.
+     * Currently only supports PostgreSQL.
+     * Defaults to `docker.io/postgres:latest`
+     */
+    databaseImage?: string;
+  };
   /**
    * The [Cloud Native Buildpacks](https://buildpacks.io/) builder configuration.
    *

package/dist/constants.js

@@ -4,5 +4,5 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "refactor-untangle-gitlab-api-requests-from-vorpal-57cf3cf2" || "latest";
+exports.PIPELINE_IMAGE_TAG = "reference-database-url-1befbbee" || "latest";
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || "git.panter.ch:5001/catladder/catladder";

package/dist/context/createComponentContext.js

@@ -182,15 +182,15 @@ var createComponentContext = function (ctx) {
           packageManagerInfo = _b.sent();
           envContext = (0, getEnvironmentContext_1.getEnvironmentContext)(ctx);
           componentConfigWithoutDefaults = envContext.envConfigRaw;
-          resolvedBuildType = (0, build_1.isStandaloneBuildConfig)(componentConfigWithoutDefaults.build) ? componentConfigWithoutDefaults.build.type : (_a = ctx.config.builds) === null || _a === void 0 ? void 0 : _a[componentConfigWithoutDefaults.build.from].type;
-          if (!resolvedBuildType) {
+          resolvedBuildType = componentConfigWithoutDefaults.build === false ? false : (0, build_1.isStandaloneBuildConfig)(componentConfigWithoutDefaults.build) ? componentConfigWithoutDefaults.build.type : (_a = ctx.config.builds) === null || _a === void 0 ? void 0 : _a[componentConfigWithoutDefaults.build.from].type;
+          if (resolvedBuildType === undefined) {
             throw new Error("build type not found, is the build config correct?");
           }
           defaults = componentConfigWithoutDefaults.deploy ? {
-            build: build_1.BUILD_TYPES[resolvedBuildType].defaults(envContext),
+            build: resolvedBuildType && build_1.BUILD_TYPES[resolvedBuildType].defaults(envContext),
             deploy: deploy_1.DEPLOY_TYPES[componentConfigWithoutDefaults.deploy.type].defaults(envContext)
           } : {
-            build: build_1.BUILD_TYPES[resolvedBuildType].defaults(envContext),
+            build: resolvedBuildType && build_1.BUILD_TYPES[resolvedBuildType].defaults(envContext),
             deploy: {}
           };
           componentConfig = (0, utils_1.mergeWithMergingArrays)(defaults, componentConfigWithoutDefaults);
@@ -204,6 +204,13 @@ var createComponentContext = function (ctx) {
           };
           _getBuildContext = function () {
             var _a;
+            if (build === false) {
+              return {
+                type: "disabled",
+                getComponentDirs: getComponentDirs,
+                dir: dir
+              };
+            }
             if ((0, build_1.isStandaloneBuildConfig)(build)) {
               return {
                 dir: dir,

package/dist/context/getLabels.js

@@ -34,7 +34,7 @@ var getLabels = function (context) {
     "app-name": sanitize(context.fullConfig.appName),
     "env-type": sanitize(context.environment.envType),
     "env-name": sanitize(context.env),
-    "build-type": sanitize(context.build.buildType)
+    "build-type": context.build.type === "disabled" ? "disabled" : sanitize(context.build.buildType)
   }, (_b = (_a = context.fullConfig.meta) === null || _a === void 0 ? void 0 : _a.labels) !== null && _b !== void 0 ? _b : {});
   return labels;
 };

package/dist/deploy/cloudRun/createJobs/cloudRunJobs.js

@@ -60,7 +60,7 @@ var jobName_1 = require("../utils/jobName");
 var common_1 = require("./common");
 var constants_1 = require("./constants");
 var volumes_1 = require("./volumes");
-var onDeploy_1 = require("./execute/onDeploy");
+var getJobOrServiceArgs_1 = require("../utils/getJobOrServiceArgs");
 var getDeleteJobsScripts = function (context) {
   var commonArgs = (0, common_1.getCommonCloudRunArgs)(context);
   var commonArgsString = (0, createArgsString_1.createArgsString)(commonArgs);
@@ -86,7 +86,7 @@ var getJobCreateScripts = function (context) {
       deployArgs = __rest(_g, ["image", "project", "region"]);
     var commonDeployArgsString = createArgsString_1.createArgsString.apply(void 0, __spreadArray([__assign(__assign({
       command: "\"".concat(commandArray.join(","), "\""),
-      args: (0, onDeploy_1.getCloudRunJobArgsArg)(job.args),
+      args: (0, getJobOrServiceArgs_1.getCloudRunServiceOrJobArgsArg)(job.args),
       labels: "\"".concat((0, common_1.makeLabelString)((0, getLabels_1.getLabels)(context)), ",cloud-run-job-name=$current_job_name\""),
       image: "\"".concat((_b = job.image) !== null && _b !== void 0 ? _b : commonImage, "\""),
       project: project,

package/dist/deploy/cloudRun/createJobs/cloudRunServices.js

@@ -47,28 +47,32 @@ Object.defineProperty(exports, "__esModule", {
 exports.getServiceDeleteScript = exports.getServiceDeployScript = void 0;
 var getLabels_1 = require("../../../context/getLabels");
 var createArgsString_1 = require("../utils/createArgsString");
+var getJobOrServiceArgs_1 = require("../utils/getJobOrServiceArgs");
 var getServiceName_1 = require("../utils/getServiceName");
 var common_1 = require("./common");
 var constants_1 = require("./constants");
+var healthCheck_1 = require("./healthCheck");
 var volumes_1 = require("./volumes");
 var getServiceDeployScript = function (context, service, nameSuffix) {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d, _e, _f;
   var commonDeployArgs = (0, common_1.getCommonDeployArgs)(context);
   var serviceName = (0, getServiceName_1.getServiceName)(context);
   var customConfig = service !== true ? service : undefined;
-  var command = service !== true ? (_a = service === null || service === void 0 ? void 0 : service.command) !== null && _a !== void 0 ? _a : context.build.config.startCommand : undefined;
+  var command = service !== true ? (_a = service === null || service === void 0 ? void 0 : service.command) !== null && _a !== void 0 ? _a : context.build.type !== "disabled" ? context.build.config.startCommand : undefined : undefined;
   var commandArray = command ? Array.isArray(command) ? command : command.split(" ") : undefined;
   var fullServiceName = serviceName.concat(nameSuffix !== null && nameSuffix !== void 0 ? nameSuffix : "");
-  var argsString = createArgsString_1.createArgsString.apply(void 0, __spreadArray([__assign(__assign({
+  var argsString = createArgsString_1.createArgsString.apply(void 0, __spreadArray([__assign(__assign(__assign({
     // command as empty string resets it to default (uses the image's entrypoint)
-    command: commandArray ? '"' + commandArray.join(",") + '"' : '""'
+    command: commandArray ? '"' + commandArray.join(",") + '"' : '""',
+    args: (0, getJobOrServiceArgs_1.getCloudRunServiceOrJobArgsArg)(customConfig === null || customConfig === void 0 ? void 0 : customConfig.args)
   }, commonDeployArgs), {
+    image: (_b = customConfig === null || customConfig === void 0 ? void 0 : customConfig.image) !== null && _b !== void 0 ? _b : commonDeployArgs.image,
     labels: (0, common_1.makeLabelString)(__assign(__assign({}, (0, getLabels_1.getLabels)(context)), {
       "cloud-run-service-name": fullServiceName
     })),
     "env-vars-file": constants_1.ENV_VARS_FILENAME,
-    "min-instances": (_b = customConfig === null || customConfig === void 0 ? void 0 : customConfig.minInstances) !== null && _b !== void 0 ? _b : 0,
-    "max-instances": (_c = customConfig === null || customConfig === void 0 ? void 0 : customConfig.maxInstances) !== null && _c !== void 0 ? _c : 100,
+    "min-instances": (_c = customConfig === null || customConfig === void 0 ? void 0 : customConfig.minInstances) !== null && _c !== void 0 ? _c : 0,
+    "max-instances": (_d = customConfig === null || customConfig === void 0 ? void 0 : customConfig.maxInstances) !== null && _d !== void 0 ? _d : 100,
     "cpu-throttling": (customConfig === null || customConfig === void 0 ? void 0 : customConfig.noCpuThrottling) !== true,
     cpu: customConfig === null || customConfig === void 0 ? void 0 : customConfig.cpu,
     memory: customConfig === null || customConfig === void 0 ? void 0 : customConfig.memory,
@@ -78,12 +82,15 @@ var getServiceDeployScript = function (context, service, nameSuffix) {
     network: customConfig === null || customConfig === void 0 ? void 0 : customConfig.network,
     subnet: customConfig === null || customConfig === void 0 ? void 0 : customConfig.subnet,
     "use-http2": customConfig === null || customConfig === void 0 ? void 0 : customConfig.http2,
-    "allow-unauthenticated": (_d = customConfig === null || customConfig === void 0 ? void 0 : customConfig.allowUnauthenticated) !== null && _d !== void 0 ? _d : true,
-    ingress: (_e = customConfig === null || customConfig === void 0 ? void 0 : customConfig.ingress) !== null && _e !== void 0 ? _e : "all",
+    "allow-unauthenticated": (_e = customConfig === null || customConfig === void 0 ? void 0 : customConfig.allowUnauthenticated) !== null && _e !== void 0 ? _e : true,
+    ingress: (_f = customConfig === null || customConfig === void 0 ? void 0 : customConfig.ingress) !== null && _f !== void 0 ? _f : "all",
     "cpu-boost": true,
-    "execution-environment": customConfig === null || customConfig === void 0 ? void 0 : customConfig.executionEnvironment
-  })], __read((0, volumes_1.createVolumeConfig)(customConfig === null || customConfig === void 0 ? void 0 : customConfig.volumes, "service")), false));
-  return "".concat((0, common_1.gcloudRunCmd)(), " deploy ").concat(fullServiceName, " ").concat(argsString);
+    "execution-environment": customConfig === null || customConfig === void 0 ? void 0 : customConfig.executionEnvironment,
+    gpu: customConfig === null || customConfig === void 0 ? void 0 : customConfig.gpu,
+    "gpu-type": customConfig === null || customConfig === void 0 ? void 0 : customConfig.gpuType
+  }), (0, healthCheck_1.healthCheckCliArgs)(customConfig === null || customConfig === void 0 ? void 0 : customConfig.healthCheck))], __read((0, volumes_1.createVolumeConfig)(customConfig === null || customConfig === void 0 ? void 0 : customConfig.volumes, "service")), false));
+  var version = requiresBeta(customConfig) ? "beta" : undefined;
+  return "".concat((0, common_1.gcloudRunCmd)(version), " deploy ").concat(fullServiceName, " ").concat(argsString);
 };
 exports.getServiceDeployScript = getServiceDeployScript;
 var getServiceDeleteScript = function (context, serviceSuffix) {
@@ -93,4 +100,19 @@ var getServiceDeleteScript = function (context, serviceSuffix) {
   var fullServiceName = serviceSuffix ? "".concat(serviceName, "-").concat(serviceSuffix) : serviceName;
   return ["".concat((0, common_1.gcloudRunCmd)(), " services delete ").concat(fullServiceName, " ").concat(commonArgsString)];
 };
-exports.getServiceDeleteScript = getServiceDeleteScript;
+exports.getServiceDeleteScript = getServiceDeleteScript;
+var requiresBeta = function (config) {
+  if (!config) {
+    return false;
+  }
+  if (config.gpuType) {
+    return true;
+  }
+  if (config.gpu && config.gpu > 0) {
+    return true;
+  }
+  if (config.healthCheck !== undefined) {
+    return true;
+  }
+  return false;
+};

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

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

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

@@ -44,8 +44,9 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getCloudRunJobArgsArg = exports.getOnDeployExecuteScript = void 0;
+exports.getOnDeployExecuteScript = void 0;
 var createArgsString_1 = require("../../utils/createArgsString");
+var getJobOrServiceArgs_1 = require("../../utils/getJobOrServiceArgs");
 var jobName_1 = require("../../utils/jobName");
 var cloudRunJobs_1 = require("../cloudRunJobs");
 var common_1 = require("../common");
@@ -107,14 +108,8 @@ var getJobRunScriptForExecute = function (context, _a) {
   : false;
   var argString = (0, createArgsString_1.createArgsString)(__assign(__assign({}, commonArgs), {
     wait: waitForCompletion === true ? true : undefined,
-    args: (0, exports.getCloudRunJobArgsArg)(config.args)
+    args: (0, getJobOrServiceArgs_1.getCloudRunServiceOrJobArgsArg)(config.args)
   }));
   var fullJobName = (0, jobName_1.getFullJobName)(context, jobName);
   return "".concat((0, common_1.gcloudRunCmd)(), " jobs execute ").concat(fullJobName.toString(), " ").concat(argString);
-};
-var getCloudRunJobArgsArg = function (args) {
-  return args !== undefined ? args.length > 0 ? args === null || args === void 0 ? void 0 : args.map(function (arg) {
-    return "\"".concat(arg, "\"");
-  }).join(",") : "" : undefined;
-};
-exports.getCloudRunJobArgsArg = getCloudRunJobArgsArg;
+};

package/dist/deploy/cloudRun/createJobs/healthCheck.d.ts

@@ -0,0 +1,5 @@
+import { type DeployConfigCloudRunService } from "../../types";
+export declare function healthCheckCliArgs(healthCheck: DeployConfigCloudRunService["healthCheck"]): {
+  "startup-probe": string;
+  "liveness-probe": string;
+} | undefined;

package/dist/deploy/cloudRun/createJobs/healthCheck.js

@@ -0,0 +1,82 @@
+"use strict";
+
+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;
+};
+var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
+  if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+    if (ar || !(i in from)) {
+      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+      ar[i] = from[i];
+    }
+  }
+  return to.concat(ar || Array.prototype.slice.call(from));
+};
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.healthCheckCliArgs = void 0;
+var types_1 = require("../../types");
+var PORT = 8080;
+function healthCheckCliArgs(healthCheck) {
+  var shouldNotSetHealthCheck = healthCheck === undefined;
+  if (shouldNotSetHealthCheck) {
+    return undefined;
+  }
+  var shouldUseDefaultProbe = healthCheck === true;
+  if (shouldUseDefaultProbe) {
+    return {
+      "startup-probe": toArgValue(probeToKeyValuePairs(types_1.defaultStartupProbe)),
+      "liveness-probe": toArgValue(probeToKeyValuePairs(types_1.defaultLivenessProbe))
+    };
+  }
+  return {
+    "startup-probe": toArgValue(probeToKeyValuePairs(healthCheck.startupProbe)),
+    "liveness-probe": healthCheck.livenessProbe ? toArgValue(probeToKeyValuePairs(healthCheck.livenessProbe)) : "" // NOTE: empty string ("") removes liveness probe
+  };
+}
+exports.healthCheckCliArgs = healthCheckCliArgs;
+function probeToKeyValuePairs(probe) {
+  var sharedArgs = Object.entries({
+    initialDelaySeconds: probe.initialDelaySeconds,
+    timeoutSeconds: probe.timeoutSeconds,
+    periodSeconds: probe.periodSeconds,
+    failureThreshold: probe.failureThreshold
+  });
+  switch (probe.type) {
+    case "tcp":
+      return __spreadArray(__spreadArray([], __read(sharedArgs), false), [["tcpSocket.port", PORT]], false);
+    case "http1":
+      return __spreadArray(__spreadArray([], __read(sharedArgs), false), [["httpGet.port", PORT], ["httpGet.path", probe.path]], false);
+    default:
+      probe;
+      return [];
+  }
+}
+function toArgValue(keyValues) {
+  return keyValues.map(function (_a) {
+    var _b = __read(_a, 2),
+      key = _b[0],
+      value = _b[1];
+    return "".concat(key, "=").concat(value);
+  }).join(",");
+}

package/dist/deploy/cloudRun/index.js

@@ -56,7 +56,7 @@ exports.GCLOUD_DEPLOY_CREDENTIALS_KEY = "GCLOUD_DEPLOY_credentialsKey";
 // FIXME: rename to internalHostSuffix, but this means that project-setup needs to be rerun, so its kindof a breaking change
 exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX = "GCLOUD_RUN_canonicalHostSuffix";
 var getCloudSqlVariables = function (_a) {
-  var _b, _c;
+  var _b, _c, _d;
   var deployConfigRaw = _a.deployConfigRaw,
     environmentSlugPrefix = _a.environmentSlugPrefix,
     env = _a.env,
@@ -70,14 +70,16 @@ var getCloudSqlVariables = function (_a) {
         value = _b[1];
       return "&".concat(key, "=").concat(value);
     }).join("");
-    return {
+    var dbVars = {
       CLOUD_SQL_INSTANCE_CONNECTION_NAME: deployConfigRaw.cloudSql.instanceConnectionName,
       DB_NAME: DB_NAME,
       DB_USER: (_c = deployConfigRaw.cloudSql.dbUser) !== null && _c !== void 0 ? _c : "postgres",
-      DB_PASSWORD: "$" + (0, context_1.getSecretVarName)(env, componentName, "DB_PASSWORD"),
-      DATABASE_URL: "".concat((0, database_1.getDatabaseConnectionString)(deployConfigRaw.cloudSql)).concat(additionalQueryParamsString),
-      DATABASE_JDBC_URL: database_1.DATABASE_JDBC_URL
+      DB_PASSWORD: "$" + (0, context_1.getSecretVarName)(env, componentName, "DB_PASSWORD")
     };
+    return __assign(__assign({}, dbVars), {
+      DATABASE_URL: (0, database_1.getDatabaseConnectionString)(deployConfigRaw.cloudSql, dbVars).concat(additionalQueryParamsString),
+      DATABASE_JDBC_URL: (0, database_1.getDatabaseJdbcUrl)(dbVars, (_d = deployConfigRaw.cloudSql.dbConnectionStringVariablesMode) !== null && _d !== void 0 ? _d : database_1.DEFAULT_DB_VARIABLES_MODE)
+    });
   }
   return {};
 };