Skip to content

Commit d35982f

Browse files
Update regions_by_endpoint for AWS sdk upgrade. (#131400) (#131451)
Also add test to ensure the file has at least one entry for each region so that it is easy to spot missing regions in future upgrades. Relates: #131050 Resolves: #131392 Co-authored-by: Elastic Machine <[email protected]>
1 parent 04aaea0 commit d35982f

File tree

2 files changed

+29
-0
lines changed

2 files changed

+29
-0
lines changed

modules/repository-s3/src/main/resources/org/elasticsearch/repositories/s3/regions_by_endpoint.txt

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ ap-east-1 s3-fips.ap-east-1.amazonaws.com
66
ap-east-1 s3-fips.dualstack.ap-east-1.amazonaws.com
77
ap-east-1 s3.ap-east-1.amazonaws.com
88
ap-east-1 s3.dualstack.ap-east-1.amazonaws.com
9+
ap-east-2 s3-fips.ap-east-2.amazonaws.com
10+
ap-east-2 s3-fips.dualstack.ap-east-2.amazonaws.com
11+
ap-east-2 s3.ap-east-2.amazonaws.com
12+
ap-east-2 s3.dualstack.ap-east-2.amazonaws.com
913
ap-northeast-1 s3-fips.ap-northeast-1.amazonaws.com
1014
ap-northeast-1 s3-fips.dualstack.ap-northeast-1.amazonaws.com
1115
ap-northeast-1 s3.ap-northeast-1.amazonaws.com
@@ -56,6 +60,14 @@ aws-iso-b-global s3-fips.aws-iso-b-global.sc2s.sgov.gov
5660
aws-iso-b-global s3-fips.dualstack.aws-iso-b-global.sc2s.sgov.gov
5761
aws-iso-b-global s3.aws-iso-b-global.sc2s.sgov.gov
5862
aws-iso-b-global s3.dualstack.aws-iso-b-global.sc2s.sgov.gov
63+
aws-iso-e-global s3-fips.aws-iso-e-global.cloud.adc-e.uk
64+
aws-iso-e-global s3-fips.dualstack.aws-iso-e-global.cloud.adc-e.uk
65+
aws-iso-e-global s3.aws-iso-e-global.cloud.adc-e.uk
66+
aws-iso-e-global s3.dualstack.aws-iso-e-global.cloud.adc-e.uk
67+
aws-iso-f-global s3-fips.aws-iso-f-global.csp.hci.ic.gov
68+
aws-iso-f-global s3-fips.dualstack.aws-iso-f-global.csp.hci.ic.gov
69+
aws-iso-f-global s3.aws-iso-f-global.csp.hci.ic.gov
70+
aws-iso-f-global s3.dualstack.aws-iso-f-global.csp.hci.ic.gov
5971
aws-iso-global s3-fips.aws-iso-global.c2s.ic.gov
6072
aws-iso-global s3-fips.dualstack.aws-iso-global.c2s.ic.gov
6173
aws-iso-global s3.aws-iso-global.c2s.ic.gov
@@ -76,6 +88,10 @@ cn-north-1 s3.cn-north-1.amazonaws.com.cn
7688
cn-north-1 s3.dualstack.cn-north-1.amazonaws.com.cn
7789
cn-northwest-1 s3.cn-northwest-1.amazonaws.com.cn
7890
cn-northwest-1 s3.dualstack.cn-northwest-1.amazonaws.com.cn
91+
eusc-de-east-1 s3-fips.eusc-de-east-1.amazonaws.eu
92+
eusc-de-east-1 s3-fips.dualstack.eusc-de-east-1.amazonaws.eu
93+
eusc-de-east-1 s3.eusc-de-east-1.amazonaws.eu
94+
eusc-de-east-1 s3.dualstack.eusc-de-east-1.amazonaws.eu
7995
eu-central-1 s3-fips.dualstack.eu-central-1.amazonaws.com
8096
eu-central-1 s3-fips.eu-central-1.amazonaws.com
8197
eu-central-1 s3.dualstack.eu-central-1.amazonaws.com

modules/repository-s3/src/test/java/org/elasticsearch/repositories/s3/RegionFromEndpointGuesserTests.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@
99

1010
package org.elasticsearch.repositories.s3;
1111

12+
import software.amazon.awssdk.endpoints.Endpoint;
13+
import software.amazon.awssdk.regions.Region;
14+
import software.amazon.awssdk.services.s3.endpoints.S3EndpointParams;
15+
import software.amazon.awssdk.services.s3.endpoints.internal.DefaultS3EndpointProvider;
16+
1217
import org.elasticsearch.core.Nullable;
1318
import org.elasticsearch.test.ESTestCase;
1419

@@ -23,6 +28,14 @@ public void testRegionGuessing() {
2328
assertRegionGuess("random.endpoint.internal.net", null);
2429
}
2530

31+
public void testHasEntryForEachRegion() {
32+
final var defaultS3EndpointProvider = new DefaultS3EndpointProvider();
33+
for (var region : Region.regions()) {
34+
final Endpoint endpoint = safeGet(defaultS3EndpointProvider.resolveEndpoint(S3EndpointParams.builder().region(region).build()));
35+
assertNotNull(region.id(), RegionFromEndpointGuesser.guessRegion(endpoint.url().toString()));
36+
}
37+
}
38+
2639
private static void assertRegionGuess(String endpoint, @Nullable String expectedRegion) {
2740
assertEquals(endpoint, expectedRegion, RegionFromEndpointGuesser.guessRegion(endpoint));
2841
}

0 commit comments

Comments
 (0)