chore: Examples run serially. Examples wait for GSI. No extra checkout (#561)

Author: ajewellamz

Examples/runtimes/java/DynamoDbEncryption/src/main/java/software/amazon/cryptography/examples/searchableencryption/CompoundBeaconSearchableEncryptionExample.java

@@ -298,16 +298,29 @@ public static void PutAndQueryItemWithCompoundBeacon(DynamoDbClient ddb, String
         .expressionAttributeValues(expressionAttributeValues)
         .build();
 
-    QueryResponse queryResponse = ddb.query(queryRequest);
-    List<Map<String, AttributeValue>> attributeValues = queryResponse.items();
-    // Validate query was returned successfully
-    assert 200 == queryResponse.sdkHttpResponse().statusCode();
-    // Validate only 1 item was returned: the item we just put
-    assert attributeValues.size() == 1;
-    Map<String, AttributeValue> returnedItem = attributeValues.get(0);
-    // Validate the item has the expected attributes
-    assert returnedItem.get("inspector_id_last4").s().equals("5678");
-    assert returnedItem.get("unit").s().equals("011899988199");
+    // GSIs do not update instantly
+    // so if the results come back empty
+    // we retry after a short sleep
+    for (int i=0; i<10; ++i) {
+	QueryResponse queryResponse = ddb.query(queryRequest);
+	List<Map<String, AttributeValue>> attributeValues = queryResponse.items();
+	// Validate query was returned successfully
+	assert 200 == queryResponse.sdkHttpResponse().statusCode();
+
+	// if no results, sleep and try again
+        if (attributeValues.size() == 0) {
+            try {Thread.sleep(20);} catch (Exception e) {}
+            continue;
+        }
+
+	// Validate only 1 item was returned: the item we just put
+	assert attributeValues.size() == 1;
+	Map<String, AttributeValue> returnedItem = attributeValues.get(0);
+	// Validate the item has the expected attributes
+	assert returnedItem.get("inspector_id_last4").s().equals("5678");
+	assert returnedItem.get("unit").s().equals("011899988199");
+	break;
+    }
   }
 
   public static void main(final String[] args) {

Examples/runtimes/java/DynamoDbEncryption/src/main/java/software/amazon/cryptography/examples/searchableencryption/VirtualBeaconSearchableEncryptionExample.java

@@ -407,16 +407,29 @@ public static void PutItemQueryItemWithVirtualBeacon(String ddbTableName, String
         .expressionAttributeValues(expressionAttributeValues)
         .build();
 
-    final QueryResponse queryResponse = ddb.query(queryRequest);
-    List<Map<String, AttributeValue>> attributeValues = queryResponse.items();
-    // Validate query was returned successfully
-    assert 200 == queryResponse.sdkHttpResponse().statusCode();
-    // Validate only 1 item was returned: the item with the expected attributes
-    assert attributeValues.size() == 1;
-    final Map<String, AttributeValue> returnedItem = attributeValues.get(0);
-    // Validate the item has the expected attributes
-    assert returnedItem.get("state").s().equals("CA");
-    assert returnedItem.get("hasTestResult").bool().equals(true);
+    // GSIs do not update instantly
+    // so if the results come back empty
+    // we retry after a short sleep
+    for (int i=0; i<10; ++i) {
+	final QueryResponse queryResponse = ddb.query(queryRequest);
+	List<Map<String, AttributeValue>> attributeValues = queryResponse.items();
+	// Validate query was returned successfully
+	assert 200 == queryResponse.sdkHttpResponse().statusCode();
+
+	// if no results, sleep and try again
+        if (attributeValues.size() == 0) {
+            try {Thread.sleep(20);} catch (Exception e) {}
+            continue;
+        }
+
+	// Validate only 1 item was returned: the item with the expected attributes
+	assert attributeValues.size() == 1;
+	final Map<String, AttributeValue> returnedItem = attributeValues.get(0);
+	// Validate the item has the expected attributes
+	assert returnedItem.get("state").s().equals("CA");
+	assert returnedItem.get("hasTestResult").bool().equals(true);
+	break;
+    }
   }
 
   public static void main(final String[] args) {

codebuild/release/release-prod.yml

@@ -4,8 +4,6 @@
 version: 0.2
 
 env:
-  variables:
-    BRANCH: "main"
   parameter-store:
     ACCOUNT: /CodeBuild/AccountId
   secrets-manager:
@@ -31,7 +29,6 @@ phases:
       - cd  aws-database-encryption-sdk-dynamodb-java/
   pre_build:
     commands:
-      - git checkout $BRANCH
       - aws secretsmanager get-secret-value --region us-west-2 --secret-id Maven-GPG-Keys-Release --query SecretBinary --output text | base64 -d > ~/mvn_gpg.tgz
       - tar -xvf ~/mvn_gpg.tgz -C ~
       # Create default location where GPG looks for creds and keys

codebuild/release/release.yml

@@ -28,7 +28,7 @@ batch:
 
   - identifier: validate_staging_corretto11
     depend-on:
-        - release_staging
+        - validate_staging_corretto8
     buildspec: codebuild/staging/validate-staging.yml
     env:
       variables:
@@ -38,7 +38,7 @@ batch:
 
   - identifier: validate_staging_corretto17
     depend-on:
-        - release_staging
+        - validate_staging_corretto11
     buildspec: codebuild/staging/validate-staging.yml
     env:
       variables:
@@ -73,7 +73,7 @@ batch:
 
   - identifier: validate_release_corretto11
     depend-on:
-        - upload_to_sonatype
+        - validate_release_corretto8
     buildspec: codebuild/release/validate-release.yml
     env:
       variables:
@@ -83,7 +83,7 @@ batch:
 
   - identifier: validate_release_corretto17
     depend-on:
-        - upload_to_sonatype
+        - validate_release_corretto11
     buildspec: codebuild/release/validate-release.yml
     env:
       variables: