@catladder/cli 0.0.0-main-e52d6632 → 0.0.0-main-344735ad

package/dist/apps/cli/verify/migration/oldGitlabCi.js

@@ -23,7 +23,7 @@ var detectBuildConfig = function (gitlabCi) {
         return "meteor";
     }
     if (firstInclude.file === "rails-kubernetes.yml") {
-        throw new Error("rails is not yet implemented");
+        return "rails";
     }
 };
 exports.detectBuildConfig = detectBuildConfig;

package/dist/apps/cli/verify/migration/oldGitlabCi.js.map

@@ -1 +1 @@
-{"version":3,"file":"oldGitlabCi.js","sourceRoot":"","sources":["../../../../../src/apps/cli/verify/migration/oldGitlabCi.ts"],"names":[],"mappings":";;;AAkBO,IAAM,YAAY,GAAG,UAAC,QAAyB;;IACpD,OAAO,CAAA,MAAA,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,0CAAE,OAAO,MAAK,qBAAqB,CAAC;AAChE,CAAC,CAAC;AAFW,QAAA,YAAY,gBAEvB;AAEK,IAAM,iBAAiB,GAAG,UAC/B,QAAyB;IAEzB,IAAI,CAAC,IAAA,oBAAY,EAAC,QAAQ,CAAC,EAAE;QAC3B,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;KAC/C;IAED,IAAM,YAAY,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAEzC,IAAI,YAAY,CAAC,IAAI,KAAK,cAAc;QAAE,OAAO,UAAU,CAAC;IAE5D,IAAI,YAAY,CAAC,IAAI,KAAK,qBAAqB,EAAE;QAC/C,OAAO,MAAM,CAAC;KACf;IAED,IAAI,YAAY,CAAC,IAAI,KAAK,0BAA0B,EAAE;QACpD,OAAO,aAAa,CAAC;KACtB;IACD,IAAI,YAAY,CAAC,IAAI,KAAK,uBAAuB,EAAE;QACjD,OAAO,QAAQ,CAAC;KACjB;IAED,IAAI,YAAY,CAAC,IAAI,KAAK,sBAAsB,EAAE;QAChD,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;KACjD;AACH,CAAC,CAAC;AAzBW,QAAA,iBAAiB,qBAyB5B"}
+{"version":3,"file":"oldGitlabCi.js","sourceRoot":"","sources":["../../../../../src/apps/cli/verify/migration/oldGitlabCi.ts"],"names":[],"mappings":";;;AAkBO,IAAM,YAAY,GAAG,UAAC,QAAyB;;IACpD,OAAO,CAAA,MAAA,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,0CAAE,OAAO,MAAK,qBAAqB,CAAC;AAChE,CAAC,CAAC;AAFW,QAAA,YAAY,gBAEvB;AAEK,IAAM,iBAAiB,GAAG,UAC/B,QAAyB;IAEzB,IAAI,CAAC,IAAA,oBAAY,EAAC,QAAQ,CAAC,EAAE;QAC3B,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;KAC/C;IAED,IAAM,YAAY,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAEzC,IAAI,YAAY,CAAC,IAAI,KAAK,cAAc;QAAE,OAAO,UAAU,CAAC;IAE5D,IAAI,YAAY,CAAC,IAAI,KAAK,qBAAqB,EAAE;QAC/C,OAAO,MAAM,CAAC;KACf;IAED,IAAI,YAAY,CAAC,IAAI,KAAK,0BAA0B,EAAE;QACpD,OAAO,aAAa,CAAC;KACtB;IACD,IAAI,YAAY,CAAC,IAAI,KAAK,uBAAuB,EAAE;QACjD,OAAO,QAAQ,CAAC;KACjB;IAED,IAAI,YAAY,CAAC,IAAI,KAAK,sBAAsB,EAAE;QAChD,OAAO,OAAO,CAAC;KAChB;AACH,CAAC,CAAC;AAzBW,QAAA,iBAAiB,qBAyB5B"}

package/dist/bundles/catenv/index.js

@@ -39193,6 +39193,8 @@ var custom_1 = __nccwpck_require__(3437);
 
 var node_1 = __nccwpck_require__(6994);
 
+var rails_1 = __nccwpck_require__(4665);
+
 __exportStar(__nccwpck_require__(1197), exports);
 
 __exportStar(__nccwpck_require__(6994), exports);
@@ -39236,6 +39238,12 @@ exports.BUILD_TYPES = {
     defaults: function () {
       return {};
     }
+  },
+  rails: {
+    jobs: rails_1.createRailsJobs,
+    defaults: function () {
+      return {};
+    }
   }
 };
 
@@ -39850,6 +39858,220 @@ exports.getYarnInstall = getYarnInstall;
 
 /***/ }),
 
+/***/ 8597:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+
+var __assign = this && this.__assign || function () {
+  __assign = Object.assign || function (t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+      s = arguments[i];
+
+      for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+    }
+
+    return t;
+  };
+
+  return __assign.apply(this, arguments);
+};
+
+exports.__esModule = true;
+exports.createRailsBuildJobs = void 0;
+
+var docker_1 = __nccwpck_require__(3219);
+
+var createRailsBuildJobs = function (context) {
+  return [(0, docker_1.createDockerBuildJobBase)(context, {
+    variables: __assign({
+      CNB_BUILDER: "heroku/buildpacks:18",
+      CNB_ENV_VARS: "BUNDLE_GIT__PANTER__CH",
+      CNB_EXTRA_ARGS: "",
+      CNB_PACK_VERSION: "0.20.0"
+    }, context.componentConfig.build.extraVars),
+    // custom script
+    script: [docker_1.gitlabDockerLogin, "docker pull $DOCKER_CACHE_IMAGE || true", "wget --output-document=- https://github.com/buildpacks/pack/releases/download/v$CNB_PACK_VERSION/pack-v$CNB_PACK_VERSION-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
+    // eslint-disable-next-line no-useless-escape
+    "sed --in-place 's|git@([^:]*):|https://1/|g' Gemfile Gemfile.lock", "for v in $CNB_ENV_VARS; do env_args=\"$env_args --env $v\"; done", "pack build $DOCKER_IMAGE:$DOCKER_IMAGE_TAG --builder $CNB_BUILDER --publish --cache-image $DOCKER_CACHE_IMAGE $env_args $CNB_EXTRA_ARGS"]
+  })];
+};
+
+exports.createRailsBuildJobs = createRailsBuildJobs;
+
+/***/ }),
+
+/***/ 4665:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+
+var __read = this && this.__read || function (o, n) {
+  var m = typeof Symbol === "function" && o[Symbol.iterator];
+  if (!m) return o;
+  var i = m.call(o),
+      r,
+      ar = [],
+      e;
+
+  try {
+    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+  } catch (error) {
+    e = {
+      error: error
+    };
+  } finally {
+    try {
+      if (r && !r.done && (m = i["return"])) m.call(i);
+    } finally {
+      if (e) throw e.error;
+    }
+  }
+
+  return ar;
+};
+
+var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
+  if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+    if (ar || !(i in from)) {
+      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+      ar[i] = from[i];
+    }
+  }
+  return to.concat(ar || Array.prototype.slice.call(from));
+};
+
+exports.__esModule = true;
+exports.createRailsJobs = void 0;
+
+var build_1 = __nccwpck_require__(8597);
+
+var test_1 = __nccwpck_require__(5444);
+
+var createRailsJobs = function (context) {
+  return __spreadArray(__spreadArray([], __read((0, test_1.createRailsTestJobs)(context)), false), __read((0, build_1.createRailsBuildJobs)(context)), false);
+};
+
+exports.createRailsJobs = createRailsJobs;
+
+/***/ }),
+
+/***/ 5444:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+
+var __assign = this && this.__assign || function () {
+  __assign = Object.assign || function (t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+      s = arguments[i];
+
+      for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+    }
+
+    return t;
+  };
+
+  return __assign.apply(this, arguments);
+};
+
+var __read = this && this.__read || function (o, n) {
+  var m = typeof Symbol === "function" && o[Symbol.iterator];
+  if (!m) return o;
+  var i = m.call(o),
+      r,
+      ar = [],
+      e;
+
+  try {
+    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+  } catch (error) {
+    e = {
+      error: error
+    };
+  } finally {
+    try {
+      if (r && !r.done && (m = i["return"])) m.call(i);
+    } finally {
+      if (e) throw e.error;
+    }
+  }
+
+  return ar;
+};
+
+var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
+  if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+    if (ar || !(i in from)) {
+      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+      ar[i] = from[i];
+    }
+  }
+  return to.concat(ar || Array.prototype.slice.call(from));
+};
+
+exports.__esModule = true;
+exports.createRailsTestJobs = void 0;
+
+var utils_1 = __nccwpck_require__(7461);
+
+var createRailsTestJobs = function (context) {
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p; // don't run tests after release
+
+
+  if (((_a = context.commitInfo) === null || _a === void 0 ? void 0 : _a.trigger) === "taggedRelease") {
+    return [];
+  }
+
+  var buildConfig = context.componentConfig.build;
+  var base = {
+    variables: (_b = buildConfig.extraVars) !== null && _b !== void 0 ? _b : {},
+    stage: "test",
+    needs: [],
+    envMode: "none"
+  };
+  var defaultImage = "docker.io/ruby";
+  var bundlerCacheDir = "tmp/cache";
+  var bundlerInstall = ["bundle config set path '".concat(bundlerCacheDir, "'"), "bundle install -j $(nproc)"];
+  var bundlerCache = {
+    key: {
+      files: ["Gemfile.lock"],
+      prefix: "$CI_JOB_IMAGE"
+    },
+    paths: [bundlerCacheDir]
+  };
+  var auditJob = buildConfig.audit !== false ? __assign(__assign({
+    name: "🛡 audit"
+  }, base), {
+    cache: undefined,
+    image: (_d = (_c = buildConfig.audit) === null || _c === void 0 ? void 0 : _c.jobImage) !== null && _d !== void 0 ? _d : defaultImage,
+    script: __spreadArray(["cd ".concat(context.componentConfig.dir)], __read((_f = (0, utils_1.ensureArray)((_e = buildConfig.audit) === null || _e === void 0 ? void 0 : _e.command)) !== null && _f !== void 0 ? _f : ["gem install bundler-audit", "bundle audit check"]), false),
+    allow_failure: true
+  }) : null;
+  var lintJob = buildConfig.lint !== false ? __assign(__assign({
+    name: "👮 lint"
+  }, base), {
+    cache: bundlerCache,
+    image: (_h = (_g = buildConfig.lint) === null || _g === void 0 ? void 0 : _g.jobImage) !== null && _h !== void 0 ? _h : defaultImage,
+    script: __spreadArray(__spreadArray(["cd ".concat(context.componentConfig.dir)], __read(bundlerInstall), false), __read((_k = (0, utils_1.ensureArray)((_j = buildConfig.lint) === null || _j === void 0 ? void 0 : _j.command)) !== null && _k !== void 0 ? _k : ["bundle exec rubocop"]), false)
+  }) : null;
+  var testJob = buildConfig.test !== false ? __assign(__assign({
+    name: "🧪 test"
+  }, base), {
+    cache: bundlerCache,
+    image: (_m = (_l = buildConfig.test) === null || _l === void 0 ? void 0 : _l.jobImage) !== null && _m !== void 0 ? _m : defaultImage,
+    script: __spreadArray(__spreadArray(["cd ".concat(context.componentConfig.dir)], __read(bundlerInstall), false), __read((_p = (0, utils_1.ensureArray)((_o = buildConfig.test) === null || _o === void 0 ? void 0 : _o.command)) !== null && _p !== void 0 ? _p : ["bundle exec rspec"]), false)
+  }) : null;
+  return [auditJob, lintJob, testJob].filter(utils_1.notNil);
+};
+
+exports.createRailsTestJobs = createRailsTestJobs;
+
+/***/ }),
+
 /***/ 1197:
 /***/ ((__unused_webpack_module, exports) => {
 
@@ -40074,7 +40296,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "main-e52d6632" || 0;
+exports.PIPELINE_IMAGE_TAG = "main-344735ad" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -40617,8 +40839,9 @@ var getEnvironmentVariables = function (config, componentName, env, commitInfo,
             additionalEnvVars = deployConfigRaw ? deploy_1.DEPLOY_TYPES[deployConfigRaw.type].getAdditionalEnvVars(environmentContext) : {};
             host = (_c = (_b = envConfigRaw === null || envConfigRaw === void 0 ? void 0 : envConfigRaw.host) !== null && _b !== void 0 ? _b : additionalEnvVars.HOST_CANONICAL) !== null && _c !== void 0 ? _c : "unknown-host.example.com";
             url = "https://".concat(host);
-            predefinedVariables = __assign(__assign(__assign({}, basePredefinedVariables), {
-              HOST: host,
+            predefinedVariables = __assign(__assign(__assign(__assign({}, basePredefinedVariables), config.components[componentName].build.type === "rails" ? {} : {
+              HOST: host
+            }), {
               ROOT_URL: url
             }), additionalEnvVars);
           }
@@ -41556,7 +41779,7 @@ var setExtraVarsScripts = function (deployConfig) {
 };
 
 var createGoogleCloudRunDeployJobs = function (context) {
-  var _a;
+  var _a, _b, _c;
 
   var deployConfig = context.componentConfig.deploy;
 
@@ -41616,12 +41839,31 @@ var createGoogleCloudRunDeployJobs = function (context) {
     };
   });
 
-  var getServiceDeployScript = function (service) {
+  var getServiceDeployScript = function (service, nameSuffix) {
     var _a;
 
+    var customConfig = service !== true ? service : undefined;
     var command = service !== true ? (_a = service === null || service === void 0 ? void 0 : service.command) !== null && _a !== void 0 ? _a : context.componentConfig.build.startCommand : undefined;
     var commandArg = command ? "--command=\"".concat(command.split(" ").join(","), "\"") : "";
-    return "gcloud run deploy ".concat(serviceName, " ").concat(commandArg, " ").concat(commonDeployArgs, " --env-vars-file=____envvars.yaml --allow-unauthenticated");
+    var args = {
+      "allow-unauthenticated": true,
+      "min-instances": customConfig === null || customConfig === void 0 ? void 0 : customConfig.minInstances,
+      "max-instances": customConfig === null || customConfig === void 0 ? void 0 : customConfig.maxInstances,
+      "no-cpu-throttling": customConfig === null || customConfig === void 0 ? void 0 : customConfig.noCpuThrottling
+    };
+    var argsString = Object.entries(args).filter(function (_a) {
+      var _b = __read(_a, 2),
+          value = _b[1];
+
+      return !(0, lodash_1.isNil)(value);
+    }).map(function (_a) {
+      var _b = __read(_a, 2),
+          key = _b[0],
+          value = _b[1];
+
+      return "--".concat(key).concat(value !== true ? "=".concat(value) : "");
+    }).join(" ");
+    return "gcloud run deploy ".concat(serviceName).concat(nameSuffix !== null && nameSuffix !== void 0 ? nameSuffix : "", " ").concat(commandArg, " ").concat(commonDeployArgs, " --env-vars-file=____envvars.yaml ").concat(argsString);
   };
 
   var getJobCreateScriptsForJob = function (jobName, job) {
@@ -41678,10 +41920,21 @@ var createGoogleCloudRunDeployJobs = function (context) {
     });
   };
 
-  var deployScripts = __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read(setExtraVarsScripts(deployConfig)), false), __read(pushImageToArtifactsRegistry), false), ["echo \"$ENV_VARS\" > ____envvars.yaml"], false), __read(deployConfig.cloudSql ? (0, database_1.getDatabaseCreateScript)(context, deployConfig) // we create the db, so that we can also delete it afterwards
-  : []), false), __read(getCreateScheduleScripts()), false), __read(getJobCreateScripts()), false), __read(getJobRunScripts("preDeploy")), false), __read(deployConfig.service !== false ? [getServiceDeployScript(deployConfig.service)] : []), false), __read(getJobRunScripts("postDeploy")), false), ["docker image rm ".concat(gcloudImageName)], false);
+  var deployScripts = __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read(setExtraVarsScripts(deployConfig)), false), __read(pushImageToArtifactsRegistry), false), ["echo \"$ENV_VARS\" > ____envvars.yaml"], false), __read(deployConfig.cloudSql ? (0, database_1.getDatabaseCreateScript)(context, deployConfig) // we create the db, so that we can also delete it afterwards
+  : []), false), __read(getCreateScheduleScripts()), false), __read(getJobCreateScripts()), false), __read(getJobRunScripts("preDeploy")), false), __read(deployConfig.service !== false ? [getServiceDeployScript(deployConfig.service)] : []), false), __read(Object.entries((_b = deployConfig.additionalServices) !== null && _b !== void 0 ? _b : {}).map(function (_a) {
+    var _b = __read(_a, 2),
+        name = _b[0],
+        service = _b[1];
+
+    return getServiceDeployScript(service, "-" + name);
+  })), false), __read(getJobRunScripts("postDeploy")), false), ["docker image rm ".concat(gcloudImageName)], false);
+
+  var stopScripts = __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read(deployConfig.service !== false ? ["gcloud run services delete ".concat(serviceName, " ").concat(commonArgs)] : []), false), __read(Object.entries((_c = deployConfig.additionalServices) !== null && _c !== void 0 ? _c : {}).map(function (_a) {
+    var _b = __read(_a, 1),
+        name = _b[0];
 
-  var stopScripts = __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read(deployConfig.service !== false ? ["gcloud run services delete ".concat(serviceName, " ").concat(commonArgs)] : []), false), __read(getDeleteSchedulesScripts()), false), __read(getDeleteJobsScripts()), false), __read(deployConfig.cloudSql && deployConfig.cloudSql.deleteDatabaseOnStop ? (0, database_1.getDatabaseDeleteScript)(context, deployConfig) : []), false);
+    return "gcloud run services delete ".concat(serviceName, "-").concat(name, " ").concat(commonArgs);
+  })), false), __read(getDeleteSchedulesScripts()), false), __read(getDeleteJobsScripts()), false), __read(deployConfig.cloudSql && deployConfig.cloudSql.deleteDatabaseOnStop ? (0, database_1.getDatabaseDeleteScript)(context, deployConfig) : []), false);
 
   return [(0, lodash_1.merge)({}, baseDeploymentJob, (0, docker_1.getDockerJobBaseProps)(context), {
     artifacts: {