Skip to content

Update test case where endpoint resolution is checked for atleast once #4854

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joviegas merged 1 commit into from
Jan 29, 2024
Merged

Update test case where endpoint resolution is checked for atleast once #4854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions ...software/amazon/awssdk/services/s3/internal/crossregion/S3CrossRegionAsyncClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static software.amazon.awssdk.services.s3.internal.crossregion.S3CrossRegionRedirectTestBase.CHANGED_CROSS_REGION;
Expand Down Expand Up @@ -437,18 +438,18 @@ void given_AnyRegion_Client_Updates_the_useGlobalEndpointFlag_asFalse(String reg
.thenReturn(CompletableFuture.completedFuture(Endpoint.builder().url(URI.create("https://bucket.s3.amazonaws.com")).build()));

S3AsyncClient s3Client = clientBuilder().crossRegionAccessEnabled(true)
.region(Region.of(region))
.endpointProvider(mockEndpointProvider).build();
.region(Region.of(region))
.endpointProvider(mockEndpointProvider).build();
s3Client.getObject(r -> r.bucket(BUCKET).key(KEY), AsyncResponseTransformer.toBytes()).join();
assertThat(captureInterceptor.endpointProvider).isInstanceOf(BucketEndpointProvider.class);
ArgumentCaptor<S3EndpointParams> collectionCaptor = ArgumentCaptor.forClass(S3EndpointParams.class);
verify(mockEndpointProvider).resolveEndpoint(collectionCaptor.capture());
S3EndpointParams resolvedParams = collectionCaptor.getAllValues().get(0);
assertThat(resolvedParams.region()).isEqualTo(Region.of(region));
assertThat(resolvedParams.useGlobalEndpoint()).isFalse();
verify(mockEndpointProvider, atLeastOnce()).resolveEndpoint(collectionCaptor.capture());
Copy link
Contributor

@zoewangg zoewangg Jan 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: should we just verify twice, non blocking, can be a follow up PR.

Copy link
Contributor Author

@joviegas joviegas Jan 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will push this once now to get in release , updating might cause checkbuild to start and cause delay , will create separate PR for times(2)

collectionCaptor.getAllValues().forEach(resolvedParams -> {
assertThat(resolvedParams.region()).isEqualTo(Region.of(region));
assertThat(resolvedParams.useGlobalEndpoint()).isFalse();
});
}


private S3AsyncClientBuilder clientBuilder() {
return S3AsyncClient.builder()
.httpClient(mockAsyncHttpClient)
Expand Down
12 changes: 6 additions & 6 deletions .../software/amazon/awssdk/services/s3/internal/crossregion/S3CrossRegionSyncClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,13 @@

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static software.amazon.awssdk.services.s3.internal.crossregion.S3CrossRegionAsyncClientTest.customHttpResponse;
import static software.amazon.awssdk.services.s3.internal.crossregion.S3CrossRegionAsyncClientTest.customHttpResponseWithUnknownErrorCode;
import static software.amazon.awssdk.services.s3.internal.crossregion.S3CrossRegionAsyncClientTest.successHttpResponse;
import static software.amazon.awssdk.services.s3.internal.crossregion.S3CrossRegionRedirectTestBase.CHANGED_CROSS_REGION;
import static software.amazon.awssdk.services.s3.internal.crossregion.S3CrossRegionRedirectTestBase.CROSS_REGION;
import static software.amazon.awssdk.services.s3.internal.crossregion.S3CrossRegionRedirectTestBase.CROSS_REGION_BUCKET;
import static software.amazon.awssdk.services.s3.internal.crossregion.S3CrossRegionRedirectTestBase.OVERRIDE_CONFIGURED_REGION;

import java.net.URI;
Expand Down Expand Up @@ -271,10 +270,11 @@ void given_AnyRegion_Client_Updates_the_useGlobalEndpointFlag_asFalse(String reg
s3Client.getObject(getObjectBuilder().build());
assertThat(captureInterceptor.endpointProvider).isInstanceOf(BucketEndpointProvider.class);
ArgumentCaptor<S3EndpointParams> collectionCaptor = ArgumentCaptor.forClass(S3EndpointParams.class);
verify(mockEndpointProvider).resolveEndpoint(collectionCaptor.capture());
S3EndpointParams resolvedParams = collectionCaptor.getAllValues().get(0);
assertThat(resolvedParams.region()).isEqualTo(Region.of(region));
assertThat(resolvedParams.useGlobalEndpoint()).isFalse();
verify(mockEndpointProvider, atLeastOnce()).resolveEndpoint(collectionCaptor.capture());
collectionCaptor.getAllValues().forEach(resolvedParams ->{
assertThat(resolvedParams.region()).isEqualTo(Region.of(region));
assertThat(resolvedParams.useGlobalEndpoint()).isFalse();
});
}

private static GetObjectRequest.Builder getObjectBuilder() {
Expand Down