From 44b2ad21bdf35778f21880dfac42688601a4e1e8 Mon Sep 17 00:00:00 2001 From: rishav-karanjit Date: Fri, 14 Nov 2025 09:49:06 -0800 Subject: [PATCH 1/4] auto commit --- .../amazon/encryption/s3/RoundTripTests.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/test-server/java-tests/src/it/java/software/amazon/encryption/s3/RoundTripTests.java b/test-server/java-tests/src/it/java/software/amazon/encryption/s3/RoundTripTests.java index 59382006..1b9c67c7 100644 --- a/test-server/java-tests/src/it/java/software/amazon/encryption/s3/RoundTripTests.java +++ b/test-server/java-tests/src/it/java/software/amazon/encryption/s3/RoundTripTests.java @@ -595,15 +595,15 @@ public void instructionFileWriteAndRead(LanguageServerTarget encLang, LanguageSe if (!encLang.getLanguageName().startsWith("Ruby") && !encLang.getLanguageName().startsWith("PHP")) { // Ruby and PHP do not include it :( assertTrue(ptInstFile.response().metadata().containsKey("x-amz-crypto-instr-file")); - assertFalse(ptInstFile.asUtf8String().isEmpty()); - // Read should be enabled by default - GetObjectOutput output = decClient.getObject(GetObjectInput.builder() - .clientID(decS3ECId) - .bucket(BUCKET) - .key(objectKey) - .build()); - - assertEquals(input, new String(output.getBody().array())); } + assertFalse(ptInstFile.asUtf8String().isEmpty()); + // Read should be enabled by default + GetObjectOutput output = decClient.getObject(GetObjectInput.builder() + .clientID(decS3ECId) + .bucket(BUCKET) + .key(objectKey) + .build()); + + assertEquals(input, new String(output.getBody().array())); } } \ No newline at end of file From 65a61b69f13e58adaca141e53e7177fff561b78f Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Fri, 14 Nov 2025 13:57:09 -0800 Subject: [PATCH 2/4] php sdk bump --- test-server/php-v3-server/local-php-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-server/php-v3-server/local-php-sdk b/test-server/php-v3-server/local-php-sdk index d75f911e..a977ffa6 160000 --- a/test-server/php-v3-server/local-php-sdk +++ b/test-server/php-v3-server/local-php-sdk @@ -1 +1 @@ -Subproject commit d75f911e41df81a1224f09bb4330c4a1c6c8ed59 +Subproject commit a977ffa68f932ddd197bc4748cd57d388ccc99b3 From 981b78462f8b6dd585d895de5c916cf4809d145b Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Fri, 14 Nov 2025 14:35:17 -0800 Subject: [PATCH 3/4] update test --- .../it/java/software/amazon/encryption/s3/RoundTripTests.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test-server/java-tests/src/it/java/software/amazon/encryption/s3/RoundTripTests.java b/test-server/java-tests/src/it/java/software/amazon/encryption/s3/RoundTripTests.java index e1539ef8..468fc708 100644 --- a/test-server/java-tests/src/it/java/software/amazon/encryption/s3/RoundTripTests.java +++ b/test-server/java-tests/src/it/java/software/amazon/encryption/s3/RoundTripTests.java @@ -549,6 +549,10 @@ public void instructionFileWriteAndRead(LanguageServerTarget encLang, LanguageSe if (KMS_INSTRUCTION_FILE_UNSUPPORTED.contains(decLang.getLanguageName())) { throw new TestAbortedException("not testing " + encLang.getLanguageName()); } + // We skip PHP-V2-Current because it writes an instruction file that other languages may not read. + if (encLang.getLanguageName().equals("PHP-V2-Current")) { + throw new TestAbortedException("not testing " + encLang.getLanguageName()); + } S3ECTestServerClient encClient = testServerClientFor(encLang); S3ECTestServerClient decClient = testServerClientFor(decLang); final String objectKey = appendTestSuffix(String.format("write-%s-read-%s-instruction-file", encLang.getLanguageName(), decLang.getLanguageName())); From 56656baa908ccd91023a7f2634ef8e7bccd4d2dd Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Fri, 14 Nov 2025 15:02:32 -0800 Subject: [PATCH 4/4] point to stable branch --- test-server/php-v3-server/local-php-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-server/php-v3-server/local-php-sdk b/test-server/php-v3-server/local-php-sdk index a977ffa6..e32c9f2b 160000 --- a/test-server/php-v3-server/local-php-sdk +++ b/test-server/php-v3-server/local-php-sdk @@ -1 +1 @@ -Subproject commit a977ffa68f932ddd197bc4748cd57d388ccc99b3 +Subproject commit e32c9f2b009a43cf88f2ab35e1e532114c8390c9