fix(e2e): move delete of IAM resources to After call

Author: trivikr

features/iam/iam.feature

@@ -7,18 +7,14 @@ Feature: IAM
   Scenario: Users
     Given I have an IAM username "js-test"
     And I create an IAM user with the username
-    And I get the IAM user
     Then the IAM user should exist
-    And I delete the IAM user
 
   Scenario: Roles
     Given I create an IAM role with name prefix "aws-sdk-js"
     Then the IAM role should exist
-    And I delete the IAM role
 
   Scenario: Error handling
     Given I have an IAM username "js-test-dupe"
     And I create an IAM user with the username
     And I create an IAM user with the username
     Then the error code should be "EntityAlreadyExists"
-    And I delete the IAM user

features/iam/step_definitions/iam.js

@@ -1,60 +1,43 @@
-const { Before, Given, Then } = require("@cucumber/cucumber");
+const { After, Before, Given, Then } = require("@cucumber/cucumber");
 
-Before({ tags: "@iam" }, function (scenario, callback) {
+Before({ tags: "@iam" }, function () {
   const { IAM } = require("../../../clients/client-iam");
   this.iam = new IAM({});
-  callback();
 });
 
-Given("I have an IAM username {string}", function (name, callback) {
-  this.iamUserArn = "";
-  this.iamUser = this.uniqueName(name);
-  callback();
-});
-
-Given("I create an IAM user with the username", function (callback) {
-  const world = this;
-  const next = function () {
-    if (world.data) this.iamUserArn = world.data.User.Arn;
-    else this.iamUserArn = null;
-    callback();
-  };
-  next.fail = callback;
-  this.request(
-    "iam",
-    "createUser",
-    {
-      UserName: this.iamUser,
-    },
-    next,
-    false
-  );
+After({ tags: "@iam" }, async function () {
+  if (this.iamUser) {
+    await this.iam.deleteUser({ UserName: this.iamUser });
+    this.iamUser = undefined;
+  }
+  if (this.iamRoleName) {
+    await this.iam.deleteRole({ RoleName: this.iamRoleName });
+    this.iamRoleName = undefined;
+  }
 });
 
-Given("I get the IAM user", function (callback) {
-  this.request("iam", "getUser", { UserName: this.iamUser }, callback);
+Given("I have an IAM username {string}", function (name) {
+  this.iamUser = this.uniqueName(name);
 });
 
-Then("the IAM user should exist", function (callback) {
-  this.assert.equal(this.data.User.UserName, this.iamUser);
-  callback();
+Given("I create an IAM user with the username", async function () {
+  try {
+    const { User } = await this.iam.createUser({ UserName: this.iamUser });
+    this.iamUserArn = User.Arn;
+  } catch (error) {
+    this.error = error;
+  }
 });
 
-Then("I delete the IAM user", function (callback) {
-  this.request(
-    "iam",
-    "deleteUser",
-    {
-      UserName: this.iamUser,
-    },
-    callback
-  );
+Then("the IAM user should exist", async function () {
+  const { User } = await this.iam.getUser({ UserName: this.iamUser });
+  this.assert.equal(User.UserName, this.iamUser);
+  this.assert.equal(User.Arn, this.iamUserArn);
 });
 
-Given("I create an IAM role with name prefix {string}", function (name, callback) {
+Given("I create an IAM role with name prefix {string}", async function (name) {
   this.iamRoleName = this.uniqueName(name);
 
-  const world = this;
   const assumeRolePolicyDocument =
     '{"Version":"2008-10-17","Statement":[' +
     '{"Effect":"Allow","Principal":{"Service":["ec2.amazonaws.com"]},' +
@@ -63,27 +46,11 @@ Given("I create an IAM role with name prefix {string}", function (name, callback
     RoleName: this.iamRoleName,
     AssumeRolePolicyDocument: assumeRolePolicyDocument,
   };
-  const next = function () {
-    world.iamRoleArn = world.data.Role.Arn;
-    callback();
-  };
-  next.fail = callback;
-
-  this.request("iam", "createRole", params, next);
-});
 
-Then("the IAM role should exist", function (callback) {
-  this.assert.compare(this.iamRoleArn.length, ">", 0);
-  callback();
+  await this.iam.createRole(params);
 });
 
-Then("I delete the IAM role", function (callback) {
-  this.request(
-    "iam",
-    "deleteRole",
-    {
-      RoleName: this.iamRoleName,
-    },
-    callback
-  );
+Then("the IAM role should exist", async function () {
+  const { Role } = await this.iam.getRole({ RoleName: this.iamRoleName });
+  this.assert.equal(Role.RoleName, this.iamRoleName);
 });