New Max Attemp Retry Strategy

Author: kai-ion

src/aws-cpp-sdk-core/include/aws/core/client/ClientConfiguration.h

@@ -501,7 +501,7 @@ namespace Aws
                * Number of total attempts to make when retrieving data from IMDS. Default 1.
                */
               long metadataServiceNumAttempts = 1;
-
+              
               /**
                * Timeout in seconds when retrieving data from IMDS. Default 1.
                */
@@ -512,20 +512,15 @@ namespace Aws
                */
               std::shared_ptr<RetryStrategy> imdsRetryStrategy;
             } imdsConfig;
-
-            /**
-             * Region to use for calls
-             */
-            Aws::String region;
           }credentialProviderConfig;
         };
 
         /**
          * A helper function to initialize a retry strategy.
          * Default is DefaultRetryStrategy (i.e. exponential backoff)
          */
-        AWS_CORE_API std::shared_ptr<RetryStrategy> InitRetryStrategy(Aws::String retryMode = "");
-        AWS_CORE_API std::shared_ptr<RetryStrategy> InitRetryStrategy(int maxRetries, Aws::String retryMode = "");
+        std::shared_ptr<RetryStrategy> InitRetryStrategy(Aws::String retryMode = "");
+        std::shared_ptr<RetryStrategy> InitRetryStrategy(int maxAttempts, Aws::String retryMode = "");
 
         /**
          * A helper function to compute a user agent

src/aws-cpp-sdk-core/source/client/ClientConfiguration.cpp

@@ -316,10 +316,9 @@ void setConfigFromEnvOrProfile(ClientConfiguration &config)
     long attempts = static_cast<long>(Aws::Utils::StringUtils::ConvertToInt32(numAttemptsStr.c_str()));
     config.credentialProviderConfig.imdsConfig.metadataServiceNumAttempts = attempts;
 
-    // Ensure retry strategy is set using factory pattern
-    if (!config.retryStrategy) {
-        config.retryStrategy = config.configFactories.retryStrategyCreateFn();
-    }
+    // Initialize IMDS-specific retry strategy with configured number of attempts
+    // Uses default retry mode with the specified max attempts from metadata_service_num_attempts
+    config.credentialProviderConfig.imdsConfig.imdsRetryStrategy = InitRetryStrategy(attempts, "");
 }
 
 ClientConfiguration::ClientConfiguration()

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

@@ -82,7 +82,7 @@ namespace Aws
         AWSHttpResourceClient::AWSHttpResourceClient(const Aws::Client::ClientConfiguration& clientConfiguration, const char* logtag)
         : m_logtag(logtag),
           m_userAgent(Aws::Client::ComputeUserAgentString(&clientConfiguration)),
-          m_retryStrategy(clientConfiguration.retryStrategy),
+          m_retryStrategy(clientConfiguration.retryStrategy ? clientConfiguration.retryStrategy : clientConfiguration.configFactories.retryStrategyCreateFn()),
           m_httpClient(nullptr)
         {
             AWS_LOGSTREAM_INFO(m_logtag.c_str(),
@@ -213,10 +213,8 @@ namespace Aws
                   [&credentialConfig]() -> ClientConfiguration{
                     Aws::Client::ClientConfiguration clientConfig;
                     clientConfig.credentialProviderConfig = credentialConfig;
-                    clientConfig.connectTimeoutMs = credentialConfig.imdsConfig.metadataServiceTimeout * 1000;
                     clientConfig.requestTimeoutMs = credentialConfig.imdsConfig.metadataServiceTimeout * 1000;
-                    clientConfig.retryStrategy = Aws::MakeShared<DefaultRetryStrategy>(
-                        RESOURCE_CLIENT_CONFIGURATION_ALLOCATION_TAG, credentialConfig.imdsConfig.metadataServiceNumAttempts - 1, 1000);
+                    clientConfig.retryStrategy = credentialConfig.imdsConfig.imdsRetryStrategy;
                     return clientConfig;
                   }(),
                   EC2_METADATA_CLIENT_LOG_TAG),