@catladder/cli 1.146.1 → 1.147.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/cli/src/apps/cli/commands/project/commandCloudSqlProxy.js +22 -19
- package/dist/cli/src/apps/cli/commands/project/commandCloudSqlProxy.js.map +1 -1
- package/dist/cli/src/apps/cli/commands/project/commandOpenDashboard.js +10 -9
- package/dist/cli/src/apps/cli/commands/project/commandOpenDashboard.js.map +1 -1
- package/dist/cli/src/apps/cli/commands/project/commandPortForward.js +18 -16
- package/dist/cli/src/apps/cli/commands/project/commandPortForward.js.map +1 -1
- package/dist/cli/src/apps/cli/commands/project/setup/setupCloudRun.d.ts +2 -2
- package/dist/cli/src/apps/cli/commands/project/setup/setupCloudRun.js +10 -9
- package/dist/cli/src/apps/cli/commands/project/setup/setupCloudRun.js.map +1 -1
- package/dist/cli/src/apps/cli/commands/project/setup/setupContext.d.ts +2 -2
- package/dist/cli/src/apps/cli/commands/project/setup/setupContext.js +9 -8
- package/dist/cli/src/apps/cli/commands/project/setup/setupContext.js.map +1 -1
- package/dist/cli/src/apps/cli/commands/project/setup/setupKubernetes.d.ts +2 -2
- package/dist/cli/src/apps/cli/commands/project/setup/setupKubernetes.js +23 -22
- package/dist/cli/src/apps/cli/commands/project/setup/setupKubernetes.js.map +1 -1
- package/dist/cli/src/apps/cli/commands/project/utils/ensureCluster.js +10 -9
- package/dist/cli/src/apps/cli/commands/project/utils/ensureCluster.js.map +1 -1
- package/dist/cli/src/apps/cli/commands/project/utils/ensureNamespace.d.ts +2 -2
- package/dist/cli/src/apps/cli/commands/project/utils/ensureNamespace.js.map +1 -1
- package/dist/cli/src/config/getProjectConfig.d.ts +2 -2
- package/dist/cli/src/config/getProjectConfig.js +1 -1
- package/dist/cli/src/config/getProjectConfig.js.map +1 -1
- package/dist/cli/src/gcloud/cloudRun/openCloudRunDashboards.d.ts +2 -2
- package/dist/cli/src/gcloud/cloudRun/openCloudRunDashboards.js +6 -5
- package/dist/cli/src/gcloud/cloudRun/openCloudRunDashboards.js.map +1 -1
- package/dist/cli/src/gcloud/serviceAccounts.d.ts +2 -2
- package/dist/cli/src/gcloud/serviceAccounts.js.map +1 -1
- package/dist/cli/src/kubernetes/openKubernetesDashboards.d.ts +3 -3
- package/dist/cli/src/kubernetes/openKubernetesDashboards.js +10 -8
- package/dist/cli/src/kubernetes/openKubernetesDashboards.js.map +1 -1
- package/dist/pipeline/src/build/base/createAppBuildJob.d.ts +2 -2
- package/dist/pipeline/src/build/base/createAppBuildJob.js +8 -6
- package/dist/pipeline/src/build/base/createAppBuildJob.js.map +1 -1
- package/dist/pipeline/src/build/base/index.d.ts +2 -2
- package/dist/pipeline/src/build/base/index.js.map +1 -1
- package/dist/pipeline/src/build/base/writeBuildInfo.d.ts +2 -2
- package/dist/pipeline/src/build/base/writeBuildInfo.js +1 -1
- package/dist/pipeline/src/build/base/writeBuildInfo.js.map +1 -1
- package/dist/pipeline/src/build/base/writeDotEnv.d.ts +2 -2
- package/dist/pipeline/src/build/base/writeDotEnv.js +1 -1
- package/dist/pipeline/src/build/base/writeDotEnv.js.map +1 -1
- package/dist/pipeline/src/build/custom/buildJob.d.ts +2 -2
- package/dist/pipeline/src/build/custom/buildJob.js +6 -6
- 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 +5 -5
- package/dist/pipeline/src/build/custom/testJob.js.map +1 -1
- package/dist/pipeline/src/build/docker.d.ts +32 -11
- package/dist/pipeline/src/build/docker.js +50 -17
- 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/node/buildJob.d.ts +2 -2
- package/dist/pipeline/src/build/node/buildJob.js +11 -11
- package/dist/pipeline/src/build/node/buildJob.js.map +1 -1
- package/dist/pipeline/src/build/node/cache.d.ts +5 -5
- package/dist/pipeline/src/build/node/cache.js +5 -5
- package/dist/pipeline/src/build/node/cache.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 +10 -10
- package/dist/pipeline/src/build/node/meteor.js.map +1 -1
- package/dist/pipeline/src/build/node/testJob.d.ts +2 -2
- package/dist/pipeline/src/build/node/testJob.js +12 -12
- package/dist/pipeline/src/build/node/testJob.js.map +1 -1
- package/dist/pipeline/src/build/node/yarn.d.ts +4 -4
- package/dist/pipeline/src/build/node/yarn.js +1 -3
- 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 +3 -3
- 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/rails/test.d.ts +2 -2
- package/dist/pipeline/src/build/rails/test.js +4 -4
- package/dist/pipeline/src/build/rails/test.js.map +1 -1
- package/dist/pipeline/src/build/sbom.d.ts +2 -2
- package/dist/pipeline/src/build/sbom.js +3 -3
- package/dist/pipeline/src/build/sbom.js.map +1 -1
- package/dist/pipeline/src/build/types.d.ts +33 -25
- package/dist/pipeline/src/build/types.js.map +1 -1
- package/dist/pipeline/src/context/getEnvironment.d.ts +2 -2
- package/dist/pipeline/src/context/getEnvironment.js.map +1 -1
- package/dist/pipeline/src/context/getEnvironmentContext.d.ts +2 -2
- package/dist/pipeline/src/context/getEnvironmentContext.js.map +1 -1
- package/dist/pipeline/src/context/getEnvironmentVariables.d.ts +4 -4
- package/dist/pipeline/src/context/getEnvironmentVariables.js.map +1 -1
- package/dist/pipeline/src/context/getLabels.d.ts +2 -2
- package/dist/pipeline/src/context/getLabels.js +1 -1
- package/dist/pipeline/src/context/getLabels.js.map +1 -1
- package/dist/pipeline/src/context/index.d.ts +7 -3
- package/dist/pipeline/src/context/index.js +46 -15
- package/dist/pipeline/src/context/index.js.map +1 -1
- package/dist/pipeline/src/deploy/base/deploy.d.ts +2 -2
- package/dist/pipeline/src/deploy/base/deploy.js +10 -17
- package/dist/pipeline/src/deploy/base/deploy.js.map +1 -1
- package/dist/pipeline/src/deploy/base/index.d.ts +2 -2
- package/dist/pipeline/src/deploy/base/index.js.map +1 -1
- package/dist/pipeline/src/deploy/base/rollback.d.ts +2 -2
- package/dist/pipeline/src/deploy/base/rollback.js.map +1 -1
- package/dist/pipeline/src/deploy/base/stop.d.ts +2 -2
- package/dist/pipeline/src/deploy/base/stop.js.map +1 -1
- package/dist/pipeline/src/deploy/cloudRun/artifactsRegistry.d.ts +7 -7
- package/dist/pipeline/src/deploy/cloudRun/artifactsRegistry.js +8 -9
- package/dist/pipeline/src/deploy/cloudRun/artifactsRegistry.js.map +1 -1
- package/dist/pipeline/src/deploy/cloudRun/cleanup.d.ts +2 -2
- package/dist/pipeline/src/deploy/cloudRun/cleanup.js.map +1 -1
- package/dist/pipeline/src/deploy/cloudRun/cloudRunRevisions.d.ts +2 -2
- package/dist/pipeline/src/deploy/cloudRun/cloudRunRevisions.js +4 -5
- package/dist/pipeline/src/deploy/cloudRun/cloudRunRevisions.js.map +1 -1
- package/dist/pipeline/src/deploy/cloudRun/createJobs/cloudRunJobs.d.ts +6 -6
- package/dist/pipeline/src/deploy/cloudRun/createJobs/cloudRunJobs.js.map +1 -1
- package/dist/pipeline/src/deploy/cloudRun/createJobs/cloudRunServices.d.ts +3 -3
- package/dist/pipeline/src/deploy/cloudRun/createJobs/cloudRunServices.js +1 -1
- package/dist/pipeline/src/deploy/cloudRun/createJobs/cloudRunServices.js.map +1 -1
- package/dist/pipeline/src/deploy/cloudRun/createJobs/common.js +2 -1
- package/dist/pipeline/src/deploy/cloudRun/createJobs/common.js.map +1 -1
- package/dist/pipeline/src/deploy/cloudRun/createJobs/getCloudRunDeployScripts.d.ts +2 -2
- package/dist/pipeline/src/deploy/cloudRun/createJobs/getCloudRunDeployScripts.js.map +1 -1
- package/dist/pipeline/src/deploy/cloudRun/createJobs/getCloudRunStopScripts.d.ts +2 -2
- package/dist/pipeline/src/deploy/cloudRun/createJobs/getCloudRunStopScripts.js.map +1 -1
- package/dist/pipeline/src/deploy/cloudRun/createJobs/index.d.ts +2 -2
- package/dist/pipeline/src/deploy/cloudRun/createJobs/index.js +2 -4
- package/dist/pipeline/src/deploy/cloudRun/createJobs/index.js.map +1 -1
- package/dist/pipeline/src/deploy/cloudRun/utils/database.d.ts +3 -3
- package/dist/pipeline/src/deploy/cloudRun/utils/database.js.map +1 -1
- package/dist/pipeline/src/deploy/cloudRun/utils/gcloudServiceAccountLoginCommands.d.ts +2 -2
- package/dist/pipeline/src/deploy/cloudRun/utils/gcloudServiceAccountLoginCommands.js.map +1 -1
- package/dist/pipeline/src/deploy/cloudRun/utils/getServiceName.d.ts +2 -2
- package/dist/pipeline/src/deploy/cloudRun/utils/getServiceName.js.map +1 -1
- package/dist/pipeline/src/deploy/custom/deployJob.d.ts +2 -2
- package/dist/pipeline/src/deploy/custom/deployJob.js +9 -10
- package/dist/pipeline/src/deploy/custom/deployJob.js.map +1 -1
- package/dist/pipeline/src/deploy/dockerTag/deployJob.d.ts +2 -2
- package/dist/pipeline/src/deploy/dockerTag/deployJob.js +3 -5
- package/dist/pipeline/src/deploy/dockerTag/deployJob.js.map +1 -1
- package/dist/pipeline/src/deploy/index.d.ts +2 -2
- package/dist/pipeline/src/deploy/kubernetes/cloudSql/index.d.ts +3 -3
- package/dist/pipeline/src/deploy/kubernetes/cloudSql/index.js +11 -9
- package/dist/pipeline/src/deploy/kubernetes/cloudSql/index.js.map +1 -1
- package/dist/pipeline/src/deploy/kubernetes/deployJob.d.ts +2 -2
- package/dist/pipeline/src/deploy/kubernetes/deployJob.js +3 -6
- package/dist/pipeline/src/deploy/kubernetes/deployJob.js.map +1 -1
- package/dist/pipeline/src/deploy/kubernetes/kubeEnv.d.ts +2 -2
- package/dist/pipeline/src/deploy/kubernetes/kubeEnv.js +2 -1
- package/dist/pipeline/src/deploy/kubernetes/kubeEnv.js.map +1 -1
- package/dist/pipeline/src/deploy/kubernetes/kubeValues.d.ts +2 -2
- package/dist/pipeline/src/deploy/kubernetes/kubeValues.js +6 -6
- package/dist/pipeline/src/deploy/kubernetes/kubeValues.js.map +1 -1
- package/dist/pipeline/src/deploy/kubernetes/mongodb.d.ts +2 -2
- package/dist/pipeline/src/deploy/kubernetes/mongodb.js +11 -11
- package/dist/pipeline/src/deploy/kubernetes/mongodb.js.map +1 -1
- package/dist/pipeline/src/deploy/sbom.d.ts +4 -4
- package/dist/pipeline/src/deploy/sbom.js +1 -2
- package/dist/pipeline/src/deploy/sbom.js.map +1 -1
- package/dist/pipeline/src/deploy/types/index.d.ts +1 -1
- package/dist/pipeline/src/deploy/types/index.js +1 -1
- package/dist/pipeline/src/deploy/types/index.js.map +1 -1
- package/dist/pipeline/src/deploy/utils.d.ts +2 -2
- package/dist/pipeline/src/deploy/utils.js +2 -1
- package/dist/pipeline/src/deploy/utils.js.map +1 -1
- package/dist/pipeline/src/pipeline/createJobsForComponent.d.ts +2 -2
- package/dist/pipeline/src/pipeline/createJobsForComponent.js +7 -9
- package/dist/pipeline/src/pipeline/createJobsForComponent.js.map +1 -1
- package/dist/pipeline/src/pipeline/gitlab/createGitlabJobs.js.map +1 -1
- package/dist/pipeline/src/types/config.d.ts +2 -2
- package/dist/pipeline/src/types/context.d.ts +28 -2
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/apps/cli/commands/project/commandCloudSqlProxy.ts +9 -12
- package/src/apps/cli/commands/project/commandOpenDashboard.ts +2 -2
- package/src/apps/cli/commands/project/commandPortForward.ts +9 -6
- package/src/apps/cli/commands/project/setup/setupCloudRun.ts +4 -4
- package/src/apps/cli/commands/project/setup/setupContext.ts +4 -4
- package/src/apps/cli/commands/project/setup/setupKubernetes.ts +3 -3
- package/src/apps/cli/commands/project/utils/ensureCluster.ts +2 -4
- package/src/apps/cli/commands/project/utils/ensureNamespace.ts +2 -2
- package/src/config/getProjectConfig.ts +2 -2
- package/src/gcloud/cloudRun/openCloudRunDashboards.ts +4 -4
- package/src/gcloud/serviceAccounts.ts +3 -3
- package/src/kubernetes/openKubernetesDashboards.ts +5 -5
|
@@ -30,17 +30,18 @@ var BashExpression_1 = require("../../bash/BashExpression");
|
|
|
30
30
|
var gitlab_1 = require("../../utils/gitlab");
|
|
31
31
|
var types_1 = require("../types");
|
|
32
32
|
var removeFirstLinesFromCommandOutput_1 = require("./utils/removeFirstLinesFromCommandOutput");
|
|
33
|
-
var getArtifactsRegistryHost = function (
|
|
34
|
-
var
|
|
35
|
-
if (!(0, types_1.isOfDeployType)(deploy, "google-cloudrun")) {
|
|
33
|
+
var getArtifactsRegistryHost = function (context) {
|
|
34
|
+
var _a;
|
|
35
|
+
if (!(0, types_1.isOfDeployType)((_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config, "google-cloudrun")) {
|
|
36
36
|
// should not happen
|
|
37
37
|
throw new Error("deploy config is wrong");
|
|
38
38
|
}
|
|
39
|
-
return "".concat(deploy.region, "-docker.pkg.dev");
|
|
39
|
+
return "".concat(context.deploy.config.region, "-docker.pkg.dev");
|
|
40
40
|
};
|
|
41
41
|
exports.getArtifactsRegistryHost = getArtifactsRegistryHost;
|
|
42
42
|
var getArtifactsRegistryDockerUrl = function (context) {
|
|
43
|
-
var
|
|
43
|
+
var _a;
|
|
44
|
+
var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
|
|
44
45
|
if (!(0, types_1.isOfDeployType)(deployConfig, "google-cloudrun")) {
|
|
45
46
|
// should not happen
|
|
46
47
|
throw new Error("deploy config is wrong");
|
|
@@ -103,11 +104,9 @@ var getDeleteImageCommands = function (fullImageName, keepNewest) {
|
|
|
103
104
|
* @returns
|
|
104
105
|
*/
|
|
105
106
|
var getDeleteUnusedImagesCommands = function (context, keep) {
|
|
107
|
+
var _a;
|
|
106
108
|
if (keep === void 0) { keep = 0; }
|
|
107
|
-
var deployConfig = context.
|
|
108
|
-
if (deployConfig === false) {
|
|
109
|
-
return [];
|
|
110
|
-
}
|
|
109
|
+
var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
|
|
111
110
|
if (!(0, types_1.isOfDeployType)(deployConfig, "google-cloudrun")) {
|
|
112
111
|
// should not happen
|
|
113
112
|
throw new Error("deploy config is wrong");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"artifactsRegistry.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/cloudRun/artifactsRegistry.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,4DAAgE;AAEhE,6CAA2D;AAC3D,kCAA0C;AAC1C,+FAA8F;AAEvF,IAAM,wBAAwB,GAAG,UAAC,
|
|
1
|
+
{"version":3,"file":"artifactsRegistry.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/cloudRun/artifactsRegistry.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
export declare const getRemoveOldRevisionsAndImagesCommand: (context:
|
|
1
|
+
import type { ComponentContext } from "../../types/context";
|
|
2
|
+
export declare const getRemoveOldRevisionsAndImagesCommand: (context: ComponentContext, when: "postDeploy" | "onStop") => string[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cleanup.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/cloudRun/cleanup.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,yDAAoE;AACpE,yDAAuE;AAEhE,IAAM,qCAAqC,GAAG,UACnD,
|
|
1
|
+
{"version":3,"file":"cleanup.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/cloudRun/cleanup.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,yDAAoE;AACpE,yDAAuE;AAEhE,IAAM,qCAAqC,GAAG,UACnD,OAAyB,EACzB,IAA6B;IAE7B,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;QACtB,+FAA+F;QAC/F,OAAO,IAAA,iDAA6B,EAAC,OAAO,CAAC,CAAC;IAChD,CAAC;IAED,8CAA8C;IAC9C,IAAM,eAAe,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAEvE,2EAA2E;IAC3E,IAAM,YAAY,GAAG,eAAe,GAAG,CAAC,CAAC;IAEzC,IAAM,0BAA0B,GAAG,IAAA,oDAAgC,EACjE,OAAO,EACP,eAAe,CAChB,CAAC;IACF,IAAM,uBAAuB,GAAG,IAAA,iDAA6B,EAC3D,OAAO,EACP,YAAY,CACb,CAAC;IAEF,8CAAW,0BAA0B,kBAAK,uBAAuB,UAAE;AACrE,CAAC,CAAC;AAzBW,QAAA,qCAAqC,yCAyBhD"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
export declare const getDeleteUnusedRevisionsCommands: (context:
|
|
1
|
+
import type { ComponentContext } from "../../types/context";
|
|
2
|
+
export declare const getDeleteUnusedRevisionsCommands: (context: ComponentContext, keep: number) => string[];
|
|
@@ -17,8 +17,9 @@ var createArgsString_1 = require("./utils/createArgsString");
|
|
|
17
17
|
var getServiceName_1 = require("./utils/getServiceName");
|
|
18
18
|
var removeFirstLinesFromCommandOutput_1 = require("./utils/removeFirstLinesFromCommandOutput");
|
|
19
19
|
var getListRevisionsCommand = function (context, args) {
|
|
20
|
+
var _a;
|
|
20
21
|
var serviceName = (0, getServiceName_1.getServiceName)(context);
|
|
21
|
-
var deployConfig = context.
|
|
22
|
+
var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
|
|
22
23
|
if (!deployConfig || !(0, types_1.isOfDeployType)(deployConfig, "google-cloudrun")) {
|
|
23
24
|
// should not happen
|
|
24
25
|
throw new Error("deploy config is wrong");
|
|
@@ -30,10 +31,8 @@ var getListRevisionsCommand = function (context, args) {
|
|
|
30
31
|
return "gcloud run revisions list ".concat((0, createArgsString_1.createArgsString)(filterRevisionArgs));
|
|
31
32
|
};
|
|
32
33
|
var getDeleteUnusedRevisionsCommands = function (context, keep) {
|
|
33
|
-
var
|
|
34
|
-
|
|
35
|
-
return [];
|
|
36
|
-
}
|
|
34
|
+
var _a;
|
|
35
|
+
var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
|
|
37
36
|
if (!(0, types_1.isOfDeployType)(deployConfig, "google-cloudrun")) {
|
|
38
37
|
// should not happen
|
|
39
38
|
throw new Error("deploy config is wrong");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloudRunRevisions.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/cloudRun/cloudRunRevisions.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,kCAA0C;AAC1C,6DAA4D;AAC5D,yDAAwD;AACxD,+FAA8F;AAE9F,IAAM,uBAAuB,GAAG,UAC9B,
|
|
1
|
+
{"version":3,"file":"cloudRunRevisions.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/cloudRun/cloudRunRevisions.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,kCAA0C;AAC1C,6DAA4D;AAC5D,yDAAwD;AACxD,+FAA8F;AAE9F,IAAM,uBAAuB,GAAG,UAC9B,OAAyB,EACzB,IAGC;;IAED,IAAM,WAAW,GAAG,IAAA,+BAAc,EAAC,OAAO,CAAC,CAAC;IAE5C,IAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAE5C,IAAI,CAAC,YAAY,IAAI,CAAC,IAAA,sBAAc,EAAC,YAAY,EAAE,iBAAiB,CAAC,EAAE,CAAC;QACtE,oBAAoB;QACpB,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC5C,CAAC;IACD,IAAM,kBAAkB,cACtB,OAAO,EAAE,YAAY,CAAC,SAAS,EAC/B,MAAM,EAAE,YAAY,CAAC,MAAM;QAC3B,+BAA+B;QAC/B,OAAO,EAAE,WAAW,EAEpB,KAAK,EAAE,WAAW,EAClB,SAAS,EAAE,4BAA4B,IACpC,IAAI,CACR,CAAC;IAEF,uDAAuD;IACvD,OAAO,oCAA6B,IAAA,mCAAgB,EAAC,kBAAkB,CAAC,CAAE,CAAC;AAC7E,CAAC,CAAC;AAEK,IAAM,gCAAgC,GAAG,UAC9C,OAAyB,EACzB,IAAY;;IAEZ,IAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAC5C,IAAI,CAAC,IAAA,sBAAc,EAAC,YAAY,EAAE,iBAAiB,CAAC,EAAE,CAAC;QACrD,oBAAoB;QACpB,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC5C,CAAC;IAED,uDAAuD;IACvD,IAAM,2BAA2B,GAAG,uBAAuB,CAAC,OAAO,EAAE;QACnE,MAAM,EAAE,iBAAe;QACvB,MAAM,EAAE,wEAAwE;KACjF,CAAC,CAAC;IACH,mDAAmD;IACnD,IAAM,wBAAwB,GAAG,IAAA,qEAAiC,EAChE,2BAA2B,EAC3B,IAAI,CACL,CAAC;IACF,IAAM,iBAAiB,GAAG,sCAA+B,IAAA,mCAAgB,EAAC;QACxE,OAAO,EAAE,YAAY,CAAC,SAAS;QAC/B,MAAM,EAAE,YAAY,CAAC,MAAM;QAC3B,KAAK,EAAE,IAAI;KACZ,CAAC,oBAAiB,CAAC;IAEpB,IAAM,kBAAkB,GAAG,UAAG,wBAAwB,+CAAqC,iBAAiB,WAAQ,CAAC;IACrH,OAAO,CAAC,kBAAkB,CAAC,CAAC;AAC9B,CAAC,CAAC;AA5BW,QAAA,gCAAgC,oCA4B3C"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { ComponentContext } from "../../../types/context";
|
|
2
2
|
import type { DeployConfigCloudRunJob } from "../../types/googleCloudRun";
|
|
3
|
-
export declare const getDeleteSchedulesScripts: (context:
|
|
4
|
-
export declare const getDeleteJobsScripts: (context:
|
|
5
|
-
export declare const getJobRunScripts: (context:
|
|
6
|
-
export declare const getJobCreateScripts: (context:
|
|
7
|
-
export declare const getCreateScheduleScripts: (context:
|
|
3
|
+
export declare const getDeleteSchedulesScripts: (context: ComponentContext) => string[];
|
|
4
|
+
export declare const getDeleteJobsScripts: (context: ComponentContext) => string[];
|
|
5
|
+
export declare const getJobRunScripts: (context: ComponentContext, when: DeployConfigCloudRunJob["when"]) => string[];
|
|
6
|
+
export declare const getJobCreateScripts: (context: ComponentContext) => string[];
|
|
7
|
+
export declare const getCreateScheduleScripts: (context: ComponentContext) => string[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloudRunJobs.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/cloudRunJobs.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAA8D;AAM9D,8DAA6D;AAC7D,4CAAsD;AACtD,mCAOkB;AAClB,wDAAuD;AACvD,qCAA+C;AAK/C,yCAAgD;AAEhD,IAAM,qBAAqB,GAAG,UAC5B,
|
|
1
|
+
{"version":3,"file":"cloudRunJobs.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/cloudRunJobs.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { ComponentContext } from "../../../types/context";
|
|
2
2
|
import type { DeployConfigCloudRunService } from "../../types/googleCloudRun";
|
|
3
|
-
export declare const getServiceDeployScript: (context:
|
|
4
|
-
export declare const getServiceDeleteScript: (context:
|
|
3
|
+
export declare const getServiceDeployScript: (context: ComponentContext, service: DeployConfigCloudRunService | true | undefined, nameSuffix?: string) => string;
|
|
4
|
+
export declare const getServiceDeleteScript: (context: ComponentContext, serviceSuffix?: string) => string[];
|
|
@@ -49,7 +49,7 @@ var getServiceDeployScript = function (context, service, nameSuffix) {
|
|
|
49
49
|
var serviceName = (0, getServiceName_1.getServiceName)(context);
|
|
50
50
|
var customConfig = service !== true ? service : undefined;
|
|
51
51
|
var command = service !== true
|
|
52
|
-
? (_a = service === null || service === void 0 ? void 0 : service.command) !== null && _a !== void 0 ? _a : context.
|
|
52
|
+
? (_a = service === null || service === void 0 ? void 0 : service.command) !== null && _a !== void 0 ? _a : context.build.config.startCommand
|
|
53
53
|
: undefined;
|
|
54
54
|
var commandArray = command
|
|
55
55
|
? Array.isArray(command)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloudRunServices.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/cloudRunServices.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAAuD;AAIvD,8DAA6D;AAC7D,0DAAyD;AACzD,mCAKkB;AAClB,yCAAgD;AAChD,qCAA+C;AAExC,IAAM,sBAAsB,GAAG,UACpC,
|
|
1
|
+
{"version":3,"file":"cloudRunServices.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/cloudRunServices.ts"],"names":[],"mappings":"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"}
|
|
@@ -57,7 +57,8 @@ var makeLabelString = function (obj) {
|
|
|
57
57
|
};
|
|
58
58
|
exports.makeLabelString = makeLabelString;
|
|
59
59
|
var getCloudRunDeployConfig = function (context) {
|
|
60
|
-
var
|
|
60
|
+
var _a;
|
|
61
|
+
var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
|
|
61
62
|
if (!(0, types_1.isOfDeployType)(deployConfig, "google-cloudrun")) {
|
|
62
63
|
// should not happen
|
|
63
64
|
throw new Error("deploy config is wrong");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/common.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,qCAA6C;AAE7C,0DAAiE;AAE1D,IAAM,SAAS,GAAG,UAAC,OAAgB;IACxC,OAAO,OAAO,CAAC,CAAC,CAAC,iBAAU,OAAO,CAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;AAClD,CAAC,CAAC;AAFW,QAAA,SAAS,aAEpB;AACK,IAAM,YAAY,GAAG,UAAC,OAAgB;IAC3C,OAAO,UAAG,IAAA,iBAAS,EAAC,OAAO,CAAC,SAAM,CAAC;AACrC,CAAC,CAAC;AAFW,QAAA,YAAY,gBAEvB;AAEK,IAAM,kBAAkB,GAAG,UAAC,OAAgB;IACjD,OAAO,UAAG,IAAA,iBAAS,EAAC,OAAO,CAAC,eAAY,CAAC;AAC3C,CAAC,CAAC;AAFW,QAAA,kBAAkB,sBAE7B;AAEK,IAAM,4BAA4B,GAAG,UAC1C,YAAkC,IAC/B,OAAA;IACH,yCAAkC,IAAA,iBAAS,GAAE,gCAC3C,YAAY,CAAC,SAAS,wCACW;IACnC,wDAAsD;CACvD,EALI,CAKJ,CAAC;AAPW,QAAA,4BAA4B,gCAOvC;AAEK,IAAM,eAAe,GAAG,UAAC,GAA4B;IAC1D,OAAA,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC;SAChB,GAAG,CAAC,UAAC,EAAY;YAAZ,KAAA,aAAY,EAAX,GAAG,QAAA,EAAE,KAAK,QAAA;QAAM,OAAA,UAAG,GAAG,cAAI,KAAK,CAAE;IAAjB,CAAiB,CAAC;SACxC,IAAI,CAAC,GAAG,CAAC;AAFZ,CAEY,CAAC;AAHF,QAAA,eAAe,mBAGb;AAER,IAAM,uBAAuB,GAAG,UAAC,OAAgB
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/common.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,qCAA6C;AAE7C,0DAAiE;AAE1D,IAAM,SAAS,GAAG,UAAC,OAAgB;IACxC,OAAO,OAAO,CAAC,CAAC,CAAC,iBAAU,OAAO,CAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;AAClD,CAAC,CAAC;AAFW,QAAA,SAAS,aAEpB;AACK,IAAM,YAAY,GAAG,UAAC,OAAgB;IAC3C,OAAO,UAAG,IAAA,iBAAS,EAAC,OAAO,CAAC,SAAM,CAAC;AACrC,CAAC,CAAC;AAFW,QAAA,YAAY,gBAEvB;AAEK,IAAM,kBAAkB,GAAG,UAAC,OAAgB;IACjD,OAAO,UAAG,IAAA,iBAAS,EAAC,OAAO,CAAC,eAAY,CAAC;AAC3C,CAAC,CAAC;AAFW,QAAA,kBAAkB,sBAE7B;AAEK,IAAM,4BAA4B,GAAG,UAC1C,YAAkC,IAC/B,OAAA;IACH,yCAAkC,IAAA,iBAAS,GAAE,gCAC3C,YAAY,CAAC,SAAS,wCACW;IACnC,wDAAsD;CACvD,EALI,CAKJ,CAAC;AAPW,QAAA,4BAA4B,gCAOvC;AAEK,IAAM,eAAe,GAAG,UAAC,GAA4B;IAC1D,OAAA,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC;SAChB,GAAG,CAAC,UAAC,EAAY;YAAZ,KAAA,aAAY,EAAX,GAAG,QAAA,EAAE,KAAK,QAAA;QAAM,OAAA,UAAG,GAAG,cAAI,KAAK,CAAE;IAAjB,CAAiB,CAAC;SACxC,IAAI,CAAC,GAAG,CAAC;AAFZ,CAEY,CAAC;AAHF,QAAA,eAAe,mBAGb;AAER,IAAM,uBAAuB,GAAG,UAAC,OAAgB;;IACtD,IAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAC5C,IAAI,CAAC,IAAA,sBAAc,EAAC,YAAY,EAAE,iBAAiB,CAAC,EAAE,CAAC;QACrD,oBAAoB;QACpB,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC5C,CAAC;IACD,OAAO,YAAY,CAAC;AACtB,CAAC,CAAC;AAPW,QAAA,uBAAuB,2BAOlC;AAEF,SAAgB,qBAAqB,CAAC,OAAgB;IACpD,IAAM,YAAY,GAAG,IAAA,+BAAuB,EAAC,OAAO,CAAC,CAAC;IACtD,OAAO;QACL,OAAO,EAAE,YAAY,CAAC,SAAS;QAC/B,MAAM,EAAE,YAAY,CAAC,MAAM;KAC5B,CAAC;AACJ,CAAC;AAND,sDAMC;AAED,SAAgB,mBAAmB,CAAC,OAAgB;IAClD,IAAM,UAAU,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAC;IAClD,IAAM,YAAY,GAAG,IAAA,+BAAuB,EAAC,OAAO,CAAC,CAAC;IACtD,2BACE,KAAK,EAAE,IAAA,6CAAyB,EAAC,OAAO,CAAC,IACtC,UAAU,KACb,wBAAwB,EAAE,YAAY,CAAC,QAAQ;YAC7C,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,sBAAsB;YAC9C,CAAC,CAAC,SAAS,IACb;AACJ,CAAC;AAVD,kDAUC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
export declare function getCloudRunDeployScripts(context:
|
|
1
|
+
import type { ComponentContext } from "../../../types/context";
|
|
2
|
+
export declare function getCloudRunDeployScripts(context: ComponentContext): string[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getCloudRunDeployScripts.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/getCloudRunDeployScripts.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAAqC;
|
|
1
|
+
{"version":3,"file":"getCloudRunDeployScripts.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/getCloudRunDeployScripts.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAAqC;AAKrC,gDAA4D;AAC5D,mCAA4D;AAE5D,sCAAmE;AACnE,8CAA4D;AAC5D,gGAA+F;AAC/F,+CAIwB;AACxB,uDAA4D;AAC5D,mCAGkB;AAClB,wBAAmD;AAGnD,yCAAgD;AAChD,mDAGgC;AAEhC,SAAgB,wBAAwB,CAAC,OAAyB;;IAChE,IAAM,YAAY,GAAG,IAAA,gCAAuB,EAAC,OAAO,CAAC,CAAC;IACtD,IAAM,UAAU,GAAG,IAAA,aAAI,EACrB,OAAO,CAAC,WAAW,CAAC,OAAO,EAC3B,iCAA6B,CAC9B,CAAC;IAEF,wFACK,IAAA,4BAAmB,EACpB,SAAS,EACT,YAAY,CACb,wCACI,IAAA,qEAAiC,EAAC,OAAO,CAAC,kBAC1C,IAAA,qCAA4B,EAAC,YAAY,CAAC,UAC7C,kBACC,IAAA,4BAAmB,EACpB,cAAc,EACd,wBAAwB,CACzB,CAAC,IAAA,oCAAyB,EAAC,UAAU,EAAE,6BAAiB,CAAC,CAAC,kBAExD,IAAA,4BAAmB,EACpB,QAAQ,EACR,qBAAqB,CACtB,8GACI,CAAC,YAAY,CAAC,QAAQ;QACvB,CAAC,CAAC,IAAA,kCAAuB,EAAC,OAAO,EAAE,YAAY,CAAC,CAAC,6DAA6D;QAC9G,CAAC,CAAC,EAAE,CAAC,kBACJ,IAAA,uCAAwB,EAAC,OAAO,CAAC,kBACjC,IAAA,kCAAmB,EAAC,OAAO,CAAC,kBAC5B,IAAA,+BAAgB,EAAC,OAAO,EAAE,WAAW,CAAC,kBAEtC,CAAC,YAAY,CAAC,OAAO,KAAK,KAAK;QAChC,CAAC,CAAC,CAAC,IAAA,yCAAsB,EAAC,OAAO,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;QACzD,CAAC,CAAC,EAAE,CAAC,kBACJ,MAAM,CAAC,OAAO,CAAC,MAAA,YAAY,CAAC,kBAAkB,mCAAI,EAAE,CAAC,CAAC,GAAG,CAC1D,UAAC,EAAe;YAAf,KAAA,aAAe,EAAd,IAAI,QAAA,EAAE,OAAO,QAAA;QACb,OAAA,IAAA,yCAAsB,EAAC,OAAO,EAAE,OAAO,EAAE,GAAG,GAAG,IAAI,CAAC;IAApD,CAAoD,CACvD,kBACE,IAAA,+BAAgB,EAAC,OAAO,EAAE,YAAY,CAAC,UAC1C,kBACC,IAAA,4BAAmB,EACpB,SAAS,EACT,SAAS,CACV,CACC,IAAA,+CAAqC,EAAC,OAAO,EAAE,YAAY,CAAC,CAC7D,kBACE,IAAA,qCAA8B,EAAC,OAAO,CAAC,UAC1C;AACJ,CAAC;AAhDD,4DAgDC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
export declare function getCloudRunStopScripts(context:
|
|
1
|
+
import type { ComponentContext } from "../../../types/context";
|
|
2
|
+
export declare function getCloudRunStopScripts(context: ComponentContext): string[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getCloudRunStopScripts.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/getCloudRunStopScripts.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,mCAA4D;AAE5D,sCAAmE;AACnE,8CAA4D;AAC5D,gGAA+F;AAC/F,+CAIwB;AACxB,uDAA4D;AAC5D,mCAAmD;AAEnD,SAAgB,sBAAsB,CAAC,
|
|
1
|
+
{"version":3,"file":"getCloudRunStopScripts.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/getCloudRunStopScripts.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,mCAA4D;AAE5D,sCAAmE;AACnE,8CAA4D;AAC5D,gGAA+F;AAC/F,+CAIwB;AACxB,uDAA4D;AAC5D,mCAAmD;AAEnD,SAAgB,sBAAsB,CAAC,OAAyB;;IAC9D,IAAM,YAAY,GAAG,IAAA,gCAAuB,EAAC,OAAO,CAAC,CAAC;IACtD,8JACK,IAAA,qEAAiC,EAAC,OAAO,CAAC,kBAC1C,IAAA,+BAAgB,EAAC,OAAO,EAAE,SAAS,CAAC,kBACpC,CAAC,YAAY,CAAC,OAAO,KAAK,KAAK,CAAC,CAAC,CAAC,IAAA,yCAAsB,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,kBACvE,MAAM,CAAC,OAAO,CAAC,MAAA,YAAY,CAAC,kBAAkB,mCAAI,EAAE,CAAC,CAAC,OAAO,CAAC,UAAC,EAAM;YAAN,KAAA,aAAM,EAAL,IAAI,QAAA;QACrE,OAAA,IAAA,yCAAsB,EAAC,OAAO,EAAE,IAAI,CAAC;IAArC,CAAqC,CACtC,kBACE,IAAA,+BAAgB,EAAC,OAAO,EAAE,UAAU,CAAC,kBACrC,IAAA,wCAAyB,EAAC,OAAO,CAAC,kBAClC,IAAA,mCAAoB,EAAC,OAAO,CAAC,kBAC7B,CAAC,YAAY,CAAC,QAAQ,IAAI,YAAY,CAAC,QAAQ,CAAC,oBAAoB;QACrE,CAAC,CAAC,IAAA,kCAAuB,EAAC,OAAO,EAAE,YAAY,CAAC;QAChD,CAAC,CAAC,EAAE,CAAC,kBAEJ,IAAA,+CAAqC,EAAC,OAAO,EAAE,QAAQ,CAAC,kBACxD,IAAA,qCAA8B,EAAC,OAAO,CAAC,UAC1C;AACJ,CAAC;AAnBD,wDAmBC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { ComponentContext } from "../../../types/context";
|
|
2
2
|
import type { CatladderJob } from "../../../types/jobs";
|
|
3
|
-
export declare const createGoogleCloudRunDeployJobs: (context:
|
|
3
|
+
export declare const createGoogleCloudRunDeployJobs: (context: ComponentContext) => CatladderJob[];
|
|
@@ -20,10 +20,8 @@ var constants_1 = require("./constants");
|
|
|
20
20
|
var getCloudRunDeployScripts_1 = require("./getCloudRunDeployScripts");
|
|
21
21
|
var getCloudRunStopScripts_1 = require("./getCloudRunStopScripts");
|
|
22
22
|
var createGoogleCloudRunDeployJobs = function (context) {
|
|
23
|
-
var
|
|
24
|
-
|
|
25
|
-
return [];
|
|
26
|
-
}
|
|
23
|
+
var _a;
|
|
24
|
+
var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
|
|
27
25
|
if (!(0, types_1.isOfDeployType)(deployConfig, "google-cloudrun")) {
|
|
28
26
|
// should not happen
|
|
29
27
|
throw new Error("deploy config is wrong");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,0CAAiD;AAGjD,gDAA8D;AAC9D,mCAAmD;AAEnD,qCAA6C;AAC7C,yCAAgD;AAChD,uEAAsE;AACtE,mEAAkE;AAE3D,IAAM,8BAA8B,GAAG,UAC5C,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,0CAAiD;AAGjD,gDAA8D;AAC9D,mCAAmD;AAEnD,qCAA6C;AAC7C,yCAAgD;AAChD,uEAAsE;AACtE,mEAAkE;AAE3D,IAAM,8BAA8B,GAAG,UAC5C,OAAyB;;IAEzB,IAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAC5C,IAAI,CAAC,IAAA,sBAAc,EAAC,YAAY,EAAE,iBAAiB,CAAC,EAAE,CAAC;QACrD,oBAAoB;QACpB,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC5C,CAAC;IAED,IAAM,aAAa,GAAG,IAAA,mDAAwB,EAAC,OAAO,CAAC,CAAC;IACxD,IAAM,WAAW,GAAG,IAAA,+CAAsB,EAAC,OAAO,CAAC,CAAC;IAEpD,OAAO,IAAA,4BAAqB,EAAC,OAAO,EAAE;QACpC,MAAM,sBACJ,SAAS,EAAE;gBACT,6BAA6B,EAAE,GAAG;aACnC,IACE,CAAC,YAAY,CAAC,KAAK;YACpB,CAAC,CAAC;gBACE,SAAS,EAAE;oBACT,KAAK,EAAE;wBACL,6BAAiB,EAAE,QAAQ;qBAC5B;oBACD,IAAI,EAAE,QAAQ;iBACf;aACF;YACH,CAAC,CAAC,EAAE,CAAC,KAEP,KAAK,EAAE,IAAA,uBAAc,EAAC,QAAQ,CAAC,EAC/B,MAAM,EAAE,aAAa,GACtB;QACD,IAAI,EAAE;YACJ,KAAK,EAAE,IAAA,uBAAc,EAAC,QAAQ,CAAC;YAC/B,SAAS,EAAE;gBACT,6BAA6B,EAAE,GAAG;aACnC;YACD,MAAM,EAAE,IAAA,8BAAqB,EAAC,WAAW,CAAC;SAC3C;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AAvCW,QAAA,8BAA8B,kCAuCzC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { ComponentContext } from "../../../types";
|
|
2
2
|
import type { DeployConfigCloudRun, DeployConfigCloudRunCloudSql } from "../../types";
|
|
3
|
-
export declare const getDatabaseDeleteScript: (context:
|
|
4
|
-
export declare const getDatabaseCreateScript: (context:
|
|
3
|
+
export declare const getDatabaseDeleteScript: (context: ComponentContext, deployConfig: DeployConfigCloudRun) => string[];
|
|
4
|
+
export declare const getDatabaseCreateScript: (context: ComponentContext, deployConfig: DeployConfigCloudRun) => string[];
|
|
5
5
|
export declare const DATABASE_JDBC_URL = "jdbc:postgresql:///$DB_NAME?cloudSqlInstance=$CLOUD_SQL_INSTANCE_CONNECTION_NAME&socketFactory=com.google.cloud.sql.postgres.SocketFactory&user=$DB_USER&password=$DB_PASSWORD";
|
|
6
6
|
export declare const getDatabaseConnectionString: (config: DeployConfigCloudRunCloudSql) => string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"database.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/utils/database.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;AACA,gDAA+E;AAMxE,IAAM,uBAAuB,GAAG,UACrC,
|
|
1
|
+
{"version":3,"file":"database.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/utils/database.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;AACA,gDAA+E;AAMxE,IAAM,uBAAuB,GAAG,UACrC,OAAyB,EACzB,YAAkC;IAElC,IAAI,CAAC,YAAY,CAAC,QAAQ,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,oBAAoB,EAAE,CAAC;QAC1E,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;IAClC,CAAC;IACD,IAAM,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAEvD,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;IAC7D,CAAC;IAEK,IAAA,KAAA,OACJ,YAAY,CAAC,QAAQ,CAAC,sBAAsB,CAAC,KAAK,CAAC,GAAG,CAAC,IAAA,EADlD,SAAS,QAAA,EAAE,MAAM,QAAA,EAAE,UAAU,QACqB,CAAC;IAC1D,sHAAsH;IACtH,kCAAkC;IAClC,OAAO;QACL,mCAA2B,OAAO,UAAM;QACxC,8KAAkK;QAClK,IAAA,wBAAe,EACb,sCAA+B,OAAO,yBAAe,UAAU,wBAAc,SAAS,CAAE,EACxF;YACE,cAAc,EAAE,EAAE;SACnB,CACF;KACF,CAAC;AACJ,CAAC,CAAC;AA3BW,QAAA,uBAAuB,2BA2BlC;AAEK,IAAM,uBAAuB,GAAG,UACrC,OAAyB,EACzB,YAAkC;IAElC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC;QAC3B,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;IAClC,CAAC;IAED,IAAM,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAEvD,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;IAC7D,CAAC;IAEK,IAAA,KAAA,OACJ,YAAY,CAAC,QAAQ,CAAC,sBAAsB,CAAC,KAAK,CAAC,GAAG,CAAC,IAAA,EADlD,SAAS,QAAA,EAAE,MAAM,QAAA,EAAE,UAAU,QACqB,CAAC;IAC1D,gCAAgC;IAChC,OAAO,IAAA,8BAAqB,EAAC;QAC3B,+BAA6B;QAC7B,sCAA+B,OAAO,yBAAe,UAAU,wBAAc,SAAS,CAAE;KACzF,CAAC,CAAC;AACL,CAAC,CAAC;AArBW,QAAA,uBAAuB,2BAqBlC;AAEW,QAAA,iBAAiB,GAC5B,gLAAgL,CAAC;AAE5K,IAAM,2BAA2B,GAAG,UACzC,MAAoC;IAEpC,QAAQ,MAAM,CAAC,wBAAwB,EAAE,CAAC;QACxC,KAAK,MAAM;YACT,OAAO,yBAAiB,CAAC;QAC3B,KAAK,OAAO;YACV,OAAO,6CAAsC,kBAAkB,CAC7D,oBAAa,MAAM,CAAC,sBAAsB,CAAE,CAC7C,eAAY,CAAC;QAChB;YACE,SAAS;YACT,OAAO,0GAA0G,CAAC;IACtH,CAAC;AACH,CAAC,CAAC;AAdW,QAAA,2BAA2B,+BActC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
export declare const gcloudServiceAccountLoginCommands: (context:
|
|
1
|
+
import type { ComponentContext } from "../../../types";
|
|
2
|
+
export declare const gcloudServiceAccountLoginCommands: (context: ComponentContext) => string[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gcloudServiceAccountLoginCommands.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/utils/gcloudServiceAccountLoginCommands.ts"],"names":[],"mappings":";;;AAAA,wBAAmD;AACnD,4CAA8D;AAGvD,IAAM,iCAAiC,GAAG,
|
|
1
|
+
{"version":3,"file":"gcloudServiceAccountLoginCommands.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/utils/gcloudServiceAccountLoginCommands.ts"],"names":[],"mappings":";;;AAAA,wBAAmD;AACnD,4CAA8D;AAGvD,IAAM,iCAAiC,GAAG,UAC/C,OAAyB,IACtB,OAAA;IACH,oEAA4D,IAAA,oCAA0B,EACpF,OAAO,EACP,iCAA6B,CAC9B,QAAI;CACN,EALI,CAKJ,CAAC;AAPW,QAAA,iCAAiC,qCAO5C"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
export declare const getServiceName: (context:
|
|
1
|
+
import type { ComponentContext } from "../../../types/context";
|
|
2
|
+
export declare const getServiceName: (context: ComponentContext) => string | import("../../../bash/BashExpression").BashExpression;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getServiceName.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/utils/getServiceName.ts"],"names":[],"mappings":";;;AACO,IAAM,cAAc,GAAG,UAAC,
|
|
1
|
+
{"version":3,"file":"getServiceName.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/utils/getServiceName.ts"],"names":[],"mappings":";;;AACO,IAAM,cAAc,GAAG,UAAC,OAAyB;IACtD,OAAA,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,WAAW,EAAE;AAA1C,CAA0C,CAAC;AADhC,QAAA,cAAc,kBACkB"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { ComponentContext } from "../../types/context";
|
|
2
2
|
import type { CatladderJob } from "../../types/jobs";
|
|
3
|
-
export declare const createCustomDeployJobs: (context:
|
|
3
|
+
export declare const createCustomDeployJobs: (context: ComponentContext) => CatladderJob[];
|
|
@@ -32,29 +32,28 @@ var base_1 = require("../base");
|
|
|
32
32
|
var sbom_1 = require("../sbom");
|
|
33
33
|
var types_1 = require("../types");
|
|
34
34
|
var createCustomDeployJobs = function (context) {
|
|
35
|
-
var _a, _b, _c;
|
|
36
|
-
var deployConfig = context.
|
|
37
|
-
if (deployConfig === false) {
|
|
38
|
-
return [];
|
|
39
|
-
}
|
|
35
|
+
var _a, _b, _c, _d;
|
|
36
|
+
var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
|
|
40
37
|
if (!(0, types_1.isOfDeployType)(deployConfig, "custom")) {
|
|
41
38
|
// should not happen
|
|
42
39
|
throw new Error("deploy config is not custom");
|
|
43
40
|
}
|
|
44
41
|
// FIXME: custom deploy currently assumes yarn-based project
|
|
45
|
-
var yarnInstall = (0, yarn_1.getYarnInstall)(context, {
|
|
42
|
+
var yarnInstall = (0, yarn_1.getYarnInstall)(context.build, {
|
|
43
|
+
noCustomPostInstall: true,
|
|
44
|
+
});
|
|
46
45
|
return (0, base_1.createDeployementJobs)(context, {
|
|
47
46
|
deploy: {
|
|
48
|
-
image: (
|
|
49
|
-
cache: (
|
|
47
|
+
image: (_b = deployConfig.jobImage) !== null && _b !== void 0 ? _b : (0, runner_1.getRunnerImage)("jobs-default"),
|
|
48
|
+
cache: (_c = deployConfig.jobCache) !== null && _c !== void 0 ? _c : [],
|
|
50
49
|
script: __spreadArray(__spreadArray(__spreadArray([
|
|
51
|
-
"cd ".concat(context.
|
|
50
|
+
"cd ".concat(context.build.dir)
|
|
52
51
|
], __read((deployConfig.requiresYarnInstall ? yarnInstall : [])), false), __read(deployConfig.script), false), __read((0, sbom_1.getDependencyTrackUploadScript)(context)), false),
|
|
53
52
|
variables: {},
|
|
54
53
|
},
|
|
55
54
|
stop: deployConfig.stopScript
|
|
56
55
|
? {
|
|
57
|
-
image: (
|
|
56
|
+
image: (_d = deployConfig.jobImage) !== null && _d !== void 0 ? _d : (0, runner_1.getRunnerImage)("jobs-default"),
|
|
58
57
|
script: __spreadArray(__spreadArray([], __read(deployConfig.stopScript), false), __read((0, sbom_1.getDependencyTrackDeleteScript)(context)), false),
|
|
59
58
|
variables: {},
|
|
60
59
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deployJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/custom/deployJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAuD;AACvD,uCAA8C;AAG9C,gCAAgD;AAChD,gCAGiB;AACjB,kCAA0C;AAEnC,IAAM,sBAAsB,GAAG,
|
|
1
|
+
{"version":3,"file":"deployJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/custom/deployJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAuD;AACvD,uCAA8C;AAG9C,gCAAgD;AAChD,gCAGiB;AACjB,kCAA0C;AAEnC,IAAM,sBAAsB,GAAG,UACpC,OAAyB;;IAEzB,IAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAE5C,IAAI,CAAC,IAAA,sBAAc,EAAC,YAAY,EAAE,QAAQ,CAAC,EAAE,CAAC;QAC5C,oBAAoB;QACpB,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;IACD,4DAA4D;IAC5D,IAAM,WAAW,GAAG,IAAA,qBAAc,EAAC,OAAO,CAAC,KAAK,EAAE;QAChD,mBAAmB,EAAE,IAAI;KAC1B,CAAC,CAAC;IACH,OAAO,IAAA,4BAAqB,EAAC,OAAO,EAAE;QACpC,MAAM,EAAE;YACN,KAAK,EAAE,MAAA,YAAY,CAAC,QAAQ,mCAAI,IAAA,uBAAc,EAAC,cAAc,CAAC;YAC9D,KAAK,EAAE,MAAA,YAAY,CAAC,QAAQ,mCAAI,EAAE;YAClC,MAAM;gBACJ,aAAM,OAAO,CAAC,KAAK,CAAC,GAAG,CAAE;sBACtB,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,kBACrD,YAAY,CAAC,MAAM,kBACnB,IAAA,qCAA8B,EAAC,OAAO,CAAC,SAC3C;YACD,SAAS,EAAE,EAAE;SACd;QACD,IAAI,EAAE,YAAY,CAAC,UAAU;YAC3B,CAAC,CAAC;gBACE,KAAK,EAAE,MAAA,YAAY,CAAC,QAAQ,mCAAI,IAAA,uBAAc,EAAC,cAAc,CAAC;gBAC9D,MAAM,yCACD,YAAY,CAAC,UAAU,kBACvB,IAAA,qCAA8B,EAAC,OAAO,CAAC,SAC3C;gBACD,SAAS,EAAE,EAAE;aACd;YACH,CAAC,CAAC,SAAS;KACd,CAAC,CAAC;AACL,CAAC,CAAC;AApCW,QAAA,sBAAsB,0BAoCjC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { ComponentContext } from "../../types/context";
|
|
2
2
|
import type { CatladderJob } from "../../types/jobs";
|
|
3
|
-
export declare const createDockerTagDeployJobs: (context:
|
|
3
|
+
export declare const createDockerTagDeployJobs: (context: ComponentContext) => CatladderJob[];
|
|
@@ -41,17 +41,15 @@ var docker_1 = require("../../build/docker");
|
|
|
41
41
|
var base_1 = require("../base");
|
|
42
42
|
var types_1 = require("../types");
|
|
43
43
|
var createDockerTagDeployJobs = function (context) {
|
|
44
|
-
var
|
|
45
|
-
|
|
46
|
-
return [];
|
|
47
|
-
}
|
|
44
|
+
var _a;
|
|
45
|
+
var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
|
|
48
46
|
if (!(0, types_1.isOfDeployType)(deployConfig, "dockerTag")) {
|
|
49
47
|
// should not happen
|
|
50
48
|
throw new Error("deploy config is not dockerTag");
|
|
51
49
|
}
|
|
52
50
|
var tag = deployConfig.tag;
|
|
53
51
|
return (0, base_1.createDeployementJobs)(context, {
|
|
54
|
-
deploy: __assign(__assign({}, (0, docker_1.getDockerJobBaseProps)(
|
|
52
|
+
deploy: __assign(__assign({}, (0, docker_1.getDockerJobBaseProps)()), { script: __spreadArray(__spreadArray([], __read((0, docker_1.gitlabDockerLogin)(context)), false), [
|
|
55
53
|
"docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
|
|
56
54
|
"docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_IMAGE:".concat(tag),
|
|
57
55
|
"docker push $DOCKER_IMAGE:".concat(tag),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deployJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/dockerTag/deployJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAA8E;AAI9E,gCAAgD;AAChD,kCAA0C;AAEnC,IAAM,yBAAyB,GAAG,
|
|
1
|
+
{"version":3,"file":"deployJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/dockerTag/deployJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAA8E;AAI9E,gCAAgD;AAChD,kCAA0C;AAEnC,IAAM,yBAAyB,GAAG,UACvC,OAAyB;;IAEzB,IAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAC5C,IAAI,CAAC,IAAA,sBAAc,EAAC,YAAY,EAAE,WAAW,CAAC,EAAE,CAAC;QAC/C,oBAAoB;QACpB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;IACpD,CAAC;IACD,IAAM,GAAG,GAAG,YAAY,CAAC,GAAG,CAAC;IAC7B,OAAO,IAAA,4BAAqB,EAAC,OAAO,EAAE;QACpC,MAAM,wBACD,IAAA,8BAAqB,GAAE,KAC1B,MAAM,yCACD,IAAA,0BAAiB,EAAC,OAAO,CAAC;gBAC7B,6CAA6C;gBAC7C,mEAA4D,GAAG,CAAE;gBACjE,oCAA6B,GAAG,CAAE;gBAClC,yCAAiC,GAAG,OAAG;wBAE1C;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AArBW,QAAA,yBAAyB,6BAqBpC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { SecretEnvVar } from "..";
|
|
2
2
|
import type { BashExpression } from "../bash/BashExpression";
|
|
3
|
-
import type {
|
|
3
|
+
import type { ComponentContext } from "../types/context";
|
|
4
4
|
import type { EnvironmentContext } from "../types/environmentContext";
|
|
5
5
|
import type { CatladderJob } from "../types/jobs";
|
|
6
6
|
import type { PartialDeep } from "../types/utils";
|
|
@@ -10,7 +10,7 @@ export * from "./kubernetes";
|
|
|
10
10
|
export * from "./types";
|
|
11
11
|
export * from "./utils";
|
|
12
12
|
export type DeployTypeDefinition<T extends DeployConfigType> = {
|
|
13
|
-
jobs: (context:
|
|
13
|
+
jobs: (context: ComponentContext) => CatladderJob[];
|
|
14
14
|
defaults: (envContext: EnvironmentContext<any, T>) => PartialDeep<DeployConfigGeneric<T>>;
|
|
15
15
|
additionalSecretKeys: (envContext: EnvironmentContext<any, T>) => SecretEnvVar[];
|
|
16
16
|
getAdditionalEnvVars: (envContext: EnvironmentContext<any, T>) => Record<string, string | BashExpression | undefined | null>;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { StringOrBashExpression } from "../../../bash/BashExpression";
|
|
2
|
-
import type {
|
|
3
|
-
export declare const hasKubernetesCloudSQL: (context:
|
|
2
|
+
import type { ComponentContext } from "../../../types";
|
|
3
|
+
export declare const hasKubernetesCloudSQL: (context: ComponentContext) => boolean;
|
|
4
4
|
type CloudSqlValues = {
|
|
5
5
|
enabled: boolean;
|
|
6
6
|
proxyCredentials: string;
|
|
@@ -8,7 +8,7 @@ type CloudSqlValues = {
|
|
|
8
8
|
fullDbName: StringOrBashExpression;
|
|
9
9
|
dbUser: string;
|
|
10
10
|
};
|
|
11
|
-
export declare const createKubernetesCloudsqlBaseValues: (context:
|
|
11
|
+
export declare const createKubernetesCloudsqlBaseValues: (context: ComponentContext) => {
|
|
12
12
|
cloudsql: CloudSqlValues;
|
|
13
13
|
};
|
|
14
14
|
export {};
|
|
@@ -5,32 +5,34 @@ var context_1 = require("../../../context");
|
|
|
5
5
|
var utils_1 = require("../../cloudSql/utils");
|
|
6
6
|
var types_1 = require("../../types");
|
|
7
7
|
var hasKubernetesCloudSQL = function (context) {
|
|
8
|
-
var _a, _b;
|
|
9
|
-
|
|
10
|
-
|
|
8
|
+
var _a, _b, _c;
|
|
9
|
+
var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
|
|
10
|
+
if ((0, types_1.isOfDeployType)(deployConfig, "kubernetes")) {
|
|
11
|
+
return (_c = (_b = deployConfig.values) === null || _b === void 0 ? void 0 : _b.cloudsql) === null || _c === void 0 ? void 0 : _c.enabled;
|
|
11
12
|
}
|
|
12
13
|
return false;
|
|
13
14
|
};
|
|
14
15
|
exports.hasKubernetesCloudSQL = hasKubernetesCloudSQL;
|
|
15
16
|
var createKubernetesCloudsqlBaseValues = function (context) {
|
|
16
|
-
var _a, _b, _c, _d, _e, _f;
|
|
17
|
-
|
|
17
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
|
18
|
+
var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
|
|
19
|
+
if (!(0, types_1.isOfDeployType)(deployConfig, "kubernetes")) {
|
|
18
20
|
throw new Error("cannot get cloud sql config");
|
|
19
21
|
}
|
|
20
|
-
var config = (
|
|
22
|
+
var config = (_b = deployConfig.values) === null || _b === void 0 ? void 0 : _b.cloudsql;
|
|
21
23
|
if (!config) {
|
|
22
24
|
throw new Error("cannot get cloud sql config");
|
|
23
25
|
}
|
|
24
26
|
var proxyCredentials = "$".concat((0, context_1.getSecretVarNameForContext)(context, "cloudsqlProxyCredentials"));
|
|
25
27
|
if ((config === null || config === void 0 ? void 0 : config.type) !== "unmanaged") {
|
|
26
|
-
var instanceConnectionName = "".concat((
|
|
28
|
+
var instanceConnectionName = "".concat((_c = config.projectId) !== null && _c !== void 0 ? _c : "skynet-164509", ":").concat((_d = config.region) !== null && _d !== void 0 ? _d : "europe-west6", ":").concat((_e = config.instanceId) !== null && _e !== void 0 ? _e : context.environment.envVars.KUBE_NAMESPACE);
|
|
27
29
|
return {
|
|
28
30
|
cloudsql: {
|
|
29
31
|
enabled: config.enabled,
|
|
30
32
|
dbUser: "postgres",
|
|
31
33
|
instanceConnectionName: instanceConnectionName,
|
|
32
34
|
proxyCredentials: proxyCredentials,
|
|
33
|
-
fullDbName: (
|
|
35
|
+
fullDbName: (_f = context.environment.envVars.KUBE_APP_NAME) !== null && _f !== void 0 ? _f : "",
|
|
34
36
|
},
|
|
35
37
|
};
|
|
36
38
|
}
|
|
@@ -38,7 +40,7 @@ var createKubernetesCloudsqlBaseValues = function (context) {
|
|
|
38
40
|
return {
|
|
39
41
|
cloudsql: {
|
|
40
42
|
enabled: config.enabled,
|
|
41
|
-
dbUser: (
|
|
43
|
+
dbUser: (_g = config.dbUser) !== null && _g !== void 0 ? _g : "postgres",
|
|
42
44
|
instanceConnectionName: config.instanceConnectionName,
|
|
43
45
|
proxyCredentials: proxyCredentials,
|
|
44
46
|
fullDbName: (0, utils_1.getFullDbName)(config, context.fullConfig, context.environment.slugPrefix, context.componentName),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/kubernetes/cloudSql/index.ts"],"names":[],"mappings":";;;AACA,4CAA8D;AAE9D,8CAAqD;AACrD,qCAA6C;AAEtC,IAAM,qBAAqB,GAAG,UAAC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/kubernetes/cloudSql/index.ts"],"names":[],"mappings":";;;AACA,4CAA8D;AAE9D,8CAAqD;AACrD,qCAA6C;AAEtC,IAAM,qBAAqB,GAAG,UAAC,OAAyB;;IAC7D,IAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAE5C,IAAI,IAAA,sBAAc,EAAC,YAAY,EAAE,YAAY,CAAC,EAAE,CAAC;QAC/C,OAAO,MAAA,MAAA,YAAY,CAAC,MAAM,0CAAE,QAAQ,0CAAE,OAAO,CAAC;IAChD,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAPW,QAAA,qBAAqB,yBAOhC;AAUK,IAAM,kCAAkC,GAAG,UAChD,OAAyB;;IAIzB,IAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAC5C,IAAI,CAAC,IAAA,sBAAc,EAAC,YAAY,EAAE,YAAY,CAAC,EAAE,CAAC;QAChD,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;IAED,IAAM,MAAM,GAAG,MAAA,YAAY,CAAC,MAAM,0CAAE,QAAQ,CAAC;IAE7C,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;IAED,IAAM,gBAAgB,GAAG,WAAI,IAAA,oCAA0B,EACrD,OAAO,EACP,0BAA0B,CAC3B,CAAE,CAAC;IACJ,IAAI,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,MAAK,WAAW,EAAE,CAAC;QACjC,IAAM,sBAAsB,GAAG,UAAG,MAAA,MAAM,CAAC,SAAS,mCAAI,eAAe,cACnE,MAAA,MAAM,CAAC,MAAM,mCAAI,cAAc,cAC7B,MAAA,MAAM,CAAC,UAAU,mCAAI,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,cAAc,CAAE,CAAC;QAEtE,OAAO;YACL,QAAQ,EAAE;gBACR,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,MAAM,EAAE,UAAU;gBAClB,sBAAsB,wBAAA;gBACtB,gBAAgB,kBAAA;gBAChB,UAAU,EAAE,MAAA,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,aAAa,mCAAI,EAAE;aAC5D;SACF,CAAC;IACJ,CAAC;SAAM,IAAI,MAAM,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;QACvC,OAAO;YACL,QAAQ,EAAE;gBACR,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,MAAM,EAAE,MAAA,MAAM,CAAC,MAAM,mCAAI,UAAU;gBACnC,sBAAsB,EAAE,MAAM,CAAC,sBAAsB;gBACrD,gBAAgB,kBAAA;gBAChB,UAAU,EAAE,IAAA,qBAAa,EACvB,MAAM,EACN,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,WAAW,CAAC,UAAU,EAC9B,OAAO,CAAC,aAAa,CACtB;aACF;SACF,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;IAClC,CAAC;AACH,CAAC,CAAC;AApDW,QAAA,kCAAkC,sCAoD7C"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { ComponentContext } from "../../types/context";
|
|
2
2
|
import type { CatladderJob } from "../../types/jobs";
|
|
3
|
-
export declare const createKubernetesDeployJobs: (context:
|
|
3
|
+
export declare const createKubernetesDeployJobs: (context: ComponentContext) => CatladderJob[];
|
|
@@ -47,11 +47,8 @@ var bashYaml_1 = require("../../bash/bashYaml");
|
|
|
47
47
|
var gitlab_1 = require("../../utils/gitlab");
|
|
48
48
|
var ALL_VALUES_FILE = "__all_values.yml";
|
|
49
49
|
var createKubernetesDeployJobs = function (context) {
|
|
50
|
-
var _a, _b;
|
|
51
|
-
var deployConfig = context.
|
|
52
|
-
if (deployConfig === false) {
|
|
53
|
-
return [];
|
|
54
|
-
}
|
|
50
|
+
var _a, _b, _c;
|
|
51
|
+
var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
|
|
55
52
|
if (!(0, types_1.isOfDeployType)(deployConfig, "kubernetes")) {
|
|
56
53
|
// should not happen
|
|
57
54
|
throw new Error("deploy config is not kubernetes");
|
|
@@ -65,7 +62,7 @@ var createKubernetesDeployJobs = function (context) {
|
|
|
65
62
|
when: "always",
|
|
66
63
|
},
|
|
67
64
|
}
|
|
68
|
-
: {})), { variables: __assign(__assign({}, context.environment.envVars), { RELEASE_NAME: context.environment.fullName, HELM_EXPERIMENTAL_OCI: "1", KUBE_DOCKER_IMAGE_PULL_SECRET: "gitlab-registry-".concat(context.componentName), HELM_GITLAB_CHART_NAME: (
|
|
65
|
+
: {})), { variables: __assign(__assign({}, context.environment.envVars), { RELEASE_NAME: context.environment.fullName, HELM_EXPERIMENTAL_OCI: "1", KUBE_DOCKER_IMAGE_PULL_SECRET: "gitlab-registry-".concat(context.componentName), HELM_GITLAB_CHART_NAME: (_b = deployConfig.chartName) !== null && _b !== void 0 ? _b : "/helm-charts/the-panter-chart", HELM_ARGS: __spreadArray(__spreadArray([], __read((deployConfig.debug ? ["--debug"] : [])), false), __read(((_c = deployConfig.additionalHelmArgs) !== null && _c !== void 0 ? _c : [])), false).join(" "), COMPONENT_NAME: context.componentName,
|
|
69
66
|
/** @deprecated */
|
|
70
67
|
BUILD_ID: context.environment.envVars.BUILD_INFO_BUILD_ID }) });
|
|
71
68
|
var clusterName = "kube-".concat(context.environment.fullName);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deployJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/kubernetes/deployJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iFAAmF;AACnF,uCAA8C;AAG9C,gCAAgD;AAChD,gCAGiB;AACjB,kCAA0C;AAC1C,2CAAgD;AAEhD,gDAAgE;AAChE,6CAAyD;AAEzD,IAAM,eAAe,GAAG,kBAAkB,CAAC;AACpC,IAAM,0BAA0B,GAAG,UACxC,
|
|
1
|
+
{"version":3,"file":"deployJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/kubernetes/deployJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iFAAmF;AACnF,uCAA8C;AAG9C,gCAAgD;AAChD,gCAGiB;AACjB,kCAA0C;AAC1C,2CAAgD;AAEhD,gDAAgE;AAChE,6CAAyD;AAEzD,IAAM,eAAe,GAAG,kBAAkB,CAAC;AACpC,IAAM,0BAA0B,GAAG,UACxC,OAAyB;;IAEzB,IAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAC5C,IAAI,CAAC,IAAA,sBAAc,EAAC,YAAY,EAAE,YAAY,CAAC,EAAE,CAAC;QAChD,oBAAoB;QACpB,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;IACrD,CAAC;IAED,IAAM,MAAM,uBACV,KAAK,EAAE,IAAA,uBAAc,EAAC,YAAY,CAAC,IAChC,CAAC,YAAY,CAAC,KAAK;QACpB,CAAC,CAAC;YACE,SAAS,EAAE;gBACT,KAAK,EAAE;oBACL,eAAe,EAAE,QAAQ;iBAC1B;gBACD,IAAI,EAAE,QAAQ;aACf;SACF;QACH,CAAC,CAAC,EAAE,CAAC,KACP,SAAS,wBACJ,OAAO,CAAC,WAAW,CAAC,OAAO,KAC9B,YAAY,EAAE,OAAO,CAAC,WAAW,CAAC,QAAQ,EAC1C,qBAAqB,EAAE,GAAG,EAC1B,6BAA6B,EAAE,0BAAmB,OAAO,CAAC,aAAa,CAAE,EACzE,sBAAsB,EACpB,MAAA,YAAY,CAAC,SAAS,mCAAI,+BAA+B,EAC3D,SAAS,EAAE,uCACN,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,kBACvC,CAAC,MAAA,YAAY,CAAC,kBAAkB,mCAAI,EAAE,CAAC,UAC1C,IAAI,CAAC,GAAG,CAAC,EACX,cAAc,EAAE,OAAO,CAAC,aAAa;YACrC,kBAAkB;YAClB,QAAQ,EAAE,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,MAE5D,CAAC;IAEF,IAAM,WAAW,GAAG,eAAQ,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAE,CAAC;IAC3D,IAAM,cAAc,GAAG;QACrB,uCAA+B,WAAW,4BAAgB,IAAA,oDAA0B,EAClF,OAAO,EACP,UAAU,CACX,gDAAqC,IAAA,oDAA0B,EAC9D,OAAO,EACP,aAAa,CACd,qCAAkC;QACnC,2CAAmC,WAAW,2BAAe,IAAA,oDAA0B,EACrF,OAAO,EACP,YAAY,CACb,OAAG;QACJ,uCAA+B,WAAW,4BAAgB,WAAW,yBAAa,WAAW,8BAAkB,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,cAAc,OAAG;QAC5J,uCAA+B,WAAW,OAAG;KAC9C,CAAC;IAEF,OAAO,IAAA,4BAAqB,EAAC,OAAO,EAAE;QACpC,MAAM,wBACD,MAAM,KACT,MAAM,mFACD,cAAc,kBACd,IAAA,4BAAmB,EACpB,gBAAgB,EAChB,QAAQ,GAAG,eAAe,GAAG,sBAAsB,CACpD,CACC,IAAA,oCAAyB,EAAC,IAAA,6BAAgB,EAAC,OAAO,CAAC,EAAE,eAAe,CAAC,CACtE;gBACD,wBAAwB;gBACxB,kBAAkB;8BACf,IAAA,qCAA8B,EAAC,OAAO,CAAC;gBAC1C,+BAA+B;wBAElC;QACD,IAAI,wBACC,MAAM,KACT,MAAM,uDACD,cAAc;gBACjB,kBAAkB;8BACf,IAAA,qCAA8B,EAAC,OAAO,CAAC,YAE7C;QACD,QAAQ,wBACH,MAAM,KACT,MAAM,yCAAM,cAAc,YAAE,oBAAoB,YACjD;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AArFW,QAAA,0BAA0B,8BAqFrC"}
|