Skip to content

Commit 546077e

Browse files
kai-ionkai-ion
committed
update the changes for code gen
1 parent 0669ff8 commit 546077e

File tree

9 files changed

+59
-3
lines changed

9 files changed

+59
-3
lines changed

‎generated/src/aws-cpp-sdk-s3-crt/include/aws/s3-crt/S3ExpressIdentityProvider.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ namespace Aws {
2828

2929
virtual S3ExpressIdentity
3030
GetS3ExpressIdentity(const std::shared_ptr<Aws::Http::ServiceSpecificParameters> &serviceSpecificParameters) = 0;
31-
31+
3232
virtual S3ExpressIdentity
3333
GetS3ExpressIdentity(Aws::Auth::CredentialsResolutionContext& context, const std::shared_ptr<Aws::Http::ServiceSpecificParameters> &serviceSpecificParameters) {
3434
AWS_UNREFERENCED_PARAM(context);
@@ -66,7 +66,7 @@ namespace Aws {
6666
virtual ~DefaultS3ExpressIdentityProvider() override = default;
6767

6868
S3ExpressIdentity GetS3ExpressIdentity(const std::shared_ptr<Aws::Http::ServiceSpecificParameters> &serviceSpecificParameters) override;
69-
69+
7070
S3ExpressIdentity GetS3ExpressIdentity(Aws::Auth::CredentialsResolutionContext& context, const std::shared_ptr<Aws::Http::ServiceSpecificParameters> &serviceSpecificParameters) override;
7171

7272
private:
@@ -90,7 +90,7 @@ namespace Aws {
9090
virtual ~DefaultAsyncS3ExpressIdentityProvider() override;
9191

9292
S3ExpressIdentity GetS3ExpressIdentity(const std::shared_ptr<Aws::Http::ServiceSpecificParameters> &serviceSpecificParameters) override;
93-
93+
9494
S3ExpressIdentity GetS3ExpressIdentity(Aws::Auth::CredentialsResolutionContext& context, const std::shared_ptr<Aws::Http::ServiceSpecificParameters> &serviceSpecificParameters) override;
9595

9696
private:

‎generated/src/aws-cpp-sdk-s3/include/aws/s3/S3ExpressIdentityProvider.h‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include <aws/core/utils/memory/stl/AWSString.h>
1010
#include <aws/core/utils/ConcurrentCache.h>
1111
#include <aws/core/auth/signer/AWSAuthSignerBase.h>
12+
#include <aws/core/auth/AWSCredentialsProvider.h>
1213
#include <aws/s3/S3ExpressIdentity.h>
1314
#include <smithy/identity/resolver/AwsIdentityResolverBase.h>
1415
#include <thread>
@@ -28,6 +29,12 @@ namespace Aws {
2829
virtual S3ExpressIdentity
2930
GetS3ExpressIdentity(const std::shared_ptr<Aws::Http::ServiceSpecificParameters> &serviceSpecificParameters) = 0;
3031

32+
virtual S3ExpressIdentity
33+
GetS3ExpressIdentity(Aws::Auth::CredentialsResolutionContext& context, const std::shared_ptr<Aws::Http::ServiceSpecificParameters> &serviceSpecificParameters) {
34+
AWS_UNREFERENCED_PARAM(context);
35+
return GetS3ExpressIdentity(serviceSpecificParameters);
36+
}
37+
3138
ResolveIdentityFutureOutcome
3239
getIdentity(const IdentityProperties& identityProperties, const AdditionalParameters& additionalParameters) override;
3340
S3ExpressIdentity
@@ -60,6 +67,8 @@ namespace Aws {
6067

6168
S3ExpressIdentity GetS3ExpressIdentity(const std::shared_ptr<Aws::Http::ServiceSpecificParameters> &serviceSpecificParameters) override;
6269

70+
S3ExpressIdentity GetS3ExpressIdentity(Aws::Auth::CredentialsResolutionContext& context, const std::shared_ptr<Aws::Http::ServiceSpecificParameters> &serviceSpecificParameters) override;
71+
6372
private:
6473
mutable std::shared_ptr<Aws::Utils::ConcurrentCache<Aws::String, S3ExpressIdentity>> m_credentialsCache;
6574
};
@@ -82,6 +91,8 @@ namespace Aws {
8291

8392
S3ExpressIdentity GetS3ExpressIdentity(const std::shared_ptr<Aws::Http::ServiceSpecificParameters> &serviceSpecificParameters) override;
8493

94+
S3ExpressIdentity GetS3ExpressIdentity(Aws::Auth::CredentialsResolutionContext& context, const std::shared_ptr<Aws::Http::ServiceSpecificParameters> &serviceSpecificParameters) override;
95+
8596
private:
8697
void refreshIdentities(std::chrono::minutes refreshPeriod);
8798
void threadSafeKeyInsert(const Aws::String& key);

‎generated/src/aws-cpp-sdk-s3/include/aws/s3/S3ExpressSigner.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ namespace Aws {
4343

4444
Aws::Auth::AWSCredentials GetCredentials(const std::shared_ptr<Aws::Http::ServiceSpecificParameters> &serviceSpecificParameters) const override;
4545

46+
Aws::Auth::AWSCredentials GetCredentials(Aws::Auth::CredentialsResolutionContext& context, const std::shared_ptr<Aws::Http::ServiceSpecificParameters> &serviceSpecificParameters) const override;
47+
4648
protected:
4749
bool ServiceRequireUnsignedPayload(const String &serviceName) const override;
4850

‎generated/src/aws-cpp-sdk-s3/source/S3ExpressIdentityProvider.cpp‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,11 @@ S3ExpressIdentity DefaultS3ExpressIdentityProvider::GetS3ExpressIdentity(const s
115115
return identity;
116116
}
117117

118+
S3ExpressIdentity DefaultS3ExpressIdentityProvider::GetS3ExpressIdentity(Aws::Auth::CredentialsResolutionContext& context, const std::shared_ptr<Aws::Http::ServiceSpecificParameters> &serviceSpecificParameters) {
119+
AWS_UNREFERENCED_PARAM(context);
120+
return GetS3ExpressIdentity(serviceSpecificParameters);
121+
}
122+
118123
Aws::S3::DefaultAsyncS3ExpressIdentityProvider::DefaultAsyncS3ExpressIdentityProvider(
119124
const S3Client &s3Client,
120125
std::chrono::minutes refreshPeriod) :
@@ -192,6 +197,11 @@ S3ExpressIdentity DefaultAsyncS3ExpressIdentityProvider::GetS3ExpressIdentity(co
192197
return identity;
193198
}
194199

200+
S3ExpressIdentity DefaultAsyncS3ExpressIdentityProvider::GetS3ExpressIdentity(Aws::Auth::CredentialsResolutionContext& context, const std::shared_ptr<ServiceSpecificParameters> &serviceSpecificParameters) {
201+
AWS_UNREFERENCED_PARAM(context);
202+
return GetS3ExpressIdentity(serviceSpecificParameters);
203+
}
204+
195205
void DefaultAsyncS3ExpressIdentityProvider::threadSafeKeyEmpty() {
196206
std::lock_guard<std::mutex> lock(m_keysUsedMutex);
197207
m_keysUsed.clear();

‎generated/src/aws-cpp-sdk-s3/source/S3ExpressSigner.cpp‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,3 +95,8 @@ Aws::Auth::AWSCredentials S3ExpressSigner::GetCredentials(const std::shared_ptr<
9595
auto identity = m_S3ExpressIdentityProvider->GetS3ExpressIdentity(serviceSpecificParameters);
9696
return {identity.getAccessKeyId(), identity.getSecretKeyId()};
9797
}
98+
99+
Aws::Auth::AWSCredentials S3ExpressSigner::GetCredentials(Aws::Auth::CredentialsResolutionContext& context, const std::shared_ptr<Aws::Http::ServiceSpecificParameters> &serviceSpecificParameters) const {
100+
auto identity = m_S3ExpressIdentityProvider->GetS3ExpressIdentity(context, serviceSpecificParameters);
101+
return {identity.getAccessKeyId(), identity.getSecretKeyId()};
102+
}

‎tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/s3/S3ExpressIdentityProviderHeader.vm‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
\#include <aws/core/utils/memory/stl/AWSString.h>
1010
\#include <aws/core/utils/ConcurrentCache.h>
1111
\#include <aws/core/auth/signer/AWSAuthSignerBase.h>
12+
\#include <aws/core/auth/AWSCredentialsProvider.h>
1213
\#include <aws/${metadata.projectName}/S3ExpressIdentity.h>
1314
\#include <smithy/identity/resolver/AwsIdentityResolverBase.h>
1415
\#include <thread>
@@ -28,6 +29,12 @@ namespace ${rootNamespace} {
2829
virtual S3ExpressIdentity
2930
GetS3ExpressIdentity(const std::shared_ptr<Aws::Http::ServiceSpecificParameters> &serviceSpecificParameters) = 0;
3031

32+
virtual S3ExpressIdentity
33+
GetS3ExpressIdentity(Aws::Auth::CredentialsResolutionContext& context, const std::shared_ptr<Aws::Http::ServiceSpecificParameters> &serviceSpecificParameters) {
34+
AWS_UNREFERENCED_PARAM(context);
35+
return GetS3ExpressIdentity(serviceSpecificParameters);
36+
}
37+
3138
ResolveIdentityFutureOutcome
3239
getIdentity(const IdentityProperties& identityProperties, const AdditionalParameters& additionalParameters) override;
3340
S3ExpressIdentity
@@ -60,6 +67,8 @@ namespace ${rootNamespace} {
6067

6168
S3ExpressIdentity GetS3ExpressIdentity(const std::shared_ptr<Aws::Http::ServiceSpecificParameters> &serviceSpecificParameters) override;
6269

70+
S3ExpressIdentity GetS3ExpressIdentity(Aws::Auth::CredentialsResolutionContext& context, const std::shared_ptr<Aws::Http::ServiceSpecificParameters> &serviceSpecificParameters) override;
71+
6372
private:
6473
mutable std::shared_ptr<Aws::Utils::ConcurrentCache<Aws::String, S3ExpressIdentity>> m_credentialsCache;
6574
};
@@ -82,6 +91,8 @@ namespace ${rootNamespace} {
8291

8392
S3ExpressIdentity GetS3ExpressIdentity(const std::shared_ptr<Aws::Http::ServiceSpecificParameters> &serviceSpecificParameters) override;
8493

94+
S3ExpressIdentity GetS3ExpressIdentity(Aws::Auth::CredentialsResolutionContext& context, const std::shared_ptr<Aws::Http::ServiceSpecificParameters> &serviceSpecificParameters) override;
95+
8596
private:
8697
void refreshIdentities(std::chrono::minutes refreshPeriod);
8798
void threadSafeKeyInsert(const Aws::String& key);

‎tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/s3/S3ExpressIdentityProviderSource.vm‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,11 @@ S3ExpressIdentity DefaultS3ExpressIdentityProvider::GetS3ExpressIdentity(const s
115115
return identity;
116116
}
117117

118+
S3ExpressIdentity DefaultS3ExpressIdentityProvider::GetS3ExpressIdentity(Aws::Auth::CredentialsResolutionContext& context, const std::shared_ptr<Aws::Http::ServiceSpecificParameters> &serviceSpecificParameters) {
119+
AWS_UNREFERENCED_PARAM(context);
120+
return GetS3ExpressIdentity(serviceSpecificParameters);
121+
}
122+
118123
Aws::${serviceNamespace}::DefaultAsyncS3ExpressIdentityProvider::DefaultAsyncS3ExpressIdentityProvider(
119124
const ${metadata.classNamePrefix}Client &s3Client,
120125
std::chrono::minutes refreshPeriod) :
@@ -192,6 +197,11 @@ S3ExpressIdentity DefaultAsyncS3ExpressIdentityProvider::GetS3ExpressIdentity(co
192197
return identity;
193198
}
194199

200+
S3ExpressIdentity DefaultAsyncS3ExpressIdentityProvider::GetS3ExpressIdentity(Aws::Auth::CredentialsResolutionContext& context, const std::shared_ptr<ServiceSpecificParameters> &serviceSpecificParameters) {
201+
AWS_UNREFERENCED_PARAM(context);
202+
return GetS3ExpressIdentity(serviceSpecificParameters);
203+
}
204+
195205
void DefaultAsyncS3ExpressIdentityProvider::threadSafeKeyEmpty() {
196206
std::lock_guard<std::mutex> lock(m_keysUsedMutex);
197207
m_keysUsed.clear();

‎tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/s3/S3ExpressSignerHeader.vm‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ namespace ${rootNamespace} {
4343

4444
Aws::Auth::AWSCredentials GetCredentials(const std::shared_ptr<Aws::Http::ServiceSpecificParameters> &serviceSpecificParameters) const override;
4545

46+
Aws::Auth::AWSCredentials GetCredentials(Aws::Auth::CredentialsResolutionContext& context, const std::shared_ptr<Aws::Http::ServiceSpecificParameters> &serviceSpecificParameters) const override;
47+
4648
protected:
4749
bool ServiceRequireUnsignedPayload(const String &serviceName) const override;
4850

‎tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/s3/S3ExpressSignerSource.vm‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,3 +95,8 @@ Aws::Auth::AWSCredentials S3ExpressSigner::GetCredentials(const std::shared_ptr<
9595
auto identity = m_S3ExpressIdentityProvider->GetS3ExpressIdentity(serviceSpecificParameters);
9696
return {identity.getAccessKeyId(), identity.getSecretKeyId()};
9797
}
98+
99+
Aws::Auth::AWSCredentials S3ExpressSigner::GetCredentials(Aws::Auth::CredentialsResolutionContext& context, const std::shared_ptr<Aws::Http::ServiceSpecificParameters> &serviceSpecificParameters) const {
100+
auto identity = m_S3ExpressIdentityProvider->GetS3ExpressIdentity(context, serviceSpecificParameters);
101+
return {identity.getAccessKeyId(), identity.getSecretKeyId()};
102+
}

0 commit comments

Comments
 (0)