reverted changes

Author: kai-ion

src/aws-cpp-sdk-core/source/internal/AWSHttpResourceClient.cpp

@@ -208,37 +208,27 @@ namespace Aws
 #endif
         }
 
-        EC2MetadataClient::EC2MetadataClient(
-            const Aws::Client::ClientConfiguration::CredentialProviderConfiguration& credentialConfig,
-            const char* endpoint)
+    EC2MetadataClient::EC2MetadataClient(const Aws::Client::ClientConfiguration::CredentialProviderConfiguration& credentialConfig,
+                                         const char* endpoint)
         : AWSHttpResourceClient(
-            [&credentialConfig]() -> Aws::Client::ClientConfiguration {
-              Aws::Client::ClientConfiguration clientConfig{credentialConfig.profile.c_str()};
-              clientConfig.region = credentialConfig.region;
-              clientConfig.credentialProviderConfig = credentialConfig;
-
-              auto imdsRetry = credentialConfig.imdsConfig.imdsRetryStrategy;
-              if (!imdsRetry) {
-                const long totalAttempts =
-                    (credentialConfig.imdsConfig.metadataServiceNumAttempts > 0)
-                      ? credentialConfig.imdsConfig.metadataServiceNumAttempts
-                      : 1; // 1 total attempt => 0 retries
-                const long maxRetries = std::max<long>(0, totalAttempts - 1);
-                imdsRetry = Aws::MakeShared<Aws::Client::DefaultRetryStrategy>(
-                    EC2_METADATA_CLIENT_LOG_TAG, maxRetries, /*scaleMs=*/1000);
-              }
-
-              clientConfig.retryStrategy = imdsRetry;
-              clientConfig.configFactories.retryStrategyCreateFn = [imdsRetry]() { return imdsRetry; };
-
-              return clientConfig;
-            }(),
-            EC2_METADATA_CLIENT_LOG_TAG),
+              [&credentialConfig]() -> ClientConfiguration{
+                Aws::Client::ClientConfiguration clientConfig{credentialConfig.profile.c_str()};
+                clientConfig.region = credentialConfig.region;
+                clientConfig.credentialProviderConfig = credentialConfig;
+                clientConfig.requestTimeoutMs = credentialConfig.imdsConfig.metadataServiceTimeout * 1000;
+                if (credentialConfig.imdsConfig.imdsRetryStrategy) {
+                        clientConfig.retryStrategy = credentialConfig.imdsConfig.imdsRetryStrategy;
+                    } else {
+                        clientConfig.retryStrategy = Aws::MakeShared<Aws::Client::DefaultRetryStrategy>(
+                                EC2_METADATA_CLIENT_LOG_TAG, credentialConfig.imdsConfig.metadataServiceNumAttempts - 1, /*scaleMs=*/500);
+                    }
+                return clientConfig;
+              }(),
+              EC2_METADATA_CLIENT_LOG_TAG),
           m_endpoint(endpoint),
           m_disableIMDS(credentialConfig.imdsConfig.disableImds),
           m_tokenRequired(true),
-          m_disableIMDSV1(credentialConfig.imdsConfig.disableImdsV1)
-        {
+          m_disableIMDSV1(credentialConfig.imdsConfig.disableImdsV1) {
 #if defined(DISABLE_IMDSV1)
           m_disableIMDSV1 = true;
           AWS_LOGSTREAM_TRACE(m_logtag.c_str(), "IMDSv1 had been disabled at the SDK build time");