update to use a service object instead of using getvalue

Author: kai-ion

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

@@ -20,6 +20,27 @@ namespace Aws
         class Profile
         {
         public:
+            /*
+             * Data container for service endpoints.
+             */
+            class Services
+            {
+            public:
+                inline const Aws::Map<Aws::String, Aws::String>& GetEndpoints() const { return m_endpoints; }
+                inline const Aws::String& GetServiceName() const { return m_name; }
+                inline bool IsSet() const { return m_isSet; }
+            private:
+                friend class ConfigFileProfileFSM;
+                void SetEndpoints(Aws::Map<Aws::String, Aws::String>&& endpoints, Aws::String name) {
+                    m_endpoints = std::move(endpoints);
+                    m_name = std::move(name);
+                    m_isSet = true;
+                }
+                Aws::Map<Aws::String, Aws::String> m_endpoints;
+                Aws::String m_name;
+                bool m_isSet = false;
+            };
+
             /*
              * Data container for a sso-session config entry.
              * This is independent of the general profile configuration and used by a bearer auth token provider.
@@ -94,10 +115,7 @@ namespace Aws
                 return iter->second;
             }
 
-            inline Aws::Crt::Optional<Aws::String> GetServicesName() const {
-                const Aws::String& service = GetValue("services");
-                return service.empty() ? Aws::Crt::Optional<Aws::String>() : Aws::Crt::Optional<Aws::String>(service);
-            }
+            inline const Services& GetServiceEndpoints() const { return m_services; }
 
             inline Aws::Crt::Optional<Aws::String> GetEndpointUrl() const {
                 const Aws::String& endpoint = GetValue("endpoint_url");
@@ -110,6 +128,7 @@ namespace Aws
             inline void SetSsoSession(SsoSession&& value) { m_ssoSessionSet = true; m_ssoSession = std::move(value); }
 
         private:
+            friend class ConfigFileProfileFSM;
             Aws::String m_name;
             Aws::String m_region;
             Aws::Auth::AWSCredentials m_credentials;
@@ -123,6 +142,7 @@ namespace Aws
             Aws::String m_ssoRoleName;
             Aws::String m_defaultsMode;
             Aws::Map<Aws::String, Aws::String> m_allKeyValPairs;
+            Services m_services;
 
             bool m_ssoSessionSet = false;
             SsoSession m_ssoSession;

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

@@ -206,6 +206,27 @@ namespace Aws
 
                 FlushSection(currentState, currentSectionName, currentKeyValues);
 
+                // Resolve service endpoints
+                for (auto& profilePair : m_foundProfiles)
+                {
+                    Profile& profile = profilePair.second;
+                    const Aws::String& servicesRef = profile.GetValue("services");
+                    if (!servicesRef.empty())
+                    {
+                        auto servicesBlk = m_services.find(servicesRef);
+                        if (servicesBlk == m_services.end())
+                        {
+                            // Services section exists but has no endpoints (all content was ignored)
+                            Aws::Map<Aws::String, Aws::String> emptyEndpoints;
+                            profile.m_services.SetEndpoints(std::move(emptyEndpoints), servicesRef);
+                        }
+                        else
+                        {
+                            profile.m_services.SetEndpoints(std::move(servicesBlk->second), servicesRef);
+                        }
+                    }
+                }
+
                 // Put sso-sessions into profiles
                 for(auto& profile : m_foundProfiles)
                 {

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

@@ -46,11 +46,13 @@ TEST_F(ServiceEndpointsConfigFileLoaderTest, TestServiceSpecificEndpoints)
     ASSERT_TRUE(globalEndpoint.has_value());
     ASSERT_STREQ("https://global.example.com", globalEndpoint->c_str());
 
-    // Test services name is parsed correctly
-    auto servicesName = profile.GetServicesName();
-    ASSERT_TRUE(servicesName.has_value());
-    ASSERT_STREQ("myservices", servicesName->c_str());
-
+    // Test services endpoints are parsed correctly
+    const auto& services = profile.GetServiceEndpoints();
+    ASSERT_TRUE(services.IsSet());
+    const auto& endpoints = services.GetEndpoints();
+    ASSERT_EQ(2u, endpoints.size());
+    ASSERT_EQ("http://localhost:9000", endpoints.at("S3"));
+    ASSERT_EQ("http://localhost:8000", endpoints.at("DYNAMODB"));
 }
 
 TEST_F(ServiceEndpointsConfigFileLoaderTest, TestServiceSpecificEndpointsOnly)
@@ -76,10 +78,12 @@ TEST_F(ServiceEndpointsConfigFileLoaderTest, TestServiceSpecificEndpointsOnly)
     auto globalEndpoint = profile.GetEndpointUrl();
     ASSERT_FALSE(globalEndpoint.has_value());
 
-    // Test services name is parsed correctly
-    auto servicesName = profile.GetServicesName();
-    ASSERT_TRUE(servicesName.has_value());
-    ASSERT_STREQ("s3-minio", servicesName->c_str());
+    // Test services endpoints are parsed correctly
+    const auto& services = profile.GetServiceEndpoints();
+    ASSERT_TRUE(services.IsSet());
+    const auto& endpoints = services.GetEndpoints();
+    ASSERT_EQ(1u, endpoints.size());
+    ASSERT_EQ("https://play.min.io:9000", endpoints.at("S3"));
 }
 
 TEST_F(ServiceEndpointsConfigFileLoaderTest, TestGlobalEndpointOnly)
@@ -103,9 +107,9 @@ TEST_F(ServiceEndpointsConfigFileLoaderTest, TestGlobalEndpointOnly)
     ASSERT_TRUE(globalEndpoint.has_value());
     ASSERT_STREQ("https://play.min.io:9000", globalEndpoint->c_str());
 
-    // Test that services name is not set
-    auto servicesName = profile.GetServicesName();
-    ASSERT_FALSE(servicesName.has_value());
+    // Test that services endpoints are not set
+    const auto& services = profile.GetServiceEndpoints();
+    ASSERT_FALSE(services.IsSet());
 }
 
 TEST_F(ServiceEndpointsConfigFileLoaderTest, TestServiceSpecificAndGlobalEndpoints)
@@ -128,10 +132,12 @@ TEST_F(ServiceEndpointsConfigFileLoaderTest, TestServiceSpecificAndGlobalEndpoin
     ASSERT_NE(profiles.end(), profileIt);
     const auto& profile = profileIt->second;
 
-    // Test services name is parsed correctly
-    auto servicesName = profile.GetServicesName();
-    ASSERT_TRUE(servicesName.has_value());
-    ASSERT_STREQ("s3-specific-and-global", servicesName->c_str());
+    // Test services endpoints are parsed correctly
+    const auto& services = profile.GetServiceEndpoints();
+    ASSERT_TRUE(services.IsSet());
+    const auto& endpoints = services.GetEndpoints();
+    ASSERT_EQ(1u, endpoints.size());
+    ASSERT_EQ("https://play.min.io:9000", endpoints.at("S3"));
 
     // Test global endpoint
     auto globalEndpoint = profile.GetEndpointUrl();
@@ -160,10 +166,13 @@ TEST_F(ServiceEndpointsConfigFileLoaderTest, TestMultipleServicesInDefinition)
   ASSERT_NE(profiles.end(), profileIt);
   const auto& profile = profileIt->second;
 
-  // Test services name is parsed correctly
-  auto servicesName = profile.GetServicesName();
-  ASSERT_TRUE(servicesName.has_value());
-  ASSERT_STREQ("testing-s3-and-eb", servicesName->c_str());
+  // Test services endpoints are parsed correctly
+  const auto& services = profile.GetServiceEndpoints();
+  ASSERT_TRUE(services.IsSet());
+  const auto& endpoints = services.GetEndpoints();
+  ASSERT_EQ(2u, endpoints.size());
+  ASSERT_EQ("http://localhost:4567", endpoints.at("S3"));
+  ASSERT_EQ("http://localhost:8000", endpoints.at("ELASTIC_BEANSTALK"));
 }
 
 TEST_F(ServiceEndpointsConfigFileLoaderTest, TestIgnoreGlobalEndpointInServicesSection)
@@ -188,10 +197,11 @@ TEST_F(ServiceEndpointsConfigFileLoaderTest, TestIgnoreGlobalEndpointInServicesS
     auto globalEndpoint = profile.GetEndpointUrl();
     ASSERT_FALSE(globalEndpoint.has_value());
 
-    // Test that services name is parsed correctly
-    auto servicesName = profile.GetServicesName();
-    ASSERT_TRUE(servicesName.has_value());
-    ASSERT_STREQ("bad-service-definition", servicesName->c_str());
+    // Test that services endpoints are empty (global endpoint_url ignored)
+    const auto& services = profile.GetServiceEndpoints();
+    ASSERT_TRUE(services.IsSet());
+    const auto& endpoints = services.GetEndpoints();
+    ASSERT_EQ(0u, endpoints.size());
 }
 
 TEST_F(ServiceEndpointsConfigFileLoaderTest, TestSourceProfileEndpointIsolation)
@@ -221,10 +231,12 @@ TEST_F(ServiceEndpointsConfigFileLoaderTest, TestSourceProfileEndpointIsolation)
     ASSERT_NE(profiles.end(), profileAIt);
     const auto& profileA = profileAIt->second;
 
-    // Test that profile B has services name
-    auto servicesBName = profileB.GetServicesName();
-    ASSERT_TRUE(servicesBName.has_value());
-    ASSERT_STREQ("profileB", servicesBName->c_str());
+    // Test that profile B has services endpoints
+    const auto& servicesB = profileB.GetServiceEndpoints();
+    ASSERT_TRUE(servicesB.IsSet());
+    const auto& endpointsB = servicesB.GetEndpoints();
+    ASSERT_EQ(1u, endpointsB.size());
+    ASSERT_EQ("https://profile-b-ec2-endpoint.aws", endpointsB.at("EC2"));
 
     // Test that profile B has no global endpoint (doesn't inherit from profile A)
     auto globalEndpointB = profileB.GetEndpointUrl();
@@ -236,9 +248,10 @@ TEST_F(ServiceEndpointsConfigFileLoaderTest, TestSourceProfileEndpointIsolation)
     ASSERT_STREQ("https://profile-a-endpoint.aws/", globalEndpointA->c_str());
 
     // Test that profile A has no services name
-    auto servicesAName = profileA.GetServicesName();
-    ASSERT_FALSE(servicesAName.has_value());
+    const auto& servicesA = profileA.GetServiceEndpoints();
+    ASSERT_FALSE(servicesA.IsSet());
 }
+
 TEST_F(ServiceEndpointsConfigFileLoaderTest, TestIgnoreConfiguredEndpointUrls)
 {
     TempFile configFile(std::ios_base::out | std::ios_base::trunc);
@@ -285,8 +298,10 @@ TEST_F(ServiceEndpointsConfigFileLoaderTest, TestMultipleServicesDefinitions)
     ASSERT_NE(profiles.end(), profileIt);
     const auto& profile = profileIt->second;
 
-    // Test services name is parsed correctly
-    auto servicesName = profile.GetServicesName();
-    ASSERT_TRUE(servicesName.has_value());
-    ASSERT_STREQ("foo", servicesName->c_str());
+    // Test services endpoints are parsed correctly
+    const auto& services = profile.GetServiceEndpoints();
+    ASSERT_TRUE(services.IsSet());
+    const auto& endpoints = services.GetEndpoints();
+    ASSERT_EQ(1u, endpoints.size());
+    ASSERT_EQ("http://foo.com", endpoints.at("S3"));
 }