@pwrdrvr/microapps-publish 0.0.23 → 0.0.24
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/commands/nextjs-docker-auto.d.ts +4 -0
- package/dist/commands/nextjs-docker-auto.d.ts.map +1 -1
- package/dist/commands/nextjs-docker-auto.js +44 -11
- package/dist/commands/nextjs-docker-auto.js.map +1 -1
- package/dist/commands/publish-static.d.ts +18 -0
- package/dist/commands/publish-static.d.ts.map +1 -0
- package/dist/commands/publish-static.js +256 -0
- package/dist/commands/publish-static.js.map +1 -0
- package/dist/commands/publish.d.ts +2 -0
- package/dist/commands/publish.d.ts.map +1 -1
- package/dist/commands/publish.js +18 -2
- package/dist/commands/publish.js.map +1 -1
- package/dist/lib/DeployClient.d.ts +1 -1
- package/dist/lib/DeployClient.d.ts.map +1 -1
- package/dist/lib/DeployClient.js +3 -2
- package/dist/lib/DeployClient.js.map +1 -1
- package/package.json +1 -1
- package/src/commands/nextjs-docker-auto.ts +50 -11
- package/src/commands/publish-static.ts +302 -0
- package/src/commands/publish.ts +23 -1
- package/src/lib/DeployClient.ts +3 -1
|
@@ -10,6 +10,10 @@ export declare class DockerAutoCommand extends Command {
|
|
|
10
10
|
newVersion: flagsParser.IOptionFlag<string>;
|
|
11
11
|
repoName: flagsParser.IOptionFlag<string>;
|
|
12
12
|
leaveCopy: import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
|
|
13
|
+
appLambdaName: flagsParser.IOptionFlag<string>;
|
|
14
|
+
appName: flagsParser.IOptionFlag<string>;
|
|
15
|
+
staticAssetsPath: flagsParser.IOptionFlag<string>;
|
|
16
|
+
defaultFile: flagsParser.IOptionFlag<string>;
|
|
13
17
|
};
|
|
14
18
|
private VersionAndAlias;
|
|
15
19
|
private IMAGE_TAG;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nextjs-docker-auto.d.ts","sourceRoot":"","sources":["../../src/commands/nextjs-docker-auto.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC;AAM1B,OAAO,EAAE,OAAO,EAAE,KAAK,IAAI,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAgC/D,qBAAa,iBAAkB,SAAQ,OAAO;IAC5C,MAAM,CAAC,WAAW,SACwF;IAE1G,MAAM,CAAC,QAAQ,WAeb;IAEF,MAAM,CAAC,KAAK
|
|
1
|
+
{"version":3,"file":"nextjs-docker-auto.d.ts","sourceRoot":"","sources":["../../src/commands/nextjs-docker-auto.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC;AAM1B,OAAO,EAAE,OAAO,EAAE,KAAK,IAAI,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAgC/D,qBAAa,iBAAkB,SAAQ,OAAO;IAC5C,MAAM,CAAC,WAAW,SACwF;IAE1G,MAAM,CAAC,QAAQ,WAeb;IAEF,MAAM,CAAC,KAAK;;;;;;;;;;;MAuDV;IAEF,OAAO,CAAC,eAAe,CAAY;IACnC,OAAO,CAAC,SAAS,CAAM;IACvB,OAAO,CAAC,SAAS,CAAM;IACvB,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,oBAAoB,CAAS;IAE/B,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;IA8T1B;;;;OAIG;YACW,UAAU;IAexB;;;OAGG;YACW,YAAY;IAW1B;;;;OAIG;YACW,cAAc;CAyD7B"}
|
|
@@ -32,18 +32,27 @@ class DockerAutoCommand extends command_1.Command {
|
|
|
32
32
|
this._restoreFilesStarted = false;
|
|
33
33
|
}
|
|
34
34
|
async run() {
|
|
35
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
|
36
|
+
const config = Config_1.Config.instance;
|
|
35
37
|
// const RUNNING_TEXT = ' RUNS ';
|
|
36
38
|
// const RUNNING = chalk.reset.inverse.yellow.bold(RUNNING_TEXT) + ' ';
|
|
37
39
|
const RUNNING = ''; //chalk.reset.inverse.yellow.bold(RUNNING_TEXT) + ' ';
|
|
38
40
|
const { flags: parsedFlags } = this.parse(DockerAutoCommand);
|
|
39
|
-
const
|
|
41
|
+
const appLambdaName = (_a = parsedFlags.appLambdaName) !== null && _a !== void 0 ? _a : config.app.lambdaName;
|
|
42
|
+
const appName = (_b = parsedFlags.appName) !== null && _b !== void 0 ? _b : config.app.name;
|
|
40
43
|
const leaveFiles = parsedFlags.leaveCopy;
|
|
41
|
-
const
|
|
42
|
-
const
|
|
44
|
+
const deployerLambdaName = (_c = parsedFlags.deployerLambdaName) !== null && _c !== void 0 ? _c : config.deployer.lambdaName;
|
|
45
|
+
const semVer = (_d = parsedFlags.newVersion) !== null && _d !== void 0 ? _d : config.app.semVer;
|
|
46
|
+
const ecrRepo = (_e = parsedFlags.repoName) !== null && _e !== void 0 ? _e : config.app.ecrRepoName;
|
|
47
|
+
const staticAssetsPath = (_f = parsedFlags.staticAssetsPath) !== null && _f !== void 0 ? _f : config.app.staticAssetsPath;
|
|
48
|
+
const defaultFile = (_g = parsedFlags.defaultFile) !== null && _g !== void 0 ? _g : config.app.defaultFile;
|
|
43
49
|
// Override the config value
|
|
44
|
-
|
|
45
|
-
config.
|
|
46
|
-
config.app.
|
|
50
|
+
config.deployer.lambdaName = deployerLambdaName;
|
|
51
|
+
config.app.lambdaName = appLambdaName;
|
|
52
|
+
config.app.name = appName;
|
|
53
|
+
config.app.semVer = semVer;
|
|
54
|
+
config.app.staticAssetsPath = staticAssetsPath;
|
|
55
|
+
config.app.defaultFile = defaultFile;
|
|
47
56
|
// Get the account ID and region from STS
|
|
48
57
|
// TODO: Move this to the right place
|
|
49
58
|
if (config.app.awsAccountID === 0 || config.app.awsRegion === '') {
|
|
@@ -67,7 +76,7 @@ class DockerAutoCommand extends command_1.Command {
|
|
|
67
76
|
else if (config.app.ecrRepoName === '') {
|
|
68
77
|
config.app.ecrRepoName = `microapps-app-${config.app.name}${Config_1.Config.envLevel}-repo`;
|
|
69
78
|
}
|
|
70
|
-
this.VersionAndAlias = Versions_1.createVersions(
|
|
79
|
+
this.VersionAndAlias = Versions_1.createVersions(semVer);
|
|
71
80
|
const versionOnly = { version: this.VersionAndAlias.version };
|
|
72
81
|
this.FILES_TO_MODIFY = [
|
|
73
82
|
{ path: 'package.json', versions: versionOnly },
|
|
@@ -126,7 +135,7 @@ class DockerAutoCommand extends command_1.Command {
|
|
|
126
135
|
const origTitle = task.title;
|
|
127
136
|
task.title = RUNNING + origTitle;
|
|
128
137
|
// Confirm the Version Does Not Exist in Published State
|
|
129
|
-
task.output = `Checking if deployed app/version already exists for ${config.app.name}/${
|
|
138
|
+
task.output = `Checking if deployed app/version already exists for ${config.app.name}/${semVer}`;
|
|
130
139
|
ctx.preflightResult = await DeployClient_1.default.DeployVersionPreflight({
|
|
131
140
|
config,
|
|
132
141
|
output: (message) => (task.output = message),
|
|
@@ -142,7 +151,7 @@ class DockerAutoCommand extends command_1.Command {
|
|
|
142
151
|
task: async (ctx, task) => {
|
|
143
152
|
const origTitle = task.title;
|
|
144
153
|
task.title = RUNNING + origTitle;
|
|
145
|
-
task.output = `Invoking serverless next.js build for ${config.app.name}/${
|
|
154
|
+
task.output = `Invoking serverless next.js build for ${config.app.name}/${semVer}`;
|
|
146
155
|
// Run the serverless next.js build
|
|
147
156
|
await asyncExec('serverless');
|
|
148
157
|
if (config.app.serverlessNextRouterPath !== undefined) {
|
|
@@ -267,7 +276,7 @@ class DockerAutoCommand extends command_1.Command {
|
|
|
267
276
|
const origTitle = task.title;
|
|
268
277
|
task.title = RUNNING + origTitle;
|
|
269
278
|
// Call Deployer to Deploy AppName/Version
|
|
270
|
-
await DeployClient_1.default.DeployVersion(config, (message) => (task.output = message));
|
|
279
|
+
await DeployClient_1.default.DeployVersion(config, 'lambda', (message) => (task.output = message));
|
|
271
280
|
task.title = origTitle;
|
|
272
281
|
},
|
|
273
282
|
},
|
|
@@ -406,10 +415,34 @@ DockerAutoCommand.flags = {
|
|
|
406
415
|
description: 'Name (not URI) of the Docker repo for the app',
|
|
407
416
|
}),
|
|
408
417
|
leaveCopy: command_1.flags.boolean({
|
|
409
|
-
char: '
|
|
418
|
+
char: 'f',
|
|
410
419
|
default: false,
|
|
411
420
|
required: false,
|
|
412
421
|
description: 'Leave a copy of the modifed files as .modified',
|
|
413
422
|
}),
|
|
423
|
+
appLambdaName: command_1.flags.string({
|
|
424
|
+
char: 'l',
|
|
425
|
+
multiple: false,
|
|
426
|
+
required: false,
|
|
427
|
+
description: 'Name of the application lambda function',
|
|
428
|
+
}),
|
|
429
|
+
appName: command_1.flags.string({
|
|
430
|
+
char: 'a',
|
|
431
|
+
multiple: false,
|
|
432
|
+
required: false,
|
|
433
|
+
description: 'MicroApps app name',
|
|
434
|
+
}),
|
|
435
|
+
staticAssetsPath: command_1.flags.string({
|
|
436
|
+
char: 's',
|
|
437
|
+
multiple: false,
|
|
438
|
+
required: false,
|
|
439
|
+
description: 'Path to files to be uploaded to S3 static bucket at app/version/ path. Do include app/version/ in path if files are already "rooted" under that path locally.',
|
|
440
|
+
}),
|
|
441
|
+
defaultFile: command_1.flags.string({
|
|
442
|
+
char: 'i',
|
|
443
|
+
multiple: false,
|
|
444
|
+
required: false,
|
|
445
|
+
description: 'Default file to return when the app is loaded via the router without a version (e.g. when app/ is requested).',
|
|
446
|
+
}),
|
|
414
447
|
};
|
|
415
448
|
//# sourceMappingURL=nextjs-docker-auto.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nextjs-docker-auto.js","sourceRoot":"","sources":["../../src/commands/nextjs-docker-auto.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"nextjs-docker-auto.js","sourceRoot":"","sources":["../../src/commands/nextjs-docker-auto.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import 'reflect-metadata';
|
|
2
|
+
import { Command, flags as flagsParser } from '@oclif/command';
|
|
3
|
+
export declare class PublishCommand extends Command {
|
|
4
|
+
static description: string;
|
|
5
|
+
static examples: string[];
|
|
6
|
+
static flags: {
|
|
7
|
+
version: import("@oclif/parser/lib/flags").IBooleanFlag<void>;
|
|
8
|
+
help: import("@oclif/parser/lib/flags").IBooleanFlag<void>;
|
|
9
|
+
deployerLambdaName: flagsParser.IOptionFlag<string>;
|
|
10
|
+
newVersion: flagsParser.IOptionFlag<string>;
|
|
11
|
+
appName: flagsParser.IOptionFlag<string>;
|
|
12
|
+
staticAssetsPath: flagsParser.IOptionFlag<string>;
|
|
13
|
+
defaultFile: flagsParser.IOptionFlag<string>;
|
|
14
|
+
};
|
|
15
|
+
private VersionAndAlias;
|
|
16
|
+
run(): Promise<void>;
|
|
17
|
+
}
|
|
18
|
+
//# sourceMappingURL=publish-static.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"publish-static.d.ts","sourceRoot":"","sources":["../../src/commands/publish-static.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC;AAK1B,OAAO,EAAE,OAAO,EAAE,KAAK,IAAI,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAwB/D,qBAAa,cAAe,SAAQ,OAAO;IACzC,MAAM,CAAC,WAAW,SAA+E;IAEjG,MAAM,CAAC,QAAQ,WAUb;IAEF,MAAM,CAAC,KAAK;;;;;;;;MAqCV;IAEF,OAAO,CAAC,eAAe,CAAY;IAE7B,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAwN3B"}
|
|
@@ -0,0 +1,256 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.PublishCommand = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
require("reflect-metadata");
|
|
6
|
+
const util = tslib_1.__importStar(require("util"));
|
|
7
|
+
const lambda = tslib_1.__importStar(require("@aws-sdk/client-lambda"));
|
|
8
|
+
const s3 = tslib_1.__importStar(require("@aws-sdk/client-s3"));
|
|
9
|
+
const sts = tslib_1.__importStar(require("@aws-sdk/client-sts"));
|
|
10
|
+
const command_1 = require("@oclif/command");
|
|
11
|
+
const path = tslib_1.__importStar(require("path"));
|
|
12
|
+
const fs_extra_1 = require("fs-extra");
|
|
13
|
+
const listr2_1 = require("listr2");
|
|
14
|
+
const Config_1 = require("../config/Config");
|
|
15
|
+
const DeployClient_1 = tslib_1.__importDefault(require("../lib/DeployClient"));
|
|
16
|
+
const S3Uploader_1 = tslib_1.__importDefault(require("../lib/S3Uploader"));
|
|
17
|
+
const S3TransferUtility_1 = tslib_1.__importDefault(require("../lib/S3TransferUtility"));
|
|
18
|
+
const lib_storage_1 = require("@aws-sdk/lib-storage");
|
|
19
|
+
const mime_types_1 = require("mime-types");
|
|
20
|
+
const Versions_1 = require("../lib/Versions");
|
|
21
|
+
const asyncSetTimeout = util.promisify(setTimeout);
|
|
22
|
+
const lambdaClient = new lambda.LambdaClient({
|
|
23
|
+
maxAttempts: 8,
|
|
24
|
+
});
|
|
25
|
+
class PublishCommand extends command_1.Command {
|
|
26
|
+
async run() {
|
|
27
|
+
var _a, _b, _c, _d, _e;
|
|
28
|
+
const config = Config_1.Config.instance;
|
|
29
|
+
// const RUNNING_TEXT = ' RUNS ';
|
|
30
|
+
// const RUNNING = chalk.reset.inverse.yellow.bold(RUNNING_TEXT) + ' ';
|
|
31
|
+
const RUNNING = ''; //chalk.reset.inverse.yellow.bold(RUNNING_TEXT) + ' ';
|
|
32
|
+
const { flags: parsedFlags } = this.parse(PublishCommand);
|
|
33
|
+
const appName = (_a = parsedFlags.appName) !== null && _a !== void 0 ? _a : config.app.name;
|
|
34
|
+
const deployerLambdaName = (_b = parsedFlags.deployerLambdaName) !== null && _b !== void 0 ? _b : config.deployer.lambdaName;
|
|
35
|
+
const semVer = (_c = parsedFlags.newVersion) !== null && _c !== void 0 ? _c : config.app.semVer;
|
|
36
|
+
const staticAssetsPath = (_d = parsedFlags.staticAssetsPath) !== null && _d !== void 0 ? _d : config.app.staticAssetsPath;
|
|
37
|
+
const defaultFile = (_e = parsedFlags.defaultFile) !== null && _e !== void 0 ? _e : config.app.defaultFile;
|
|
38
|
+
// Override the config value
|
|
39
|
+
config.deployer.lambdaName = deployerLambdaName;
|
|
40
|
+
delete config.app.lambdaName;
|
|
41
|
+
config.app.name = appName;
|
|
42
|
+
config.app.semVer = semVer;
|
|
43
|
+
config.app.staticAssetsPath = staticAssetsPath;
|
|
44
|
+
config.app.defaultFile = defaultFile;
|
|
45
|
+
// Get the account ID and region from STS
|
|
46
|
+
// TODO: Move this to the right place
|
|
47
|
+
if (config.app.awsAccountID === 0 || config.app.awsRegion === '') {
|
|
48
|
+
const stsClient = new sts.STSClient({
|
|
49
|
+
maxAttempts: 8,
|
|
50
|
+
});
|
|
51
|
+
const stsResponse = await stsClient.send(new sts.GetCallerIdentityCommand({}));
|
|
52
|
+
if (config.app.awsAccountID === 0) {
|
|
53
|
+
config.app.awsAccountID = parseInt(stsResponse.Account, 10);
|
|
54
|
+
}
|
|
55
|
+
if (config.app.awsRegion === '') {
|
|
56
|
+
config.app.awsRegion = stsClient.config.region;
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
this.VersionAndAlias = Versions_1.createVersions(semVer);
|
|
60
|
+
if (config === undefined) {
|
|
61
|
+
this.error('Failed to load the config file');
|
|
62
|
+
}
|
|
63
|
+
if (config.app.staticAssetsPath === undefined) {
|
|
64
|
+
this.error('StaticAssetsPath must be specified in the config file');
|
|
65
|
+
}
|
|
66
|
+
//
|
|
67
|
+
// Setup Tasks
|
|
68
|
+
//
|
|
69
|
+
const tasks = new listr2_1.Listr([
|
|
70
|
+
{
|
|
71
|
+
// TODO: Disable this task if no static assets path
|
|
72
|
+
title: 'Get S3 Temp Credentials',
|
|
73
|
+
task: async (ctx, task) => {
|
|
74
|
+
const origTitle = task.title;
|
|
75
|
+
task.title = RUNNING + origTitle;
|
|
76
|
+
// Confirm the Version Does Not Exist in Published State
|
|
77
|
+
task.output = `Checking if deployed app/version already exists for ${config.app.name}/${semVer}`;
|
|
78
|
+
ctx.preflightResult = await DeployClient_1.default.DeployVersionPreflight({
|
|
79
|
+
config,
|
|
80
|
+
output: (message) => (task.output = message),
|
|
81
|
+
});
|
|
82
|
+
if (ctx.preflightResult.exists) {
|
|
83
|
+
task.output = `Warning: App/Version already exists: ${config.app.name}/${config.app.semVer}`;
|
|
84
|
+
}
|
|
85
|
+
task.title = origTitle;
|
|
86
|
+
},
|
|
87
|
+
},
|
|
88
|
+
{
|
|
89
|
+
// TODO: Disable this task if no static assets path
|
|
90
|
+
title: 'Confirm Static Assets Folder Exists',
|
|
91
|
+
task: async (ctx, task) => {
|
|
92
|
+
const origTitle = task.title;
|
|
93
|
+
task.title = RUNNING + origTitle;
|
|
94
|
+
// Check that Static Assets Folder exists
|
|
95
|
+
if (!(await fs_extra_1.pathExists(config.app.staticAssetsPath))) {
|
|
96
|
+
this.error(`Static asset path does not exist: ${config.app.staticAssetsPath}`);
|
|
97
|
+
}
|
|
98
|
+
task.title = origTitle;
|
|
99
|
+
},
|
|
100
|
+
},
|
|
101
|
+
{
|
|
102
|
+
// TODO: Disable this task if no static assets path
|
|
103
|
+
title: 'Copy Static Files to Local Upload Dir',
|
|
104
|
+
task: async (ctx, task) => {
|
|
105
|
+
const origTitle = task.title;
|
|
106
|
+
task.title = RUNNING + origTitle;
|
|
107
|
+
// Copy files to local dir to be uploaded
|
|
108
|
+
await S3Uploader_1.default.CopyToUploadDir(config, ctx.preflightResult.response.s3UploadUrl);
|
|
109
|
+
task.title = origTitle;
|
|
110
|
+
},
|
|
111
|
+
},
|
|
112
|
+
{
|
|
113
|
+
// TODO: Disable this task if no static assets path
|
|
114
|
+
title: 'Enumerate Files to Upload to S3',
|
|
115
|
+
task: async (ctx, task) => {
|
|
116
|
+
const origTitle = task.title;
|
|
117
|
+
task.title = RUNNING + origTitle;
|
|
118
|
+
ctx.files = (await S3TransferUtility_1.default.GetFiles(S3Uploader_1.default.TempDir));
|
|
119
|
+
task.title = origTitle;
|
|
120
|
+
},
|
|
121
|
+
},
|
|
122
|
+
{
|
|
123
|
+
// TODO: Disable this task if no static assets path
|
|
124
|
+
title: 'Upload Static Files to S3',
|
|
125
|
+
task: (ctx, task) => {
|
|
126
|
+
const origTitle = task.title;
|
|
127
|
+
task.title = RUNNING + origTitle;
|
|
128
|
+
const { bucketName, destinationPrefix } = S3Uploader_1.default.ParseUploadPath(ctx.preflightResult.response.s3UploadUrl);
|
|
129
|
+
// Use temp credentials for S3
|
|
130
|
+
const s3Client = new s3.S3Client({
|
|
131
|
+
maxAttempts: 16,
|
|
132
|
+
credentials: {
|
|
133
|
+
accessKeyId: ctx.preflightResult.response.awsCredentials.accessKeyId,
|
|
134
|
+
secretAccessKey: ctx.preflightResult.response.awsCredentials.secretAccessKey,
|
|
135
|
+
sessionToken: ctx.preflightResult.response.awsCredentials.sessionToken,
|
|
136
|
+
},
|
|
137
|
+
});
|
|
138
|
+
const pathWithoutAppAndVer = path.join(S3Uploader_1.default.TempDir, destinationPrefix);
|
|
139
|
+
const tasks = ctx.files.map((filePath) => ({
|
|
140
|
+
task: async (ctx, subtask) => {
|
|
141
|
+
const relFilePath = path.relative(pathWithoutAppAndVer, filePath);
|
|
142
|
+
const origTitle = relFilePath;
|
|
143
|
+
subtask.title = RUNNING + origTitle;
|
|
144
|
+
const upload = new lib_storage_1.Upload({
|
|
145
|
+
client: s3Client,
|
|
146
|
+
leavePartsOnError: false,
|
|
147
|
+
params: {
|
|
148
|
+
Bucket: bucketName,
|
|
149
|
+
Key: path.relative(S3Uploader_1.default.TempDir, filePath),
|
|
150
|
+
Body: fs_extra_1.createReadStream(filePath),
|
|
151
|
+
ContentType: mime_types_1.contentType(path.basename(filePath)) || 'application/octet-stream',
|
|
152
|
+
CacheControl: 'max-age=86400; public',
|
|
153
|
+
},
|
|
154
|
+
});
|
|
155
|
+
await upload.done();
|
|
156
|
+
subtask.title = origTitle;
|
|
157
|
+
},
|
|
158
|
+
}));
|
|
159
|
+
task.title = origTitle;
|
|
160
|
+
return task.newListr(tasks, {
|
|
161
|
+
concurrent: 8,
|
|
162
|
+
rendererOptions: {
|
|
163
|
+
clearOutput: false,
|
|
164
|
+
showErrorMessage: true,
|
|
165
|
+
showTimer: true,
|
|
166
|
+
},
|
|
167
|
+
});
|
|
168
|
+
},
|
|
169
|
+
},
|
|
170
|
+
{
|
|
171
|
+
title: `Creating MicroApp Application: ${config.app.name}`,
|
|
172
|
+
task: async (ctx, task) => {
|
|
173
|
+
const origTitle = task.title;
|
|
174
|
+
task.title = RUNNING + origTitle;
|
|
175
|
+
// Call Deployer to Create App if Not Exists
|
|
176
|
+
await DeployClient_1.default.CreateApp(config);
|
|
177
|
+
task.title = origTitle;
|
|
178
|
+
},
|
|
179
|
+
},
|
|
180
|
+
{
|
|
181
|
+
title: `Creating MicroApp Version: ${config.app.semVer}`,
|
|
182
|
+
task: async (ctx, task) => {
|
|
183
|
+
const origTitle = task.title;
|
|
184
|
+
task.title = RUNNING + origTitle;
|
|
185
|
+
// Call Deployer to Deploy AppName/Version
|
|
186
|
+
await DeployClient_1.default.DeployVersion(config, 'static', (message) => (task.output = message));
|
|
187
|
+
task.title = origTitle;
|
|
188
|
+
},
|
|
189
|
+
},
|
|
190
|
+
], {
|
|
191
|
+
rendererOptions: {
|
|
192
|
+
showTimer: true,
|
|
193
|
+
},
|
|
194
|
+
});
|
|
195
|
+
try {
|
|
196
|
+
await tasks.run();
|
|
197
|
+
// this.log(`Published: ${config.app.name}/${config.app.semVer}`);
|
|
198
|
+
}
|
|
199
|
+
catch (error) {
|
|
200
|
+
this.log(`Caught exception: ${error.message}`);
|
|
201
|
+
}
|
|
202
|
+
finally {
|
|
203
|
+
await S3Uploader_1.default.removeTempDirIfExists();
|
|
204
|
+
}
|
|
205
|
+
}
|
|
206
|
+
}
|
|
207
|
+
exports.PublishCommand = PublishCommand;
|
|
208
|
+
PublishCommand.description = 'Publish arbitrary framework static app - deploy static assets to S3 only.';
|
|
209
|
+
PublishCommand.examples = [
|
|
210
|
+
`$ microapps-publish publish-static -d microapps-deployer-dev -n 0.0.21 -l microapps-app-release-dev -a release
|
|
211
|
+
✔ Get S3 Temp Credentials [1s]
|
|
212
|
+
✔ Confirm Static Assets Folder Exists [0.0s]
|
|
213
|
+
✔ Copy Static Files to Local Upload Dir [0.0s]
|
|
214
|
+
✔ Enumerate Files to Upload to S3 [0.0s]
|
|
215
|
+
✔ Upload Static Files to S3 [1s]
|
|
216
|
+
✔ Creating MicroApp Application: release [0.0s]
|
|
217
|
+
✔ Creating MicroApp Version: 0.0.21 [1s]
|
|
218
|
+
`,
|
|
219
|
+
];
|
|
220
|
+
PublishCommand.flags = {
|
|
221
|
+
version: command_1.flags.version({
|
|
222
|
+
char: 'v',
|
|
223
|
+
}),
|
|
224
|
+
help: command_1.flags.help(),
|
|
225
|
+
deployerLambdaName: command_1.flags.string({
|
|
226
|
+
char: 'd',
|
|
227
|
+
multiple: false,
|
|
228
|
+
required: true,
|
|
229
|
+
description: 'Name of the deployer lambda function',
|
|
230
|
+
}),
|
|
231
|
+
newVersion: command_1.flags.string({
|
|
232
|
+
char: 'n',
|
|
233
|
+
multiple: false,
|
|
234
|
+
required: true,
|
|
235
|
+
description: 'New semantic version to apply',
|
|
236
|
+
}),
|
|
237
|
+
appName: command_1.flags.string({
|
|
238
|
+
char: 'a',
|
|
239
|
+
multiple: false,
|
|
240
|
+
required: false,
|
|
241
|
+
description: 'MicroApps app name',
|
|
242
|
+
}),
|
|
243
|
+
staticAssetsPath: command_1.flags.string({
|
|
244
|
+
char: 's',
|
|
245
|
+
multiple: false,
|
|
246
|
+
required: false,
|
|
247
|
+
description: 'Path to files to be uploaded to S3 static bucket at app/version/ path. Do include app/version/ in path if files are already "rooted" under that path locally.',
|
|
248
|
+
}),
|
|
249
|
+
defaultFile: command_1.flags.string({
|
|
250
|
+
char: 'i',
|
|
251
|
+
multiple: false,
|
|
252
|
+
required: false,
|
|
253
|
+
description: 'Default file to return when the app is loaded via the router without a version (e.g. when app/ is requested).',
|
|
254
|
+
}),
|
|
255
|
+
};
|
|
256
|
+
//# sourceMappingURL=publish-static.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"publish-static.js","sourceRoot":"","sources":["../../src/commands/publish-static.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,8 @@ export declare class PublishCommand extends Command {
|
|
|
10
10
|
newVersion: flagsParser.IOptionFlag<string>;
|
|
11
11
|
appLambdaName: flagsParser.IOptionFlag<string>;
|
|
12
12
|
appName: flagsParser.IOptionFlag<string>;
|
|
13
|
+
staticAssetsPath: flagsParser.IOptionFlag<string>;
|
|
14
|
+
defaultFile: flagsParser.IOptionFlag<string>;
|
|
13
15
|
};
|
|
14
16
|
private VersionAndAlias;
|
|
15
17
|
run(): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publish.d.ts","sourceRoot":"","sources":["../../src/commands/publish.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC;AAK1B,OAAO,EAAE,OAAO,EAAE,KAAK,IAAI,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAyB/D,qBAAa,cAAe,SAAQ,OAAO;IACzC,MAAM,CAAC,WAAW,SACiH;IAEnI,MAAM,CAAC,QAAQ,WAWb;IAEF,MAAM,CAAC,KAAK
|
|
1
|
+
{"version":3,"file":"publish.d.ts","sourceRoot":"","sources":["../../src/commands/publish.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC;AAK1B,OAAO,EAAE,OAAO,EAAE,KAAK,IAAI,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAyB/D,qBAAa,cAAe,SAAQ,OAAO;IACzC,MAAM,CAAC,WAAW,SACiH;IAEnI,MAAM,CAAC,QAAQ,WAWb;IAEF,MAAM,CAAC,KAAK;;;;;;;;;MA2CV;IAEF,OAAO,CAAC,eAAe,CAAY;IAE7B,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;IAuO1B;;;;OAIG;YACW,cAAc;CAkD7B"}
|
package/dist/commands/publish.js
CHANGED
|
@@ -24,7 +24,7 @@ const lambdaClient = new lambda.LambdaClient({
|
|
|
24
24
|
});
|
|
25
25
|
class PublishCommand extends command_1.Command {
|
|
26
26
|
async run() {
|
|
27
|
-
var _a, _b, _c, _d;
|
|
27
|
+
var _a, _b, _c, _d, _e, _f;
|
|
28
28
|
const config = Config_1.Config.instance;
|
|
29
29
|
// const RUNNING_TEXT = ' RUNS ';
|
|
30
30
|
// const RUNNING = chalk.reset.inverse.yellow.bold(RUNNING_TEXT) + ' ';
|
|
@@ -34,11 +34,15 @@ class PublishCommand extends command_1.Command {
|
|
|
34
34
|
const appName = (_b = parsedFlags.appName) !== null && _b !== void 0 ? _b : config.app.name;
|
|
35
35
|
const deployerLambdaName = (_c = parsedFlags.deployerLambdaName) !== null && _c !== void 0 ? _c : config.deployer.lambdaName;
|
|
36
36
|
const semVer = (_d = parsedFlags.newVersion) !== null && _d !== void 0 ? _d : config.app.semVer;
|
|
37
|
+
const staticAssetsPath = (_e = parsedFlags.staticAssetsPath) !== null && _e !== void 0 ? _e : config.app.staticAssetsPath;
|
|
38
|
+
const defaultFile = (_f = parsedFlags.defaultFile) !== null && _f !== void 0 ? _f : config.app.defaultFile;
|
|
37
39
|
// Override the config value
|
|
38
40
|
config.deployer.lambdaName = deployerLambdaName;
|
|
39
41
|
config.app.lambdaName = appLambdaName;
|
|
40
42
|
config.app.name = appName;
|
|
41
43
|
config.app.semVer = semVer;
|
|
44
|
+
config.app.staticAssetsPath = staticAssetsPath;
|
|
45
|
+
config.app.defaultFile = defaultFile;
|
|
42
46
|
// Get the account ID and region from STS
|
|
43
47
|
// TODO: Move this to the right place
|
|
44
48
|
if (config.app.awsAccountID === 0 || config.app.awsRegion === '') {
|
|
@@ -191,7 +195,7 @@ class PublishCommand extends command_1.Command {
|
|
|
191
195
|
const origTitle = task.title;
|
|
192
196
|
task.title = RUNNING + origTitle;
|
|
193
197
|
// Call Deployer to Deploy AppName/Version
|
|
194
|
-
await DeployClient_1.default.DeployVersion(config, (message) => (task.output = message));
|
|
198
|
+
await DeployClient_1.default.DeployVersion(config, 'lambda', (message) => (task.output = message));
|
|
195
199
|
task.title = origTitle;
|
|
196
200
|
},
|
|
197
201
|
},
|
|
@@ -296,5 +300,17 @@ PublishCommand.flags = {
|
|
|
296
300
|
required: false,
|
|
297
301
|
description: 'MicroApps app name',
|
|
298
302
|
}),
|
|
303
|
+
staticAssetsPath: command_1.flags.string({
|
|
304
|
+
char: 's',
|
|
305
|
+
multiple: false,
|
|
306
|
+
required: false,
|
|
307
|
+
description: 'Path to files to be uploaded to S3 static bucket at app/version/ path. Do include app/version/ in path if files are already "rooted" under that path locally.',
|
|
308
|
+
}),
|
|
309
|
+
defaultFile: command_1.flags.string({
|
|
310
|
+
char: 'i',
|
|
311
|
+
multiple: false,
|
|
312
|
+
required: false,
|
|
313
|
+
description: 'Default file to return when the app is loaded via the router without a version (e.g. when app/ is requested).',
|
|
314
|
+
}),
|
|
299
315
|
};
|
|
300
316
|
//# sourceMappingURL=publish.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publish.js","sourceRoot":"","sources":["../../src/commands/publish.ts"],"names":[],"mappings":";;;;AAAA,4BAA0B;AAC1B,mDAA6B;AAC7B,uEAAiD;AACjD,+DAAyC;AACzC,iEAA2C;AAC3C,4CAA+D;AAE/D,mDAA6B;AAC7B,uCAAwD;AACxD,mCAA0C;AAC1C,6CAAmD;AACnD,+EAAkF;AAClF,2EAA2C;AAC3C,yFAAyD;AACzD,sDAA8C;AAC9C,2CAAyC;AAGzC,8CAA4D;AAC5D,MAAM,eAAe,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;AAEnD,MAAM,YAAY,GAAG,IAAI,MAAM,CAAC,YAAY,CAAC;IAC3C,WAAW,EAAE,CAAC;CACf,CAAC,CAAC;AAOH,MAAa,cAAe,SAAQ,iBAAO;
|
|
1
|
+
{"version":3,"file":"publish.js","sourceRoot":"","sources":["../../src/commands/publish.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,6 +29,6 @@ export default class DeployClient {
|
|
|
29
29
|
* @param config
|
|
30
30
|
* @param task
|
|
31
31
|
*/
|
|
32
|
-
static DeployVersion(config: IConfig, output: (message: string) => void): Promise<void>;
|
|
32
|
+
static DeployVersion(config: IConfig, appType: 'lambda' | 'static', output: (message: string) => void): Promise<void>;
|
|
33
33
|
}
|
|
34
34
|
//# sourceMappingURL=DeployClient.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeployClient.d.ts","sourceRoot":"","sources":["../../src/lib/DeployClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAEL,+BAA+B,EAIhC,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAE3C,MAAM,WAAW,6BAA6B;IAC5C,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,+BAA+B,CAAC;CAC3C;AAED,MAAM,CAAC,OAAO,OAAO,YAAY;IAC/B,MAAM,CAAC,QAAQ,CAAC,OAAO,sBAEpB;IACH,MAAM,CAAC,QAAQ,CAAC,QAAQ,cAA4B;WAEhC,SAAS,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAyB7D;;;;;;OAMG;WACiB,sBAAsB,CAAC,IAAI,EAAE;QAC/C,MAAM,EAAE,OAAO,CAAC;QAChB,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,MAAM,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;KACnC,GAAG,OAAO,CAAC,6BAA6B,CAAC;IAgC1C;;;;;;;OAOG;WACiB,aAAa,CAC/B,MAAM,EAAE,OAAO,EACf,MAAM,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,GAChC,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"DeployClient.d.ts","sourceRoot":"","sources":["../../src/lib/DeployClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAEL,+BAA+B,EAIhC,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAE3C,MAAM,WAAW,6BAA6B;IAC5C,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,+BAA+B,CAAC;CAC3C;AAED,MAAM,CAAC,OAAO,OAAO,YAAY;IAC/B,MAAM,CAAC,QAAQ,CAAC,OAAO,sBAEpB;IACH,MAAM,CAAC,QAAQ,CAAC,QAAQ,cAA4B;WAEhC,SAAS,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAyB7D;;;;;;OAMG;WACiB,sBAAsB,CAAC,IAAI,EAAE;QAC/C,MAAM,EAAE,OAAO,CAAC;QAChB,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,MAAM,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;KACnC,GAAG,OAAO,CAAC,6BAA6B,CAAC;IAgC1C;;;;;;;OAOG;WACiB,aAAa,CAC/B,MAAM,EAAE,OAAO,EACf,OAAO,EAAE,QAAQ,GAAG,QAAQ,EAC5B,MAAM,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,GAChC,OAAO,CAAC,IAAI,CAAC;CA8BjB"}
|
package/dist/lib/DeployClient.js
CHANGED
|
@@ -65,13 +65,14 @@ class DeployClient {
|
|
|
65
65
|
* @param config
|
|
66
66
|
* @param task
|
|
67
67
|
*/
|
|
68
|
-
static async DeployVersion(config, output) {
|
|
68
|
+
static async DeployVersion(config, appType, output) {
|
|
69
69
|
const request = {
|
|
70
70
|
type: 'deployVersion',
|
|
71
|
+
appType,
|
|
71
72
|
appName: config.app.name,
|
|
72
73
|
semVer: config.app.semVer,
|
|
73
74
|
defaultFile: config.app.defaultFile,
|
|
74
|
-
lambdaARN: config.app.lambdaARN,
|
|
75
|
+
lambdaARN: appType === 'lambda' ? config.app.lambdaARN : undefined,
|
|
75
76
|
};
|
|
76
77
|
const response = await this._client.send(new lambda.InvokeCommand({
|
|
77
78
|
FunctionName: config.deployer.lambdaName,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeployClient.js","sourceRoot":"","sources":["../../src/lib/DeployClient.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"DeployClient.js","sourceRoot":"","sources":["../../src/lib/DeployClient.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -81,11 +81,37 @@ export class DockerAutoCommand extends Command {
|
|
|
81
81
|
description: 'Name (not URI) of the Docker repo for the app',
|
|
82
82
|
}),
|
|
83
83
|
leaveCopy: flagsParser.boolean({
|
|
84
|
-
char: '
|
|
84
|
+
char: 'f',
|
|
85
85
|
default: false,
|
|
86
86
|
required: false,
|
|
87
87
|
description: 'Leave a copy of the modifed files as .modified',
|
|
88
88
|
}),
|
|
89
|
+
appLambdaName: flagsParser.string({
|
|
90
|
+
char: 'l',
|
|
91
|
+
multiple: false,
|
|
92
|
+
required: false,
|
|
93
|
+
description: 'Name of the application lambda function',
|
|
94
|
+
}),
|
|
95
|
+
appName: flagsParser.string({
|
|
96
|
+
char: 'a',
|
|
97
|
+
multiple: false,
|
|
98
|
+
required: false,
|
|
99
|
+
description: 'MicroApps app name',
|
|
100
|
+
}),
|
|
101
|
+
staticAssetsPath: flagsParser.string({
|
|
102
|
+
char: 's',
|
|
103
|
+
multiple: false,
|
|
104
|
+
required: false,
|
|
105
|
+
description:
|
|
106
|
+
'Path to files to be uploaded to S3 static bucket at app/version/ path. Do include app/version/ in path if files are already "rooted" under that path locally.',
|
|
107
|
+
}),
|
|
108
|
+
defaultFile: flagsParser.string({
|
|
109
|
+
char: 'i',
|
|
110
|
+
multiple: false,
|
|
111
|
+
required: false,
|
|
112
|
+
description:
|
|
113
|
+
'Default file to return when the app is loaded via the router without a version (e.g. when app/ is requested).',
|
|
114
|
+
}),
|
|
89
115
|
};
|
|
90
116
|
|
|
91
117
|
private VersionAndAlias: IVersions;
|
|
@@ -95,20 +121,29 @@ export class DockerAutoCommand extends Command {
|
|
|
95
121
|
private _restoreFilesStarted = false;
|
|
96
122
|
|
|
97
123
|
async run(): Promise<void> {
|
|
124
|
+
const config = Config.instance;
|
|
125
|
+
|
|
98
126
|
// const RUNNING_TEXT = ' RUNS ';
|
|
99
127
|
// const RUNNING = chalk.reset.inverse.yellow.bold(RUNNING_TEXT) + ' ';
|
|
100
128
|
const RUNNING = ''; //chalk.reset.inverse.yellow.bold(RUNNING_TEXT) + ' ';
|
|
101
129
|
|
|
102
130
|
const { flags: parsedFlags } = this.parse(DockerAutoCommand);
|
|
103
|
-
const
|
|
131
|
+
const appLambdaName = parsedFlags.appLambdaName ?? config.app.lambdaName;
|
|
132
|
+
const appName = parsedFlags.appName ?? config.app.name;
|
|
104
133
|
const leaveFiles = parsedFlags.leaveCopy;
|
|
105
|
-
const
|
|
106
|
-
const
|
|
134
|
+
const deployerLambdaName = parsedFlags.deployerLambdaName ?? config.deployer.lambdaName;
|
|
135
|
+
const semVer = parsedFlags.newVersion ?? config.app.semVer;
|
|
136
|
+
const ecrRepo = parsedFlags.repoName ?? config.app.ecrRepoName;
|
|
137
|
+
const staticAssetsPath = parsedFlags.staticAssetsPath ?? config.app.staticAssetsPath;
|
|
138
|
+
const defaultFile = parsedFlags.defaultFile ?? config.app.defaultFile;
|
|
107
139
|
|
|
108
140
|
// Override the config value
|
|
109
|
-
|
|
110
|
-
config.
|
|
111
|
-
config.app.
|
|
141
|
+
config.deployer.lambdaName = deployerLambdaName;
|
|
142
|
+
config.app.lambdaName = appLambdaName;
|
|
143
|
+
config.app.name = appName;
|
|
144
|
+
config.app.semVer = semVer;
|
|
145
|
+
config.app.staticAssetsPath = staticAssetsPath;
|
|
146
|
+
config.app.defaultFile = defaultFile;
|
|
112
147
|
|
|
113
148
|
// Get the account ID and region from STS
|
|
114
149
|
// TODO: Move this to the right place
|
|
@@ -133,7 +168,7 @@ export class DockerAutoCommand extends Command {
|
|
|
133
168
|
config.app.ecrRepoName = `microapps-app-${config.app.name}${Config.envLevel}-repo`;
|
|
134
169
|
}
|
|
135
170
|
|
|
136
|
-
this.VersionAndAlias = createVersions(
|
|
171
|
+
this.VersionAndAlias = createVersions(semVer);
|
|
137
172
|
const versionOnly = { version: this.VersionAndAlias.version };
|
|
138
173
|
|
|
139
174
|
this.FILES_TO_MODIFY = [
|
|
@@ -202,7 +237,7 @@ export class DockerAutoCommand extends Command {
|
|
|
202
237
|
task.title = RUNNING + origTitle;
|
|
203
238
|
|
|
204
239
|
// Confirm the Version Does Not Exist in Published State
|
|
205
|
-
task.output = `Checking if deployed app/version already exists for ${config.app.name}/${
|
|
240
|
+
task.output = `Checking if deployed app/version already exists for ${config.app.name}/${semVer}`;
|
|
206
241
|
ctx.preflightResult = await DeployClient.DeployVersionPreflight({
|
|
207
242
|
config,
|
|
208
243
|
output: (message: string) => (task.output = message),
|
|
@@ -220,7 +255,7 @@ export class DockerAutoCommand extends Command {
|
|
|
220
255
|
const origTitle = task.title;
|
|
221
256
|
task.title = RUNNING + origTitle;
|
|
222
257
|
|
|
223
|
-
task.output = `Invoking serverless next.js build for ${config.app.name}/${
|
|
258
|
+
task.output = `Invoking serverless next.js build for ${config.app.name}/${semVer}`;
|
|
224
259
|
|
|
225
260
|
// Run the serverless next.js build
|
|
226
261
|
await asyncExec('serverless');
|
|
@@ -375,7 +410,11 @@ export class DockerAutoCommand extends Command {
|
|
|
375
410
|
task.title = RUNNING + origTitle;
|
|
376
411
|
|
|
377
412
|
// Call Deployer to Deploy AppName/Version
|
|
378
|
-
await DeployClient.DeployVersion(
|
|
413
|
+
await DeployClient.DeployVersion(
|
|
414
|
+
config,
|
|
415
|
+
'lambda',
|
|
416
|
+
(message: string) => (task.output = message),
|
|
417
|
+
);
|
|
379
418
|
|
|
380
419
|
task.title = origTitle;
|
|
381
420
|
},
|
|
@@ -0,0 +1,302 @@
|
|
|
1
|
+
import 'reflect-metadata';
|
|
2
|
+
import * as util from 'util';
|
|
3
|
+
import * as lambda from '@aws-sdk/client-lambda';
|
|
4
|
+
import * as s3 from '@aws-sdk/client-s3';
|
|
5
|
+
import * as sts from '@aws-sdk/client-sts';
|
|
6
|
+
import { Command, flags as flagsParser } from '@oclif/command';
|
|
7
|
+
import * as path from 'path';
|
|
8
|
+
import { pathExists, createReadStream } from 'fs-extra';
|
|
9
|
+
import { Listr, ListrTask } from 'listr2';
|
|
10
|
+
import { Config, IConfig } from '../config/Config';
|
|
11
|
+
import DeployClient, { IDeployVersionPreflightResult } from '../lib/DeployClient';
|
|
12
|
+
import S3Uploader from '../lib/S3Uploader';
|
|
13
|
+
import S3TransferUtility from '../lib/S3TransferUtility';
|
|
14
|
+
import { Upload } from '@aws-sdk/lib-storage';
|
|
15
|
+
import { contentType } from 'mime-types';
|
|
16
|
+
import { TaskWrapper } from 'listr2/dist/lib/task-wrapper';
|
|
17
|
+
import { DefaultRenderer } from 'listr2/dist/renderer/default.renderer';
|
|
18
|
+
import { createVersions, IVersions } from '../lib/Versions';
|
|
19
|
+
const asyncSetTimeout = util.promisify(setTimeout);
|
|
20
|
+
|
|
21
|
+
const lambdaClient = new lambda.LambdaClient({
|
|
22
|
+
maxAttempts: 8,
|
|
23
|
+
});
|
|
24
|
+
|
|
25
|
+
interface IContext {
|
|
26
|
+
preflightResult: IDeployVersionPreflightResult;
|
|
27
|
+
files: string[];
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
export class PublishCommand extends Command {
|
|
31
|
+
static description = 'Publish arbitrary framework static app - deploy static assets to S3 only.';
|
|
32
|
+
|
|
33
|
+
static examples = [
|
|
34
|
+
`$ microapps-publish publish-static -d microapps-deployer-dev -n 0.0.21 -l microapps-app-release-dev -a release
|
|
35
|
+
✔ Get S3 Temp Credentials [1s]
|
|
36
|
+
✔ Confirm Static Assets Folder Exists [0.0s]
|
|
37
|
+
✔ Copy Static Files to Local Upload Dir [0.0s]
|
|
38
|
+
✔ Enumerate Files to Upload to S3 [0.0s]
|
|
39
|
+
✔ Upload Static Files to S3 [1s]
|
|
40
|
+
✔ Creating MicroApp Application: release [0.0s]
|
|
41
|
+
✔ Creating MicroApp Version: 0.0.21 [1s]
|
|
42
|
+
`,
|
|
43
|
+
];
|
|
44
|
+
|
|
45
|
+
static flags = {
|
|
46
|
+
version: flagsParser.version({
|
|
47
|
+
char: 'v',
|
|
48
|
+
}),
|
|
49
|
+
help: flagsParser.help(),
|
|
50
|
+
deployerLambdaName: flagsParser.string({
|
|
51
|
+
char: 'd',
|
|
52
|
+
multiple: false,
|
|
53
|
+
required: true,
|
|
54
|
+
description: 'Name of the deployer lambda function',
|
|
55
|
+
}),
|
|
56
|
+
newVersion: flagsParser.string({
|
|
57
|
+
char: 'n',
|
|
58
|
+
multiple: false,
|
|
59
|
+
required: true,
|
|
60
|
+
description: 'New semantic version to apply',
|
|
61
|
+
}),
|
|
62
|
+
appName: flagsParser.string({
|
|
63
|
+
char: 'a',
|
|
64
|
+
multiple: false,
|
|
65
|
+
required: false,
|
|
66
|
+
description: 'MicroApps app name',
|
|
67
|
+
}),
|
|
68
|
+
staticAssetsPath: flagsParser.string({
|
|
69
|
+
char: 's',
|
|
70
|
+
multiple: false,
|
|
71
|
+
required: false,
|
|
72
|
+
description:
|
|
73
|
+
'Path to files to be uploaded to S3 static bucket at app/version/ path. Do include app/version/ in path if files are already "rooted" under that path locally.',
|
|
74
|
+
}),
|
|
75
|
+
defaultFile: flagsParser.string({
|
|
76
|
+
char: 'i',
|
|
77
|
+
multiple: false,
|
|
78
|
+
required: false,
|
|
79
|
+
description:
|
|
80
|
+
'Default file to return when the app is loaded via the router without a version (e.g. when app/ is requested).',
|
|
81
|
+
}),
|
|
82
|
+
};
|
|
83
|
+
|
|
84
|
+
private VersionAndAlias: IVersions;
|
|
85
|
+
|
|
86
|
+
async run(): Promise<void> {
|
|
87
|
+
const config = Config.instance;
|
|
88
|
+
|
|
89
|
+
// const RUNNING_TEXT = ' RUNS ';
|
|
90
|
+
// const RUNNING = chalk.reset.inverse.yellow.bold(RUNNING_TEXT) + ' ';
|
|
91
|
+
const RUNNING = ''; //chalk.reset.inverse.yellow.bold(RUNNING_TEXT) + ' ';
|
|
92
|
+
|
|
93
|
+
const { flags: parsedFlags } = this.parse(PublishCommand);
|
|
94
|
+
const appName = parsedFlags.appName ?? config.app.name;
|
|
95
|
+
const deployerLambdaName = parsedFlags.deployerLambdaName ?? config.deployer.lambdaName;
|
|
96
|
+
const semVer = parsedFlags.newVersion ?? config.app.semVer;
|
|
97
|
+
const staticAssetsPath = parsedFlags.staticAssetsPath ?? config.app.staticAssetsPath;
|
|
98
|
+
const defaultFile = parsedFlags.defaultFile ?? config.app.defaultFile;
|
|
99
|
+
|
|
100
|
+
// Override the config value
|
|
101
|
+
config.deployer.lambdaName = deployerLambdaName;
|
|
102
|
+
delete config.app.lambdaName;
|
|
103
|
+
config.app.name = appName;
|
|
104
|
+
config.app.semVer = semVer;
|
|
105
|
+
config.app.staticAssetsPath = staticAssetsPath;
|
|
106
|
+
config.app.defaultFile = defaultFile;
|
|
107
|
+
|
|
108
|
+
// Get the account ID and region from STS
|
|
109
|
+
// TODO: Move this to the right place
|
|
110
|
+
if (config.app.awsAccountID === 0 || config.app.awsRegion === '') {
|
|
111
|
+
const stsClient = new sts.STSClient({
|
|
112
|
+
maxAttempts: 8,
|
|
113
|
+
});
|
|
114
|
+
const stsResponse = await stsClient.send(new sts.GetCallerIdentityCommand({}));
|
|
115
|
+
if (config.app.awsAccountID === 0) {
|
|
116
|
+
config.app.awsAccountID = parseInt(stsResponse.Account, 10);
|
|
117
|
+
}
|
|
118
|
+
if (config.app.awsRegion === '') {
|
|
119
|
+
config.app.awsRegion = stsClient.config.region as string;
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
|
|
123
|
+
this.VersionAndAlias = createVersions(semVer);
|
|
124
|
+
|
|
125
|
+
if (config === undefined) {
|
|
126
|
+
this.error('Failed to load the config file');
|
|
127
|
+
}
|
|
128
|
+
if (config.app.staticAssetsPath === undefined) {
|
|
129
|
+
this.error('StaticAssetsPath must be specified in the config file');
|
|
130
|
+
}
|
|
131
|
+
|
|
132
|
+
//
|
|
133
|
+
// Setup Tasks
|
|
134
|
+
//
|
|
135
|
+
|
|
136
|
+
const tasks = new Listr<IContext>(
|
|
137
|
+
[
|
|
138
|
+
{
|
|
139
|
+
// TODO: Disable this task if no static assets path
|
|
140
|
+
title: 'Get S3 Temp Credentials',
|
|
141
|
+
task: async (ctx, task) => {
|
|
142
|
+
const origTitle = task.title;
|
|
143
|
+
task.title = RUNNING + origTitle;
|
|
144
|
+
|
|
145
|
+
// Confirm the Version Does Not Exist in Published State
|
|
146
|
+
task.output = `Checking if deployed app/version already exists for ${config.app.name}/${semVer}`;
|
|
147
|
+
ctx.preflightResult = await DeployClient.DeployVersionPreflight({
|
|
148
|
+
config,
|
|
149
|
+
output: (message: string) => (task.output = message),
|
|
150
|
+
});
|
|
151
|
+
if (ctx.preflightResult.exists) {
|
|
152
|
+
task.output = `Warning: App/Version already exists: ${config.app.name}/${config.app.semVer}`;
|
|
153
|
+
}
|
|
154
|
+
|
|
155
|
+
task.title = origTitle;
|
|
156
|
+
},
|
|
157
|
+
},
|
|
158
|
+
{
|
|
159
|
+
// TODO: Disable this task if no static assets path
|
|
160
|
+
title: 'Confirm Static Assets Folder Exists',
|
|
161
|
+
task: async (ctx, task) => {
|
|
162
|
+
const origTitle = task.title;
|
|
163
|
+
task.title = RUNNING + origTitle;
|
|
164
|
+
|
|
165
|
+
// Check that Static Assets Folder exists
|
|
166
|
+
if (!(await pathExists(config.app.staticAssetsPath))) {
|
|
167
|
+
this.error(`Static asset path does not exist: ${config.app.staticAssetsPath}`);
|
|
168
|
+
}
|
|
169
|
+
|
|
170
|
+
task.title = origTitle;
|
|
171
|
+
},
|
|
172
|
+
},
|
|
173
|
+
{
|
|
174
|
+
// TODO: Disable this task if no static assets path
|
|
175
|
+
title: 'Copy Static Files to Local Upload Dir',
|
|
176
|
+
task: async (ctx, task) => {
|
|
177
|
+
const origTitle = task.title;
|
|
178
|
+
task.title = RUNNING + origTitle;
|
|
179
|
+
|
|
180
|
+
// Copy files to local dir to be uploaded
|
|
181
|
+
await S3Uploader.CopyToUploadDir(config, ctx.preflightResult.response.s3UploadUrl);
|
|
182
|
+
|
|
183
|
+
task.title = origTitle;
|
|
184
|
+
},
|
|
185
|
+
},
|
|
186
|
+
{
|
|
187
|
+
// TODO: Disable this task if no static assets path
|
|
188
|
+
title: 'Enumerate Files to Upload to S3',
|
|
189
|
+
task: async (ctx, task) => {
|
|
190
|
+
const origTitle = task.title;
|
|
191
|
+
task.title = RUNNING + origTitle;
|
|
192
|
+
|
|
193
|
+
ctx.files = (await S3TransferUtility.GetFiles(S3Uploader.TempDir)) as string[];
|
|
194
|
+
|
|
195
|
+
task.title = origTitle;
|
|
196
|
+
},
|
|
197
|
+
},
|
|
198
|
+
{
|
|
199
|
+
// TODO: Disable this task if no static assets path
|
|
200
|
+
title: 'Upload Static Files to S3',
|
|
201
|
+
task: (ctx, task) => {
|
|
202
|
+
const origTitle = task.title;
|
|
203
|
+
task.title = RUNNING + origTitle;
|
|
204
|
+
|
|
205
|
+
const { bucketName, destinationPrefix } = S3Uploader.ParseUploadPath(
|
|
206
|
+
ctx.preflightResult.response.s3UploadUrl,
|
|
207
|
+
);
|
|
208
|
+
|
|
209
|
+
// Use temp credentials for S3
|
|
210
|
+
const s3Client = new s3.S3Client({
|
|
211
|
+
maxAttempts: 16,
|
|
212
|
+
credentials: {
|
|
213
|
+
accessKeyId: ctx.preflightResult.response.awsCredentials.accessKeyId,
|
|
214
|
+
secretAccessKey: ctx.preflightResult.response.awsCredentials.secretAccessKey,
|
|
215
|
+
sessionToken: ctx.preflightResult.response.awsCredentials.sessionToken,
|
|
216
|
+
},
|
|
217
|
+
});
|
|
218
|
+
|
|
219
|
+
const pathWithoutAppAndVer = path.join(S3Uploader.TempDir, destinationPrefix);
|
|
220
|
+
|
|
221
|
+
const tasks: ListrTask<IContext>[] = ctx.files.map((filePath) => ({
|
|
222
|
+
task: async (ctx: IContext, subtask) => {
|
|
223
|
+
const relFilePath = path.relative(pathWithoutAppAndVer, filePath);
|
|
224
|
+
|
|
225
|
+
const origTitle = relFilePath;
|
|
226
|
+
subtask.title = RUNNING + origTitle;
|
|
227
|
+
|
|
228
|
+
const upload = new Upload({
|
|
229
|
+
client: s3Client,
|
|
230
|
+
leavePartsOnError: false,
|
|
231
|
+
params: {
|
|
232
|
+
Bucket: bucketName,
|
|
233
|
+
Key: path.relative(S3Uploader.TempDir, filePath),
|
|
234
|
+
Body: createReadStream(filePath),
|
|
235
|
+
ContentType: contentType(path.basename(filePath)) || 'application/octet-stream',
|
|
236
|
+
CacheControl: 'max-age=86400; public',
|
|
237
|
+
},
|
|
238
|
+
});
|
|
239
|
+
await upload.done();
|
|
240
|
+
|
|
241
|
+
subtask.title = origTitle;
|
|
242
|
+
},
|
|
243
|
+
}));
|
|
244
|
+
|
|
245
|
+
task.title = origTitle;
|
|
246
|
+
|
|
247
|
+
return task.newListr(tasks, {
|
|
248
|
+
concurrent: 8,
|
|
249
|
+
rendererOptions: {
|
|
250
|
+
clearOutput: false,
|
|
251
|
+
showErrorMessage: true,
|
|
252
|
+
showTimer: true,
|
|
253
|
+
},
|
|
254
|
+
});
|
|
255
|
+
},
|
|
256
|
+
},
|
|
257
|
+
{
|
|
258
|
+
title: `Creating MicroApp Application: ${config.app.name}`,
|
|
259
|
+
task: async (ctx, task) => {
|
|
260
|
+
const origTitle = task.title;
|
|
261
|
+
task.title = RUNNING + origTitle;
|
|
262
|
+
|
|
263
|
+
// Call Deployer to Create App if Not Exists
|
|
264
|
+
await DeployClient.CreateApp(config);
|
|
265
|
+
|
|
266
|
+
task.title = origTitle;
|
|
267
|
+
},
|
|
268
|
+
},
|
|
269
|
+
{
|
|
270
|
+
title: `Creating MicroApp Version: ${config.app.semVer}`,
|
|
271
|
+
task: async (ctx, task) => {
|
|
272
|
+
const origTitle = task.title;
|
|
273
|
+
task.title = RUNNING + origTitle;
|
|
274
|
+
|
|
275
|
+
// Call Deployer to Deploy AppName/Version
|
|
276
|
+
await DeployClient.DeployVersion(
|
|
277
|
+
config,
|
|
278
|
+
'static',
|
|
279
|
+
(message: string) => (task.output = message),
|
|
280
|
+
);
|
|
281
|
+
|
|
282
|
+
task.title = origTitle;
|
|
283
|
+
},
|
|
284
|
+
},
|
|
285
|
+
],
|
|
286
|
+
{
|
|
287
|
+
rendererOptions: {
|
|
288
|
+
showTimer: true,
|
|
289
|
+
},
|
|
290
|
+
},
|
|
291
|
+
);
|
|
292
|
+
|
|
293
|
+
try {
|
|
294
|
+
await tasks.run();
|
|
295
|
+
// this.log(`Published: ${config.app.name}/${config.app.semVer}`);
|
|
296
|
+
} catch (error) {
|
|
297
|
+
this.log(`Caught exception: ${error.message}`);
|
|
298
|
+
} finally {
|
|
299
|
+
await S3Uploader.removeTempDirIfExists();
|
|
300
|
+
}
|
|
301
|
+
}
|
|
302
|
+
}
|
package/src/commands/publish.ts
CHANGED
|
@@ -74,6 +74,20 @@ export class PublishCommand extends Command {
|
|
|
74
74
|
required: false,
|
|
75
75
|
description: 'MicroApps app name',
|
|
76
76
|
}),
|
|
77
|
+
staticAssetsPath: flagsParser.string({
|
|
78
|
+
char: 's',
|
|
79
|
+
multiple: false,
|
|
80
|
+
required: false,
|
|
81
|
+
description:
|
|
82
|
+
'Path to files to be uploaded to S3 static bucket at app/version/ path. Do include app/version/ in path if files are already "rooted" under that path locally.',
|
|
83
|
+
}),
|
|
84
|
+
defaultFile: flagsParser.string({
|
|
85
|
+
char: 'i',
|
|
86
|
+
multiple: false,
|
|
87
|
+
required: false,
|
|
88
|
+
description:
|
|
89
|
+
'Default file to return when the app is loaded via the router without a version (e.g. when app/ is requested).',
|
|
90
|
+
}),
|
|
77
91
|
};
|
|
78
92
|
|
|
79
93
|
private VersionAndAlias: IVersions;
|
|
@@ -90,12 +104,16 @@ export class PublishCommand extends Command {
|
|
|
90
104
|
const appName = parsedFlags.appName ?? config.app.name;
|
|
91
105
|
const deployerLambdaName = parsedFlags.deployerLambdaName ?? config.deployer.lambdaName;
|
|
92
106
|
const semVer = parsedFlags.newVersion ?? config.app.semVer;
|
|
107
|
+
const staticAssetsPath = parsedFlags.staticAssetsPath ?? config.app.staticAssetsPath;
|
|
108
|
+
const defaultFile = parsedFlags.defaultFile ?? config.app.defaultFile;
|
|
93
109
|
|
|
94
110
|
// Override the config value
|
|
95
111
|
config.deployer.lambdaName = deployerLambdaName;
|
|
96
112
|
config.app.lambdaName = appLambdaName;
|
|
97
113
|
config.app.name = appName;
|
|
98
114
|
config.app.semVer = semVer;
|
|
115
|
+
config.app.staticAssetsPath = staticAssetsPath;
|
|
116
|
+
config.app.defaultFile = defaultFile;
|
|
99
117
|
|
|
100
118
|
// Get the account ID and region from STS
|
|
101
119
|
// TODO: Move this to the right place
|
|
@@ -278,7 +296,11 @@ export class PublishCommand extends Command {
|
|
|
278
296
|
task.title = RUNNING + origTitle;
|
|
279
297
|
|
|
280
298
|
// Call Deployer to Deploy AppName/Version
|
|
281
|
-
await DeployClient.DeployVersion(
|
|
299
|
+
await DeployClient.DeployVersion(
|
|
300
|
+
config,
|
|
301
|
+
'lambda',
|
|
302
|
+
(message: string) => (task.output = message),
|
|
303
|
+
);
|
|
282
304
|
|
|
283
305
|
task.title = origTitle;
|
|
284
306
|
},
|
package/src/lib/DeployClient.ts
CHANGED
|
@@ -97,14 +97,16 @@ export default class DeployClient {
|
|
|
97
97
|
*/
|
|
98
98
|
public static async DeployVersion(
|
|
99
99
|
config: IConfig,
|
|
100
|
+
appType: 'lambda' | 'static',
|
|
100
101
|
output: (message: string) => void,
|
|
101
102
|
): Promise<void> {
|
|
102
103
|
const request = {
|
|
103
104
|
type: 'deployVersion',
|
|
105
|
+
appType,
|
|
104
106
|
appName: config.app.name,
|
|
105
107
|
semVer: config.app.semVer,
|
|
106
108
|
defaultFile: config.app.defaultFile,
|
|
107
|
-
lambdaARN: config.app.lambdaARN,
|
|
109
|
+
lambdaARN: appType === 'lambda' ? config.app.lambdaARN : undefined,
|
|
108
110
|
} as IDeployVersionRequest;
|
|
109
111
|
const response = await this._client.send(
|
|
110
112
|
new lambda.InvokeCommand({
|