Skip to content

chore: add suffix to test-objects to avoid accidental collisions #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kessplas merged 2 commits into from
Oct 1, 2025
Merged

chore: add suffix to test-objects to avoid accidental collisions #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
23cc0a3
chore: add suffix to test-objects to avoid accidental collisions
josecorella Oct 1, 2025
46dfd62
oopsie
josecorella Oct 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions test-server/java-tests/src/it/java/software/amazon/encryption/s3/RoundTripTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public static void setup() {
@MethodSource("software.amazon.encryption.s3.TestUtils#crossLanguageClients")
public void crossLanguageTestKms(LanguageServerTarget encLang, LanguageServerTarget decLang) {
S3ECTestServerClient encClient = testServerClientFor(encLang);
final String objectKey = "cross-lang-test-key-" + encLang;
final String objectKey = appendTestSuffix("cross-lang-test-key-" + encLang);
final String input = "simple-test-input";
KeyMaterial kmsKeyArn = KeyMaterial.builder()
.kmsKeyId(KMS_KEY_ARN)
Expand Down Expand Up @@ -92,7 +92,7 @@ public void crossLanguageTestKmsWithEncCtx(LanguageServerTarget encLang, Languag
return;
}
S3ECTestServerClient encClient = testServerClientFor(encLang);
final String objectKey = "cross-lang-test-key-kms-ec-" + encLang;
final String objectKey = appendTestSuffix("cross-lang-test-key-kms-ec-" + encLang);
final String input = "simple-test-input";
final Map<String, String> encCtx = new HashMap<>();
encCtx.put("user-defined-enc-ctx-key", "user-defined-enc-ctx-value");
Expand Down Expand Up @@ -142,7 +142,7 @@ public void crossLanguageTestKmsWithSubsetEncCtxFails(LanguageServerTarget encLa
return;
}
S3ECTestServerClient encClient = testServerClientFor(encLang);
final String objectKey = "cross-lang-test-key-kms-ec-subset-fails" + encLang;
final String objectKey = appendTestSuffix("cross-lang-test-key-kms-ec-subset-fails" + encLang);
final String input = "simple-test-input";
final Map<String, String> encCtx = new HashMap<>();
encCtx.put("user-defined-enc-ctx-key", "user-defined-enc-ctx-value");
Expand Down Expand Up @@ -193,7 +193,7 @@ public void crossLanguageTestKmsWithIncorrectEncCtxFails(LanguageServerTarget en
return;
}
S3ECTestServerClient encClient = testServerClientFor(encLang);
final String objectKey = "cross-lang-test-key-kms-ec-incorrect-fails" + encLang;
final String objectKey = appendTestSuffix("cross-lang-test-key-kms-ec-incorrect-fails" + encLang);
final String input = "simple-test-input";
final Map<String, String> encCtx = new HashMap<>();
encCtx.put("user-defined-enc-ctx-key", "user-defined-enc-ctx-value");
Expand Down Expand Up @@ -246,7 +246,7 @@ public void crossLanguageTestKmsWithIncorrectEncCtxFails(LanguageServerTarget en
@MethodSource("software.amazon.encryption.s3.TestUtils#clientsForTest")
public void kmsV1Legacy(String language) {
S3ECTestServerClient client = testServerClientFor(getServerMap().get(language));
final String objectKey = "test-key-kms-v1-" + language;
final String objectKey = appendTestSuffix("test-key-kms-v1-" + language);
final String input = "simple-test-input";
KeyMaterial kmsKeyArn = KeyMaterial.builder()
.kmsKeyId(KMS_KEY_ARN)
Expand Down Expand Up @@ -288,7 +288,7 @@ public void kmsV1Legacy(String language) {
@MethodSource("software.amazon.encryption.s3.TestUtils#clientsForTest")
public void kmsV1LegacyWithEncCtx(String language) {
S3ECTestServerClient client = testServerClientFor(getServerMap().get(language));
final String objectKey = "test-key-kms-v1-with-enc-ctx-" + language;
final String objectKey = appendTestSuffix("test-key-kms-v1-with-enc-ctx-" + language);
final String input = "simple-test-input";
KeyMaterial kmsKeyArn = KeyMaterial.builder()
.kmsKeyId(KMS_KEY_ARN)
Expand Down Expand Up @@ -337,7 +337,7 @@ public void kmsV1LegacyWithEncCtx(String language) {
@MethodSource("software.amazon.encryption.s3.TestUtils#clientsForTest")
public void kmsV1LegacyFailsWhenLegacyDisabled(String language) {
S3ECTestServerClient client = testServerClientFor(getServerMap().get(language));
final String objectKey = "test-key-kms-v1-fails-disabled" + language;
final String objectKey = appendTestSuffix("test-key-kms-v1-fails-disabled" + language);
final String input = "simple-test-input";
KeyMaterial kmsKeyArn = KeyMaterial.builder()
.kmsKeyId(KMS_KEY_ARN)
Expand Down
15 changes: 15 additions & 0 deletions test-server/java-tests/src/it/java/software/amazon/encryption/s3/TestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
import java.util.stream.Collectors;
import java.util.stream.Stream;

import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat;
import org.junit.jupiter.params.provider.Arguments;
import com.amazonaws.regions.Region;
import com.amazonaws.regions.Regions;
Expand Down Expand Up @@ -316,4 +318,17 @@ public static Stream<Arguments> crossLanguageClients() {
Arguments.of(t1, t2)
)));
}

/**
* For a given string, append a suffix to distinguish it from
* simultaneous test runs.
* @param s The string to append the suffix to
* @return The string with the suffix appended
*/
public static String appendTestSuffix(final String s) {
StringBuilder stringBuilder = new StringBuilder(s);
stringBuilder.append(DateTimeFormat.forPattern("-yyMMdd-hhmmss-").print(new DateTime()));
stringBuilder.append((int) (Math.random() * 100000));
return stringBuilder.toString();
}
}
Loading