Revert "Only append if we have credential features"

This reverts commit 29614f4.

Author: kai-ion

src/aws-cpp-sdk-core/source/auth/signer/AWSAuthV4Signer.cpp

@@ -7,7 +7,6 @@
 #include <aws/core/auth/signer/AWSAuthSignerCommon.h>
 #include <aws/core/auth/signer/AWSAuthSignerHelper.h>
 
-#include <aws/core/AmazonWebServiceRequest.h>
 #include <aws/core/auth/AWSCredentialsProvider.h>
 #include <aws/core/client/UserAgent.h>
 #include <aws/core/http/HttpRequest.h>
@@ -27,7 +26,6 @@
 
 #include <iomanip>
 #include <cstring>
-#include <map>
 
 using namespace Aws;
 using namespace Aws::Client;
@@ -338,16 +336,11 @@ bool AWSAuthV4Signer::SignRequestWithCreds(Aws::Http::HttpRequest& request, cons
 
 bool AWSAuthV4Signer::SignRequest(Aws::Http::HttpRequest& request, const char* region, const char* serviceName, bool signBody) const
 {
-    AWSCredentials credentials = GetCredentials(request.GetServiceSpecificParameters());
-    return SignRequestWithCreds(request, credentials, region, serviceName, signBody);
-}
-
-bool AWSAuthV4Signer::SignRequest(Aws::Http::HttpRequest& request, Aws::AmazonWebServiceRequest& awsRequest, const char* region, const char* serviceName, bool signBody) const
-{
-    AWSCredentials credentials = GetCredentials(awsRequest, request.GetServiceSpecificParameters());
+    Aws::Auth::CredentialsResolutionContext context;
+    AWSCredentials credentials = GetCredentials(context, request.GetServiceSpecificParameters());
 
-    // Update User-Agent with credential tracking features added during credential resolution
-    UpdateUserAgentWithCredentialFeatures(request, awsRequest);
+    // Update User-Agent with credential tracking features from context
+    UpdateUserAgentWithCredentialFeatures(request, context);
 
     return SignRequestWithCreds(request, credentials, region, serviceName, signBody);
 }
@@ -609,77 +602,38 @@ Aws::Auth::AWSCredentials AWSAuthV4Signer::GetCredentials(const std::shared_ptr<
     return m_credentialsProvider->GetAWSCredentials();
 }
 
-Aws::Auth::AWSCredentials AWSAuthV4Signer::GetCredentials(Aws::AmazonWebServiceRequest& awsRequest, const std::shared_ptr<Aws::Http::ServiceSpecificParameters> &serviceSpecificParameters) const {
+Aws::Auth::AWSCredentials AWSAuthV4Signer::GetCredentials(Aws::Auth::CredentialsResolutionContext& context, const std::shared_ptr<Aws::Http::ServiceSpecificParameters> &serviceSpecificParameters) const {
     AWS_UNREFERENCED_PARAM(serviceSpecificParameters);
-    return m_credentialsProvider->GetAWSCredentials(awsRequest);
+    return m_credentialsProvider->GetAWSCredentials(context);
 }
 
-void AWSAuthV4Signer::UpdateUserAgentWithCredentialFeatures(Aws::Http::HttpRequest& request, const Aws::AmazonWebServiceRequest& awsRequest) const {
+void AWSAuthV4Signer::UpdateUserAgentWithCredentialFeatures(Aws::Http::HttpRequest& request, const Aws::Auth::CredentialsResolutionContext& context) const {
     if (!request.HasHeader(USER_AGENT)) {
         return;
     }
 
-    const auto& features = awsRequest.GetUserAgentFeatures();
+    const auto& features = context.GetUserAgentFeatures();
     if (features.empty()) {
         return;
     }
 
-    // Get existing User-Agent
-    Aws::String existingUA = request.GetHeaderValue(USER_AGENT);
-    
-    // Build credential metrics string
-    Aws::StringStream credentialMetrics;
-    bool firstFeature = true;
-
+    // Build credential features string
+    Aws::StringStream credentialFeatures;
     for (const auto& feature : features) {
-        char featureChar = 0;
         switch (feature) {
             case Aws::Client::UserAgentFeature::CREDENTIALS_ENV_VARS:
-                featureChar = 'g';
+                credentialFeatures << "g";
                 break;
-            // Add other credential feature mappings as needed
             default:
-                continue; // Skip non-credential features
-        }
-        
-        if (!firstFeature) {
-            credentialMetrics << ",";
+                // Skip non-credential features
+                break;
         }
-        credentialMetrics << featureChar;
-        firstFeature = false;
-    }
-
-    if (credentialMetrics.str().empty()) {
-        return;
     }
 
-    // Parse and update existing User-Agent
-    bool metricsUpdated = false;
+    // Append credential features to existing UA
+    Aws::String existingUA = request.GetHeaderValue(USER_AGENT);
     Aws::StringStream updatedUA;
-    const auto parts = Aws::Utils::StringUtils::Split(existingUA, ' ');
+    updatedUA << existingUA << " m/" << credentialFeatures.str();
 
-    for (size_t i = 0; i < parts.size(); ++i) {
-        if (i > 0) {
-            updatedUA << ' ';
-        }
-
-        if (parts[i].find("m/") == 0) {
-            // Add credentials to business metrics
-            updatedUA << parts[i];
-            if (!parts[i].empty() && parts[i].back() != '/') {
-                updatedUA << ',';
-            }
-            updatedUA << credentialMetrics.str();
-            metricsUpdated = true;
-        } else {
-            updatedUA << parts[i];
-        }
-    }
-
-    // If no metrics section found, add one
-    if (!metricsUpdated) {
-        updatedUA << " m/" << credentialMetrics.str();
-    }
-
     request.SetUserAgent(updatedUA.str());
-}
+}