rgw:chksum: pull up aws-sdk-java-v2 and fix S3Builder invocation

This commit pulls up aws-sdk-java-v2 to 2.32.2, which has trailing header
formatting previously seen with golang v2 sdk--for which the upstream
*Reef* logic is not present (see prior commit by Yixin Jin).

And it fixes the construction of S3Client to accept endpoint self-signed
certificates--logic which is present in the main function example code
in jcksum.java, but somehow not in putobjects.java (anymore?).

Resolves: rhbz#2392604

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit 7c56e11d6a9892d02ec9f750b5b785c501f966a3)

diff --git a/qa/workunits/rgw/jcksum/pom.xml b/qa/workunits/rgw/jcksum/pom.xml
index ab874e57638e7c51145865e5ca23086a33509307..494228d08455635640563531020eccb24660f42c 100644 (file)
--- a/qa/workunits/rgw/jcksum/pom.xml
+++ b/qa/workunits/rgw/jcksum/pom.xml
@@ -11,7 +11,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.source>1.9</maven.compiler.source>
     <maven.compiler.target>${maven.compiler.source}</maven.compiler.target>
-    <aws.java.sdk.version>2.20.43</aws.java.sdk.version>
+    <aws.java.sdk.version>2.32.2</aws.java.sdk.version>
     <slf4j.version>1.7.28</slf4j.version>
     <junit5.version>5.10.1</junit5.version>
     <junit.platform.version>1.10.1</junit.platform.version>

diff --git a/qa/workunits/rgw/jcksum/src/test/java/io/ceph/jcksum/PutObjects.java b/qa/workunits/rgw/jcksum/src/test/java/io/ceph/jcksum/PutObjects.java
index 9f9d3475c04f68d5a23095c567562cfaaae62a56..b3998953c1922bf0a9a6b7c8afe6344d2c53a1b7 100644 (file)
--- a/qa/workunits/rgw/jcksum/src/test/java/io/ceph/jcksum/PutObjects.java
+++ b/qa/workunits/rgw/jcksum/src/test/java/io/ceph/jcksum/PutObjects.java
@@ -151,6 +151,7 @@ class PutObjects {
     System.out.println("DEBUG: Environment Variables Read");
     try {
       client = S3Client.builder()
+        .httpClient(apacheHttpClient)
         .endpointOverride(http_uri)
         .credentialsProvider(StaticCredentialsProvider.create(creds))
         .region(jcksum.region)