Revert "Set read timeout for fetching IMDSv2 token" (#104397)

Author: arteam

docs/changelog/104253.yaml

@@ -102,9 +102,6 @@ tasks.named("test").configure {
   } else {
     nonInputProperties.systemProperty 'java.security.policy', "file://${buildDir}/tmp/java.policy"
   }
-  if (BuildParams.random.nextBoolean()) {
-    env 'AWS_METADATA_SERVICE_TIMEOUT', '1'
-  }
 }
 
 tasks.named("check").configure {

plugins/discovery-ec2/build.gradle

@@ -8,9 +8,6 @@
 
 package org.elasticsearch.discovery.ec2;
 
-import com.amazonaws.SDKGlobalConfiguration;
-import com.amazonaws.util.StringUtils;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.elasticsearch.common.Strings;
@@ -27,11 +24,7 @@
 class AwsEc2Utils {
 
     private static final Logger logger = LogManager.getLogger(AwsEc2Utils.class);
-    // The timeout can be configured via the AWS_METADATA_SERVICE_TIMEOUT environment variable
-    private static final int TIMEOUT = Optional.ofNullable(System.getenv(SDKGlobalConfiguration.AWS_METADATA_SERVICE_TIMEOUT_ENV_VAR))
-        .filter(StringUtils::hasValue)
-        .map(s -> Integer.parseInt(s) * 1000)
-        .orElse(2000);
+    private static final int CONNECT_TIMEOUT = 2000;
     private static final int METADATA_TOKEN_TTL_SECONDS = 10;
     static final String X_AWS_EC_2_METADATA_TOKEN = "X-aws-ec2-metadata-token";
 
@@ -46,10 +39,7 @@ static Optional<String> getMetadataToken(String metadataTokenUrl) {
             try {
                 urlConnection = (HttpURLConnection) new URL(metadataTokenUrl).openConnection();
                 urlConnection.setRequestMethod("PUT");
-                // Use both timeout for connect and read timeout analogous to AWS SDK.
-                // See com.amazonaws.internal.HttpURLConnection#connectToEndpoint
-                urlConnection.setConnectTimeout(TIMEOUT);
-                urlConnection.setReadTimeout(TIMEOUT);
+                urlConnection.setConnectTimeout(CONNECT_TIMEOUT);
                 urlConnection.setRequestProperty("X-aws-ec2-metadata-token-ttl-seconds", String.valueOf(METADATA_TOKEN_TTL_SECONDS));
             } catch (IOException e) {
                 logger.warn("Unable to access the IMDSv2 URI: " + metadataTokenUrl, e);

plugins/discovery-ec2/src/main/java/org/elasticsearch/discovery/ec2/AwsEc2Utils.java

@@ -121,19 +121,6 @@ public void testTokenMetadataApiIsMisbehaving() throws Exception {
         }
     }
 
-    public void testTokenMetadataApiDoesNotRespond() throws Exception {
-        try (var metadataServer = new MetadataServer("/metadata", exchange -> {
-            assertNull(exchange.getRequestHeaders().getFirst("X-aws-ec2-metadata-token"));
-            exchange.sendResponseHeaders(200, 0);
-            exchange.getResponseBody().write("us-east-1c".getBytes(StandardCharsets.UTF_8));
-            exchange.close();
-        }, "/latest/api/token", ex -> {
-            // Intentionally don't close the connection, so the client has to time out
-        })) {
-            assertNodeAttributes(Settings.EMPTY, metadataServer.metadataUri(), metadataServer.tokenUri(), "us-east-1c");
-        }
-    }
-
     public void testTokenMetadataApiIsNotAvailable() throws Exception {
         try (var metadataServer = metadataServerWithoutToken()) {
             assertNodeAttributes(Settings.EMPTY, metadataServer.metadataUri(), metadataServer.tokenUri(), "us-east-1c");