Skip to content

Re-enable disabled S3 tests #3876

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
dagnir merged 3 commits into from
Apr 6, 2023
Merged

Re-enable disabled S3 tests #3876

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ef1949
Re-enable disabled S3 tests
dagnir Mar 31, 2023
41a2cfc
Merge branch 'master' into dongie/reenable-s3-test
dagnir Mar 31, 2023
b98c102
Merge branch 'master' into dongie/reenable-s3-test
dagnir Apr 6, 2023
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
32 changes: 15 additions & 17 deletions .../test/java/software/amazon/awssdk/services/s3/EndpointOverrideEndpointResolutionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,14 +230,13 @@ public static Collection<TestCase> testCases() {
.setExpectedSigningServiceName("s3")
.setExpectedSigningRegion(Region.US_WEST_2));

//FIXME: The ruleset is currently broken for this test case. The provider is not preserving the path part
// cases.add(new TestCase().setCaseName("access point with http, path, query, and port")
// .setGetObjectBucketName("arn:aws:s3:us-west-2:123456789012:accesspoint:myendpoint")
// .setEndpointUrl("http://beta.example.com:1234/path?foo=bar")
// .setClientRegion(Region.US_WEST_2)
// .setExpectedEndpoint("http://myendpoint-123456789012.beta.example.com:1234/path/object?foo=bar")
// .setExpectedSigningServiceName("s3")
// .setExpectedSigningRegion(Region.US_WEST_2));
cases.add(new TestCase().setCaseName("access point with http, path, query, and port")
.setGetObjectBucketName("arn:aws:s3:us-west-2:123456789012:accesspoint:myendpoint")
.setEndpointUrl("http://beta.example.com:1234/path?foo=bar")
.setClientRegion(Region.US_WEST_2)
.setExpectedEndpoint("http://myendpoint-123456789012.beta.example.com:1234/path/object?foo=bar")
.setExpectedSigningServiceName("s3")
.setExpectedSigningRegion(Region.US_WEST_2));

cases.add(new TestCase().setCaseName("outposts access point")
.setGetObjectBucketName("arn:aws:s3-outposts:us-west-2:123456789012:outpost:op-01234567890123456:accesspoint:myaccesspoint")
Expand Down Expand Up @@ -313,15 +312,14 @@ public static Collection<TestCase> testCases() {
.setExpectedSigningServiceName("s3")
.setExpectedSigningRegion(Region.US_WEST_2));

//FIXME: The ruleset is currently broken for this test case. The provider is not preserving the path part
// cases.add(new TestCase().setCaseName("access point with http, path, query, port, different arn region, and arn region enabled")
// .setGetObjectBucketName("arn:aws:s3:us-west-2:123456789012:accesspoint:myendpoint")
// .setEndpointUrl("http://accesspoint.vpce-123-abc.s3.us-west-2.vpce.amazonaws.com:1234/path?foo=bar")
// .setS3Configuration(c -> c.useArnRegionEnabled(true))
// .setClientRegion(Region.EU_WEST_1)
// .setExpectedEndpoint("http://myendpoint-123456789012.accesspoint.vpce-123-abc.s3.us-west-2.vpce.amazonaws.com:1234/path/object?foo=bar")
// .setExpectedSigningServiceName("s3")
// .setExpectedSigningRegion(Region.US_WEST_2));
cases.add(new TestCase().setCaseName("access point with http, path, query, port, different arn region, and arn region enabled")
.setGetObjectBucketName("arn:aws:s3:us-west-2:123456789012:accesspoint:myendpoint")
.setEndpointUrl("http://accesspoint.vpce-123-abc.s3.us-west-2.vpce.amazonaws.com:1234/path?foo=bar")
.setS3Configuration(c -> c.useArnRegionEnabled(true))
.setClientRegion(Region.EU_WEST_1)
.setExpectedEndpoint("http://myendpoint-123456789012.accesspoint.vpce-123-abc.s3.us-west-2.vpce.amazonaws.com:1234/path/object?foo=bar")
.setExpectedSigningServiceName("s3")
.setExpectedSigningRegion(Region.US_WEST_2));

cases.add(new TestCase().setCaseName("outposts access point with dual stack enabled via s3 config")
.setGetObjectBucketName("arn:aws:s3-outposts:us-west-2:123456789012:outpost:op-01234567890123456:accesspoint:myaccesspoint")
Expand Down