Skip to content

Commit 000585c

Browse files
committed
chore: Examples run serially. Examples wait for GSI. No extra checkout (#561)
1 parent dd28262 commit 000585c

File tree

4 files changed

+10
-7
lines changed

4 files changed

+10
-7
lines changed

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

+3
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,9 @@ public static void PutAndQueryItemWithCompoundBeacon(DynamoDbClient ddb, String
328328
.expressionAttributeValues(expressionAttributeValues)
329329
.build();
330330

331+
// GSIs do not update instantly
332+
// so if the results come back empty
333+
// we retry after a short sleep
331334
for (int i=0; i<10; ++i) {
332335
QueryResponse queryResponse = ddb.query(queryRequest);
333336
List<Map<String, AttributeValue>> attributeValues = queryResponse.items();

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

+3
Original file line numberDiff line numberDiff line change
@@ -436,6 +436,9 @@ public static void PutItemQueryItemWithVirtualBeacon(String ddbTableName, String
436436
.expressionAttributeValues(expressionAttributeValues)
437437
.build();
438438

439+
// GSIs do not update instantly
440+
// so if the results come back empty
441+
// we retry after a short sleep
439442
for (int i=0; i<10; ++i) {
440443
final QueryResponse queryResponse = ddb.query(queryRequest);
441444
List<Map<String, AttributeValue>> attributeValues = queryResponse.items();

codebuild/release/release-prod.yml

-3
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
version: 0.2
55

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

codebuild/release/release.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ batch:
2828

2929
- identifier: validate_staging_corretto11
3030
depend-on:
31-
- release_staging
31+
- validate_staging_corretto8
3232
buildspec: codebuild/staging/validate-staging.yml
3333
env:
3434
variables:
@@ -38,7 +38,7 @@ batch:
3838

3939
- identifier: validate_staging_corretto17
4040
depend-on:
41-
- release_staging
41+
- validate_staging_corretto11
4242
buildspec: codebuild/staging/validate-staging.yml
4343
env:
4444
variables:
@@ -73,7 +73,7 @@ batch:
7373

7474
- identifier: validate_release_corretto11
7575
depend-on:
76-
- upload_to_sonatype
76+
- validate_release_corretto8
7777
buildspec: codebuild/release/validate-release.yml
7878
env:
7979
variables:
@@ -83,7 +83,7 @@ batch:
8383

8484
- identifier: validate_release_corretto17
8585
depend-on:
86-
- upload_to_sonatype
86+
- validate_release_corretto11
8787
buildspec: codebuild/release/validate-release.yml
8888
env:
8989
variables:

0 commit comments

Comments
 (0)