@catladder/cli 0.0.0-fix-add-missing-openssl-to-node-deploy-docker-4c13843a → 0.0.0-fix-rails-default-start-command-530390e3

package/dist/bundles/catenv/index.js

@@ -330,9 +330,15 @@ const getAllComponentsWithAllEnvsHierarchical = async () => {
     ]));
 };
 exports.getAllComponentsWithAllEnvsHierarchical = getAllComponentsWithAllEnvsHierarchical;
-const getAllPipelineContexts = async () => {
+const getAllPipelineContexts = async (onlyComponent) => {
+    const onlyComponentsArray = onlyComponent
+        ? Array.isArray(onlyComponent)
+            ? onlyComponent
+            : [onlyComponent]
+        : null;
     return Promise.all((await (0, exports.getAllComponentsWithAllEnvsFlat)())
         .filter((c) => c.env !== "local")
+        .filter((c) => !onlyComponentsArray || onlyComponentsArray.includes(c.componentName))
         .map(({ env, componentName }) => (0, exports.getPipelineContextByChoice)(env, componentName)));
 };
 exports.getAllPipelineContexts = getAllPipelineContexts;
@@ -1226,7 +1232,9 @@ exports.createBuildJobArtifacts = createBuildJobArtifacts;
 const getArtifactsPathForComponent = (c, additionalPaths) => {
     var _a, _b;
     return (_b = [
-        ...((_a = c.build.config.artifactsPaths) !== null && _a !== void 0 ? _a : []),
+        ...(c.build.type !== "disabled"
+            ? ((_a = c.build.config.artifactsPaths) !== null && _a !== void 0 ? _a : [])
+            : []),
         ...(additionalPaths !== null && additionalPaths !== void 0 ? additionalPaths : []),
     ]) === null || _b === void 0 ? void 0 : _b.flatMap((artifact) => c.build
         // in theory, we only need "direct",
@@ -1602,10 +1610,12 @@ const getAllCacheConfigsFromConfig = (context, configWithCache) => {
                 // we would probably need to introduce a path to the right config property (build-->test or so)
                 context.components.flatMap((componentContext) => {
                     var _a;
-                    return (_a = (0, index_1.ensureArray)(componentContext.build.config.cache).map((c) => ({
-                        ...c,
-                        baseDir: componentContext.build.dir,
-                    }))) !== null && _a !== void 0 ? _a : [];
+                    return componentContext.build.type !== "disabled"
+                        ? ((_a = (0, index_1.ensureArray)(componentContext.build.config.cache).map((c) => ({
+                            ...c,
+                            baseDir: componentContext.build.dir,
+                        }))) !== null && _a !== void 0 ? _a : [])
+                        : [];
                 })
             : []),
     ];
@@ -1996,7 +2006,6 @@ exports.BUILD_TYPES = {
     rails: {
         jobs: rails_1.createRailsJobs,
         defaults: () => ({
-            startCommand: "/cnb/process/web",
             cnbBuilder: {
                 image: "heroku/builder:22",
                 packVersion: "0.32.1",
@@ -2373,7 +2382,9 @@ const ensureNodeVersion = (context) => (0, gitlab_1.collapseableSection)("nodein
 ]);
 exports.ensureNodeVersion = ensureNodeVersion;
 const getYarnInstall = (context, options) => {
-    const postInstall = context.type !== "workspace" && "postInstall" in context.build.config
+    const postInstall = context.type !== "workspace" &&
+        context.build.type !== "disabled" &&
+        "postInstall" in context.build.config
         ? context.build.config.postInstall
         : null;
     return [
@@ -2831,19 +2842,23 @@ const createComponentContext = async (ctx) => {
     const packageManagerInfo = await (0, packageManager_1.getPackageManagerInfoForComponent)(ctx.config, ctx.componentName);
     const envContext = (0, getEnvironmentContext_1.getEnvironmentContext)(ctx);
     const componentConfigWithoutDefaults = envContext.envConfigRaw;
-    const 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) {
+    const 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?");
     }
     const 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: {},
         };
     const componentConfig = (0, utils_1.mergeWithMergingArrays)(defaults, componentConfigWithoutDefaults);
@@ -2861,6 +2876,13 @@ const createComponentContext = async (ctx) => {
     };
     const _getBuildContext = () => {
         var _a;
+        if (build === false) {
+            return {
+                type: "disabled",
+                getComponentDirs,
+                dir,
+            };
+        }
         if ((0, build_1.isStandaloneBuildConfig)(build)) {
             return {
                 dir: dir,
@@ -3277,7 +3299,9 @@ const getLabels = (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;
@@ -3871,7 +3895,7 @@ const jobName_1 = __nccwpck_require__(9626);
 const common_1 = __nccwpck_require__(3325);
 const constants_1 = __nccwpck_require__(8865);
 const volumes_1 = __nccwpck_require__(847);
-const onDeploy_1 = __nccwpck_require__(2358);
+const getJobOrServiceArgs_1 = __nccwpck_require__(1741);
 const getDeleteJobsScripts = (context) => {
     const commonArgs = (0, common_1.getCommonCloudRunArgs)(context);
     const commonArgsString = (0, createArgsString_1.createArgsString)(commonArgs);
@@ -3891,7 +3915,7 @@ const getJobCreateScripts = (context) => (0, exports.getCloudRunJobsWithNames)(c
     const { image: commonImage, project, region, ...deployArgs } = (0, common_1.getCommonDeployArgs)(context);
     const commonDeployArgsString = (0, createArgsString_1.createArgsString)({
         command: `"${commandArray.join(",")}"`,
-        args: (0, onDeploy_1.getCloudRunJobArgsArg)(job.args),
+        args: (0, getJobOrServiceArgs_1.getCloudRunServiceOrJobArgsArg)(job.args),
         labels: `"${(0, common_1.makeLabelString)((0, getLabels_1.getLabels)(context))},cloud-run-job-name=$current_job_name"`,
         image: `"${(_a = job.image) !== null && _a !== void 0 ? _a : commonImage}"`,
         project,
@@ -3951,17 +3975,21 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.getServiceDeleteScript = exports.getServiceDeployScript = void 0;
 const getLabels_1 = __nccwpck_require__(920);
 const createArgsString_1 = __nccwpck_require__(9598);
+const getJobOrServiceArgs_1 = __nccwpck_require__(1741);
 const getServiceName_1 = __nccwpck_require__(8128);
 const common_1 = __nccwpck_require__(3325);
 const constants_1 = __nccwpck_require__(8865);
+const healthCheck_1 = __nccwpck_require__(193);
 const volumes_1 = __nccwpck_require__(847);
 const getServiceDeployScript = (context, service, nameSuffix) => {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     const commonDeployArgs = (0, common_1.getCommonDeployArgs)(context);
     const serviceName = (0, getServiceName_1.getServiceName)(context);
     const customConfig = service !== true ? service : undefined;
     const command = service !== true
-        ? ((_a = service === null || service === void 0 ? void 0 : service.command) !== null && _a !== void 0 ? _a : context.build.config.startCommand)
+        ? ((_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;
     const commandArray = command
         ? Array.isArray(command)
@@ -3972,14 +4000,16 @@ const getServiceDeployScript = (context, service, nameSuffix) => {
     const argsString = (0, createArgsString_1.createArgsString)({
         // command as empty string resets it to default (uses the image's entrypoint)
         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)({
             ...(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,
@@ -3989,12 +4019,16 @@ const getServiceDeployScript = (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,
+        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),
     }, ...(0, volumes_1.createVolumeConfig)(customConfig === null || customConfig === void 0 ? void 0 : customConfig.volumes, "service"));
-    return `${(0, common_1.gcloudRunCmd)()} deploy ${fullServiceName} ${argsString}`;
+    const version = requiresBeta(customConfig) ? "beta" : undefined;
+    return `${(0, common_1.gcloudRunCmd)(version)} deploy ${fullServiceName} ${argsString}`;
 };
 exports.getServiceDeployScript = getServiceDeployScript;
 const getServiceDeleteScript = (context, serviceSuffix) => {
@@ -4009,6 +4043,21 @@ const getServiceDeleteScript = (context, serviceSuffix) => {
     ];
 };
 exports.getServiceDeleteScript = getServiceDeleteScript;
+const requiresBeta = (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;
+};
 //# sourceMappingURL=cloudRunServices.js.map
 
 /***/ }),
@@ -4095,8 +4144,9 @@ exports.ENV_VARS_FILENAME = "____envvars.yaml";
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.getCloudRunJobArgsArg = exports.getOnDeployExecuteScript = void 0;
+exports.getOnDeployExecuteScript = void 0;
 const createArgsString_1 = __nccwpck_require__(9598);
+const getJobOrServiceArgs_1 = __nccwpck_require__(1741);
 const jobName_1 = __nccwpck_require__(9626);
 const cloudRunJobs_1 = __nccwpck_require__(1224);
 const common_1 = __nccwpck_require__(3325);
@@ -4164,19 +4214,11 @@ const getJobRunScriptForExecute = (context, { jobName, config }) => {
     const argString = (0, createArgsString_1.createArgsString)({
         ...commonArgs,
         wait: waitForCompletion === true ? true : undefined,
-        args: (0, exports.getCloudRunJobArgsArg)(config.args),
+        args: (0, getJobOrServiceArgs_1.getCloudRunServiceOrJobArgsArg)(config.args),
     });
     const fullJobName = (0, jobName_1.getFullJobName)(context, jobName);
     return `${(0, common_1.gcloudRunCmd)()} jobs execute ${fullJobName.toString()} ${argString}`;
 };
-const getCloudRunJobArgsArg = (args) => {
-    return args !== undefined
-        ? args.length > 0
-            ? args === null || args === void 0 ? void 0 : args.map((arg) => `"${arg}"`).join(",")
-            : ""
-        : undefined;
-};
-exports.getCloudRunJobArgsArg = getCloudRunJobArgsArg;
 //# sourceMappingURL=onDeploy.js.map
 
 /***/ }),
@@ -4416,6 +4458,64 @@ exports.getCloudRunStopScripts = getCloudRunStopScripts;
 
 /***/ }),
 
+/***/ 193:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.healthCheckCliArgs = void 0;
+const types_1 = __nccwpck_require__(5781);
+const PORT = 8080;
+function healthCheckCliArgs(healthCheck) {
+    const shouldNotSetHealthCheck = healthCheck === undefined;
+    if (shouldNotSetHealthCheck) {
+        return undefined;
+    }
+    const 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) {
+    const sharedArgs = Object.entries({
+        initialDelaySeconds: probe.initialDelaySeconds,
+        timeoutSeconds: probe.timeoutSeconds,
+        periodSeconds: probe.periodSeconds,
+        failureThreshold: probe.failureThreshold,
+    });
+    switch (probe.type) {
+        case "tcp":
+            return [...sharedArgs, ["tcpSocket.port", PORT]];
+        case "http1":
+            return [
+                ...sharedArgs,
+                ["httpGet.port", PORT],
+                ["httpGet.path", probe.path],
+                // NOTE: headers are not supported by "gcloud beta" at the moment
+            ];
+        default:
+            probe;
+            return [];
+    }
+}
+function toArgValue(keyValues) {
+    return keyValues.map(([key, value]) => `${key}=${value}`).join(",");
+}
+//# sourceMappingURL=healthCheck.js.map
+
+/***/ }),
+
 /***/ 4069:
 /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
 
@@ -4721,6 +4821,25 @@ exports.gcloudServiceAccountLoginCommands = gcloudServiceAccountLoginCommands;
 
 /***/ }),
 
+/***/ 1741:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.getCloudRunServiceOrJobArgsArg = void 0;
+const getCloudRunServiceOrJobArgsArg = (args) => {
+    return args !== undefined
+        ? args.length > 0
+            ? args === null || args === void 0 ? void 0 : args.map((arg) => `"${arg}"`).join(",")
+            : ""
+        : undefined;
+};
+exports.getCloudRunServiceOrJobArgsArg = getCloudRunServiceOrJobArgsArg;
+//# sourceMappingURL=getJobOrServiceArgs.js.map
+
+/***/ }),
+
 /***/ 8128:
 /***/ ((__unused_webpack_module, exports) => {
 
@@ -5263,7 +5382,9 @@ const createAppConfig = (context, application) => {
     const { healthRoute, command, ...rest } = application !== null && application !== void 0 ? application : {};
     return (0, utils_1.mergeWithMergingArrays)({
         host: context.environment.envVars.HOSTNAME,
-        command: command !== null && command !== void 0 ? command : context.build.config.startCommand,
+        command: command !== null && command !== void 0 ? command : (context.build.type !== "disabled"
+            ? context.build.config.startCommand
+            : undefined),
         livenessProbe: {
             httpGet: {
                 path: healthRoute !== null && healthRoute !== void 0 ? healthRoute : "__health",
@@ -5443,9 +5564,10 @@ exports.getDependencyTrackDeleteScript = exports.getDependencyTrackUploadScript
 const BashExpression_1 = __nccwpck_require__(2376);
 const sbom_1 = __nccwpck_require__(7038);
 const context_1 = __nccwpck_require__(1724);
-const sbomDeactivated = (context) => (0, context_1.componentContextIsStandaloneBuild)(context) &&
-    context.build.config.type === "custom" &&
-    context.build.config.sbom === false;
+const sbomDeactivated = (context) => context.build.type === "disabled" ||
+    ((0, context_1.componentContextIsStandaloneBuild)(context) &&
+        context.build.config.type === "custom" &&
+        context.build.config.sbom === false);
 exports.sbomDeactivated = sbomDeactivated;
 const getDependencyTrackUploadScript = (context) => {
     return (0, exports.sbomDeactivated)(context)
@@ -5495,6 +5617,22 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.defaultLivenessProbe = exports.defaultStartupProbe = void 0;
+exports.defaultStartupProbe = {
+    type: "http1",
+    path: "/__health",
+    initialDelaySeconds: 5,
+    timeoutSeconds: 1,
+    periodSeconds: 30,
+    failureThreshold: 3,
+};
+exports.defaultLivenessProbe = {
+    ...exports.defaultStartupProbe,
+    initialDelaySeconds: 0,
+    timeoutSeconds: 10,
+    periodSeconds: 30,
+    failureThreshold: 3,
+};
 //# sourceMappingURL=googleCloudRun.js.map
 
 /***/ }),
@@ -5738,7 +5876,9 @@ const getCustomJobs = (context) => {
     return injectDefaultVarsInCustomJobs(context, rawJobs);
 };
 const createJobsForComponentContext = (context) => {
-    const buildJobs = build_1.BUILD_TYPES[context.build.buildType].jobs(context);
+    const buildJobs = context.build.type !== "disabled"
+        ? build_1.BUILD_TYPES[context.build.buildType].jobs(context)
+        : [];
     const deployJobs = context.componentConfig.deploy !== false
         ? deploy_1.DEPLOY_TYPES[context.componentConfig.deploy.type].jobs(context)
         : [];