@tremho/mist-lift 2.1.0 → 2.1.2
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/README.md +4 -0
- package/build/commands/builtin/BuiltInHandler.js +2 -1
- package/build/commands/builtin/BuiltInHandler.js.map +1 -1
- package/build/commands/builtin/StageWebrootZip.js +1 -1
- package/build/commands/builtin/StageWebrootZip.js.map +1 -1
- package/build/commands/builtin/prebuilt-zips/API.zip +0 -0
- package/build/commands/builtin/prebuilt-zips/FileServe.zip +0 -0
- package/build/commands/builtin/prebuilt-zips/Webroot.zip +0 -0
- package/build/commands/publish.js +14 -17
- package/build/commands/publish.js.map +1 -1
- package/build/commands/update.js +1 -0
- package/build/commands/update.js.map +1 -1
- package/build/lib/ESBuild.js +2 -0
- package/build/lib/ESBuild.js.map +1 -1
- package/package.json +2 -2
- package/src/commands/builtin/BuiltInHandler.ts +2 -1
- package/src/commands/builtin/StageWebrootZip.ts +1 -1
- package/src/commands/builtin/prebuilt-zips/API.zip +0 -0
- package/src/commands/builtin/prebuilt-zips/FileServe.zip +0 -0
- package/src/commands/builtin/prebuilt-zips/Webroot.zip +0 -0
- package/src/commands/publish.ts +22 -26
- package/src/commands/update.ts +2 -1
- package/src/lib/ESBuild.ts +2 -0
package/README.md
CHANGED
|
@@ -64,6 +64,10 @@ To get started using MistLift, please see the [QuickStart Guide](https://github.
|
|
|
64
64
|
|
|
65
65
|
## Changelog
|
|
66
66
|
|
|
67
|
+
### 2.1.1, 2.1.2
|
|
68
|
+
- Fixes for fileserve operations that caused failures in custom domain deployments
|
|
69
|
+
- minor updates to publish operation
|
|
70
|
+
|
|
67
71
|
### 2.1.0
|
|
68
72
|
- Add `update` command to allow updating of webroot files without a new publish.
|
|
69
73
|
|
|
@@ -44,8 +44,9 @@ const fs_1 = __importDefault(require("fs"));
|
|
|
44
44
|
const path_1 = __importDefault(require("path"));
|
|
45
45
|
function DeployWebrootBuiltIn() {
|
|
46
46
|
return __awaiter(this, void 0, void 0, function* () {
|
|
47
|
+
// console.warn(">> DeployWebrootBuiltIn")
|
|
47
48
|
const wrZip = yield (0, StageWebrootZip_1.StageWebrootZip)();
|
|
48
|
-
// console.log("Deploy Webroot Builtin from "+wrZip)
|
|
49
|
+
// console.log(">> Deploy Webroot Builtin from "+wrZip)
|
|
49
50
|
yield (0, DeployBuiltInZip_1.DeployBuiltInZip)('Webroot', wrZip);
|
|
50
51
|
// remove temp zip when done
|
|
51
52
|
// console.warn("a.zip is left behind")
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BuiltInHandler.js","sourceRoot":"","sources":["../../../src/commands/builtin/BuiltInHandler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAAmD;AACnD,yDAAqD;AACrD,6EAA2E;AAC3E,gDAAiC;AAEjC,4CAAmB;AACnB,gDAAuB;AAEvB,SAAsB,oBAAoB;;QAGxC,MAAM,KAAK,GAAG,MAAM,IAAA,iCAAe,GAAE,CAAA;QACrC,
|
|
1
|
+
{"version":3,"file":"BuiltInHandler.js","sourceRoot":"","sources":["../../../src/commands/builtin/BuiltInHandler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAAmD;AACnD,yDAAqD;AACrD,6EAA2E;AAC3E,gDAAiC;AAEjC,4CAAmB;AACnB,gDAAuB;AAEvB,SAAsB,oBAAoB;;QAGxC,0CAA0C;QAC1C,MAAM,KAAK,GAAG,MAAM,IAAA,iCAAe,GAAE,CAAA;QACrC,uDAAuD;QACvD,MAAM,IAAA,mCAAgB,EAAC,SAAS,EAAE,KAAK,CAAC,CAAA;QACxC,4BAA4B;QAC5B,uCAAuC;QACvC,YAAE,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IACvC,CAAC;CAAA;AAVD,oDAUC;AAED,SAAsB,oBAAoB;;QAGxC,iBAAiB;QACjB,MAAM,KAAK,GAAG,IAAA,yCAAoB,GAAE,CAAA;QACpC,0CAA0C;QAC1C,MAAM,YAAY,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,eAAe,EAAE,eAAe,CAAC,CAAA;QAC3E,MAAM,GAAG,GAAwB,EAAE,CAAA;QACnC,KAAK,IAAI,IAAI,IAAI,KAAK,EAAE,CAAC;YACvB,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,CAAA;YAClB,IAAI,IAAI,GAAG,YAAY,GAAG,IAAI,CAAA;YAC9B,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC1B,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;YAC9B,CAAC;YACD,gDAAgD;YAChD,GAAG,CAAC,IAAI,CAAC,IAAA,mCAAgB,EAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAA;QAChD,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,aAAa,GAAG,CAAC,MAAM,iBAAiB,CAAC,CAAC,CAAA;QACtE,MAAM,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QACtB,+BAA+B;IACjC,CAAC;CAAA;AApBD,oDAoBC;AAED,SAAsB,gBAAgB;;QAGpC,gCAAgC;QAChC,MAAM,MAAM,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,eAAe,EAAE,SAAS,CAAC,CAAA;QAC/D,MAAM,IAAA,mCAAgB,EAAC,KAAK,EAAE,MAAM,CAAC,CAAA;IACvC,CAAC;CAAA;AAND,4CAMC"}
|
|
@@ -84,7 +84,7 @@ function StageWebrootZip() {
|
|
|
84
84
|
});
|
|
85
85
|
const webrootZip = path.join(projectPaths.basePath, 'a.zip');
|
|
86
86
|
// console.log(">>>> Combined webroot folder at "+stagedWebrootFolder)
|
|
87
|
-
// await executeCommand('ls', [ '-l', stagedWebrootFolder], '', true)
|
|
87
|
+
// await executeCommand('ls', [ '-l', stagedWebrootFolder+'/__files__'], '', true)
|
|
88
88
|
yield (0, utils_1.FolderToZip)(stagedWebrootFolder, webrootZip);
|
|
89
89
|
// return path to this zip
|
|
90
90
|
return webrootZip;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StageWebrootZip.js","sourceRoot":"","sources":["../../../src/commands/builtin/StageWebrootZip.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"StageWebrootZip.js","sourceRoot":"","sources":["../../../src/commands/builtin/StageWebrootZip.ts"],"names":[],"mappings":"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"}
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
@@ -68,7 +68,7 @@ function doPublishAsync(stageName) {
|
|
|
68
68
|
exports.doPublishAsync = doPublishAsync;
|
|
69
69
|
function publishApi(stageName) {
|
|
70
70
|
return __awaiter(this, void 0, void 0, function* () {
|
|
71
|
-
var _a, _b, _c;
|
|
71
|
+
var _a, _b, _c, _d, _e, _f;
|
|
72
72
|
if (stageName === undefined)
|
|
73
73
|
stageName = 'Dev';
|
|
74
74
|
console.log(ac.green.bold(`Publishing Api to ${stageName}`));
|
|
@@ -112,14 +112,14 @@ function publishApi(stageName) {
|
|
|
112
112
|
failOnWarnings: false,
|
|
113
113
|
body: apiBytes
|
|
114
114
|
});
|
|
115
|
-
let apiId;
|
|
115
|
+
let apiId = '';
|
|
116
116
|
try {
|
|
117
117
|
const response = yield client.send(command);
|
|
118
118
|
const { name, id, version, warnings } = response;
|
|
119
|
-
console.log(ac.grey(`\n\nAPI ${name !== null &&
|
|
119
|
+
console.log(ac.grey(`\n\nAPI ${(_a = name) !== null && _a !== void 0 ? _a : ''} version ${(_b = version) !== null && _b !== void 0 ? _b : ''} [${(_c = id) !== null && _c !== void 0 ? _c : ''}] schema created`));
|
|
120
120
|
apiId = id !== null && id !== void 0 ? id : '';
|
|
121
121
|
if ((warnings === null || warnings === void 0 ? void 0 : warnings.length) !== 0) {
|
|
122
|
-
console.log(ac.magenta(` with ${(
|
|
122
|
+
console.log(ac.magenta(` with ${(_d = warnings === null || warnings === void 0 ? void 0 : warnings.length) !== null && _d !== void 0 ? _d : 0} warnings`));
|
|
123
123
|
if (warnings !== undefined) {
|
|
124
124
|
for (const warning of warnings) {
|
|
125
125
|
console.log(ac.grey.italic(` ${warning}`));
|
|
@@ -139,7 +139,7 @@ function publishApi(stageName) {
|
|
|
139
139
|
const intRequests = prereq.MakeRequests();
|
|
140
140
|
yield PutIntegrations(intRequests);
|
|
141
141
|
yield DeployApi(apiId !== null && apiId !== void 0 ? apiId : '', stageName);
|
|
142
|
-
const region = (
|
|
142
|
+
const region = (_f = (_e = (0, LiftConfig_1.getSettings)()) === null || _e === void 0 ? void 0 : _e.awsPreferredRegion) !== null && _f !== void 0 ? _f : '';
|
|
143
143
|
const publishUrl = `https://${apiId !== null && apiId !== void 0 ? apiId : ''}.execute-api.${region}.amazonaws.com/${stageName}`;
|
|
144
144
|
console.log(ac.green.bold(`\n Successfully deployed to ${publishUrl}`));
|
|
145
145
|
recordLatestPublish(publishUrl);
|
|
@@ -163,10 +163,8 @@ function RemoveExistingVersions(client) {
|
|
|
163
163
|
return __awaiter(this, void 0, void 0, function* () {
|
|
164
164
|
yield new Promise(resolve => {
|
|
165
165
|
const ourName = findApiName();
|
|
166
|
-
// ClogDebug("looking for name "+ ourName)
|
|
167
166
|
const listCommand = new client_api_gateway_1.GetRestApisCommand({});
|
|
168
167
|
client.send(listCommand).then((response) => {
|
|
169
|
-
// ClogInfo(`There are ${response.items.length} other APIs`)
|
|
170
168
|
const DeleteMatchingApis = (...args_1) => __awaiter(this, [...args_1], void 0, function* (i = 0) {
|
|
171
169
|
if (i >= response.items.length) {
|
|
172
170
|
resolve(undefined);
|
|
@@ -174,20 +172,19 @@ function RemoveExistingVersions(client) {
|
|
|
174
172
|
}
|
|
175
173
|
const item = response.items[i];
|
|
176
174
|
if (item.name === ourName) {
|
|
177
|
-
// ClogInfo(`Found previous ${ourName}, [${item.id}] -- deleting...`)
|
|
178
175
|
const deleteCommand = new client_api_gateway_1.DeleteRestApiCommand({
|
|
179
176
|
restApiId: item.id
|
|
180
177
|
});
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
return yield DeleteMatchingApis(++i);
|
|
178
|
+
try {
|
|
179
|
+
yield client.send(deleteCommand);
|
|
180
|
+
yield (0, utils_1.delay)(5000);
|
|
181
|
+
console.log(ac.magenta.bold(`Removed previous id ${item.id}`));
|
|
182
|
+
}
|
|
183
|
+
catch (e) {
|
|
184
|
+
console.error(`Failed to delete previous id ${item.id}: ${e.message}`);
|
|
185
|
+
}
|
|
190
186
|
}
|
|
187
|
+
return yield DeleteMatchingApis(++i);
|
|
191
188
|
});
|
|
192
189
|
DeleteMatchingApis().catch((reason) => undefined);
|
|
193
190
|
}).catch((reason) => undefined);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publish.js","sourceRoot":"","sources":["../../src/commands/publish.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"publish.js","sourceRoot":"","sources":["../../src/commands/publish.ts"],"names":[],"mappings":"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"}
|
package/build/commands/update.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../src/commands/update.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAiC;AACjC,oDAAiD;AACjD,
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../src/commands/update.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAiC;AACjC,oDAAiD;AACjD,6DAAqF;AACrF,4CAA0C;AAE1C,gBAAgB;AAChB,SAAsB,aAAa,CACjC,SAAkB;;QAElB,MAAM,YAAY,GAAG,IAAA,0BAAY,GAAE,CAAA;QAEnC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC;YAC3B,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,0CAA0C,CAAC,CAAC,CAAA;YACxE,OAAO,CAAC,CAAC,CAAA;QACX,CAAC;QAED,IAAI,SAAS,KAAK,SAAS;YAAE,SAAS,GAAG,KAAK,CAAA;QAC9C,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,6BAA6B,SAAS,EAAE,CAAC,CAAC,CAAA;QAEpE,IAAI,CAAC;YACH,MAAM,IAAA,mBAAS,GAAE,CAAA;YACjB,MAAM,IAAA,qCAAoB,GAAE,CAAA;YAC5B,MAAM,IAAA,qCAAoB,GAAE,CAAA;YAC5B,OAAO,CAAC,CAAA;QACV,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YAChB,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,iDAAiD,CAAC,CAAC,CAAA;YAC3E,OAAO,CAAC,CAAC,CAAA;QACX,CAAC;IACH,CAAC;CAAA;AAtBD,sCAsBC"}
|
package/build/lib/ESBuild.js
CHANGED
|
@@ -65,11 +65,13 @@ function esbuilder() {
|
|
|
65
65
|
let more = watch === true;
|
|
66
66
|
do {
|
|
67
67
|
yield sleep(500);
|
|
68
|
+
// console.log("ctx.rebuild()")
|
|
68
69
|
/* result = */ yield ctx.rebuild();
|
|
69
70
|
more = watch === true;
|
|
70
71
|
if (oneShot)
|
|
71
72
|
break;
|
|
72
73
|
} while (more);
|
|
74
|
+
// console.log("done building")
|
|
73
75
|
});
|
|
74
76
|
}
|
|
75
77
|
exports.esbuilder = esbuilder;
|
package/build/lib/ESBuild.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ESBuild.js","sourceRoot":"","sources":["../../src/lib/ESBuild.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iDAAkC;AAClC,+CAA4C;AAC5C,gDAAuB;AACvB,4CAAmB;AAEnB,MAAM,YAAY,GAAG,gBAAgB,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"ESBuild.js","sourceRoot":"","sources":["../../src/lib/ESBuild.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iDAAkC;AAClC,+CAA4C;AAC5C,gDAAuB;AACvB,4CAAmB;AAEnB,MAAM,YAAY,GAAG,gBAAgB,EAAE,CAAA;AAEvC,SAAsB,SAAS;yDAAE,iBAAsB,IAAI,EAAE,UAAmB,IAAI;;QAClF,wCAAwC;QACxC,IAAI,YAAY,CAAC,OAAO,KAAK,SAAS,IAAI,OAAO,cAAc,KAAK,UAAU,EAAE,CAAC;YAC/E,MAAM,OAAO,GAAkB,cAAc,EAAE,CAAA;YAC/C,OAAO,MAAM,OAAO,CAAA,CAAC,oBAAoB;QAC3C,CAAC;QAED,MAAM,WAAW,GAAG,MAAA,YAAY,CAAC,OAAO,CAAC,WAAW,mCAAI,EAAE,CAAA;QAC1D,MAAM,MAAM,GAAG,MAAA,YAAY,CAAC,OAAO,CAAC,MAAM,mCAAI,SAAS,CAAA;QACvD,MAAM,KAAK,GAAG,MAAA,YAAY,CAAC,OAAO,CAAC,KAAK,mCAAI,KAAK,CAAA;QACjD,kEAAkE;QAClE,gEAAgE;QAEhE,kEAAkE;QAElE,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC;YAChC,WAAW;YACX,MAAM,EAAE,IAAI;YACZ,MAAM,EAAE,MAAM;SACf,CAAC,CAAA;QACF,4BAA4B;QAE5B,kBAAkB,CAAC,MAAM,GAAG,CAAC,OAAO,EAAE,CAAA;QACtC,IAAI,IAAI,GAAY,KAAK,KAAK,IAAI,CAAA;QAClC,GAAG,CAAC;YACF,MAAM,KAAK,CAAC,GAAG,CAAC,CAAA;YAChB,+BAA+B;YAC/B,cAAc,CAAC,MAAM,GAAG,CAAC,OAAO,EAAE,CAAA;YAClC,IAAI,GAAG,KAAK,KAAK,IAAI,CAAA;YACrB,IAAI,OAAO;gBAAE,MAAK;QACpB,CAAC,QAAQ,IAAI,EAAC;QACd,+BAA+B;IACjC,CAAC;CAAA;AAhCD,8BAgCC;AAED,SAAgB,gBAAgB;IAC9B,qCAAqC;IACrC,MAAM,YAAY,GAAG,IAAA,0BAAY,GAAE,CAAA;IACnC,MAAM,QAAQ,GAAG,cAAI,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,wBAAwB,CAAC,CAAA;IAC3E,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,QAAQ,CAAC;QAAE,OAAO,EAAE,CAAA;IAEvC,MAAM,IAAI,GAAQ,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAA;IAClE,4CAA4C;IAC5C,OAAO,IAAI,CAAA;AACb,CAAC;AATD,4CASC;AAED,SAAe,KAAK,CAAE,EAAU;;QAC9B,OAAO,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;YACjC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAA;QACzB,CAAC,CAAC,CAAA;IACJ,CAAC;CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tremho/mist-lift",
|
|
3
|
-
"version": "2.1.
|
|
3
|
+
"version": "2.1.2",
|
|
4
4
|
"description": "lift command line utility for MistLift development",
|
|
5
5
|
"main": "build/lift.js",
|
|
6
6
|
"bin": {
|
|
@@ -49,7 +49,7 @@
|
|
|
49
49
|
"@aws-sdk/client-api-gateway": "^3.598.0",
|
|
50
50
|
"@aws-sdk/client-lambda": "^3.598.0",
|
|
51
51
|
"@aws-sdk/credential-providers": "^3.598.0",
|
|
52
|
-
"@tremho/inverse-y": "^2.0.
|
|
52
|
+
"@tremho/inverse-y": "^2.0.4",
|
|
53
53
|
"@tremho/session-tbd": "^2.0.2",
|
|
54
54
|
"ansi-colors": "^4.1.3",
|
|
55
55
|
"body-parser": "^1.20.2",
|
|
@@ -9,8 +9,9 @@ import path from 'path'
|
|
|
9
9
|
export async function DeployWebrootBuiltIn
|
|
10
10
|
(
|
|
11
11
|
): Promise<void> {
|
|
12
|
+
// console.warn(">> DeployWebrootBuiltIn")
|
|
12
13
|
const wrZip = await StageWebrootZip()
|
|
13
|
-
// console.log("Deploy Webroot Builtin from "+wrZip)
|
|
14
|
+
// console.log(">> Deploy Webroot Builtin from "+wrZip)
|
|
14
15
|
await DeployBuiltInZip('Webroot', wrZip)
|
|
15
16
|
// remove temp zip when done
|
|
16
17
|
// console.warn("a.zip is left behind")
|
|
@@ -54,7 +54,7 @@ export async function StageWebrootZip
|
|
|
54
54
|
})
|
|
55
55
|
const webrootZip = path.join(projectPaths.basePath, 'a.zip')
|
|
56
56
|
// console.log(">>>> Combined webroot folder at "+stagedWebrootFolder)
|
|
57
|
-
// await executeCommand('ls', [ '-l', stagedWebrootFolder], '', true)
|
|
57
|
+
// await executeCommand('ls', [ '-l', stagedWebrootFolder+'/__files__'], '', true)
|
|
58
58
|
|
|
59
59
|
await FolderToZip(stagedWebrootFolder, webrootZip)
|
|
60
60
|
// return path to this zip
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
package/src/commands/publish.ts
CHANGED
|
@@ -7,7 +7,7 @@ import {
|
|
|
7
7
|
APIGatewayClient,
|
|
8
8
|
ImportRestApiCommand,
|
|
9
9
|
GetRestApisCommand,
|
|
10
|
-
GetResourcesCommand,
|
|
10
|
+
GetResourcesCommand,
|
|
11
11
|
DeleteRestApiCommand,
|
|
12
12
|
PutIntegrationRequest,
|
|
13
13
|
PutIntegrationCommand,
|
|
@@ -92,21 +92,21 @@ async function publishApi (
|
|
|
92
92
|
|
|
93
93
|
await RemoveExistingVersions(client)
|
|
94
94
|
|
|
95
|
-
const command = new ImportRestApiCommand({
|
|
95
|
+
const command: any = new ImportRestApiCommand({
|
|
96
96
|
failOnWarnings: false,
|
|
97
97
|
body: apiBytes
|
|
98
98
|
})
|
|
99
|
-
let apiId
|
|
99
|
+
let apiId: string = ''
|
|
100
100
|
try {
|
|
101
|
-
const response = await client.send(command)
|
|
101
|
+
const response: any = await client.send(command)
|
|
102
102
|
const { name, id, version, warnings } = response
|
|
103
|
-
console.log(ac.grey(`\n\nAPI ${name ?? ''} version ${version ?? ''} [${id ?? ''}] schema created`))
|
|
103
|
+
console.log(ac.grey(`\n\nAPI ${name as string ?? ''} version ${version as string ?? ''} [${id as string ?? ''}] schema created`))
|
|
104
104
|
apiId = id ?? ''
|
|
105
105
|
if (warnings?.length !== 0) {
|
|
106
|
-
console.log(ac.magenta(` with ${warnings?.length ?? 0} warnings`))
|
|
106
|
+
console.log(ac.magenta(` with ${(warnings as string[])?.length ?? 0} warnings`))
|
|
107
107
|
if (warnings !== undefined) {
|
|
108
108
|
for (const warning of warnings) {
|
|
109
|
-
console.log(ac.grey.italic(` ${warning}`))
|
|
109
|
+
console.log(ac.grey.italic(` ${warning as string}`))
|
|
110
110
|
}
|
|
111
111
|
}
|
|
112
112
|
}
|
|
@@ -142,11 +142,8 @@ function findApiName (): string {
|
|
|
142
142
|
async function RemoveExistingVersions (client: APIGatewayClient): Promise<void> {
|
|
143
143
|
await new Promise(resolve => {
|
|
144
144
|
const ourName = findApiName()
|
|
145
|
-
|
|
146
|
-
const listCommand = new GetRestApisCommand({})
|
|
145
|
+
const listCommand: any = new GetRestApisCommand({})
|
|
147
146
|
client.send(listCommand).then((response: any) => {
|
|
148
|
-
// ClogInfo(`There are ${response.items.length} other APIs`)
|
|
149
|
-
|
|
150
147
|
const DeleteMatchingApis = async (i: number = 0): Promise<any> => {
|
|
151
148
|
if (i >= response.items.length) {
|
|
152
149
|
resolve(undefined)
|
|
@@ -154,19 +151,18 @@ async function RemoveExistingVersions (client: APIGatewayClient): Promise<void>
|
|
|
154
151
|
}
|
|
155
152
|
const item: { name: string, id: string } = response.items[i]
|
|
156
153
|
if (item.name === ourName) {
|
|
157
|
-
|
|
158
|
-
const deleteCommand = new DeleteRestApiCommand({
|
|
154
|
+
const deleteCommand: any = new DeleteRestApiCommand({
|
|
159
155
|
restApiId: item.id
|
|
160
156
|
})
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
return await DeleteMatchingApis(++i)
|
|
157
|
+
try {
|
|
158
|
+
await client.send(deleteCommand)
|
|
159
|
+
await delay(5000)
|
|
160
|
+
console.log(ac.magenta.bold(`Removed previous id ${item.id}`))
|
|
161
|
+
} catch (e: any) {
|
|
162
|
+
console.error(`Failed to delete previous id ${item.id}: ${e.message as string}`)
|
|
163
|
+
}
|
|
169
164
|
}
|
|
165
|
+
return await DeleteMatchingApis(++i)
|
|
170
166
|
}
|
|
171
167
|
DeleteMatchingApis().catch<any>((reason: any) => undefined)
|
|
172
168
|
}).catch<any>((reason: any) => undefined)
|
|
@@ -197,7 +193,7 @@ class PrereqInfo {
|
|
|
197
193
|
for (const api of this.apis) {
|
|
198
194
|
if (api?.path === pathMap) {
|
|
199
195
|
// console.log("resourceMethods", api.resourceMethods)
|
|
200
|
-
const methodList = Object.getOwnPropertyNames(api.resourceMethods)
|
|
196
|
+
const methodList: string[] = Object.getOwnPropertyNames(api.resourceMethods)
|
|
201
197
|
// ClogTrace("methodList", methodList)
|
|
202
198
|
for (const meth of allowedMethods.toUpperCase().split(',')) { // NOTE: we no longer try to support multiples, but this still works as is.
|
|
203
199
|
// console.log("meth", meth)
|
|
@@ -282,10 +278,10 @@ async function GetMethodResources (
|
|
|
282
278
|
info: PrereqInfo
|
|
283
279
|
): Promise<PrereqInfo> {
|
|
284
280
|
const client = new APIGatewayClient(getAWSCredentials())
|
|
285
|
-
const listCommand = new GetResourcesCommand({
|
|
281
|
+
const listCommand: any = new GetResourcesCommand({
|
|
286
282
|
restApiId: id
|
|
287
283
|
})
|
|
288
|
-
const response:
|
|
284
|
+
const response: any = await client.send(listCommand)
|
|
289
285
|
// ClogInfo("Resources response", response)
|
|
290
286
|
if ((response?.items) != null) info.apis = response.items
|
|
291
287
|
|
|
@@ -296,7 +292,7 @@ async function PutIntegrations (integrations: PutIntegrationRequest[]): Promise<
|
|
|
296
292
|
const client = new APIGatewayClient(getAWSCredentials())
|
|
297
293
|
for (const input of integrations) {
|
|
298
294
|
try {
|
|
299
|
-
const command = new PutIntegrationCommand(input)
|
|
295
|
+
const command: any = new PutIntegrationCommand(input)
|
|
300
296
|
/* const intResp = */ await client.send(command)
|
|
301
297
|
// ClogDebug("integration response", intResp);
|
|
302
298
|
await delay(5000)
|
|
@@ -310,7 +306,7 @@ async function PutIntegrations (integrations: PutIntegrationRequest[]): Promise<
|
|
|
310
306
|
async function DeployApi (restApiId: string, stageName: string): Promise<void> {
|
|
311
307
|
try {
|
|
312
308
|
const client = new APIGatewayClient(getAWSCredentials())
|
|
313
|
-
const command = new CreateDeploymentCommand({
|
|
309
|
+
const command: any = new CreateDeploymentCommand({
|
|
314
310
|
restApiId,
|
|
315
311
|
stageName
|
|
316
312
|
})
|
package/src/commands/update.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as ac from 'ansi-colors'
|
|
2
2
|
import { resolvePaths } from '../lib/pathResolve'
|
|
3
|
-
import { DeployRootFileserves } from './builtin/BuiltInHandler'
|
|
3
|
+
import { DeployRootFileserves, DeployWebrootBuiltIn } from './builtin/BuiltInHandler'
|
|
4
4
|
import { esbuilder } from '../lib/ESBuild'
|
|
5
5
|
|
|
6
6
|
/// Info command
|
|
@@ -20,6 +20,7 @@ export async function doUpdateAsync (
|
|
|
20
20
|
try {
|
|
21
21
|
await esbuilder()
|
|
22
22
|
await DeployRootFileserves()
|
|
23
|
+
await DeployWebrootBuiltIn()
|
|
23
24
|
return 0
|
|
24
25
|
} catch (e: any) {
|
|
25
26
|
console.log(ac.bold.red('Unexpected failure updating Webroot deployments'))
|
package/src/lib/ESBuild.ts
CHANGED
|
@@ -31,10 +31,12 @@ export async function esbuilder (triggerRebuild: any = null, oneShot: boolean =
|
|
|
31
31
|
let more: boolean = watch === true
|
|
32
32
|
do {
|
|
33
33
|
await sleep(500)
|
|
34
|
+
// console.log("ctx.rebuild()")
|
|
34
35
|
/* result = */ await ctx.rebuild()
|
|
35
36
|
more = watch === true
|
|
36
37
|
if (oneShot) break
|
|
37
38
|
} while (more)
|
|
39
|
+
// console.log("done building")
|
|
38
40
|
}
|
|
39
41
|
|
|
40
42
|
export function readServerConfig (): any {
|