@catladder/cli 0.0.0-main-46c5c159 → 0.0.0-main-7971bbe7

package/dist/bundles/catenv/index.js

@@ -2530,7 +2530,7 @@ var RUNNER_BUILD_VARIABLES = {
     KUBERNETES_MEMORY_LIMIT: "4Gi",
 };
 var createCustomBuildJobs = function (context) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c;
     var buildConfig = context.build.config;
     if (!(0, types_1.isOfBuildType)(buildConfig, "custom")) {
         throw new Error("deploy config is not custom");
@@ -2555,7 +2555,7 @@ var createCustomBuildJobs = function (context) {
             }
             : undefined,
         dockerBuild: {
-            script: (0, docker_1.getDockerBuildDefaultScript)(context, ((_d = buildConfig.docker) === null || _d === void 0 ? void 0 : _d.type) === "nginx" ? "ensureNginxDockerfile" : ""),
+            script: (0, docker_1.getDockerBuildScriptWithBuiltInDockerFile)(context),
             variables: {},
         },
     });
@@ -2747,15 +2747,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.hasDockerfile = exports.getDockerBuildDefaultScript = exports.gitlabDockerLogin = exports.createDockerBuildJobBase = exports.getDockerJobBaseProps = exports.DOCKER_BUILD_JOB_NAME = exports.getDockerBuildVariables = exports.requiresDockerBuild = exports.getDockerImageVariables = void 0;
-var lodash_1 = __nccwpck_require__(3255);
-var deploy_1 = __nccwpck_require__(8483);
-var runner_1 = __nccwpck_require__(4058);
+exports.hasDockerfile = exports.getDockerBuildDefaultScript = exports.getDockerBuildScriptWithBuiltInDockerFile = exports.gitlabDockerLogin = exports.createDockerBuildJobBase = exports.getDockerJobBaseProps = exports.DOCKER_BUILD_JOB_NAME = exports.getDockerBuildVariables = exports.requiresDockerBuild = exports.getDockerImageVariables = void 0;
 var fs_1 = __nccwpck_require__(7147);
+var lodash_1 = __nccwpck_require__(3255);
 var path_1 = __importDefault(__nccwpck_require__(1017));
-var gitlab_1 = __nccwpck_require__(8490);
+var deploy_1 = __nccwpck_require__(8483);
 var artifactsRegistry_1 = __nccwpck_require__(4963);
 var gcloudServiceAccountLoginCommands_1 = __nccwpck_require__(6320);
+var runner_1 = __nccwpck_require__(4058);
+var gitlab_1 = __nccwpck_require__(8490);
 var DOCKER_BUILD_RUNNER_REQUESTS = {
     KUBERNETES_CPU_REQUEST: "0.5",
     KUBERNETES_MEMORY_REQUEST: "1Gi",
@@ -2797,9 +2797,23 @@ var getDockerBuildRunnerVariables = function () { return ({
     DOCKER_DRIVER: "overlay2",
     DOCKER_BUILDKIT: "1", // see https://docs.docker.com/develop/develop-images/build_enhancements/
 }); };
+var getDockerAdditions = function (build) {
+    var _a, _b;
+    if (!("docker" in build))
+        return {};
+    if (!build.docker)
+        return {};
+    return {
+        DOCKERFILE_ADDITIONS: "additionsBegin" in build.docker
+            ? (_a = build.docker.additionsBegin) === null || _a === void 0 ? void 0 : _a.join("\n")
+            : undefined,
+        DOCKERFILE_ADDITIONS_END: "additionsEnd" in build.docker
+            ? (_b = build.docker.additionsEnd) === null || _b === void 0 ? void 0 : _b.join("\n")
+            : undefined,
+    };
+};
 var getDockerBuildVariables = function (context) {
-    var _a, _b, _c, _d;
-    return __assign({ DOCKERFILE_ADDITIONS: (_b = (_a = context.build.config.docker) === null || _a === void 0 ? void 0 : _a.additionsBegin) === null || _b === void 0 ? void 0 : _b.join("\n"), DOCKERFILE_ADDITIONS_END: (_d = (_c = context.build.config.docker) === null || _c === void 0 ? void 0 : _c.additionsEnd) === null || _d === void 0 ? void 0 : _d.join("\n"), APP_DIR: context.build.dir, DOCKER_DIR: "." }, (0, exports.getDockerImageVariables)(context));
+    return __assign(__assign(__assign({}, getDockerAdditions(context.build.config)), { APP_DIR: context.build.dir, DOCKER_DIR: "." }), (0, exports.getDockerImageVariables)(context));
 };
 exports.getDockerBuildVariables = getDockerBuildVariables;
 exports.DOCKER_BUILD_JOB_NAME = "🔨 docker";
@@ -2834,9 +2848,25 @@ var gitlabDockerLogin = function (context) {
     ];
 };
 exports.gitlabDockerLogin = gitlabDockerLogin;
+var BUILT_IN_ENSURE_DOCKERFILE_SCRIPTS = {
+    meteor: "ensureMeteorDockerfile",
+    node: "ensureNodeDockerfile",
+    nginx: "ensureNginxDockerfile",
+    custom: null,
+};
+var getDockerBuildScriptWithBuiltInDockerFile = function (context, defaultType) {
+    var _a;
+    var type = "docker" in context.componentConfig.build &&
+        context.componentConfig.build.docker &&
+        "type" in context.componentConfig.build.docker
+        ? (_a = context.componentConfig.build.docker) === null || _a === void 0 ? void 0 : _a.type
+        : defaultType;
+    return (0, exports.getDockerBuildDefaultScript)(context, type ? BUILT_IN_ENSURE_DOCKERFILE_SCRIPTS[type] : null);
+};
+exports.getDockerBuildScriptWithBuiltInDockerFile = getDockerBuildScriptWithBuiltInDockerFile;
 var getDockerBuildDefaultScript = function (context, ensureDockerFileScript) {
     return __spreadArray(__spreadArray(__spreadArray([
-        ensureDockerFileScript
+        ensureDockerFileScript !== null && ensureDockerFileScript !== void 0 ? ensureDockerFileScript : undefined
     ], __read((0, gitlab_1.collapseableSection)("docker-login", "Docker Login")((0, exports.gitlabDockerLogin)(context))), false), __read((0, gitlab_1.collapseableSection)("docker-build", "Docker build")([
         "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile . --build-arg BUILDKIT_INLINE_CACHE=1", //BUILDKIT_INLINE_CACHE,  see https://testdriven.io/blog/faster-ci-builds-with-docker-cache/
     ])), false), __read((0, gitlab_1.collapseableSection)("docker-push", "Docker push and tag")([
@@ -3001,9 +3031,9 @@ var createNodeBuildJobs = function (context) {
             }
             : undefined,
         dockerBuild: {
-            script: (0, docker_1.getDockerBuildDefaultScript)(context, buildConfig.type === "node-static" || buildConfig.type === "storybook"
-                ? "ensureNginxDockerfile"
-                : "ensureNodeDockerfile"),
+            script: (0, docker_1.getDockerBuildScriptWithBuiltInDockerFile)(context, buildConfig.type === "node-static" || buildConfig.type === "storybook"
+                ? "nginx"
+                : "node"),
             cache: __spreadArray([], __read((0, cache_1.getYarnCache)(context.build, "pull")), false),
             variables: {
                 // only required for non static
@@ -3264,7 +3294,7 @@ var createMeteorBuildJobs = function (context) {
             }
             : undefined,
         dockerBuild: {
-            script: (0, docker_1.getDockerBuildDefaultScript)(context, "ensureMeteorDockerfile"),
+            script: (0, docker_1.getDockerBuildScriptWithBuiltInDockerFile)(context, "meteor"),
             variables: {
                 METEOR_INSTALL_SCRIPTS: buildConfig.installScripts ? "true" : "",
             },
@@ -5678,7 +5708,7 @@ var gcloudSchedulerCmd = function (version) {
 exports.gcloudSchedulerCmd = gcloudSchedulerCmd;
 var setGoogleProjectNumberScript = function (deployConfig) { return [
     "export GCLOUD_PROJECT_NUMBER=$(".concat((0, exports.gcloudCmd)(), " projects describe ").concat(deployConfig.projectId, " --format=\"value(projectNumber)\")"),
-    "echo \"GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER\"",
+    'echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"',
 ]; };
 exports.setGoogleProjectNumberScript = setGoogleProjectNumberScript;
 var makeLabelString = function (obj) {
@@ -7176,7 +7206,7 @@ var getDependencyTrackUploadScript = function (context) {
     return (0, exports.sbomDeactivated)(context)
         ? []
         : [
-            "echo Uploading SBOM to Dependency Track",
+            "echo 'Uploading SBOM to Dependency Track'",
             "/dtrackuploader https://dep.panter.swiss/ \"$DT_KEY_PROD\" upload \"".concat(context.fullConfig.customerName, "-").concat(context.fullConfig.appName, "/").concat(context.componentName, "\" \"").concat(context.environment.url, "\" \"").concat(sbom_1.SBOM_FILE, "\" vex.json || true"),
         ];
 };
@@ -7185,7 +7215,7 @@ var getDependencyTrackDeleteScript = function (context) {
     return (0, exports.sbomDeactivated)(context)
         ? []
         : [
-            "echo Disabling component in Dependency Track",
+            "echo 'Disabling component in Dependency Track'",
             "/dtrackuploader https://dep.panter.swiss/ \"$DT_KEY_PROD\" disable \"".concat(context.fullConfig.customerName, "-").concat(context.fullConfig.appName, "/").concat(context.componentName, "\" \"").concat(context.environment.url, "\" || true"),
         ];
 };
@@ -7892,15 +7922,32 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
+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;
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.generatePipelineFiles = void 0;
 var writeFiles_1 = __nccwpck_require__(2228);
 var createChildPipeline_1 = __nccwpck_require__(5139);
 var createMainPipeline_1 = __nccwpck_require__(9192);
 var getPipelineTriggerForGitlabChildPipeline_1 = __nccwpck_require__(7426);
+var sortGitLabJobDefProps_1 = __nccwpck_require__(2361);
 function generatePipelineFiles(config, pipelineType, mode) {
     return __awaiter(this, void 0, void 0, function () {
-        var trigger, _a, jobs, image, stages, variables, workflow, mainPipeline, _b, jobs, image, stages, variables, workflow, mainPipeline;
+        var trigger, _a, jobs, image, stages, variables, workflow, pipelineRest, jobsWithSortedProps, _b, jobs, image, stages, variables, workflow, pipelineRest, jobsWithSortedProps;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
@@ -7908,20 +7955,30 @@ function generatePipelineFiles(config, pipelineType, mode) {
                     trigger = (0, getPipelineTriggerForGitlabChildPipeline_1.getPipelineTriggerForGitlabChildPipeline)();
                     return [4 /*yield*/, (0, createChildPipeline_1.createChildPipeline)(pipelineType, trigger, config)];
                 case 1:
-                    _a = _c.sent(), jobs = _a.jobs, image = _a.image, stages = _a.stages, variables = _a.variables, workflow = _a.workflow, mainPipeline = __rest(_a, ["jobs", "image", "stages", "variables", "workflow"]);
-                    // need to spread out the jobs, forgot why
-                    return [4 /*yield*/, (0, writeFiles_1.writeYamlfile)("__pipeline.yml", __assign(__assign({ image: image, stages: stages, variables: variables, workflow: workflow }, mainPipeline), jobs))];
+                    _a = _c.sent(), jobs = _a.jobs, image = _a.image, stages = _a.stages, variables = _a.variables, workflow = _a.workflow, pipelineRest = __rest(_a, ["jobs", "image", "stages", "variables", "workflow"]);
+                    jobsWithSortedProps = Object.fromEntries(Object.entries(jobs).map(function (_a) {
+                        var _b = __read(_a, 2), jobName = _b[0], job = _b[1];
+                        return [
+                            jobName,
+                            (0, sortGitLabJobDefProps_1.sortGitLabJobDefProps)(job),
+                        ];
+                    }));
+                    return [4 /*yield*/, (0, writeFiles_1.writeYamlfile)("__pipeline.yml", __assign(__assign({ image: image, stages: stages, variables: variables, workflow: workflow }, pipelineRest), jobsWithSortedProps))];
                 case 2:
-                    // need to spread out the jobs, forgot why
                     _c.sent();
                     return [3 /*break*/, 6];
                 case 3: return [4 /*yield*/, (0, createMainPipeline_1.createMainPipeline)(pipelineType, config)];
                 case 4:
-                    _b = _c.sent(), jobs = _b.jobs, image = _b.image, stages = _b.stages, variables = _b.variables, workflow = _b.workflow, mainPipeline = __rest(_b, ["jobs", "image", "stages", "variables", "workflow"]);
-                    // need to spread out the jobs, forgot why
-                    return [4 /*yield*/, (0, writeFiles_1.writeYamlfile)(".gitlab-ci.yml", __assign(__assign({ image: image, stages: stages, variables: variables, workflow: workflow }, mainPipeline), jobs))];
+                    _b = _c.sent(), jobs = _b.jobs, image = _b.image, stages = _b.stages, variables = _b.variables, workflow = _b.workflow, pipelineRest = __rest(_b, ["jobs", "image", "stages", "variables", "workflow"]);
+                    jobsWithSortedProps = Object.fromEntries(Object.entries(jobs).map(function (_a) {
+                        var _b = __read(_a, 2), jobName = _b[0], job = _b[1];
+                        return [
+                            jobName,
+                            (0, sortGitLabJobDefProps_1.sortGitLabJobDefProps)(job),
+                        ];
+                    }));
+                    return [4 /*yield*/, (0, writeFiles_1.writeYamlfile)(".gitlab-ci.yml", __assign(__assign({ image: image, stages: stages, variables: variables, workflow: workflow }, pipelineRest), jobsWithSortedProps))];
                 case 5:
-                    // need to spread out the jobs, forgot why
                     _c.sent();
                     _c.label = 6;
                 case 6: return [2 /*return*/];
@@ -8081,13 +8138,8 @@ var getInjectVarsScript_1 = __nccwpck_require__(8133);
 var defaults_1 = __nccwpck_require__(6484);
 var utils_1 = __nccwpck_require__(2497);
 var gitlab_1 = __nccwpck_require__(8490);
+var removeUndefined_1 = __nccwpck_require__(1073);
 exports.GITLAB_ENVIRONMENT_URL_VARIABLE = "CL_GITLAB_ENVIRONMENT_URL";
-var removeUndefined = function (obj) {
-    return Object.fromEntries(Object.entries(obj).filter(function (_a) {
-        var _b = __read(_a, 2), value = _b[1];
-        return value !== undefined;
-    }));
-};
 var getFullJobName = function (name, componentName, env) {
     if (env) {
         return "".concat(componentName, " ").concat(name, " | ").concat(env, " ");
@@ -8165,8 +8217,7 @@ var makeGitlabJob = function (componentName, env, _a, allJobs, baseRules) {
     var modified = addGitlabEnvironment(context, environment, __assign(__assign({}, job), { rules: rules.length > 0 ? rules : undefined, variables: __assign(__assign({}, legacyRunnerVariables), runnerVariables), script: __spreadArray(__spreadArray([], __read(varsInjectScripts), false), __read(((_c = script === null || script === void 0 ? void 0 : script.filter(utils_1.notNil)) !== null && _c !== void 0 ? _c : [])), false), tags: jobTags, stage: stage, 
         // sort in a predictable manner for snapshot tests
         needs: deduplicatedGitlabNeeds, retry: defaults_1.BASE_RETRY, interruptible: true }), componentName, env, allJobs);
-    var gitlabJob = removeUndefined(modified);
-    return [fullJobName, gitlabJob];
+    return [fullJobName, (0, removeUndefined_1.removeUndefined)(modified)];
 };
 exports.makeGitlabJob = makeGitlabJob;
 var addGitlabEnvironment = function (context, environment, job, componentName, env, // TODO: we could actually pull this from contxt
@@ -8330,6 +8381,72 @@ exports.getGitlabReleaseJobs = getGitlabReleaseJobs;
 
 /***/ }),
 
+/***/ 2361:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.sortGitLabJobDefProps = void 0;
+/**
+ * The desired order of GitLab job definition keys.
+ */
+var jobDefOrder = [
+    "stage",
+    "tags",
+    "image",
+    "services",
+    "variables",
+    "before_script",
+    "script",
+    "after_script",
+    "cache",
+    "coverage",
+    "environment",
+    "release",
+    "artifacts",
+    "rules",
+    "only",
+    "except",
+    "needs",
+    "dependencies",
+    "trigger",
+    "retry",
+    "interruptible",
+    "allow_failure",
+    "parallel",
+    "hooks",
+    "resource_group",
+];
+var sortGitLabJobDefKeys = function (jobDef) {
+    return Object.keys(jobDef).sort(function (a, b) {
+        return jobDefOrder.indexOf(a) === -1 && jobDefOrder.indexOf(b) === -1
+            ? 0
+            : jobDefOrder.indexOf(a) === -1
+                ? 1
+                : jobDefOrder.indexOf(b) === -1
+                    ? -1
+                    : jobDefOrder.indexOf(a) - jobDefOrder.indexOf(b);
+    });
+};
+/**
+ * Sorts the properties of a GitLab job definition based on the desired order.
+ *
+ * This is only useful when generating a GitLab pipeline YAML file.
+ */
+var sortGitLabJobDefProps = function (jobDef) {
+    return sortGitLabJobDefKeys(jobDef).reduce(function (acc, key) {
+        var _a;
+        return jobDef[key] !== undefined
+            ? Object.assign(acc, (_a = {}, _a[key] = jobDef[key], _a))
+            : acc;
+    }, {});
+};
+exports.sortGitLabJobDefProps = sortGitLabJobDefProps;
+//# sourceMappingURL=sortGitLabJobDefProps.js.map
+
+/***/ }),
+
 /***/ 7752:
 /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
 
@@ -8984,6 +9101,40 @@ exports.mergeWithMergingArrays = mergeWithMergingArrays;
 
 /***/ }),
 
+/***/ 1073:
+/***/ (function(__unused_webpack_module, exports) {
+
+"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;
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.removeUndefined = void 0;
+var removeUndefined = function (obj) {
+    return Object.fromEntries(Object.entries(obj).filter(function (_a) {
+        var _b = __read(_a, 2), value = _b[1];
+        return value !== undefined;
+    }));
+};
+exports.removeUndefined = removeUndefined;
+//# sourceMappingURL=removeUndefined.js.map
+
+/***/ }),
+
 /***/ 2228:
 /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {