aws-architect 6.7.141 → 6.7.143

package/lib/BucketManager.js

@@ -3,6 +3,8 @@ let glob = require('glob');
 let path = require('path');
 const { createHash } = require('crypto');
 const { lookup } = require('mime-types');
+const { S3Client, HeadBucketCommand, CreateBucketCommand, PutPublicAccessBlockCommand, PutBucketLifecycleConfigurationCommand } = require('@aws-sdk/client-s3');
+const { STSClient, GetCallerIdentityCommand } = require('@aws-sdk/client-sts');
 
 const contentTypeMappingConst = {
   '.ico': 'image/x-icon',
@@ -154,43 +156,58 @@ class BucketManager {
   }
 
   async ensureBucketExists(bucket) {
+    const region = this.S3Manager.config.region;
+    const s3Client = new S3Client({ region });
+    const stsClient = new STSClient({ region });
+
+    const { Account: accountId } = await stsClient.send(new GetCallerIdentityCommand({}));
+
+    if (!bucket.includes(accountId) || !bucket.includes(region)) {
+      throw { title: 'Bucket name must include both the AWS account ID and the region', bucket, accountId, region };
+    }
+
     const bucketLifecycleConfigurationParams = {
       Bucket: bucket,
       LifecycleConfiguration: {
         Rules: [{
           ID: 'AwsArchitect-AutoDeleteOldArtifacts',
-          Expiration: {
-            Days: 31
-          },
-          Prefix: '',
-          NoncurrentVersionExpiration: {
-            NoncurrentDays: 5
-          },
-          AbortIncompleteMultipartUpload: {
-            DaysAfterInitiation: 5
-          },
+          Filter: { Prefix: '' },
+          Expiration: { Days: 31 },
+          NoncurrentVersionExpiration: { NoncurrentDays: 5 },
+          AbortIncompleteMultipartUpload: { DaysAfterInitiation: 5 },
           Status: 'Enabled'
         }]
       }
     };
 
     try {
-      await this.S3Manager.headBucket({ Bucket: bucket }).promise();
+      await s3Client.send(new HeadBucketCommand({ Bucket: bucket }));
+      return;
     } catch (error) {
-      if (error.code !== 'NotFound') {
+      if (error.name !== 'NotFound') {
         throw { title: 'Failed to validate deployment bucket is available', error, bucket };
       }
+    }
 
-      const params = { Bucket: bucket };
-      if (this.S3Manager.config.region !== 'us-east-1') {
-        params.CreateBucketConfiguration = { LocationConstraint: this.S3Manager.config.region };
+    const params = { Bucket: bucket };
+    if (region !== 'us-east-1') {
+      params.CreateBucketConfiguration = { LocationConstraint: region };
+    }
+    try {
+      console.log(`[AWS Architect] (S3) - Creating deployment bucket because it does not exist: ${bucket}`);
+      await s3Client.send(new CreateBucketCommand(params));
+    } catch (error) {
+      if (error.name === 'BucketAlreadyExists' || error.name === 'BucketAlreadyOwnedByYou') {
+        return;
       }
-      await this.S3Manager.createBucket(params).promise();
-      await this.S3Manager.putPublicAccessBlock({
-        Bucket: bucket, PublicAccessBlockConfiguration: { BlockPublicAcls: true, BlockPublicPolicy: true, IgnorePublicAcls: true, RestrictPublicBuckets: true }
-      }).promise();
-      await this.S3Manager.putBucketLifecycleConfiguration(bucketLifecycleConfigurationParams).promise();
+      throw error;
     }
+    await s3Client.send(new PutPublicAccessBlockCommand({
+      Bucket: bucket,
+      PublicAccessBlockConfiguration: { BlockPublicAcls: true, BlockPublicPolicy: true, IgnorePublicAcls: true, RestrictPublicBuckets: true },
+      ExpectedBucketOwner: accountId
+    }));
+    await s3Client.send(new PutBucketLifecycleConfigurationCommand(bucketLifecycleConfigurationParams));
   }
 
   // Ensures a path will be in unix format (that is, forward slash), also on Windows systems.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aws-architect",
-  "version": "6.7.141",
+  "version": "6.7.143",
   "description": "AWS Architect is a node based tool to configure and deploy AWS-based microservices.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -19,6 +19,8 @@
   },
   "dependencies": {
     "@aws-sdk/client-cloudformation": "^3.1000.0",
+    "@aws-sdk/client-s3": "^3.1000",
+    "@aws-sdk/client-sts": "^3.1000",
     "archiver": "^5.3.0",
     "body-parser": "^1.18.2",
     "commander": "^2.5.0",