@catladder/cli 0.0.0-main-b2d64b36 → 0.0.0-main-b0461757
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/bundles/catenv/index.js +6 -2
- package/dist/bundles/cli/index.js +6 -2
- package/dist/pipeline/src/constants.js +1 -1
- package/dist/pipeline/src/deploy/cloudRun/index.js +2 -0
- package/dist/pipeline/src/deploy/cloudRun/index.js.map +1 -1
- package/dist/pipeline/src/deploy/cloudRun/utils/getServiceName.d.ts +5 -1
- package/dist/pipeline/src/deploy/cloudRun/utils/getServiceName.js +4 -2
- package/dist/pipeline/src/deploy/cloudRun/utils/getServiceName.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -2824,7 +2824,7 @@ Object.defineProperty(exports, "__esModule", ({
|
|
|
2824
2824
|
value: true
|
|
2825
2825
|
}));
|
|
2826
2826
|
exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
|
|
2827
|
-
exports.PIPELINE_IMAGE_TAG = "main-
|
|
2827
|
+
exports.PIPELINE_IMAGE_TAG = "main-b0461757" || 0;
|
|
2828
2828
|
exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
|
|
2829
2829
|
|
|
2830
2830
|
/***/ }),
|
|
@@ -4662,6 +4662,7 @@ const utils_1 = __nccwpck_require__(7844);
|
|
|
4662
4662
|
const createJobs_1 = __nccwpck_require__(933);
|
|
4663
4663
|
const cloudRunExecutionUrl_1 = __nccwpck_require__(5857);
|
|
4664
4664
|
const database_1 = __nccwpck_require__(41);
|
|
4665
|
+
const getServiceName_1 = __nccwpck_require__(6428);
|
|
4665
4666
|
exports.GCLOUD_DEPLOY_CREDENTIALS_KEY = "GCLOUD_DEPLOY_credentialsKey";
|
|
4666
4667
|
// FIXME: rename to internalHostSuffix, but this means that project-setup needs to be rerun, so its kindof a breaking change
|
|
4667
4668
|
exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX = "GCLOUD_RUN_canonicalHostSuffix";
|
|
@@ -4731,6 +4732,7 @@ exports.GCLOUD_RUN_DEPLOY_TYPE = {
|
|
|
4731
4732
|
HOSTNAME_INTERNAL,
|
|
4732
4733
|
...getCloudSqlVariables(ctx),
|
|
4733
4734
|
...jobTriggers,
|
|
4735
|
+
DEPLOY_CLOUD_RUN_SERVICE_NAME: (0, getServiceName_1.getServiceNameForEnvContext)(ctx),
|
|
4734
4736
|
DEPLOY_CLOUD_RUN_PROJECT_ID: deployConfigRaw ? deployConfigRaw.projectId : undefined,
|
|
4735
4737
|
DEPLOY_CLOUD_RUN_REGION: deployConfigRaw ? deployConfigRaw.region : undefined
|
|
4736
4738
|
};
|
|
@@ -4916,9 +4918,11 @@ exports.getCloudRunServiceOrJobArgsArg = getCloudRunServiceOrJobArgsArg;
|
|
|
4916
4918
|
Object.defineProperty(exports, "__esModule", ({
|
|
4917
4919
|
value: true
|
|
4918
4920
|
}));
|
|
4919
|
-
exports.getServiceName = void 0;
|
|
4921
|
+
exports.getServiceNameForEnvContext = exports.getServiceName = void 0;
|
|
4920
4922
|
const getServiceName = context => context.environment.fullName.toLowerCase();
|
|
4921
4923
|
exports.getServiceName = getServiceName;
|
|
4924
|
+
const getServiceNameForEnvContext = context => context.fullName.toLowerCase();
|
|
4925
|
+
exports.getServiceNameForEnvContext = getServiceNameForEnvContext;
|
|
4922
4926
|
|
|
4923
4927
|
/***/ }),
|
|
4924
4928
|
|
|
@@ -7721,7 +7721,7 @@ Object.defineProperty(exports, "__esModule", ({
|
|
|
7721
7721
|
value: true
|
|
7722
7722
|
}));
|
|
7723
7723
|
exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
|
|
7724
|
-
exports.PIPELINE_IMAGE_TAG = "main-
|
|
7724
|
+
exports.PIPELINE_IMAGE_TAG = "main-b0461757" || 0;
|
|
7725
7725
|
exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
|
|
7726
7726
|
|
|
7727
7727
|
/***/ }),
|
|
@@ -9559,6 +9559,7 @@ const utils_1 = __nccwpck_require__(27844);
|
|
|
9559
9559
|
const createJobs_1 = __nccwpck_require__(20933);
|
|
9560
9560
|
const cloudRunExecutionUrl_1 = __nccwpck_require__(55857);
|
|
9561
9561
|
const database_1 = __nccwpck_require__(70041);
|
|
9562
|
+
const getServiceName_1 = __nccwpck_require__(96428);
|
|
9562
9563
|
exports.GCLOUD_DEPLOY_CREDENTIALS_KEY = "GCLOUD_DEPLOY_credentialsKey";
|
|
9563
9564
|
// FIXME: rename to internalHostSuffix, but this means that project-setup needs to be rerun, so its kindof a breaking change
|
|
9564
9565
|
exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX = "GCLOUD_RUN_canonicalHostSuffix";
|
|
@@ -9628,6 +9629,7 @@ exports.GCLOUD_RUN_DEPLOY_TYPE = {
|
|
|
9628
9629
|
HOSTNAME_INTERNAL,
|
|
9629
9630
|
...getCloudSqlVariables(ctx),
|
|
9630
9631
|
...jobTriggers,
|
|
9632
|
+
DEPLOY_CLOUD_RUN_SERVICE_NAME: (0, getServiceName_1.getServiceNameForEnvContext)(ctx),
|
|
9631
9633
|
DEPLOY_CLOUD_RUN_PROJECT_ID: deployConfigRaw ? deployConfigRaw.projectId : undefined,
|
|
9632
9634
|
DEPLOY_CLOUD_RUN_REGION: deployConfigRaw ? deployConfigRaw.region : undefined
|
|
9633
9635
|
};
|
|
@@ -9813,9 +9815,11 @@ exports.getCloudRunServiceOrJobArgsArg = getCloudRunServiceOrJobArgsArg;
|
|
|
9813
9815
|
Object.defineProperty(exports, "__esModule", ({
|
|
9814
9816
|
value: true
|
|
9815
9817
|
}));
|
|
9816
|
-
exports.getServiceName = void 0;
|
|
9818
|
+
exports.getServiceNameForEnvContext = exports.getServiceName = void 0;
|
|
9817
9819
|
const getServiceName = context => context.environment.fullName.toLowerCase();
|
|
9818
9820
|
exports.getServiceName = getServiceName;
|
|
9821
|
+
const getServiceNameForEnvContext = context => context.fullName.toLowerCase();
|
|
9822
|
+
exports.getServiceNameForEnvContext = getServiceNameForEnvContext;
|
|
9819
9823
|
|
|
9820
9824
|
/***/ }),
|
|
9821
9825
|
|
|
@@ -4,5 +4,5 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
|
|
7
|
-
exports.PIPELINE_IMAGE_TAG = "main-
|
|
7
|
+
exports.PIPELINE_IMAGE_TAG = "main-b0461757" || "latest";
|
|
8
8
|
exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || "git.panter.ch:5001/catladder/catladder";
|
|
@@ -11,6 +11,7 @@ const utils_1 = require("../cloudSql/utils");
|
|
|
11
11
|
const createJobs_1 = require("./createJobs");
|
|
12
12
|
const cloudRunExecutionUrl_1 = require("./utils/cloudRunExecutionUrl");
|
|
13
13
|
const database_1 = require("./utils/database");
|
|
14
|
+
const getServiceName_1 = require("./utils/getServiceName");
|
|
14
15
|
exports.GCLOUD_DEPLOY_CREDENTIALS_KEY = "GCLOUD_DEPLOY_credentialsKey";
|
|
15
16
|
// FIXME: rename to internalHostSuffix, but this means that project-setup needs to be rerun, so its kindof a breaking change
|
|
16
17
|
exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX = "GCLOUD_RUN_canonicalHostSuffix";
|
|
@@ -80,6 +81,7 @@ exports.GCLOUD_RUN_DEPLOY_TYPE = {
|
|
|
80
81
|
HOSTNAME_INTERNAL,
|
|
81
82
|
...getCloudSqlVariables(ctx),
|
|
82
83
|
...jobTriggers,
|
|
84
|
+
DEPLOY_CLOUD_RUN_SERVICE_NAME: (0, getServiceName_1.getServiceNameForEnvContext)(ctx),
|
|
83
85
|
DEPLOY_CLOUD_RUN_PROJECT_ID: deployConfigRaw ? deployConfigRaw.projectId : undefined,
|
|
84
86
|
DEPLOY_CLOUD_RUN_REGION: deployConfigRaw ? deployConfigRaw.region : undefined
|
|
85
87
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/cloudRun/index.ts"],"names":[],"mappings":";;;AACA,8DAGmC;AAEnC,2CAAiD;AAEjD,+CAA6D;AAC7D,6CAAkD;AAClD,6CAA8D;AAC9D,uEAAwE;AACxE,+CAI0B;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/cloudRun/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,6 @@
|
|
|
1
|
+
import type { DeployConfigCloudRun } from "../..";
|
|
2
|
+
import type { BuildConfig } from "../../../build/types";
|
|
1
3
|
import type { ComponentContext } from "../../../types/context";
|
|
2
|
-
|
|
4
|
+
import type { EnvironmentContext } from "../../../types/environmentContext";
|
|
5
|
+
export declare const getServiceName: (context: ComponentContext) => string | import("../../..").BashExpression;
|
|
6
|
+
export declare const getServiceNameForEnvContext: (context: EnvironmentContext<BuildConfig, DeployConfigCloudRun>) => string | import("../../..").BashExpression;
|
|
@@ -3,6 +3,8 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.getServiceName = void 0;
|
|
6
|
+
exports.getServiceNameForEnvContext = exports.getServiceName = void 0;
|
|
7
7
|
const getServiceName = context => context.environment.fullName.toLowerCase();
|
|
8
|
-
exports.getServiceName = getServiceName;
|
|
8
|
+
exports.getServiceName = getServiceName;
|
|
9
|
+
const getServiceNameForEnvContext = context => context.fullName.toLowerCase();
|
|
10
|
+
exports.getServiceNameForEnvContext = getServiceNameForEnvContext;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getServiceName.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/utils/getServiceName.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"getServiceName.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/utils/getServiceName.ts"],"names":[],"mappings":";;;AAIO,MAAM,cAAc,GAAG,CAAC,OAAyB,EAAE,EAAE,CAC1D,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;AADhC,QAAA,cAAc,kBACkB;AAEtC,MAAM,2BAA2B,GAAG,CACzC,OAA8D,EAC9D,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;AAFvB,QAAA,2BAA2B,+BAEJ"}
|