fix(e2e): move deletion of sqs queues to After call (#3948)

Author: trivikr

features/sqs/messages.feature

@@ -10,12 +10,10 @@ Feature: SQS Messages
     Then the result should include a message ID
     And the result should have an MD5 digest of "eb61eead90e3b899c6bcbe27ac581660"
     And I should eventually be able to receive "HELLO" from the queue
-    Then I delete the SQS queue
 
   Scenario: Binary payloads
     Given I create a queue with the prefix name "aws-js-sdk"
     When I send the message "HELLO" with a binary attribute
     Then the result should include a message ID
     And the result should have an MD5 digest of "eb61eead90e3b899c6bcbe27ac581660"
     And I should eventually be able to receive "HELLO" from the queue with a binary attribute
-    Then I delete the SQS queue

features/sqs/queues.feature

@@ -8,5 +8,3 @@ Feature: SQS Queues
     Given I create a queue with the prefix name "aws-js-sdk"
     And I create a queue with the prefix name "aws-js-sdk"
     Then list queues should eventually return the queue urls
-    Then I delete the SQS queue
-    Then I delete the SQS queue

features/sqs/step_definitions/queues.js

@@ -1,11 +1,10 @@
 const { Given, Then } = require("@cucumber/cucumber");
 
-Given("I create a queue with the prefix name {string}", function (prefix, callback) {
+Given("I create a queue with the prefix name {string}", async function (prefix) {
   const name = this.uniqueName(prefix);
-  this.request(null, "createQueue", { QueueName: name }, callback, function () {
-    this.queueUrl = this.data.QueueUrl;
-    this.createdQueues.push(this.queueUrl);
-  });
+  const response = await this.service.createQueue({ QueueName: name });
+  this.queueUrl = response.QueueUrl;
+  this.createdQueues.push(this.queueUrl);
 });
 
 Then("list queues should eventually return the queue urls", function (callback) {
@@ -29,8 +28,3 @@ Then("list queues should eventually return the queue urls", function (callback)
     { maxTime: 60 }
   );
 });
-
-Then("I delete the SQS queue", function (callback) {
-  const url = this.createdQueues.pop();
-  this.request(null, "deleteQueue", { QueueUrl: url }, callback);
-});

features/sqs/step_definitions/sqs.js

@@ -1,10 +1,13 @@
-const { Before } = require("@cucumber/cucumber");
+const { Before, After } = require("@cucumber/cucumber");
 
-Before({ tags: "@sqs" }, function (scenario, callback) {
+Before({ tags: "@sqs" }, function () {
   const { SQS } = require("../../../clients/client-sqs");
-  this.service = new SQS({
-    region: "us-east-1",
-  });
+  this.service = new SQS({});
   this.createdQueues = [];
-  callback();
+});
+
+After({ tags: "@sqs" }, async function () {
+  for (const queueUrl of this.createdQueues) {
+    await this.service.deleteQueue({ QueueUrl: queueUrl });
+  }
 });