Merge pull request #572 from jglick/testAmpersand

Fixing `JCloudsVirtualFileTest.testAmpersand` for SSO
jenkinsci · Dec 3, 2024 · 8a06a03 · 8a06a03
2 parents 29efad1 + 4b77dab
commit 8a06a03
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/src/test/java/io/jenkins/plugins/artifact_manager_jclouds/s3/JCloudsVirtualFileTest.java b/src/test/java/io/jenkins/plugins/artifact_manager_jclouds/s3/JCloudsVirtualFileTest.java
@@ -53,7 +53,6 @@
 import org.jvnet.hudson.test.LoggerRule;
 
 import com.amazonaws.services.s3.AmazonS3;
-import com.amazonaws.services.s3.AmazonS3ClientBuilder;
 import com.amazonaws.services.s3.model.ListObjectsV2Result;
 import com.amazonaws.services.s3.model.S3ObjectSummary;
 import java.net.ProtocolException;
@@ -287,7 +286,7 @@ public void testAmpersand() throws Exception {
         try {
             putBlob(blobStore.blobBuilder(key).payload("test").build());
 
-            final AmazonS3 s3 = AmazonS3ClientBuilder.defaultClient();
+            final AmazonS3 s3 = S3BlobStoreConfig.clientBuilder.get().build();
             ListObjectsV2Result result = s3.listObjectsV2(getContainer(), key);
             List<S3ObjectSummary> objects = result.getObjectSummaries();
             assertThat(objects, not(empty()));