@catladder/cli 0.0.0-next-d3840b21 → 0.0.0-next-616e80f1
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 +8 -3
- package/dist/bundles/cli/index.js +8 -3
- package/dist/pipeline/src/bash/replaceAsync.js +5 -2
- package/dist/pipeline/src/bash/replaceAsync.js.map +1 -1
- package/dist/pipeline/src/build/docker.js +1 -1
- package/dist/pipeline/src/build/docker.js.map +1 -1
- package/dist/pipeline/src/deploy/cloudRun/createJobs/cloudRunServices.js +2 -0
- package/dist/pipeline/src/deploy/cloudRun/createJobs/cloudRunServices.js.map +1 -1
- package/dist/pipeline/src/deploy/types/googleCloudRun.d.ts +7 -2
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -941,12 +941,15 @@ const BashExpression_1 = __nccwpck_require__(2376);
|
|
|
941
941
|
// and adjusted a bit
|
|
942
942
|
async function replaceAsync(string, searchValue, replacer) {
|
|
943
943
|
const wasBashExpression = string instanceof BashExpression_1.BashExpression;
|
|
944
|
+
const stringRepresentation = wasBashExpression
|
|
945
|
+
? string.toString()
|
|
946
|
+
: (0, BashExpression_1.bashEscape)(string);
|
|
944
947
|
try {
|
|
945
948
|
// 1. Run fake pass of `replace`, collect values from `replacer` calls
|
|
946
949
|
// 2. Resolve them with `Promise.all`
|
|
947
950
|
// 3. Run `replace` with resolved values
|
|
948
951
|
const values = [];
|
|
949
|
-
String.prototype.replace.call(
|
|
952
|
+
String.prototype.replace.call(stringRepresentation, searchValue, function (...args) {
|
|
950
953
|
// eslint-disable-next-line prefer-spread
|
|
951
954
|
const result = replacer.apply(undefined, args);
|
|
952
955
|
values.push(result);
|
|
@@ -954,7 +957,7 @@ async function replaceAsync(string, searchValue, replacer) {
|
|
|
954
957
|
});
|
|
955
958
|
const resolvedValues = await Promise.all(values);
|
|
956
959
|
const containsBashExpression = resolvedValues.some((value) => value instanceof BashExpression_1.BashExpression);
|
|
957
|
-
const result = String.prototype.replace.call(
|
|
960
|
+
const result = String.prototype.replace.call(stringRepresentation, searchValue, function () {
|
|
958
961
|
var _a, _b;
|
|
959
962
|
return (_b = (_a = resolvedValues.shift()) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : "";
|
|
960
963
|
});
|
|
@@ -1647,7 +1650,7 @@ const getDockerJobBaseProps = () => {
|
|
|
1647
1650
|
services: [
|
|
1648
1651
|
{
|
|
1649
1652
|
name: "docker:24.0.6-dind", // see see https://gitlab.com/gitlab-org/gitlab-runner/-/issues/27300#note_466755332
|
|
1650
|
-
command: ["--tls=false"],
|
|
1653
|
+
command: ["--tls=false", "--registry-mirror=https://mirror.gcr.io"],
|
|
1651
1654
|
},
|
|
1652
1655
|
],
|
|
1653
1656
|
variables: {},
|
|
@@ -3889,6 +3892,8 @@ const getServiceDeployScript = (context, service, nameSuffix) => {
|
|
|
3889
3892
|
timeout: customConfig === null || customConfig === void 0 ? void 0 : customConfig.timeout,
|
|
3890
3893
|
"vpc-connector": customConfig === null || customConfig === void 0 ? void 0 : customConfig.vpcConnector,
|
|
3891
3894
|
"vpc-egress": customConfig === null || customConfig === void 0 ? void 0 : customConfig.vpcEgress,
|
|
3895
|
+
network: customConfig === null || customConfig === void 0 ? void 0 : customConfig.network,
|
|
3896
|
+
subnet: customConfig === null || customConfig === void 0 ? void 0 : customConfig.subnet,
|
|
3892
3897
|
"use-http2": customConfig === null || customConfig === void 0 ? void 0 : customConfig.http2,
|
|
3893
3898
|
"allow-unauthenticated": (_d = customConfig === null || customConfig === void 0 ? void 0 : customConfig.allowUnauthenticated) !== null && _d !== void 0 ? _d : true,
|
|
3894
3899
|
ingress: (_e = customConfig === null || customConfig === void 0 ? void 0 : customConfig.ingress) !== null && _e !== void 0 ? _e : "all",
|
|
@@ -4107,12 +4107,15 @@ const BashExpression_1 = __nccwpck_require__(42376);
|
|
|
4107
4107
|
// and adjusted a bit
|
|
4108
4108
|
async function replaceAsync(string, searchValue, replacer) {
|
|
4109
4109
|
const wasBashExpression = string instanceof BashExpression_1.BashExpression;
|
|
4110
|
+
const stringRepresentation = wasBashExpression
|
|
4111
|
+
? string.toString()
|
|
4112
|
+
: (0, BashExpression_1.bashEscape)(string);
|
|
4110
4113
|
try {
|
|
4111
4114
|
// 1. Run fake pass of `replace`, collect values from `replacer` calls
|
|
4112
4115
|
// 2. Resolve them with `Promise.all`
|
|
4113
4116
|
// 3. Run `replace` with resolved values
|
|
4114
4117
|
const values = [];
|
|
4115
|
-
String.prototype.replace.call(
|
|
4118
|
+
String.prototype.replace.call(stringRepresentation, searchValue, function (...args) {
|
|
4116
4119
|
// eslint-disable-next-line prefer-spread
|
|
4117
4120
|
const result = replacer.apply(undefined, args);
|
|
4118
4121
|
values.push(result);
|
|
@@ -4120,7 +4123,7 @@ async function replaceAsync(string, searchValue, replacer) {
|
|
|
4120
4123
|
});
|
|
4121
4124
|
const resolvedValues = await Promise.all(values);
|
|
4122
4125
|
const containsBashExpression = resolvedValues.some((value) => value instanceof BashExpression_1.BashExpression);
|
|
4123
|
-
const result = String.prototype.replace.call(
|
|
4126
|
+
const result = String.prototype.replace.call(stringRepresentation, searchValue, function () {
|
|
4124
4127
|
var _a, _b;
|
|
4125
4128
|
return (_b = (_a = resolvedValues.shift()) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : "";
|
|
4126
4129
|
});
|
|
@@ -4813,7 +4816,7 @@ const getDockerJobBaseProps = () => {
|
|
|
4813
4816
|
services: [
|
|
4814
4817
|
{
|
|
4815
4818
|
name: "docker:24.0.6-dind", // see see https://gitlab.com/gitlab-org/gitlab-runner/-/issues/27300#note_466755332
|
|
4816
|
-
command: ["--tls=false"],
|
|
4819
|
+
command: ["--tls=false", "--registry-mirror=https://mirror.gcr.io"],
|
|
4817
4820
|
},
|
|
4818
4821
|
],
|
|
4819
4822
|
variables: {},
|
|
@@ -7055,6 +7058,8 @@ const getServiceDeployScript = (context, service, nameSuffix) => {
|
|
|
7055
7058
|
timeout: customConfig === null || customConfig === void 0 ? void 0 : customConfig.timeout,
|
|
7056
7059
|
"vpc-connector": customConfig === null || customConfig === void 0 ? void 0 : customConfig.vpcConnector,
|
|
7057
7060
|
"vpc-egress": customConfig === null || customConfig === void 0 ? void 0 : customConfig.vpcEgress,
|
|
7061
|
+
network: customConfig === null || customConfig === void 0 ? void 0 : customConfig.network,
|
|
7062
|
+
subnet: customConfig === null || customConfig === void 0 ? void 0 : customConfig.subnet,
|
|
7058
7063
|
"use-http2": customConfig === null || customConfig === void 0 ? void 0 : customConfig.http2,
|
|
7059
7064
|
"allow-unauthenticated": (_d = customConfig === null || customConfig === void 0 ? void 0 : customConfig.allowUnauthenticated) !== null && _d !== void 0 ? _d : true,
|
|
7060
7065
|
ingress: (_e = customConfig === null || customConfig === void 0 ? void 0 : customConfig.ingress) !== null && _e !== void 0 ? _e : "all",
|
|
@@ -5,12 +5,15 @@ const BashExpression_1 = require("./BashExpression");
|
|
|
5
5
|
// and adjusted a bit
|
|
6
6
|
async function replaceAsync(string, searchValue, replacer) {
|
|
7
7
|
const wasBashExpression = string instanceof BashExpression_1.BashExpression;
|
|
8
|
+
const stringRepresentation = wasBashExpression
|
|
9
|
+
? string.toString()
|
|
10
|
+
: (0, BashExpression_1.bashEscape)(string);
|
|
8
11
|
try {
|
|
9
12
|
// 1. Run fake pass of `replace`, collect values from `replacer` calls
|
|
10
13
|
// 2. Resolve them with `Promise.all`
|
|
11
14
|
// 3. Run `replace` with resolved values
|
|
12
15
|
const values = [];
|
|
13
|
-
String.prototype.replace.call(
|
|
16
|
+
String.prototype.replace.call(stringRepresentation, searchValue, function (...args) {
|
|
14
17
|
// eslint-disable-next-line prefer-spread
|
|
15
18
|
const result = replacer.apply(undefined, args);
|
|
16
19
|
values.push(result);
|
|
@@ -18,7 +21,7 @@ async function replaceAsync(string, searchValue, replacer) {
|
|
|
18
21
|
});
|
|
19
22
|
const resolvedValues = await Promise.all(values);
|
|
20
23
|
const containsBashExpression = resolvedValues.some((value) => value instanceof BashExpression_1.BashExpression);
|
|
21
|
-
const result = String.prototype.replace.call(
|
|
24
|
+
const result = String.prototype.replace.call(stringRepresentation, searchValue, function () {
|
|
22
25
|
var _a, _b;
|
|
23
26
|
return (_b = (_a = resolvedValues.shift()) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : "";
|
|
24
27
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"replaceAsync.js","sourceRoot":"","sources":["../../../../../pipeline/src/bash/replaceAsync.ts"],"names":[],"mappings":";;AAAA,
|
|
1
|
+
{"version":3,"file":"replaceAsync.js","sourceRoot":"","sources":["../../../../../pipeline/src/bash/replaceAsync.ts"],"names":[],"mappings":";;AAAA,qDAA8D;AAE9D,wEAAwE;AACxE,qBAAqB;AACN,KAAK,UAAU,YAAY,CACxC,MAA+B,EAC/B,WAAgB,EAChB,QAGqC;IAErC,MAAM,iBAAiB,GAAG,MAAM,YAAY,+BAAc,CAAC;IAE3D,MAAM,oBAAoB,GAAG,iBAAiB;QAC5C,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE;QACnB,CAAC,CAAC,IAAA,2BAAU,EAAC,MAAM,CAAC,CAAC;IACvB,IAAI,CAAC;QACH,sEAAsE;QACtE,qCAAqC;QACrC,wCAAwC;QACxC,MAAM,MAAM,GAA4C,EAAE,CAAC;QAC3D,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAC3B,oBAAoB,EACpB,WAAW,EACX,UAAU,GAAG,IAAI;YACf,yCAAyC;YACzC,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;YAC/C,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACpB,OAAO,EAAE,CAAC;QACZ,CAAC,CACF,CAAC;QACF,MAAM,cAAc,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAEjD,MAAM,sBAAsB,GAAG,cAAc,CAAC,IAAI,CAChD,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,YAAY,+BAAc,CAC3C,CAAC;QAEF,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAC1C,oBAAoB,EACpB,WAAW,EACX;;YACE,OAAO,MAAA,MAAA,cAAc,CAAC,KAAK,EAAE,0CAAE,QAAQ,EAAE,mCAAI,EAAE,CAAC;QAClD,CAAC,CACF,CAAC;QACF,IAAI,iBAAiB,IAAI,sBAAsB,EAAE,CAAC;YAChD,OAAO,IAAI,+BAAc,CAAC,MAAM,CAAC,CAAC;QACpC,CAAC;aAAM,CAAC;YACN,OAAO,MAAM,CAAC;QAChB,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;AACH,CAAC;AAjDD,+BAiDC"}
|
|
@@ -94,7 +94,7 @@ const getDockerJobBaseProps = () => {
|
|
|
94
94
|
services: [
|
|
95
95
|
{
|
|
96
96
|
name: "docker:24.0.6-dind", // see see https://gitlab.com/gitlab-org/gitlab-runner/-/issues/27300#note_466755332
|
|
97
|
-
command: ["--tls=false"],
|
|
97
|
+
command: ["--tls=false", "--registry-mirror=https://mirror.gcr.io"],
|
|
98
98
|
},
|
|
99
99
|
],
|
|
100
100
|
variables: {},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../../../pipeline/src/build/docker.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../../../pipeline/src/build/docker.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,6 +38,8 @@ const getServiceDeployScript = (context, service, nameSuffix) => {
|
|
|
38
38
|
timeout: customConfig === null || customConfig === void 0 ? void 0 : customConfig.timeout,
|
|
39
39
|
"vpc-connector": customConfig === null || customConfig === void 0 ? void 0 : customConfig.vpcConnector,
|
|
40
40
|
"vpc-egress": customConfig === null || customConfig === void 0 ? void 0 : customConfig.vpcEgress,
|
|
41
|
+
network: customConfig === null || customConfig === void 0 ? void 0 : customConfig.network,
|
|
42
|
+
subnet: customConfig === null || customConfig === void 0 ? void 0 : customConfig.subnet,
|
|
41
43
|
"use-http2": customConfig === null || customConfig === void 0 ? void 0 : customConfig.http2,
|
|
42
44
|
"allow-unauthenticated": (_d = customConfig === null || customConfig === void 0 ? void 0 : customConfig.allowUnauthenticated) !== null && _d !== void 0 ? _d : true,
|
|
43
45
|
ingress: (_e = customConfig === null || customConfig === void 0 ? void 0 : customConfig.ingress) !== null && _e !== void 0 ? _e : "all",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloudRunServices.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/cloudRunServices.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"cloudRunServices.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/cloudRunServices.ts"],"names":[],"mappings":"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"}
|
|
@@ -106,14 +106,19 @@ export type DeployConfigCloudRunService = {
|
|
|
106
106
|
* defaults to gen1 according to gcloud
|
|
107
107
|
*/
|
|
108
108
|
executionEnvironment?: "gen2" | "gen1";
|
|
109
|
+
network?: string;
|
|
109
110
|
/**
|
|
110
|
-
* vpc
|
|
111
|
+
* vpc subnet to use, see https://cloud.google.com/sdk/gcloud/reference/run/deploy#--subnet
|
|
111
112
|
*/
|
|
112
|
-
|
|
113
|
+
subnet?: string;
|
|
113
114
|
/**
|
|
114
115
|
* vpc egress, see https://cloud.google.com/sdk/gcloud/reference/run/deploy#--vpc-egress
|
|
115
116
|
*/
|
|
116
117
|
vpcEgress?: "all-traffic" | "private-ranges-only";
|
|
118
|
+
/**
|
|
119
|
+
* vpc connector
|
|
120
|
+
*/
|
|
121
|
+
vpcConnector?: string;
|
|
117
122
|
/**
|
|
118
123
|
* Use http2 end-to-end. See https://cloud.google.com/run/docs/configuring/http2
|
|
119
124
|
*
|