@goldstack/template-nextjs 0.3.61 → 0.3.65

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;AAU/E,UAAU,kBAAkB;IAC1B,UAAU,EAAE,gBAAgB,CAAC;IAC7B,eAAe,EAAE,eAAe,CAAC;CAClC;AAED,eAAO,MAAM,gBAAgB,WACnB,kBAAkB,KACzB,QAAQ,IAAI,CA0Gd,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;AAU/E,UAAU,kBAAkB;IAC1B,UAAU,EAAE,gBAAgB,CAAC;IAC7B,eAAe,EAAE,eAAe,CAAC;CAClC;AAED,eAAO,MAAM,gBAAgB,WACnB,kBAAkB,KACzB,QAAQ,IAAI,CAmId,CAAC"}
@@ -53,16 +53,39 @@ const deployEdgeLambda = async (params) => {
53
53
  });
54
54
  await (0, utils_sh_1.rmSafe)(targetArchive);
55
55
  await (0, utils_sh_1.zip)({ directory: lambdaPackageDir, target: targetArchive });
56
+ const credentials = await (0, infra_aws_1.getAWSUser)(params.deployment.awsUser);
57
+ const functionName = (0, infra_1.readTerraformStateVariable)(params.deploymentState, 'edge_function_name');
56
58
  const deployResult = (0, utils_aws_cli_1.awsCli)({
57
- credentials: await (0, infra_aws_1.getAWSUser)(params.deployment.awsUser),
59
+ credentials,
58
60
  region: 'us-east-1',
59
- command: `lambda update-function-code --function-name ${(0, infra_1.readTerraformStateVariable)(params.deploymentState, 'edge_function_name')} --zip-file fileb://${targetArchive} --publish`,
61
+ command: `lambda update-function-code --function-name ${functionName} --zip-file fileb://${targetArchive} --publish`,
60
62
  });
61
63
  await (0, utils_sh_1.rmSafe)(targetArchive);
62
64
  const { FunctionArn } = JSON.parse(deployResult);
63
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
+ }
81
+ // Add a wait since there sometimes appear to be race conditions
82
+ // CF thinking the lambda is not in active state
83
+ // notwithstanding the above check
84
+ await new Promise((resolve) => {
85
+ setTimeout(() => resolve(), 10000);
86
+ });
64
87
  const cfDistributionResult = (0, utils_aws_cli_1.awsCli)({
65
- credentials: await (0, infra_aws_1.getAWSUser)(params.deployment.awsUser),
88
+ credentials,
66
89
  region: 'us-east-1',
67
90
  command: `cloudfront get-distribution-config --id ${(0, infra_1.readTerraformStateVariable)(params.deploymentState, 'website_cdn_root_id')}`,
68
91
  options: { silent: true },
@@ -1 +1 @@
1
- {"version":3,"file":"edgeLambdaDeploy.js","sourceRoot":"","sources":["../../src/edgeLambdaDeploy.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"edgeLambdaDeploy.js","sourceRoot":"","sources":["../../src/edgeLambdaDeploy.ts"],"names":[],"mappings":";;;;;;AACA,oDAAkD;AAClD,4CAA+E;AAC/E,kDAA0E;AAC1E,4DAAkD;AAElD,gDAAwB;AACxB,gDAA4B;AAC5B,2DAAwD;AAExD,MAAM,IAAI,GAAG,cAAI,CAAC,SAAS,CAAC,cAAQ,CAAC,CAAC;AAO/B,MAAM,gBAAgB,GAAG,KAAK,EACnC,MAA0B,EACX,EAAE;IACjB,MAAM,aAAa,GAAG,YAAY,CAAC;IACnC,MAAM,eAAe,GAAG,sBAAsB,CAAC;IAC/C,MAAM,iBAAiB,GAAG,2BAA2B,CAAC;IACtD,MAAM,gBAAgB,GAAG,oBAAoB,CAAC;IAE9C,gEAAgE;IAChE,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,eAAI,EAAC,8BAA8B,CAAC,CAAC,CAAC;IAExE,sCAAsC;IACtC,MAAM,aAAa,GAAG,cAAc,CAAC,aAAa,CAAC;IACnD,MAAM,aAAa,GAAa,MAAM,IAAI,CAAC,mBAAmB,CAAC,CAAC;IAChE,MAAM,2BAA2B,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QAC9D,MAAM,GAAG,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC7B,GAAG,CAAC,KAAK,EAAE,CAAC;QACZ,MAAM,cAAc,GAAG,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACrC,OAAO,cAAc,CAAC;IACxB,CAAC,CAAC,CAAC;IACH,MAAM,6BAA6B,GAAG,2BAA2B,CAAC,GAAG,CACnE,CAAC,KAAK,EAAE,EAAE;QACR,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC/B,KAAK,CAAC,GAAG,EAAE,CAAC;QACZ,MAAM,gBAAgB,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACzC,OAAO,gBAAgB,CAAC;IAC1B,CAAC,CACF,CAAC;IAEF,MAAM,YAAY,GAAG,6BAA6B,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACjE,IAAI,EAAE,GAAG,GAAG,KAAK;QACjB,KAAK,EAAE,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG;KAC7C,CAAC,CAAC,CAAC;IAEJ,cAAc,CAAC,aAAa,GAAG,CAAC,GAAG,YAAY,EAAE,GAAG,aAAa,CAAC,CAAC;IACnE,2DAA2D;IAC3D,MAAM,IAAA,iBAAM,EAAC,GAAG,eAAe,sBAAsB,CAAC,CAAC;IACvD,IAAA,gBAAK,EACH,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC,EACvC,GAAG,eAAe,sBAAsB,CACzC,CAAC;IACF,MAAM,IAAA,iBAAM,EAAC,GAAG,iBAAiB,sBAAsB,CAAC,CAAC;IACzD,IAAA,aAAE,EACA,IAAI,EACJ,GAAG,eAAe,sBAAsB,EACxC,GAAG,iBAAiB,sBAAsB,CAC3C,CAAC;IAEF,yCAAyC;IAEzC,MAAM,IAAA,iBAAM,EAAC,gBAAgB,CAAC,CAAC;IAC/B,IAAA,gBAAK,EAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;IAE9B,MAAM,IAAA,qCAAiB,EAAC;QACtB,UAAU,EAAE,GAAG,iBAAiB,WAAW;QAC3C,QAAQ,EAAE,GAAG,gBAAgB,WAAW;KACzC,CAAC,CAAC;IAEH,MAAM,IAAA,iBAAM,EAAC,aAAa,CAAC,CAAC;IAC5B,MAAM,IAAA,cAAG,EAAC,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,CAAC;IAElE,MAAM,WAAW,GAAG,MAAM,IAAA,sBAAU,EAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IAChE,MAAM,YAAY,GAAG,IAAA,kCAA0B,EAC7C,MAAM,CAAC,eAAe,EACtB,oBAAoB,CACrB,CAAC;IACF,MAAM,YAAY,GAAG,IAAA,sBAAM,EAAC;QAC1B,WAAW;QACX,MAAM,EAAE,WAAW;QACnB,OAAO,EAAE,+CAA+C,YAAY,uBAAuB,aAAa,YAAY;KACrH,CAAC,CAAC;IACH,MAAM,IAAA,iBAAM,EAAC,aAAa,CAAC,CAAC;IAE5B,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IAEjD,MAAM,YAAY,GAAG,GAAG,WAAW,EAAE,CAAC;IAEtC,IAAI,OAAO,GAAG,CAAC,CAAC;IAChB,IAAI,KAAK,GAAG,EAAE,CAAC;IACf,OAAO,OAAO,GAAG,EAAE,IAAI,KAAK,KAAK,QAAQ,EAAE;QACzC,MAAM,GAAG,GAAG,IAAA,sBAAM,EAAC;YACjB,WAAW;YACX,MAAM,EAAE,WAAW;YACnB,OAAO,EAAE,uCAAuC,YAAY,EAAE;SAC/D,CAAC,CAAC;QACH,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC7B,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC;QACjC,OAAO,EAAE,CAAC;KACX;IACD,IAAI,OAAO,IAAI,EAAE,EAAE;QACjB,MAAM,IAAI,KAAK,CAAC,gCAAgC,KAAK,oBAAoB,CAAC,CAAC;KAC5E;IAED,gEAAgE;IAChE,gDAAgD;IAChD,kCAAkC;IAClC,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;QAClC,UAAU,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,EAAE,KAAK,CAAC,CAAC;IACrC,CAAC,CAAC,CAAC;IAEH,MAAM,oBAAoB,GAAG,IAAA,sBAAM,EAAC;QAClC,WAAW;QACX,MAAM,EAAE,WAAW;QACnB,OAAO,EAAE,2CAA2C,IAAA,kCAA0B,EAC5E,MAAM,CAAC,eAAe,EACtB,qBAAqB,CACtB,EAAE;QACH,OAAO,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;KAC1B,CAAC,CAAC;IAEH,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;IAExD,MAAM,IAAI,GAAG,cAAc,CAAC,IAAI,CAAC;IACjC,MAAM,0BAA0B,GAC9B,cAAc,CAAC,kBAAkB,CAAC,oBAAoB;SACnD,0BAA0B,CAAC,KAAK,CAAC;IACtC,0BAA0B,CAAC,CAAC,CAAC,CAAC,iBAAiB,GAAG,YAAY,CAAC;IAE/D,MAAM,IAAA,iBAAM,EAAC,gBAAgB,CAAC,CAAC;IAC/B,IAAA,gBAAK,EACH,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,kBAAkB,EAAE,IAAI,EAAE,CAAC,CAAC,EAC1D,gBAAgB,CACjB,CAAC;IACF,IAAA,sBAAM,EAAC;QACL,WAAW,EAAE,MAAM,IAAA,sBAAU,EAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC;QACxD,MAAM,EAAE,WAAW;QACnB,OAAO,EAAE,uCAAuC,IAAA,kCAA0B,EACxE,MAAM,CAAC,eAAe,EACtB,qBAAqB,CACtB,yDAAyD,IAAI,EAAE;QAChE,OAAO,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;KAC1B,CAAC,CAAC;IACH,MAAM,IAAA,iBAAM,EAAC,gBAAgB,CAAC,CAAC;AACjC,CAAC,CAAC;AArIW,QAAA,gBAAgB,oBAqI3B"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@goldstack/template-nextjs",
3
- "version": "0.3.61",
3
+ "version": "0.3.65",
4
4
  "description": "Building blocks for deploying Next.js applications to AWS using S3 and CloudFront",
5
5
  "keywords": [
6
6
  "goldstack",
@@ -48,27 +48,27 @@
48
48
  "version:apply:force": "yarn version $@ && yarn version apply"
49
49
  },
50
50
  "dependencies": {
51
- "@goldstack/infra": "0.3.21",
52
- "@goldstack/infra-aws": "0.3.25",
53
- "@goldstack/template-static-website-aws": "0.3.59",
54
- "@goldstack/utils-aws-cli": "0.3.30",
55
- "@goldstack/utils-cli": "0.2.7",
56
- "@goldstack/utils-config": "0.3.20",
57
- "@goldstack/utils-log": "0.2.8",
58
- "@goldstack/utils-package": "0.3.21",
59
- "@goldstack/utils-package-config": "0.3.21",
60
- "@goldstack/utils-sh": "0.4.19",
61
- "@goldstack/utils-template": "0.3.21",
62
- "@goldstack/utils-terraform": "0.3.31",
51
+ "@goldstack/infra": "0.3.22",
52
+ "@goldstack/infra-aws": "0.3.27",
53
+ "@goldstack/template-static-website-aws": "0.3.61",
54
+ "@goldstack/utils-aws-cli": "0.3.32",
55
+ "@goldstack/utils-cli": "0.2.8",
56
+ "@goldstack/utils-config": "0.3.21",
57
+ "@goldstack/utils-log": "0.2.9",
58
+ "@goldstack/utils-package": "0.3.22",
59
+ "@goldstack/utils-package-config": "0.3.22",
60
+ "@goldstack/utils-sh": "0.4.20",
61
+ "@goldstack/utils-template": "0.3.22",
62
+ "@goldstack/utils-terraform": "0.3.33",
63
63
  "glob": "^7.1.6",
64
- "source-map-support": "^0.5.20",
64
+ "source-map-support": "^0.5.21",
65
65
  "webpack": "4.43.0",
66
66
  "yargs": "^15.4.1"
67
67
  },
68
68
  "devDependencies": {
69
69
  "@goldstack/utils-docs-cli": "0.3.11",
70
- "@goldstack/utils-git": "0.1.28",
71
- "@goldstack/utils-package-config-generate": "0.2.7",
70
+ "@goldstack/utils-git": "0.1.29",
71
+ "@goldstack/utils-package-config-generate": "0.2.8",
72
72
  "@types/glob": "^7.1.3",
73
73
  "@types/jest": "^27.0.2",
74
74
  "@types/node": "^16.11.0",