Supported AssumeRoleWithOIDC.

CHANGELOG

@@ -1,3 +1,6 @@
+2021-09-29 Version: 1.36.890
+- Supported AssumeRoleWithOIDC.
+
 2021-09-28 Version: 1.36.889
 - Add new internal API.
 

VERSION

@@ -1 +1 @@
-1.36.889
+1.36.890

sts/CMakeLists.txt

@@ -23,10 +23,10 @@ set(sts_public_header
 set(sts_public_header_model 
 	include/alibabacloud/sts/model/AssumeRoleRequest.h
 	include/alibabacloud/sts/model/AssumeRoleResult.h
+	include/alibabacloud/sts/model/AssumeRoleWithOIDCRequest.h
+	include/alibabacloud/sts/model/AssumeRoleWithOIDCResult.h
 	include/alibabacloud/sts/model/AssumeRoleWithSAMLRequest.h
 	include/alibabacloud/sts/model/AssumeRoleWithSAMLResult.h
-	include/alibabacloud/sts/model/GenerateSessionAccessKeyRequest.h
-	include/alibabacloud/sts/model/GenerateSessionAccessKeyResult.h
 	include/alibabacloud/sts/model/GetCallerIdentityRequest.h
 	include/alibabacloud/sts/model/GetCallerIdentityResult.h )
 
@@ -34,10 +34,10 @@ set(sts_src
 	src/StsClient.cc
 	src/model/AssumeRoleRequest.cc
 	src/model/AssumeRoleResult.cc
+	src/model/AssumeRoleWithOIDCRequest.cc
+	src/model/AssumeRoleWithOIDCResult.cc
 	src/model/AssumeRoleWithSAMLRequest.cc
 	src/model/AssumeRoleWithSAMLResult.cc
-	src/model/GenerateSessionAccessKeyRequest.cc
-	src/model/GenerateSessionAccessKeyResult.cc
 	src/model/GetCallerIdentityRequest.cc
 	src/model/GetCallerIdentityResult.cc )
 

sts/include/alibabacloud/sts/StsClient.h

@@ -24,10 +24,10 @@
 #include "StsExport.h"
 #include "model/AssumeRoleRequest.h"
 #include "model/AssumeRoleResult.h"
+#include "model/AssumeRoleWithOIDCRequest.h"
+#include "model/AssumeRoleWithOIDCResult.h"
 #include "model/AssumeRoleWithSAMLRequest.h"
 #include "model/AssumeRoleWithSAMLResult.h"
-#include "model/GenerateSessionAccessKeyRequest.h"
-#include "model/GenerateSessionAccessKeyResult.h"
 #include "model/GetCallerIdentityRequest.h"
 #include "model/GetCallerIdentityResult.h"
 
@@ -42,12 +42,12 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::AssumeRoleResult> AssumeRoleOutcome;
 			typedef std::future<AssumeRoleOutcome> AssumeRoleOutcomeCallable;
 			typedef std::function<void(const StsClient*, const Model::AssumeRoleRequest&, const AssumeRoleOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> AssumeRoleAsyncHandler;
+			typedef Outcome<Error, Model::AssumeRoleWithOIDCResult> AssumeRoleWithOIDCOutcome;
+			typedef std::future<AssumeRoleWithOIDCOutcome> AssumeRoleWithOIDCOutcomeCallable;
+			typedef std::function<void(const StsClient*, const Model::AssumeRoleWithOIDCRequest&, const AssumeRoleWithOIDCOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> AssumeRoleWithOIDCAsyncHandler;
 			typedef Outcome<Error, Model::AssumeRoleWithSAMLResult> AssumeRoleWithSAMLOutcome;
 			typedef std::future<AssumeRoleWithSAMLOutcome> AssumeRoleWithSAMLOutcomeCallable;
 			typedef std::function<void(const StsClient*, const Model::AssumeRoleWithSAMLRequest&, const AssumeRoleWithSAMLOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> AssumeRoleWithSAMLAsyncHandler;
-			typedef Outcome<Error, Model::GenerateSessionAccessKeyResult> GenerateSessionAccessKeyOutcome;
-			typedef std::future<GenerateSessionAccessKeyOutcome> GenerateSessionAccessKeyOutcomeCallable;
-			typedef std::function<void(const StsClient*, const Model::GenerateSessionAccessKeyRequest&, const GenerateSessionAccessKeyOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> GenerateSessionAccessKeyAsyncHandler;
 			typedef Outcome<Error, Model::GetCallerIdentityResult> GetCallerIdentityOutcome;
 			typedef std::future<GetCallerIdentityOutcome> GetCallerIdentityOutcomeCallable;
 			typedef std::function<void(const StsClient*, const Model::GetCallerIdentityRequest&, const GetCallerIdentityOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> GetCallerIdentityAsyncHandler;
@@ -59,12 +59,12 @@ namespace AlibabaCloud
 			AssumeRoleOutcome assumeRole(const Model::AssumeRoleRequest &request)const;
 			void assumeRoleAsync(const Model::AssumeRoleRequest& request, const AssumeRoleAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			AssumeRoleOutcomeCallable assumeRoleCallable(const Model::AssumeRoleRequest& request) const;
+			AssumeRoleWithOIDCOutcome assumeRoleWithOIDC(const Model::AssumeRoleWithOIDCRequest &request)const;
+			void assumeRoleWithOIDCAsync(const Model::AssumeRoleWithOIDCRequest& request, const AssumeRoleWithOIDCAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			AssumeRoleWithOIDCOutcomeCallable assumeRoleWithOIDCCallable(const Model::AssumeRoleWithOIDCRequest& request) const;
 			AssumeRoleWithSAMLOutcome assumeRoleWithSAML(const Model::AssumeRoleWithSAMLRequest &request)const;
 			void assumeRoleWithSAMLAsync(const Model::AssumeRoleWithSAMLRequest& request, const AssumeRoleWithSAMLAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			AssumeRoleWithSAMLOutcomeCallable assumeRoleWithSAMLCallable(const Model::AssumeRoleWithSAMLRequest& request) const;
-			GenerateSessionAccessKeyOutcome generateSessionAccessKey(const Model::GenerateSessionAccessKeyRequest &request)const;
-			void generateSessionAccessKeyAsync(const Model::GenerateSessionAccessKeyRequest& request, const GenerateSessionAccessKeyAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			GenerateSessionAccessKeyOutcomeCallable generateSessionAccessKeyCallable(const Model::GenerateSessionAccessKeyRequest& request) const;
 			GetCallerIdentityOutcome getCallerIdentity(const Model::GetCallerIdentityRequest &request)const;
 			void getCallerIdentityAsync(const Model::GetCallerIdentityRequest& request, const GetCallerIdentityAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			GetCallerIdentityOutcomeCallable getCallerIdentityCallable(const Model::GetCallerIdentityRequest& request) const;

sts/include/alibabacloud/sts/model/AssumeRoleResult.h

@@ -32,6 +32,11 @@ namespace AlibabaCloud
 			class ALIBABACLOUD_STS_EXPORT AssumeRoleResult : public ServiceResult
 			{
 			public:
+				struct AssumedRoleUser
+				{
+					std::string arn;
+					std::string assumedRoleId;
+				};
 				struct Credentials
 				{
 					std::string securityToken;
@@ -39,11 +44,6 @@ namespace AlibabaCloud
 					std::string accessKeySecret;
 					std::string expiration;
 				};
-				struct AssumedRoleUser
-				{
-					std::string arn;
-					std::string assumedRoleId;
-				};
 
 
 				AssumeRoleResult();

sts/include/alibabacloud/sts/model/AssumeRoleWithOIDCRequest.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ALIBABACLOUD_STS_MODEL_GENERATESESSIONACCESSKEYREQUEST_H_
+#ifndef ALIBABACLOUD_STS_MODEL_ASSUMEROLEWITHOIDCREQUEST_H_
-#define ALIBABACLOUD_STS_MODEL_GENERATESESSIONACCESSKEYREQUEST_H_
+#define ALIBABACLOUD_STS_MODEL_ASSUMEROLEWITHOIDCREQUEST_H_
 
 #include <string>
 #include <vector>
@@ -28,21 +28,36 @@ namespace AlibabaCloud
 	{
 		namespace Model
 		{
-			class ALIBABACLOUD_STS_EXPORT GenerateSessionAccessKeyRequest : public RpcServiceRequest
+			class ALIBABACLOUD_STS_EXPORT AssumeRoleWithOIDCRequest : public RpcServiceRequest
 			{
 
 			public:
-				GenerateSessionAccessKeyRequest();
+				AssumeRoleWithOIDCRequest();
-				~GenerateSessionAccessKeyRequest();
+				~AssumeRoleWithOIDCRequest();
 
+				std::string getRoleArn()const;
+				void setRoleArn(const std::string& roleArn);
+				std::string getRoleSessionName()const;
+				void setRoleSessionName(const std::string& roleSessionName);
+				std::string getOIDCToken()const;
+				void setOIDCToken(const std::string& oIDCToken);
 				long getDurationSeconds()const;
 				void setDurationSeconds(long durationSeconds);
+				std::string getOIDCProviderArn()const;
+				void setOIDCProviderArn(const std::string& oIDCProviderArn);
+				std::string getPolicy()const;
+				void setPolicy(const std::string& policy);
 
             private:
+				std::string roleArn_;
+				std::string roleSessionName_;
+				std::string oIDCToken_;
 				long durationSeconds_;
+				std::string oIDCProviderArn_;
+				std::string policy_;
 
 			};
 		}
 	}
 }
-#endif // !ALIBABACLOUD_STS_MODEL_GENERATESESSIONACCESSKEYREQUEST_H_
+#endif // !ALIBABACLOUD_STS_MODEL_ASSUMEROLEWITHOIDCREQUEST_H_

sts/include/alibabacloud/sts/model/AssumeRoleWithOIDCResult.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ALIBABACLOUD_STS_MODEL_GENERATESESSIONACCESSKEYRESULT_H_
+#ifndef ALIBABACLOUD_STS_MODEL_ASSUMEROLEWITHOIDCRESULT_H_
-#define ALIBABACLOUD_STS_MODEL_GENERATESESSIONACCESSKEYRESULT_H_
+#define ALIBABACLOUD_STS_MODEL_ASSUMEROLEWITHOIDCRESULT_H_
 
 #include <string>
 #include <vector>
@@ -29,29 +29,45 @@ namespace AlibabaCloud
 	{
 		namespace Model
 		{
-			class ALIBABACLOUD_STS_EXPORT GenerateSessionAccessKeyResult : public ServiceResult
+			class ALIBABACLOUD_STS_EXPORT AssumeRoleWithOIDCResult : public ServiceResult
 			{
 			public:
-				struct SessionAccessKey
+				struct OIDCTokenInfo
 				{
-					std::string sessionAccessKeyId;
+					std::string issuer;
+					std::string subject;
+					std::string clientIds;
+				};
+				struct AssumedRoleUser
+				{
+					std::string arn;
+					std::string assumedRoleId;
+				};
+				struct Credentials
+				{
+					std::string securityToken;
+					std::string accessKeyId;
+					std::string accessKeySecret;
 					std::string expiration;
-					std::string sessionAccessKeySecret;
 				};
 
 
-				GenerateSessionAccessKeyResult();
+				AssumeRoleWithOIDCResult();
-				explicit GenerateSessionAccessKeyResult(const std::string &payload);
+				explicit AssumeRoleWithOIDCResult(const std::string &payload);
-				~GenerateSessionAccessKeyResult();
+				~AssumeRoleWithOIDCResult();
-				SessionAccessKey getSessionAccessKey()const;
+				OIDCTokenInfo getOIDCTokenInfo()const;
+				AssumedRoleUser getAssumedRoleUser()const;
+				Credentials getCredentials()const;
 
 			protected:
 				void parse(const std::string &payload);
 			private:
-				SessionAccessKey sessionAccessKey_;
+				OIDCTokenInfo oIDCTokenInfo_;
+				AssumedRoleUser assumedRoleUser_;
+				Credentials credentials_;
 
 			};
 		}
 	}
 }
-#endif // !ALIBABACLOUD_STS_MODEL_GENERATESESSIONACCESSKEYRESULT_H_
+#endif // !ALIBABACLOUD_STS_MODEL_ASSUMEROLEWITHOIDCRESULT_H_

sts/include/alibabacloud/sts/model/AssumeRoleWithSAMLResult.h

@@ -32,18 +32,6 @@ namespace AlibabaCloud
 			class ALIBABACLOUD_STS_EXPORT AssumeRoleWithSAMLResult : public ServiceResult
 			{
 			public:
-				struct Credentials
-				{
-					std::string securityToken;
-					std::string accessKeyId;
-					std::string accessKeySecret;
-					std::string expiration;
-				};
-				struct AssumedRoleUser
-				{
-					std::string arn;
-					std::string assumedRoleId;
-				};
 				struct SAMLAssertionInfo
 				{
 					std::string subjectType;
@@ -51,6 +39,18 @@ namespace AlibabaCloud
 					std::string recipient;
 					std::string subject;
 				};
+				struct AssumedRoleUser
+				{
+					std::string arn;
+					std::string assumedRoleId;
+				};
+				struct Credentials
+				{
+					std::string securityToken;
+					std::string accessKeyId;
+					std::string accessKeySecret;
+					std::string expiration;
+				};
 
 
 				AssumeRoleWithSAMLResult();

sts/src/StsClient.cc

@@ -31,21 +31,21 @@ StsClient::StsClient(const Credentials &credentials, const ClientConfiguration &
 	RpcServiceClient(SERVICE_NAME, std::make_shared<SimpleCredentialsProvider>(credentials), configuration)
 {
 	auto locationClient = std::make_shared<LocationClient>(credentials, configuration);
-	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "sts");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "");
 }
 
 StsClient::StsClient(const std::shared_ptr<CredentialsProvider>& credentialsProvider, const ClientConfiguration & configuration) :
 	RpcServiceClient(SERVICE_NAME, credentialsProvider, configuration)
 {
 	auto locationClient = std::make_shared<LocationClient>(credentialsProvider, configuration);
-	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "sts");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "");
 }
 
 StsClient::StsClient(const std::string & accessKeyId, const std::string & accessKeySecret, const ClientConfiguration & configuration) :
 	RpcServiceClient(SERVICE_NAME, std::make_shared<SimpleCredentialsProvider>(accessKeyId, accessKeySecret), configuration)
 {
 	auto locationClient = std::make_shared<LocationClient>(accessKeyId, accessKeySecret, configuration);
-	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "sts");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "");
 }
 
 StsClient::~StsClient()
@@ -87,6 +87,42 @@ StsClient::AssumeRoleOutcomeCallable StsClient::assumeRoleCallable(const AssumeR
 	return task->get_future();
 }
 
+StsClient::AssumeRoleWithOIDCOutcome StsClient::assumeRoleWithOIDC(const AssumeRoleWithOIDCRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return AssumeRoleWithOIDCOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return AssumeRoleWithOIDCOutcome(AssumeRoleWithOIDCResult(outcome.result()));
+	else
+		return AssumeRoleWithOIDCOutcome(outcome.error());
+}
+
+void StsClient::assumeRoleWithOIDCAsync(const AssumeRoleWithOIDCRequest& request, const AssumeRoleWithOIDCAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, assumeRoleWithOIDC(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+StsClient::AssumeRoleWithOIDCOutcomeCallable StsClient::assumeRoleWithOIDCCallable(const AssumeRoleWithOIDCRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<AssumeRoleWithOIDCOutcome()>>(
+			[this, request]()
+			{
+			return this->assumeRoleWithOIDC(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 StsClient::AssumeRoleWithSAMLOutcome StsClient::assumeRoleWithSAML(const AssumeRoleWithSAMLRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -123,42 +159,6 @@ StsClient::AssumeRoleWithSAMLOutcomeCallable StsClient::assumeRoleWithSAMLCallab
 	return task->get_future();
 }
 
-StsClient::GenerateSessionAccessKeyOutcome StsClient::generateSessionAccessKey(const GenerateSessionAccessKeyRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return GenerateSessionAccessKeyOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return GenerateSessionAccessKeyOutcome(GenerateSessionAccessKeyResult(outcome.result()));
-	else
-		return GenerateSessionAccessKeyOutcome(outcome.error());
-}
-
-void StsClient::generateSessionAccessKeyAsync(const GenerateSessionAccessKeyRequest& request, const GenerateSessionAccessKeyAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, generateSessionAccessKey(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-StsClient::GenerateSessionAccessKeyOutcomeCallable StsClient::generateSessionAccessKeyCallable(const GenerateSessionAccessKeyRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<GenerateSessionAccessKeyOutcome()>>(
-			[this, request]()
-			{
-			return this->generateSessionAccessKey(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
 StsClient::GetCallerIdentityOutcome StsClient::getCallerIdentity(const GetCallerIdentityRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

sts/src/model/AssumeRoleResult.cc

@@ -39,20 +39,20 @@ void AssumeRoleResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
+	auto assumedRoleUserNode = value["AssumedRoleUser"];
+	if(!assumedRoleUserNode["AssumedRoleId"].isNull())
+		assumedRoleUser_.assumedRoleId = assumedRoleUserNode["AssumedRoleId"].asString();
+	if(!assumedRoleUserNode["Arn"].isNull())
+		assumedRoleUser_.arn = assumedRoleUserNode["Arn"].asString();
 	auto credentialsNode = value["Credentials"];
 	if(!credentialsNode["SecurityToken"].isNull())
 		credentials_.securityToken = credentialsNode["SecurityToken"].asString();
+	if(!credentialsNode["Expiration"].isNull())
+		credentials_.expiration = credentialsNode["Expiration"].asString();
 	if(!credentialsNode["AccessKeySecret"].isNull())
 		credentials_.accessKeySecret = credentialsNode["AccessKeySecret"].asString();
 	if(!credentialsNode["AccessKeyId"].isNull())
 		credentials_.accessKeyId = credentialsNode["AccessKeyId"].asString();
-	if(!credentialsNode["Expiration"].isNull())
-		credentials_.expiration = credentialsNode["Expiration"].asString();
-	auto assumedRoleUserNode = value["AssumedRoleUser"];
-	if(!assumedRoleUserNode["Arn"].isNull())
-		assumedRoleUser_.arn = assumedRoleUserNode["Arn"].asString();
-	if(!assumedRoleUserNode["AssumedRoleId"].isNull())
-		assumedRoleUser_.assumedRoleId = assumedRoleUserNode["AssumedRoleId"].asString();
 
 }
 

sts/src/model/AssumeRoleWithOIDCRequest.cc

@@ -0,0 +1,95 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/sts/model/AssumeRoleWithOIDCRequest.h>
+
+using AlibabaCloud::Sts::Model::AssumeRoleWithOIDCRequest;
+
+AssumeRoleWithOIDCRequest::AssumeRoleWithOIDCRequest() :
+	RpcServiceRequest("sts", "2015-04-01", "AssumeRoleWithOIDC")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+AssumeRoleWithOIDCRequest::~AssumeRoleWithOIDCRequest()
+{}
+
+std::string AssumeRoleWithOIDCRequest::getRoleArn()const
+{
+	return roleArn_;
+}
+
+void AssumeRoleWithOIDCRequest::setRoleArn(const std::string& roleArn)
+{
+	roleArn_ = roleArn;
+	setParameter("RoleArn", roleArn);
+}
+
+std::string AssumeRoleWithOIDCRequest::getRoleSessionName()const
+{
+	return roleSessionName_;
+}
+
+void AssumeRoleWithOIDCRequest::setRoleSessionName(const std::string& roleSessionName)
+{
+	roleSessionName_ = roleSessionName;
+	setParameter("RoleSessionName", roleSessionName);
+}
+
+std::string AssumeRoleWithOIDCRequest::getOIDCToken()const
+{
+	return oIDCToken_;
+}
+
+void AssumeRoleWithOIDCRequest::setOIDCToken(const std::string& oIDCToken)
+{
+	oIDCToken_ = oIDCToken;
+	setParameter("OIDCToken", oIDCToken);
+}
+
+long AssumeRoleWithOIDCRequest::getDurationSeconds()const
+{
+	return durationSeconds_;
+}
+
+void AssumeRoleWithOIDCRequest::setDurationSeconds(long durationSeconds)
+{
+	durationSeconds_ = durationSeconds;
+	setParameter("DurationSeconds", std::to_string(durationSeconds));
+}
+
+std::string AssumeRoleWithOIDCRequest::getOIDCProviderArn()const
+{
+	return oIDCProviderArn_;
+}
+
+void AssumeRoleWithOIDCRequest::setOIDCProviderArn(const std::string& oIDCProviderArn)
+{
+	oIDCProviderArn_ = oIDCProviderArn;
+	setParameter("OIDCProviderArn", oIDCProviderArn);
+}
+
+std::string AssumeRoleWithOIDCRequest::getPolicy()const
+{
+	return policy_;
+}
+
+void AssumeRoleWithOIDCRequest::setPolicy(const std::string& policy)
+{
+	policy_ = policy;
+	setParameter("Policy", policy);
+}
+

sts/src/model/AssumeRoleWithOIDCResult.cc

@@ -0,0 +1,80 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/sts/model/AssumeRoleWithOIDCResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Sts;
+using namespace AlibabaCloud::Sts::Model;
+
+AssumeRoleWithOIDCResult::AssumeRoleWithOIDCResult() :
+	ServiceResult()
+{}
+
+AssumeRoleWithOIDCResult::AssumeRoleWithOIDCResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+AssumeRoleWithOIDCResult::~AssumeRoleWithOIDCResult()
+{}
+
+void AssumeRoleWithOIDCResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	auto oIDCTokenInfoNode = value["OIDCTokenInfo"];
+	if(!oIDCTokenInfoNode["Subject"].isNull())
+		oIDCTokenInfo_.subject = oIDCTokenInfoNode["Subject"].asString();
+	if(!oIDCTokenInfoNode["Issuer"].isNull())
+		oIDCTokenInfo_.issuer = oIDCTokenInfoNode["Issuer"].asString();
+	if(!oIDCTokenInfoNode["ClientIds"].isNull())
+		oIDCTokenInfo_.clientIds = oIDCTokenInfoNode["ClientIds"].asString();
+	auto assumedRoleUserNode = value["AssumedRoleUser"];
+	if(!assumedRoleUserNode["AssumedRoleId"].isNull())
+		assumedRoleUser_.assumedRoleId = assumedRoleUserNode["AssumedRoleId"].asString();
+	if(!assumedRoleUserNode["Arn"].isNull())
+		assumedRoleUser_.arn = assumedRoleUserNode["Arn"].asString();
+	auto credentialsNode = value["Credentials"];
+	if(!credentialsNode["SecurityToken"].isNull())
+		credentials_.securityToken = credentialsNode["SecurityToken"].asString();
+	if(!credentialsNode["Expiration"].isNull())
+		credentials_.expiration = credentialsNode["Expiration"].asString();
+	if(!credentialsNode["AccessKeySecret"].isNull())
+		credentials_.accessKeySecret = credentialsNode["AccessKeySecret"].asString();
+	if(!credentialsNode["AccessKeyId"].isNull())
+		credentials_.accessKeyId = credentialsNode["AccessKeyId"].asString();
+
+}
+
+AssumeRoleWithOIDCResult::OIDCTokenInfo AssumeRoleWithOIDCResult::getOIDCTokenInfo()const
+{
+	return oIDCTokenInfo_;
+}
+
+AssumeRoleWithOIDCResult::AssumedRoleUser AssumeRoleWithOIDCResult::getAssumedRoleUser()const
+{
+	return assumedRoleUser_;
+}
+
+AssumeRoleWithOIDCResult::Credentials AssumeRoleWithOIDCResult::getCredentials()const
+{
+	return credentials_;
+}
+

sts/src/model/AssumeRoleWithSAMLResult.cc

@@ -39,29 +39,29 @@ void AssumeRoleWithSAMLResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto credentialsNode = value["Credentials"];
+	auto sAMLAssertionInfoNode = value["SAMLAssertionInfo"];
-	if(!credentialsNode["SecurityToken"].isNull())
+	if(!sAMLAssertionInfoNode["SubjectType"].isNull())
-		credentials_.securityToken = credentialsNode["SecurityToken"].asString();
+		sAMLAssertionInfo_.subjectType = sAMLAssertionInfoNode["SubjectType"].asString();
-	if(!credentialsNode["AccessKeySecret"].isNull())
+	if(!sAMLAssertionInfoNode["Issuer"].isNull())
-		credentials_.accessKeySecret = credentialsNode["AccessKeySecret"].asString();
+		sAMLAssertionInfo_.issuer = sAMLAssertionInfoNode["Issuer"].asString();
-	if(!credentialsNode["AccessKeyId"].isNull())
+	if(!sAMLAssertionInfoNode["Recipient"].isNull())
-		credentials_.accessKeyId = credentialsNode["AccessKeyId"].asString();
+		sAMLAssertionInfo_.recipient = sAMLAssertionInfoNode["Recipient"].asString();
-	if(!credentialsNode["Expiration"].isNull())
+	if(!sAMLAssertionInfoNode["Subject"].isNull())
-		credentials_.expiration = credentialsNode["Expiration"].asString();
+		sAMLAssertionInfo_.subject = sAMLAssertionInfoNode["Subject"].asString();
 	auto assumedRoleUserNode = value["AssumedRoleUser"];
 	if(!assumedRoleUserNode["Arn"].isNull())
 		assumedRoleUser_.arn = assumedRoleUserNode["Arn"].asString();
 	if(!assumedRoleUserNode["AssumedRoleId"].isNull())
 		assumedRoleUser_.assumedRoleId = assumedRoleUserNode["AssumedRoleId"].asString();
-	auto sAMLAssertionInfoNode = value["SAMLAssertionInfo"];
+	auto credentialsNode = value["Credentials"];
-	if(!sAMLAssertionInfoNode["SubjectType"].isNull())
+	if(!credentialsNode["SecurityToken"].isNull())
-		sAMLAssertionInfo_.subjectType = sAMLAssertionInfoNode["SubjectType"].asString();
+		credentials_.securityToken = credentialsNode["SecurityToken"].asString();
-	if(!sAMLAssertionInfoNode["Subject"].isNull())
+	if(!credentialsNode["AccessKeyId"].isNull())
-		sAMLAssertionInfo_.subject = sAMLAssertionInfoNode["Subject"].asString();
+		credentials_.accessKeyId = credentialsNode["AccessKeyId"].asString();
-	if(!sAMLAssertionInfoNode["Recipient"].isNull())
+	if(!credentialsNode["AccessKeySecret"].isNull())
-		sAMLAssertionInfo_.recipient = sAMLAssertionInfoNode["Recipient"].asString();
+		credentials_.accessKeySecret = credentialsNode["AccessKeySecret"].asString();
-	if(!sAMLAssertionInfoNode["Issuer"].isNull())
+	if(!credentialsNode["Expiration"].isNull())
-		sAMLAssertionInfo_.issuer = sAMLAssertionInfoNode["Issuer"].asString();
+		credentials_.expiration = credentialsNode["Expiration"].asString();
 
 }
 

sts/src/model/GenerateSessionAccessKeyRequest.cc

@@ -1,38 +0,0 @@
-/*
- * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <alibabacloud/sts/model/GenerateSessionAccessKeyRequest.h>
-
-using AlibabaCloud::Sts::Model::GenerateSessionAccessKeyRequest;
-
-GenerateSessionAccessKeyRequest::GenerateSessionAccessKeyRequest() :
-	RpcServiceRequest("sts", "2015-04-01", "GenerateSessionAccessKey")
-{}
-
-GenerateSessionAccessKeyRequest::~GenerateSessionAccessKeyRequest()
-{}
-
-long GenerateSessionAccessKeyRequest::getDurationSeconds()const
-{
-	return durationSeconds_;
-}
-
-void GenerateSessionAccessKeyRequest::setDurationSeconds(long durationSeconds)
-{
-	durationSeconds_ = durationSeconds;
-	setParameter("DurationSeconds", std::to_string(durationSeconds));
-}
-

sts/src/model/GenerateSessionAccessKeyResult.cc

@@ -1,57 +0,0 @@
-/*
- * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <alibabacloud/sts/model/GenerateSessionAccessKeyResult.h>
-#include <json/json.h>
-
-using namespace AlibabaCloud::Sts;
-using namespace AlibabaCloud::Sts::Model;
-
-GenerateSessionAccessKeyResult::GenerateSessionAccessKeyResult() :
-	ServiceResult()
-{}
-
-GenerateSessionAccessKeyResult::GenerateSessionAccessKeyResult(const std::string &payload) :
-	ServiceResult()
-{
-	parse(payload);
-}
-
-GenerateSessionAccessKeyResult::~GenerateSessionAccessKeyResult()
-{}
-
-void GenerateSessionAccessKeyResult::parse(const std::string &payload)
-{
-	Json::Reader reader;
-	Json::Value value;
-	reader.parse(payload, value);
-
-	setRequestId(value["RequestId"].asString());
-	auto sessionAccessKeyNode = value["SessionAccessKey"];
-	if(!sessionAccessKeyNode["SessionAccessKeyId"].isNull())
-		sessionAccessKey_.sessionAccessKeyId = sessionAccessKeyNode["SessionAccessKeyId"].asString();
-	if(!sessionAccessKeyNode["SessionAccessKeySecret"].isNull())
-		sessionAccessKey_.sessionAccessKeySecret = sessionAccessKeyNode["SessionAccessKeySecret"].asString();
-	if(!sessionAccessKeyNode["Expiration"].isNull())
-		sessionAccessKey_.expiration = sessionAccessKeyNode["Expiration"].asString();
-
-}
-
-GenerateSessionAccessKeyResult::SessionAccessKey GenerateSessionAccessKeyResult::getSessionAccessKey()const
-{
-	return sessionAccessKey_;
-}
-

sts/src/model/GetCallerIdentityResult.cc

@@ -39,18 +39,18 @@ void GetCallerIdentityResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	if(!value["AccountId"].isNull())
-		accountId_ = value["AccountId"].asString();
-	if(!value["UserId"].isNull())
-		userId_ = value["UserId"].asString();
-	if(!value["RoleId"].isNull())
-		roleId_ = value["RoleId"].asString();
-	if(!value["Arn"].isNull())
-		arn_ = value["Arn"].asString();
 	if(!value["IdentityType"].isNull())
 		identityType_ = value["IdentityType"].asString();
+	if(!value["AccountId"].isNull())
+		accountId_ = value["AccountId"].asString();
 	if(!value["PrincipalId"].isNull())
 		principalId_ = value["PrincipalId"].asString();
+	if(!value["UserId"].isNull())
+		userId_ = value["UserId"].asString();
+	if(!value["Arn"].isNull())
+		arn_ = value["Arn"].asString();
+	if(!value["RoleId"].isNull())
+		roleId_ = value["RoleId"].asString();
 
 }