diff --git a/VERSION b/VERSION index bc577dc5a..eb42437fd 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.2078 \ No newline at end of file +1.36.2079 \ No newline at end of file diff --git a/sts/include/alibabacloud/sts/model/AssumeRoleRequest.h b/sts/include/alibabacloud/sts/model/AssumeRoleRequest.h index 688e55b37..e462601f9 100644 --- a/sts/include/alibabacloud/sts/model/AssumeRoleRequest.h +++ b/sts/include/alibabacloud/sts/model/AssumeRoleRequest.h @@ -32,6 +32,8 @@ public: ~AssumeRoleRequest(); std::string getExternalId() const; void setExternalId(const std::string &externalId); + std::string getSourceIdentity() const; + void setSourceIdentity(const std::string &sourceIdentity); std::string getRoleSessionName() const; void setRoleSessionName(const std::string &roleSessionName); std::string getPolicy() const; @@ -43,6 +45,7 @@ public: private: std::string externalId_; + std::string sourceIdentity_; std::string roleSessionName_; std::string policy_; std::string roleArn_; diff --git a/sts/include/alibabacloud/sts/model/AssumeRoleResult.h b/sts/include/alibabacloud/sts/model/AssumeRoleResult.h index 9a3d427c1..12f3c2575 100644 --- a/sts/include/alibabacloud/sts/model/AssumeRoleResult.h +++ b/sts/include/alibabacloud/sts/model/AssumeRoleResult.h @@ -49,12 +49,14 @@ namespace AlibabaCloud AssumeRoleResult(); explicit AssumeRoleResult(const std::string &payload); ~AssumeRoleResult(); + std::string getSourceIdentity()const; AssumedRoleUser getAssumedRoleUser()const; Credentials getCredentials()const; protected: void parse(const std::string &payload); private: + std::string sourceIdentity_; AssumedRoleUser assumedRoleUser_; Credentials credentials_; diff --git a/sts/include/alibabacloud/sts/model/AssumeRoleWithOIDCResult.h b/sts/include/alibabacloud/sts/model/AssumeRoleWithOIDCResult.h index 9ee915a67..5da03b663 100644 --- a/sts/include/alibabacloud/sts/model/AssumeRoleWithOIDCResult.h +++ b/sts/include/alibabacloud/sts/model/AssumeRoleWithOIDCResult.h @@ -58,6 +58,7 @@ namespace AlibabaCloud AssumeRoleWithOIDCResult(); explicit AssumeRoleWithOIDCResult(const std::string &payload); ~AssumeRoleWithOIDCResult(); + std::string getSourceIdentity()const; OIDCTokenInfo getOIDCTokenInfo()const; AssumedRoleUser getAssumedRoleUser()const; Credentials getCredentials()const; @@ -65,6 +66,7 @@ namespace AlibabaCloud protected: void parse(const std::string &payload); private: + std::string sourceIdentity_; OIDCTokenInfo oIDCTokenInfo_; AssumedRoleUser assumedRoleUser_; Credentials credentials_; diff --git a/sts/include/alibabacloud/sts/model/AssumeRoleWithSAMLResult.h b/sts/include/alibabacloud/sts/model/AssumeRoleWithSAMLResult.h index 8bcd6979e..de2284a6b 100644 --- a/sts/include/alibabacloud/sts/model/AssumeRoleWithSAMLResult.h +++ b/sts/include/alibabacloud/sts/model/AssumeRoleWithSAMLResult.h @@ -56,6 +56,7 @@ namespace AlibabaCloud AssumeRoleWithSAMLResult(); explicit AssumeRoleWithSAMLResult(const std::string &payload); ~AssumeRoleWithSAMLResult(); + std::string getSourceIdentity()const; SAMLAssertionInfo getSAMLAssertionInfo()const; AssumedRoleUser getAssumedRoleUser()const; Credentials getCredentials()const; @@ -63,6 +64,7 @@ namespace AlibabaCloud protected: void parse(const std::string &payload); private: + std::string sourceIdentity_; SAMLAssertionInfo sAMLAssertionInfo_; AssumedRoleUser assumedRoleUser_; Credentials credentials_; diff --git a/sts/src/StsClient.cc b/sts/src/StsClient.cc index bfaed8515..274e8260c 100644 --- a/sts/src/StsClient.cc +++ b/sts/src/StsClient.cc @@ -31,21 +31,21 @@ StsClient::StsClient(const Credentials &credentials, const ClientConfiguration & RpcServiceClient(SERVICE_NAME, std::make_shared(credentials), configuration) { auto locationClient = std::make_shared(credentials, configuration); - endpointProvider_ = std::make_shared(locationClient, configuration.regionId(), SERVICE_NAME, ""); + endpointProvider_ = std::make_shared(locationClient, configuration.regionId(), SERVICE_NAME, "sts"); } StsClient::StsClient(const std::shared_ptr& credentialsProvider, const ClientConfiguration & configuration) : RpcServiceClient(SERVICE_NAME, credentialsProvider, configuration) { auto locationClient = std::make_shared(credentialsProvider, configuration); - endpointProvider_ = std::make_shared(locationClient, configuration.regionId(), SERVICE_NAME, ""); + endpointProvider_ = std::make_shared(locationClient, configuration.regionId(), SERVICE_NAME, "sts"); } StsClient::StsClient(const std::string & accessKeyId, const std::string & accessKeySecret, const ClientConfiguration & configuration) : RpcServiceClient(SERVICE_NAME, std::make_shared(accessKeyId, accessKeySecret), configuration) { auto locationClient = std::make_shared(accessKeyId, accessKeySecret, configuration); - endpointProvider_ = std::make_shared(locationClient, configuration.regionId(), SERVICE_NAME, ""); + endpointProvider_ = std::make_shared(locationClient, configuration.regionId(), SERVICE_NAME, "sts"); } StsClient::~StsClient() diff --git a/sts/src/model/AssumeRoleRequest.cc b/sts/src/model/AssumeRoleRequest.cc index 1bb0ec9b8..498cf6a74 100644 --- a/sts/src/model/AssumeRoleRequest.cc +++ b/sts/src/model/AssumeRoleRequest.cc @@ -34,6 +34,15 @@ void AssumeRoleRequest::setExternalId(const std::string &externalId) { setParameter(std::string("ExternalId"), externalId); } +std::string AssumeRoleRequest::getSourceIdentity() const { + return sourceIdentity_; +} + +void AssumeRoleRequest::setSourceIdentity(const std::string &sourceIdentity) { + sourceIdentity_ = sourceIdentity; + setParameter(std::string("SourceIdentity"), sourceIdentity); +} + std::string AssumeRoleRequest::getRoleSessionName() const { return roleSessionName_; } diff --git a/sts/src/model/AssumeRoleResult.cc b/sts/src/model/AssumeRoleResult.cc index 269d42a98..6b805fed1 100644 --- a/sts/src/model/AssumeRoleResult.cc +++ b/sts/src/model/AssumeRoleResult.cc @@ -53,9 +53,16 @@ void AssumeRoleResult::parse(const std::string &payload) credentials_.accessKeySecret = credentialsNode["AccessKeySecret"].asString(); if(!credentialsNode["AccessKeyId"].isNull()) credentials_.accessKeyId = credentialsNode["AccessKeyId"].asString(); + if(!value["SourceIdentity"].isNull()) + sourceIdentity_ = value["SourceIdentity"].asString(); } +std::string AssumeRoleResult::getSourceIdentity()const +{ + return sourceIdentity_; +} + AssumeRoleResult::AssumedRoleUser AssumeRoleResult::getAssumedRoleUser()const { return assumedRoleUser_; diff --git a/sts/src/model/AssumeRoleWithOIDCResult.cc b/sts/src/model/AssumeRoleWithOIDCResult.cc index e5e8dd6a2..f27216378 100644 --- a/sts/src/model/AssumeRoleWithOIDCResult.cc +++ b/sts/src/model/AssumeRoleWithOIDCResult.cc @@ -66,9 +66,16 @@ void AssumeRoleWithOIDCResult::parse(const std::string &payload) credentials_.accessKeySecret = credentialsNode["AccessKeySecret"].asString(); if(!credentialsNode["AccessKeyId"].isNull()) credentials_.accessKeyId = credentialsNode["AccessKeyId"].asString(); + if(!value["SourceIdentity"].isNull()) + sourceIdentity_ = value["SourceIdentity"].asString(); } +std::string AssumeRoleWithOIDCResult::getSourceIdentity()const +{ + return sourceIdentity_; +} + AssumeRoleWithOIDCResult::OIDCTokenInfo AssumeRoleWithOIDCResult::getOIDCTokenInfo()const { return oIDCTokenInfo_; diff --git a/sts/src/model/AssumeRoleWithSAMLResult.cc b/sts/src/model/AssumeRoleWithSAMLResult.cc index cb1f5b491..e2b8f9424 100644 --- a/sts/src/model/AssumeRoleWithSAMLResult.cc +++ b/sts/src/model/AssumeRoleWithSAMLResult.cc @@ -62,9 +62,16 @@ void AssumeRoleWithSAMLResult::parse(const std::string &payload) credentials_.accessKeySecret = credentialsNode["AccessKeySecret"].asString(); if(!credentialsNode["AccessKeyId"].isNull()) credentials_.accessKeyId = credentialsNode["AccessKeyId"].asString(); + if(!value["SourceIdentity"].isNull()) + sourceIdentity_ = value["SourceIdentity"].asString(); } +std::string AssumeRoleWithSAMLResult::getSourceIdentity()const +{ + return sourceIdentity_; +} + AssumeRoleWithSAMLResult::SAMLAssertionInfo AssumeRoleWithSAMLResult::getSAMLAssertionInfo()const { return sAMLAssertionInfo_;