diff --git a/pom.xml b/pom.xml index be6e60c95069..5dc9aba79607 100644 --- a/pom.xml +++ b/pom.xml @@ -114,7 +114,7 @@ 2.2.21 1.15 1.29 - 0.21.12 + 0.22.2 5.8.1 diff --git a/services/s3/src/it/java/software/amazon/awssdk/services/s3/crt/S3CrossRegionCrtIntegrationTest.java b/services/s3/src/it/java/software/amazon/awssdk/services/s3/crt/S3CrossRegionCrtIntegrationTest.java new file mode 100644 index 000000000000..953c6e4b4f4b --- /dev/null +++ b/services/s3/src/it/java/software/amazon/awssdk/services/s3/crt/S3CrossRegionCrtIntegrationTest.java @@ -0,0 +1,156 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package software.amazon.awssdk.services.s3.crt; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static software.amazon.awssdk.services.s3.crt.S3CrtClientCopyIntegrationTest.randomBytes; +import static software.amazon.awssdk.services.s3.utils.ChecksumUtils.computeCheckSum; +import static software.amazon.awssdk.testutils.service.S3BucketUtils.temporaryBucketName; + +import java.io.File; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.nio.file.Files; +import java.util.Random; +import java.util.UUID; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.ThreadLocalRandom; +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import software.amazon.awssdk.core.ResponseBytes; +import software.amazon.awssdk.core.async.AsyncRequestBody; +import software.amazon.awssdk.core.async.AsyncResponseTransformer; +import software.amazon.awssdk.core.sync.ResponseTransformer; +import software.amazon.awssdk.crt.CrtResource; +import software.amazon.awssdk.regions.Region; +import software.amazon.awssdk.services.s3.S3AsyncClient; +import software.amazon.awssdk.services.s3.S3IntegrationTestBase; +import software.amazon.awssdk.services.s3.model.CopyObjectResponse; +import software.amazon.awssdk.services.s3.model.GetObjectRequest; +import software.amazon.awssdk.services.s3.model.GetObjectResponse; +import software.amazon.awssdk.services.s3.model.PutObjectRequest; +import software.amazon.awssdk.services.s3.model.S3Exception; +import software.amazon.awssdk.testutils.RandomTempFile; +import software.amazon.awssdk.testutils.service.AwsTestBase; + +public class S3CrossRegionCrtIntegrationTest extends S3IntegrationTestBase { + public static final Region CROSS_REGION = Region.EU_CENTRAL_1; + private static final String BUCKET = temporaryBucketName(S3CrossRegionCrtIntegrationTest.class); + private static final String KEY = "key"; + private static final String ORIGINAL_OBJ = "test_file.dat"; + private static final String COPIED_OBJ = "test_file_copy.dat"; + private static final long OBJ_SIZE = ThreadLocalRandom.current().nextLong(8 * 1024, 16 * 1024 + 1); + private static S3AsyncClient crtClient; + private static File file; + private static ExecutorService executorService; + + @BeforeAll + public static void setup() throws Exception { + S3IntegrationTestBase.setUp(); + S3IntegrationTestBase.createBucket(BUCKET); + crtClient = S3AsyncClient.crtBuilder() + .region(CROSS_REGION) + .crossRegionAccessEnabled(true) + .credentialsProvider(AwsTestBase.CREDENTIALS_PROVIDER_CHAIN) + .build(); + file = new RandomTempFile(10_000); + S3IntegrationTestBase.s3.putObject(PutObjectRequest.builder() + .bucket(BUCKET) + .key(KEY) + .build(), file.toPath()); + executorService = Executors.newFixedThreadPool(2); + } + + @AfterAll + public static void cleanup() { + crtClient.close(); + S3IntegrationTestBase.deleteBucketAndAllContents(BUCKET); + executorService.shutdown(); + CrtResource.waitForNoResources(); + } + + @Test + void crossRegionClient_getObject() throws IOException { + byte[] bytes = + crtClient.getObject(b -> b.bucket(BUCKET).key(KEY), AsyncResponseTransformer.toBytes()).join().asByteArray(); + assertThat(bytes).isEqualTo(Files.readAllBytes(file.toPath())); + } + + @Test + void putObjectNoSuchBucket() { + assertThatThrownBy(() -> crtClient.getObject(GetObjectRequest.builder().bucket("nonExistingTestBucket" + UUID.randomUUID()).key(KEY).build(), + AsyncResponseTransformer.toBytes()).get()) + .hasCauseInstanceOf(S3Exception.class) + .satisfies(throwable -> assertThat(throwable.getCause()).satisfies(cause -> assertThat(((S3Exception) cause).statusCode()).isEqualTo(404))); + } + + @Test + void copy_copiedObject_hasSameContent() { + byte[] originalContent = randomBytes(OBJ_SIZE); + createOriginalObject(originalContent, ORIGINAL_OBJ); + copyObject(ORIGINAL_OBJ, COPIED_OBJ); + validateCopiedObject(originalContent, ORIGINAL_OBJ); + } + + private void copyObject(String original, String destination) { + CompletableFuture future = crtClient.copyObject(c -> c + .sourceBucket(BUCKET) + .sourceKey(original) + .destinationBucket(BUCKET) + .destinationKey(destination)); + + CopyObjectResponse copyObjectResponse = future.join(); + assertThat(copyObjectResponse.responseMetadata().requestId()).isNotNull(); + assertThat(copyObjectResponse.sdkHttpResponse()).isNotNull(); + } + + @Test + void putObject_byteBufferBody_objectSentCorrectly() { + byte[] data = new byte[16384]; + new Random().nextBytes(data); + ByteBuffer byteBuffer = ByteBuffer.wrap(data); + + AsyncRequestBody body = AsyncRequestBody.fromByteBuffer(byteBuffer); + + crtClient.putObject(r -> r.bucket(BUCKET).key(KEY), body).join(); + + ResponseBytes responseBytes = S3IntegrationTestBase.s3.getObject(r -> r.bucket(BUCKET).key(KEY), + ResponseTransformer.toBytes()); + + byte[] expectedSum = computeCheckSum(byteBuffer); + + assertThat(computeCheckSum(responseBytes.asByteBuffer())).isEqualTo(expectedSum); + } + + private void validateCopiedObject(byte[] originalContent, String originalKey) { + ResponseBytes copiedObject = s3.getObject(r -> r.bucket(BUCKET) + .key(originalKey), + ResponseTransformer.toBytes()); + assertThat(computeCheckSum(copiedObject.asByteBuffer())).isEqualTo(computeCheckSum(ByteBuffer.wrap(originalContent))); + } + + private void createOriginalObject(byte[] originalContent, String originalKey) { + crtClient.putObject(r -> r.bucket(BUCKET) + .key(originalKey), + AsyncRequestBody.fromBytes(originalContent)).join(); + } + +} diff --git a/services/s3/src/it/java/software/amazon/awssdk/services/s3/crt/S3CrtClientCopyIntegrationTest.java b/services/s3/src/it/java/software/amazon/awssdk/services/s3/crt/S3CrtClientCopyIntegrationTest.java index d0f92bb5b29a..f4d2b34c1cdf 100644 --- a/services/s3/src/it/java/software/amazon/awssdk/services/s3/crt/S3CrtClientCopyIntegrationTest.java +++ b/services/s3/src/it/java/software/amazon/awssdk/services/s3/crt/S3CrtClientCopyIntegrationTest.java @@ -166,7 +166,7 @@ private void validateCopiedObject(byte[] originalContent, String originalKey) { assertThat(computeCheckSum(copiedObject.asByteBuffer())).isEqualTo(computeCheckSum(ByteBuffer.wrap(originalContent))); } - private static byte[] randomBytes(long size) { + public static byte[] randomBytes(long size) { byte[] bytes = new byte[Math.toIntExact(size)]; ThreadLocalRandom.current().nextBytes(bytes); return bytes; diff --git a/services/s3/src/it/java/software/amazon/awssdk/services/s3/crt/S3CrtGetObjectIntegrationTest.java b/services/s3/src/it/java/software/amazon/awssdk/services/s3/crt/S3CrtGetObjectIntegrationTest.java index 5206a53448c6..a7ea924c5fe4 100644 --- a/services/s3/src/it/java/software/amazon/awssdk/services/s3/crt/S3CrtGetObjectIntegrationTest.java +++ b/services/s3/src/it/java/software/amazon/awssdk/services/s3/crt/S3CrtGetObjectIntegrationTest.java @@ -23,19 +23,15 @@ import java.nio.ByteBuffer; import java.nio.file.Files; import java.nio.file.Path; -import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.async.AsyncResponseTransformer; -import software.amazon.awssdk.core.async.SdkPublisher; import software.amazon.awssdk.crt.CrtResource; -import software.amazon.awssdk.http.async.SimpleSubscriber; import software.amazon.awssdk.services.s3.S3AsyncClient; import software.amazon.awssdk.services.s3.S3IntegrationTestBase; -import software.amazon.awssdk.services.s3.internal.crt.S3CrtAsyncClient; import software.amazon.awssdk.services.s3.model.GetObjectResponse; import software.amazon.awssdk.services.s3.model.PutObjectRequest; import software.amazon.awssdk.testutils.RandomTempFile; @@ -97,35 +93,4 @@ void getObject_customResponseTransformer() { } - private static final class TestResponseTransformer implements AsyncResponseTransformer { - private CompletableFuture future; - - @Override - public CompletableFuture prepare() { - future = new CompletableFuture<>(); - return future; - } - - @Override - public void onResponse(GetObjectResponse response) { - assertThat(response).isNotNull(); - } - - @Override - public void onStream(SdkPublisher publisher) { - publisher.subscribe(new SimpleSubscriber(b -> { - }) { - @Override - public void onComplete() { - super.onComplete(); - future.complete(null); - } - }); - } - - @Override - public void exceptionOccurred(Throwable error) { - future.completeExceptionally(error); - } - } } diff --git a/services/s3/src/it/java/software/amazon/awssdk/services/s3/crt/TestResponseTransformer.java b/services/s3/src/it/java/software/amazon/awssdk/services/s3/crt/TestResponseTransformer.java new file mode 100644 index 000000000000..6b7e8848af45 --- /dev/null +++ b/services/s3/src/it/java/software/amazon/awssdk/services/s3/crt/TestResponseTransformer.java @@ -0,0 +1,57 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package software.amazon.awssdk.services.s3.crt; + +import static org.assertj.core.api.Assertions.assertThat; + +import java.nio.ByteBuffer; +import java.util.concurrent.CompletableFuture; +import software.amazon.awssdk.core.async.AsyncResponseTransformer; +import software.amazon.awssdk.core.async.SdkPublisher; +import software.amazon.awssdk.http.async.SimpleSubscriber; +import software.amazon.awssdk.services.s3.model.GetObjectResponse; + +public final class TestResponseTransformer implements AsyncResponseTransformer { + private CompletableFuture future; + + @Override + public CompletableFuture prepare() { + future = new CompletableFuture<>(); + return future; + } + + @Override + public void onResponse(GetObjectResponse response) { + assertThat(response).isNotNull(); + } + + @Override + public void onStream(SdkPublisher publisher) { + publisher.subscribe(new SimpleSubscriber(b -> { + }) { + @Override + public void onComplete() { + super.onComplete(); + future.complete(null); + } + }); + } + + @Override + public void exceptionOccurred(Throwable error) { + future.completeExceptionally(error); + } +} \ No newline at end of file diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/S3CrtAsyncClientBuilder.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/S3CrtAsyncClientBuilder.java index ee2434cc9ac4..e3131ba7aca7 100644 --- a/services/s3/src/main/java/software/amazon/awssdk/services/s3/S3CrtAsyncClientBuilder.java +++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/S3CrtAsyncClientBuilder.java @@ -212,9 +212,27 @@ default S3CrtAsyncClientBuilder retryConfiguration(Consumer Configures whether cross-region bucket access is enabled for clients using the configuration. + *

The following behavior is used when this mode is enabled: + *

    + *
  1. This method allows enabling or disabling cross-region bucket access for clients. When cross-region bucket + * access is enabled, requests that do not act on an existing bucket (e.g., createBucket API) will be routed to the + * region configured on the client
    2. + *
  2. The first time a request is made that references an existing bucket (e.g., putObject API), a request will be + * made to the client-configured region. If the bucket does not exist in this region, the service will include the + * actual region in the error responses. Subsequently, the API will be called using the correct region obtained + * from the error response.
    3. + *
  3. This location may be cached in the client for subsequent requests to the same bucket.
    4. + *
+ *

Enabling this mode has several drawbacks, as it can increase latency if the bucket's location is physically far + * from the location of the request.Therefore, it is strongly advised, whenever possible, to know the location of your + * buckets and create a region-specific client to access them + * + * @param crossRegionAccessEnabled Whether cross region bucket access should be enabled. + * @return The builder object for method chaining. + */ + S3CrtAsyncClientBuilder crossRegionAccessEnabled(boolean crossRegionAccessEnabled); @Override S3AsyncClient build(); diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/crt/DefaultS3CrtAsyncClient.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/crt/DefaultS3CrtAsyncClient.java index 860ac509932e..5a5c0d9a314d 100644 --- a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/crt/DefaultS3CrtAsyncClient.java +++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/crt/DefaultS3CrtAsyncClient.java @@ -18,6 +18,7 @@ import static software.amazon.awssdk.core.interceptor.SdkInternalExecutionAttribute.SDK_HTTP_EXECUTION_ATTRIBUTES; import static software.amazon.awssdk.services.s3.internal.crt.S3InternalSdkHttpExecutionAttribute.HTTP_CHECKSUM; import static software.amazon.awssdk.services.s3.internal.crt.S3InternalSdkHttpExecutionAttribute.OPERATION_NAME; +import static software.amazon.awssdk.services.s3.internal.crt.S3InternalSdkHttpExecutionAttribute.SIGNING_REGION; import static software.amazon.awssdk.services.s3.internal.crt.S3NativeClientConfiguration.DEFAULT_PART_SIZE_IN_BYTES; import java.net.URI; @@ -27,6 +28,7 @@ import software.amazon.awssdk.annotations.SdkInternalApi; import software.amazon.awssdk.annotations.SdkTestInternalApi; import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider; +import software.amazon.awssdk.auth.signer.AwsSignerExecutionAttribute; import software.amazon.awssdk.awscore.AwsRequest; import software.amazon.awssdk.awscore.AwsRequestOverrideConfiguration; import software.amazon.awssdk.core.SdkRequest; @@ -94,6 +96,7 @@ private static S3AsyncClient initializeS3AsyncClient(DefaultS3CrtClientBuilder b // Disable checksum, it is handled in CRT .serviceConfiguration(S3Configuration.builder() .checksumValidationEnabled(false) + .crossRegionAccessEnabled(builder.crossRegionAccessEnabled) .build()) .region(builder.region) .endpointOverride(builder.endpointOverride) @@ -149,6 +152,7 @@ public static final class DefaultS3CrtClientBuilder implements S3CrtAsyncClientB private List executionInterceptors; private S3CrtRetryConfiguration retryConfiguration; + private boolean crossRegionAccessEnabled; public AwsCredentialsProvider credentialsProvider() { return credentialsProvider; @@ -178,6 +182,10 @@ public Long readBufferSizeInBytes() { return readBufferSizeInBytes; } + public boolean crossRegionAccessEnabled() { + return crossRegionAccessEnabled; + } + @Override public S3CrtAsyncClientBuilder credentialsProvider(AwsCredentialsProvider credentialsProvider) { this.credentialsProvider = credentialsProvider; @@ -259,6 +267,12 @@ public S3CrtAsyncClientBuilder retryConfiguration(S3CrtRetryConfiguration retryC return this; } + @Override + public S3CrtAsyncClientBuilder crossRegionAccessEnabled(boolean crossRegionAccessEnabled) { + this.crossRegionAccessEnabled = crossRegionAccessEnabled; + return this; + } + @Override public S3CrtAsyncClient build() { return new DefaultS3CrtAsyncClient(this); @@ -280,6 +294,7 @@ public void afterMarshalling(Context.AfterMarshalling context, builder.put(OPERATION_NAME, executionAttributes.getAttribute(SdkExecutionAttribute.OPERATION_NAME)) .put(HTTP_CHECKSUM, executionAttributes.getAttribute(SdkInternalExecutionAttribute.HTTP_CHECKSUM)) + .put(SIGNING_REGION, executionAttributes.getAttribute(AwsSignerExecutionAttribute.SIGNING_REGION)) .build(); // For putObject and getObject, we rely on CRT to perform checksum validation diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/crt/S3CrtAsyncHttpClient.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/crt/S3CrtAsyncHttpClient.java index 9681c8c14f94..a6358b238a40 100644 --- a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/crt/S3CrtAsyncHttpClient.java +++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/crt/S3CrtAsyncHttpClient.java @@ -20,6 +20,7 @@ import static software.amazon.awssdk.services.s3.internal.crt.S3InternalSdkHttpExecutionAttribute.HTTP_CHECKSUM; import static software.amazon.awssdk.services.s3.internal.crt.S3InternalSdkHttpExecutionAttribute.METAREQUEST_PAUSE_OBSERVABLE; import static software.amazon.awssdk.services.s3.internal.crt.S3InternalSdkHttpExecutionAttribute.OPERATION_NAME; +import static software.amazon.awssdk.services.s3.internal.crt.S3InternalSdkHttpExecutionAttribute.SIGNING_REGION; import static software.amazon.awssdk.utils.FunctionalUtils.invokeSafely; import java.net.URI; @@ -31,6 +32,7 @@ import software.amazon.awssdk.annotations.SdkInternalApi; import software.amazon.awssdk.annotations.SdkTestInternalApi; import software.amazon.awssdk.core.interceptor.trait.HttpChecksum; +import software.amazon.awssdk.crt.auth.signing.AwsSigningConfig; import software.amazon.awssdk.crt.http.HttpHeader; import software.amazon.awssdk.crt.http.HttpRequest; import software.amazon.awssdk.crt.s3.ChecksumConfig; @@ -43,9 +45,11 @@ import software.amazon.awssdk.http.SdkHttpRequest; import software.amazon.awssdk.http.async.AsyncExecuteRequest; import software.amazon.awssdk.http.async.SdkAsyncHttpClient; +import software.amazon.awssdk.regions.Region; import software.amazon.awssdk.utils.AttributeMap; import software.amazon.awssdk.utils.Logger; import software.amazon.awssdk.utils.NumericUtils; +import software.amazon.awssdk.utils.StringUtils; import software.amazon.awssdk.utils.http.SdkHttpUtils; /** @@ -117,6 +121,7 @@ public CompletableFuture execute(AsyncExecuteRequest asyncRequest) { HttpChecksum httpChecksum = asyncRequest.httpExecutionAttributes().getAttribute(HTTP_CHECKSUM); ResumeToken resumeToken = asyncRequest.httpExecutionAttributes().getAttribute(CRT_PAUSE_RESUME_TOKEN); + Region signingRegion = asyncRequest.httpExecutionAttributes().getAttribute(SIGNING_REGION); ChecksumConfig checksumConfig = checksumConfig(httpChecksum, requestType, s3NativeClientConfiguration.checksumValidationEnabled()); @@ -130,6 +135,13 @@ public CompletableFuture execute(AsyncExecuteRequest asyncRequest) { .withResponseHandler(responseHandler) .withResumeToken(resumeToken); + // Create a new SigningConfig object only if the signing region has changed from the previously configured region. + if (signingRegion != null && !s3ClientOptions.getRegion().equals(signingRegion.id())) { + requestOptions.withSigningConfig( + AwsSigningConfig.getDefaultS3SigningConfig(signingRegion.id(), + s3ClientOptions.getCredentialsProvider())); + } + S3MetaRequest s3MetaRequest = crtS3Client.makeMetaRequest(requestOptions); S3MetaRequestPauseObservable observable = asyncRequest.httpExecutionAttributes().getAttribute(METAREQUEST_PAUSE_OBSERVABLE); @@ -144,6 +156,7 @@ public CompletableFuture execute(AsyncExecuteRequest asyncRequest) { return executeFuture; } + private static URI getEndpoint(URI uri) { return invokeSafely(() -> new URI(uri.getScheme(), null, uri.getHost(), uri.getPort(), null, null, null)); } diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/crt/S3InternalSdkHttpExecutionAttribute.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/crt/S3InternalSdkHttpExecutionAttribute.java index 763cc874cc86..f7b817ab9ad2 100644 --- a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/crt/S3InternalSdkHttpExecutionAttribute.java +++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/crt/S3InternalSdkHttpExecutionAttribute.java @@ -19,6 +19,7 @@ import software.amazon.awssdk.core.interceptor.trait.HttpChecksum; import software.amazon.awssdk.crt.s3.ResumeToken; import software.amazon.awssdk.http.SdkHttpExecutionAttribute; +import software.amazon.awssdk.regions.Region; @SdkInternalApi public final class S3InternalSdkHttpExecutionAttribute extends SdkHttpExecutionAttribute { @@ -37,6 +38,9 @@ public final class S3InternalSdkHttpExecutionAttribute extends SdkHttpExecuti public static final S3InternalSdkHttpExecutionAttribute CRT_PAUSE_RESUME_TOKEN = new S3InternalSdkHttpExecutionAttribute<>(ResumeToken.class); + public static final S3InternalSdkHttpExecutionAttribute SIGNING_REGION = + new S3InternalSdkHttpExecutionAttribute<>(Region.class); + private S3InternalSdkHttpExecutionAttribute(Class valueClass) { super(valueClass); } diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/crt/DefaultS3CrtAsyncClientTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/crt/DefaultS3CrtAsyncClientTest.java index 5c0da7b22f9f..ee44bf18839f 100644 --- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/crt/DefaultS3CrtAsyncClientTest.java +++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/crt/DefaultS3CrtAsyncClientTest.java @@ -29,8 +29,10 @@ import software.amazon.awssdk.core.interceptor.ExecutionAttributes; import software.amazon.awssdk.core.interceptor.ExecutionInterceptor; import software.amazon.awssdk.core.interceptor.SdkInternalExecutionAttribute; +import software.amazon.awssdk.services.s3.DelegatingS3AsyncClient; import software.amazon.awssdk.services.s3.S3AsyncClient; import software.amazon.awssdk.services.s3.endpoints.S3ClientContextParams; +import software.amazon.awssdk.services.s3.internal.crossregion.S3CrossRegionAsyncClient; import software.amazon.awssdk.utils.AttributeMap; class DefaultS3CrtAsyncClientTest { @@ -92,4 +94,23 @@ void invalidConfig_shouldThrowException(long value) { .hasMessageContaining( "positive"); } + + @Test + void crtClient_with_crossRegionAccessEnabled_asTrue(){ + S3AsyncClient crossRegionCrtClient = S3AsyncClient.crtBuilder().crossRegionAccessEnabled(true).build(); + assertThat(crossRegionCrtClient).isInstanceOf(DefaultS3CrtAsyncClient.class); + assertThat(((DelegatingS3AsyncClient)crossRegionCrtClient).delegate()).isInstanceOf(S3CrossRegionAsyncClient.class); + } + + @Test + void crtClient_with_crossRegionAccessEnabled_asFalse(){ + S3AsyncClient crossRegionDisabledCrtClient = S3AsyncClient.crtBuilder().crossRegionAccessEnabled(false).build(); + assertThat(crossRegionDisabledCrtClient).isInstanceOf(DefaultS3CrtAsyncClient.class); + assertThat(((DelegatingS3AsyncClient)crossRegionDisabledCrtClient).delegate()).isNotInstanceOf(S3CrossRegionAsyncClient.class); + + S3AsyncClient defaultCrtClient = S3AsyncClient.crtBuilder().build(); + assertThat(defaultCrtClient).isInstanceOf(DefaultS3CrtAsyncClient.class); + assertThat(((DelegatingS3AsyncClient)defaultCrtClient).delegate()).isNotInstanceOf(S3CrossRegionAsyncClient.class); + } + }