Check for UA overwrite

Author: kai-ion

src/aws-cpp-sdk-core/include/aws/core/auth/AWSCredentials.h

@@ -38,8 +38,34 @@ namespace Aws
             return m_features;
           }
 
+          /**
+           * Set the user agent for this context
+           */
+          void SetUserAgent(const std::shared_ptr<Aws::Client::UserAgent>& userAgent)
+          {
+            m_userAgent = userAgent;
+          }
+
+          /**
+           * Get the user agent associated with this context
+           */
+          const std::shared_ptr<Aws::Client::UserAgent>& GetUserAgent() const
+          {
+            return m_userAgent;
+          }
+
+          /**
+           * Check if this context has a custom user agent
+           */
+          bool HasCustomUserAgent() const
+          {
+            return m_userAgent && m_userAgent->HasOverrideUserAgent();
+          }
+
+
         private:
           Aws::Set<Aws::Client::UserAgentFeature> m_features;
+          std::shared_ptr<Aws::Client::UserAgent> m_userAgent;
         };
 
         /**

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

@@ -612,6 +612,11 @@ void AWSAuthV4Signer::UpdateUserAgentWithCredentialFeatures(Aws::Http::HttpReque
         return;
     }
 
+    if (context.HasCustomUserAgent()) {
+      AWS_LOGSTREAM_DEBUG(v4LogTag, "Custom User-Agent detected, skipping credential feature update");
+      return;
+    }
+
     const auto features = context.GetUserAgentFeatures();
     if (features.empty()) {
         AWS_LOGSTREAM_DEBUG(v4LogTag, "No credential features to add to User-Agent");