[closes #991] Add wait for IAM and DynamoDB

tnb-software · Feb 27, 2025 · a956653 · a956653
1 parent 4f2e41e
commit a956653
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/.../aws/dynamo-db/src/main/java/software/tnb/aws/dynamodb/validation/DynamoDBValidation.java b/.../aws/dynamo-db/src/main/java/software/tnb/aws/dynamodb/validation/DynamoDBValidation.java
@@ -62,9 +62,8 @@ public void createTable(String tableName, String primaryKey) {
             .keySchema(KeySchemaElement.builder().attributeName(primaryKey).keyType(KeyType.HASH).build())
             .attributeDefinitions(AttributeDefinition.builder().attributeType(ScalarAttributeType.S).attributeName(primaryKey).build())
         );
-        WaitUtils.waitFor(
-            () -> "active".equalsIgnoreCase(client.describeTable(b -> b.tableName(tableName)).table().tableStatusAsString()),
-            6, 5000L, "Waiting until the DynamoDB table " + tableName + " is created");
+
+        client.waiter().waitUntilTableExists(b -> b.tableName(tableName));
     }
 
     public String enableDataStream(String tableName) {

diff --git a/system-x/services/aws/iam/src/main/java/software/tnb/aws/iam/validation/IAMValidation.java b/system-x/services/aws/iam/src/main/java/software/tnb/aws/iam/validation/IAMValidation.java
@@ -26,17 +26,25 @@ public String createRole(String name, String description, String rolePolicyDocum
             return getRoleArn(name).get();
         } else {
             LOG.debug("Creating IAM role {}", name);
-            return client.createRole(b -> b.roleName(name)
+            final String arn = client.createRole(b -> b.roleName(name)
                 .description(description)
                 .assumeRolePolicyDocument(rolePolicyDocument)
             ).role().arn();
+
+            client.waiter().waitUntilRoleExists(r -> r.roleName(name));
+
+            return arn;
         }
     }
 
     public String createPolicy(String name, String policyDocument) {
-        return client.createPolicy(b -> b.policyName(name)
+        final String arn = client.createPolicy(b -> b.policyName(name)
             .policyDocument(policyDocument)
         ).policy().arn();
+
+        client.waiter().waitUntilPolicyExists(b -> b.policyArn(arn));
+
+        return arn;
     }
 
     public void attachPolicy(String role, String policyArn) {