aws-architect 6.7.67 → 6.7.70

package/lib/BucketManager.js

@@ -42,8 +42,6 @@ class BucketManager {
       const fileUrl = this.unixify(path.join(version, relativePath));
       const fileData = await fs.readFile(file);
 
-      await this.ensureBucketExists(this.Bucket);
-
       const putObjectParams = {
         Bucket: this.Bucket,
         Key: fileUrl,
@@ -156,6 +154,24 @@ class BucketManager {
   }
 
   async ensureBucketExists(bucket) {
+    const bucketLifecycleConfigurationParams = {
+      Bucket: bucket,
+      LifecycleConfiguration: {
+        Rules: [{
+          ID: 'AutoDeleteOldArtifacts',
+          Expiration: {
+            Days: 365
+          },
+          NoncurrentVersionExpiration: {
+            NoncurrentDays: 5
+          },
+          AbortIncompleteMultipartUpload: {
+            DaysAfterInitiation: 5
+          },
+          Status: 'Enabled'
+        }]
+      }
+    };
     try {
       await this.S3Manager.headBucket({ Bucket: bucket }).promise();
     } catch (error) {
@@ -163,7 +179,7 @@ class BucketManager {
         throw { title: 'Failed to validate deployment bucket is available', error, bucket };
       }
 
-      const params = { Bucket: bucket, ObjectOwnership: 'BucketOwnerEnforced' };
+      const params = { Bucket: bucket };
       if (this.S3Manager.config.region !== 'us-east-1') {
         params.CreateBucketConfiguration = { LocationConstraint: this.S3Manager.config.region };
       }
@@ -172,6 +188,7 @@ class BucketManager {
         Bucket: bucket, PublicAccessBlockConfiguration: { BlockPublicAcls: true, BlockPublicPolicy: true, IgnorePublicAcls: true, RestrictPublicBuckets: true }
       }).promise();
     }
+    await this.S3Manager.putBucketLifecycleConfiguration(bucketLifecycleConfigurationParams).promise();
   }
 
   // Ensures a path will be in unix format (that is, forward slash), also on Windows systems.

package/lib/CloudFormationDeployer.js

@@ -115,14 +115,29 @@ class CloudFormationDeployer {
           }
           maxErrors += 1;
         });
-      }).then(stackStatus => {
+      }).then(async stackStatus => {
         console.log(`Current status of stack ${stackName} is ${stackStatus}.`);
         if (stackStatus === 'REVIEW_IN_PROGRESS') {
           throw { error: 'Current status of the stack has failed', status: stackStatus };
         }
 
         if (!allowUpdateRollback && stackStatus === 'UPDATE_ROLLBACK_COMPLETE') {
-          throw { title: 'Current stack status is failure', status: stackStatus };
+          const eventsResponse = await this.cloudFormationClient.describeStackEvents({ StackName: stackName }).promise();
+          const failureStackEventStatuses = {
+            CREATE_FAILED: true,
+            UPDATE_FAILED: true,
+            DELETE_FAILED: true,
+            IMPORT_FAILED: true,
+            IMPORT_ROLLBACK_FAILED: true,
+            UPDATE_ROLLBACK_FAILED: true,
+            ROLLBACK_FAILED: true
+          };
+          const mappedResults = eventsResponse.StackEvents.filter(event => failureStackEventStatuses[event.ResourceStatus]).map(result => ({
+            cloudFormationResourceName: result.LogicalResourceId, awsResourceId: result.PhysicalResourceId, error: result.ResourceStatusReason
+          }));
+          console.error('Stack status indicates failure because of the following events: ', mappedResults);
+
+          throw { title: 'Deployment to the stack failed.', status: stackStatus, code: stackStatus };
         }
 
         if (stackStatus.match(/PROGRESS$/i)) {
@@ -267,6 +282,9 @@ class CloudFormationDeployer {
 
       return stackData.Stacks[0];
     } catch (error) {
+      if (error.code === 'UPDATE_ROLLBACK_COMPLETE') {
+        throw error;
+      }
       if (error.code === 'ValidationError' || error.code === 'MultipleValidationErrors' || error.code === 'InvalidParameterType') {
         throw error;
       }

package/package.json

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