Merge branch 'master' into yori-nuke-s3

aws/ecs_cluster_test.go

@@ -76,6 +76,7 @@ func TestCanListAllEcsClustersOlderThan24hours(t *testing.T) {
 // Test we can nuke all ECS clusters older than 24hrs
 func TestCanNukeAllEcsClustersOlderThan24Hours(t *testing.T) {
 	t.Parallel()
+	t.Skip("Skipping temporarily - will be fixed as part of issue-145")
 
 	awsSession, err := session.NewSession(&awsgo.Config{
 		Region: awsgo.String(region),

aws/s3_test.go

@@ -361,6 +361,12 @@ func testNukeS3Bucket(t *testing.T, args TestNukeS3BucketArgs) {
 		}
 	}
 
+	// Don't remove this.
+	// It ensures that all S3 buckets created as part of this test will be nuked after the test has run.
+	// This is necessary, as some test cases are expected to fail & test that the buckets with invalid args are not nuked.
+	// For more details, look at Github issue-140: https://github.com/gruntwork-io/cloud-nuke/issues/140
+	defer nukeAllS3Buckets(awsParams.awsSession, []*string{aws.String(bucketName)}, 1000)
+
 	// Nuke the test bucket
 	delCount, err := nukeAllS3Buckets(awsParams.awsSession, []*string{aws.String(bucketName)}, args.objectBatchsize)
 	if args.shouldError {