@catladder/pipeline 4.4.1 → 4.5.1

package/dist/constants.js

@@ -4,5 +4,5 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "v4-4-1-b0900022" || "latest";
+exports.PIPELINE_IMAGE_TAG = "v4-5-1-e57263cf" || "latest";
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || "git.panter.ch:5001/catladder/catladder";

package/dist/deploy/cloudRun/index.js

@@ -52,6 +52,7 @@ var utils_1 = require("../cloudSql/utils");
 var createJobs_1 = require("./createJobs");
 var cloudRunExecutionUrl_1 = require("./utils/cloudRunExecutionUrl");
 var database_1 = require("./utils/database");
+var getServiceName_1 = require("./utils/getServiceName");
 exports.GCLOUD_DEPLOY_CREDENTIALS_KEY = "GCLOUD_DEPLOY_credentialsKey";
 // FIXME: rename to internalHostSuffix, but this means that project-setup needs to be rerun, so its kindof a breaking change
 exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX = "GCLOUD_RUN_canonicalHostSuffix";
@@ -132,6 +133,7 @@ exports.GCLOUD_RUN_DEPLOY_TYPE = {
     return __assign(__assign(__assign({
       HOSTNAME_INTERNAL: HOSTNAME_INTERNAL
     }, getCloudSqlVariables(ctx)), jobTriggers), {
+      DEPLOY_CLOUD_RUN_SERVICE_NAME: (0, getServiceName_1.getServiceNameForEnvContext)(ctx),
       DEPLOY_CLOUD_RUN_PROJECT_ID: deployConfigRaw ? deployConfigRaw.projectId : undefined,
       DEPLOY_CLOUD_RUN_REGION: deployConfigRaw ? deployConfigRaw.region : undefined
     });

package/dist/deploy/cloudRun/utils/getServiceName.d.ts

@@ -1,2 +1,6 @@
+import type { DeployConfigCloudRun } from "../..";
+import type { BuildConfig } from "../../../build/types";
 import type { ComponentContext } from "../../../types/context";
-export declare const getServiceName: (context: ComponentContext) => string | import("../../..").BashExpression;
+import type { EnvironmentContext } from "../../../types/environmentContext";
+export declare const getServiceName: (context: ComponentContext) => string | import("../../..").BashExpression;
+export declare const getServiceNameForEnvContext: (context: EnvironmentContext<BuildConfig, DeployConfigCloudRun>) => string | import("../../..").BashExpression;

package/dist/deploy/cloudRun/utils/getServiceName.js

@@ -3,8 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getServiceName = void 0;
+exports.getServiceNameForEnvContext = exports.getServiceName = void 0;
 var getServiceName = function (context) {
   return context.environment.fullName.toLowerCase();
 };
-exports.getServiceName = getServiceName;
+exports.getServiceName = getServiceName;
+var getServiceNameForEnvContext = function (context) {
+  return context.fullName.toLowerCase();
+};
+exports.getServiceNameForEnvContext = getServiceNameForEnvContext;

package/dist/pipeline/createMainPipeline.js

@@ -279,7 +279,7 @@ function getGitlabRulesForTrigger(trigger) {
   // taggedRelease: on tag
   switch (trigger) {
     case "mainBranch":
-      return [rules_1.RULE_NEVER_ON_AGENT_TRIGGER, rules_1.RULE_IS_MAIN_BRANCH_AND_NOT_RELEASE_COMMIT_PUSH];
+      return [rules_1.RULE_NEVER_ON_AGENT_TRIGGER, rules_1.RULE_IS_MAIN_BRANCH_AND_NOT_RELEASE_COMMIT];
     case "mr":
       return [rules_1.RULE_NEVER_ON_AGENT_TRIGGER, rules_1.RULE_IS_MERGE_REQUEST];
     case "taggedRelease":

package/dist/pipeline/gitlab/createGitlabPipeline.js

@@ -94,7 +94,7 @@ var createGitlabPipelineWithDefaults = function (_a) {
           PIPELINE_NAME: "Release $CI_COMMIT_TAG"
         }
       }, {
-        if: rules_1.RULE_IS_MAIN_BRANCH_AND_NOT_RELEASE_COMMIT_PUSH.if,
+        if: rules_1.RULE_IS_MAIN_BRANCH_AND_NOT_RELEASE_COMMIT.if,
         variables: {
           PIPELINE_ICON: "🐱🔨",
           PIPELINE_NAME: "Main - $CI_COMMIT_TITLE"

package/dist/rules/index.d.ts

@@ -1,9 +1,9 @@
 import type { GitlabRule } from "../types";
 export declare const RULE_CONDITION_MAIN_BRANCH = "$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH";
 export declare const RULE_CONDITION_RELEASE_COMMIT = "$CI_COMMIT_MESSAGE =~ /^chore\\(release\\).*/";
-export declare const RULE_CONDITION_NOT_RELEASE_COMMIT_PUSH = "$CI_COMMIT_MESSAGE !~ /^chore\\(release\\).*/ && $CI_PIPELINE_SOURCE != \"push\"";
+export declare const RULE_CONDITION_NOT_RELEASE_COMMIT = "$CI_COMMIT_MESSAGE !~ /^chore\\(release\\).*/";
 export declare const RULE_IS_MAIN_BRANCH: GitlabRule;
-export declare const RULE_IS_MAIN_BRANCH_AND_NOT_RELEASE_COMMIT_PUSH: GitlabRule;
+export declare const RULE_IS_MAIN_BRANCH_AND_NOT_RELEASE_COMMIT: GitlabRule;
 export declare const RULE_NEVER_ON_RELEASE_COMMIT: GitlabRule;
 export declare const RULE_NEVER_ON_AGENT_TRIGGER: GitlabRule;
 export declare const RULE_NEVER_ON_SCHEDULE: GitlabRule;

package/dist/rules/index.js

@@ -3,15 +3,15 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.RULE_CONDITION_HOTFIX_BRANCH = exports.RULE_IS_TAGGED_RELEASE = exports.RULE_IS_MERGE_REQUEST = exports.RULE_NEVER_ON_SCHEDULE = exports.RULE_NEVER_ON_AGENT_TRIGGER = exports.RULE_NEVER_ON_RELEASE_COMMIT = exports.RULE_IS_MAIN_BRANCH_AND_NOT_RELEASE_COMMIT_PUSH = exports.RULE_IS_MAIN_BRANCH = exports.RULE_CONDITION_NOT_RELEASE_COMMIT_PUSH = exports.RULE_CONDITION_RELEASE_COMMIT = exports.RULE_CONDITION_MAIN_BRANCH = void 0;
+exports.RULE_CONDITION_HOTFIX_BRANCH = exports.RULE_IS_TAGGED_RELEASE = exports.RULE_IS_MERGE_REQUEST = exports.RULE_NEVER_ON_SCHEDULE = exports.RULE_NEVER_ON_AGENT_TRIGGER = exports.RULE_NEVER_ON_RELEASE_COMMIT = exports.RULE_IS_MAIN_BRANCH_AND_NOT_RELEASE_COMMIT = exports.RULE_IS_MAIN_BRANCH = exports.RULE_CONDITION_NOT_RELEASE_COMMIT = exports.RULE_CONDITION_RELEASE_COMMIT = exports.RULE_CONDITION_MAIN_BRANCH = void 0;
 exports.RULE_CONDITION_MAIN_BRANCH = "$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH";
 exports.RULE_CONDITION_RELEASE_COMMIT = "$CI_COMMIT_MESSAGE =~ /^chore\\(release\\).*/";
-exports.RULE_CONDITION_NOT_RELEASE_COMMIT_PUSH = '$CI_COMMIT_MESSAGE !~ /^chore\\(release\\).*/ && $CI_PIPELINE_SOURCE != "push"';
+exports.RULE_CONDITION_NOT_RELEASE_COMMIT = "$CI_COMMIT_MESSAGE !~ /^chore\\(release\\).*/";
 exports.RULE_IS_MAIN_BRANCH = {
   if: exports.RULE_CONDITION_MAIN_BRANCH
 };
-exports.RULE_IS_MAIN_BRANCH_AND_NOT_RELEASE_COMMIT_PUSH = {
-  if: exports.RULE_CONDITION_MAIN_BRANCH + " && (" + exports.RULE_CONDITION_NOT_RELEASE_COMMIT_PUSH + ")"
+exports.RULE_IS_MAIN_BRANCH_AND_NOT_RELEASE_COMMIT = {
+  if: exports.RULE_CONDITION_MAIN_BRANCH + " && " + exports.RULE_CONDITION_NOT_RELEASE_COMMIT
 };
 exports.RULE_NEVER_ON_RELEASE_COMMIT = {
   if: exports.RULE_CONDITION_RELEASE_COMMIT,