@catladder/cli 0.0.0-fix-catenv-broken-build-cdada2e9 → 0.0.0-fix-gitlab-env-no-url-except-start-7c96a064

package/dist/bundles/catenv/index.js

@@ -13,12 +13,13 @@ const writeDotEnvFiles_1 = __nccwpck_require__(4770);
 const writeEnvDTs_1 = __nccwpck_require__(8800);
 const pipeline_1 = __nccwpck_require__(603);
 exports["default"] = async (choice) => {
+    var _a;
     const config = await (0, getProjectConfig_1.getProjectConfig)();
     if (!config) {
         return;
     }
     await Promise.all([
-        (0, pipeline_1.generatePipelineFiles)(config, "gitlab"),
+        (0, pipeline_1.generatePipelineFiles)(config, (_a = config.pipelineType) !== null && _a !== void 0 ? _a : "gitlab"),
         (0, writeDotEnvFiles_1.writeDotEnvFiles)(config, choice),
         (0, writeEnvDTs_1.writeDTsFiles)(config, choice),
         (0, printVariables_1.printVariables)(config, choice),
@@ -3067,11 +3068,7 @@ const getEnvironmentVariables = async (ctx, options = {}) => {
         url = (0, BashExpression_1.joinBashExpressions)(["https://", host]);
         predefinedVariables = {
             ...basePredefinedVariables,
-            // Rails before 6.1 (mis)uses the `HOST` environment variable to specify the IP to bind to
-            ...((0, types_1.isStandaloneBuildConfig)(buildConfigRaw) &&
-                buildConfigRaw.type === "rails"
-                ? {}
-                : { HOSTNAME: host }),
+            HOSTNAME: host,
             ROOT_URL: url,
             HOSTNAME_INTERNAL,
             ROOT_URL_INTERNAL: (0, BashExpression_1.joinBashExpressions)(["https://", HOSTNAME_INTERNAL]),
@@ -3120,8 +3117,6 @@ const getEnvironmentVariables = async (ctx, options = {}) => {
                 null),
             deploy: await (0, transformJobOnlyVars_1.transformJobOnlyVars)(env, componentName, (deployConfigRaw && deployConfigRaw.jobVars) || null),
         },
-        host,
-        url,
     };
 };
 exports.getEnvironmentVariables = getEnvironmentVariables;
@@ -4949,7 +4944,7 @@ const createAppConfig = (context, application) => {
     }
     const { healthRoute, command, ...rest } = application !== null && application !== void 0 ? application : {};
     return (0, utils_1.mergeWithMergingArrays)({
-        host: context.environment.host,
+        host: context.environment.envVars.HOSTNAME,
         command: command !== null && command !== void 0 ? command : context.build.config.startCommand,
         livenessProbe: {
             httpGet: {
@@ -5138,7 +5133,7 @@ const getDependencyTrackUploadScript = (context) => {
         ? []
         : [
             "echo 'Uploading SBOM to Dependency Track'",
-            `/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "${context.fullConfig.customerName}-${context.fullConfig.appName}/${context.name}" "${context.environment.url}" "${sbom_1.SBOM_FILE}" vex.json || true`,
+            `/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "${context.fullConfig.customerName}-${context.fullConfig.appName}/${context.name}" "${context.environment.envVars.ROOT_URL}" "${sbom_1.SBOM_FILE}" vex.json || true`,
         ];
 };
 exports.getDependencyTrackUploadScript = getDependencyTrackUploadScript;
@@ -5147,7 +5142,7 @@ const getDependencyTrackDeleteScript = (context) => {
         ? []
         : [
             "echo 'Disabling component in Dependency Track'",
-            `/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "${context.fullConfig.customerName}-${context.fullConfig.appName}/${context.name}" "${context.environment.url}" || true`,
+            `/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "${context.fullConfig.customerName}-${context.fullConfig.appName}/${context.name}" "${context.environment.envVars.ROOT_URL}" || true`,
         ];
 };
 exports.getDependencyTrackDeleteScript = getDependencyTrackDeleteScript;
@@ -5467,7 +5462,7 @@ const createMainPipeline = async (pipelineType, config) => {
         // for all triggers create jobs and add base rules
         const allJobsPerTrigger = await Promise.all(config_1.ALL_PIPELINE_TRIGGERS.map(async (trigger) => await (0, createGitlabJobs_1.createGitlabJobs)(await (0, createAllJobs_1.createAllJobs)({ config, trigger, pipelineType }), getGitlabRulesForTrigger(trigger)))).then((j) => j.flat());
         const allWorkspaceJobs = allJobsPerTrigger
-            .filter((j) => j.context.type === "workspace") // sort by componentName in the same order as they appear in the config
+            .filter((j) => { var _a; return ((_a = j.context) === null || _a === void 0 ? void 0 : _a.type) === "workspace"; }) // sort by componentName in the same order as they appear in the config
             // this is purely for better readability in git diffs when you add new components
             .sort((a, b) => {
             var _a;
@@ -5477,7 +5472,7 @@ const createMainPipeline = async (pipelineType, config) => {
             return aIndex - bIndex;
         });
         const allComponentJobs = allJobsPerTrigger
-            .filter((j) => j.context.type === "component")
+            .filter((j) => { var _a; return ((_a = j.context) === null || _a === void 0 ? void 0 : _a.type) === "component"; })
             // sort by componentName in the same order as they appear in the config
             // this is purely for better readability in git diffs when you add new components
             .sort((a, b) => {
@@ -5486,18 +5481,18 @@ const createMainPipeline = async (pipelineType, config) => {
             const bIndex = componentNames.findIndex((c) => c === b.context.name);
             return aIndex - bIndex;
         });
-        const allJobs = [...allWorkspaceJobs, ...allComponentJobs].reduce((acc, { gitlabJob, name }) => {
+        const allJobs = [...allWorkspaceJobs, ...allComponentJobs].reduce((acc, { gitlabJob, name, context }) => {
             var _a, _b;
             // merge jobs, if a job is already there, merge the rules
             // this is currently needed because of envMode: "none", which creates the same job for all triggers, so it can appear multiple times
             if (acc[name]) {
-                acc[name].rules = [
-                    ...((_a = acc[name].rules) !== null && _a !== void 0 ? _a : []),
+                acc[name].gitlabJob.rules = [
+                    ...((_a = acc[name].gitlabJob.rules) !== null && _a !== void 0 ? _a : []),
                     ...((_b = gitlabJob.rules) !== null && _b !== void 0 ? _b : []),
                 ];
             }
             else {
-                acc[name] = gitlabJob;
+                acc[name] = { context, gitlabJob };
             }
             return acc;
         }, {});
@@ -5505,7 +5500,13 @@ const createMainPipeline = async (pipelineType, config) => {
             stages: [...stages, "release"],
             jobs: {
                 ...allJobs,
-                ...(0, gitlabReleaseJobs_1.getGitlabReleaseJobs)(),
+                ...Object.fromEntries(Object.entries((0, gitlabReleaseJobs_1.getGitlabReleaseJobs)()).map(([name, gitlabJob]) => [
+                    name,
+                    {
+                        gitlabJob,
+                        context: null,
+                    },
+                ])),
             },
             variables: config.runnerVariables,
         });
@@ -5536,32 +5537,83 @@ function getGitlabRulesForTrigger(trigger) {
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.generatePipelineFiles = exports.generateLocalPipelineContent = void 0;
+exports.getGitlabCompletePipeline = exports.generatePipelineFiles = void 0;
+const promises_1 = __nccwpck_require__(3292);
+const path_1 = __nccwpck_require__(1017);
 const writeFiles_1 = __nccwpck_require__(2228);
 const createMainPipeline_1 = __nccwpck_require__(9192);
 const sortGitLabJobDefProps_1 = __nccwpck_require__(2361);
-async function generateLocalPipelineContent(config, pipelineType) {
-    const { jobs, image, stages, variables, workflow, ...pipelineRest } = await (0, createMainPipeline_1.createMainPipeline)(pipelineType, config);
-    const jobsWithSortedProps = Object.fromEntries(Object.entries(jobs).map(([jobName, job]) => [
-        jobName,
-        (0, sortGitLabJobDefProps_1.sortGitLabJobDefProps)(job),
-    ]));
-    return {
-        image,
-        stages,
-        variables,
-        workflow,
-        ...pipelineRest,
-        // jobs need to be spread into main YAML, because GitLab pipeline YAML has no jobs key - jobs are top level with their key as their name
-        ...jobsWithSortedProps,
-    };
-}
-exports.generateLocalPipelineContent = generateLocalPipelineContent;
+const CATLADDER_GENERATED_FOLDER = ".catladder-generated";
+const GITLAB_GENERATED_FOLDER = CATLADDER_GENERATED_FOLDER + "/gitlab";
 async function generatePipelineFiles(config, pipelineType) {
-    const pipelineContent = await generateLocalPipelineContent(config, pipelineType);
-    return (0, writeFiles_1.writeYamlfile)(`.gitlab-ci.yml`, pipelineContent);
+    if (pipelineType !== "gitlab") {
+        throw new Error("Pipeline type not supported");
+    }
+    const includes = await getGitlabPipelineIncludes(config);
+    const mainFile = {
+        path: ".gitlab-ci.yml",
+        content: {
+            include: includes.map((i) => i.path),
+        },
+    };
+    const files = [mainFile, ...includes];
+    // first clean up the folder
+    await (0, promises_1.rm)(GITLAB_GENERATED_FOLDER, { force: true, recursive: true });
+    // write files
+    await Promise.all(files.map(async ({ path, content }) => {
+        await (0, promises_1.mkdir)((0, path_1.dirname)(path), { recursive: true });
+        await (0, writeFiles_1.writeYamlfile)(path, content);
+    }));
 }
 exports.generatePipelineFiles = generatePipelineFiles;
+async function getGitlabPipelineIncludes(config) {
+    const { jobs, image, stages, variables, workflow, ...pipelineRest } = await (0, createMainPipeline_1.createMainPipeline)("gitlab", config);
+    // we will create 1 include per component or workspace
+    // this is for better readability in git diffs and to avoid problems with yaml files beeing too large
+    // group by context
+    const groups = Object.entries(jobs).reduce((acc, [jobName, { gitlabJob, context }]) => {
+        const group = !context
+            ? "global-jobs"
+            : (context === null || context === void 0 ? void 0 : context.type) + "/" + context.name;
+        if (!acc[group]) {
+            acc[group] = {};
+        }
+        acc[group][jobName] = (0, sortGitLabJobDefProps_1.sortGitLabJobDefProps)(gitlabJob); // also sort properties for more consistent diffing
+        return acc;
+    }, {});
+    const componentIncludes = Object.entries(groups).map(([group, jobs]) => {
+        return {
+            path: GITLAB_GENERATED_FOLDER + "/" + group + ".yaml",
+            content: jobs,
+        };
+    });
+    const mainInclude = {
+        path: GITLAB_GENERATED_FOLDER + "/main.yaml",
+        content: {
+            image,
+            stages,
+            variables,
+            workflow,
+            ...pipelineRest,
+        },
+    };
+    const includes = [mainInclude, ...componentIncludes];
+    return includes;
+}
+/**
+ *
+ * for testing purposes
+ */
+async function getGitlabCompletePipeline(config) {
+    const includes = await getGitlabPipelineIncludes(config);
+    return includes.reduce((acc, { content }) => {
+        return {
+            ...acc,
+            ...content, // merge all includes into one object
+        };
+    }, {});
+}
+exports.getGitlabCompletePipeline = getGitlabCompletePipeline;
 //# sourceMappingURL=generatePipelineFiles.js.map
 
 /***/ }),
@@ -5720,12 +5772,12 @@ const addGitlabEnvironment = (context, catladderJobEnvironment, job, allJobs) =>
         return job;
     }
     const { env, name, environment } = context;
-    const { url, envType } = environment;
+    const { envVars, envType } = environment;
     const { on_stop, ...restEnvironment } = catladderJobEnvironment;
     // those can be dynamic, so we therefore have to do this: https://docs.gitlab.com/ee/ci/environments/#set-a-dynamic-environment-url
     const dotEnvFile = "gitlab_environment.env";
     const scriptToAdd = [
-        `echo "${exports.GITLAB_ENVIRONMENT_URL_VARIABLE}=${url}" >> ${dotEnvFile}`,
+        `echo "${exports.GITLAB_ENVIRONMENT_URL_VARIABLE}=${envVars.ROOT_URL}" >> ${dotEnvFile}`,
     ];
     // this is NOT a bashVariable since it NEEDS to be used as a string in gitlab
     const gitlabEnvironmentName = envType === "review"
@@ -5735,7 +5787,10 @@ const addGitlabEnvironment = (context, catladderJobEnvironment, job, allJobs) =>
         ...job,
         environment: {
             name: gitlabEnvironmentName,
-            url: `$${exports.GITLAB_ENVIRONMENT_URL_VARIABLE}`,
+            ...(!catladderJobEnvironment.action ||
+                catladderJobEnvironment.action === "start"
+                ? { url: `$${exports.GITLAB_ENVIRONMENT_URL_VARIABLE}` }
+                : {}),
             ...(on_stop
                 ? {
                     on_stop: getFullReferencedJobNameFromComponent(on_stop, name, env, allJobs),

package/dist/bundles/cli/index.js

@@ -1563,7 +1563,7 @@ exports["default"] = async (vorpal) => vorpal
     const { env, componentName } = (0, getProjectConfig_1.parseChoice)(envComponent);
     await ensureCluster_1.default.call(this, envComponent);
     const environment = await (0, getProjectConfig_1.getEnvironment)(env, componentName);
-    const url = environment.url;
+    const url = environment.envVars.ROOT_URL;
     (0, open_1.default)(url.toString());
 });
 //# sourceMappingURL=commandOpenEnv.js.map
@@ -6005,11 +6005,7 @@ const getEnvironmentVariables = async (ctx, options = {}) => {
         url = (0, BashExpression_1.joinBashExpressions)(["https://", host]);
         predefinedVariables = {
             ...basePredefinedVariables,
-            // Rails before 6.1 (mis)uses the `HOST` environment variable to specify the IP to bind to
-            ...((0, types_1.isStandaloneBuildConfig)(buildConfigRaw) &&
-                buildConfigRaw.type === "rails"
-                ? {}
-                : { HOSTNAME: host }),
+            HOSTNAME: host,
             ROOT_URL: url,
             HOSTNAME_INTERNAL,
             ROOT_URL_INTERNAL: (0, BashExpression_1.joinBashExpressions)(["https://", HOSTNAME_INTERNAL]),
@@ -6058,8 +6054,6 @@ const getEnvironmentVariables = async (ctx, options = {}) => {
                 null),
             deploy: await (0, transformJobOnlyVars_1.transformJobOnlyVars)(env, componentName, (deployConfigRaw && deployConfigRaw.jobVars) || null),
         },
-        host,
-        url,
     };
 };
 exports.getEnvironmentVariables = getEnvironmentVariables;
@@ -7887,7 +7881,7 @@ const createAppConfig = (context, application) => {
     }
     const { healthRoute, command, ...rest } = application !== null && application !== void 0 ? application : {};
     return (0, utils_1.mergeWithMergingArrays)({
-        host: context.environment.host,
+        host: context.environment.envVars.HOSTNAME,
         command: command !== null && command !== void 0 ? command : context.build.config.startCommand,
         livenessProbe: {
             httpGet: {
@@ -8076,7 +8070,7 @@ const getDependencyTrackUploadScript = (context) => {
         ? []
         : [
             "echo 'Uploading SBOM to Dependency Track'",
-            `/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "${context.fullConfig.customerName}-${context.fullConfig.appName}/${context.name}" "${context.environment.url}" "${sbom_1.SBOM_FILE}" vex.json || true`,
+            `/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "${context.fullConfig.customerName}-${context.fullConfig.appName}/${context.name}" "${context.environment.envVars.ROOT_URL}" "${sbom_1.SBOM_FILE}" vex.json || true`,
         ];
 };
 exports.getDependencyTrackUploadScript = getDependencyTrackUploadScript;
@@ -8085,7 +8079,7 @@ const getDependencyTrackDeleteScript = (context) => {
         ? []
         : [
             "echo 'Disabling component in Dependency Track'",
-            `/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "${context.fullConfig.customerName}-${context.fullConfig.appName}/${context.name}" "${context.environment.url}" || true`,
+            `/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "${context.fullConfig.customerName}-${context.fullConfig.appName}/${context.name}" "${context.environment.envVars.ROOT_URL}" || true`,
         ];
 };
 exports.getDependencyTrackDeleteScript = getDependencyTrackDeleteScript;
@@ -8405,7 +8399,7 @@ const createMainPipeline = async (pipelineType, config) => {
         // for all triggers create jobs and add base rules
         const allJobsPerTrigger = await Promise.all(config_1.ALL_PIPELINE_TRIGGERS.map(async (trigger) => await (0, createGitlabJobs_1.createGitlabJobs)(await (0, createAllJobs_1.createAllJobs)({ config, trigger, pipelineType }), getGitlabRulesForTrigger(trigger)))).then((j) => j.flat());
         const allWorkspaceJobs = allJobsPerTrigger
-            .filter((j) => j.context.type === "workspace") // sort by componentName in the same order as they appear in the config
+            .filter((j) => { var _a; return ((_a = j.context) === null || _a === void 0 ? void 0 : _a.type) === "workspace"; }) // sort by componentName in the same order as they appear in the config
             // this is purely for better readability in git diffs when you add new components
             .sort((a, b) => {
             var _a;
@@ -8415,7 +8409,7 @@ const createMainPipeline = async (pipelineType, config) => {
             return aIndex - bIndex;
         });
         const allComponentJobs = allJobsPerTrigger
-            .filter((j) => j.context.type === "component")
+            .filter((j) => { var _a; return ((_a = j.context) === null || _a === void 0 ? void 0 : _a.type) === "component"; })
             // sort by componentName in the same order as they appear in the config
             // this is purely for better readability in git diffs when you add new components
             .sort((a, b) => {
@@ -8424,18 +8418,18 @@ const createMainPipeline = async (pipelineType, config) => {
             const bIndex = componentNames.findIndex((c) => c === b.context.name);
             return aIndex - bIndex;
         });
-        const allJobs = [...allWorkspaceJobs, ...allComponentJobs].reduce((acc, { gitlabJob, name }) => {
+        const allJobs = [...allWorkspaceJobs, ...allComponentJobs].reduce((acc, { gitlabJob, name, context }) => {
             var _a, _b;
             // merge jobs, if a job is already there, merge the rules
             // this is currently needed because of envMode: "none", which creates the same job for all triggers, so it can appear multiple times
             if (acc[name]) {
-                acc[name].rules = [
-                    ...((_a = acc[name].rules) !== null && _a !== void 0 ? _a : []),
+                acc[name].gitlabJob.rules = [
+                    ...((_a = acc[name].gitlabJob.rules) !== null && _a !== void 0 ? _a : []),
                     ...((_b = gitlabJob.rules) !== null && _b !== void 0 ? _b : []),
                 ];
             }
             else {
-                acc[name] = gitlabJob;
+                acc[name] = { context, gitlabJob };
             }
             return acc;
         }, {});
@@ -8443,7 +8437,13 @@ const createMainPipeline = async (pipelineType, config) => {
             stages: [...stages, "release"],
             jobs: {
                 ...allJobs,
-                ...(0, gitlabReleaseJobs_1.getGitlabReleaseJobs)(),
+                ...Object.fromEntries(Object.entries((0, gitlabReleaseJobs_1.getGitlabReleaseJobs)()).map(([name, gitlabJob]) => [
+                    name,
+                    {
+                        gitlabJob,
+                        context: null,
+                    },
+                ])),
             },
             variables: config.runnerVariables,
         });
@@ -8474,32 +8474,83 @@ function getGitlabRulesForTrigger(trigger) {
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.generatePipelineFiles = exports.generateLocalPipelineContent = void 0;
+exports.getGitlabCompletePipeline = exports.generatePipelineFiles = void 0;
+const promises_1 = __nccwpck_require__(73292);
+const path_1 = __nccwpck_require__(71017);
 const writeFiles_1 = __nccwpck_require__(92228);
 const createMainPipeline_1 = __nccwpck_require__(39192);
 const sortGitLabJobDefProps_1 = __nccwpck_require__(72361);
-async function generateLocalPipelineContent(config, pipelineType) {
-    const { jobs, image, stages, variables, workflow, ...pipelineRest } = await (0, createMainPipeline_1.createMainPipeline)(pipelineType, config);
-    const jobsWithSortedProps = Object.fromEntries(Object.entries(jobs).map(([jobName, job]) => [
-        jobName,
-        (0, sortGitLabJobDefProps_1.sortGitLabJobDefProps)(job),
-    ]));
-    return {
-        image,
-        stages,
-        variables,
-        workflow,
-        ...pipelineRest,
-        // jobs need to be spread into main YAML, because GitLab pipeline YAML has no jobs key - jobs are top level with their key as their name
-        ...jobsWithSortedProps,
-    };
-}
-exports.generateLocalPipelineContent = generateLocalPipelineContent;
+const CATLADDER_GENERATED_FOLDER = ".catladder-generated";
+const GITLAB_GENERATED_FOLDER = CATLADDER_GENERATED_FOLDER + "/gitlab";
 async function generatePipelineFiles(config, pipelineType) {
-    const pipelineContent = await generateLocalPipelineContent(config, pipelineType);
-    return (0, writeFiles_1.writeYamlfile)(`.gitlab-ci.yml`, pipelineContent);
+    if (pipelineType !== "gitlab") {
+        throw new Error("Pipeline type not supported");
+    }
+    const includes = await getGitlabPipelineIncludes(config);
+    const mainFile = {
+        path: ".gitlab-ci.yml",
+        content: {
+            include: includes.map((i) => i.path),
+        },
+    };
+    const files = [mainFile, ...includes];
+    // first clean up the folder
+    await (0, promises_1.rm)(GITLAB_GENERATED_FOLDER, { force: true, recursive: true });
+    // write files
+    await Promise.all(files.map(async ({ path, content }) => {
+        await (0, promises_1.mkdir)((0, path_1.dirname)(path), { recursive: true });
+        await (0, writeFiles_1.writeYamlfile)(path, content);
+    }));
 }
 exports.generatePipelineFiles = generatePipelineFiles;
+async function getGitlabPipelineIncludes(config) {
+    const { jobs, image, stages, variables, workflow, ...pipelineRest } = await (0, createMainPipeline_1.createMainPipeline)("gitlab", config);
+    // we will create 1 include per component or workspace
+    // this is for better readability in git diffs and to avoid problems with yaml files beeing too large
+    // group by context
+    const groups = Object.entries(jobs).reduce((acc, [jobName, { gitlabJob, context }]) => {
+        const group = !context
+            ? "global-jobs"
+            : (context === null || context === void 0 ? void 0 : context.type) + "/" + context.name;
+        if (!acc[group]) {
+            acc[group] = {};
+        }
+        acc[group][jobName] = (0, sortGitLabJobDefProps_1.sortGitLabJobDefProps)(gitlabJob); // also sort properties for more consistent diffing
+        return acc;
+    }, {});
+    const componentIncludes = Object.entries(groups).map(([group, jobs]) => {
+        return {
+            path: GITLAB_GENERATED_FOLDER + "/" + group + ".yaml",
+            content: jobs,
+        };
+    });
+    const mainInclude = {
+        path: GITLAB_GENERATED_FOLDER + "/main.yaml",
+        content: {
+            image,
+            stages,
+            variables,
+            workflow,
+            ...pipelineRest,
+        },
+    };
+    const includes = [mainInclude, ...componentIncludes];
+    return includes;
+}
+/**
+ *
+ * for testing purposes
+ */
+async function getGitlabCompletePipeline(config) {
+    const includes = await getGitlabPipelineIncludes(config);
+    return includes.reduce((acc, { content }) => {
+        return {
+            ...acc,
+            ...content, // merge all includes into one object
+        };
+    }, {});
+}
+exports.getGitlabCompletePipeline = getGitlabCompletePipeline;
 //# sourceMappingURL=generatePipelineFiles.js.map
 
 /***/ }),
@@ -8658,12 +8709,12 @@ const addGitlabEnvironment = (context, catladderJobEnvironment, job, allJobs) =>
         return job;
     }
     const { env, name, environment } = context;
-    const { url, envType } = environment;
+    const { envVars, envType } = environment;
     const { on_stop, ...restEnvironment } = catladderJobEnvironment;
     // those can be dynamic, so we therefore have to do this: https://docs.gitlab.com/ee/ci/environments/#set-a-dynamic-environment-url
     const dotEnvFile = "gitlab_environment.env";
     const scriptToAdd = [
-        `echo "${exports.GITLAB_ENVIRONMENT_URL_VARIABLE}=${url}" >> ${dotEnvFile}`,
+        `echo "${exports.GITLAB_ENVIRONMENT_URL_VARIABLE}=${envVars.ROOT_URL}" >> ${dotEnvFile}`,
     ];
     // this is NOT a bashVariable since it NEEDS to be used as a string in gitlab
     const gitlabEnvironmentName = envType === "review"
@@ -8673,7 +8724,10 @@ const addGitlabEnvironment = (context, catladderJobEnvironment, job, allJobs) =>
         ...job,
         environment: {
             name: gitlabEnvironmentName,
-            url: `$${exports.GITLAB_ENVIRONMENT_URL_VARIABLE}`,
+            ...(!catladderJobEnvironment.action ||
+                catladderJobEnvironment.action === "start"
+                ? { url: `$${exports.GITLAB_ENVIRONMENT_URL_VARIABLE}` }
+                : {}),
             ...(on_stop
                 ? {
                     on_stop: getFullReferencedJobNameFromComponent(on_stop, name, env, allJobs),

package/dist/cli/src/apps/catenv/catenv.js

@@ -6,12 +6,13 @@ const writeDotEnvFiles_1 = require("./writeDotEnvFiles");
 const writeEnvDTs_1 = require("./writeEnvDTs");
 const pipeline_1 = require("../../../../pipeline/src/index.js");
 exports.default = async (choice) => {
+    var _a;
     const config = await (0, getProjectConfig_1.getProjectConfig)();
     if (!config) {
         return;
     }
     await Promise.all([
-        (0, pipeline_1.generatePipelineFiles)(config, "gitlab"),
+        (0, pipeline_1.generatePipelineFiles)(config, (_a = config.pipelineType) !== null && _a !== void 0 ? _a : "gitlab"),
         (0, writeDotEnvFiles_1.writeDotEnvFiles)(config, choice),
         (0, writeEnvDTs_1.writeDTsFiles)(config, choice),
         (0, printVariables_1.printVariables)(config, choice),

package/dist/cli/src/apps/catenv/catenv.js.map

@@ -1 +1 @@
-{"version":3,"file":"catenv.js","sourceRoot":"","sources":["../../../../../src/apps/catenv/catenv.ts"],"names":[],"mappings":";;AAAA,oEAAiE;AACjE,qDAAkD;AAElD,yDAAsD;AACtD,+CAA8C;AAC9C,kDAA4D;AAE5D,kBAAe,KAAK,EAAE,MAAe,EAAE,EAAE;IACvC,MAAM,MAAM,GAAG,MAAM,IAAA,mCAAgB,GAAE,CAAC;IACxC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO;IACT,CAAC;IAED,MAAM,OAAO,CAAC,GAAG,CAAC;QAChB,IAAA,gCAAqB,EAAC,MAAM,EAAE,QAAQ,CAAC;QACvC,IAAA,mCAAgB,EAAC,MAAM,EAAE,MAAM,CAAC;QAEhC,IAAA,2BAAa,EAAC,MAAM,EAAE,MAAM,CAAC;QAE7B,IAAA,+BAAc,EAAC,MAAM,EAAE,MAAM,CAAC;KAC/B,CAAC,CAAC;AACL,CAAC,CAAC"}
+{"version":3,"file":"catenv.js","sourceRoot":"","sources":["../../../../../src/apps/catenv/catenv.ts"],"names":[],"mappings":";;AAAA,oEAAiE;AACjE,qDAAkD;AAElD,yDAAsD;AACtD,+CAA8C;AAC9C,kDAA4D;AAE5D,kBAAe,KAAK,EAAE,MAAe,EAAE,EAAE;;IACvC,MAAM,MAAM,GAAG,MAAM,IAAA,mCAAgB,GAAE,CAAC;IACxC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO;IACT,CAAC;IAED,MAAM,OAAO,CAAC,GAAG,CAAC;QAChB,IAAA,gCAAqB,EAAC,MAAM,EAAE,MAAA,MAAM,CAAC,YAAY,mCAAI,QAAQ,CAAC;QAC9D,IAAA,mCAAgB,EAAC,MAAM,EAAE,MAAM,CAAC;QAEhC,IAAA,2BAAa,EAAC,MAAM,EAAE,MAAM,CAAC;QAE7B,IAAA,+BAAc,EAAC,MAAM,EAAE,MAAM,CAAC;KAC/B,CAAC,CAAC;AACL,CAAC,CAAC"}

package/dist/cli/src/apps/cli/commands/project/commandOpenEnv.js

@@ -14,7 +14,7 @@ exports.default = async (vorpal) => vorpal
     const { env, componentName } = (0, getProjectConfig_1.parseChoice)(envComponent);
     await ensureCluster_1.default.call(this, envComponent);
     const environment = await (0, getProjectConfig_1.getEnvironment)(env, componentName);
-    const url = environment.url;
+    const url = environment.envVars.ROOT_URL;
     (0, open_1.default)(url.toString());
 });
 //# sourceMappingURL=commandOpenEnv.js.map

package/dist/cli/src/apps/cli/commands/project/commandOpenEnv.js.map

@@ -1 +1 @@
-{"version":3,"file":"commandOpenEnv.js","sourceRoot":"","sources":["../../../../../../../src/apps/cli/commands/project/commandOpenEnv.ts"],"names":[],"mappings":";;;;;AAAA,gDAAwB;AAExB,0EAG6C;AAE7C,6DAA2D;AAC3D,0EAAkD;AAElD,kBAAe,KAAK,EAAE,MAAc,EAAE,EAAE,CACtC,MAAM;KACH,OAAO,CAAC,iCAAiC,EAAE,2BAA2B,CAAC;KACvE,YAAY,CAAC,MAAM,IAAA,kCAAgB,GAAE,CAAC;KACtC,MAAM,CAAC,KAAK,WAAW,EAAE,YAAY,EAAE;IACtC,MAAM,EAAE,GAAG,EAAE,aAAa,EAAE,GAAG,IAAA,8BAAW,EAAC,YAAY,CAAC,CAAC;IACzD,MAAM,uBAAa,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;IAC7C,MAAM,WAAW,GAAG,MAAM,IAAA,iCAAc,EAAC,GAAG,EAAE,aAAa,CAAC,CAAC;IAC7D,MAAM,GAAG,GAAG,WAAW,CAAC,GAAG,CAAC;IAE5B,IAAA,cAAI,EAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;AACvB,CAAC,CAAC,CAAC"}
+{"version":3,"file":"commandOpenEnv.js","sourceRoot":"","sources":["../../../../../../../src/apps/cli/commands/project/commandOpenEnv.ts"],"names":[],"mappings":";;;;;AAAA,gDAAwB;AAExB,0EAG6C;AAE7C,6DAA2D;AAC3D,0EAAkD;AAElD,kBAAe,KAAK,EAAE,MAAc,EAAE,EAAE,CACtC,MAAM;KACH,OAAO,CAAC,iCAAiC,EAAE,2BAA2B,CAAC;KACvE,YAAY,CAAC,MAAM,IAAA,kCAAgB,GAAE,CAAC;KACtC,MAAM,CAAC,KAAK,WAAW,EAAE,YAAY,EAAE;IACtC,MAAM,EAAE,GAAG,EAAE,aAAa,EAAE,GAAG,IAAA,8BAAW,EAAC,YAAY,CAAC,CAAC;IACzD,MAAM,uBAAa,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;IAC7C,MAAM,WAAW,GAAG,MAAM,IAAA,iCAAc,EAAC,GAAG,EAAE,aAAa,CAAC,CAAC;IAC7D,MAAM,GAAG,GAAG,WAAW,CAAC,OAAO,CAAC,QAAQ,CAAC;IAEzC,IAAA,cAAI,EAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;AACvB,CAAC,CAAC,CAAC"}

package/dist/pipeline/src/context/getEnvironmentVariables.d.ts

@@ -13,7 +13,7 @@ declare const getBasePredefinedVariables: (ctx: EnvironmentContext) => {
 };
 type BasePredefinedVariables = ReturnType<typeof getBasePredefinedVariables>;
 export type PredefinedVariables = BasePredefinedVariables & {
-    HOSTNAME?: StringOrBashExpression;
+    HOSTNAME: StringOrBashExpression;
     ROOT_URL: StringOrBashExpression;
     HOSTNAME_INTERNAL: StringOrBashExpression;
     ROOT_URL_INTERNAL: StringOrBashExpression;

package/dist/pipeline/src/context/getEnvironmentVariables.js

@@ -51,11 +51,7 @@ const getEnvironmentVariables = async (ctx, options = {}) => {
         url = (0, BashExpression_1.joinBashExpressions)(["https://", host]);
         predefinedVariables = {
             ...basePredefinedVariables,
-            // Rails before 6.1 (mis)uses the `HOST` environment variable to specify the IP to bind to
-            ...((0, types_1.isStandaloneBuildConfig)(buildConfigRaw) &&
-                buildConfigRaw.type === "rails"
-                ? {}
-                : { HOSTNAME: host }),
+            HOSTNAME: host,
             ROOT_URL: url,
             HOSTNAME_INTERNAL,
             ROOT_URL_INTERNAL: (0, BashExpression_1.joinBashExpressions)(["https://", HOSTNAME_INTERNAL]),
@@ -104,8 +100,6 @@ const getEnvironmentVariables = async (ctx, options = {}) => {
                 null),
             deploy: await (0, transformJobOnlyVars_1.transformJobOnlyVars)(env, componentName, (deployConfigRaw && deployConfigRaw.jobVars) || null),
         },
-        host,
-        url,
     };
 };
 exports.getEnvironmentVariables = getEnvironmentVariables;

package/dist/pipeline/src/context/getEnvironmentVariables.js.map

@@ -1 +1 @@
-{"version":3,"file":"getEnvironmentVariables.js","sourceRoot":"","sources":["../../../../../pipeline/src/context/getEnvironmentVariables.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"getEnvironmentVariables.js","sourceRoot":"","sources":["../../../../../pipeline/src/context/getEnvironmentVariables.ts"],"names":[],"mappings":"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"}

package/dist/pipeline/src/deploy/kubernetes/kubeValues.js

@@ -15,7 +15,7 @@ const createAppConfig = (context, application) => {
     }
     const { healthRoute, command, ...rest } = application !== null && application !== void 0 ? application : {};
     return (0, utils_1.mergeWithMergingArrays)({
-        host: context.environment.host,
+        host: context.environment.envVars.HOSTNAME,
         command: command !== null && command !== void 0 ? command : context.build.config.startCommand,
         livenessProbe: {
             httpGet: {

package/dist/pipeline/src/deploy/kubernetes/kubeValues.js.map

@@ -1 +1 @@
-{"version":3,"file":"kubeValues.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/kubernetes/kubeValues.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"kubeValues.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/kubernetes/kubeValues.ts"],"names":[],"mappings":"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"}

package/dist/pipeline/src/deploy/sbom.js

@@ -12,7 +12,7 @@ const getDependencyTrackUploadScript = (context) => {
         ? []
         : [
             "echo 'Uploading SBOM to Dependency Track'",
-            `/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "${context.fullConfig.customerName}-${context.fullConfig.appName}/${context.name}" "${context.environment.url}" "${sbom_1.SBOM_FILE}" vex.json || true`,
+            `/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "${context.fullConfig.customerName}-${context.fullConfig.appName}/${context.name}" "${context.environment.envVars.ROOT_URL}" "${sbom_1.SBOM_FILE}" vex.json || true`,
         ];
 };
 exports.getDependencyTrackUploadScript = getDependencyTrackUploadScript;
@@ -21,7 +21,7 @@ const getDependencyTrackDeleteScript = (context) => {
         ? []
         : [
             "echo 'Disabling component in Dependency Track'",
-            `/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "${context.fullConfig.customerName}-${context.fullConfig.appName}/${context.name}" "${context.environment.url}" || true`,
+            `/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "${context.fullConfig.customerName}-${context.fullConfig.appName}/${context.name}" "${context.environment.envVars.ROOT_URL}" || true`,
         ];
 };
 exports.getDependencyTrackDeleteScript = getDependencyTrackDeleteScript;

package/dist/pipeline/src/deploy/sbom.js.map

@@ -1 +1 @@
-{"version":3,"file":"sbom.js","sourceRoot":"","sources":["../../../../../pipeline/src/deploy/sbom.ts"],"names":[],"mappings":";;;AAAA,wCAA0C;AAC1C,8CAG0B;AAEnB,MAAM,eAAe,GAAG,CAAC,OAAyB,EAAE,EAAE,CAC3D,IAAA,2CAAiC,EAAC,OAAO,CAAC;IAC1C,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,KAAK,QAAQ;IACtC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,KAAK,KAAK,CAAC;AAHzB,QAAA,eAAe,mBAGU;AAE/B,MAAM,8BAA8B,GAAG,CAC5C,OAAyB,EACf,EAAE;IACZ,OAAO,IAAA,uBAAe,EAAC,OAAO,CAAC;QAC7B,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC;YACE,2CAA2C;YAC3C,oEAAoE,OAAO,CAAC,UAAU,CAAC,YAAY,IAAI,OAAO,CAAC,UAAU,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,MAAM,OAAO,CAAC,WAAW,CAAC,GAAG,MAAM,gBAAS,oBAAoB;SAClN,CAAC;AACR,CAAC,CAAC;AATW,QAAA,8BAA8B,kCASzC;AAEK,MAAM,8BAA8B,GAAG,CAC5C,OAAyB,EACf,EAAE;IACZ,OAAO,IAAA,uBAAe,EAAC,OAAO,CAAC;QAC7B,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC;YACE,gDAAgD;YAChD,qEAAqE,OAAO,CAAC,UAAU,CAAC,YAAY,IAAI,OAAO,CAAC,UAAU,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,MAAM,OAAO,CAAC,WAAW,CAAC,GAAG,WAAW;SAC3L,CAAC;AACR,CAAC,CAAC;AATW,QAAA,8BAA8B,kCASzC"}
+{"version":3,"file":"sbom.js","sourceRoot":"","sources":["../../../../../pipeline/src/deploy/sbom.ts"],"names":[],"mappings":";;;AAAA,wCAA0C;AAC1C,8CAG0B;AAEnB,MAAM,eAAe,GAAG,CAAC,OAAyB,EAAE,EAAE,CAC3D,IAAA,2CAAiC,EAAC,OAAO,CAAC;IAC1C,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,KAAK,QAAQ;IACtC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,KAAK,KAAK,CAAC;AAHzB,QAAA,eAAe,mBAGU;AAE/B,MAAM,8BAA8B,GAAG,CAC5C,OAAyB,EACf,EAAE;IACZ,OAAO,IAAA,uBAAe,EAAC,OAAO,CAAC;QAC7B,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC;YACE,2CAA2C;YAC3C,oEAAoE,OAAO,CAAC,UAAU,CAAC,YAAY,IAAI,OAAO,CAAC,UAAU,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,MAAM,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,QAAQ,MAAM,gBAAS,oBAAoB;SAC/N,CAAC;AACR,CAAC,CAAC;AATW,QAAA,8BAA8B,kCASzC;AAEK,MAAM,8BAA8B,GAAG,CAC5C,OAAyB,EACf,EAAE;IACZ,OAAO,IAAA,uBAAe,EAAC,OAAO,CAAC;QAC7B,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC;YACE,gDAAgD;YAChD,qEAAqE,OAAO,CAAC,UAAU,CAAC,YAAY,IAAI,OAAO,CAAC,UAAU,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,MAAM,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,QAAQ,WAAW;SACxM,CAAC;AACR,CAAC,CAAC;AATW,QAAA,8BAA8B,kCASzC"}