@goldstack/template-nextjs 0.3.65 → 0.3.69
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"edgeLambdaDeploy.d.ts","sourceRoot":"","sources":["../../src/edgeLambdaDeploy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD,OAAO,EAA8B,eAAe,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"edgeLambdaDeploy.d.ts","sourceRoot":"","sources":["../../src/edgeLambdaDeploy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD,OAAO,EAA8B,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAY/E,UAAU,kBAAkB;IAC1B,UAAU,EAAE,gBAAgB,CAAC;IAC7B,eAAe,EAAE,eAAe,CAAC;CAClC;AAED,eAAO,MAAM,gBAAgB,WACnB,kBAAkB,KACzB,QAAQ,IAAI,CAyHd,CAAC"}
|
|
@@ -11,6 +11,7 @@ const utils_aws_cli_1 = require("@goldstack/utils-aws-cli");
|
|
|
11
11
|
const util_1 = __importDefault(require("util"));
|
|
12
12
|
const glob_1 = __importDefault(require("glob"));
|
|
13
13
|
const edgeLambdaPackage_1 = require("./edgeLambdaPackage");
|
|
14
|
+
const utils_aws_lambda_1 = require("@goldstack/utils-aws-lambda");
|
|
14
15
|
const glob = util_1.default.promisify(glob_1.default);
|
|
15
16
|
const deployEdgeLambda = async (params) => {
|
|
16
17
|
const targetArchive = 'lambda.zip';
|
|
@@ -51,40 +52,30 @@ const deployEdgeLambda = async (params) => {
|
|
|
51
52
|
sourceFile: `${lambdaCompiledDir}lambda.js`,
|
|
52
53
|
destFile: `${lambdaPackageDir}lambda.js`,
|
|
53
54
|
});
|
|
54
|
-
await (0, utils_sh_1.rmSafe)(targetArchive);
|
|
55
|
-
await (0, utils_sh_1.zip)({ directory: lambdaPackageDir, target: targetArchive });
|
|
56
|
-
const credentials = await (0, infra_aws_1.getAWSUser)(params.deployment.awsUser);
|
|
57
55
|
const functionName = (0, infra_1.readTerraformStateVariable)(params.deploymentState, 'edge_function_name');
|
|
58
|
-
const
|
|
56
|
+
const credentials = await (0, infra_aws_1.getAWSUser)(params.deployment.awsUser);
|
|
57
|
+
const deployResult = await (0, utils_aws_lambda_1.deployFunction)({
|
|
58
|
+
targetArchiveName: targetArchive,
|
|
59
|
+
lambdaPackageDir,
|
|
60
|
+
functionName,
|
|
61
|
+
awsCredentials: credentials,
|
|
62
|
+
region: 'us-east-1',
|
|
63
|
+
});
|
|
64
|
+
const { FunctionArn } = deployResult;
|
|
65
|
+
const publishResults = await (0, utils_aws_cli_1.awsCli)({
|
|
59
66
|
credentials,
|
|
60
67
|
region: 'us-east-1',
|
|
61
|
-
command: `lambda
|
|
68
|
+
command: `lambda publish-version --function-name ${functionName}`,
|
|
62
69
|
});
|
|
63
|
-
|
|
64
|
-
const {
|
|
65
|
-
const qualifiedArn = `${FunctionArn}`;
|
|
66
|
-
let counter = 0;
|
|
67
|
-
let state = '';
|
|
68
|
-
while (counter < 20 && state !== 'Active') {
|
|
69
|
-
const res = (0, utils_aws_cli_1.awsCli)({
|
|
70
|
-
credentials,
|
|
71
|
-
region: 'us-east-1',
|
|
72
|
-
command: `lambda get-function --function-name ${functionName}`,
|
|
73
|
-
});
|
|
74
|
-
const data = JSON.parse(res);
|
|
75
|
-
state = data.Configuration.State;
|
|
76
|
-
counter++;
|
|
77
|
-
}
|
|
78
|
-
if (counter >= 20) {
|
|
79
|
-
throw new Error(`Function was still in state '${state}' after deployment`);
|
|
80
|
-
}
|
|
70
|
+
const { Version } = JSON.parse(publishResults);
|
|
71
|
+
const qualifiedArn = `${FunctionArn}:${Version}`;
|
|
81
72
|
// Add a wait since there sometimes appear to be race conditions
|
|
82
73
|
// CF thinking the lambda is not in active state
|
|
83
74
|
// notwithstanding the above check
|
|
84
75
|
await new Promise((resolve) => {
|
|
85
76
|
setTimeout(() => resolve(), 10000);
|
|
86
77
|
});
|
|
87
|
-
const cfDistributionResult = (0, utils_aws_cli_1.awsCli)({
|
|
78
|
+
const cfDistributionResult = await (0, utils_aws_cli_1.awsCli)({
|
|
88
79
|
credentials,
|
|
89
80
|
region: 'us-east-1',
|
|
90
81
|
command: `cloudfront get-distribution-config --id ${(0, infra_1.readTerraformStateVariable)(params.deploymentState, 'website_cdn_root_id')}`,
|
|
@@ -94,11 +85,11 @@ const deployEdgeLambda = async (params) => {
|
|
|
94
85
|
const eTag = cfDistribution.ETag;
|
|
95
86
|
const lambdaFunctionAssociations = cfDistribution.DistributionConfig.DefaultCacheBehavior
|
|
96
87
|
.LambdaFunctionAssociations.Items;
|
|
97
|
-
lambdaFunctionAssociations[0].LambdaFunctionARN = qualifiedArn
|
|
88
|
+
lambdaFunctionAssociations[0].LambdaFunctionARN = `${qualifiedArn}`;
|
|
98
89
|
await (0, utils_sh_1.rmSafe)('./dist/cf.json');
|
|
99
90
|
(0, utils_sh_1.write)(JSON.stringify(cfDistribution.DistributionConfig, null, 2), './dist/cf.json');
|
|
100
|
-
(0, utils_aws_cli_1.awsCli)({
|
|
101
|
-
credentials:
|
|
91
|
+
await (0, utils_aws_cli_1.awsCli)({
|
|
92
|
+
credentials: credentials,
|
|
102
93
|
region: 'us-east-1',
|
|
103
94
|
command: `cloudfront update-distribution --id ${(0, infra_1.readTerraformStateVariable)(params.deploymentState, 'website_cdn_root_id')} --distribution-config file://dist/cf.json --if-match ${eTag}`,
|
|
104
95
|
options: { silent: true },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"edgeLambdaDeploy.js","sourceRoot":"","sources":["../../src/edgeLambdaDeploy.ts"],"names":[],"mappings":";;;;;;AACA,oDAAkD;AAClD,4CAA+E;AAC/E,kDAA0E;AAC1E,4DAAkD;
|
|
1
|
+
{"version":3,"file":"edgeLambdaDeploy.js","sourceRoot":"","sources":["../../src/edgeLambdaDeploy.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@goldstack/template-nextjs",
|
|
3
|
-
"version": "0.3.
|
|
3
|
+
"version": "0.3.69",
|
|
4
4
|
"description": "Building blocks for deploying Next.js applications to AWS using S3 and CloudFront",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"goldstack",
|
|
@@ -48,18 +48,19 @@
|
|
|
48
48
|
"version:apply:force": "yarn version $@ && yarn version apply"
|
|
49
49
|
},
|
|
50
50
|
"dependencies": {
|
|
51
|
-
"@goldstack/infra": "0.3.
|
|
52
|
-
"@goldstack/infra-aws": "0.3.
|
|
53
|
-
"@goldstack/template-static-website-aws": "0.3.
|
|
54
|
-
"@goldstack/utils-aws-cli": "0.3.
|
|
51
|
+
"@goldstack/infra": "0.3.24",
|
|
52
|
+
"@goldstack/infra-aws": "0.3.29",
|
|
53
|
+
"@goldstack/template-static-website-aws": "0.3.64",
|
|
54
|
+
"@goldstack/utils-aws-cli": "0.3.35",
|
|
55
|
+
"@goldstack/utils-aws-lambda": "0.1.3",
|
|
55
56
|
"@goldstack/utils-cli": "0.2.8",
|
|
56
|
-
"@goldstack/utils-config": "0.3.
|
|
57
|
+
"@goldstack/utils-config": "0.3.23",
|
|
57
58
|
"@goldstack/utils-log": "0.2.9",
|
|
58
|
-
"@goldstack/utils-package": "0.3.
|
|
59
|
-
"@goldstack/utils-package-config": "0.3.
|
|
60
|
-
"@goldstack/utils-sh": "0.4.
|
|
61
|
-
"@goldstack/utils-template": "0.3.
|
|
62
|
-
"@goldstack/utils-terraform": "0.3.
|
|
59
|
+
"@goldstack/utils-package": "0.3.24",
|
|
60
|
+
"@goldstack/utils-package-config": "0.3.24",
|
|
61
|
+
"@goldstack/utils-sh": "0.4.22",
|
|
62
|
+
"@goldstack/utils-template": "0.3.24",
|
|
63
|
+
"@goldstack/utils-terraform": "0.3.36",
|
|
63
64
|
"glob": "^7.1.6",
|
|
64
65
|
"source-map-support": "^0.5.21",
|
|
65
66
|
"webpack": "4.43.0",
|
|
@@ -68,7 +69,7 @@
|
|
|
68
69
|
"devDependencies": {
|
|
69
70
|
"@goldstack/utils-docs-cli": "0.3.11",
|
|
70
71
|
"@goldstack/utils-git": "0.1.29",
|
|
71
|
-
"@goldstack/utils-package-config-generate": "0.2.
|
|
72
|
+
"@goldstack/utils-package-config-generate": "0.2.9",
|
|
72
73
|
"@types/glob": "^7.1.3",
|
|
73
74
|
"@types/jest": "^27.0.2",
|
|
74
75
|
"@types/node": "^16.11.0",
|