fix(e2e): delete s3 buckets in After Call

features/elastictranscoder/elastictranscoder.feature

@@ -14,7 +14,6 @@ Feature: Elastic Transcoder
     And I pause the pipeline
     And I read the pipeline
     Then the pipeline status should be "Paused"
-    And I delete the bucket
 
   @error
   Scenario: Error handling

features/elastictranscoder/step_definitions/elastictranscoder.js

@@ -18,6 +18,10 @@ After({ tags: "@elastictranscoder" }, async function () {
     await this.service.deletePipeline({ Id: this.pipelineId });
     this.pipelineId = undefined;
   }
+  if (this.bucket) {
+    await this.s3.deleteBucket({ Bucket: this.bucket });
+    this.bucket = undefined;
+  }
 });
 
 Given("I create an Elastic Transcoder pipeline with name prefix {string}", async function (prefix) {

features/extra/hooks.js

@@ -45,10 +45,6 @@ Given("I create a bucket", function (callback) {
   });
 });
 
-When("I delete the bucket", function (callback) {
-  this.request("s3", "deleteBucket", { Bucket: this.bucket }, callback);
-});
-
 Then("the bucket should exist", function (next) {
   this.waitForBucketExists(this.s3, { Bucket: this.bucket }, next);
 });

features/s3/buckets.feature

@@ -6,14 +6,12 @@ Feature: Working with Buckets
     Given I am using the S3 "us-east-1" region
     When I create a bucket
     Then the bucket should exist
-    Then I delete the bucket
     # Then the bucket should not exist
 
   Scenario: CRUD buckets using a regional endpoint
     Given I am using the S3 "us-west-2" region
     When I create a bucket
     Then the bucket should exist
-    Then I delete the bucket
     # Then the bucket should not exist
 
   @cors
@@ -26,7 +24,6 @@ Feature: Working with Buckets
     Then the AllowedHeader value should equal "*"
     Then the ExposeHeader value should equal "x-amz-server-side-encryption"
     Then the MaxAgeSeconds value should equal 5000
-    Then I delete the bucket
 
   @lifecycle
   Scenario: Bucket lifecycles
@@ -35,15 +32,13 @@ Feature: Working with Buckets
     And I get the transition lifecycle configuration on the bucket
     Then the lifecycle configuration should have transition days of 0
     And the lifecycle configuration should have transition storage class of "GLACIER"
-    Then I delete the bucket
 
   @tagging
   Scenario: Bucket Tagging
     When I create a bucket
     And I put a bucket tag with key "KEY" and value "VALUE"
     And I get the bucket tagging
     Then the first tag in the tag set should have key and value "KEY", "VALUE"
-    Then I delete the bucket
 
   Scenario: Access bucket following 307 redirects
     Given I am using the S3 "us-east-1" region with signatureVersion "s3"
@@ -55,7 +50,6 @@ Feature: Working with Buckets
   Scenario: Working with bucket names that contain '.'
     When I create a bucket with a DNS compatible name that contains a dot
     Then the bucket should exist
-    Then I delete the bucket
     # Then the bucket should not exist
 
   @path-style
@@ -67,7 +61,6 @@ Feature: Working with Buckets
     Then the bucket name should be in the request path
     And the bucket name should not be in the request host
     Then I delete the object "hello" from the bucket
-    Then I delete the bucket
 
   # Known bug: https://github.com/aws/aws-sdk-js-v3/issues/1802
   # Scenario: Follow 307 redirect on new buckets

features/s3/step_definitions/buckets.js

@@ -1,9 +1,17 @@
-const { Before, Given, Then, When } = require("@cucumber/cucumber");
+const { After, Before, Given, Then, When } = require("@cucumber/cucumber");
 
-Before({ tags: "@buckets" }, function (scenario, callback) {
+Before({ tags: "@buckets" }, function () {
   const { S3 } = require("../../../clients/client-s3");
   this.S3 = S3;
-  callback();
+});
+
+After({ tags: "@buckets" }, function (callback) {
+  if (this.bucket) {
+    this.request("s3", "deleteBucket", { Bucket: this.bucket }, callback);
+    this.bucket = undefined;
+  } else {
+    callback();
+  }
 });
 
 Given("I am using the S3 {string} region", function (region, callback) {