test(e2e): fix e2e resources stack deployment (#3772)

* test(e2e): fix e2e resources stack deployment

Author: AllanZhengYP

tests/e2e/ensure-test-stack.js

@@ -13,12 +13,15 @@ const {
  * Deploy the integration test stack if it does not exist. Update the
  * stack if there's a changeset. There should be a high level library for it
  * really.
+ *
+ * This is a boil-down version of aws cli cloudformation deploy:
+ * https://github.com/aws/aws-cli/blob/c3eec161713ffd7e01c239bd0761fcf02db183aa/awscli/customizations/cloudformation/deploy.py#L321
  */
 exports.ensureTestStack = async (client, stackName, templateBody) => {
   let hasExistingStack = false;
   try {
-    await client.send(new DescribeStacksCommand({ StackName: stackName }));
-    hasExistingStack = true;
+    const { Stacks } = await client.send(new DescribeStacksCommand({ StackName: stackName }));
+    hasExistingStack = Stacks[0]?.StackStatus !== "REVIEW_IN_PROGRESS";
   } catch (e) {
     if ((e.message || "").endsWith("does not exist")) {
       hasExistingStack = false;
@@ -31,7 +34,7 @@ exports.ensureTestStack = async (client, stackName, templateBody) => {
     new CreateChangeSetCommand({
       StackName: stackName,
       ChangeSetType: hasExistingStack ? "UPDATE" : "CREATE",
-      ChangeSetName: `${stackName}ChangeSet`,
+      ChangeSetName: `${stackName}ChangeSet${Date.now()}`,
       TemplateBody: templateBody,
       Capabilities: [Capability.CAPABILITY_IAM],
     })