@catladder/cli 3.46.0 → 3.46.2

package/dist/pipeline/src/build/node/yarn.js

@@ -1,5 +1,8 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.getDockerAppCopyAndBuildScript = exports.getYarnInstall = exports.ensureNodeVersion = void 0;
 const BashExpression_1 = require("../../bash/BashExpression");
 const utils_1 = require("../../utils");
@@ -8,60 +11,39 @@ const YARN_INSTALL_CLASSIC = `yarn install --frozen-lockfile`;
 const YARN_BERRY_PROD_INSTALL = `yarn workspaces focus --production`;
 // FIXME: check why and when rebuild is needed
 const YARN_BERRY_PROD_REBUILD = `yarn rebuild`;
-const getYarnInstallCommand = (context) => {
-    if (context.packageManagerInfo.isClassic) {
-        return YARN_INSTALL_CLASSIC;
-    }
-    // inline builds make debugging easier as it prints it out in the logs, instead of writing it in temp files
-    return `yarn install --immutable --inline-builds`;
+const getYarnInstallCommand = context => {
+  if (context.packageManagerInfo.isClassic) {
+    return YARN_INSTALL_CLASSIC;
+  }
+  // inline builds make debugging easier as it prints it out in the logs, instead of writing it in temp files
+  return `yarn install --immutable --inline-builds`;
 };
-const ensureNodeVersion = (context) => (0, gitlab_1.collapseableSection)("nodeinstall", "Ensure node version")([
-    "if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi",
-    "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
-]);
+const ensureNodeVersion = context => (0, gitlab_1.collapseableSection)("nodeinstall", "Ensure node version")(["if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi", "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi"]);
 exports.ensureNodeVersion = ensureNodeVersion;
 const getYarnInstall = (context, options) => {
-    const postInstall = context.type !== "workspace" &&
-        context.build.type !== "disabled" &&
-        "postInstall" in context.build.config
-        ? context.build.config.postInstall
-        : null;
-    return [
-        ...(0, exports.ensureNodeVersion)(context),
-        ...(0, gitlab_1.collapseableSection)("yarninstall", "Yarn install")([getYarnInstallCommand(context)]),
-        ...(postInstall && !(options === null || options === void 0 ? void 0 : options.noCustomPostInstall)
-            ? (0, gitlab_1.collapseableSection)("postinstall", "Custom post install")((0, utils_1.ensureArray)(postInstall))
-            : []),
-    ];
+  const postInstall = context.type !== "workspace" && context.build.type !== "disabled" && "postInstall" in context.build.config ? context.build.config.postInstall : null;
+  return [...(0, exports.ensureNodeVersion)(context), ...(0, gitlab_1.collapseableSection)("yarninstall", "Yarn install")([getYarnInstallCommand(context)]), ...(postInstall && !(options === null || options === void 0 ? void 0 : options.noCustomPostInstall) ? (0, gitlab_1.collapseableSection)("postinstall", "Custom post install")((0, utils_1.ensureArray)(postInstall)) : [])];
 };
 exports.getYarnInstall = getYarnInstall;
 const DOCKER_COPY_FILES = `COPY --chown=node:node $APP_DIR .`;
-const getDockerAppCopyAndBuildScript = (context) => {
-    var _a, _b, _c;
-    if (context.packageManagerInfo.isClassic) {
-        return new BashExpression_1.BashExpression(`
+const getDockerAppCopyAndBuildScript = context => {
+  var _a, _b, _c;
+  if (context.packageManagerInfo.isClassic) {
+    return new BashExpression_1.BashExpression(`
 RUN ${YARN_INSTALL_CLASSIC} --production --ignore-scripts
 ${DOCKER_COPY_FILES}
 RUN ${YARN_INSTALL_CLASSIC} --production 
     `.trim());
-    }
-    const yarnRebuildEnabledDefault = context.build.type === "fromWorkspace"
-        ? ((_b = (_a = context.build.workspaceBuildConfig.dockerDefaults) === null || _a === void 0 ? void 0 : _a.yarnRebuildEnabled) !== null && _b !== void 0 ? _b : true)
-        : true;
-    const yarnRebuildEnabled = "docker" in context.build.config &&
-        context.build.config.docker &&
-        "yarnRebuildEnabled" in context.build.config.docker
-        ? ((_c = context.build.config.docker.yarnRebuildEnabled) !== null && _c !== void 0 ? _c : yarnRebuildEnabledDefault)
-        : yarnRebuildEnabledDefault;
-    // yarn >= 4 ships with build in plugins, see https://github.com/yarnpkg/berry/pull/4253
-    // trying to import those fail on this version
-    const doesNotShipWithBuiltInPlugins = ["2", "3"].some((v) => context.packageManagerInfo.version.startsWith(v));
-    const maybeAddWorkspaceToolsCommand = doesNotShipWithBuiltInPlugins
-        ? "RUN yarn plugin import workspace-tools"
-        : "";
-    // copy first everything and then install
-    // rebuild first does not work as it will run postinstall and that might require files in the app
-    return new BashExpression_1.BashExpression(`
+  }
+  const yarnRebuildEnabledDefault = context.build.type === "fromWorkspace" ? (_b = (_a = context.build.workspaceBuildConfig.dockerDefaults) === null || _a === void 0 ? void 0 : _a.yarnRebuildEnabled) !== null && _b !== void 0 ? _b : true : true;
+  const yarnRebuildEnabled = "docker" in context.build.config && context.build.config.docker && "yarnRebuildEnabled" in context.build.config.docker ? (_c = context.build.config.docker.yarnRebuildEnabled) !== null && _c !== void 0 ? _c : yarnRebuildEnabledDefault : yarnRebuildEnabledDefault;
+  // yarn >= 4 ships with build in plugins, see https://github.com/yarnpkg/berry/pull/4253
+  // trying to import those fail on this version
+  const doesNotShipWithBuiltInPlugins = ["2", "3"].some(v => context.packageManagerInfo.version.startsWith(v));
+  const maybeAddWorkspaceToolsCommand = doesNotShipWithBuiltInPlugins ? "RUN yarn plugin import workspace-tools" : "";
+  // copy first everything and then install
+  // rebuild first does not work as it will run postinstall and that might require files in the app
+  return new BashExpression_1.BashExpression(`
     ENV YARN_ENABLE_INLINE_BUILDS=1
 ${DOCKER_COPY_FILES}
 ${maybeAddWorkspaceToolsCommand}
@@ -70,5 +52,4 @@ ${yarnRebuildEnabled ? `RUN ${YARN_BERRY_PROD_REBUILD}` : ""}
 
     `.trim());
 };
-exports.getDockerAppCopyAndBuildScript = getDockerAppCopyAndBuildScript;
-//# sourceMappingURL=yarn.js.map
+exports.getDockerAppCopyAndBuildScript = getDockerAppCopyAndBuildScript;

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

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

package/dist/pipeline/src/build/rails/build.js

@@ -1,53 +1,46 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.createRailsBuildJobs = void 0;
 const __1 = require("../..");
 const base_1 = require("../base");
 const docker_1 = require("../docker");
 const types_1 = require("../types");
-const createRailsBuildJobs = (context) => {
-    var _a, _b, _c;
-    const buildConfig = context.build.config;
-    if (!(0, types_1.isOfBuildType)(buildConfig, "rails")) {
-        // should not happen
-        throw new Error("build type is not rails");
-    }
-    // if its not a standalone build, we don't need to run tests
-    if (!(0, __1.componentContextIsStandaloneBuild)(context)) {
-        throw new Error("workspace builds are not supported for rails apps");
-    }
-    if ((0, docker_1.hasDockerfile)(context)) {
-        return (0, base_1.createComponentBuildJobs)(context, {
-            appBuild: undefined,
-            dockerBuild: {
-                script: (0, docker_1.getDockerBuildDefaultScript)(context),
-                variables: {},
-            },
-        });
-    }
-    const cnbConf = buildConfig.cnbBuilder;
-    const packEnvArgs = Object.entries((_a = cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.buildVars) !== null && _a !== void 0 ? _a : {})
-        .map(([k, v]) => `--env '${k}${v ? `=${v}` : ""}'`)
-        .join(" ");
+const createRailsBuildJobs = context => {
+  var _a, _b, _c;
+  const buildConfig = context.build.config;
+  if (!(0, types_1.isOfBuildType)(buildConfig, "rails")) {
+    // should not happen
+    throw new Error("build type is not rails");
+  }
+  // if its not a standalone build, we don't need to run tests
+  if (!(0, __1.componentContextIsStandaloneBuild)(context)) {
+    throw new Error("workspace builds are not supported for rails apps");
+  }
+  if ((0, docker_1.hasDockerfile)(context)) {
     return (0, base_1.createComponentBuildJobs)(context, {
-        appBuild: undefined,
-        dockerBuild: {
-            variables: {
-                ...context.environment.jobOnlyVars.build.envVars,
-            },
-            // custom script
-            script: [
-                ...(0, docker_1.gitlabDockerLogin)(context),
-                `cd ${context.build.dir}`,
-                `wget --output-document=- https://github.com/buildpacks/pack/releases/download/v${cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packVersion}/pack-v${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 config registry-mirrors add index.docker.io --mirror mirror.gcr.io`,
-                `pack build "$DOCKER_IMAGE:$DOCKER_IMAGE_TAG" --builder '${cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.image}' --publish --cache-image "$DOCKER_CACHE_IMAGE" ${packEnvArgs} ${(_c = (_b = cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packExtraArgs) === null || _b === void 0 ? void 0 : _b.join(" ")) !== null && _c !== void 0 ? _c : ""}`,
-            ],
-        },
+      appBuild: undefined,
+      dockerBuild: {
+        script: (0, docker_1.getDockerBuildDefaultScript)(context),
+        variables: {}
+      }
     });
+  }
+  const cnbConf = buildConfig.cnbBuilder;
+  const packEnvArgs = Object.entries((_a = cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.buildVars) !== null && _a !== void 0 ? _a : {}).map(([k, v]) => `--env '${k}${v ? `=${v}` : ""}'`).join(" ");
+  return (0, base_1.createComponentBuildJobs)(context, {
+    appBuild: undefined,
+    dockerBuild: {
+      variables: {
+        ...context.environment.jobOnlyVars.build.envVars
+      },
+      // custom script
+      script: [...(0, docker_1.gitlabDockerLogin)(context), `cd ${context.build.dir}`, `wget --output-document=- https://github.com/buildpacks/pack/releases/download/v${cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packVersion}/pack-v${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 config registry-mirrors add index.docker.io --mirror mirror.gcr.io`, `pack build "$DOCKER_IMAGE:$DOCKER_IMAGE_TAG" --builder '${cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.image}' --publish --cache-image "$DOCKER_CACHE_IMAGE" ${packEnvArgs} ${(_c = (_b = cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packExtraArgs) === null || _b === void 0 ? void 0 : _b.join(" ")) !== null && _c !== void 0 ? _c : ""}`]
+    }
+  });
 };
-exports.createRailsBuildJobs = createRailsBuildJobs;
-//# sourceMappingURL=build.js.map
+exports.createRailsBuildJobs = createRailsBuildJobs;

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

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

package/dist/pipeline/src/build/rails/index.js

@@ -1,10 +1,12 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.createRailsJobs = void 0;
 const build_1 = require("./build");
 const testJob_1 = require("./testJob");
-const createRailsJobs = (context) => {
-    return [...(0, testJob_1.createRailsTestJobs)(context), ...(0, build_1.createRailsBuildJobs)(context)];
+const createRailsJobs = context => {
+  return [...(0, testJob_1.createRailsTestJobs)(context), ...(0, build_1.createRailsBuildJobs)(context)];
 };
-exports.createRailsJobs = createRailsJobs;
-//# sourceMappingURL=index.js.map
+exports.createRailsJobs = createRailsJobs;

package/dist/pipeline/src/build/rails/testJob.d.ts

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

package/dist/pipeline/src/build/rails/testJob.js

@@ -1,106 +1,76 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.createRailsTestJobs = void 0;
 const __1 = require("../..");
 const utils_1 = require("../../utils");
-const createRailsTestJobs = (context) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w;
-    // don't run tests after release
-    // TODO: this will be replaced by using rules
-    if (context.trigger === "taggedRelease") {
-        return [];
-    }
-    // if its not a standalone build, we don't need to run tests
-    if (!(0, __1.componentContextIsStandaloneBuild)(context)) {
-        return [];
-    }
-    const buildConfig = context.build.config;
-    const base = {
-        variables: {
-            ...context.environment.jobOnlyVars.build.envVars,
-        },
-        stage: "test",
-        needs: [],
-    };
-    const defaultImage = "docker.io/ruby";
-    const bundlerCacheDir = "tmp/cache";
-    const bundlerInstall = [
-        `bundle config set path '${bundlerCacheDir}'`,
-        "bundle install -j $(nproc)",
-    ];
-    const bundlerCache = {
-        key: {
-            files: ["Gemfile.lock"],
-            prefix: "$CI_JOB_IMAGE", // a changed image might have different OS libraries which no longer work with the cached gems
-        },
-        paths: [bundlerCacheDir],
-    };
-    const auditJob = buildConfig.audit !== false
-        ? {
-            name: "🛡 audit",
-            ...base,
-            cache: undefined, // audit does not need bundle install and no cache
-            image: (_c = (_b = (_a = buildConfig.audit) === null || _a === void 0 ? void 0 : _a.jobImage) !== null && _b !== void 0 ? _b : buildConfig.jobImage) !== null && _c !== void 0 ? _c : defaultImage,
-            script: [
-                `cd ${context.build.dir}`,
-                ...((_e = (0, utils_1.ensureArrayOrNull)((_d = buildConfig.audit) === null || _d === void 0 ? void 0 : _d.command)) !== null && _e !== void 0 ? _e : [
-                    "gem install bundler-audit",
-                    "bundle audit check",
-                ]),
-            ],
-            allow_failure: (_g = (_f = buildConfig.audit) === null || _f === void 0 ? void 0 : _f.allowFailure) !== null && _g !== void 0 ? _g : true,
-        }
-        : null;
-    const lintJob = buildConfig.lint !== false
-        ? {
-            name: "👮 lint",
-            ...base,
-            cache: bundlerCache,
-            image: (_k = (_j = (_h = buildConfig.lint) === null || _h === void 0 ? void 0 : _h.jobImage) !== null && _j !== void 0 ? _j : buildConfig.jobImage) !== null && _k !== void 0 ? _k : defaultImage,
-            script: [
-                `cd ${context.build.dir}`,
-                ...bundlerInstall,
-                ...((_m = (0, utils_1.ensureArrayOrNull)((_l = buildConfig.lint) === null || _l === void 0 ? void 0 : _l.command)) !== null && _m !== void 0 ? _m : [
-                    "bundle exec rubocop",
-                ]),
-            ],
-            allow_failure: (_o = buildConfig.lint) === null || _o === void 0 ? void 0 : _o.allowFailure,
-        }
-        : null;
-    const testJob = buildConfig.test !== false
-        ? {
-            name: "🧪 test",
-            ...base,
-            cache: bundlerCache,
-            image: (_r = (_q = (_p = buildConfig.test) === null || _p === void 0 ? void 0 : _p.jobImage) !== null && _q !== void 0 ? _q : buildConfig.jobImage) !== null && _r !== void 0 ? _r : defaultImage,
-            script: [
-                `cd ${context.build.dir}`,
-                ...bundlerInstall,
-                ...((_t = (0, utils_1.ensureArrayOrNull)((_s = buildConfig.test) === null || _s === void 0 ? void 0 : _s.command)) !== null && _t !== void 0 ? _t : [
-                    "bundle exec rake db:test:prepare",
-                    "bundle exec rake assets:precompile assets:clean",
-                    "bundle exec rspec",
-                ]),
-            ],
-            allow_failure: (_u = buildConfig.test) === null || _u === void 0 ? void 0 : _u.allowFailure,
-            runnerVariables: {
-                RAILS_ENV: "test",
-                DATABASE_URL: "postgresql://postgres@database",
-            },
-            services: [
-                {
-                    name: buildConfig.test && "databaseImage" in buildConfig.test
-                        ? ((_w = (_v = buildConfig === null || buildConfig === void 0 ? void 0 : buildConfig.test) === null || _v === void 0 ? void 0 : _v.databaseImage) !== null && _w !== void 0 ? _w : "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);
+const createRailsTestJobs = context => {
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w;
+  // don't run tests after release
+  // TODO: this will be replaced by using rules
+  if (context.trigger === "taggedRelease") {
+    return [];
+  }
+  // if its not a standalone build, we don't need to run tests
+  if (!(0, __1.componentContextIsStandaloneBuild)(context)) {
+    return [];
+  }
+  const buildConfig = context.build.config;
+  const base = {
+    variables: {
+      ...context.environment.jobOnlyVars.build.envVars
+    },
+    stage: "test",
+    needs: []
+  };
+  const defaultImage = "docker.io/ruby";
+  const bundlerCacheDir = "tmp/cache";
+  const bundlerInstall = [`bundle config set path '${bundlerCacheDir}'`, "bundle install -j $(nproc)"];
+  const bundlerCache = {
+    key: {
+      files: ["Gemfile.lock"],
+      prefix: "$CI_JOB_IMAGE" // a changed image might have different OS libraries which no longer work with the cached gems
+    },
+    paths: [bundlerCacheDir]
+  };
+  const auditJob = buildConfig.audit !== false ? {
+    name: "🛡 audit",
+    ...base,
+    cache: undefined,
+    // audit does not need bundle install and no cache
+    image: (_c = (_b = (_a = buildConfig.audit) === null || _a === void 0 ? void 0 : _a.jobImage) !== null && _b !== void 0 ? _b : buildConfig.jobImage) !== null && _c !== void 0 ? _c : defaultImage,
+    script: [`cd ${context.build.dir}`, ...((_e = (0, utils_1.ensureArrayOrNull)((_d = buildConfig.audit) === null || _d === void 0 ? void 0 : _d.command)) !== null && _e !== void 0 ? _e : ["gem install bundler-audit", "bundle audit check"])],
+    allow_failure: (_g = (_f = buildConfig.audit) === null || _f === void 0 ? void 0 : _f.allowFailure) !== null && _g !== void 0 ? _g : true
+  } : null;
+  const lintJob = buildConfig.lint !== false ? {
+    name: "👮 lint",
+    ...base,
+    cache: bundlerCache,
+    image: (_k = (_j = (_h = buildConfig.lint) === null || _h === void 0 ? void 0 : _h.jobImage) !== null && _j !== void 0 ? _j : buildConfig.jobImage) !== null && _k !== void 0 ? _k : defaultImage,
+    script: [`cd ${context.build.dir}`, ...bundlerInstall, ...((_m = (0, utils_1.ensureArrayOrNull)((_l = buildConfig.lint) === null || _l === void 0 ? void 0 : _l.command)) !== null && _m !== void 0 ? _m : ["bundle exec rubocop"])],
+    allow_failure: (_o = buildConfig.lint) === null || _o === void 0 ? void 0 : _o.allowFailure
+  } : null;
+  const testJob = buildConfig.test !== false ? {
+    name: "🧪 test",
+    ...base,
+    cache: bundlerCache,
+    image: (_r = (_q = (_p = buildConfig.test) === null || _p === void 0 ? void 0 : _p.jobImage) !== null && _q !== void 0 ? _q : buildConfig.jobImage) !== null && _r !== void 0 ? _r : defaultImage,
+    script: [`cd ${context.build.dir}`, ...bundlerInstall, ...((_t = (0, utils_1.ensureArrayOrNull)((_s = buildConfig.test) === null || _s === void 0 ? void 0 : _s.command)) !== null && _t !== void 0 ? _t : ["bundle exec rake db:test:prepare", "bundle exec rake assets:precompile assets:clean", "bundle exec rspec"])],
+    allow_failure: (_u = buildConfig.test) === null || _u === void 0 ? void 0 : _u.allowFailure,
+    runnerVariables: {
+      RAILS_ENV: "test",
+      DATABASE_URL: "postgresql://postgres@database"
+    },
+    services: [{
+      name: buildConfig.test && "databaseImage" in buildConfig.test ? (_w = (_v = buildConfig === null || buildConfig === void 0 ? void 0 : buildConfig.test) === null || _v === void 0 ? void 0 : _v.databaseImage) !== null && _w !== void 0 ? _w : "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);
 };
-exports.createRailsTestJobs = createRailsTestJobs;
-//# sourceMappingURL=testJob.js.map
+exports.createRailsTestJobs = createRailsTestJobs;