refactor code

Author: kai-ion

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

@@ -208,27 +208,22 @@ namespace Aws
 #endif
         }
 
-    EC2MetadataClient::EC2MetadataClient(const Aws::Client::ClientConfiguration::CredentialProviderConfiguration& credentialConfig,
-                                         const char* endpoint)
-        : AWSHttpResourceClient(
-              [&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) {
+      EC2MetadataClient::EC2MetadataClient(const Aws::Client::ClientConfiguration::CredentialProviderConfiguration& credentialConfig,
+                                               const char* endpoint)
+              : AWSHttpResourceClient(
+                    [&credentialConfig]() -> ClientConfiguration{
+                      Aws::Client::ClientConfiguration clientConfig{credentialConfig.profile.c_str()};
+                      clientConfig.region = credentialConfig.region;
+                      clientConfig.credentialProviderConfig = credentialConfig;
+                      clientConfig.requestTimeoutMs = credentialConfig.imdsConfig.metadataServiceTimeout * 1000;
+                      clientConfig.retryStrategy = credentialConfig.imdsConfig.imdsRetryStrategy;
+                      return clientConfig;
+                    }(),
+                    EC2_METADATA_CLIENT_LOG_TAG),
+                m_endpoint(endpoint),
+                m_disableIMDS(credentialConfig.imdsConfig.disableImds),
+                m_tokenRequired(true),
+                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");
@@ -437,21 +432,9 @@ namespace Aws
             return Aws::String(m_endpoint);
         }
 
-        #ifdef _MSC_VER
-            // VS2015 compiler's bug, warning s_ec2metadataClient: symbol will be dynamically initialized (implementation limitation)
-            AWS_SUPPRESS_WARNING(4592,
-                static std::shared_ptr<EC2MetadataClient> s_ec2metadataClient(nullptr);
-            )
-        #else
-            static std::shared_ptr<EC2MetadataClient> s_ec2metadataClient(nullptr);
-        #endif
-
-        void InitEC2MetadataClient(const Aws::Client::ClientConfiguration::CredentialProviderConfiguration& credentialConfig) {
-          if (s_ec2metadataClient)
-          {
-            return;
-          }
-          Aws::String ec2MetadataServiceEndpoint = Aws::Environment::GetEnv("AWS_EC2_METADATA_SERVICE_ENDPOINT");
+        static Aws::String CalculateEC2MetadataServiceEndpoint()
+        {
+            Aws::String ec2MetadataServiceEndpoint = Aws::Environment::GetEnv("AWS_EC2_METADATA_SERVICE_ENDPOINT");
             if (ec2MetadataServiceEndpoint.empty())
             {
                 Aws::String ec2MetadataServiceEndpointMode = Aws::Environment::GetEnv("AWS_EC2_METADATA_SERVICE_ENDPOINT_MODE").c_str();
@@ -482,8 +465,26 @@ namespace Aws
                     }
                 }
             }
-            AWS_LOGSTREAM_INFO(EC2_METADATA_CLIENT_LOG_TAG, "Using IMDS endpoint: " << ec2MetadataServiceEndpoint);
-            s_ec2metadataClient = Aws::MakeShared<EC2MetadataClient>(EC2_METADATA_CLIENT_LOG_TAG, credentialConfig, ec2MetadataServiceEndpoint.c_str());
+            return ec2MetadataServiceEndpoint;
+        }
+
+        #ifdef _MSC_VER
+            // VS2015 compiler's bug, warning s_ec2metadataClient: symbol will be dynamically initialized (implementation limitation)
+            AWS_SUPPRESS_WARNING(4592,
+                static std::shared_ptr<EC2MetadataClient> s_ec2metadataClient(nullptr);
+            )
+        #else
+            static std::shared_ptr<EC2MetadataClient> s_ec2metadataClient(nullptr);
+        #endif
+
+        void InitEC2MetadataClient(const Aws::Client::ClientConfiguration::CredentialProviderConfiguration& credentialConfig) {
+          if (s_ec2metadataClient)
+          {
+            return;
+          }
+          Aws::String ec2MetadataServiceEndpoint = CalculateEC2MetadataServiceEndpoint();
+          AWS_LOGSTREAM_INFO(EC2_METADATA_CLIENT_LOG_TAG, "Using IMDS endpoint: " << ec2MetadataServiceEndpoint);
+          s_ec2metadataClient = Aws::MakeShared<EC2MetadataClient>(EC2_METADATA_CLIENT_LOG_TAG, credentialConfig, ec2MetadataServiceEndpoint.c_str());
         }
 
         void InitEC2MetadataClient()
@@ -492,37 +493,7 @@ namespace Aws
             {
                 return;
             }
-            Aws::String ec2MetadataServiceEndpoint = Aws::Environment::GetEnv("AWS_EC2_METADATA_SERVICE_ENDPOINT");
-            if (ec2MetadataServiceEndpoint.empty())
-            {
-                Aws::String ec2MetadataServiceEndpointMode = Aws::Environment::GetEnv("AWS_EC2_METADATA_SERVICE_ENDPOINT_MODE").c_str();
-                if (ec2MetadataServiceEndpointMode.length() == 0 )
-                {
-                    ec2MetadataServiceEndpoint = "http://169.254.169.254"; //default to IPv4 default endpoint
-                }
-                else
-                {
-                    if (ec2MetadataServiceEndpointMode.length() == 4 )
-                    {
-                        if (Aws::Utils::StringUtils::CaselessCompare(ec2MetadataServiceEndpointMode.c_str(), "ipv4"))
-                        {
-                            ec2MetadataServiceEndpoint = "http://169.254.169.254"; //default to IPv4 default endpoint
-                        }
-                        else if (Aws::Utils::StringUtils::CaselessCompare(ec2MetadataServiceEndpointMode.c_str(), "ipv6"))
-                        {
-                            ec2MetadataServiceEndpoint = "http://[fd00:ec2::254]";
-                        }
-                        else
-                        {
-                            AWS_LOGSTREAM_ERROR(EC2_METADATA_CLIENT_LOG_TAG, "AWS_EC2_METADATA_SERVICE_ENDPOINT_MODE can only be set to ipv4 or ipv6, received: " << ec2MetadataServiceEndpointMode );
-                        }
-                    }
-                    else
-                    {
-                        AWS_LOGSTREAM_ERROR(EC2_METADATA_CLIENT_LOG_TAG, "AWS_EC2_METADATA_SERVICE_ENDPOINT_MODE can only be set to ipv4 or ipv6, received: " << ec2MetadataServiceEndpointMode );
-                    }
-                }
-            }
+            Aws::String ec2MetadataServiceEndpoint = CalculateEC2MetadataServiceEndpoint();
             AWS_LOGSTREAM_INFO(EC2_METADATA_CLIENT_LOG_TAG, "Using IMDS endpoint: " << ec2MetadataServiceEndpoint);
             s_ec2metadataClient = Aws::MakeShared<EC2MetadataClient>(EC2_METADATA_CLIENT_LOG_TAG, ec2MetadataServiceEndpoint.c_str());
         }