Removed Credential_source tracking and updated to add useragentfeature when we get the credentials from profile

Author: kai-ion

src/aws-cpp-sdk-core/include/aws/core/client/UserAgent.h

@@ -38,7 +38,6 @@ enum class UserAgentFeature {
   CREDENTIALS_IMDS,
   CREDENTIALS_STS_ASSUME_ROLE,
   CREDENTIALS_HTTP,
-  CREDENTIALS_PROFILE_NAMED_PROVIDER,
   CREDENTIALS_PROFILE_SOURCE_PROFILE,
 };
 

src/aws-cpp-sdk-core/source/client/UserAgent.cpp

@@ -48,7 +48,6 @@ const std::pair<UserAgentFeature, const char*> BUSINESS_METRIC_MAPPING[] = {
     {UserAgentFeature::CREDENTIALS_IMDS, "0"},
     {UserAgentFeature::CREDENTIALS_STS_ASSUME_ROLE, "i"},
     {UserAgentFeature::CREDENTIALS_HTTP, "z"},
-    {UserAgentFeature::CREDENTIALS_PROFILE_NAMED_PROVIDER, "o"},
     {UserAgentFeature::CREDENTIALS_PROFILE_SOURCE_PROFILE, "p"},
 };
 

src/aws-cpp-sdk-identity-management/source/auth/STSProfileCredentialsProvider.cpp

@@ -210,12 +210,6 @@ void STSProfileCredentialsProvider::Reload()
         profileIt->second.SetCredentials({});
     }
 
-    // Check for credential_source usage
-    const auto credentialSource = profileIt->second.GetValue("credential_source");
-    if (!credentialSource.empty() && !m_credentials.IsEmpty()) {
-        m_credentials.AddUserAgentFeature(Aws::Client::UserAgentFeature::CREDENTIALS_PROFILE_NAMED_PROVIDER);
-    }
-
     AWS_LOGSTREAM_INFO(CLASS_TAG, "Profile " << profileIt->second.GetName()
             << " has a role ARN. Attempting to load its source credentials from profile "
             << profileIt->second.GetSourceProfile());
@@ -301,7 +295,12 @@ void STSProfileCredentialsProvider::Reload()
 
         // get the role arn from the profile at the top of the stack (which hasn't been popped out yet)
         const auto arn = sourceProfiles.back()->second.GetRoleArn();
-        const auto& assumedCreds = GetCredentialsFromSTS(stsCreds, arn);
+        auto assumedCreds = GetCredentialsFromSTS(stsCreds, arn);
+
+        if (!assumedCreds.IsEmpty()) {
+          assumedCreds.AddUserAgentFeature(Aws::Client::UserAgentFeature::CREDENTIALS_PROFILE_SOURCE_PROFILE);
+        }
+
         sourceProfiles.back()->second.SetCredentials(assumedCreds);
     }
 
@@ -312,11 +311,6 @@ void STSProfileCredentialsProvider::Reload()
     }
 
     m_credentials = profileIt->second.GetCredentials();
-    
-    if (!m_credentials.IsEmpty()) {
-        m_credentials.AddUserAgentFeature(Aws::Client::UserAgentFeature::CREDENTIALS_PROFILE_SOURCE_PROFILE);
-    }
-    
     AWSCredentialsProvider::Reload();
 }