added a test for multiple services definition

removed unused map

Author: kai-ion

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

@@ -8,7 +8,6 @@
 #include <aws/core/config/AWSProfileConfigLoaderBase.h>
 
 #include <aws/core/utils/memory/stl/AWSString.h>
-#include <aws/core/utils/memory/stl/AWSMap.h>
 
 namespace Aws
 {
@@ -47,7 +46,6 @@ namespace Aws
         private:
             Aws::String m_fileName;
             bool m_useProfilePrefix;
-            Aws::Map<Aws::String, Aws::Map<Aws::String, Aws::String>> m_services;
         };
     }
 }

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

@@ -116,7 +116,6 @@ namespace Aws
             {}
 
             const Aws::Map<String, Profile>& GetProfiles() const { return m_foundProfiles; }
-            const Aws::Map<String, Aws::Map<String, String>>& GetServices() const { return m_services; }
 
             void ParseStream(Aws::IStream& stream)
             {
@@ -641,15 +640,13 @@ namespace Aws
         bool AWSConfigFileProfileConfigLoader::LoadInternal()
         {
             m_profiles.clear();
-            m_services.clear();
 
             Aws::IFStream inputFile(m_fileName.c_str());
             if(inputFile)
             {
                 ConfigFileProfileFSM parser(m_useProfilePrefix);
                 parser.ParseStream(inputFile);
                 m_profiles = parser.GetProfiles();
-                m_services = parser.GetServices();
                 return m_profiles.size() > 0;
             }
 

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

@@ -245,15 +245,30 @@ TEST_F(ServiceEndpointsConfigFileLoaderTest, TestIgnoreConfiguredEndpointUrls)
     ASSERT_STREQ("true", profiles["default"].GetValue("ignore_configured_endpoint_urls").c_str());
     ASSERT_STREQ("TRUE", profiles["test"].GetValue("ignore_configured_endpoint_urls").c_str());
     ASSERT_STREQ("", profiles["empty"].GetValue("ignore_configured_endpoint_urls").c_str());
-    
-    // Test absent key returns empty string
-    TempFile configFile2(std::ios_base::out | std::ios_base::trunc);
-    configFile2 << "[profile absent]\n";
-    configFile2 << "region = us-east-1\n";
-    configFile2.flush();
-    
-    AWSConfigFileProfileConfigLoader loader2(configFile2.GetFileName(), true);
-    ASSERT_TRUE(loader2.Load());
-    auto profiles2 = loader2.GetProfiles();
-    ASSERT_STREQ("", profiles2["absent"].GetValue("ignore_configured_endpoint_urls").c_str());
+}
+
+TEST_F(ServiceEndpointsConfigFileLoaderTest, TestMultipleServicesDefinitions)
+{
+    TempFile configFile(std::ios_base::out | std::ios_base::trunc);
+    ASSERT_TRUE(configFile.good());
+
+    configFile << "[services foo]\n";
+    configFile << "s3 =\n";
+    configFile << "  endpoint_url = http://foo.com\n";
+    configFile << "\n[services bar]\n";
+    configFile << "s3 =\n";
+    configFile << "  endpoint_url = http://bar.com\n";
+    configFile << "\n[profile dev]\n";
+    configFile << "services = foo\n";
+    configFile.flush();
+
+    AWSConfigFileProfileConfigLoader loader(configFile.GetFileName(), true);
+    ASSERT_TRUE(loader.Load());
+    auto profiles = loader.GetProfiles();
+    const auto& profile = profiles["dev"];
+
+    // Test services name is parsed correctly
+    auto servicesName = profile.GetServicesName();
+    ASSERT_TRUE(servicesName.has_value());
+    ASSERT_STREQ("foo", servicesName->c_str());
 }