From 9fd360781fb5bfa668cc5e7496b09cad3e548e64 Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Thu, 13 Nov 2025 10:40:50 -0800 Subject: [PATCH 1/3] chore: enable php instruction file tests --- .../java/software/amazon/encryption/s3/RoundTripTests.java | 3 --- .../it/java/software/amazon/encryption/s3/TestUtils.java | 6 +++--- 2 files changed, 3 insertions(+), 6 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 1167e4db..59382006 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 @@ -548,9 +548,6 @@ public void instructionFileWriteAndRead(LanguageServerTarget encLang, LanguageSe if (KMS_INSTRUCTION_FILE_UNSUPPORTED.contains(decLang.getLanguageName())) { throw new TestAbortedException("not testing " + encLang.getLanguageName()); } - if (INSTRUCTION_FILE_ROUNDTRIP_TEMP_UNSUPPORTED.contains(encLang.getLanguageName())) { - 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())); diff --git a/test-server/java-tests/src/it/java/software/amazon/encryption/s3/TestUtils.java b/test-server/java-tests/src/it/java/software/amazon/encryption/s3/TestUtils.java index c20fd5a6..e1451d8d 100644 --- a/test-server/java-tests/src/it/java/software/amazon/encryption/s3/TestUtils.java +++ b/test-server/java-tests/src/it/java/software/amazon/encryption/s3/TestUtils.java @@ -117,9 +117,9 @@ public class TestUtils { public static final Set INSTRUCTION_FILE_GET_UNSUPPORTED = Set.of(PYTHON_V3); - // PHP doesn't work but it should, temporarily disable - public static final Set INSTRUCTION_FILE_ROUNDTRIP_TEMP_UNSUPPORTED = - Set.of(PHP_V2_CURRENT, PHP_V2_TRANSITION, PHP_V3); + // // PHP doesn't work but it should, temporarily disable + // public static final Set INSTRUCTION_FILE_ROUNDTRIP_TEMP_UNSUPPORTED = + // Set.of(PHP_V2_CURRENT, PHP_V2_TRANSITION, PHP_V3); public static final Set CURRENT_VERSIONS = Set.of( From b1bbca34635e27cb0e530ab63c9fad08c86079a0 Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Thu, 13 Nov 2025 10:55:02 -0800 Subject: [PATCH 2/3] delete not comment out --- .../src/it/java/software/amazon/encryption/s3/TestUtils.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/test-server/java-tests/src/it/java/software/amazon/encryption/s3/TestUtils.java b/test-server/java-tests/src/it/java/software/amazon/encryption/s3/TestUtils.java index e1451d8d..0b3f025b 100644 --- a/test-server/java-tests/src/it/java/software/amazon/encryption/s3/TestUtils.java +++ b/test-server/java-tests/src/it/java/software/amazon/encryption/s3/TestUtils.java @@ -117,10 +117,6 @@ public class TestUtils { public static final Set INSTRUCTION_FILE_GET_UNSUPPORTED = Set.of(PYTHON_V3); - // // PHP doesn't work but it should, temporarily disable - // public static final Set INSTRUCTION_FILE_ROUNDTRIP_TEMP_UNSUPPORTED = - // Set.of(PHP_V2_CURRENT, PHP_V2_TRANSITION, PHP_V3); - public static final Set CURRENT_VERSIONS = Set.of( JAVA_V3_CURRENT, From a9e743ea182ad618d1b83fd2f782f3d9648ed32b Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Thu, 13 Nov 2025 14:16:43 -0800 Subject: [PATCH 3/3] bump sdk --- 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 c81d43cd..d75f911e 160000 --- a/test-server/php-v3-server/local-php-sdk +++ b/test-server/php-v3-server/local-php-sdk @@ -1 +1 @@ -Subproject commit c81d43cd86764642ed83b1457f0f3ae87b052d23 +Subproject commit d75f911e41df81a1224f09bb4330c4a1c6c8ed59