aws-architect 6.7.55 → 6.7.58

package/CHANGELOG.md

@@ -4,6 +4,8 @@ This is the changelog for [AWS Architect](readme.md).
 ## 6.7 ##
 * Fix handlers for /route and /route/ so that the index.html is always duplicated.
 * Add support for organizational stack set deployment
+* Remove invalid regions from organizational deployment [eu-central-2, ap-south-2, eu-south-2, me-central-1, ap-southeast-4]
+* Support pnpm lock files
 
 ## 6.6 ##
 * Add support to `deleteWebsiteVersion(version)`

package/index.js

@@ -81,9 +81,10 @@ AwsArchitect.prototype.publishLambdaArtifactPromise = AwsArchitect.prototype.Pub
 
   // (default: true) If set to true, will attempt to copy and install packages related to deployment (i.e. package.json for node)
   if (options.autoHandleCompileOfSourceDirectory !== false) {
-    await new LockFinder().findLockFile(this.SourceDirectory).then(lockFile => {
-      return lockFile ? fs.copy(lockFile.file, path.join(tmpDir, path.basename(lockFile.file))) : Promise.resolve();
-    });
+    const lockFile = await new LockFinder().findLockFile(this.SourceDirectory);
+    if (lockFile.file) {
+      await fs.copy(lockFile.file, path.join(tmpDir, path.basename(lockFile.file)));
+    }
 
     try {
       await fs.writeJson(path.join(tmpDir, 'package.json'), this.PackageMetadata);
@@ -91,8 +92,7 @@ AwsArchitect.prototype.publishLambdaArtifactPromise = AwsArchitect.prototype.Pub
       throw { Error: 'Failed writing production package.json file.', Details: error };
     }
 
-    const exists = await fs.pathExists(path.join(tmpDir, 'yarn.lock')).catch(() => false);
-    let cmd = exists ? 'yarn --prod --frozen-lockfile' : 'npm install --production';
+    let cmd = lockFile.command;
     await new Promise((resolve, reject) => {
       /* eslint-disable-next-line no-unused-vars */
       exec(cmd, { cwd: tmpDir }, (error, stdout, stderr) => {

package/lib/CloudFormationDeployer.js

@@ -480,7 +480,7 @@ class CloudFormationDeployer {
     const currentStackData = await this.cloudFormationClient.describeStackSet({ StackSetName: options.stackSetName }).promise().then(data => data.StackSet);
     const rawRegions = await new EC2().describeRegions().promise().then(data => data.Regions.map(r => r.RegionName));
     const newRegions = rawRegions.filter(r => !currentStackData.Regions || !currentStackData.Regions.some(e => e === r))
-    .filter(r => r !== 'eu-central-2');
+    .filter(r => r !== 'eu-central-2' && r !== 'ap-south-2' && r !== 'eu-south-2' && r !== 'me-central-1' && r !== 'ap-southeast-4');
 
     // If the stack already existed, and there are no new regions, all the stacks are updated then check to see if the template matches the new template
     if (stackExists && !newRegions.length) {

package/lib/lockFinder.js

@@ -3,19 +3,27 @@ let path = require('path');
 let fs = require('fs-extra');
 
 module.exports = function LockFinder() {
-  let findLockFile = directory => {
+  let findLockFile = async directory => {
     if (!directory || directory === '/' || directory === '' || directory.match(/^[a-zA-Z]:\\$/)) { return null; }
-	
+
     let yarnLockFile = path.join(directory, 'yarn.lock');
     let packageLockFile = path.join(directory, 'package-lock.json');
-    return fs.pathExists(yarnLockFile)
-    .then(exists => {
-      return exists ? { type: 'yarn', file: yarnLockFile } : fs.pathExists(packageLockFile)
-      .then(npmExists => {
-        return npmExists ? { type: 'npm', file: packageLockFile } : findLockFile(path.join(directory, '..'));
-      });
-    })
-    .catch(() => null);
+    let pnpmLockFile = path.join(directory, 'pnpm-lock.yaml');
+    try {
+      if (await fs.pathExists(yarnLockFile)) {
+        return { type: 'yarn', file: yarnLockFile, command: 'yarn --prod --frozen-lockfile' };
+      }
+      if (await fs.pathExists(packageLockFile)) {
+        return { type: 'npm', file: packageLockFile, command: 'npm install --production' };
+      }
+      if (await fs.pathExists(pnpmLockFile)) {
+        return { type: 'pnpm', file: pnpmLockFile, command: 'pnpm --prod --frozen-lockfile' };
+      }
+
+      return await findLockFile(path.join(directory, '..'));
+    } catch (error) {
+      return { command: 'npm install --production' };
+    }
   };
 
   this.findLockFile = findLockFile;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aws-architect",
-  "version": "6.7.55",
+  "version": "6.7.58",
   "description": "AWS Architect is a node based tool to configure and deploy AWS-based microservices.",
   "main": "index.js",
   "types": "index.d.ts",