Skip to content

Commit 522b399

Browse files
committed
new todos
1 parent 76315f4 commit 522b399

File tree

5 files changed

+23
-4
lines changed

5 files changed

+23
-4
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ namespace Aws
114114
* Returns empty credentials object.
115115
*/
116116
inline AWSCredentials GetAWSCredentials() override { return AWSCredentials(); }
117+
117118
};
118119

119120
/**

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ bool AWSCredentialsProvider::IsTimeToRefresh(long reloadFrequency)
6868
static const char* ENVIRONMENT_LOG_TAG = "EnvironmentAWSCredentialsProvider";
6969

7070

71-
AWSCredentials EnvironmentAWSCredentialsProvider::GetAWSCredentials()
71+
AWSCredentials EnvironmentAWSCredentialsProvider::GetAWSCredentials() //pass in request or return request for tracking
7272
{
7373
auto accessKey = Aws::Environment::GetEnv(ACCESS_KEY_ENV_VAR);
7474
AWSCredentials credentials;
@@ -103,6 +103,12 @@ AWSCredentials EnvironmentAWSCredentialsProvider::GetAWSCredentials()
103103
}
104104
}
105105

106+
if (!credentials.IsEmpty()) {
107+
// TODO: this will work
108+
// TODO: how does request get here?????
109+
// request.AddFeature(ENV_VAR)
110+
}
111+
106112
return credentials;
107113
}
108114

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ AWSCredentials AWSCredentialsProviderChain::GetAWSCredentials()
3434
AWSCredentials credentials = credentialsProvider->GetAWSCredentials();
3535
if (!credentials.GetAWSAccessKeyId().empty() && !credentials.GetAWSSecretKey().empty())
3636
{
37+
// TODO: issue of only chain, not overidden
38+
// which credentials were used -- add it somethow
39+
// request.addFeatureTrack(credential_type)
3740
m_cachedProvider = credentialsProvider;
3841
return credentials;
3942
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -593,5 +593,5 @@ Aws::Utils::ByteBuffer AWSAuthV4Signer::ComputeHash(const Aws::String& secretKey
593593

594594
Aws::Auth::AWSCredentials AWSAuthV4Signer::GetCredentials(const std::shared_ptr<Aws::Http::ServiceSpecificParameters> &serviceSpecificParameters) const {
595595
AWS_UNREFERENCED_PARAM(serviceSpecificParameters);
596-
return m_credentialsProvider->GetAWSCredentials();
596+
return m_credentialsProvider->GetAWSCredentials();//
597597
}

tests/aws-cpp-sdk-core-tests/aws/auth/CredentialTrackingTest.cpp

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ class CredentialTrackingTest : public Aws::Testing::AwsCppSdkGTestSuite
4545
TEST_F(CredentialTrackingTest, TestEnvironmentCredentialsTracking)
4646
{
4747
// Set environment variables
48-
Aws::Environment::SetEnv("AWS_ACCESS_KEY_ID", "test-access-key");
49-
Aws::Environment::SetEnv("AWS_SECRET_ACCESS_KEY", "test-secret-key");
48+
Aws::Environment::SetEnv("AWS_ACCESS_KEY_ID", "test-access-key", 1);
49+
Aws::Environment::SetEnv("AWS_SECRET_ACCESS_KEY", "test-secret-key", 1);
5050

5151
// Setup mock response
5252
auto request = CreateHttpRequest(Aws::Http::URI("http://test.com"),
@@ -88,4 +88,13 @@ TEST_F(CredentialTrackingTest, TestEnvironmentCredentialsTracking)
8888
// Clean up environment variables
8989
Aws::Environment::UnSetEnv("AWS_ACCESS_KEY_ID");
9090
Aws::Environment::UnSetEnv("AWS_SECRET_ACCESS_KEY");
91+
}
92+
93+
TEST_F(CredentialTrackingTest, TestEnvironmentProviderType)
94+
{
95+
// Test that EnvironmentAWSCredentialsProvider has correct provider type
96+
auto envProvider = Aws::MakeShared<EnvironmentAWSCredentialsProvider>(ALLOCATION_TAG);
97+
98+
// Verify the provider type is set correctly
99+
EXPECT_EQ(envProvider->GetProviderType(), Aws::Auth::CredentialProviderType::ENVIRONMENT);
91100
}

0 commit comments

Comments
 (0)