@catladder/cli 3.6.0 → 3.8.0
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 +1 -1
- package/dist/bundles/cli/index.js +1 -1
- package/dist/pipeline/src/build/artifacts/createBuildJobArtifact.js +3 -1
- package/dist/pipeline/src/build/artifacts/createBuildJobArtifact.js.map +1 -1
- package/dist/pipeline/src/build/base/index.d.ts +2 -3
- package/dist/pipeline/src/build/base/index.js.map +1 -1
- package/dist/pipeline/src/build/cache/getAllCacheConfigsFromConfig.js +6 -4
- package/dist/pipeline/src/build/cache/getAllCacheConfigsFromConfig.js.map +1 -1
- package/dist/pipeline/src/build/custom/buildJob.d.ts +2 -2
- package/dist/pipeline/src/build/custom/buildJob.js.map +1 -1
- package/dist/pipeline/src/build/custom/index.d.ts +2 -2
- package/dist/pipeline/src/build/custom/index.js.map +1 -1
- package/dist/pipeline/src/build/custom/testJob.d.ts +2 -2
- package/dist/pipeline/src/build/custom/testJob.js.map +1 -1
- package/dist/pipeline/src/build/docker.d.ts +4 -4
- package/dist/pipeline/src/build/docker.js.map +1 -1
- package/dist/pipeline/src/build/index.d.ts +2 -2
- package/dist/pipeline/src/build/index.js.map +1 -1
- package/dist/pipeline/src/build/node/buildJob.d.ts +5 -3
- package/dist/pipeline/src/build/node/buildJob.js.map +1 -1
- package/dist/pipeline/src/build/node/index.d.ts +4 -4
- package/dist/pipeline/src/build/node/index.js.map +1 -1
- package/dist/pipeline/src/build/node/meteor.d.ts +2 -2
- package/dist/pipeline/src/build/node/meteor.js.map +1 -1
- package/dist/pipeline/src/build/node/yarn.d.ts +1 -1
- package/dist/pipeline/src/build/node/yarn.js +3 -1
- package/dist/pipeline/src/build/node/yarn.js.map +1 -1
- package/dist/pipeline/src/build/rails/build.d.ts +2 -2
- package/dist/pipeline/src/build/rails/build.js.map +1 -1
- package/dist/pipeline/src/build/rails/index.d.ts +2 -2
- package/dist/pipeline/src/build/rails/index.js.map +1 -1
- package/dist/pipeline/src/build/sbom.d.ts +2 -2
- package/dist/pipeline/src/build/sbom.js.map +1 -1
- package/dist/pipeline/src/context/createComponentContext.js +17 -6
- package/dist/pipeline/src/context/createComponentContext.js.map +1 -1
- package/dist/pipeline/src/context/getLabels.js +3 -1
- package/dist/pipeline/src/context/getLabels.js.map +1 -1
- package/dist/pipeline/src/deploy/cloudRun/createJobs/cloudRunJobs.js +2 -2
- package/dist/pipeline/src/deploy/cloudRun/createJobs/cloudRunJobs.js.map +1 -1
- package/dist/pipeline/src/deploy/cloudRun/createJobs/cloudRunServices.js +16 -6
- package/dist/pipeline/src/deploy/cloudRun/createJobs/cloudRunServices.js.map +1 -1
- package/dist/pipeline/src/deploy/cloudRun/createJobs/execute/onDeploy.d.ts +1 -2
- package/dist/pipeline/src/deploy/cloudRun/createJobs/execute/onDeploy.js +3 -10
- package/dist/pipeline/src/deploy/cloudRun/createJobs/execute/onDeploy.js.map +1 -1
- package/dist/pipeline/src/deploy/cloudRun/createJobs/healthCheck.d.ts +5 -0
- package/dist/pipeline/src/deploy/cloudRun/createJobs/healthCheck.js +51 -0
- package/dist/pipeline/src/deploy/cloudRun/createJobs/healthCheck.js.map +1 -0
- package/dist/pipeline/src/deploy/cloudRun/utils/getJobOrServiceArgs.d.ts +2 -0
- package/dist/pipeline/src/deploy/cloudRun/utils/getJobOrServiceArgs.js +12 -0
- package/dist/pipeline/src/deploy/cloudRun/utils/getJobOrServiceArgs.js.map +1 -0
- package/dist/pipeline/src/deploy/kubernetes/kubeValues.d.ts +2 -2
- package/dist/pipeline/src/deploy/kubernetes/kubeValues.js +3 -1
- package/dist/pipeline/src/deploy/kubernetes/kubeValues.js.map +1 -1
- package/dist/pipeline/src/deploy/sbom.js +4 -3
- package/dist/pipeline/src/deploy/sbom.js.map +1 -1
- package/dist/pipeline/src/deploy/types/googleCloudRun.d.ts +80 -0
- package/dist/pipeline/src/deploy/types/googleCloudRun.js +16 -0
- package/dist/pipeline/src/deploy/types/googleCloudRun.js.map +1 -1
- package/dist/pipeline/src/pipeline/createJobsForComponent.js +3 -1
- package/dist/pipeline/src/pipeline/createJobsForComponent.js.map +1 -1
- package/dist/pipeline/src/types/config.d.ts +1 -1
- package/dist/pipeline/src/types/context.d.ts +6 -1
- package/dist/pipeline/src/types/context.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.getOnDeployExecuteScript = void 0;
|
|
4
4
|
const createArgsString_1 = require("../../utils/createArgsString");
|
|
5
|
+
const getJobOrServiceArgs_1 = require("../../utils/getJobOrServiceArgs");
|
|
5
6
|
const jobName_1 = require("../../utils/jobName");
|
|
6
7
|
const cloudRunJobs_1 = require("../cloudRunJobs");
|
|
7
8
|
const common_1 = require("../common");
|
|
@@ -69,17 +70,9 @@ const getJobRunScriptForExecute = (context, { jobName, config }) => {
|
|
|
69
70
|
const argString = (0, createArgsString_1.createArgsString)({
|
|
70
71
|
...commonArgs,
|
|
71
72
|
wait: waitForCompletion === true ? true : undefined,
|
|
72
|
-
args: (0,
|
|
73
|
+
args: (0, getJobOrServiceArgs_1.getCloudRunServiceOrJobArgsArg)(config.args),
|
|
73
74
|
});
|
|
74
75
|
const fullJobName = (0, jobName_1.getFullJobName)(context, jobName);
|
|
75
76
|
return `${(0, common_1.gcloudRunCmd)()} jobs execute ${fullJobName.toString()} ${argString}`;
|
|
76
77
|
};
|
|
77
|
-
const getCloudRunJobArgsArg = (args) => {
|
|
78
|
-
return args !== undefined
|
|
79
|
-
? args.length > 0
|
|
80
|
-
? args === null || args === void 0 ? void 0 : args.map((arg) => `"${arg}"`).join(",")
|
|
81
|
-
: ""
|
|
82
|
-
: undefined;
|
|
83
|
-
};
|
|
84
|
-
exports.getCloudRunJobArgsArg = getCloudRunJobArgsArg;
|
|
85
78
|
//# sourceMappingURL=onDeploy.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"onDeploy.js","sourceRoot":"","sources":["../../../../../../../../pipeline/src/deploy/cloudRun/createJobs/execute/onDeploy.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"onDeploy.js","sourceRoot":"","sources":["../../../../../../../../pipeline/src/deploy/cloudRun/createJobs/execute/onDeploy.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.healthCheckCliArgs = void 0;
|
|
4
|
+
const types_1 = require("../../types");
|
|
5
|
+
const PORT = 8080;
|
|
6
|
+
function healthCheckCliArgs(healthCheck) {
|
|
7
|
+
const shouldNotSetHealthCheck = healthCheck === undefined;
|
|
8
|
+
if (shouldNotSetHealthCheck) {
|
|
9
|
+
return undefined;
|
|
10
|
+
}
|
|
11
|
+
const shouldUseDefaultProbe = healthCheck === true;
|
|
12
|
+
if (shouldUseDefaultProbe) {
|
|
13
|
+
return {
|
|
14
|
+
"startup-probe": toArgValue(probeToKeyValuePairs(types_1.defaultStartupProbe)),
|
|
15
|
+
"liveness-probe": toArgValue(probeToKeyValuePairs(types_1.defaultLivenessProbe)),
|
|
16
|
+
};
|
|
17
|
+
}
|
|
18
|
+
return {
|
|
19
|
+
"startup-probe": toArgValue(probeToKeyValuePairs(healthCheck.startupProbe)),
|
|
20
|
+
"liveness-probe": healthCheck.livenessProbe
|
|
21
|
+
? toArgValue(probeToKeyValuePairs(healthCheck.livenessProbe))
|
|
22
|
+
: "", // NOTE: empty string ("") removes liveness probe
|
|
23
|
+
};
|
|
24
|
+
}
|
|
25
|
+
exports.healthCheckCliArgs = healthCheckCliArgs;
|
|
26
|
+
function probeToKeyValuePairs(probe) {
|
|
27
|
+
const sharedArgs = Object.entries({
|
|
28
|
+
initialDelaySeconds: probe.initialDelaySeconds,
|
|
29
|
+
timeoutSeconds: probe.timeoutSeconds,
|
|
30
|
+
periodSeconds: probe.periodSeconds,
|
|
31
|
+
failureThreshold: probe.failureThreshold,
|
|
32
|
+
});
|
|
33
|
+
switch (probe.type) {
|
|
34
|
+
case "tcp":
|
|
35
|
+
return [...sharedArgs, ["tcpSocket.port", PORT]];
|
|
36
|
+
case "http1":
|
|
37
|
+
return [
|
|
38
|
+
...sharedArgs,
|
|
39
|
+
["httpGet.port", PORT],
|
|
40
|
+
["httpGet.path", probe.path],
|
|
41
|
+
// NOTE: headers are not supported by "gcloud beta" at the moment
|
|
42
|
+
];
|
|
43
|
+
default:
|
|
44
|
+
probe;
|
|
45
|
+
return [];
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
function toArgValue(keyValues) {
|
|
49
|
+
return keyValues.map(([key, value]) => `${key}=${value}`).join(",");
|
|
50
|
+
}
|
|
51
|
+
//# sourceMappingURL=healthCheck.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"healthCheck.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/healthCheck.ts"],"names":[],"mappings":";;;AACA,uCAKqB;AAErB,MAAM,IAAI,GAAG,IAAI,CAAC;AAElB,SAAgB,kBAAkB,CAChC,WAAuD;IAEvD,MAAM,uBAAuB,GAAG,WAAW,KAAK,SAAS,CAAC;IAC1D,IAAI,uBAAuB,EAAE,CAAC;QAC5B,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,qBAAqB,GAAG,WAAW,KAAK,IAAI,CAAC;IAEnD,IAAI,qBAAqB,EAAE,CAAC;QAC1B,OAAO;YACL,eAAe,EAAE,UAAU,CAAC,oBAAoB,CAAC,2BAAmB,CAAC,CAAC;YACtE,gBAAgB,EAAE,UAAU,CAAC,oBAAoB,CAAC,4BAAoB,CAAC,CAAC;SACzE,CAAC;IACJ,CAAC;IAED,OAAO;QACL,eAAe,EAAE,UAAU,CAAC,oBAAoB,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;QAC3E,gBAAgB,EAAE,WAAW,CAAC,aAAa;YACzC,CAAC,CAAC,UAAU,CAAC,oBAAoB,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;YAC7D,CAAC,CAAC,EAAE,EAAE,iDAAiD;KAC1D,CAAC;AACJ,CAAC;AAvBD,gDAuBC;AAED,SAAS,oBAAoB,CAC3B,KAAgC;IAEhC,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC;QAChC,mBAAmB,EAAE,KAAK,CAAC,mBAAmB;QAC9C,cAAc,EAAE,KAAK,CAAC,cAAc;QACpC,aAAa,EAAE,KAAK,CAAC,aAAa;QAClC,gBAAgB,EAAE,KAAK,CAAC,gBAAgB;KACC,CAAC,CAAC;IAE7C,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;QACnB,KAAK,KAAK;YACR,OAAO,CAAC,GAAG,UAAU,EAAE,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC,CAAC;QACnD,KAAK,OAAO;YACV,OAAO;gBACL,GAAG,UAAU;gBACb,CAAC,cAAc,EAAE,IAAI,CAAC;gBACtB,CAAC,cAAc,EAAE,KAAK,CAAC,IAAI,CAAC;gBAC5B,iEAAiE;aAClE,CAAC;QACJ;YACE,KAAqB,CAAC;YACtB,OAAO,EAAE,CAAC;IACd,CAAC;AACH,CAAC;AAED,SAAS,UAAU,CAAC,SAA8B;IAChD,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACtE,CAAC"}
|
|
@@ -0,0 +1,2 @@
|
|
|
1
|
+
import type { DeployConfigCloudRunExecuteOnDeploy, DeployConfigCloudRunJob, DeployConfigCloudRunService } from "../../types";
|
|
2
|
+
export declare const getCloudRunServiceOrJobArgsArg: (args: DeployConfigCloudRunExecuteOnDeploy["args"] | DeployConfigCloudRunJob["args"] | DeployConfigCloudRunService["args"]) => string;
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getCloudRunServiceOrJobArgsArg = void 0;
|
|
4
|
+
const getCloudRunServiceOrJobArgsArg = (args) => {
|
|
5
|
+
return args !== undefined
|
|
6
|
+
? args.length > 0
|
|
7
|
+
? args === null || args === void 0 ? void 0 : args.map((arg) => `"${arg}"`).join(",")
|
|
8
|
+
: ""
|
|
9
|
+
: undefined;
|
|
10
|
+
};
|
|
11
|
+
exports.getCloudRunServiceOrJobArgsArg = getCloudRunServiceOrJobArgsArg;
|
|
12
|
+
//# sourceMappingURL=getJobOrServiceArgs.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getJobOrServiceArgs.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/utils/getJobOrServiceArgs.ts"],"names":[],"mappings":";;;AAMO,MAAM,8BAA8B,GAAG,CAC5C,IAGuC,EACvC,EAAE;IACF,OAAO,IAAI,KAAK,SAAS;QACvB,CAAC,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC;YACf,CAAC,CAAC,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,GAAG,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC;YAC1C,CAAC,CAAC,EAAE;QACN,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC,CAAC;AAXW,QAAA,8BAA8B,kCAWzC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type { ComponentContext } from "../../types/context";
|
|
2
|
-
export declare const createKubeValues: (context: ComponentContext) => any[] | ({
|
|
1
|
+
import type { BuildContextComponent, ComponentContext } from "../../types/context";
|
|
2
|
+
export declare const createKubeValues: (context: ComponentContext<BuildContextComponent>) => any[] | ({
|
|
3
3
|
env: {
|
|
4
4
|
secret: Record<string, import("../..").VariableValue>;
|
|
5
5
|
public: Record<string, import("../..").VariableValue>;
|
|
@@ -16,7 +16,9 @@ const createAppConfig = (context, application) => {
|
|
|
16
16
|
const { healthRoute, command, ...rest } = application !== null && application !== void 0 ? application : {};
|
|
17
17
|
return (0, utils_1.mergeWithMergingArrays)({
|
|
18
18
|
host: context.environment.envVars.HOSTNAME,
|
|
19
|
-
command: command !== null && command !== void 0 ? command : context.build.
|
|
19
|
+
command: command !== null && command !== void 0 ? command : (context.build.type !== "disabled"
|
|
20
|
+
? context.build.config.startCommand
|
|
21
|
+
: undefined),
|
|
20
22
|
livenessProbe: {
|
|
21
23
|
httpGet: {
|
|
22
24
|
path: healthRoute !== null && healthRoute !== void 0 ? healthRoute : "__health",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kubeValues.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/kubernetes/kubeValues.ts"],"names":[],"mappings":";;;AAAA,mCAA+B;
|
|
1
|
+
{"version":3,"file":"kubeValues.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/kubernetes/kubeValues.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,9 +4,10 @@ exports.getDependencyTrackDeleteScript = exports.getDependencyTrackUploadScript
|
|
|
4
4
|
const BashExpression_1 = require("../bash/BashExpression");
|
|
5
5
|
const sbom_1 = require("../build/sbom");
|
|
6
6
|
const context_1 = require("../types/context");
|
|
7
|
-
const sbomDeactivated = (context) =>
|
|
8
|
-
context
|
|
9
|
-
|
|
7
|
+
const sbomDeactivated = (context) => context.build.type === "disabled" ||
|
|
8
|
+
((0, context_1.componentContextIsStandaloneBuild)(context) &&
|
|
9
|
+
context.build.config.type === "custom" &&
|
|
10
|
+
context.build.config.sbom === false);
|
|
10
11
|
exports.sbomDeactivated = sbomDeactivated;
|
|
11
12
|
const getDependencyTrackUploadScript = (context) => {
|
|
12
13
|
return (0, exports.sbomDeactivated)(context)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sbom.js","sourceRoot":"","sources":["../../../../../pipeline/src/deploy/sbom.ts"],"names":[],"mappings":";;;AAAA,2DAAyD;AACzD,wCAA0C;AAC1C,8CAG0B;AAEnB,MAAM,eAAe,GAAG,CAAC,OAAyB,EAAE,EAAE,CAC3D,IAAA,2CAAiC,EAAC,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"sbom.js","sourceRoot":"","sources":["../../../../../pipeline/src/deploy/sbom.ts"],"names":[],"mappings":";;;AAAA,2DAAyD;AACzD,wCAA0C;AAC1C,8CAG0B;AAEnB,MAAM,eAAe,GAAG,CAAC,OAAyB,EAAE,EAAE,CAC3D,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU;IACjC,CAAC,IAAA,2CAAiC,EAAC,OAAO,CAAC;QACzC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,KAAK,QAAQ;QACtC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC;AAJ5B,QAAA,eAAe,mBAIa;AAElC,MAAM,8BAA8B,GAAG,CAC5C,OAAyB,EACf,EAAE;IACZ,OAAO,IAAA,uBAAe,EAAC,OAAO,CAAC;QAC7B,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC;YACE,2CAA2C;YAC3C,oEAAoE,OAAO,CAAC,UAAU,CAAC,YAAY,IAAI,OAAO,CAAC,UAAU,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,MAAM,IAAA,gCAAe,EAAC,UAAU,CAAC,MAAM,gBAAS,oBAAoB;SACtN,CAAC;AACR,CAAC,CAAC;AATW,QAAA,8BAA8B,kCASzC;AAEK,MAAM,8BAA8B,GAAG,CAC5C,OAAyB,EACf,EAAE;IACZ,OAAO,IAAA,uBAAe,EAAC,OAAO,CAAC;QAC7B,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC;YACE,gDAAgD;YAChD,qEAAqE,OAAO,CAAC,UAAU,CAAC,YAAY,IAAI,OAAO,CAAC,UAAU,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,MAAM,IAAA,gCAAe,EAAC,oBAAoB,CAAC,WAAW;SACzM,CAAC;AACR,CAAC,CAAC;AATW,QAAA,8BAA8B,kCASzC"}
|
|
@@ -126,7 +126,87 @@ export type DeployConfigCloudRunService = {
|
|
|
126
126
|
* gpu type to use. Refer to https://cloud.google.com/run/docs/configuring/services/gpu#gcloud for defaults
|
|
127
127
|
*/
|
|
128
128
|
gpuType?: string;
|
|
129
|
+
/**
|
|
130
|
+
* the image to use. Defaults to the image from the build.
|
|
131
|
+
*
|
|
132
|
+
* If you specify an image, you usually want to disable the build by setting build: false
|
|
133
|
+
*/
|
|
134
|
+
image?: string;
|
|
135
|
+
/**
|
|
136
|
+
* args to pass to the command
|
|
137
|
+
*/
|
|
138
|
+
args?: string[];
|
|
139
|
+
/**
|
|
140
|
+
* Configuration of the health check.
|
|
141
|
+
*
|
|
142
|
+
* When set to `true`, startup and liveness probes will be
|
|
143
|
+
* configured to `defaultStartupProbe` and `defaultLivenessProbe`.
|
|
144
|
+
*
|
|
145
|
+
* When not set, default Cloud Run's health check
|
|
146
|
+
* configuration is used (startup TCP probe and no liveness probe).
|
|
147
|
+
*/
|
|
148
|
+
healthCheck?: true | {
|
|
149
|
+
/**
|
|
150
|
+
* Startup probe configuration.
|
|
151
|
+
*/
|
|
152
|
+
startupProbe: DeployConfigCloudRunProbe;
|
|
153
|
+
/**
|
|
154
|
+
* Liveness probe configuration.
|
|
155
|
+
* `false` disables the liveness probe.
|
|
156
|
+
*/
|
|
157
|
+
livenessProbe: false | DeployConfigCloudRunProbe;
|
|
158
|
+
};
|
|
129
159
|
} & DeployConfigCloudRunWithVolumes & DeployConfigCloudRunNetworkConfig;
|
|
160
|
+
export declare const defaultStartupProbe: DeployConfigCloudRunProbe;
|
|
161
|
+
export declare const defaultLivenessProbe: DeployConfigCloudRunProbe;
|
|
162
|
+
export type DeployConfigCloudRunProbe = DeployConfigCloudRunHttp1Probe | DeployConfigCloudRunTcpProbe;
|
|
163
|
+
export type DeployConfigCloudRunProbeShared = {
|
|
164
|
+
/**
|
|
165
|
+
* The period in seconds at which to perform the probe.
|
|
166
|
+
* For example 2 to perform the probe every 2 seconds.
|
|
167
|
+
* Specify a value **from 1 second to 240** seconds.
|
|
168
|
+
*/
|
|
169
|
+
periodSeconds: number;
|
|
170
|
+
/**
|
|
171
|
+
* The number of seconds to wait after the container has started before performing the first probe.
|
|
172
|
+
* Specify a value **from 0 seconds to 240** seconds.
|
|
173
|
+
*/
|
|
174
|
+
initialDelaySeconds: number;
|
|
175
|
+
/**
|
|
176
|
+
* The number of seconds to wait until the probe times out.
|
|
177
|
+
* This value cannot exceed the value specified for `period`.
|
|
178
|
+
* Specify a value **from 1 to 240**.
|
|
179
|
+
*/
|
|
180
|
+
timeoutSeconds: number;
|
|
181
|
+
/**
|
|
182
|
+
* The number of times to retry the probe before shutting down the container.
|
|
183
|
+
*/
|
|
184
|
+
failureThreshold: number;
|
|
185
|
+
};
|
|
186
|
+
export type DeployConfigCloudRunTcpProbe = DeployConfigCloudRunProbeShared & {
|
|
187
|
+
/**
|
|
188
|
+
* Cloud Run makes a TCP connection to open the TCP Socket on the specified port.
|
|
189
|
+
* If Cloud Run is unable to establish a connection, it indicates a failure.
|
|
190
|
+
*/
|
|
191
|
+
type: "tcp";
|
|
192
|
+
};
|
|
193
|
+
export type DeployConfigCloudRunHttp1Probe = DeployConfigCloudRunProbeShared & {
|
|
194
|
+
/**
|
|
195
|
+
* **This will NOT work with http2 enabled services**
|
|
196
|
+
*
|
|
197
|
+
* Cloud Run makes an HTTP GET request to the service health check endpoint (for example, /ready).
|
|
198
|
+
* Any response between 200 and 400 is a success, everything else indicates failure.
|
|
199
|
+
*
|
|
200
|
+
* If a startup probe does not succeed within the specified time (failureThreshold * period), which cannot exceed 240 seconds, the container is shut down.
|
|
201
|
+
*
|
|
202
|
+
* If the HTTP startup probe succeeds within the specified time, and you have enabled liveness probe, the HTTP liveness probe is started.
|
|
203
|
+
*/
|
|
204
|
+
type: "http1";
|
|
205
|
+
/**
|
|
206
|
+
* the route path to check for health status of the service starting with a `/`.
|
|
207
|
+
*/
|
|
208
|
+
path: string;
|
|
209
|
+
};
|
|
130
210
|
export type DeployConfigCloudRunNetworkConfig = {
|
|
131
211
|
network?: string;
|
|
132
212
|
/**
|
|
@@ -1,3 +1,19 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.defaultLivenessProbe = exports.defaultStartupProbe = void 0;
|
|
4
|
+
exports.defaultStartupProbe = {
|
|
5
|
+
type: "http1",
|
|
6
|
+
path: "/__health",
|
|
7
|
+
initialDelaySeconds: 5,
|
|
8
|
+
timeoutSeconds: 1,
|
|
9
|
+
periodSeconds: 30,
|
|
10
|
+
failureThreshold: 3,
|
|
11
|
+
};
|
|
12
|
+
exports.defaultLivenessProbe = {
|
|
13
|
+
...exports.defaultStartupProbe,
|
|
14
|
+
initialDelaySeconds: 0,
|
|
15
|
+
timeoutSeconds: 10,
|
|
16
|
+
periodSeconds: 30,
|
|
17
|
+
failureThreshold: 3,
|
|
18
|
+
};
|
|
3
19
|
//# sourceMappingURL=googleCloudRun.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"googleCloudRun.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/types/googleCloudRun.ts"],"names":[],"mappings":""}
|
|
1
|
+
{"version":3,"file":"googleCloudRun.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/types/googleCloudRun.ts"],"names":[],"mappings":";;;AA4Na,QAAA,mBAAmB,GAA8B;IAC5D,IAAI,EAAE,OAAO;IACb,IAAI,EAAE,WAAW;IAEjB,mBAAmB,EAAE,CAAC;IACtB,cAAc,EAAE,CAAC;IACjB,aAAa,EAAE,EAAE;IACjB,gBAAgB,EAAE,CAAC;CACpB,CAAC;AAEW,QAAA,oBAAoB,GAA8B;IAC7D,GAAG,2BAAmB;IAEtB,mBAAmB,EAAE,CAAC;IACtB,cAAc,EAAE,EAAE;IAClB,aAAa,EAAE,EAAE;IACjB,gBAAgB,EAAE,CAAC;CACpB,CAAC"}
|
|
@@ -21,7 +21,9 @@ const getCustomJobs = (context) => {
|
|
|
21
21
|
return injectDefaultVarsInCustomJobs(context, rawJobs);
|
|
22
22
|
};
|
|
23
23
|
const createJobsForComponentContext = (context) => {
|
|
24
|
-
const buildJobs =
|
|
24
|
+
const buildJobs = context.build.type !== "disabled"
|
|
25
|
+
? build_1.BUILD_TYPES[context.build.buildType].jobs(context)
|
|
26
|
+
: [];
|
|
25
27
|
const deployJobs = context.componentConfig.deploy !== false
|
|
26
28
|
? deploy_1.DEPLOY_TYPES[context.componentConfig.deploy.type].jobs(context)
|
|
27
29
|
: [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createJobsForComponent.js","sourceRoot":"","sources":["../../../../../pipeline/src/pipeline/createJobsForComponent.ts"],"names":[],"mappings":";;;AAAA,oCAAuC;AACvC,sCAAyC;
|
|
1
|
+
{"version":3,"file":"createJobsForComponent.js","sourceRoot":"","sources":["../../../../../pipeline/src/pipeline/createJobsForComponent.ts"],"names":[],"mappings":";;;AAAA,oCAAuC;AACvC,sCAAyC;AAOzC,MAAM,6BAA6B,GAAG,CACpC,OAAyB,EACzB,IAAoB,EACpB,EAAE,CACF,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,EAAE,GAAG,GAAG,EAAE,EAAE,EAAE;;IAAC,OAAA,CAAC;QACnC,SAAS,EAAE;YACT,GAAG,CAAC,MAAA,OAAO,CAAC,WAAW,CAAC,OAAO,mCAAI,EAAE,CAAC;YACtC,GAAG,CAAC,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,EAAE,CAAC;SACrB;QACD,GAAG,GAAG;KACP,CAAC,CAAA;CAAA,CAAC,CAAC;AACN,MAAM,aAAa,GAAG,CAAC,OAAyB,EAAE,EAAE;IAClD,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;QACxB,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;IACnC,OAAO,6BAA6B,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AACzD,CAAC,CAAC;AACK,MAAM,6BAA6B,GAAG,CAC3C,OAAyB,EACT,EAAE;IAClB,MAAM,SAAS,GACb,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU;QAC/B,CAAC,CAAC,mBAAW,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,CACvC,OAAoC,CACrC;QACH,CAAC,CAAC,EAAE,CAAC;IACT,MAAM,UAAU,GACd,OAAO,CAAC,eAAe,CAAC,MAAM,KAAK,KAAK;QACtC,CAAC,CAAC,qBAAY,CAAC,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC;QACjE,CAAC,CAAC,EAAE,CAAC;IAET,MAAM,UAAU,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;IAC1C,OAAO,CAAC,GAAG,SAAS,EAAE,GAAG,UAAU,EAAE,GAAG,UAAU,CAAC,CAAC;AACtD,CAAC,CAAC;AAhBW,QAAA,6BAA6B,iCAgBxC"}
|
|
@@ -86,6 +86,9 @@ export type BuildContextStandalone<C extends BuildConfigStandalone = BuildConfig
|
|
|
86
86
|
type: "standalone";
|
|
87
87
|
buildType: C["type"];
|
|
88
88
|
};
|
|
89
|
+
export type BuildContextDisabled = BuildContextComponentBase & {
|
|
90
|
+
type: "disabled";
|
|
91
|
+
};
|
|
89
92
|
export type BuildContextFromWorkspace = BuildContextComponentBase & {
|
|
90
93
|
config: BuildConfigFromWorkspace;
|
|
91
94
|
workspaceName: string;
|
|
@@ -101,7 +104,8 @@ export type BuildContextWorkspace = BuildContextBase & {
|
|
|
101
104
|
buildType: WorkspaceBuildConfig["type"];
|
|
102
105
|
config: WorkspaceBuildConfig;
|
|
103
106
|
};
|
|
104
|
-
export type
|
|
107
|
+
export type BuildContextWithBuild = BuildContextStandalone | BuildContextFromWorkspace;
|
|
108
|
+
export type BuildContextComponent = BuildContextWithBuild | BuildContextDisabled;
|
|
105
109
|
export type BuildContext = BuildContextComponent | BuildContextWorkspace;
|
|
106
110
|
export type DeployContext = {
|
|
107
111
|
config: DeployConfig;
|
|
@@ -129,6 +133,7 @@ export type ComponentContext<BC extends BuildContextComponent = BuildContextComp
|
|
|
129
133
|
packageManagerInfo: PackageManagerInfoComponent;
|
|
130
134
|
customJobs?: CatladderJob[];
|
|
131
135
|
};
|
|
136
|
+
export type ComponentContextWithBuild = ComponentContext<BuildContextWithBuild>;
|
|
132
137
|
export type Context = ComponentContext | WorkspaceContext;
|
|
133
138
|
export type CatladderJobWithContext<S = BaseStage> = CatladderJob<S> & {
|
|
134
139
|
context: ComponentContext;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../../../pipeline/src/types/context.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../../../pipeline/src/types/context.ts"],"names":[],"mappings":";;;AA6LO,MAAM,iCAAiC,GAAG,CAC/C,OAAgD,EACK,EAAE;IACvD,OAAO,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,YAAY,CAAC;AAC7C,CAAC,CAAC;AAJW,QAAA,iCAAiC,qCAI5C;AAEK,MAAM,iCAAiC,GAAG,CAC/C,OAAgD,EACQ,EAAE;IAC1D,OAAO,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,eAAe,CAAC;AAChD,CAAC,CAAC;AAJW,QAAA,iCAAiC,qCAI5C"}
|