@catladder/cli 0.0.0-refactor-gitlab-jobs-c23038ea → 0.0.0-remove-undefined-66ca1336
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/apps/cli/commands/project/commandCloudSqlProxy.js +22 -62
- package/dist/apps/cli/commands/project/commandCloudSqlProxy.js.map +1 -1
- package/dist/apps/cli/commands/project/commandConfigSecrets.js +15 -4
- package/dist/apps/cli/commands/project/commandConfigSecrets.js.map +1 -1
- package/dist/apps/cli/commands/project/commandGetShell.js +9 -6
- package/dist/apps/cli/commands/project/commandGetShell.js.map +1 -1
- package/dist/apps/cli/commands/project/setup/setupContext.js +3 -10
- package/dist/apps/cli/commands/project/setup/setupContext.js.map +1 -1
- package/dist/apps/cli/commands/project/setup/setupKubernetes.js +16 -5
- package/dist/apps/cli/commands/project/setup/setupKubernetes.js.map +1 -1
- package/dist/apps/cli/verify/migration/migrateSecrets.js +3 -1
- package/dist/apps/cli/verify/migration/migrateSecrets.js.map +1 -1
- package/dist/bundles/catenv/index.js +321 -78
- package/dist/bundles/cli/index.js +731 -517
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -2
- package/src/apps/cli/commands/project/commandCloudSqlProxy.ts +18 -43
- package/src/apps/cli/commands/project/commandConfigSecrets.ts +16 -2
- package/src/apps/cli/commands/project/commandGetShell.ts +8 -5
- package/src/apps/cli/commands/project/setup/setupContext.ts +2 -5
- package/src/apps/cli/commands/project/setup/setupKubernetes.ts +27 -6
- package/src/apps/cli/verify/migration/migrateSecrets.ts +6 -1
- package/dist/apps/cli/commands/project/setup/setupCloudSQL.d.ts +0 -3
- package/dist/apps/cli/commands/project/setup/setupCloudSQL.js +0 -56
- package/dist/apps/cli/commands/project/setup/setupCloudSQL.js.map +0 -1
- package/src/apps/cli/commands/project/setup/setupCloudSQL.ts +0 -22
|
@@ -35,20 +35,10 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
35
35
|
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
36
36
|
}
|
|
37
37
|
};
|
|
38
|
-
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
39
|
-
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
40
|
-
if (ar || !(i in from)) {
|
|
41
|
-
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
42
|
-
ar[i] = from[i];
|
|
43
|
-
}
|
|
44
|
-
}
|
|
45
|
-
return to.concat(ar || Array.prototype.slice.call(from));
|
|
46
|
-
};
|
|
47
38
|
exports.__esModule = true;
|
|
48
39
|
var pipeline_1 = require("@catladder/pipeline");
|
|
40
|
+
var pipeline_2 = require("@catladder/pipeline");
|
|
49
41
|
var child_process_promise_1 = require("child-process-promise");
|
|
50
|
-
var fs_extra_1 = require("fs-extra");
|
|
51
|
-
var tmp_promise_1 = require("tmp-promise");
|
|
52
42
|
var getProjectConfig_1 = require("../../../../config/getProjectConfig");
|
|
53
43
|
var autocompletions_1 = require("./utils/autocompletions");
|
|
54
44
|
exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void 0, function () {
|
|
@@ -64,8 +54,7 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
|
|
|
64
54
|
.action(function (_a) {
|
|
65
55
|
var envComponent = _a.envComponent;
|
|
66
56
|
return __awaiter(this, void 0, void 0, function () {
|
|
67
|
-
var _b, env, componentName, context, proxyInfo, DB_PASSWORD, DB_NAME, DB_USER, instanceName, localPort
|
|
68
|
-
var _this = this;
|
|
57
|
+
var _b, env, componentName, context, proxyInfo, DB_PASSWORD, DB_NAME, DB_USER, instanceName, localPort;
|
|
69
58
|
return __generator(this, function (_c) {
|
|
70
59
|
switch (_c.label) {
|
|
71
60
|
case 0:
|
|
@@ -76,13 +65,13 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
|
|
|
76
65
|
if (env === "review") {
|
|
77
66
|
vorpal.log("⚠️ connection string does not include mr information on review environments");
|
|
78
67
|
}
|
|
79
|
-
if (!(0,
|
|
68
|
+
if (!(0, pipeline_2.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) return [3 /*break*/, 3];
|
|
80
69
|
return [4 /*yield*/, getProxyInfoForKubernetes(context)];
|
|
81
70
|
case 2:
|
|
82
71
|
proxyInfo = _c.sent();
|
|
83
72
|
return [3 /*break*/, 6];
|
|
84
73
|
case 3:
|
|
85
|
-
if (!(0,
|
|
74
|
+
if (!(0, pipeline_2.isOfDeployType)(context.componentConfig.deploy, "google-cloudrun")) return [3 /*break*/, 5];
|
|
86
75
|
return [4 /*yield*/, getProxyInfoForCloudRun(context)];
|
|
87
76
|
case 4:
|
|
88
77
|
proxyInfo = _c.sent();
|
|
@@ -101,39 +90,17 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
|
|
|
101
90
|
this.log("");
|
|
102
91
|
this.log("postgres-PW: ".concat(DB_PASSWORD));
|
|
103
92
|
this.log("");
|
|
104
|
-
this.log("
|
|
93
|
+
this.log("connection strings:");
|
|
105
94
|
this.log("");
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
switch (_b.label) {
|
|
114
|
-
case 0:
|
|
115
|
-
if (!cloudsqlProxyCredentials) return [3 /*break*/, 2];
|
|
116
|
-
return [4 /*yield*/, (0, fs_extra_1.writeFile)(tmpFilePath, cloudsqlProxyCredentials)];
|
|
117
|
-
case 1:
|
|
118
|
-
_b.sent();
|
|
119
|
-
_b.label = 2;
|
|
120
|
-
case 2: return [4 /*yield*/, (0, child_process_promise_1.spawn)("cloud_sql_proxy", __spreadArray([
|
|
121
|
-
"-instances",
|
|
122
|
-
"".concat(instanceName, "=tcp:").concat(localPort)
|
|
123
|
-
], (cloudsqlProxyCredentials
|
|
124
|
-
? ["-credential_file", tmpFilePath]
|
|
125
|
-
: []), true), {
|
|
126
|
-
stdio: "inherit",
|
|
127
|
-
shell: true
|
|
128
|
-
})];
|
|
129
|
-
case 3:
|
|
130
|
-
_b.sent();
|
|
131
|
-
return [2 /*return*/];
|
|
132
|
-
}
|
|
133
|
-
});
|
|
134
|
-
});
|
|
95
|
+
this.log("DATABASE_URL=postgresql://".concat(DB_USER, ":").concat(DB_PASSWORD, "@localhost:").concat(localPort, "/").concat(DB_NAME, "?schema=public"));
|
|
96
|
+
this.log("");
|
|
97
|
+
this.log("DATABASE_JDBC_URL=jdbc:postgresql://localhost:".concat(localPort, "/").concat(DB_NAME, "?schema=public&user=").concat(DB_USER, "&password=").concat(DB_PASSWORD));
|
|
98
|
+
this.log("");
|
|
99
|
+
return [4 /*yield*/, (0, child_process_promise_1.spawn)("cloud_sql_proxy", ["-instances", "".concat(instanceName, "=tcp:").concat(localPort)], {
|
|
100
|
+
stdio: "inherit",
|
|
101
|
+
shell: true
|
|
135
102
|
})];
|
|
136
|
-
case
|
|
103
|
+
case 8:
|
|
137
104
|
_c.sent();
|
|
138
105
|
return [2 /*return*/];
|
|
139
106
|
}
|
|
@@ -144,27 +111,20 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
|
|
|
144
111
|
});
|
|
145
112
|
}); });
|
|
146
113
|
var getProxyInfoForKubernetes = function (context) { return __awaiter(void 0, void 0, void 0, function () {
|
|
147
|
-
var envVars, DB_PASSWORD, DB_NAME,
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
switch (_e.label) {
|
|
114
|
+
var envVars, cloudSqlValues, DB_PASSWORD, DB_NAME, instanceName;
|
|
115
|
+
return __generator(this, function (_a) {
|
|
116
|
+
switch (_a.label) {
|
|
151
117
|
case 0:
|
|
152
|
-
if (!(0,
|
|
118
|
+
if (!(0, pipeline_2.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) {
|
|
153
119
|
throw new Error("unsupported");
|
|
154
120
|
}
|
|
155
121
|
return [4 /*yield*/, (0, getProjectConfig_1.getEnvVars)(this, context.environment.shortName, context.componentName)];
|
|
156
122
|
case 1:
|
|
157
|
-
envVars =
|
|
123
|
+
envVars = _a.sent();
|
|
124
|
+
cloudSqlValues = (0, pipeline_1.createKubernetesCloudsqlBaseValues)(context);
|
|
158
125
|
DB_PASSWORD = (envVars === null || envVars === void 0 ? void 0 : envVars.DB_PASSWORD) || (envVars === null || envVars === void 0 ? void 0 : envVars.POSTGRESQL_PASSWORD);
|
|
159
|
-
DB_NAME =
|
|
160
|
-
|
|
161
|
-
projectId = ((_a = values === null || values === void 0 ? void 0 : values.cloudsql) === null || _a === void 0 ? void 0 : _a.projectId) ||
|
|
162
|
-
((_b = context.componentConfig.deploy.cluster) === null || _b === void 0 ? void 0 : _b.projectId);
|
|
163
|
-
defaultInstanceId = "".concat(context.fullConfig.customerName, "-").concat(context.fullConfig.appName, "-").concat(context.environment.shortName);
|
|
164
|
-
instanceId = ((_c = values === null || values === void 0 ? void 0 : values.cloudsql) === null || _c === void 0 ? void 0 : _c.instanceId) || defaultInstanceId;
|
|
165
|
-
defaultRegion = "europe-west6";
|
|
166
|
-
region = ((_d = values === null || values === void 0 ? void 0 : values.cloudsql) === null || _d === void 0 ? void 0 : _d.region) || defaultRegion;
|
|
167
|
-
instanceName = "".concat(projectId, ":").concat(region, ":").concat(instanceId);
|
|
126
|
+
DB_NAME = cloudSqlValues.cloudsql.fullDbName;
|
|
127
|
+
instanceName = cloudSqlValues.cloudsql.instanceConnectionName;
|
|
168
128
|
return [2 /*return*/, {
|
|
169
129
|
instanceName: instanceName,
|
|
170
130
|
DB_PASSWORD: DB_PASSWORD,
|
|
@@ -179,7 +139,7 @@ var getProxyInfoForCloudRun = function (context) { return __awaiter(void 0, void
|
|
|
179
139
|
return __generator(this, function (_a) {
|
|
180
140
|
switch (_a.label) {
|
|
181
141
|
case 0:
|
|
182
|
-
if (!(0,
|
|
142
|
+
if (!(0, pipeline_2.isOfDeployType)(context.componentConfig.deploy, "google-cloudrun") ||
|
|
183
143
|
!context.componentConfig.deploy.cloudSql) {
|
|
184
144
|
throw new Error("unsupported");
|
|
185
145
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commandCloudSqlProxy.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/commandCloudSqlProxy.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"commandCloudSqlProxy.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/commandCloudSqlProxy.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAAyE;AACzE,gDAAqD;AACrD,+DAA8C;AAI9C,wEAK6C;AAC7C,2DAA2D;AAQ3D,sBAAe,UAAO,MAAc;;;;;gBAClC,KAAA,CAAA,KAAA,MAAM;qBACH,OAAO,CAAC,wCAAwC,EAAE,uBAAuB,CAAC,CAAA;qBAC1E,YAAY,CAAA;gBAAC,qBAAM,IAAA,kCAAgB,GAAE,EAAA;oBAFxC,sBAAA,cAEgB,SAAwB,EAAC;qBACtC,MAAM,CAAC,UAAgB,EAAgB;wBAAd,YAAY,kBAAA;;;;;;oCAC9B,KAAyB,IAAA,8BAAW,EAAC,YAAY,CAAC,EAAhD,GAAG,SAAA,EAAE,aAAa,mBAAA,CAA+B;oCAEzC,qBAAM,IAAA,6CAA0B,EAAC,GAAG,EAAE,aAAa,CAAC,EAAA;;oCAA9D,OAAO,GAAG,SAAoD;oCAGpE,IAAI,GAAG,KAAK,QAAQ,EAAE;wCACpB,MAAM,CAAC,GAAG,CACR,6EAA6E,CAC9E,CAAC;qCACH;yCACG,IAAA,yBAAc,EAAC,OAAO,CAAC,eAAe,CAAC,MAAM,EAAE,YAAY,CAAC,EAA5D,wBAA4D;oCAClD,qBAAM,yBAAyB,CAAC,OAAO,CAAC,EAAA;;oCAApD,SAAS,GAAG,SAAwC,CAAC;;;yCAErD,IAAA,yBAAc,EAAC,OAAO,CAAC,eAAe,CAAC,MAAM,EAAE,iBAAiB,CAAC,EAAjE,wBAAiE;oCAErD,qBAAM,uBAAuB,CAAC,OAAO,CAAC,EAAA;;oCAAlD,SAAS,GAAG,SAAsC,CAAC;;wCAEnD,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;;oCAIrC,WAAW,GAAqC,SAAS,YAA9C,EAAE,OAAO,GAA4B,SAAS,QAArC,EAAE,OAAO,GAAmB,SAAS,QAA5B,EAAE,YAAY,GAAK,SAAS,aAAd,CAAe;oCAC5C,qBAAM,IAAI,CAAC,MAAM,CAAC;4CACtC,IAAI,EAAE,QAAQ;4CACd,IAAI,EAAE,WAAW;4CACjB,SAAO,EAAE,OAAO;4CAChB,OAAO,EAAE,cAAc;yCACxB,CAAC,EAAA;;oCALM,SAAS,GAAK,CAAA,SAKpB,CAAA,UALe;oCAOjB,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oCACb,IAAI,CAAC,GAAG,CAAC,uBAAgB,WAAW,CAAE,CAAC,CAAC;oCACxC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oCACb,IAAI,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;oCAChC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oCACb,IAAI,CAAC,GAAG,CACN,oCAA6B,OAAO,cAAI,WAAW,wBAAc,SAAS,cAAI,OAAO,mBAAgB,CACtG,CAAC;oCACF,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oCACb,IAAI,CAAC,GAAG,CACN,wDAAiD,SAAS,cAAI,OAAO,iCAAuB,OAAO,uBAAa,WAAW,CAAE,CAC9H,CAAC;oCACF,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oCACb,qBAAM,IAAA,6BAAK,EACT,iBAAiB,EACjB,CAAC,YAAY,EAAE,UAAG,YAAY,kBAAQ,SAAS,CAAE,CAAC,EAClD;4CACE,KAAK,EAAE,SAAS;4CAChB,KAAK,EAAE,IAAI;yCACZ,CACF,EAAA;;oCAPD,SAOC,CAAC;;;;;iBACH,CAAC,EAAA;;;KAAA,EAAC;AAEP,IAAM,yBAAyB,GAAG,UAChC,OAAgB;;;;;gBAEhB,IAAI,CAAC,IAAA,yBAAc,EAAC,OAAO,CAAC,eAAe,CAAC,MAAM,EAAE,YAAY,CAAC,EAAE;oBACjE,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC;iBAChC;gBAEe,qBAAM,IAAA,6BAAU,EAC9B,IAAI,EACJ,OAAO,CAAC,WAAW,CAAC,SAAS,EAC7B,OAAO,CAAC,aAAa,CACtB,EAAA;;gBAJK,OAAO,GAAG,SAIf;gBAEK,cAAc,GAAG,IAAA,6CAAkC,EAAC,OAAO,CAAC,CAAC;gBAE7D,WAAW,GAAG,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,MAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,mBAAmB,CAAA,CAAC;gBAEnE,OAAO,GAAG,cAAc,CAAC,QAAQ,CAAC,UAAU,CAAC;gBAE7C,YAAY,GAAG,cAAc,CAAC,QAAQ,CAAC,sBAAsB,CAAC;gBAEpE,sBAAO;wBACL,YAAY,cAAA;wBACZ,WAAW,aAAA;wBACX,OAAO,SAAA;wBACP,OAAO,EAAE,UAAU;qBACpB,EAAC;;;KACH,CAAC;AAEF,IAAM,uBAAuB,GAAG,UAC9B,OAAgB;;;;;gBAEhB,IACE,CAAC,IAAA,yBAAc,EAAC,OAAO,CAAC,eAAe,CAAC,MAAM,EAAE,iBAAiB,CAAC;oBAClE,CAAC,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC,QAAQ,EACxC;oBACA,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC;iBAChC;gBAEe,qBAAM,IAAA,6BAAU,EAC9B,IAAI,EACJ,OAAO,CAAC,WAAW,CAAC,SAAS,EAC7B,OAAO,CAAC,aAAa,CACtB,EAAA;;gBAJK,OAAO,GAAG,SAIf;gBAEK,WAAW,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,CAAC;gBACnC,OAAO,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC;gBAE3B,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC;gBAEpD,sBAAO;wBACL,YAAY,EACV,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,sBAAsB;wBAChE,WAAW,aAAA;wBACX,OAAO,SAAA;wBACP,OAAO,SAAA;qBACR,EAAC;;;KACH,CAAC"}
|
|
@@ -74,13 +74,24 @@ var resolveJson = function (v) {
|
|
|
74
74
|
];
|
|
75
75
|
}));
|
|
76
76
|
};
|
|
77
|
-
var
|
|
78
|
-
var secretEnvVarKeys
|
|
77
|
+
var getNonHiddenSecretEnvVarKeys = function (env, componentName) { return __awaiter(void 0, void 0, void 0, function () {
|
|
78
|
+
var secretEnvVarKeys;
|
|
79
79
|
return __generator(this, function (_a) {
|
|
80
80
|
switch (_a.label) {
|
|
81
81
|
case 0: return [4 /*yield*/, (0, getProjectConfig_1.getEnvironment)(env, componentName)];
|
|
82
82
|
case 1:
|
|
83
83
|
secretEnvVarKeys = (_a.sent()).secretEnvVarKeys;
|
|
84
|
+
return [2 /*return*/, secretEnvVarKeys.filter(function (k) { return !k.hidden; }).map(function (k) { return k.key; })];
|
|
85
|
+
}
|
|
86
|
+
});
|
|
87
|
+
}); };
|
|
88
|
+
var getEnvVarsToEdit = function (instance, env, componentName) { return __awaiter(void 0, void 0, void 0, function () {
|
|
89
|
+
var secretEnvVarKeys, allEnvVars;
|
|
90
|
+
return __generator(this, function (_a) {
|
|
91
|
+
switch (_a.label) {
|
|
92
|
+
case 0: return [4 /*yield*/, getNonHiddenSecretEnvVarKeys(env, componentName)];
|
|
93
|
+
case 1:
|
|
94
|
+
secretEnvVarKeys = _a.sent();
|
|
84
95
|
return [4 /*yield*/, (0, getProjectConfig_1.getEnvVars)(instance, env, componentName)];
|
|
85
96
|
case 2:
|
|
86
97
|
allEnvVars = _a.sent();
|
|
@@ -157,9 +168,9 @@ var doItFor = function (instance, envAndComponents) { return __awaiter(void 0, v
|
|
|
157
168
|
usedKeys = valuesToEdit[componentName][env]
|
|
158
169
|
? Object.keys(valuesToEdit[componentName][env])
|
|
159
170
|
: [];
|
|
160
|
-
return [4 /*yield*/, (
|
|
171
|
+
return [4 /*yield*/, getNonHiddenSecretEnvVarKeys(env, componentName)];
|
|
161
172
|
case 6:
|
|
162
|
-
secretEnvVarKeys =
|
|
173
|
+
secretEnvVarKeys = _k.sent();
|
|
163
174
|
extranous = (0, lodash_1.difference)(usedKeys, secretEnvVarKeys);
|
|
164
175
|
missing = (0, lodash_1.difference)(secretEnvVarKeys, usedKeys);
|
|
165
176
|
if (!(extranous.length > 0 || missing.length > 0)) return [3 /*break*/, 9];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commandConfigSecrets.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/commandConfigSecrets.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAA0C;AAC1C,gDAAuD;AACvD,2CAA2C;AAC3C,iCAAoC;AAGpC,wEAM6C;AAC7C,2DAA0D;AAC1D,mDAA8D;AAC9D,qDAAkD;AAClD,2DAAkE;AAOlE,+FAA+F;AAC/F,IAAM,WAAW,GAAG,UAAC,CAAO;IAC1B,OAAA,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,UAAC,EAAqB;YAApB,aAAa,QAAA,EAAE,IAAI,QAAA;QACzC,OAAO;YACL,aAAa;YACb,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,UAAC,EAAc;oBAAb,GAAG,QAAA,EAAE,OAAO,QAAA;gBAAM,OAAA;oBAC3C,GAAG;oBACH,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,UAAC,EAAY;4BAAX,GAAG,QAAA,EAAE,KAAK,QAAA;wBACtC,IAAI;4BACF,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;yBACjC;wBAAC,OAAO,CAAC,EAAE;4BACV,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;yBACrB;oBACH,CAAC,CAAC,CACH;iBACF;YAX4C,CAW5C,CAAC,CACH;SACF,CAAC;IACJ,CAAC,CAAC,CACH;AApBD,CAoBC,CAAC;AAEJ,IAAM,
|
|
1
|
+
{"version":3,"file":"commandConfigSecrets.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/commandConfigSecrets.ts"],"names":[],"mappings":"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"}
|
|
@@ -58,7 +58,7 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
|
|
|
58
58
|
.action(function (_a) {
|
|
59
59
|
var envComponent = _a.envComponent;
|
|
60
60
|
return __awaiter(this, void 0, void 0, function () {
|
|
61
|
-
var namespace,
|
|
61
|
+
var namespace, pods, runningPodNames, podName;
|
|
62
62
|
return __generator(this, function (_b) {
|
|
63
63
|
switch (_b.label) {
|
|
64
64
|
case 0: return [4 /*yield*/, ensureCluster_1["default"].call(this, envComponent)];
|
|
@@ -67,17 +67,20 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
|
|
|
67
67
|
return [4 /*yield*/, (0, projects_1.getProjectNamespace)(envComponent)];
|
|
68
68
|
case 2:
|
|
69
69
|
namespace = _b.sent();
|
|
70
|
-
return [4 /*yield*/, (0, kubernetes_1.
|
|
70
|
+
return [4 /*yield*/, (0, kubernetes_1.getProjectPods)(envComponent)];
|
|
71
71
|
case 3:
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
(
|
|
72
|
+
pods = _b.sent();
|
|
73
|
+
runningPodNames = pods
|
|
74
|
+
.filter(function (p) { return p.status.phase == "Running"; })
|
|
75
|
+
.map(function (r) { return r.metadata.name; });
|
|
76
|
+
if (runningPodNames.length === 0) {
|
|
77
|
+
(0, log_1.logError)(this, "sorry, no running pods found");
|
|
75
78
|
return [2 /*return*/];
|
|
76
79
|
}
|
|
77
80
|
return [4 /*yield*/, this.prompt({
|
|
78
81
|
type: "list",
|
|
79
82
|
name: "podName",
|
|
80
|
-
choices:
|
|
83
|
+
choices: runningPodNames,
|
|
81
84
|
message: "Which pod? 🤔"
|
|
82
85
|
})];
|
|
83
86
|
case 4:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commandGetShell.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/commandGetShell.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,
|
|
1
|
+
{"version":3,"file":"commandGetShell.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/commandGetShell.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,qDAAwD;AACxD,6CAAiD;AACjD,uDAAiE;AACjE,iDAAmD;AAEnD,2DAA2D;AAC3D,wEAAkD;AAElD,sBAAe,UAAO,MAAc;;;;;gBAClC,KAAA,CAAA,KAAA,MAAM;qBACH,OAAO,CACN,kCAAkC,EAClC,yCAAyC,CAC1C,CAAA;qBACA,YAAY,CAAA;gBAAC,qBAAM,IAAA,kCAAgB,GAAE,EAAA;oBALxC,sBAAA,cAKgB,SAAwB,EAAC;qBACtC,MAAM,CAAC,UAAgB,EAAgB;wBAAd,YAAY,kBAAA;;;;;wCACpC,qBAAM,0BAAa,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,EAAA;;oCAA5C,SAA4C,CAAC;oCAC3B,qBAAM,IAAA,8BAAmB,EAAC,YAAY,CAAC,EAAA;;oCAAnD,SAAS,GAAG,SAAuC;oCAC5C,qBAAM,IAAA,2BAAc,EAAC,YAAY,CAAC,EAAA;;oCAAzC,IAAI,GAAG,SAAkC;oCACzC,eAAe,GAAG,IAAI;yCACzB,MAAM,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,MAAM,CAAC,KAAK,IAAI,SAAS,EAA3B,CAA2B,CAAC;yCAC1C,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAf,CAAe,CAAC,CAAC;oCAC/B,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE;wCAChC,IAAA,cAAQ,EAAC,IAAI,EAAE,8BAA8B,CAAC,CAAC;wCAC/C,sBAAO;qCACR;oCACmB,qBAAM,IAAI,CAAC,MAAM,CAAC;4CACpC,IAAI,EAAE,MAAM;4CACZ,IAAI,EAAE,SAAS;4CACf,OAAO,EAAE,eAAe;4CACxB,OAAO,EAAE,eAAe;yCACzB,CAAC,EAAA;;oCALM,OAAO,GAAK,CAAA,SAKlB,CAAA,QALa;oCAOf,sBAAO,IAAA,gBAAQ,EAAC,SAAS,EAAE,OAAO,CAAC,EAAC;;;;iBACrC,CAAC,EAAA;;;KAAA,EAAC"}
|
|
@@ -39,7 +39,6 @@ exports.__esModule = true;
|
|
|
39
39
|
exports.setupContext = void 0;
|
|
40
40
|
var pipeline_1 = require("@catladder/pipeline");
|
|
41
41
|
var setupCloudRun_1 = require("./setupCloudRun");
|
|
42
|
-
var setupCloudSQL_1 = require("./setupCloudSQL");
|
|
43
42
|
var setupKubernetes_1 = require("./setupKubernetes");
|
|
44
43
|
var setupContext = function (instance, context) { return __awaiter(void 0, void 0, void 0, function () {
|
|
45
44
|
var deployConfig;
|
|
@@ -60,19 +59,13 @@ var setupContext = function (instance, context) { return __awaiter(void 0, void
|
|
|
60
59
|
_a.sent();
|
|
61
60
|
_a.label = 2;
|
|
62
61
|
case 2:
|
|
63
|
-
|
|
64
|
-
|
|
62
|
+
deployConfig = context.componentConfig.deploy;
|
|
63
|
+
if (!(0, pipeline_1.isOfDeployType)(deployConfig, "kubernetes")) return [3 /*break*/, 4];
|
|
64
|
+
return [4 /*yield*/, (0, setupKubernetes_1.setupKubernetes)(instance, context)];
|
|
65
65
|
case 3:
|
|
66
66
|
_a.sent();
|
|
67
67
|
_a.label = 4;
|
|
68
68
|
case 4:
|
|
69
|
-
deployConfig = context.componentConfig.deploy;
|
|
70
|
-
if (!(0, pipeline_1.isOfDeployType)(deployConfig, "kubernetes")) return [3 /*break*/, 6];
|
|
71
|
-
return [4 /*yield*/, (0, setupKubernetes_1.setupKubernetes)(instance, context)];
|
|
72
|
-
case 5:
|
|
73
|
-
_a.sent();
|
|
74
|
-
_a.label = 6;
|
|
75
|
-
case 6:
|
|
76
69
|
instance.log("");
|
|
77
70
|
instance.log("✅ " +
|
|
78
71
|
context.environment.shortName +
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupContext.js","sourceRoot":"","sources":["../../../../../../src/apps/cli/commands/project/setup/setupContext.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,
|
|
1
|
+
{"version":3,"file":"setupContext.js","sourceRoot":"","sources":["../../../../../../src/apps/cli/commands/project/setup/setupContext.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAAqD;AAErD,iDAAgD;AAEhD,qDAAoD;AAE7C,IAAM,YAAY,GAAG,UAC1B,QAAyB,EACzB,OAAgB;;;;;gBAEhB,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBACjB,QAAQ,CAAC,GAAG,CACV,oFAAoF,CACrF,CAAC;gBAEF,QAAQ,CAAC,GAAG,CACV,mBAAmB;oBACjB,OAAO,CAAC,WAAW,CAAC,SAAS;oBAC7B,GAAG;oBACH,OAAO,CAAC,aAAa;oBACrB,KAAK,CACR,CAAC;gBACF,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;qBACb,IAAA,yBAAc,EAAC,OAAO,CAAC,eAAe,CAAC,MAAM,EAAE,iBAAiB,CAAC,EAAjE,wBAAiE;gBACnE,qBAAM,IAAA,6BAAa,EAAC,QAAQ,EAAE,OAAO,CAAC,EAAA;;gBAAtC,SAAsC,CAAC;;;gBAGnC,YAAY,GAAG,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC;qBAChD,IAAA,yBAAc,EAAC,YAAY,EAAE,YAAY,CAAC,EAA1C,wBAA0C;gBAC5C,qBAAM,IAAA,iCAAe,EAAC,QAAQ,EAAE,OAAO,CAAC,EAAA;;gBAAxC,SAAwC,CAAC;;;gBAG3C,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBACjB,QAAQ,CAAC,GAAG,CACV,IAAI;oBACF,OAAO,CAAC,WAAW,CAAC,SAAS;oBAC7B,GAAG;oBACH,OAAO,CAAC,aAAa;oBACrB,QAAQ,CACX,CAAC;gBAEF,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;;;;KAClB,CAAC;AApCW,QAAA,YAAY,gBAoCvB"}
|
|
@@ -46,7 +46,7 @@ var cluster_1 = require("../../../../../utils/cluster");
|
|
|
46
46
|
var gitlab_1 = require("../../../../../utils/gitlab");
|
|
47
47
|
var ensureNamespace_1 = __importDefault(require("../utils/ensureNamespace"));
|
|
48
48
|
var setupKubernetes = function (instance, context) { return __awaiter(void 0, void 0, void 0, function () {
|
|
49
|
-
var deployConfig, fullName, namespace, serviceAccountName, KUBE_URL, e_1,
|
|
49
|
+
var deployConfig, fullName, namespace, serviceAccountName, KUBE_URL, e_1, secretName, KUBE_CA_PEM, KUBE_TOKEN, vars, missing;
|
|
50
50
|
return __generator(this, function (_a) {
|
|
51
51
|
switch (_a.label) {
|
|
52
52
|
case 0:
|
|
@@ -98,13 +98,16 @@ var setupKubernetes = function (instance, context) { return __awaiter(void 0, vo
|
|
|
98
98
|
case 11:
|
|
99
99
|
// upsert role in the ns
|
|
100
100
|
_a.sent();
|
|
101
|
-
|
|
101
|
+
secretName = "".concat(serviceAccountName, "-secret");
|
|
102
|
+
// create token for the service account
|
|
103
|
+
return [4 /*yield*/, (0, child_process_promise_1.exec)("\nkubectl apply -f - <<EOF\napiVersion: v1\nkind: Secret\nmetadata:\n name: ".concat(secretName, "\n namespace: ").concat(namespace, "\n annotations:\n kubernetes.io/service-account.name: ").concat(serviceAccountName, "\ntype: kubernetes.io/service-account-token\nEOF\n "))];
|
|
102
104
|
case 12:
|
|
103
|
-
|
|
104
|
-
|
|
105
|
+
// create token for the service account
|
|
106
|
+
_a.sent();
|
|
107
|
+
return [4 /*yield*/, (0, child_process_promise_1.exec)("kubectl get secret ".concat(secretName, " --namespace ").concat(namespace, " -o jsonpath=\"{['data']['ca\\.crt']}\"")).then(function (c) { return c.stdout.trim(); })];
|
|
105
108
|
case 13:
|
|
106
109
|
KUBE_CA_PEM = _a.sent();
|
|
107
|
-
return [4 /*yield*/, (0, child_process_promise_1.exec)("kubectl get secret ".concat(
|
|
110
|
+
return [4 /*yield*/, (0, child_process_promise_1.exec)("kubectl get secret ".concat(secretName, " --namespace ").concat(namespace, " -o jsonpath=\"{['data']['token']}\" | base64 --decode")).then(function (c) { return c.stdout.trim(); })];
|
|
108
111
|
case 14:
|
|
109
112
|
KUBE_TOKEN = _a.sent();
|
|
110
113
|
vars = {
|
|
@@ -112,6 +115,14 @@ var setupKubernetes = function (instance, context) { return __awaiter(void 0, vo
|
|
|
112
115
|
KUBE_CA_PEM: KUBE_CA_PEM,
|
|
113
116
|
KUBE_URL: KUBE_URL
|
|
114
117
|
};
|
|
118
|
+
missing = Object.entries(vars).filter(function (e) { return !e[1]; });
|
|
119
|
+
if (missing.length > 0) {
|
|
120
|
+
throw new Error("could not setup credentials. Missing vars: " +
|
|
121
|
+
missing.map(function (m) { return m[0]; }).join(", ") +
|
|
122
|
+
". Check whether your local kubectl is still working for '" +
|
|
123
|
+
fullName +
|
|
124
|
+
"'");
|
|
125
|
+
}
|
|
115
126
|
instance.log("service accounts created / updated!");
|
|
116
127
|
instance.log("");
|
|
117
128
|
instance.log("pusing secrets to gitlab...");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupKubernetes.js","sourceRoot":"","sources":["../../../../../../src/apps/cli/commands/project/setup/setupKubernetes.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAG6B;AAE7B,+DAA6C;AAC7C,wDAAgE;AAChE,sDAAiE;AACjE,6EAAuD;AAEhD,IAAM,eAAe,GAAG,UAC7B,QAAyB,EACzB,OAAgB;;;;;gBAEV,YAAY,GAAG,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC;gBACpD,IAAI,CAAC,IAAA,yBAAc,EAAC,YAAY,EAAE,YAAY,CAAC,EAAE;oBAC/C,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAC;iBAC7E;gBAEK,QAAQ,GAAG,IAAA,uCAA4B,EAAC,YAAY,CAAC,OAAO,CAAC,CAAC;gBACpE,QAAQ,CAAC,GAAG,CAAC,mBAAY,QAAQ,CAAE,CAAC,CAAC;gBAErC,qBAAM,IAAA,0BAAgB,EAAC,QAAQ,CAAC,EAAA;;gBAAhC,SAAgC,CAAC;gBACjC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBACjB,QAAQ,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;gBACrB,qBAAM,IAAA,4BAAe,EAAC,OAAO,CAAC,EAAA;;gBAA1C,SAAS,GAAG,SAA8B;gBAChD,QAAQ,CAAC,GAAG,CAAC,YAAY,GAAG,SAAS,GAAG,qBAAqB,CAAC,CAAC;gBAC/D,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBACjB,mBAAmB;gBAEnB,mFAAmF;gBACnF,gEAAgE;gBAChE,QAAQ,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC;gBACvC,kBAAkB,GAAG,aAAM,OAAO,CAAC,aAAa,YAAS,CAAC;gBAC/C,qBAAM,IAAA,4BAAI,EACzB,kHAAkH,CACnH,CAAC,IAAI,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,EAAf,CAAe,CAAC,EAAA;;gBAFxB,QAAQ,GAAG,SAEa;;;;gBAI5B,qBAAM,IAAA,4BAAI,EACR,oDAA6C,SAAS,cAAI,kBAAkB,CAAE,CAC/E,EAAA;;gBAFD,SAEC,CAAC;gBACF,qBAAM,IAAA,4BAAI,EACR,iDAA0C,SAAS,cAAI,kBAAkB,CAAE,CAC5E,EAAA;;gBAFD,SAEC,CAAC;gBACF,qBAAM,IAAA,4BAAI,EACR,0CAAmC,SAAS,cAAI,kBAAkB,CAAE,CACrE,EAAA;;gBAFD,SAEC,CAAC;;;;;oBAKJ,qBAAM,IAAA,4BAAI,EACR,oDAA6C,SAAS,cAAI,kBAAkB,CAAE,CAC/E,EAAA;;gBAFD,SAEC,CAAC;gBAEF,wBAAwB;gBAExB,qBAAM,IAAA,4BAAI,EAAC,wHAIE,SAAS,uBACd,kBAAkB,2jBASlB,kBAAkB,4BACb,SAAS,8DAGZ,kBAAkB,+BACZ,SAAS,+CAGjB,kBAAkB,mDAG3B,CAAC,EAAA;;gBA3BA,wBAAwB;gBAExB,SAyBA,CAAC;
|
|
1
|
+
{"version":3,"file":"setupKubernetes.js","sourceRoot":"","sources":["../../../../../../src/apps/cli/commands/project/setup/setupKubernetes.ts"],"names":[],"mappings":"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"}
|
|
@@ -66,7 +66,9 @@ var migrateSecrets = function (vorpal, newConfig, oldEnv) { return __awaiter(voi
|
|
|
66
66
|
case 0: return [4 /*yield*/, (0, pipeline_1.getEnvironment)(newConfig, componentName, newEnv)];
|
|
67
67
|
case 1:
|
|
68
68
|
environment = _a.sent();
|
|
69
|
-
return [4 /*yield*/, (0, gitlab_1.upsertAllVariables)(vorpal, (0, lodash_1.pick)(secrets_1, environment.secretEnvVarKeys
|
|
69
|
+
return [4 /*yield*/, (0, gitlab_1.upsertAllVariables)(vorpal, (0, lodash_1.pick)(secrets_1, environment.secretEnvVarKeys
|
|
70
|
+
.filter(function (k) { return !k.hidden; })
|
|
71
|
+
.map(function (k) { return k.key; })), newEnv, componentName)];
|
|
70
72
|
case 2:
|
|
71
73
|
_a.sent();
|
|
72
74
|
return [2 /*return*/];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrateSecrets.js","sourceRoot":"","sources":["../../../../../src/apps/cli/verify/migration/migrateSecrets.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAAqD;AACrD,mCAA+B;AAC/B,iCAA8B;AAE9B,mDAA8D;AAC9D,iEAAsE;AAGtE,IAAM,WAAW,GAAG,UAAC,SAAiB,EAAE,GAAW;IACjD,OAAO,UAAG,SAAS,CAAC,YAAY,cAAI,SAAS,CAAC,OAAO,cAAI,GAAG,iBAAc,CAAC;AAC7E,CAAC,CAAC;AAEK,IAAM,cAAc,GAAG,UAC5B,MAAuB,EACvB,SAAiB,EACjB,MAAkC;;;;;gBAE5B,MAAM,GAAG,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;gBACnD,IAAI,GAAG,WAAW,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;;;;gBAEvB,qBAAM,IAAA,wBAAQ,EAAC,IAAI,CAAC,EAAA;;gBAAjC,UAAU,GAAG,SAAoB;gBACjC,YAAU,IAAA,cAAI,EAAC,UAAU,CAAC,CAAC;gBAEjC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,UAAO,aAAa;;;;oCACxC,qBAAM,IAAA,yBAAc,EACtC,SAAS,EACT,aAAa,EACb,MAAM,CACP,EAAA;;gCAJK,WAAW,GAAG,SAInB;gCACD,qBAAM,IAAA,2BAAkB,EACtB,MAAM,EACN,IAAA,aAAI,
|
|
1
|
+
{"version":3,"file":"migrateSecrets.js","sourceRoot":"","sources":["../../../../../src/apps/cli/verify/migration/migrateSecrets.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAAqD;AACrD,mCAA+B;AAC/B,iCAA8B;AAE9B,mDAA8D;AAC9D,iEAAsE;AAGtE,IAAM,WAAW,GAAG,UAAC,SAAiB,EAAE,GAAW;IACjD,OAAO,UAAG,SAAS,CAAC,YAAY,cAAI,SAAS,CAAC,OAAO,cAAI,GAAG,iBAAc,CAAC;AAC7E,CAAC,CAAC;AAEK,IAAM,cAAc,GAAG,UAC5B,MAAuB,EACvB,SAAiB,EACjB,MAAkC;;;;;gBAE5B,MAAM,GAAG,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;gBACnD,IAAI,GAAG,WAAW,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;;;;gBAEvB,qBAAM,IAAA,wBAAQ,EAAC,IAAI,CAAC,EAAA;;gBAAjC,UAAU,GAAG,SAAoB;gBACjC,YAAU,IAAA,cAAI,EAAC,UAAU,CAAC,CAAC;gBAEjC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,UAAO,aAAa;;;;oCACxC,qBAAM,IAAA,yBAAc,EACtC,SAAS,EACT,aAAa,EACb,MAAM,CACP,EAAA;;gCAJK,WAAW,GAAG,SAInB;gCACD,qBAAM,IAAA,2BAAkB,EACtB,MAAM,EACN,IAAA,aAAI,EACF,SAAO,EACP,WAAW,CAAC,gBAAgB;yCACzB,MAAM,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,CAAC,MAAM,EAAT,CAAS,CAAC;yCACxB,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,GAAG,EAAL,CAAK,CAAC,CACrB,EACD,MAAM,EACN,aAAa,CACd,EAAA;;gCAVD,SAUC,CAAC;;;;qBACH,CAAC,CAAC;gBACH,qBAAM,IAAA,yBAAS,EAAC,IAAI,CAAC,EAAA;;gBAArB,SAAqB,CAAC;;;;gBAEtB,OAAO,CAAC,IAAI,CAAC,6CAAsC,MAAM,gBAAM,GAAC,CAAE,CAAC,CAAC;;;;;KAEvE,CAAC;AAjCW,QAAA,cAAc,kBAiCzB"}
|