Fix #11609

Signed-off-by: Yanlong He <[email protected]>
opensearch-project · Dec 14, 2023 · 7263a02 · 7263a02
1 parent 074bc6a
commit 7263a02
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/plugins/discovery-ec2/src/main/java/org/opensearch/discovery/ec2/AwsEc2ServiceImpl.java b/plugins/discovery-ec2/src/main/java/org/opensearch/discovery/ec2/AwsEc2ServiceImpl.java
@@ -114,7 +114,7 @@ protected String getFullEndpoint(String endpoint) {
         if (!Strings.hasText(endpoint)) {
             return null;
         }
-        if (endpoint.startsWith("http")) {
+        if (endpoint.startsWith("http://") || endpoint.startsWith("https://")) {
             return endpoint;
         }
 

diff --git a/plugins/discovery-ec2/src/test/java/org/opensearch/discovery/ec2/AwsEc2ServiceImplTests.java b/plugins/discovery-ec2/src/test/java/org/opensearch/discovery/ec2/AwsEc2ServiceImplTests.java
@@ -222,6 +222,8 @@ public void testGetFullEndpointWithoutScheme() {
         String endpoint = awsEc2ServiceImpl.getFullEndpoint(clientSettings.endpoint);
         assertEquals("https://ec2.us-west-2.amazonaws.com", endpoint);
 
+        assertEquals("https://httpserver.example.com", awsEc2ServiceImpl.getFullEndpoint("httpserver.example.com"));
+
         assertNull(awsEc2ServiceImpl.getFullEndpoint(""));
     }
 }