Add Profile computed getters using Aws::Crt::Optional for proper null handling:

  - GetServicesName() returns services definition name or empty Optional
  - GetEndpointUrl() returns global endpoint URL or empty Optional

added a test for multiple services definition

updated test to use .find before creatng the profile

update to use a service object instead of using getvalue

added 3 more tests verifying duplication urls, modify the services object with more encapsulation

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
 {
@@ -40,19 +39,13 @@ namespace Aws
              */
             void SetFileName(const Aws::String& fileName) { m_fileName = fileName; }
 
-            /**
-             * Get services map for endpoint resolution.
-             */
-            const Aws::Map<Aws::String, Aws::Map<Aws::String, Aws::String>>& GetServices() const;
-
         protected:
             virtual bool LoadInternal() override;
             virtual bool PersistInternal(const Aws::Map<Aws::String, Aws::Config::Profile>&) override;
 
         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/include/aws/core/config/AWSProfileConfig.h

@@ -20,6 +20,24 @@ namespace Aws
         class Profile
         {
         public:
+            /*
+             * Data container for service endpoints.
+             */
+            class Services
+            {
+            public:
+                Services() = default;
+                Services(Aws::Map<Aws::String, Aws::String>&& endpoints, Aws::String name)
+                    : m_endpoints(std::move(endpoints)), m_name(std::move(name)) {}
+                
+                inline Aws::Map<Aws::String, Aws::String> GetEndpoints() const { return m_endpoints; }
+                inline Aws::String GetServiceBlockName() const { return m_name; }
+                inline bool IsSet() const { return !m_name.empty(); }
+            private:
+                Aws::Map<Aws::String, Aws::String> m_endpoints;
+                Aws::String m_name;
+            };
+
             /*
              * 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,24 +112,14 @@ 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& GetServices() const { return m_services; }
+            inline void SetServices(Services&& services) { m_services = std::move(services); }
 
-            inline Aws::Crt::Optional<Aws::String> GetEndpointUrl() const {
+            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);
             }
 
-            /**
-             * Static helper that get service-specific endpoint URL for a given service.
-             */
-            static Aws::Crt::Optional<Aws::String> GetServiceEndpointUrl(
-                const Profile& profile,
-                const Aws::Map<Aws::String, Aws::Map<Aws::String, Aws::String>>& services,
-                const Aws::String& serviceId);
-
             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; }
@@ -131,6 +139,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

@@ -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)
             {
@@ -207,6 +206,22 @@ 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);
+                        Aws::Map<Aws::String, Aws::String> endpoints;
+                        if (servicesBlk != m_services.end()) {
+                            endpoints = servicesBlk->second;
+                        }
+                        profile.SetServices(Profile::Services(std::move(endpoints), servicesRef));
+                    }
+                }
+
                 // Put sso-sessions into profiles
                 for(auto& profile : m_foundProfiles)
                 {
@@ -641,15 +656,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;
             }
 
@@ -737,10 +750,5 @@ namespace Aws
 
             return false;
         }
-
-        const Aws::Map<Aws::String, Aws::Map<Aws::String, Aws::String>>& AWSConfigFileProfileConfigLoader::GetServices() const
-        {
-            return m_services;
-        }
     } // Config namespace
 } // Aws namespace