Porting Cloudformation integration test to use waiter test util.

Author: kiiadi

services/cloudformation/src/it/java/software/amazon/awssdk/services/cloudformation/SendEmptyListIntegrationTest.java

@@ -19,20 +19,21 @@
 import static org.hamcrest.Matchers.not;
 import static org.junit.Assert.assertThat;
 
+import java.time.Duration;
 import java.util.Collections;
 import java.util.List;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import software.amazon.awssdk.core.auth.StaticCredentialsProvider;
 import software.amazon.awssdk.core.regions.Region;
-import software.amazon.awssdk.core.waiters.WaiterParameters;
 import software.amazon.awssdk.services.cloudformation.model.CreateStackRequest;
 import software.amazon.awssdk.services.cloudformation.model.DeleteStackRequest;
 import software.amazon.awssdk.services.cloudformation.model.DescribeStacksRequest;
+import software.amazon.awssdk.services.cloudformation.model.StackStatus;
 import software.amazon.awssdk.services.cloudformation.model.Tag;
 import software.amazon.awssdk.services.cloudformation.model.UpdateStackRequest;
-import software.amazon.awssdk.services.cloudformation.waiters.CloudFormationClientWaiters;
+import software.amazon.awssdk.testutils.Waiter;
 import software.amazon.awssdk.testutils.service.AwsIntegrationTestBase;
 
 /**
@@ -62,7 +63,6 @@ public class SendEmptyListIntegrationTest extends AwsIntegrationTestBase {
             "}";
 
     private CloudFormationClient cf;
-    private CloudFormationClientWaiters waiters;
     private String stackName;
 
     @Before
@@ -78,10 +78,7 @@ public void setup() {
                                          .templateBody(STARTING_TEMPLATE)
                                          .tags(Tag.builder().key("FooKey").value("FooValue").build()).build());
 
-        waiters = new CloudFormationClientWaiters(cf);
-
-        waiters.stackCreateComplete()
-               .run(getWaiterParameters(stackName));
+        waitUntilComplete(StackStatus.CREATE_COMPLETE);
     }
 
     @After
@@ -96,8 +93,8 @@ public void explicitlyEmptyTagList_RemovesTagsFromStack() {
                                          .stackName(stackName)
                                          .templateBody(STARTING_TEMPLATE)
                                          .tags(Collections.emptyList()).build());
-        waiters.stackUpdateComplete()
-               .run(getWaiterParameters(stackName));
+
+        waitUntilComplete(StackStatus.UPDATE_COMPLETE);
         assertThat(getTagsForStack(stackName), empty());
     }
 
@@ -107,20 +104,22 @@ public void autoConstructedEmptyTagList_DoesNotRemoveTagsFromStack() {
         cf.updateStack(UpdateStackRequest.builder()
                                          .stackName(stackName)
                                          .templateBody(UPDATED_TEMPLATE).build());
-        waiters.stackUpdateComplete()
-               .run(getWaiterParameters(stackName));
+
+        waitUntilComplete(StackStatus.UPDATE_COMPLETE);
         assertThat(getTagsForStack(stackName), not(empty()));
     }
 
+    private void waitUntilComplete(StackStatus expectedStatus) {
+        Waiter.run(() -> cf.describeStacks(r -> r.stackName(stackName)))
+              .until(r -> r.stacks().size() == 1 && r.stacks().get(0).stackStatus() == expectedStatus)
+              .failOn(r -> r.stacks().size() == 1 && r.stacks().get(0).stackStatus() == StackStatus.ROLLBACK_IN_PROGRESS)
+              .orFailAfter(Duration.ofMinutes(2));
+    }
+
     private List<Tag> getTagsForStack(String stackName) {
         return cf.describeStacks(
                 DescribeStacksRequest.builder().stackName(stackName).build())
                  .stacks().get(0)
                  .tags();
     }
-
-    private WaiterParameters<DescribeStacksRequest> getWaiterParameters(String stackName) {
-        return new WaiterParameters<>(
-                DescribeStacksRequest.builder().stackName(stackName).build());
-    }
 }