Skip to content

Update regions_by_endpoint for AWS sdk upgrade. #131400

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
merged 10 commits into from
Jul 17, 2025
Merged

Update regions_by_endpoint for AWS sdk upgrade. #131400

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
117337e
Update regions_by_endpoint for AWS sdk upgrade.
ywangd Jul 17, 2025
0eaf6ae
Merge remote-tracking branch 'origin/main' into es-131392-fix
ywangd Jul 17, 2025
5dfa5a1
Merge branch 'main' into es-131392-fix
elasticmachine Jul 17, 2025
1fad2c3
Mute org.elasticsearch.packaging.test.DockerTests test072RunEsAsDiffe…
elasticsearchmachine Jul 17, 2025
aadf40c
ESQL: Fix inconsistent column order in MV_EXPAND (#129745)
kanoshiou Jul 17, 2025
e3cf9bb
ES|QL categorize options (#131104)
jan-elastic Jul 17, 2025
8d434cc
Migrate x-pack-autoscaling REST tests (#131365)
ldematte Jul 17, 2025
7dd4af3
Remove 'index' from snapshot clear_cache query params (#131067)
pquentin Jul 17, 2025
ea0d14b
[DiskBBQ] Use PackedLongValues to hold offsets on heap while writing …
iverase Jul 17, 2025
efe9896
Merge remote-tracking branch 'origin/main' into es-131392-fix
ywangd Jul 17, 2025
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
16 changes: 16 additions & 0 deletions ...epository-s3/src/main/resources/org/elasticsearch/repositories/s3/regions_by_endpoint.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ ap-east-1 s3-fips.ap-east-1.amazonaws.com
ap-east-1 s3-fips.dualstack.ap-east-1.amazonaws.com
ap-east-1 s3.ap-east-1.amazonaws.com
ap-east-1 s3.dualstack.ap-east-1.amazonaws.com
ap-east-2 s3-fips.ap-east-2.amazonaws.com
ap-east-2 s3-fips.dualstack.ap-east-2.amazonaws.com
ap-east-2 s3.ap-east-2.amazonaws.com
ap-east-2 s3.dualstack.ap-east-2.amazonaws.com
ap-northeast-1 s3-fips.ap-northeast-1.amazonaws.com
ap-northeast-1 s3-fips.dualstack.ap-northeast-1.amazonaws.com
ap-northeast-1 s3.ap-northeast-1.amazonaws.com
Expand Down Expand Up @@ -56,6 +60,14 @@ aws-iso-b-global s3-fips.aws-iso-b-global.sc2s.sgov.gov
aws-iso-b-global s3-fips.dualstack.aws-iso-b-global.sc2s.sgov.gov
aws-iso-b-global s3.aws-iso-b-global.sc2s.sgov.gov
aws-iso-b-global s3.dualstack.aws-iso-b-global.sc2s.sgov.gov
aws-iso-e-global s3-fips.aws-iso-e-global.cloud.adc-e.uk
aws-iso-e-global s3-fips.dualstack.aws-iso-e-global.cloud.adc-e.uk
aws-iso-e-global s3.aws-iso-e-global.cloud.adc-e.uk
aws-iso-e-global s3.dualstack.aws-iso-e-global.cloud.adc-e.uk
aws-iso-f-global s3-fips.aws-iso-f-global.csp.hci.ic.gov
aws-iso-f-global s3-fips.dualstack.aws-iso-f-global.csp.hci.ic.gov
aws-iso-f-global s3.aws-iso-f-global.csp.hci.ic.gov
aws-iso-f-global s3.dualstack.aws-iso-f-global.csp.hci.ic.gov
aws-iso-global s3-fips.aws-iso-global.c2s.ic.gov
aws-iso-global s3-fips.dualstack.aws-iso-global.c2s.ic.gov
aws-iso-global s3.aws-iso-global.c2s.ic.gov
Expand All @@ -76,6 +88,10 @@ cn-north-1 s3.cn-north-1.amazonaws.com.cn
cn-north-1 s3.dualstack.cn-north-1.amazonaws.com.cn
cn-northwest-1 s3.cn-northwest-1.amazonaws.com.cn
cn-northwest-1 s3.dualstack.cn-northwest-1.amazonaws.com.cn
eusc-de-east-1 s3-fips.eusc-de-east-1.amazonaws.eu
eusc-de-east-1 s3-fips.dualstack.eusc-de-east-1.amazonaws.eu
eusc-de-east-1 s3.eusc-de-east-1.amazonaws.eu
eusc-de-east-1 s3.dualstack.eusc-de-east-1.amazonaws.eu
eu-central-1 s3-fips.dualstack.eu-central-1.amazonaws.com
eu-central-1 s3-fips.eu-central-1.amazonaws.com
eu-central-1 s3.dualstack.eu-central-1.amazonaws.com
Expand Down
13 changes: 13 additions & 0 deletions ...ry-s3/src/test/java/org/elasticsearch/repositories/s3/RegionFromEndpointGuesserTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@

package org.elasticsearch.repositories.s3;

import software.amazon.awssdk.endpoints.Endpoint;
import software.amazon.awssdk.regions.Region;
import software.amazon.awssdk.services.s3.endpoints.S3EndpointParams;
import software.amazon.awssdk.services.s3.endpoints.internal.DefaultS3EndpointProvider;

import org.elasticsearch.core.Nullable;
import org.elasticsearch.test.ESTestCase;

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

public void testHasEntryForEachRegion() {
final var defaultS3EndpointProvider = new DefaultS3EndpointProvider();
for (var region : Region.regions()) {
final Endpoint endpoint = safeGet(defaultS3EndpointProvider.resolveEndpoint(S3EndpointParams.builder().region(region).build()));
assertNotNull(region.id(), RegionFromEndpointGuesser.guessRegion(endpoint.url().toString()));
}
}

private static void assertRegionGuess(String endpoint, @Nullable String expectedRegion) {
assertEquals(endpoint, expectedRegion, RegionFromEndpointGuesser.guessRegion(endpoint));
}
Expand Down