@catladder/pipeline 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/bash/replaceAsync.js +4 -3
- package/dist/build/docker.js +1 -1
- package/dist/bundles/catladder-gitlab/index.js +8 -5
- package/dist/constants.js +1 -1
- package/dist/deploy/cloudRun/createJobs/cloudRunServices.js +2 -0
- package/dist/deploy/types/googleCloudRun.d.ts +7 -2
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/examples/__snapshots__/cloud-run-http2.test.ts.snap +4 -0
- package/examples/__snapshots__/cloud-run-memory-limit.test.ts.snap +4 -0
- package/examples/__snapshots__/cloud-run-meteor-with-worker.test.ts.snap +4 -0
- package/examples/__snapshots__/cloud-run-nextjs.test.ts.snap +4 -0
- package/examples/__snapshots__/cloud-run-no-cpu-throttling.test.ts.snap +4 -0
- package/examples/__snapshots__/cloud-run-no-service.test.ts.snap +4 -0
- package/examples/__snapshots__/cloud-run-non-public.test.ts.snap +4 -0
- package/examples/__snapshots__/cloud-run-post-stop-job.test.ts.snap +4 -0
- package/examples/__snapshots__/cloud-run-service-custom-vpc-connector.test.ts.snap +1390 -0
- package/examples/__snapshots__/cloud-run-service-custom-vpc.test.ts.snap +8 -4
- package/examples/__snapshots__/cloud-run-service-gen2.test.ts.snap +4 -0
- package/examples/__snapshots__/cloud-run-service-increase-timout.test.ts.snap +4 -0
- package/examples/__snapshots__/cloud-run-service-with-volumes.test.ts.snap +4 -0
- package/examples/__snapshots__/cloud-run-storybook.test.ts.snap +4 -0
- package/examples/__snapshots__/cloud-run-with-ngnix.test.ts.snap +4 -0
- package/examples/__snapshots__/cloud-run-with-sql-reuse-db.test.ts.snap +8 -0
- package/examples/__snapshots__/cloud-run-with-sql.test.ts.snap +4 -0
- package/examples/__snapshots__/cloud-run-with-worker.test.ts.snap +4 -0
- package/examples/__snapshots__/custom-build-job-with-tests.test.ts.snap +4 -0
- package/examples/__snapshots__/custom-build-job.test.ts.snap +4 -0
- package/examples/__snapshots__/custom-deploy.test.ts.snap +4 -0
- package/examples/__snapshots__/custom-sbom-java.test.ts.snap +4 -0
- package/examples/__snapshots__/git-submodule.test.ts.snap +4 -0
- package/examples/__snapshots__/kubernetes-application-customization.test.ts.snap +4 -0
- package/examples/__snapshots__/kubernetes-with-cloud-sql.test.ts.snap +4 -0
- package/examples/__snapshots__/kubernetes-with-jobs.test.ts.snap +8 -0
- package/examples/__snapshots__/kubernetes-with-mongodb.test.ts.snap +4 -0
- package/examples/__snapshots__/local-dot-env.test.ts.snap +4 -0
- package/examples/__snapshots__/meteor-kubernetes.test.ts.snap +4 -0
- package/examples/__snapshots__/multiline-var.test.ts.snap +3046 -1072
- package/examples/__snapshots__/native-app.test.ts.snap +4 -0
- package/examples/__snapshots__/node-build-with-custom-image.test.ts.snap +4 -0
- package/examples/__snapshots__/node-build-with-docker-additions.test.ts.snap +4 -0
- package/examples/__snapshots__/rails-k8s-with-worker-dockerfile.test.ts.snap +4 -0
- package/examples/__snapshots__/rails-k8s-with-worker.test.ts.snap +4 -0
- package/examples/__snapshots__/workspace-api-www-turbo-cache.test.ts.snap +8 -0
- package/examples/__snapshots__/workspace-api-www.test.ts.snap +8 -0
- package/examples/cloud-run-service-custom-vpc-connector.test.ts +11 -0
- package/examples/cloud-run-service-custom-vpc-connector.ts +30 -0
- package/examples/cloud-run-service-custom-vpc.ts +2 -1
- package/examples/multiline-var.ts +57 -15
- package/package.json +1 -1
- package/src/bash/replaceAsync.ts +7 -3
- package/src/build/docker.ts +1 -1
- package/src/deploy/cloudRun/createJobs/cloudRunServices.ts +2 -0
- package/src/deploy/types/googleCloudRun.ts +10 -2
|
@@ -123,16 +123,17 @@ var BashExpression_1 = require("./BashExpression");
|
|
|
123
123
|
// and adjusted a bit
|
|
124
124
|
function replaceAsync(string, searchValue, replacer) {
|
|
125
125
|
return __awaiter(this, void 0, void 0, function () {
|
|
126
|
-
var wasBashExpression, values_1, resolvedValues_1, containsBashExpression, result, error_1;
|
|
126
|
+
var wasBashExpression, stringRepresentation, values_1, resolvedValues_1, containsBashExpression, result, error_1;
|
|
127
127
|
return __generator(this, function (_a) {
|
|
128
128
|
switch (_a.label) {
|
|
129
129
|
case 0:
|
|
130
130
|
wasBashExpression = string instanceof BashExpression_1.BashExpression;
|
|
131
|
+
stringRepresentation = wasBashExpression ? string.toString() : (0, BashExpression_1.bashEscape)(string);
|
|
131
132
|
_a.label = 1;
|
|
132
133
|
case 1:
|
|
133
134
|
_a.trys.push([1, 3,, 4]);
|
|
134
135
|
values_1 = [];
|
|
135
|
-
String.prototype.replace.call(
|
|
136
|
+
String.prototype.replace.call(stringRepresentation, searchValue, function () {
|
|
136
137
|
var args = [];
|
|
137
138
|
for (var _i = 0; _i < arguments.length; _i++) {
|
|
138
139
|
args[_i] = arguments[_i];
|
|
@@ -148,7 +149,7 @@ function replaceAsync(string, searchValue, replacer) {
|
|
|
148
149
|
containsBashExpression = resolvedValues_1.some(function (value) {
|
|
149
150
|
return value instanceof BashExpression_1.BashExpression;
|
|
150
151
|
});
|
|
151
|
-
result = String.prototype.replace.call(
|
|
152
|
+
result = String.prototype.replace.call(stringRepresentation, searchValue, function () {
|
|
152
153
|
var _a, _b;
|
|
153
154
|
return (_b = (_a = resolvedValues_1.shift()) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : "";
|
|
154
155
|
});
|
package/dist/build/docker.js
CHANGED
|
@@ -135,7 +135,7 @@ var getDockerJobBaseProps = function () {
|
|
|
135
135
|
services: [{
|
|
136
136
|
name: "docker:24.0.6-dind",
|
|
137
137
|
// see see https://gitlab.com/gitlab-org/gitlab-runner/-/issues/27300#note_466755332
|
|
138
|
-
command: ["--tls=false"]
|
|
138
|
+
command: ["--tls=false", "--registry-mirror=https://mirror.gcr.io"]
|
|
139
139
|
}],
|
|
140
140
|
variables: {},
|
|
141
141
|
runnerVariables: getDockerBuildRunnerVariables()
|
|
@@ -23118,16 +23118,17 @@ var BashExpression_1 = __nccwpck_require__(5879);
|
|
|
23118
23118
|
// and adjusted a bit
|
|
23119
23119
|
function replaceAsync(string, searchValue, replacer) {
|
|
23120
23120
|
return __awaiter(this, void 0, void 0, function () {
|
|
23121
|
-
var wasBashExpression, values_1, resolvedValues_1, containsBashExpression, result, error_1;
|
|
23121
|
+
var wasBashExpression, stringRepresentation, values_1, resolvedValues_1, containsBashExpression, result, error_1;
|
|
23122
23122
|
return __generator(this, function (_a) {
|
|
23123
23123
|
switch (_a.label) {
|
|
23124
23124
|
case 0:
|
|
23125
23125
|
wasBashExpression = string instanceof BashExpression_1.BashExpression;
|
|
23126
|
+
stringRepresentation = wasBashExpression ? string.toString() : (0, BashExpression_1.bashEscape)(string);
|
|
23126
23127
|
_a.label = 1;
|
|
23127
23128
|
case 1:
|
|
23128
23129
|
_a.trys.push([1, 3,, 4]);
|
|
23129
23130
|
values_1 = [];
|
|
23130
|
-
String.prototype.replace.call(
|
|
23131
|
+
String.prototype.replace.call(stringRepresentation, searchValue, function () {
|
|
23131
23132
|
var args = [];
|
|
23132
23133
|
for (var _i = 0; _i < arguments.length; _i++) {
|
|
23133
23134
|
args[_i] = arguments[_i];
|
|
@@ -23143,7 +23144,7 @@ function replaceAsync(string, searchValue, replacer) {
|
|
|
23143
23144
|
containsBashExpression = resolvedValues_1.some(function (value) {
|
|
23144
23145
|
return value instanceof BashExpression_1.BashExpression;
|
|
23145
23146
|
});
|
|
23146
|
-
result = String.prototype.replace.call(
|
|
23147
|
+
result = String.prototype.replace.call(stringRepresentation, searchValue, function () {
|
|
23147
23148
|
var _a, _b;
|
|
23148
23149
|
return (_b = (_a = resolvedValues_1.shift()) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : "";
|
|
23149
23150
|
});
|
|
@@ -24248,7 +24249,7 @@ var getDockerJobBaseProps = function () {
|
|
|
24248
24249
|
services: [{
|
|
24249
24250
|
name: "docker:24.0.6-dind",
|
|
24250
24251
|
// see see https://gitlab.com/gitlab-org/gitlab-runner/-/issues/27300#note_466755332
|
|
24251
|
-
command: ["--tls=false"]
|
|
24252
|
+
command: ["--tls=false", "--registry-mirror=https://mirror.gcr.io"]
|
|
24252
24253
|
}],
|
|
24253
24254
|
variables: {},
|
|
24254
24255
|
runnerVariables: getDockerBuildRunnerVariables()
|
|
@@ -25747,7 +25748,7 @@ Object.defineProperty(exports, "__esModule", ({
|
|
|
25747
25748
|
value: true
|
|
25748
25749
|
}));
|
|
25749
25750
|
exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
|
|
25750
|
-
exports.PIPELINE_IMAGE_TAG = "next-
|
|
25751
|
+
exports.PIPELINE_IMAGE_TAG = "next-616e80f1" || 0;
|
|
25751
25752
|
exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
|
|
25752
25753
|
|
|
25753
25754
|
/***/ }),
|
|
@@ -28469,6 +28470,8 @@ var getServiceDeployScript = function (context, service, nameSuffix) {
|
|
|
28469
28470
|
timeout: customConfig === null || customConfig === void 0 ? void 0 : customConfig.timeout,
|
|
28470
28471
|
"vpc-connector": customConfig === null || customConfig === void 0 ? void 0 : customConfig.vpcConnector,
|
|
28471
28472
|
"vpc-egress": customConfig === null || customConfig === void 0 ? void 0 : customConfig.vpcEgress,
|
|
28473
|
+
network: customConfig === null || customConfig === void 0 ? void 0 : customConfig.network,
|
|
28474
|
+
subnet: customConfig === null || customConfig === void 0 ? void 0 : customConfig.subnet,
|
|
28472
28475
|
"use-http2": customConfig === null || customConfig === void 0 ? void 0 : customConfig.http2,
|
|
28473
28476
|
"allow-unauthenticated": (_d = customConfig === null || customConfig === void 0 ? void 0 : customConfig.allowUnauthenticated) !== null && _d !== void 0 ? _d : true,
|
|
28474
28477
|
ingress: (_e = customConfig === null || customConfig === void 0 ? void 0 : customConfig.ingress) !== null && _e !== void 0 ? _e : "all",
|
package/dist/constants.js
CHANGED
|
@@ -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 = "next-
|
|
7
|
+
exports.PIPELINE_IMAGE_TAG = "next-616e80f1" || "latest";
|
|
8
8
|
exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || "git.panter.ch:5001/catladder/catladder";
|
|
@@ -75,6 +75,8 @@ var getServiceDeployScript = function (context, service, nameSuffix) {
|
|
|
75
75
|
timeout: customConfig === null || customConfig === void 0 ? void 0 : customConfig.timeout,
|
|
76
76
|
"vpc-connector": customConfig === null || customConfig === void 0 ? void 0 : customConfig.vpcConnector,
|
|
77
77
|
"vpc-egress": customConfig === null || customConfig === void 0 ? void 0 : customConfig.vpcEgress,
|
|
78
|
+
network: customConfig === null || customConfig === void 0 ? void 0 : customConfig.network,
|
|
79
|
+
subnet: customConfig === null || customConfig === void 0 ? void 0 : customConfig.subnet,
|
|
78
80
|
"use-http2": customConfig === null || customConfig === void 0 ? void 0 : customConfig.http2,
|
|
79
81
|
"allow-unauthenticated": (_d = customConfig === null || customConfig === void 0 ? void 0 : customConfig.allowUnauthenticated) !== null && _d !== void 0 ? _d : true,
|
|
80
82
|
ingress: (_e = customConfig === null || customConfig === void 0 ? void 0 : customConfig.ingress) !== null && _e !== void 0 ? _e : "all",
|
|
@@ -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
|
*
|