@catladder/cli 0.0.0-refactor-env-context-834a2b56 → 0.0.0-refactor-needs-c896b98e
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/cli.js +2 -0
- package/dist/apps/cli/cli.js.map +1 -1
- package/dist/apps/cli/commands/{project/commandCopyDB.d.ts → cloudSQL/commandRestoreDb.d.ts} +0 -0
- package/dist/apps/cli/commands/cloudSQL/commandRestoreDb.js +176 -0
- package/dist/apps/cli/commands/cloudSQL/commandRestoreDb.js.map +1 -0
- package/dist/apps/cli/commands/cloudSQL/index.d.ts +3 -0
- package/dist/apps/cli/commands/{project/commandCopyDB.js → cloudSQL/index.js} +9 -39
- package/dist/apps/cli/commands/cloudSQL/index.js.map +1 -0
- package/dist/apps/cli/commands/project/commandCloudSqlProxy.js +106 -45
- package/dist/apps/cli/commands/project/commandCloudSqlProxy.js.map +1 -1
- package/dist/apps/cli/commands/project/commandGetMyTotalWorktime.js +1 -1
- package/dist/apps/cli/commands/project/commandGetMyTotalWorktime.js.map +1 -1
- package/dist/apps/cli/commands/project/index.js +0 -2
- package/dist/apps/cli/commands/project/index.js.map +1 -1
- package/dist/apps/cli/commands/project/setup/setupCloudRun.js +20 -3
- package/dist/apps/cli/commands/project/setup/setupCloudRun.js.map +1 -1
- package/dist/apps/cli/commands/project/setup/setupCloudSQL.js +2 -2
- package/dist/apps/cli/commands/project/setup/setupCloudSQL.js.map +1 -1
- package/dist/apps/cli/commands/project/setup/setupContext.js +1 -1
- package/dist/apps/cli/commands/project/setup/setupContext.js.map +1 -1
- package/dist/apps/cli/commands/theStuffThatReallyMatters/index.js +1 -1
- package/dist/apps/cli/commands/theStuffThatReallyMatters/index.js.map +1 -1
- package/dist/apps/cli/verify/migration/fromv2.js +2 -0
- package/dist/apps/cli/verify/migration/fromv2.js.map +1 -1
- package/dist/apps/cli/verify/migration/oldGitlabCi.js +1 -1
- package/dist/apps/cli/verify/migration/oldGitlabCi.js.map +1 -1
- package/dist/bundles/catenv/index.js +1554 -1453
- package/dist/bundles/cli/index.js +1934 -1598
- package/dist/config/getProjectConfig.d.ts +1 -1
- package/dist/config/getProjectConfig.js +9 -2
- package/dist/config/getProjectConfig.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -2
- package/src/apps/cli/cli.ts +2 -0
- package/src/apps/cli/commands/cloudSQL/commandRestoreDb.ts +154 -0
- package/src/apps/cli/commands/cloudSQL/index.ts +8 -0
- package/src/apps/cli/commands/project/commandCloudSqlProxy.ts +105 -36
- package/src/apps/cli/commands/project/commandGetMyTotalWorktime.ts +1 -1
- package/src/apps/cli/commands/project/index.ts +1 -2
- package/src/apps/cli/commands/project/setup/setupCloudRun.ts +11 -1
- package/src/apps/cli/commands/project/setup/setupCloudSQL.ts +6 -3
- package/src/apps/cli/commands/project/setup/setupContext.ts +2 -2
- package/src/apps/cli/commands/theStuffThatReallyMatters/index.ts +1 -1
- package/src/apps/cli/verify/migration/fromv2.ts +1 -0
- package/src/apps/cli/verify/migration/oldGitlabCi.ts +1 -1
- package/src/config/getProjectConfig.ts +9 -4
- package/dist/apps/cli/commands/project/commandCopyDB.js.map +0 -1
- package/src/apps/cli/commands/project/commandCopyDB.ts +0 -92
package/dist/apps/cli/cli.js
CHANGED
|
@@ -45,6 +45,7 @@ var packageInfos_1 = __importDefault(require("../../packageInfos"));
|
|
|
45
45
|
var portForward_1 = require("../../utils/portForward");
|
|
46
46
|
var general_1 = __importDefault(require("./commands/general"));
|
|
47
47
|
var mongodb_1 = __importDefault(require("./commands/mongodb"));
|
|
48
|
+
var cloudSQL_1 = __importDefault(require("./commands/cloudSQL"));
|
|
48
49
|
var project_1 = __importDefault(require("./commands/project"));
|
|
49
50
|
var theStuffThatReallyMatters_1 = __importDefault(require("./commands/theStuffThatReallyMatters"));
|
|
50
51
|
var verify_1 = require("./verify");
|
|
@@ -69,6 +70,7 @@ exports["default"] = (function () { return __awaiter(void 0, void 0, void 0, fun
|
|
|
69
70
|
(0, verify_1.verify)(vorpal);
|
|
70
71
|
(0, general_1["default"])(vorpal);
|
|
71
72
|
(0, project_1["default"])(vorpal);
|
|
73
|
+
(0, cloudSQL_1["default"])(vorpal);
|
|
72
74
|
(0, mongodb_1["default"])(vorpal);
|
|
73
75
|
(0, theStuffThatReallyMatters_1["default"])(vorpal);
|
|
74
76
|
process.on("exit", function () {
|
package/dist/apps/cli/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../../src/apps/cli/cli.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAA4B;AAC5B,2CAA2C;AAC3C,oEAA8C;AAC9C,uDAA8D;AAC9D,+DAAyC;AACzC,+DAAyC;AACzC,+DAAyC;AACzC,mGAA6E;AAE7E,mCAAkC;AAClC,gFAA+E;AAE/E,sBAAe;;;;;gBACP,MAAM,GAAG,IAAI,mBAAM,EAAE,CAAC;gBAEtB,cAAc,GAAG,8CAA6B,yBAAY,CAAC,OAAO,CAAE,CAAC;gBAE3E,MAAM;qBACH,SAAS,CAAC,aAAa,CAAC,CAAC,2EAA2E;qBACpG,OAAO,CAAC,WAAW,CAAC;qBACpB,IAAI,EAAE;qBACN,GAAG,CAAC,EAAE,CAAC;qBACP,GAAG,CAAC,cAAc,CAAC;qBACnB,GAAG,CAAC,EAAE,CAAC,CAAC;gBAEX,qBAAM,IAAA,qCAAiB,EAAC,MAAM,CAAC,EAAA;;gBAA/B,SAA+B,CAAC;gBAEhC,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC;gBAEf,IAAA,oBAAO,EAAC,MAAM,CAAC,CAAC;gBAChB,IAAA,oBAAO,EAAC,MAAM,CAAC,CAAC;gBAChB,IAAA,oBAAO,EAAC,MAAM,CAAC,CAAC;gBAChB,IAAA,sCAAyB,EAAC,MAAM,CAAC,CAAC;gBAElC,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE;oBACjB,IAAA,iCAAmB,GAAE,CAAC;gBACxB,CAAC,CAAC,CAAC;;;;KACJ,EAAC"}
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../../src/apps/cli/cli.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAA4B;AAC5B,2CAA2C;AAC3C,oEAA8C;AAC9C,uDAA8D;AAC9D,+DAAyC;AACzC,+DAAyC;AACzC,iEAA2C;AAC3C,+DAAyC;AACzC,mGAA6E;AAE7E,mCAAkC;AAClC,gFAA+E;AAE/E,sBAAe;;;;;gBACP,MAAM,GAAG,IAAI,mBAAM,EAAE,CAAC;gBAEtB,cAAc,GAAG,8CAA6B,yBAAY,CAAC,OAAO,CAAE,CAAC;gBAE3E,MAAM;qBACH,SAAS,CAAC,aAAa,CAAC,CAAC,2EAA2E;qBACpG,OAAO,CAAC,WAAW,CAAC;qBACpB,IAAI,EAAE;qBACN,GAAG,CAAC,EAAE,CAAC;qBACP,GAAG,CAAC,cAAc,CAAC;qBACnB,GAAG,CAAC,EAAE,CAAC,CAAC;gBAEX,qBAAM,IAAA,qCAAiB,EAAC,MAAM,CAAC,EAAA;;gBAA/B,SAA+B,CAAC;gBAEhC,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC;gBAEf,IAAA,oBAAO,EAAC,MAAM,CAAC,CAAC;gBAChB,IAAA,oBAAO,EAAC,MAAM,CAAC,CAAC;gBAChB,IAAA,qBAAQ,EAAC,MAAM,CAAC,CAAC;gBACjB,IAAA,oBAAO,EAAC,MAAM,CAAC,CAAC;gBAChB,IAAA,sCAAyB,EAAC,MAAM,CAAC,CAAC;gBAElC,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE;oBACjB,IAAA,iCAAmB,GAAE,CAAC;gBACxB,CAAC,CAAC,CAAC;;;;KACJ,EAAC"}
|
package/dist/apps/cli/commands/{project/commandCopyDB.d.ts → cloudSQL/commandRestoreDb.d.ts}
RENAMED
|
File without changes
|
|
@@ -0,0 +1,176 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
12
|
+
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
|
|
13
|
+
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
14
|
+
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
15
|
+
function step(op) {
|
|
16
|
+
if (f) throw new TypeError("Generator is already executing.");
|
|
17
|
+
while (_) try {
|
|
18
|
+
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
19
|
+
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
20
|
+
switch (op[0]) {
|
|
21
|
+
case 0: case 1: t = op; break;
|
|
22
|
+
case 4: _.label++; return { value: op[1], done: false };
|
|
23
|
+
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
24
|
+
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
25
|
+
default:
|
|
26
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
27
|
+
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
28
|
+
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
29
|
+
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
30
|
+
if (t[2]) _.ops.pop();
|
|
31
|
+
_.trys.pop(); continue;
|
|
32
|
+
}
|
|
33
|
+
op = body.call(thisArg, _);
|
|
34
|
+
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
35
|
+
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
36
|
+
}
|
|
37
|
+
};
|
|
38
|
+
exports.__esModule = true;
|
|
39
|
+
var child_process_promise_1 = require("child-process-promise");
|
|
40
|
+
var createProxy = function (instance, port) { return __awaiter(void 0, void 0, void 0, function () {
|
|
41
|
+
var proxy, stop;
|
|
42
|
+
return __generator(this, function (_a) {
|
|
43
|
+
switch (_a.label) {
|
|
44
|
+
case 0:
|
|
45
|
+
proxy = (0, child_process_promise_1.spawn)("cloud_sql_proxy -instances ".concat(instance, "=tcp:").concat(port), [], { shell: "bash" });
|
|
46
|
+
// wait until it starts
|
|
47
|
+
return [4 /*yield*/, (0, child_process_promise_1.spawn)("echo -n \"Waiting for proxy\"\n until echo > /dev/tcp/localhost/".concat(port, "; do\n sleep 0.2\n echo -n \".\"\n done 2>/dev/null"), [], { shell: "bash" })];
|
|
48
|
+
case 1:
|
|
49
|
+
// wait until it starts
|
|
50
|
+
_a.sent();
|
|
51
|
+
stop = function () { return proxy.childProcess.kill(); };
|
|
52
|
+
process.on("beforeExit", stop);
|
|
53
|
+
return [2 /*return*/, {
|
|
54
|
+
stop: stop
|
|
55
|
+
}];
|
|
56
|
+
}
|
|
57
|
+
});
|
|
58
|
+
}); };
|
|
59
|
+
exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void 0, function () {
|
|
60
|
+
return __generator(this, function (_a) {
|
|
61
|
+
return [2 /*return*/, vorpal
|
|
62
|
+
.command("cloud-sql-restore-db", "restore a db from one source to another target")
|
|
63
|
+
.action(function restoreDb() {
|
|
64
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
65
|
+
var sourceInstance, sourceProxy, targetProxy, sourcePort, targetPort, sourceLocalPort, sourcePassword, sourceDbName, targetInstance, targetLocalPort, targetPassword, targetDbName, shouldContinue, targetPSQL, copyDBScript;
|
|
66
|
+
return __generator(this, function (_a) {
|
|
67
|
+
switch (_a.label) {
|
|
68
|
+
case 0: return [4 /*yield*/, this.prompt({
|
|
69
|
+
type: "input",
|
|
70
|
+
name: "sourceInstance",
|
|
71
|
+
message: "Source instance (connection string or 'local')? 🤔 "
|
|
72
|
+
})];
|
|
73
|
+
case 1:
|
|
74
|
+
sourceInstance = (_a.sent()).sourceInstance;
|
|
75
|
+
if (!(sourceInstance === "local")) return [3 /*break*/, 3];
|
|
76
|
+
return [4 /*yield*/, this.prompt({
|
|
77
|
+
type: "number",
|
|
78
|
+
name: "sourceLocalPort",
|
|
79
|
+
"default": 5432,
|
|
80
|
+
message: "Local Port for source? 🤔 "
|
|
81
|
+
})];
|
|
82
|
+
case 2:
|
|
83
|
+
sourceLocalPort = (_a.sent()).sourceLocalPort;
|
|
84
|
+
sourcePort = sourceLocalPort;
|
|
85
|
+
return [3 /*break*/, 5];
|
|
86
|
+
case 3:
|
|
87
|
+
sourcePort = 54399;
|
|
88
|
+
return [4 /*yield*/, createProxy(sourceInstance, sourcePort)];
|
|
89
|
+
case 4:
|
|
90
|
+
sourceProxy = _a.sent();
|
|
91
|
+
_a.label = 5;
|
|
92
|
+
case 5: return [4 /*yield*/, this.prompt({
|
|
93
|
+
type: "input",
|
|
94
|
+
name: "sourcePassword",
|
|
95
|
+
message: "Source Password? 🤔 "
|
|
96
|
+
})];
|
|
97
|
+
case 6:
|
|
98
|
+
sourcePassword = (_a.sent()).sourcePassword;
|
|
99
|
+
return [4 /*yield*/, this.prompt({
|
|
100
|
+
type: "input",
|
|
101
|
+
name: "sourceDbName",
|
|
102
|
+
message: "Source DB name? 🤔 "
|
|
103
|
+
})];
|
|
104
|
+
case 7:
|
|
105
|
+
sourceDbName = (_a.sent()).sourceDbName;
|
|
106
|
+
return [4 /*yield*/, this.prompt({
|
|
107
|
+
type: "input",
|
|
108
|
+
name: "targetInstance",
|
|
109
|
+
message: "Targe INSTANCE (connection string or 'local')? 🤔 "
|
|
110
|
+
})];
|
|
111
|
+
case 8:
|
|
112
|
+
targetInstance = (_a.sent()).targetInstance;
|
|
113
|
+
if (!(targetInstance === "local")) return [3 /*break*/, 10];
|
|
114
|
+
return [4 /*yield*/, this.prompt({
|
|
115
|
+
type: "number",
|
|
116
|
+
name: "targetLocalPort",
|
|
117
|
+
"default": 5432,
|
|
118
|
+
message: "Local Port for target? 🤔 "
|
|
119
|
+
})];
|
|
120
|
+
case 9:
|
|
121
|
+
targetLocalPort = (_a.sent()).targetLocalPort;
|
|
122
|
+
targetPort = targetLocalPort;
|
|
123
|
+
return [3 /*break*/, 12];
|
|
124
|
+
case 10:
|
|
125
|
+
targetPort = 54499;
|
|
126
|
+
return [4 /*yield*/, createProxy(targetInstance, targetPort)];
|
|
127
|
+
case 11:
|
|
128
|
+
targetProxy = _a.sent();
|
|
129
|
+
_a.label = 12;
|
|
130
|
+
case 12: return [4 /*yield*/, this.prompt({
|
|
131
|
+
type: "input",
|
|
132
|
+
name: "targetPassword",
|
|
133
|
+
message: "Target Password? 🤔 "
|
|
134
|
+
})];
|
|
135
|
+
case 13:
|
|
136
|
+
targetPassword = (_a.sent()).targetPassword;
|
|
137
|
+
return [4 /*yield*/, this.prompt({
|
|
138
|
+
type: "input",
|
|
139
|
+
name: "targetDbName",
|
|
140
|
+
message: "Target DB name? 🤔 "
|
|
141
|
+
})];
|
|
142
|
+
case 14:
|
|
143
|
+
targetDbName = (_a.sent()).targetDbName;
|
|
144
|
+
return [4 /*yield*/, this.prompt({
|
|
145
|
+
type: "confirm",
|
|
146
|
+
name: "shouldContinue",
|
|
147
|
+
message: "This will drop ".concat(targetInstance, "/").concat(targetDbName, " and replace it with ").concat(sourceInstance, "/").concat(sourceDbName, ". Continue? \uD83E\uDD14 ")
|
|
148
|
+
})];
|
|
149
|
+
case 15:
|
|
150
|
+
shouldContinue = (_a.sent()).shouldContinue;
|
|
151
|
+
if (!shouldContinue) {
|
|
152
|
+
return [2 /*return*/];
|
|
153
|
+
}
|
|
154
|
+
targetPSQL = function (command) {
|
|
155
|
+
return "PGPASSWORD=".concat(targetPassword, " psql -p ").concat(targetPort, " --host=localhost --user=postgres -q ").concat(command);
|
|
156
|
+
};
|
|
157
|
+
copyDBScript = "\n set -e\n \n \n\n dumptmp=$(mktemp /tmp/dump.XXXXXX)\n\n echo \"Dumping file to $dumptmp\"\n pg_dump --dbname=postgres://postgres:".concat(sourcePassword, "@localhost:").concat(sourcePort, "/").concat(sourceDbName, " --no-owner --no-privileges > $dumptmp\n echo \"dump done\"\n ").concat(targetPSQL("-c 'drop database \"".concat(targetDbName, "\" WITH (FORCE)' 1> /dev/null || true")), "\n ").concat(targetPSQL("-c 'create database \"".concat(targetDbName, "\"' 1> /dev/null")), "\n echo \"Restoring dump...\"\n ").concat(targetPSQL("\"".concat(targetDbName, "\" < $dumptmp 1> /dev/null")), "\n \n\n echo \"Clean up...\"\n set +e\n rm $dumptmp\n echo \"\n\uD83D\uDC31 Done!\"\n ");
|
|
158
|
+
_a.label = 16;
|
|
159
|
+
case 16:
|
|
160
|
+
_a.trys.push([16, , 18, 19]);
|
|
161
|
+
return [4 /*yield*/, (0, child_process_promise_1.spawn)(copyDBScript, [], { shell: "bash", stdio: "inherit" })];
|
|
162
|
+
case 17:
|
|
163
|
+
_a.sent();
|
|
164
|
+
return [3 /*break*/, 19];
|
|
165
|
+
case 18:
|
|
166
|
+
sourceProxy === null || sourceProxy === void 0 ? void 0 : sourceProxy.stop();
|
|
167
|
+
targetProxy === null || targetProxy === void 0 ? void 0 : targetProxy.stop();
|
|
168
|
+
return [7 /*endfinally*/];
|
|
169
|
+
case 19: return [2 /*return*/];
|
|
170
|
+
}
|
|
171
|
+
});
|
|
172
|
+
});
|
|
173
|
+
})];
|
|
174
|
+
});
|
|
175
|
+
}); });
|
|
176
|
+
//# sourceMappingURL=commandRestoreDb.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"commandRestoreDb.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/cloudSQL/commandRestoreDb.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,46 +35,16 @@ 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 __importDefault = (this && this.__importDefault) || function (mod) {
|
|
39
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
40
|
+
};
|
|
38
41
|
exports.__esModule = true;
|
|
39
|
-
|
|
40
|
-
var
|
|
42
|
+
//import commandInitProject from "./commandInitProject.old";
|
|
43
|
+
var commandRestoreDb_1 = __importDefault(require("./commandRestoreDb"));
|
|
41
44
|
exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void 0, function () {
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
case 0:
|
|
46
|
-
_b = (_a = vorpal
|
|
47
|
-
.command("copy-db <envComponent>", "replace local db with the one from an env"))
|
|
48
|
-
.autocomplete;
|
|
49
|
-
return [4 /*yield*/, (0, autocompletions_1.envAndComponents)()];
|
|
50
|
-
case 1: return [2 /*return*/, _b.apply(_a, [_c.sent()])
|
|
51
|
-
.action(function copyDB(_a) {
|
|
52
|
-
var envComponent = _a.envComponent;
|
|
53
|
-
return __awaiter(this, void 0, void 0, function () {
|
|
54
|
-
var _b, env, componentName, _c, customerName, appName, shouldContinue;
|
|
55
|
-
return __generator(this, function (_d) {
|
|
56
|
-
switch (_d.label) {
|
|
57
|
-
case 0:
|
|
58
|
-
_b = (0, getProjectConfig_1.parseChoice)(envComponent), env = _b.env, componentName = _b.componentName;
|
|
59
|
-
return [4 /*yield*/, (0, getProjectConfig_1.getProjectConfig)()];
|
|
60
|
-
case 1:
|
|
61
|
-
_c = _d.sent(), customerName = _c.customerName, appName = _c.appName;
|
|
62
|
-
return [4 /*yield*/, this.prompt({
|
|
63
|
-
type: "confirm",
|
|
64
|
-
name: "shouldContinue",
|
|
65
|
-
message: "This will drop your local database and replace it with the remote one. Continue? 🤔 "
|
|
66
|
-
})];
|
|
67
|
-
case 2:
|
|
68
|
-
shouldContinue = (_d.sent()).shouldContinue;
|
|
69
|
-
if (!shouldContinue) {
|
|
70
|
-
return [2 /*return*/];
|
|
71
|
-
}
|
|
72
|
-
return [2 /*return*/];
|
|
73
|
-
}
|
|
74
|
-
});
|
|
75
|
-
});
|
|
76
|
-
})];
|
|
77
|
-
}
|
|
45
|
+
return __generator(this, function (_a) {
|
|
46
|
+
(0, commandRestoreDb_1["default"])(vorpal);
|
|
47
|
+
return [2 /*return*/];
|
|
78
48
|
});
|
|
79
49
|
}); });
|
|
80
|
-
//# sourceMappingURL=
|
|
50
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/cloudSQL/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,4DAA4D;AAE5D,wEAAkD;AAElD,sBAAe,UAAO,MAAc;;QAClC,IAAA,6BAAgB,EAAC,MAAM,CAAC,CAAC;;;KAC1B,EAAC"}
|
|
@@ -35,6 +35,15 @@ 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
|
+
};
|
|
38
47
|
exports.__esModule = true;
|
|
39
48
|
var pipeline_1 = require("@catladder/pipeline");
|
|
40
49
|
var child_process_promise_1 = require("child-process-promise");
|
|
@@ -53,79 +62,79 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
|
|
|
53
62
|
return [4 /*yield*/, (0, autocompletions_1.envAndComponents)()];
|
|
54
63
|
case 1: return [2 /*return*/, _b.apply(_a, [_c.sent()])
|
|
55
64
|
.action(function (_a) {
|
|
56
|
-
var _b, _c, _d, _e;
|
|
57
65
|
var envComponent = _a.envComponent;
|
|
58
66
|
return __awaiter(this, void 0, void 0, function () {
|
|
59
|
-
var
|
|
67
|
+
var _b, env, componentName, context, proxyInfo, DB_PASSWORD, DB_NAME, instanceName, localPort, cloudsqlProxyCredentials;
|
|
60
68
|
var _this = this;
|
|
61
|
-
return __generator(this, function (
|
|
62
|
-
switch (
|
|
69
|
+
return __generator(this, function (_c) {
|
|
70
|
+
switch (_c.label) {
|
|
63
71
|
case 0:
|
|
64
|
-
|
|
65
|
-
return [4 /*yield*/, (0, getProjectConfig_1.
|
|
72
|
+
_b = (0, getProjectConfig_1.parseChoice)(envComponent), env = _b.env, componentName = _b.componentName;
|
|
73
|
+
return [4 /*yield*/, (0, getProjectConfig_1.getPipelineContextByChoice)(env, componentName)];
|
|
66
74
|
case 1:
|
|
67
|
-
|
|
75
|
+
context = _c.sent();
|
|
76
|
+
if (env === "review") {
|
|
77
|
+
vorpal.log("⚠️ connection string does not include mr information on review environments");
|
|
78
|
+
}
|
|
79
|
+
if (!(0, pipeline_1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) return [3 /*break*/, 3];
|
|
80
|
+
return [4 /*yield*/, getProxyInfoForKubernetes(context)];
|
|
81
|
+
case 2:
|
|
82
|
+
proxyInfo = _c.sent();
|
|
83
|
+
return [3 /*break*/, 6];
|
|
84
|
+
case 3:
|
|
85
|
+
if (!(0, pipeline_1.isOfDeployType)(context.componentConfig.deploy, "google-cloudrun")) return [3 /*break*/, 5];
|
|
86
|
+
return [4 /*yield*/, getProxyInfoForCloudRun(context)];
|
|
87
|
+
case 4:
|
|
88
|
+
proxyInfo = _c.sent();
|
|
89
|
+
return [3 /*break*/, 6];
|
|
90
|
+
case 5: throw new Error("unsupported environment");
|
|
91
|
+
case 6:
|
|
92
|
+
DB_PASSWORD = proxyInfo.DB_PASSWORD, DB_NAME = proxyInfo.DB_NAME, instanceName = proxyInfo.instanceName;
|
|
68
93
|
return [4 /*yield*/, this.prompt({
|
|
69
94
|
type: "number",
|
|
70
95
|
name: "localPort",
|
|
71
96
|
"default": "54320",
|
|
72
97
|
message: "Local port: "
|
|
73
98
|
})];
|
|
74
|
-
case
|
|
75
|
-
localPort = (
|
|
76
|
-
return [4 /*yield*/, (0, getProjectConfig_1.getEnvVars)(this, env, componentName)];
|
|
77
|
-
case 3:
|
|
78
|
-
envVars = _g.sent();
|
|
79
|
-
POSTGRESQL_PASSWORD = envVars === null || envVars === void 0 ? void 0 : envVars.POSTGRESQL_PASSWORD;
|
|
80
|
-
return [4 /*yield*/, (0, getProjectConfig_1.getPipelineContextByChoice)(env, componentName)];
|
|
81
|
-
case 4:
|
|
82
|
-
context = _g.sent();
|
|
83
|
-
if (!(0, pipeline_1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) {
|
|
84
|
-
throw new Error("currently only supported for kubernetes deployment");
|
|
85
|
-
}
|
|
99
|
+
case 7:
|
|
100
|
+
localPort = (_c.sent()).localPort;
|
|
86
101
|
this.log("");
|
|
87
|
-
this.log("postgres-PW: ".concat(
|
|
102
|
+
this.log("postgres-PW: ".concat(DB_PASSWORD));
|
|
88
103
|
this.log("");
|
|
89
|
-
this.log("POSTGRESQL_URL=postgresql://postgres:".concat(
|
|
104
|
+
this.log("POSTGRESQL_URL=postgresql://postgres:".concat(DB_PASSWORD, "@localhost:").concat(localPort, "/").concat(DB_NAME, "?schema=public"));
|
|
90
105
|
this.log("");
|
|
91
|
-
values = context.componentConfig.deploy.values;
|
|
92
|
-
projectId = ((_b = values === null || values === void 0 ? void 0 : values.cloudsql) === null || _b === void 0 ? void 0 : _b.projectId) ||
|
|
93
|
-
((_c = context.componentConfig.deploy.cluster) === null || _c === void 0 ? void 0 : _c.projectId);
|
|
94
|
-
defaultInstanceId = "".concat(config.customerName, "-").concat(config.appName, "-").concat(env);
|
|
95
|
-
instanceId = ((_d = values === null || values === void 0 ? void 0 : values.cloudsql) === null || _d === void 0 ? void 0 : _d.instanceId) || defaultInstanceId;
|
|
96
|
-
defaultRegion = "europe-west6";
|
|
97
|
-
region = ((_e = values === null || values === void 0 ? void 0 : values.cloudsql) === null || _e === void 0 ? void 0 : _e.region) || defaultRegion;
|
|
98
|
-
instanceName = "".concat(projectId, ":").concat(region, ":").concat(instanceId, "=tcp:").concat(localPort);
|
|
99
106
|
return [4 /*yield*/, (0, getProjectConfig_1.getGitlabVar)(this, env, componentName, "cloudsqlProxyCredentials")];
|
|
100
|
-
case
|
|
101
|
-
cloudsqlProxyCredentials =
|
|
102
|
-
if (!cloudsqlProxyCredentials) {
|
|
103
|
-
// we store cloudsqlProxyCredentials on gitlab, but its currently get pushed via bitwarden due to legacy reasons
|
|
104
|
-
// this will be fixed with when https://git.panter.ch/catladder/catladder/-/merge_requests/32/ is merged
|
|
105
|
-
this.log("cloudsqlProxyCredentials env var missing in gitlab. Please contact gilde-ci-cd about that.");
|
|
106
|
-
throw new Error("cloudsqlProxyCredentials missing in secrets");
|
|
107
|
-
}
|
|
107
|
+
case 8:
|
|
108
|
+
cloudsqlProxyCredentials = _c.sent();
|
|
108
109
|
return [4 /*yield*/, (0, tmp_promise_1.withFile)(function (_a) {
|
|
109
110
|
var tmpFilePath = _a.path;
|
|
110
111
|
return __awaiter(_this, void 0, void 0, function () {
|
|
111
112
|
return __generator(this, function (_b) {
|
|
112
113
|
switch (_b.label) {
|
|
113
|
-
case 0:
|
|
114
|
+
case 0:
|
|
115
|
+
if (!cloudsqlProxyCredentials) return [3 /*break*/, 2];
|
|
116
|
+
return [4 /*yield*/, (0, fs_extra_1.writeFile)(tmpFilePath, cloudsqlProxyCredentials)];
|
|
114
117
|
case 1:
|
|
115
118
|
_b.sent();
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
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:
|
|
121
130
|
_b.sent();
|
|
122
131
|
return [2 /*return*/];
|
|
123
132
|
}
|
|
124
133
|
});
|
|
125
134
|
});
|
|
126
135
|
})];
|
|
127
|
-
case
|
|
128
|
-
|
|
136
|
+
case 9:
|
|
137
|
+
_c.sent();
|
|
129
138
|
return [2 /*return*/];
|
|
130
139
|
}
|
|
131
140
|
});
|
|
@@ -134,4 +143,56 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
|
|
|
134
143
|
}
|
|
135
144
|
});
|
|
136
145
|
}); });
|
|
146
|
+
var getProxyInfoForKubernetes = function (context) { return __awaiter(void 0, void 0, void 0, function () {
|
|
147
|
+
var envVars, DB_PASSWORD, DB_NAME, values, projectId, defaultInstanceId, instanceId, defaultRegion, region, instanceName;
|
|
148
|
+
var _a, _b, _c, _d;
|
|
149
|
+
return __generator(this, function (_e) {
|
|
150
|
+
switch (_e.label) {
|
|
151
|
+
case 0:
|
|
152
|
+
if (!(0, pipeline_1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) {
|
|
153
|
+
throw new Error("unsupported");
|
|
154
|
+
}
|
|
155
|
+
return [4 /*yield*/, (0, getProjectConfig_1.getEnvVars)(this, context.environment.shortName, context.componentName)];
|
|
156
|
+
case 1:
|
|
157
|
+
envVars = _e.sent();
|
|
158
|
+
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 = context.environment.envVars.KUBE_APP_NAME;
|
|
160
|
+
values = context.componentConfig.deploy.values;
|
|
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);
|
|
168
|
+
return [2 /*return*/, {
|
|
169
|
+
instanceName: instanceName,
|
|
170
|
+
DB_PASSWORD: DB_PASSWORD,
|
|
171
|
+
DB_NAME: DB_NAME
|
|
172
|
+
}];
|
|
173
|
+
}
|
|
174
|
+
});
|
|
175
|
+
}); };
|
|
176
|
+
var getProxyInfoForCloudRun = function (context) { return __awaiter(void 0, void 0, void 0, function () {
|
|
177
|
+
var envVars, DB_PASSWORD, DB_NAME;
|
|
178
|
+
return __generator(this, function (_a) {
|
|
179
|
+
switch (_a.label) {
|
|
180
|
+
case 0:
|
|
181
|
+
if (!(0, pipeline_1.isOfDeployType)(context.componentConfig.deploy, "google-cloudrun") ||
|
|
182
|
+
!context.componentConfig.deploy.cloudSql) {
|
|
183
|
+
throw new Error("unsupported");
|
|
184
|
+
}
|
|
185
|
+
return [4 /*yield*/, (0, getProjectConfig_1.getEnvVars)(this, context.environment.shortName, context.componentName)];
|
|
186
|
+
case 1:
|
|
187
|
+
envVars = _a.sent();
|
|
188
|
+
DB_PASSWORD = envVars === null || envVars === void 0 ? void 0 : envVars.DB_PASSWORD;
|
|
189
|
+
DB_NAME = context.environment.envVars.DB_NAME;
|
|
190
|
+
return [2 /*return*/, {
|
|
191
|
+
instanceName: context.componentConfig.deploy.cloudSql.instanceConnectionName,
|
|
192
|
+
DB_PASSWORD: DB_PASSWORD,
|
|
193
|
+
DB_NAME: DB_NAME
|
|
194
|
+
}];
|
|
195
|
+
}
|
|
196
|
+
});
|
|
197
|
+
}); };
|
|
137
198
|
//# sourceMappingURL=commandCloudSqlProxy.js.map
|
|
@@ -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":"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"}
|
|
@@ -44,7 +44,7 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
|
|
|
44
44
|
.action(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
45
45
|
return __generator(this, function (_a) {
|
|
46
46
|
switch (_a.label) {
|
|
47
|
-
case 0: return [4 /*yield*/, (0, child_process_promise_1.spawn)("sh", ["-c", "curl -L http://bit.ly/
|
|
47
|
+
case 0: return [4 /*yield*/, (0, child_process_promise_1.spawn)("sh", ["-c", "curl -s -L http://bit.ly/3VQEKNq | bash"], {
|
|
48
48
|
stdio: ["pipe", "inherit", "pipe"]
|
|
49
49
|
})];
|
|
50
50
|
case 1:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commandGetMyTotalWorktime.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/commandGetMyTotalWorktime.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+DAA8C;AAG9C,sBAAe,UAAO,MAAc;;QAClC,sBAAA,MAAM;iBACH,OAAO,CACN,+BAA+B,EAC/B,qDAAqD,CACtD;iBACA,MAAM,CAAC;;;gCACN,qBAAM,IAAA,6BAAK,EAAC,IAAI,EAAE,CAAC,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"commandGetMyTotalWorktime.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/commandGetMyTotalWorktime.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+DAA8C;AAG9C,sBAAe,UAAO,MAAc;;QAClC,sBAAA,MAAM;iBACH,OAAO,CACN,+BAA+B,EAC/B,qDAAqD,CACtD;iBACA,MAAM,CAAC;;;gCACN,qBAAM,IAAA,6BAAK,EAAC,IAAI,EAAE,CAAC,IAAI,EAAE,yCAAyC,CAAC,EAAE;gCACnE,KAAK,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,CAAC;6BACnC,CAAC,EAAA;;4BAFF,SAEE,CAAC;;;;iBACJ,CAAC,EAAA;;KAAA,EAAC"}
|
|
@@ -41,7 +41,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
41
41
|
exports.__esModule = true;
|
|
42
42
|
var commandCloudSqlProxy_1 = __importDefault(require("./commandCloudSqlProxy"));
|
|
43
43
|
var commandConfigSecrets_1 = __importDefault(require("./commandConfigSecrets"));
|
|
44
|
-
var commandCopyDB_1 = __importDefault(require("./commandCopyDB"));
|
|
45
44
|
var commandDeletePods_1 = __importDefault(require("./commandDeletePods"));
|
|
46
45
|
var commandDeleteProject_1 = __importDefault(require("./commandDeleteProject"));
|
|
47
46
|
var commandEnvVars_1 = __importDefault(require("./commandEnvVars"));
|
|
@@ -84,7 +83,6 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
|
|
|
84
83
|
(0, commandConfigSecrets_1["default"])(vorpal);
|
|
85
84
|
(0, commandSecretsClearBackups_1["default"])(vorpal);
|
|
86
85
|
(0, commandDeletePods_1["default"])(vorpal);
|
|
87
|
-
(0, commandCopyDB_1["default"])(vorpal);
|
|
88
86
|
(0, commandGetShell_1["default"])(vorpal);
|
|
89
87
|
(0, commandPortForward_1["default"])(vorpal);
|
|
90
88
|
(0, commandGitlabCi_1["default"])(vorpal);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gFAA0D;AAC1D,gFAA0D;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gFAA0D;AAC1D,gFAA0D;AAE1D,0EAAoD;AACpD,gFAA0D;AAC1D,oEAA8C;AAC9C,0FAAoE;AACpE,sEAAgD;AAChD,sEAAgD;AAChD,gEAA0C;AAC1C,4DAA4D;AAC5D,sEAAgD;AAChD,8EAAwD;AACxD,wEAAkD;AAClD,wFAAkE;AAClE,gFAA0D;AAC1D,oEAA8C;AAC9C,oEAA8C;AAC9C,sEAAgD;AAChD,8EAAwD;AACxD,4EAAsD;AACtD,4EAAsD;AACtD,kFAA4D;AAE5D,kFAA4D;AAC5D,4FAAsE;AAEtE,sBAAe,UAAO,MAAc;;QAClC,IAAA,yBAAY,EAAC,MAAM,CAAC,CAAC;QAErB,IAAA,2BAAc,EAAC,MAAM,CAAC,CAAC;QAEvB,IAAA,6BAAgB,EAAC,MAAM,CAAC,CAAC;QACzB,IAAA,4BAAe,EAAC,MAAM,CAAC,CAAC;QACxB,IAAA,gCAAmB,EAAC,MAAM,CAAC,CAAC;QAC5B,IAAA,iCAAoB,EAAC,MAAM,CAAC,CAAC;QAE7B,IAAA,iCAAoB,EAAC,MAAM,CAAC,CAAC;QAE7B,IAAA,4BAAe,EAAC,MAAM,CAAC,CAAC;QAExB,IAAA,qCAAwB,EAAC,MAAM,CAAC,CAAC;QAEjC,IAAA,+BAAkB,EAAC,MAAM,CAAC,CAAC;QAC3B,IAAA,kCAAqB,EAAC,MAAM,CAAC,CAAC;QAC9B,IAAA,iCAAoB,EAAC,MAAM,CAAC,CAAC;QAC7B,IAAA,2BAAc,EAAC,MAAM,CAAC,CAAC;QACvB,IAAA,2BAAc,EAAC,MAAM,CAAC,CAAC;QACvB,IAAA,kCAAqB,EAAC,MAAM,CAAC,CAAC;QAC9B,IAAA,iCAAoB,EAAC,MAAM,CAAC,CAAC;QAC7B,IAAA,uCAA0B,EAAC,MAAM,CAAC,CAAC;QACnC,IAAA,8BAAiB,EAAC,MAAM,CAAC,CAAC;QAE1B,IAAA,4BAAe,EAAC,MAAM,CAAC,CAAC;QACxB,IAAA,+BAAkB,EAAC,MAAM,CAAC,CAAC;QAE3B,IAAA,4BAAe,EAAC,MAAM,CAAC,CAAC;QAExB,IAAA,sCAAyB,EAAC,MAAM,CAAC,CAAC;QAClC,IAAA,gCAAmB,EAAC,MAAM,CAAC,CAAC;;;KAC7B,EAAC"}
|
|
@@ -35,6 +35,15 @@ 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
|
+
};
|
|
38
47
|
exports.__esModule = true;
|
|
39
48
|
exports.setupCloudRun = void 0;
|
|
40
49
|
var pipeline_1 = require("@catladder/pipeline");
|
|
@@ -55,7 +64,14 @@ var setupCloudRun = function (instance, context) { return __awaiter(void 0, void
|
|
|
55
64
|
config = context.componentConfig.deploy;
|
|
56
65
|
// enable services
|
|
57
66
|
instance.log("enable required servies...");
|
|
58
|
-
return [4 /*yield*/, (0, enableServices_1.enableGCloudServices)([
|
|
67
|
+
return [4 /*yield*/, (0, enableServices_1.enableGCloudServices)(__spreadArray([
|
|
68
|
+
"run.googleapis.com",
|
|
69
|
+
"artifactregistry.googleapis.com",
|
|
70
|
+
"cloudscheduler.googleapis.com",
|
|
71
|
+
"cloudresourcemanager.googleapis.com"
|
|
72
|
+
], (config.cloudSql
|
|
73
|
+
? ["sqladmin.googleapis.com", "sql-component.googleapis.com"]
|
|
74
|
+
: []), true), config)];
|
|
59
75
|
case 1:
|
|
60
76
|
_b.sent();
|
|
61
77
|
instance.log("upsert artifacts registry...");
|
|
@@ -69,11 +85,12 @@ var setupCloudRun = function (instance, context) { return __awaiter(void 0, void
|
|
|
69
85
|
description: "This service account deploys to google cloud",
|
|
70
86
|
name: "cl-d",
|
|
71
87
|
// TODO: run.admin is a bit much, would be better to follow https://stackoverflow.com/questions/55788714/deploying-to-cloud-run-with-a-custom-service-account-failed-with-iam-serviceacco
|
|
72
|
-
roles: [
|
|
88
|
+
roles: __spreadArray([
|
|
73
89
|
"roles/artifactregistry.repoAdmin",
|
|
74
90
|
"roles/run.admin",
|
|
75
91
|
"roles/iam.serviceAccountUser",
|
|
76
|
-
|
|
92
|
+
"roles/cloudscheduler.admin"
|
|
93
|
+
], (config.cloudSql ? ["roles/cloudsql.admin"] : []), true)
|
|
77
94
|
}, pipeline_1.GCLOUD_DEPLOY_CREDENTIALS_KEY)];
|
|
78
95
|
case 3:
|
|
79
96
|
_b.sent();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupCloudRun.js","sourceRoot":"","sources":["../../../../../../src/apps/cli/commands/project/setup/setupCloudRun.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"setupCloudRun.js","sourceRoot":"","sources":["../../../../../../src/apps/cli/commands/project/setup/setupCloudRun.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAI6B;AAG7B,6EAAwF;AACxF,kGAAiG;AACjG,uEAA4E;AAC5E,yEAAgG;AAChG,sDAAiE;AAE1D,IAAM,aAAa,GAAG,UAC3B,QAAyB,EACzB,OAAgB;;;;;;gBAEhB,IAAI,CAAC,IAAA,yBAAc,EAAC,OAAO,CAAC,eAAe,CAAC,MAAM,EAAE,iBAAiB,CAAC,EAAE;oBACtE,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;iBACnE;gBAEK,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC;gBAE9C,kBAAkB;gBAElB,QAAQ,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;gBAC3C,qBAAM,IAAA,qCAAoB;wBAEtB,oBAAoB;wBACpB,iCAAiC;wBACjC,+BAA+B;wBAC/B,qCAAqC;uBAClC,CAAC,MAAM,CAAC,QAAQ;wBACjB,CAAC,CAAC,CAAC,yBAAyB,EAAE,8BAA8B,CAAC;wBAC7D,CAAC,CAAC,EAAE,CAAC,SAET,MAAM,CACP,EAAA;;gBAXD,SAWC,CAAC;gBACF,QAAQ,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC;gBAC7C,qBAAM,IAAA,iDAA6B,EAAC,MAAM,CAAC,EAAA;;gBAA3C,SAA2C,CAAC;gBAE5C,QAAQ,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAC;gBACjD,qBAAM,IAAA,yDAAuC,EAC3C,QAAQ,EACR,OAAO,EACP;wBACE,SAAS,EAAE,MAAM,CAAC,SAAS;wBAC3B,WAAW,EAAE,yBAAyB;wBACtC,WAAW,EAAE,8CAA8C;wBAC3D,IAAI,EAAE,MAAM;wBACZ,yLAAyL;wBACzL,KAAK;4BACH,kCAAkC;4BAClC,iBAAiB;4BACjB,8BAA8B;4BAC9B,4BAA4B;2BACzB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,OACrD;qBACF,EACD,wCAA6B,CAC9B,EAAA;;gBAlBD,SAkBC,CAAC;gBAEF,+CAA+C;gBAC/C,qDAAqD;gBACrD,qEAAqE;gBACrE,iEAAiE;gBACjE,QAAQ,CAAC,GAAG,CACV,gEAAgE,CACjE,CAAC;gBACa,qBAAM,IAAA,iDAAuB,EAAC,MAAM,CAAC,EAAA;;gBAA9C,MAAM,GAAG,SAAqC;gBACpD,QAAQ,CAAC,GAAG,CAAC,iBAAiB,GAAG,MAAM,CAAC,CAAC;gBAEzC,qBAAM,IAAA,2BAAkB,EACtB,QAAQ;wBAEN,GAAC,2CAAgC,IAAG,MAAM;6BAE5C,OAAO,CAAC,WAAW,CAAC,SAAS,EAC7B,OAAO,CAAC,aAAa,EACrB,KAAK,EAAE,SAAS;oBAChB,KAAK,CAAC,SAAS;qBAChB,EAAA;;gBATD,SASC,CAAC;;;;KACH,CAAC;AArEW,QAAA,aAAa,iBAqExB"}
|