@catladder/cli 0.0.0-main-1f9c0121 → 0.0.0-main-0eaf2efe
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 +34 -30
- package/dist/bundles/cli/index.js +66 -41
- package/dist/cli/src/apps/cli/commands/project/cloudSql/commandProjectRestoreDb.js +3 -11
- package/dist/cli/src/apps/cli/commands/project/cloudSql/commandProjectRestoreDb.js.map +1 -1
- package/dist/cli/src/gcloud/cloudSql/parseConnectionString.d.ts +9 -0
- package/dist/cli/src/gcloud/cloudSql/parseConnectionString.js +22 -0
- package/dist/cli/src/gcloud/cloudSql/parseConnectionString.js.map +1 -0
- package/dist/pipeline/src/deploy/base/deploy.js +34 -30
- package/dist/pipeline/src/deploy/base/deploy.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/apps/cli/commands/project/cloudSql/commandProjectRestoreDb.ts +3 -13
- package/src/gcloud/cloudSql/parseConnectionString.ts +28 -0
|
@@ -3686,40 +3686,44 @@ const createDeployJob = (context, jobDefinition) => {
|
|
|
3686
3686
|
}))) !== null && _d !== void 0 ? _d : [])
|
|
3687
3687
|
: []),
|
|
3688
3688
|
],
|
|
3689
|
-
|
|
3690
|
-
|
|
3691
|
-
|
|
3692
|
-
|
|
3693
|
-
|
|
3694
|
-
|
|
3695
|
-
|
|
3696
|
-
|
|
3697
|
-
|
|
3698
|
-
|
|
3699
|
-
|
|
3689
|
+
needsStages:
|
|
3690
|
+
// if the build is disabled, we don't need to wait for it
|
|
3691
|
+
context.build.type !== "disabled"
|
|
3692
|
+
? [
|
|
3693
|
+
...((0, context_1.componentContextHasWorkspaceBuild)(context)
|
|
3694
|
+
? hasDocker // docker build is per component,
|
|
3695
|
+
? [
|
|
3696
|
+
// we don't need artifacts, but have to wait for the component build
|
|
3697
|
+
{
|
|
3698
|
+
stage: "build",
|
|
3699
|
+
artifacts: false,
|
|
3700
|
+
},
|
|
3701
|
+
]
|
|
3702
|
+
: [
|
|
3703
|
+
{
|
|
3704
|
+
// pick build artifacts from workspace build
|
|
3705
|
+
stage: "build",
|
|
3706
|
+
artifacts: true,
|
|
3707
|
+
workspaceName: context.build.workspaceName,
|
|
3708
|
+
},
|
|
3709
|
+
]
|
|
3700
3710
|
: [
|
|
3701
3711
|
{
|
|
3702
|
-
// pick build artifacts from workspace build
|
|
3703
3712
|
stage: "build",
|
|
3704
|
-
artifacts: true,
|
|
3705
|
-
workspaceName: context.build.workspaceName,
|
|
3713
|
+
artifacts: hasDocker ? false : true, // we asume that no-docker deployments need build artifacts,
|
|
3706
3714
|
},
|
|
3707
|
-
]
|
|
3708
|
-
|
|
3709
|
-
|
|
3710
|
-
|
|
3711
|
-
|
|
3712
|
-
|
|
3713
|
-
|
|
3714
|
-
|
|
3715
|
-
|
|
3716
|
-
|
|
3717
|
-
|
|
3718
|
-
|
|
3719
|
-
? context.build.workspaceName
|
|
3720
|
-
: undefined,
|
|
3721
|
-
},
|
|
3722
|
-
],
|
|
3715
|
+
]),
|
|
3716
|
+
// we don't want to deploy when there is a broken test
|
|
3717
|
+
{
|
|
3718
|
+
stage: "test",
|
|
3719
|
+
artifacts: false,
|
|
3720
|
+
// use test from workspace build
|
|
3721
|
+
workspaceName: (0, context_1.componentContextHasWorkspaceBuild)(context)
|
|
3722
|
+
? context.build.workspaceName
|
|
3723
|
+
: undefined,
|
|
3724
|
+
},
|
|
3725
|
+
]
|
|
3726
|
+
: [],
|
|
3723
3727
|
when: whenDeploy === "auto" ? "on_success" : "manual",
|
|
3724
3728
|
allow_failure: whenDeploy === "manual" ? true : false,
|
|
3725
3729
|
stage: "deploy",
|
|
@@ -857,7 +857,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
|
857
857
|
const getProjectConfig_1 = __nccwpck_require__(50001);
|
|
858
858
|
const startProxy_1 = __nccwpck_require__(95540);
|
|
859
859
|
const autocompletions_1 = __nccwpck_require__(52468);
|
|
860
|
-
const
|
|
860
|
+
const parseConnectionString_1 = __nccwpck_require__(77992);
|
|
861
861
|
const copyDb_1 = __nccwpck_require__(57151);
|
|
862
862
|
exports["default"] = async (vorpal) => vorpal
|
|
863
863
|
.command("project-cloud-sql-restore-db", "restores a project db from one source to another target")
|
|
@@ -888,11 +888,7 @@ exports["default"] = async (vorpal) => vorpal
|
|
|
888
888
|
targetProxy === null || targetProxy === void 0 ? void 0 : targetProxy.stop();
|
|
889
889
|
};
|
|
890
890
|
if (sourceEnv === "local") {
|
|
891
|
-
const
|
|
892
|
-
scheme: "postgres",
|
|
893
|
-
hosts: [],
|
|
894
|
-
});
|
|
895
|
-
const parsersResult = parser.parse(sourceEnvVars.DATABASE_URL.toString());
|
|
891
|
+
const parsersResult = (0, parseConnectionString_1.parseConnectionString)(sourceEnvVars.DATABASE_URL.toString());
|
|
896
892
|
sourcePort = (_b = (_a = parsersResult.hosts) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.port;
|
|
897
893
|
sourceUsername = parsersResult.username;
|
|
898
894
|
sourcePassword = parsersResult.password;
|
|
@@ -918,11 +914,7 @@ exports["default"] = async (vorpal) => vorpal
|
|
|
918
914
|
const targetContext = await (0, getProjectConfig_1.getPipelineContextByChoice)(targetEnv, targetComponent);
|
|
919
915
|
const targetEnvVars = await (0, getProjectConfig_1.getEnvVarsResolved)(this, targetContext.env, targetContext.name);
|
|
920
916
|
if (targetEnv === "local") {
|
|
921
|
-
const
|
|
922
|
-
scheme: "postgres",
|
|
923
|
-
hosts: [],
|
|
924
|
-
});
|
|
925
|
-
const parsersResult = parser.parse(targetEnvVars.DATABASE_URL.toString());
|
|
917
|
+
const parsersResult = (0, parseConnectionString_1.parseConnectionString)(targetEnvVars.DATABASE_URL.toString());
|
|
926
918
|
targetPort = (_e = (_d = parsersResult.hosts) === null || _d === void 0 ? void 0 : _d[0]) === null || _e === void 0 ? void 0 : _e.port;
|
|
927
919
|
targetUsername = parsersResult.username;
|
|
928
920
|
targetPassword = parsersResult.password;
|
|
@@ -3002,6 +2994,35 @@ const createCopyDbScript = ({ targetPassword, targetPort, targetUsername, source
|
|
|
3002
2994
|
|
|
3003
2995
|
/***/ }),
|
|
3004
2996
|
|
|
2997
|
+
/***/ 77992:
|
|
2998
|
+
/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
|
|
2999
|
+
|
|
3000
|
+
"use strict";
|
|
3001
|
+
|
|
3002
|
+
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
3003
|
+
exports.parseConnectionString = void 0;
|
|
3004
|
+
const connection_string_parser_1 = __nccwpck_require__(27827);
|
|
3005
|
+
/**
|
|
3006
|
+
* Parses a PostgreSQL connection string.
|
|
3007
|
+
* Accepts both postgres:// and postgresql:// schemes and normalizes to postgresql://
|
|
3008
|
+
*
|
|
3009
|
+
* @param connectionString - The connection string to parse (e.g., "postgresql://user:pass@localhost:5432/dbname")
|
|
3010
|
+
* @returns Parsed connection string parameters
|
|
3011
|
+
*/
|
|
3012
|
+
function parseConnectionString(connectionString) {
|
|
3013
|
+
const parser = new connection_string_parser_1.ConnectionStringParser({
|
|
3014
|
+
scheme: "postgresql",
|
|
3015
|
+
hosts: [],
|
|
3016
|
+
});
|
|
3017
|
+
// Normalize postgres:// to postgresql:// (the official IANA scheme)
|
|
3018
|
+
const normalizedConnectionString = connectionString.replace(/^postgres:\/\//, "postgresql://");
|
|
3019
|
+
return parser.parse(normalizedConnectionString);
|
|
3020
|
+
}
|
|
3021
|
+
exports.parseConnectionString = parseConnectionString;
|
|
3022
|
+
//# sourceMappingURL=parseConnectionString.js.map
|
|
3023
|
+
|
|
3024
|
+
/***/ }),
|
|
3025
|
+
|
|
3005
3026
|
/***/ 95540:
|
|
3006
3027
|
/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
|
|
3007
3028
|
|
|
@@ -6897,40 +6918,44 @@ const createDeployJob = (context, jobDefinition) => {
|
|
|
6897
6918
|
}))) !== null && _d !== void 0 ? _d : [])
|
|
6898
6919
|
: []),
|
|
6899
6920
|
],
|
|
6900
|
-
|
|
6901
|
-
|
|
6902
|
-
|
|
6903
|
-
|
|
6904
|
-
|
|
6905
|
-
|
|
6906
|
-
|
|
6907
|
-
|
|
6908
|
-
|
|
6909
|
-
|
|
6910
|
-
|
|
6921
|
+
needsStages:
|
|
6922
|
+
// if the build is disabled, we don't need to wait for it
|
|
6923
|
+
context.build.type !== "disabled"
|
|
6924
|
+
? [
|
|
6925
|
+
...((0, context_1.componentContextHasWorkspaceBuild)(context)
|
|
6926
|
+
? hasDocker // docker build is per component,
|
|
6927
|
+
? [
|
|
6928
|
+
// we don't need artifacts, but have to wait for the component build
|
|
6929
|
+
{
|
|
6930
|
+
stage: "build",
|
|
6931
|
+
artifacts: false,
|
|
6932
|
+
},
|
|
6933
|
+
]
|
|
6934
|
+
: [
|
|
6935
|
+
{
|
|
6936
|
+
// pick build artifacts from workspace build
|
|
6937
|
+
stage: "build",
|
|
6938
|
+
artifacts: true,
|
|
6939
|
+
workspaceName: context.build.workspaceName,
|
|
6940
|
+
},
|
|
6941
|
+
]
|
|
6911
6942
|
: [
|
|
6912
6943
|
{
|
|
6913
|
-
// pick build artifacts from workspace build
|
|
6914
6944
|
stage: "build",
|
|
6915
|
-
artifacts: true,
|
|
6916
|
-
workspaceName: context.build.workspaceName,
|
|
6945
|
+
artifacts: hasDocker ? false : true, // we asume that no-docker deployments need build artifacts,
|
|
6917
6946
|
},
|
|
6918
|
-
]
|
|
6919
|
-
|
|
6920
|
-
|
|
6921
|
-
|
|
6922
|
-
|
|
6923
|
-
|
|
6924
|
-
|
|
6925
|
-
|
|
6926
|
-
|
|
6927
|
-
|
|
6928
|
-
|
|
6929
|
-
|
|
6930
|
-
? context.build.workspaceName
|
|
6931
|
-
: undefined,
|
|
6932
|
-
},
|
|
6933
|
-
],
|
|
6947
|
+
]),
|
|
6948
|
+
// we don't want to deploy when there is a broken test
|
|
6949
|
+
{
|
|
6950
|
+
stage: "test",
|
|
6951
|
+
artifacts: false,
|
|
6952
|
+
// use test from workspace build
|
|
6953
|
+
workspaceName: (0, context_1.componentContextHasWorkspaceBuild)(context)
|
|
6954
|
+
? context.build.workspaceName
|
|
6955
|
+
: undefined,
|
|
6956
|
+
},
|
|
6957
|
+
]
|
|
6958
|
+
: [],
|
|
6934
6959
|
when: whenDeploy === "auto" ? "on_success" : "manual",
|
|
6935
6960
|
allow_failure: whenDeploy === "manual" ? true : false,
|
|
6936
6961
|
stage: "deploy",
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const getProjectConfig_1 = require("../../../../../config/getProjectConfig");
|
|
4
4
|
const startProxy_1 = require("../../../../../gcloud/cloudSql/startProxy");
|
|
5
5
|
const autocompletions_1 = require("../utils/autocompletions");
|
|
6
|
-
const
|
|
6
|
+
const parseConnectionString_1 = require("../../../../../gcloud/cloudSql/parseConnectionString");
|
|
7
7
|
const copyDb_1 = require("../../../../../gcloud/cloudSql/copyDb");
|
|
8
8
|
exports.default = async (vorpal) => vorpal
|
|
9
9
|
.command("project-cloud-sql-restore-db", "restores a project db from one source to another target")
|
|
@@ -34,11 +34,7 @@ exports.default = async (vorpal) => vorpal
|
|
|
34
34
|
targetProxy === null || targetProxy === void 0 ? void 0 : targetProxy.stop();
|
|
35
35
|
};
|
|
36
36
|
if (sourceEnv === "local") {
|
|
37
|
-
const
|
|
38
|
-
scheme: "postgres",
|
|
39
|
-
hosts: [],
|
|
40
|
-
});
|
|
41
|
-
const parsersResult = parser.parse(sourceEnvVars.DATABASE_URL.toString());
|
|
37
|
+
const parsersResult = (0, parseConnectionString_1.parseConnectionString)(sourceEnvVars.DATABASE_URL.toString());
|
|
42
38
|
sourcePort = (_b = (_a = parsersResult.hosts) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.port;
|
|
43
39
|
sourceUsername = parsersResult.username;
|
|
44
40
|
sourcePassword = parsersResult.password;
|
|
@@ -64,11 +60,7 @@ exports.default = async (vorpal) => vorpal
|
|
|
64
60
|
const targetContext = await (0, getProjectConfig_1.getPipelineContextByChoice)(targetEnv, targetComponent);
|
|
65
61
|
const targetEnvVars = await (0, getProjectConfig_1.getEnvVarsResolved)(this, targetContext.env, targetContext.name);
|
|
66
62
|
if (targetEnv === "local") {
|
|
67
|
-
const
|
|
68
|
-
scheme: "postgres",
|
|
69
|
-
hosts: [],
|
|
70
|
-
});
|
|
71
|
-
const parsersResult = parser.parse(targetEnvVars.DATABASE_URL.toString());
|
|
63
|
+
const parsersResult = (0, parseConnectionString_1.parseConnectionString)(targetEnvVars.DATABASE_URL.toString());
|
|
72
64
|
targetPort = (_e = (_d = parsersResult.hosts) === null || _d === void 0 ? void 0 : _d[0]) === null || _e === void 0 ? void 0 : _e.port;
|
|
73
65
|
targetUsername = parsersResult.username;
|
|
74
66
|
targetPassword = parsersResult.password;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commandProjectRestoreDb.js","sourceRoot":"","sources":["../../../../../../../../src/apps/cli/commands/project/cloudSql/commandProjectRestoreDb.ts"],"names":[],"mappings":";;AACA,6EAGgD;AAEhD,0EAA2F;AAC3F,8DAA4D;AAE5D,
|
|
1
|
+
{"version":3,"file":"commandProjectRestoreDb.js","sourceRoot":"","sources":["../../../../../../../../src/apps/cli/commands/project/cloudSql/commandProjectRestoreDb.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { type IConnectionStringParameters } from "connection-string-parser";
|
|
2
|
+
/**
|
|
3
|
+
* Parses a PostgreSQL connection string.
|
|
4
|
+
* Accepts both postgres:// and postgresql:// schemes and normalizes to postgresql://
|
|
5
|
+
*
|
|
6
|
+
* @param connectionString - The connection string to parse (e.g., "postgresql://user:pass@localhost:5432/dbname")
|
|
7
|
+
* @returns Parsed connection string parameters
|
|
8
|
+
*/
|
|
9
|
+
export declare function parseConnectionString(connectionString: string): IConnectionStringParameters;
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.parseConnectionString = void 0;
|
|
4
|
+
const connection_string_parser_1 = require("connection-string-parser");
|
|
5
|
+
/**
|
|
6
|
+
* Parses a PostgreSQL connection string.
|
|
7
|
+
* Accepts both postgres:// and postgresql:// schemes and normalizes to postgresql://
|
|
8
|
+
*
|
|
9
|
+
* @param connectionString - The connection string to parse (e.g., "postgresql://user:pass@localhost:5432/dbname")
|
|
10
|
+
* @returns Parsed connection string parameters
|
|
11
|
+
*/
|
|
12
|
+
function parseConnectionString(connectionString) {
|
|
13
|
+
const parser = new connection_string_parser_1.ConnectionStringParser({
|
|
14
|
+
scheme: "postgresql",
|
|
15
|
+
hosts: [],
|
|
16
|
+
});
|
|
17
|
+
// Normalize postgres:// to postgresql:// (the official IANA scheme)
|
|
18
|
+
const normalizedConnectionString = connectionString.replace(/^postgres:\/\//, "postgresql://");
|
|
19
|
+
return parser.parse(normalizedConnectionString);
|
|
20
|
+
}
|
|
21
|
+
exports.parseConnectionString = parseConnectionString;
|
|
22
|
+
//# sourceMappingURL=parseConnectionString.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"parseConnectionString.js","sourceRoot":"","sources":["../../../../../src/gcloud/cloudSql/parseConnectionString.ts"],"names":[],"mappings":";;;AAAA,uEAGkC;AAElC;;;;;;GAMG;AACH,SAAgB,qBAAqB,CACnC,gBAAwB;IAExB,MAAM,MAAM,GAAG,IAAI,iDAAsB,CAAC;QACxC,MAAM,EAAE,YAAY;QACpB,KAAK,EAAE,EAAE;KACV,CAAC,CAAC;IAEH,oEAAoE;IACpE,MAAM,0BAA0B,GAAG,gBAAgB,CAAC,OAAO,CACzD,gBAAgB,EAChB,eAAe,CAChB,CAAC;IAEF,OAAO,MAAM,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;AAClD,CAAC;AAfD,sDAeC"}
|
|
@@ -51,40 +51,44 @@ const createDeployJob = (context, jobDefinition) => {
|
|
|
51
51
|
}))) !== null && _d !== void 0 ? _d : [])
|
|
52
52
|
: []),
|
|
53
53
|
],
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
54
|
+
needsStages:
|
|
55
|
+
// if the build is disabled, we don't need to wait for it
|
|
56
|
+
context.build.type !== "disabled"
|
|
57
|
+
? [
|
|
58
|
+
...((0, context_1.componentContextHasWorkspaceBuild)(context)
|
|
59
|
+
? hasDocker // docker build is per component,
|
|
60
|
+
? [
|
|
61
|
+
// we don't need artifacts, but have to wait for the component build
|
|
62
|
+
{
|
|
63
|
+
stage: "build",
|
|
64
|
+
artifacts: false,
|
|
65
|
+
},
|
|
66
|
+
]
|
|
67
|
+
: [
|
|
68
|
+
{
|
|
69
|
+
// pick build artifacts from workspace build
|
|
70
|
+
stage: "build",
|
|
71
|
+
artifacts: true,
|
|
72
|
+
workspaceName: context.build.workspaceName,
|
|
73
|
+
},
|
|
74
|
+
]
|
|
65
75
|
: [
|
|
66
76
|
{
|
|
67
|
-
// pick build artifacts from workspace build
|
|
68
77
|
stage: "build",
|
|
69
|
-
artifacts: true,
|
|
70
|
-
workspaceName: context.build.workspaceName,
|
|
78
|
+
artifacts: hasDocker ? false : true, // we asume that no-docker deployments need build artifacts,
|
|
71
79
|
},
|
|
72
|
-
]
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
? context.build.workspaceName
|
|
85
|
-
: undefined,
|
|
86
|
-
},
|
|
87
|
-
],
|
|
80
|
+
]),
|
|
81
|
+
// we don't want to deploy when there is a broken test
|
|
82
|
+
{
|
|
83
|
+
stage: "test",
|
|
84
|
+
artifacts: false,
|
|
85
|
+
// use test from workspace build
|
|
86
|
+
workspaceName: (0, context_1.componentContextHasWorkspaceBuild)(context)
|
|
87
|
+
? context.build.workspaceName
|
|
88
|
+
: undefined,
|
|
89
|
+
},
|
|
90
|
+
]
|
|
91
|
+
: [],
|
|
88
92
|
when: whenDeploy === "auto" ? "on_success" : "manual",
|
|
89
93
|
allow_failure: whenDeploy === "manual" ? true : false,
|
|
90
94
|
stage: "deploy",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/base/deploy.ts"],"names":[],"mappings":";;;AAAA,qEAAkF;AAClF,+CAG4B;AAC5B,2CAAuD;AAEvD,iDAG6B;AAE7B,kCAA0C;AAC1C,oCAA8C;AAC9C,iCAAuC;AAEvC,2CAAsD;AAEzC,QAAA,eAAe,GAAG,WAAW,CAAC;AAEpC,MAAM,eAAe,GAAG,CAC7B,OAAyB,EACzB,aAAkC,EACpB,EAAE;;IAChB,MAAM,SAAS,GAAG,IAAA,4BAAmB,EAAC,OAAO,CAAC,CAAC;IAC/C,MAAM,WAAW,GAAG,IAAA,0BAAkB,EAAC,OAAO,CAAC,CAAC;IAEhD,MAAM,QAAQ,GACZ,OAAO,CAAC,WAAW,CAAC,OAAO,KAAK,QAAQ;QACtC,CAAC,CAAC,QAAQ;QACV,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,KAAK,KAAK;YACrC,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,SAAS,CAAC;IAElB,MAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAE5C,uDAAuD;IACvD,MAAM,iBAAiB,GACrB,YAAY,IAAI,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;IACpE,mGAAmG;IACnG,MAAM,iBAAiB,GACrB,OAAO,CAAC,WAAW,CAAC,OAAO,KAAK,MAAM;QACpC,CAAC,CAAC,MAAM,CAAC,4BAA4B;QACrC,CAAC,CAAC,CAAA,MAAA,OAAO,CAAC,eAAe,CAAC,GAAG,0CAAE,KAAK,MAAK,KAAK;YAC5C,CAAC,CAAC,MAAM,CAAC,uCAAuC;YAChD,CAAC,CAAC,QAAQ,CAAC,CAAC,kBAAkB;IACpC,MAAM,UAAU,GAAG,iBAAiB,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,iBAAiB,CAAC;IAE7E,OAAO;QACL,IAAI,EAAE,uBAAe;QACrB,MAAM,EAAE,aAAa,CAAC,MAAM;QAC5B,KAAK,EAAE,aAAa,CAAC,KAAK;QAC1B,KAAK,EAAE,aAAa,CAAC,KAAK;YACxB,CAAC,CAAC,IAAA,+CAA8B,EAAC,OAAO,EAAE,aAAa,CAAC,KAAK,CAAC;YAC9D,CAAC,CAAC,SAAS;QACb,SAAS,EAAE,aAAa,CAAC,SAAS;QAClC,QAAQ,EAAE,aAAa,CAAC,QAAQ;QAChC,OAAO,EAAE,aAAa,EAAE,6CAA6C;QAErE,KAAK,EAAE;YACL,GAAG,CAAC,IAAA,sBAAe,EAAC,OAAO,CAAC;gBAC1B,CAAC,CAAC,EAAE;gBACJ,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,0BAAmB,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YACpD,GAAG,CAAC,YAAY;gBACd,CAAC,CAAC,CAAC,MAAA,MAAA,YAAY,CAAC,OAAO,0CAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;oBACjC,aAAa,EAAE,CAAC;oBAChB,GAAG,EAAE,uBAAe;oBACpB,SAAS,EAAE,KAAK;iBACjB,CAAC,CAAC,mCAAI,EAAE,CAAC;gBACZ,CAAC,CAAC,EAAE,CAAC;SACR;
|
|
1
|
+
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/base/deploy.ts"],"names":[],"mappings":"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"}
|