changed from callback

Author: kai-ion

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

@@ -19,12 +19,11 @@
 #include <aws/core/config/AWSProfileConfigLoader.h>
 #include <aws/core/client/RetryStrategy.h>
 #include <memory>
-#include <functional>
 
 namespace Aws
 {
     class AmazonWebServiceRequest;
-    
+
     namespace Client
     {
         struct ClientConfiguration;
@@ -77,16 +76,13 @@ namespace Aws
             virtual AWSCredentials GetAWSCredentials() = 0;
 
             /**
-             * Set callback for credential usage tracking
+             * Interface that allows providers to modify the request during credential retrieval.
              */
-            virtual void SetCredentialTrackingCallback(std::function<void()> callback) { m_trackingCallback = callback; }
+            virtual AWSCredentials GetAWSCredentials(Aws::AmazonWebServiceRequest& request) {
+                AWS_UNREFERENCED_PARAM(request);
+                return GetAWSCredentials();
+            }
 
-        protected:
-            /**
-             * Call this when credentials are successfully retrieved for tracking
-             */
-            void NotifyCredentialUsage() { if (m_trackingCallback) m_trackingCallback(); }
-
         protected:
             /**
              * The default implementation keeps up with the cache times and lets you know if it's time to refresh your internal caching
@@ -97,7 +93,6 @@ namespace Aws
             mutable Aws::Utils::Threading::ReaderWriterLock m_reloadLock;
         private:
             long long m_lastLoadedMs;
-            std::function<void()> m_trackingCallback;
         };
 
         /**
@@ -154,16 +149,16 @@ namespace Aws
         class AWS_CORE_API EnvironmentAWSCredentialsProvider : public AWSCredentialsProvider
         {
         public:
-            /**
-            * Initializes environment credentials provider
-            */
-            EnvironmentAWSCredentialsProvider() = default;
-            
             /**
             * Reads AWS credentials from the Environment variables AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY and AWS_SESSION_TOKEN if they exist. If they
             * are not found, empty credentials are returned. Credentials are not cached.
             */
             AWSCredentials GetAWSCredentials() override;
+            
+            /**
+            * New interface that adds environment credential tracking to the request.
+            */
+            AWSCredentials GetAWSCredentials(Aws::AmazonWebServiceRequest& request) override;
         };
 
         /**

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

@@ -27,12 +27,7 @@ namespace Aws
              * When a credentials provider in the chain returns empty credentials,
              * We go on to the next provider until we have either exhausted the installed providers in the chain or something returns non-empty credentials.
              */
-            AWSCredentials GetAWSCredentials() override;
-            
-            /**
-             * Override to store and forward callback to providers in chain
-             */
-            void SetCredentialTrackingCallback(std::function<void()> callback) override { m_chainTrackingCallback = callback; }
+            virtual AWSCredentials GetAWSCredentials();
 
             /**
              * Gets all providers stored in this chain.
@@ -55,7 +50,6 @@ namespace Aws
             Aws::Vector<std::shared_ptr<AWSCredentialsProvider> > m_providerChain;
             std::shared_ptr<AWSCredentialsProvider> m_cachedProvider;
             mutable Aws::Utils::Threading::ReaderWriterLock m_cachedProviderLock;
-            std::function<void()> m_chainTrackingCallback;
         };
 
         /**

src/aws-cpp-sdk-core/source/auth/AWSCredentialsProvider.cpp

@@ -105,13 +105,15 @@ AWSCredentials EnvironmentAWSCredentialsProvider::GetAWSCredentials() //pass in
         }
     }
 
+    return credentials;
+}
+
+AWSCredentials EnvironmentAWSCredentialsProvider::GetAWSCredentials(Aws::AmazonWebServiceRequest& request)
+{
+    AWSCredentials credentials = GetAWSCredentials();
     if (!credentials.IsEmpty()) {
-        // TODO: this will work
-        // TODO: how does request get here?????
-        // request.AddFeature(ENV_VAR)
-        NotifyCredentialUsage();
+        request.AddUserAgentFeature(Aws::Client::UserAgentFeature::CREDENTIALS_ENV_VARS);
     }
-
     return credentials;
 }
 

src/aws-cpp-sdk-core/source/auth/AWSCredentialsProviderChain.cpp

@@ -22,8 +22,6 @@ AWSCredentials AWSCredentialsProviderChain::GetAWSCredentials()
 {
     ReaderLockGuard lock(m_cachedProviderLock);
     if (m_cachedProvider) {
-      // Forward callback to cached provider
-      m_cachedProvider->SetCredentialTrackingCallback(m_chainTrackingCallback);
       AWSCredentials credentials = m_cachedProvider->GetAWSCredentials();
       if (!credentials.GetAWSAccessKeyId().empty() && !credentials.GetAWSSecretKey().empty())
       {
@@ -33,8 +31,6 @@ AWSCredentials AWSCredentialsProviderChain::GetAWSCredentials()
     lock.UpgradeToWriterLock();
     for (auto&& credentialsProvider : m_providerChain)
     {
-        // Forward callback to each provider in chain
-        credentialsProvider->SetCredentialTrackingCallback(m_chainTrackingCallback);
         AWSCredentials credentials = credentialsProvider->GetAWSCredentials();
         if (!credentials.GetAWSAccessKeyId().empty() && !credentials.GetAWSSecretKey().empty())
         {