Skip to content

Commit 0381733

Browse files
committed
fix minor stuff
1 parent bb8bc07 commit 0381733

File tree

5 files changed

+2
-20
lines changed

5 files changed

+2
-20
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ enum class UserAgentFeature {
3232
ACCOUNT_ID_MODE_REQUIRED,
3333
RESOLVED_ACCOUNT_ID,
3434
GZIP_REQUEST_COMPRESSION,
35-
CREDENTIALS_CODE,
3635
CREDENTIALS_ENV_VARS,
3736
CREDENTIALS_PROFILE,
3837
CREDENTIALS_PROFILE_PROCESS,

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ AWSCredentials AWSCredentialsProviderChain::GetAWSCredentials()
2525
AWSCredentials credentials = m_cachedProvider->GetAWSCredentials();
2626
if (!credentials.GetAWSAccessKeyId().empty() && !credentials.GetAWSSecretKey().empty())
2727
{
28-
credentials.AddUserAgentFeature(Aws::Client::UserAgentFeature::CREDENTIALS_CODE);
2928
return credentials;
3029
}
3130
}
@@ -36,7 +35,6 @@ AWSCredentials AWSCredentialsProviderChain::GetAWSCredentials()
3635
if (!credentials.GetAWSAccessKeyId().empty() && !credentials.GetAWSSecretKey().empty())
3736
{
3837
m_cachedProvider = credentialsProvider;
39-
credentials.AddUserAgentFeature(Aws::Client::UserAgentFeature::CREDENTIALS_CODE);
4038
return credentials;
4139
}
4240
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ const std::pair<UserAgentFeature, const char*> BUSINESS_METRIC_MAPPING[] = {
4242
{UserAgentFeature::ACCOUNT_ID_MODE_REQUIRED, "R"},
4343
{UserAgentFeature::RESOLVED_ACCOUNT_ID, "T"},
4444
{UserAgentFeature::GZIP_REQUEST_COMPRESSION, "L"},
45-
{UserAgentFeature::CREDENTIALS_CODE, "e"},
4645
{UserAgentFeature::CREDENTIALS_ENV_VARS, "g"},
4746
{UserAgentFeature::CREDENTIALS_PROFILE, "n"},
4847
{UserAgentFeature::CREDENTIALS_PROFILE_PROCESS, "v"},

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

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -152,20 +152,6 @@ class CredentialTrackingTest : public Aws::Testing::AwsCppSdkGTestSuite
152152
}
153153
};
154154

155-
TEST_F(CredentialTrackingTest, TestCredentialsCodeTracking)
156-
{
157-
// Set up environment credentials for the provider chain
158-
Aws::Environment::EnvironmentRAII testEnvironment{{
159-
{"AWS_ACCESS_KEY_ID", "test-access-key"},
160-
{"AWS_SECRET_ACCESS_KEY", "test-secret-key"},
161-
}};
162-
163-
// Use DefaultAWSCredentialsProviderChain which will add CREDENTIALS_CODE
164-
auto credsProvider = Aws::MakeShared<Aws::Auth::DefaultAWSCredentialsProviderChain>(TEST_LOG_TAG);
165-
RunTestWithCredentialsProvider(std::move(credsProvider), "e");
166-
}
167-
168-
169155
TEST_F(CredentialTrackingTest, TestEnvironmentCredentialsTracking)
170156
{
171157
Aws::Environment::EnvironmentRAII testEnvironment{{

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ class CredentialTestingClient : public AWSClient
4141
{
4242
public:
4343
CredentialTestingClient() : AWSClient(ClientConfiguration(), Aws::MakeShared<AWSAuthV4Signer>(TEST_LOG_TAG, Aws::MakeShared<DefaultAWSCredentialsProviderChain>(TEST_LOG_TAG),
44-
"rds", Aws::Region::US_EAST_1), Aws::MakeShared<XmlErrorMarshaller>(TEST_LOG_TAG)) {}
44+
"service", Aws::Region::US_EAST_1), Aws::MakeShared<MockAWSErrorMarshaller>(TEST_LOG_TAG)) {}
4545
CredentialTestingClient(const Aws::Client::ClientConfiguration& configuration, const std::shared_ptr<Aws::Client::AWSAuthSigner>& signer) :
46-
AWSClient(configuration, signer, Aws::MakeShared<XmlErrorMarshaller>(TEST_LOG_TAG)) {}
46+
AWSClient(configuration, signer, Aws::MakeShared<MockAWSErrorMarshaller>(TEST_LOG_TAG)) {}
4747

4848
Aws::Client::HttpResponseOutcome PublicAttemptExhaustively(
4949
const Aws::Http::URI& uri,

0 commit comments

Comments
 (0)