update to use getglobalendpointurl to match rest of sdk

Author: kai-ion

src/aws-cpp-sdk-core/include/aws/core/config/AWSProfileConfig.h

@@ -103,6 +103,10 @@ namespace Aws
             inline void SetSourceProfile(const Aws::String& value ) { m_sourceProfile = value; }
             inline const Aws::String& GetCredentialProcess() const { return m_credentialProcess; }
             inline void SetCredentialProcess(const Aws::String& value ) { m_credentialProcess = value; }
+            inline Aws::String GetGlobalEndpointUrl() const { return m_endpointUrl; }
+            inline void SetGlobalEndpointUrl(const Aws::String& value) { m_endpointUrl = value; }
+            inline Services GetServices() const { return m_services; }
+            inline void SetServices(Services&& services) { m_services = std::move(services); }
             inline void SetAllKeyValPairs(const Aws::Map<Aws::String, Aws::String>& map) { m_allKeyValPairs = map; }
             inline void SetAllKeyValPairs(Aws::Map<Aws::String, Aws::String>&& map) { m_allKeyValPairs = std::move(map); }
             inline const Aws::String GetValue(const Aws::String& key) const
@@ -112,14 +116,6 @@ namespace Aws
                 return iter->second;
             }
 
-            inline const Services& GetServices() const { return m_services; }
-            inline void SetServices(Services&& services) { m_services = std::move(services); }
-
-            inline Aws::Crt::Optional<Aws::String> GetGlobalEndpointUrl() const {
-                const Aws::String& endpoint = GetValue("endpoint_url");
-                return endpoint.empty() ? Aws::Crt::Optional<Aws::String>() : Aws::Crt::Optional<Aws::String>(endpoint);
-            }
-
             inline bool IsSsoSessionSet() const { return m_ssoSessionSet; }
             inline const SsoSession& GetSsoSession() const { return m_ssoSession; }
             inline void SetSsoSession(const SsoSession& value) { m_ssoSessionSet = true; m_ssoSession = value; }
@@ -138,6 +134,7 @@ namespace Aws
             Aws::String m_ssoAccountId;
             Aws::String m_ssoRoleName;
             Aws::String m_defaultsMode;
+            Aws::String m_endpointUrl;
             Aws::Map<Aws::String, Aws::String> m_allKeyValPairs;
             Services m_services;
 

src/aws-cpp-sdk-core/source/config/AWSConfigFileProfileConfigLoader.cpp

@@ -77,7 +77,8 @@ namespace Aws
                  {EXTERNAL_ID_KEY, &Profile::SetExternalId, &Profile::GetExternalId},
                  {CREDENTIAL_PROCESS_COMMAND, &Profile::SetCredentialProcess, &Profile::GetCredentialProcess},
                  {SOURCE_PROFILE_KEY, &Profile::SetSourceProfile, &Profile::GetSourceProfile},
-                 {DEFAULTS_MODE_KEY, &Profile::SetDefaultsMode, &Profile::GetDefaultsMode}};
+                 {DEFAULTS_MODE_KEY, &Profile::SetDefaultsMode, &Profile::GetDefaultsMode},
+                 {ENDPOINT_URL_KEY, &Profile::SetGlobalEndpointUrl, &Profile::GetGlobalEndpointUrl}};
 
         template<typename EntryT, size_t N>
         const EntryT* FindInStaticArray(const EntryT (&array)[N], const Aws::String& searchKey)

tests/aws-cpp-sdk-core-tests/aws/config/ServiceEndpointsConfigFileLoaderTest.cpp

@@ -43,8 +43,8 @@ TEST_F(ServiceEndpointsConfigFileLoaderTest, TestServiceSpecificEndpoints)
     ASSERT_NE(profiles.end(), profileIt);
     const auto& profile = profileIt->second;
     auto globalEndpoint = profile.GetGlobalEndpointUrl();
-    ASSERT_TRUE(globalEndpoint.has_value());
-    ASSERT_STREQ("https://global.example.com", globalEndpoint->c_str());
+    ASSERT_FALSE(globalEndpoint.empty());
+    ASSERT_STREQ("https://global.example.com", globalEndpoint.c_str());
 
     // Test services endpoints are parsed correctly
     const auto& services = profile.GetServices();
@@ -76,7 +76,7 @@ TEST_F(ServiceEndpointsConfigFileLoaderTest, TestServiceSpecificEndpointsOnly)
 
     // Test that global endpoint is null when not set
     auto globalEndpoint = profile.GetGlobalEndpointUrl();
-    ASSERT_FALSE(globalEndpoint.has_value());
+    ASSERT_TRUE(globalEndpoint.empty());
 
     // Test services endpoints are parsed correctly
     const auto& services = profile.GetServices();
@@ -104,8 +104,8 @@ TEST_F(ServiceEndpointsConfigFileLoaderTest, TestGlobalEndpointOnly)
 
     // Test global endpoint
     auto globalEndpoint = profile.GetGlobalEndpointUrl();
-    ASSERT_TRUE(globalEndpoint.has_value());
-    ASSERT_STREQ("https://play.min.io:9000", globalEndpoint->c_str());
+    ASSERT_FALSE(globalEndpoint.empty());
+    ASSERT_STREQ("https://play.min.io:9000", globalEndpoint.c_str());
 
     // Test that services endpoints are not set
     const auto& services = profile.GetServices();
@@ -141,8 +141,8 @@ TEST_F(ServiceEndpointsConfigFileLoaderTest, TestServiceSpecificAndGlobalEndpoin
 
     // Test global endpoint
     auto globalEndpoint = profile.GetGlobalEndpointUrl();
-    ASSERT_TRUE(globalEndpoint.has_value());
-    ASSERT_STREQ("http://localhost:1234", globalEndpoint->c_str());
+    ASSERT_FALSE(globalEndpoint.empty());
+    ASSERT_STREQ("http://localhost:1234", globalEndpoint.c_str());
 }
 
 TEST_F(ServiceEndpointsConfigFileLoaderTest, TestMultipleServicesInDefinition)
@@ -195,7 +195,7 @@ TEST_F(ServiceEndpointsConfigFileLoaderTest, TestIgnoreGlobalEndpointInServicesS
 
     // Test that global endpoint in services section is ignored
     auto globalEndpoint = profile.GetGlobalEndpointUrl();
-    ASSERT_FALSE(globalEndpoint.has_value());
+    ASSERT_TRUE(globalEndpoint.empty());
 
     // Test that services endpoints are empty (global endpoint_url ignored)
     const auto& services = profile.GetServices();
@@ -240,12 +240,12 @@ TEST_F(ServiceEndpointsConfigFileLoaderTest, TestSourceProfileEndpointIsolation)
 
     // Test that profile B has no global endpoint (doesn't inherit from profile A)
     auto globalEndpointB = profileB.GetGlobalEndpointUrl();
-    ASSERT_FALSE(globalEndpointB.has_value());
+    ASSERT_TRUE(globalEndpointB.empty());
 
     // Test that profile A still has its own global endpoint
     auto globalEndpointA = profileA.GetGlobalEndpointUrl();
-    ASSERT_TRUE(globalEndpointA.has_value());
-    ASSERT_STREQ("https://profile-a-endpoint.aws/", globalEndpointA->c_str());
+    ASSERT_FALSE(globalEndpointA.empty());
+    ASSERT_STREQ("https://profile-a-endpoint.aws/", globalEndpointA.c_str());
 
     // Test that profile A has no services name
     const auto& servicesA = profileA.GetServices();
@@ -325,8 +325,8 @@ TEST_F(ServiceEndpointsConfigFileLoaderTest, TestDuplicateGlobalEndpointUrl)
 
     // Test that last value wins for duplicate global endpoint_url
     auto globalEndpoint = profile.GetGlobalEndpointUrl();
-    ASSERT_TRUE(globalEndpoint.has_value());
-    ASSERT_STREQ("https://play2.min.io:9000", globalEndpoint->c_str());
+    ASSERT_FALSE(globalEndpoint.empty());
+    ASSERT_STREQ("https://play2.min.io:9000", globalEndpoint.c_str());
 }
 
 TEST_F(ServiceEndpointsConfigFileLoaderTest, TestDuplicateServiceEndpointUrl)
@@ -385,8 +385,8 @@ TEST_F(ServiceEndpointsConfigFileLoaderTest, TestMixedDuplicateEndpoints)
 
     // Test that last global endpoint_url wins
     auto globalEndpoint = profile.GetGlobalEndpointUrl();
-    ASSERT_TRUE(globalEndpoint.has_value());
-    ASSERT_STREQ("https://global2.example.com", globalEndpoint->c_str());
+    ASSERT_FALSE(globalEndpoint.empty());
+    ASSERT_STREQ("https://global2.example.com", globalEndpoint.c_str());
 
     // Test that last service endpoint_url wins, but other services remain
     const auto& services = profile.GetServices();