Add Tag Open API.

VERSION

@@ -1 +1 @@
-1.36.1585
+1.36.1586

kms/CMakeLists.txt

@@ -111,6 +111,8 @@ set(kms_public_header_model
 	include/alibabacloud/kms/model/ListSecretVersionIdsResult.h
 	include/alibabacloud/kms/model/ListSecretsRequest.h
 	include/alibabacloud/kms/model/ListSecretsResult.h
+	include/alibabacloud/kms/model/ListTagResourcesRequest.h
+	include/alibabacloud/kms/model/ListTagResourcesResult.h
 	include/alibabacloud/kms/model/OpenKmsServiceRequest.h
 	include/alibabacloud/kms/model/OpenKmsServiceResult.h
 	include/alibabacloud/kms/model/PutSecretValueRequest.h
@@ -127,8 +129,12 @@ set(kms_public_header_model
 	include/alibabacloud/kms/model/SetDeletionProtectionResult.h
 	include/alibabacloud/kms/model/TagResourceRequest.h
 	include/alibabacloud/kms/model/TagResourceResult.h
+	include/alibabacloud/kms/model/TagResourcesRequest.h
+	include/alibabacloud/kms/model/TagResourcesResult.h
 	include/alibabacloud/kms/model/UntagResourceRequest.h
 	include/alibabacloud/kms/model/UntagResourceResult.h
+	include/alibabacloud/kms/model/UntagResourcesRequest.h
+	include/alibabacloud/kms/model/UntagResourcesResult.h
 	include/alibabacloud/kms/model/UpdateAliasRequest.h
 	include/alibabacloud/kms/model/UpdateAliasResult.h
 	include/alibabacloud/kms/model/UpdateCertificateStatusRequest.h
@@ -238,6 +244,8 @@ set(kms_src
 	src/model/ListSecretVersionIdsResult.cc
 	src/model/ListSecretsRequest.cc
 	src/model/ListSecretsResult.cc
+	src/model/ListTagResourcesRequest.cc
+	src/model/ListTagResourcesResult.cc
 	src/model/OpenKmsServiceRequest.cc
 	src/model/OpenKmsServiceResult.cc
 	src/model/PutSecretValueRequest.cc
@@ -254,8 +262,12 @@ set(kms_src
 	src/model/SetDeletionProtectionResult.cc
 	src/model/TagResourceRequest.cc
 	src/model/TagResourceResult.cc
+	src/model/TagResourcesRequest.cc
+	src/model/TagResourcesResult.cc
 	src/model/UntagResourceRequest.cc
 	src/model/UntagResourceResult.cc
+	src/model/UntagResourcesRequest.cc
+	src/model/UntagResourcesResult.cc
 	src/model/UpdateAliasRequest.cc
 	src/model/UpdateAliasResult.cc
 	src/model/UpdateCertificateStatusRequest.cc

kms/include/alibabacloud/kms/KmsClient.h

@@ -112,6 +112,8 @@
 #include "model/ListSecretVersionIdsResult.h"
 #include "model/ListSecretsRequest.h"
 #include "model/ListSecretsResult.h"
+#include "model/ListTagResourcesRequest.h"
+#include "model/ListTagResourcesResult.h"
 #include "model/OpenKmsServiceRequest.h"
 #include "model/OpenKmsServiceResult.h"
 #include "model/PutSecretValueRequest.h"
@@ -128,8 +130,12 @@
 #include "model/SetDeletionProtectionResult.h"
 #include "model/TagResourceRequest.h"
 #include "model/TagResourceResult.h"
+#include "model/TagResourcesRequest.h"
+#include "model/TagResourcesResult.h"
 #include "model/UntagResourceRequest.h"
 #include "model/UntagResourceResult.h"
+#include "model/UntagResourcesRequest.h"
+#include "model/UntagResourcesResult.h"
 #include "model/UpdateAliasRequest.h"
 #include "model/UpdateAliasResult.h"
 #include "model/UpdateCertificateStatusRequest.h"
@@ -290,6 +296,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::ListSecretsResult> ListSecretsOutcome;
 			typedef std::future<ListSecretsOutcome> ListSecretsOutcomeCallable;
 			typedef std::function<void(const KmsClient*, const Model::ListSecretsRequest&, const ListSecretsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ListSecretsAsyncHandler;
+			typedef Outcome<Error, Model::ListTagResourcesResult> ListTagResourcesOutcome;
+			typedef std::future<ListTagResourcesOutcome> ListTagResourcesOutcomeCallable;
+			typedef std::function<void(const KmsClient*, const Model::ListTagResourcesRequest&, const ListTagResourcesOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ListTagResourcesAsyncHandler;
 			typedef Outcome<Error, Model::OpenKmsServiceResult> OpenKmsServiceOutcome;
 			typedef std::future<OpenKmsServiceOutcome> OpenKmsServiceOutcomeCallable;
 			typedef std::function<void(const KmsClient*, const Model::OpenKmsServiceRequest&, const OpenKmsServiceOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> OpenKmsServiceAsyncHandler;
@@ -314,9 +323,15 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::TagResourceResult> TagResourceOutcome;
 			typedef std::future<TagResourceOutcome> TagResourceOutcomeCallable;
 			typedef std::function<void(const KmsClient*, const Model::TagResourceRequest&, const TagResourceOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> TagResourceAsyncHandler;
+			typedef Outcome<Error, Model::TagResourcesResult> TagResourcesOutcome;
+			typedef std::future<TagResourcesOutcome> TagResourcesOutcomeCallable;
+			typedef std::function<void(const KmsClient*, const Model::TagResourcesRequest&, const TagResourcesOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> TagResourcesAsyncHandler;
 			typedef Outcome<Error, Model::UntagResourceResult> UntagResourceOutcome;
 			typedef std::future<UntagResourceOutcome> UntagResourceOutcomeCallable;
 			typedef std::function<void(const KmsClient*, const Model::UntagResourceRequest&, const UntagResourceOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> UntagResourceAsyncHandler;
+			typedef Outcome<Error, Model::UntagResourcesResult> UntagResourcesOutcome;
+			typedef std::future<UntagResourcesOutcome> UntagResourcesOutcomeCallable;
+			typedef std::function<void(const KmsClient*, const Model::UntagResourcesRequest&, const UntagResourcesOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> UntagResourcesAsyncHandler;
 			typedef Outcome<Error, Model::UpdateAliasResult> UpdateAliasOutcome;
 			typedef std::future<UpdateAliasOutcome> UpdateAliasOutcomeCallable;
 			typedef std::function<void(const KmsClient*, const Model::UpdateAliasRequest&, const UpdateAliasOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> UpdateAliasAsyncHandler;
@@ -481,6 +496,9 @@ namespace AlibabaCloud
 			ListSecretsOutcome listSecrets(const Model::ListSecretsRequest &request)const;
 			void listSecretsAsync(const Model::ListSecretsRequest& request, const ListSecretsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ListSecretsOutcomeCallable listSecretsCallable(const Model::ListSecretsRequest& request) const;
+			ListTagResourcesOutcome listTagResources(const Model::ListTagResourcesRequest &request)const;
+			void listTagResourcesAsync(const Model::ListTagResourcesRequest& request, const ListTagResourcesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			ListTagResourcesOutcomeCallable listTagResourcesCallable(const Model::ListTagResourcesRequest& request) const;
 			OpenKmsServiceOutcome openKmsService(const Model::OpenKmsServiceRequest &request)const;
 			void openKmsServiceAsync(const Model::OpenKmsServiceRequest& request, const OpenKmsServiceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			OpenKmsServiceOutcomeCallable openKmsServiceCallable(const Model::OpenKmsServiceRequest& request) const;
@@ -505,9 +523,15 @@ namespace AlibabaCloud
 			TagResourceOutcome tagResource(const Model::TagResourceRequest &request)const;
 			void tagResourceAsync(const Model::TagResourceRequest& request, const TagResourceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			TagResourceOutcomeCallable tagResourceCallable(const Model::TagResourceRequest& request) const;
+			TagResourcesOutcome tagResources(const Model::TagResourcesRequest &request)const;
+			void tagResourcesAsync(const Model::TagResourcesRequest& request, const TagResourcesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			TagResourcesOutcomeCallable tagResourcesCallable(const Model::TagResourcesRequest& request) const;
 			UntagResourceOutcome untagResource(const Model::UntagResourceRequest &request)const;
 			void untagResourceAsync(const Model::UntagResourceRequest& request, const UntagResourceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			UntagResourceOutcomeCallable untagResourceCallable(const Model::UntagResourceRequest& request) const;
+			UntagResourcesOutcome untagResources(const Model::UntagResourcesRequest &request)const;
+			void untagResourcesAsync(const Model::UntagResourcesRequest& request, const UntagResourcesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			UntagResourcesOutcomeCallable untagResourcesCallable(const Model::UntagResourcesRequest& request) const;
 			UpdateAliasOutcome updateAlias(const Model::UpdateAliasRequest &request)const;
 			void updateAliasAsync(const Model::UpdateAliasRequest& request, const UpdateAliasAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			UpdateAliasOutcomeCallable updateAliasCallable(const Model::UpdateAliasRequest& request) const;

kms/include/alibabacloud/kms/model/AsymmetricSignRequest.h

@@ -32,17 +32,17 @@ public:
 	~AsymmetricSignRequest();
 	std::string getKeyVersionId() const;
 	void setKeyVersionId(const std::string &keyVersionId);
-	std::string getDigest() const;
-	void setDigest(const std::string &digest);
 	std::string getKeyId() const;
 	void setKeyId(const std::string &keyId);
+	std::string getDigest() const;
+	void setDigest(const std::string &digest);
 	std::string getAlgorithm() const;
 	void setAlgorithm(const std::string &algorithm);
 
 private:
 	std::string keyVersionId_;
-	std::string digest_;
 	std::string keyId_;
+	std::string digest_;
 	std::string algorithm_;
 };
 } // namespace Model

kms/include/alibabacloud/kms/model/AsymmetricVerifyRequest.h

@@ -32,10 +32,10 @@ public:
 	~AsymmetricVerifyRequest();
 	std::string getKeyVersionId() const;
 	void setKeyVersionId(const std::string &keyVersionId);
-	std::string getDigest() const;
-	void setDigest(const std::string &digest);
 	std::string getKeyId() const;
 	void setKeyId(const std::string &keyId);
+	std::string getDigest() const;
+	void setDigest(const std::string &digest);
 	std::string getValue() const;
 	void setValue(const std::string &value);
 	std::string getAlgorithm() const;
@@ -43,8 +43,8 @@ public:
 
 private:
 	std::string keyVersionId_;
-	std::string digest_;
 	std::string keyId_;
+	std::string digest_;
 	std::string value_;
 	std::string algorithm_;
 };

kms/include/alibabacloud/kms/model/CertificatePublicKeyVerifyRequest.h

@@ -30,22 +30,22 @@ class ALIBABACLOUD_KMS_EXPORT CertificatePublicKeyVerifyRequest : public RpcServ
 public:
 	CertificatePublicKeyVerifyRequest();
 	~CertificatePublicKeyVerifyRequest();
-	std::string getSignatureValue() const;
-	void setSignatureValue(const std::string &signatureValue);
 	std::string getMessageType() const;
 	void setMessageType(const std::string &messageType);
 	std::string getCertificateId() const;
 	void setCertificateId(const std::string &certificateId);
 	std::string getMessage() const;
 	void setMessage(const std::string &message);
+	std::string getSignatureValue() const;
+	void setSignatureValue(const std::string &signatureValue);
 	std::string getAlgorithm() const;
 	void setAlgorithm(const std::string &algorithm);
 
 private:
-	std::string signatureValue_;
 	std::string messageType_;
 	std::string certificateId_;
 	std::string message_;
+	std::string signatureValue_;
 	std::string algorithm_;
 };
 } // namespace Model

kms/include/alibabacloud/kms/model/CreateCertificateRequest.h

@@ -30,26 +30,26 @@ class ALIBABACLOUD_KMS_EXPORT CreateCertificateRequest : public RpcServiceReques
 public:
 	CreateCertificateRequest();
 	~CreateCertificateRequest();
-	std::string getProtectionLevel() const;
-	void setProtectionLevel(const std::string &protectionLevel);
-	bool getExportablePrivateKey() const;
-	void setExportablePrivateKey(bool exportablePrivateKey);
 	std::string getClientToken() const;
 	void setClientToken(const std::string &clientToken);
 	std::string getSubject() const;
 	void setSubject(const std::string &subject);
-	std::map<std::string, std::string> getSubjectAlternativeNames() const;
-	void setSubjectAlternativeNames(std::map<std::string, std::string> subjectAlternativeNames);
 	std::string getKeySpec() const;
 	void setKeySpec(const std::string &keySpec);
+	std::string getProtectionLevel() const;
+	void setProtectionLevel(const std::string &protectionLevel);
+	bool getExportablePrivateKey() const;
+	void setExportablePrivateKey(bool exportablePrivateKey);
+	std::map<std::string, std::string> getSubjectAlternativeNames() const;
+	void setSubjectAlternativeNames(std::map<std::string, std::string> subjectAlternativeNames);
 
 private:
-	std::string protectionLevel_;
-	bool exportablePrivateKey_;
 	std::string clientToken_;
 	std::string subject_;
-	std::map<std::string, std::string> subjectAlternativeNames_;
 	std::string keySpec_;
+	std::string protectionLevel_;
+	bool exportablePrivateKey_;
+	std::map<std::string, std::string> subjectAlternativeNames_;
 };
 } // namespace Model
 } // namespace Kms

kms/include/alibabacloud/kms/model/CreateKeyRequest.h

@@ -30,14 +30,8 @@ class ALIBABACLOUD_KMS_EXPORT CreateKeyRequest : public RpcServiceRequest {
 public:
 	CreateKeyRequest();
 	~CreateKeyRequest();
-	std::string getProtectionLevel() const;
-	void setProtectionLevel(const std::string &protectionLevel);
-	std::string getKeyUsage() const;
-	void setKeyUsage(const std::string &keyUsage);
 	std::string getOrigin() const;
 	void setOrigin(const std::string &origin);
-	std::string getDKMSInstanceId() const;
-	void setDKMSInstanceId(const std::string &dKMSInstanceId);
 	std::string getDescription() const;
 	void setDescription(const std::string &description);
 	std::string getKeySpec() const;
@@ -46,16 +40,25 @@ public:
 	void setRotationInterval(const std::string &rotationInterval);
 	bool getEnableAutomaticRotation() const;
 	void setEnableAutomaticRotation(bool enableAutomaticRotation);
+	std::string getTags() const;
+	void setTags(const std::string &tags);
+	std::string getProtectionLevel() const;
+	void setProtectionLevel(const std::string &protectionLevel);
+	std::string getKeyUsage() const;
+	void setKeyUsage(const std::string &keyUsage);
+	std::string getDKMSInstanceId() const;
+	void setDKMSInstanceId(const std::string &dKMSInstanceId);
 
 private:
-	std::string protectionLevel_;
-	std::string keyUsage_;
 	std::string origin_;
-	std::string dKMSInstanceId_;
 	std::string description_;
 	std::string keySpec_;
 	std::string rotationInterval_;
 	bool enableAutomaticRotation_;
+	std::string tags_;
+	std::string protectionLevel_;
+	std::string keyUsage_;
+	std::string dKMSInstanceId_;
 };
 } // namespace Model
 } // namespace Kms

kms/include/alibabacloud/kms/model/CreateSecretRequest.h

@@ -32,42 +32,42 @@ public:
 	~CreateSecretRequest();
 	std::string getSecretType() const;
 	void setSecretType(const std::string &secretType);
-	std::string getVersionId() const;
-	void setVersionId(const std::string &versionId);
-	std::string getDKMSInstanceId() const;
-	void setDKMSInstanceId(const std::string &dKMSInstanceId);
-	std::string getSecretData() const;
-	void setSecretData(const std::string &secretData);
 	std::string getDescription() const;
 	void setDescription(const std::string &description);
 	std::string getRotationInterval() const;
 	void setRotationInterval(const std::string &rotationInterval);
-	std::string getSecretName() const;
-	void setSecretName(const std::string &secretName);
 	bool getEnableAutomaticRotation() const;
 	void setEnableAutomaticRotation(bool enableAutomaticRotation);
 	std::string getEncryptionKeyId() const;
 	void setEncryptionKeyId(const std::string &encryptionKeyId);
-	std::string getSecretDataType() const;
-	void setSecretDataType(const std::string &secretDataType);
 	std::string getTags() const;
 	void setTags(const std::string &tags);
 	std::string getExtendedConfig() const;
 	void setExtendedConfig(const std::string &extendedConfig);
+	std::string getVersionId() const;
+	void setVersionId(const std::string &versionId);
+	std::string getDKMSInstanceId() const;
+	void setDKMSInstanceId(const std::string &dKMSInstanceId);
+	std::string getSecretData() const;
+	void setSecretData(const std::string &secretData);
+	std::string getSecretName() const;
+	void setSecretName(const std::string &secretName);
+	std::string getSecretDataType() const;
+	void setSecretDataType(const std::string &secretDataType);
 
 private:
 	std::string secretType_;
-	std::string versionId_;
-	std::string dKMSInstanceId_;
-	std::string secretData_;
 	std::string description_;
 	std::string rotationInterval_;
-	std::string secretName_;
 	bool enableAutomaticRotation_;
 	std::string encryptionKeyId_;
-	std::string secretDataType_;
 	std::string tags_;
 	std::string extendedConfig_;
+	std::string versionId_;
+	std::string dKMSInstanceId_;
+	std::string secretData_;
+	std::string secretName_;
+	std::string secretDataType_;
 };
 } // namespace Model
 } // namespace Kms

kms/include/alibabacloud/kms/model/EncryptRequest.h

@@ -30,17 +30,17 @@ class ALIBABACLOUD_KMS_EXPORT EncryptRequest : public RpcServiceRequest {
 public:
 	EncryptRequest();
 	~EncryptRequest();
-	std::string getEncryptionContext() const;
-	void setEncryptionContext(const std::string &encryptionContext);
 	std::string getKeyId() const;
 	void setKeyId(const std::string &keyId);
 	std::string getPlaintext() const;
 	void setPlaintext(const std::string &plaintext);
+	std::string getEncryptionContext() const;
+	void setEncryptionContext(const std::string &encryptionContext);
 
 private:
-	std::string encryptionContext_;
 	std::string keyId_;
 	std::string plaintext_;
+	std::string encryptionContext_;
 };
 } // namespace Model
 } // namespace Kms

kms/include/alibabacloud/kms/model/ExportDataKeyRequest.h

@@ -30,22 +30,22 @@ class ALIBABACLOUD_KMS_EXPORT ExportDataKeyRequest : public RpcServiceRequest {
 public:
 	ExportDataKeyRequest();
 	~ExportDataKeyRequest();
+	std::string getPublicKeyBlob() const;
+	void setPublicKeyBlob(const std::string &publicKeyBlob);
 	std::string getEncryptionContext() const;
 	void setEncryptionContext(const std::string &encryptionContext);
 	std::string getWrappingAlgorithm() const;
 	void setWrappingAlgorithm(const std::string &wrappingAlgorithm);
 	std::string getCiphertextBlob() const;
 	void setCiphertextBlob(const std::string &ciphertextBlob);
-	std::string getPublicKeyBlob() const;
-	void setPublicKeyBlob(const std::string &publicKeyBlob);
 	std::string getWrappingKeySpec() const;
 	void setWrappingKeySpec(const std::string &wrappingKeySpec);
 
 private:
+	std::string publicKeyBlob_;
 	std::string encryptionContext_;
 	std::string wrappingAlgorithm_;
 	std::string ciphertextBlob_;
-	std::string publicKeyBlob_;
 	std::string wrappingKeySpec_;
 };
 } // namespace Model

kms/include/alibabacloud/kms/model/GenerateAndExportDataKeyRequest.h

@@ -30,28 +30,28 @@ class ALIBABACLOUD_KMS_EXPORT GenerateAndExportDataKeyRequest : public RpcServic
 public:
 	GenerateAndExportDataKeyRequest();
 	~GenerateAndExportDataKeyRequest();
-	std::string getEncryptionContext() const;
-	void setEncryptionContext(const std::string &encryptionContext);
 	std::string getKeyId() const;
 	void setKeyId(const std::string &keyId);
 	std::string getKeySpec() const;
 	void setKeySpec(const std::string &keySpec);
 	int getNumberOfBytes() const;
 	void setNumberOfBytes(int numberOfBytes);
-	std::string getWrappingAlgorithm() const;
-	void setWrappingAlgorithm(const std::string &wrappingAlgorithm);
 	std::string getPublicKeyBlob() const;
 	void setPublicKeyBlob(const std::string &publicKeyBlob);
+	std::string getEncryptionContext() const;
+	void setEncryptionContext(const std::string &encryptionContext);
+	std::string getWrappingAlgorithm() const;
+	void setWrappingAlgorithm(const std::string &wrappingAlgorithm);
 	std::string getWrappingKeySpec() const;
 	void setWrappingKeySpec(const std::string &wrappingKeySpec);
 
 private:
-	std::string encryptionContext_;
 	std::string keyId_;
 	std::string keySpec_;
 	int numberOfBytes_;
-	std::string wrappingAlgorithm_;
 	std::string publicKeyBlob_;
+	std::string encryptionContext_;
+	std::string wrappingAlgorithm_;
 	std::string wrappingKeySpec_;
 };
 } // namespace Model

kms/include/alibabacloud/kms/model/GenerateDataKeyRequest.h

@@ -30,20 +30,20 @@ class ALIBABACLOUD_KMS_EXPORT GenerateDataKeyRequest : public RpcServiceRequest
 public:
 	GenerateDataKeyRequest();
 	~GenerateDataKeyRequest();
-	std::string getEncryptionContext() const;
-	void setEncryptionContext(const std::string &encryptionContext);
 	std::string getKeyId() const;
 	void setKeyId(const std::string &keyId);
 	std::string getKeySpec() const;
 	void setKeySpec(const std::string &keySpec);
 	int getNumberOfBytes() const;
 	void setNumberOfBytes(int numberOfBytes);
+	std::string getEncryptionContext() const;
+	void setEncryptionContext(const std::string &encryptionContext);
 
 private:
-	std::string encryptionContext_;
 	std::string keyId_;
 	std::string keySpec_;
 	int numberOfBytes_;
+	std::string encryptionContext_;
 };
 } // namespace Model
 } // namespace Kms

kms/include/alibabacloud/kms/model/GenerateDataKeyWithoutPlaintextRequest.h

@@ -30,20 +30,20 @@ class ALIBABACLOUD_KMS_EXPORT GenerateDataKeyWithoutPlaintextRequest : public Rp
 public:
 	GenerateDataKeyWithoutPlaintextRequest();
 	~GenerateDataKeyWithoutPlaintextRequest();
-	std::string getEncryptionContext() const;
-	void setEncryptionContext(const std::string &encryptionContext);
 	std::string getKeyId() const;
 	void setKeyId(const std::string &keyId);
 	std::string getKeySpec() const;
 	void setKeySpec(const std::string &keySpec);
 	int getNumberOfBytes() const;
 	void setNumberOfBytes(int numberOfBytes);
+	std::string getEncryptionContext() const;
+	void setEncryptionContext(const std::string &encryptionContext);
 
 private:
-	std::string encryptionContext_;
 	std::string keyId_;
 	std::string keySpec_;
 	int numberOfBytes_;
+	std::string encryptionContext_;
 };
 } // namespace Model
 } // namespace Kms

kms/include/alibabacloud/kms/model/GetRandomPasswordRequest.h

@@ -30,29 +30,29 @@ class ALIBABACLOUD_KMS_EXPORT GetRandomPasswordRequest : public RpcServiceReques
 public:
 	GetRandomPasswordRequest();
 	~GetRandomPasswordRequest();
-	std::string getExcludeLowercase() const;
-	void setExcludeLowercase(const std::string &excludeLowercase);
 	std::string getExcludeCharacters() const;
 	void setExcludeCharacters(const std::string &excludeCharacters);
 	std::string getPasswordLength() const;
 	void setPasswordLength(const std::string &passwordLength);
 	std::string getExcludePunctuation() const;
 	void setExcludePunctuation(const std::string &excludePunctuation);
-	std::string getExcludeUppercase() const;
-	void setExcludeUppercase(const std::string &excludeUppercase);
 	std::string getRequireEachIncludedType() const;
 	void setRequireEachIncludedType(const std::string &requireEachIncludedType);
 	std::string getExcludeNumbers() const;
 	void setExcludeNumbers(const std::string &excludeNumbers);
+	std::string getExcludeLowercase() const;
+	void setExcludeLowercase(const std::string &excludeLowercase);
+	std::string getExcludeUppercase() const;
+	void setExcludeUppercase(const std::string &excludeUppercase);
 
 private:
-	std::string excludeLowercase_;
 	std::string excludeCharacters_;
 	std::string passwordLength_;
 	std::string excludePunctuation_;
-	std::string excludeUppercase_;
 	std::string requireEachIncludedType_;
 	std::string excludeNumbers_;
+	std::string excludeLowercase_;
+	std::string excludeUppercase_;
 };
 } // namespace Model
 } // namespace Kms

kms/include/alibabacloud/kms/model/ListAliasesByKeyIdRequest.h

@@ -30,17 +30,17 @@ class ALIBABACLOUD_KMS_EXPORT ListAliasesByKeyIdRequest : public RpcServiceReque
 public:
 	ListAliasesByKeyIdRequest();
 	~ListAliasesByKeyIdRequest();
-	int getPageSize() const;
-	void setPageSize(int pageSize);
 	std::string getKeyId() const;
 	void setKeyId(const std::string &keyId);
 	int getPageNumber() const;
 	void setPageNumber(int pageNumber);
+	int getPageSize() const;
+	void setPageSize(int pageSize);
 
 private:
-	int pageSize_;
 	std::string keyId_;
 	int pageNumber_;
+	int pageSize_;
 };
 } // namespace Model
 } // namespace Kms

kms/include/alibabacloud/kms/model/ListKeyVersionsRequest.h

@@ -30,17 +30,17 @@ class ALIBABACLOUD_KMS_EXPORT ListKeyVersionsRequest : public RpcServiceRequest
 public:
 	ListKeyVersionsRequest();
 	~ListKeyVersionsRequest();
-	int getPageSize() const;
-	void setPageSize(int pageSize);
 	std::string getKeyId() const;
 	void setKeyId(const std::string &keyId);
 	int getPageNumber() const;
 	void setPageNumber(int pageNumber);
+	int getPageSize() const;
+	void setPageSize(int pageSize);
 
 private:
-	int pageSize_;
 	std::string keyId_;
 	int pageNumber_;
+	int pageSize_;
 };
 } // namespace Model
 } // namespace Kms

kms/include/alibabacloud/kms/model/ListKeysRequest.h

@@ -30,17 +30,17 @@ class ALIBABACLOUD_KMS_EXPORT ListKeysRequest : public RpcServiceRequest {
 public:
 	ListKeysRequest();
 	~ListKeysRequest();
-	int getPageSize() const;
-	void setPageSize(int pageSize);
 	std::string getFilters() const;
 	void setFilters(const std::string &filters);
 	int getPageNumber() const;
 	void setPageNumber(int pageNumber);
+	int getPageSize() const;
+	void setPageSize(int pageSize);
 
 private:
-	int pageSize_;
 	std::string filters_;
 	int pageNumber_;
+	int pageSize_;
 };
 } // namespace Model
 } // namespace Kms

kms/include/alibabacloud/kms/model/ListSecretVersionIdsRequest.h

@@ -32,18 +32,18 @@ public:
 	~ListSecretVersionIdsRequest();
 	std::string getIncludeDeprecated() const;
 	void setIncludeDeprecated(const std::string &includeDeprecated);
+	int getPageNumber() const;
+	void setPageNumber(int pageNumber);
 	int getPageSize() const;
 	void setPageSize(int pageSize);
 	std::string getSecretName() const;
 	void setSecretName(const std::string &secretName);
-	int getPageNumber() const;
-	void setPageNumber(int pageNumber);
 
 private:
 	std::string includeDeprecated_;
+	int pageNumber_;
 	int pageSize_;
 	std::string secretName_;
-	int pageNumber_;
 };
 } // namespace Model
 } // namespace Kms

kms/include/alibabacloud/kms/model/ListSecretsRequest.h

@@ -30,20 +30,20 @@ class ALIBABACLOUD_KMS_EXPORT ListSecretsRequest : public RpcServiceRequest {
 public:
 	ListSecretsRequest();
 	~ListSecretsRequest();
-	int getPageSize() const;
-	void setPageSize(int pageSize);
 	std::string getFilters() const;
 	void setFilters(const std::string &filters);
-	std::string getFetchTags() const;
-	void setFetchTags(const std::string &fetchTags);
 	int getPageNumber() const;
 	void setPageNumber(int pageNumber);
+	int getPageSize() const;
+	void setPageSize(int pageSize);
+	std::string getFetchTags() const;
+	void setFetchTags(const std::string &fetchTags);
 
 private:
-	int pageSize_;
 	std::string filters_;
-	std::string fetchTags_;
 	int pageNumber_;
+	int pageSize_;
+	std::string fetchTags_;
 };
 } // namespace Model
 } // namespace Kms

kms/include/alibabacloud/kms/model/ListTagResourcesRequest.h

@@ -0,0 +1,58 @@
+/*
+ * 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.
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_LISTTAGRESOURCESREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_LISTTAGRESOURCESREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT ListTagResourcesRequest : public RpcServiceRequest {
+public:
+	struct Tag {
+		std::string value;
+		std::string key;
+	};
+	ListTagResourcesRequest();
+	~ListTagResourcesRequest();
+	std::vector<std::string> getResourceId() const;
+	void setResourceId(const std::vector<std::string> &resourceId);
+	std::string getResourceType() const;
+	void setResourceType(const std::string &resourceType);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
+	std::string getNextToken() const;
+	void setNextToken(const std::string &nextToken);
+	std::vector<Tag> getTag() const;
+	void setTag(const std::vector<Tag> &tag);
+
+private:
+	std::vector<std::string> resourceId_;
+	std::string resourceType_;
+	std::string regionId_;
+	std::string nextToken_;
+	std::vector<Tag> tag_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_LISTTAGRESOURCESREQUEST_H_

kms/include/alibabacloud/kms/model/ListTagResourcesResult.h

@@ -0,0 +1,60 @@
+/*
+ * 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.
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_LISTTAGRESOURCESRESULT_H_
+#define ALIBABACLOUD_KMS_MODEL_LISTTAGRESOURCESRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/kms/KmsExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Kms
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_KMS_EXPORT ListTagResourcesResult : public ServiceResult
+			{
+			public:
+				struct TagResource
+				{
+					std::string resourceId;
+					std::string tagKey;
+					std::string resourceType;
+					std::string tagValue;
+				};
+
+
+				ListTagResourcesResult();
+				explicit ListTagResourcesResult(const std::string &payload);
+				~ListTagResourcesResult();
+				std::string getNextToken()const;
+				std::vector<TagResource> getTagResources()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::string nextToken_;
+				std::vector<TagResource> tagResources_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_KMS_MODEL_LISTTAGRESOURCESRESULT_H_

kms/include/alibabacloud/kms/model/ReEncryptRequest.h

@@ -32,14 +32,14 @@ public:
 	~ReEncryptRequest();
 	std::string getDestinationEncryptionContext() const;
 	void setDestinationEncryptionContext(const std::string &destinationEncryptionContext);
+	std::string getSourceKeyId() const;
+	void setSourceKeyId(const std::string &sourceKeyId);
 	std::string getSourceEncryptionAlgorithm() const;
 	void setSourceEncryptionAlgorithm(const std::string &sourceEncryptionAlgorithm);
 	std::string getSourceKeyVersionId() const;
 	void setSourceKeyVersionId(const std::string &sourceKeyVersionId);
 	std::string getDestinationKeyId() const;
 	void setDestinationKeyId(const std::string &destinationKeyId);
-	std::string getSourceKeyId() const;
-	void setSourceKeyId(const std::string &sourceKeyId);
 	std::string getSourceEncryptionContext() const;
 	void setSourceEncryptionContext(const std::string &sourceEncryptionContext);
 	std::string getCiphertextBlob() const;
@@ -47,10 +47,10 @@ public:
 
 private:
 	std::string destinationEncryptionContext_;
+	std::string sourceKeyId_;
 	std::string sourceEncryptionAlgorithm_;
 	std::string sourceKeyVersionId_;
 	std::string destinationKeyId_;
-	std::string sourceKeyId_;
 	std::string sourceEncryptionContext_;
 	std::string ciphertextBlob_;
 };

kms/include/alibabacloud/kms/model/SetDeletionProtectionRequest.h

@@ -30,17 +30,17 @@ class ALIBABACLOUD_KMS_EXPORT SetDeletionProtectionRequest : public RpcServiceRe
 public:
 	SetDeletionProtectionRequest();
 	~SetDeletionProtectionRequest();
+	std::string getDeletionProtectionDescription() const;
+	void setDeletionProtectionDescription(const std::string &deletionProtectionDescription);
 	bool getEnableDeletionProtection() const;
 	void setEnableDeletionProtection(bool enableDeletionProtection);
 	std::string getProtectedResourceArn() const;
 	void setProtectedResourceArn(const std::string &protectedResourceArn);
-	std::string getDeletionProtectionDescription() const;
-	void setDeletionProtectionDescription(const std::string &deletionProtectionDescription);
 
 private:
+	std::string deletionProtectionDescription_;
 	bool enableDeletionProtection_;
 	std::string protectedResourceArn_;
-	std::string deletionProtectionDescription_;
 };
 } // namespace Model
 } // namespace Kms

kms/include/alibabacloud/kms/model/TagResourceRequest.h

@@ -34,16 +34,16 @@ public:
 	void setCertificateId(const std::string &certificateId);
 	std::string getKeyId() const;
 	void setKeyId(const std::string &keyId);
-	std::string getSecretName() const;
-	void setSecretName(const std::string &secretName);
 	std::string getTags() const;
 	void setTags(const std::string &tags);
+	std::string getSecretName() const;
+	void setSecretName(const std::string &secretName);
 
 private:
 	std::string certificateId_;
 	std::string keyId_;
-	std::string secretName_;
 	std::string tags_;
+	std::string secretName_;
 };
 } // namespace Model
 } // namespace Kms

kms/include/alibabacloud/kms/model/TagResourcesRequest.h

@@ -0,0 +1,55 @@
+/*
+ * 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.
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_TAGRESOURCESREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_TAGRESOURCESREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT TagResourcesRequest : public RpcServiceRequest {
+public:
+	struct Tag {
+		std::string value;
+		std::string key;
+	};
+	TagResourcesRequest();
+	~TagResourcesRequest();
+	std::vector<std::string> getResourceId() const;
+	void setResourceId(const std::vector<std::string> &resourceId);
+	std::string getResourceType() const;
+	void setResourceType(const std::string &resourceType);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
+	std::vector<Tag> getTag() const;
+	void setTag(const std::vector<Tag> &tag);
+
+private:
+	std::vector<std::string> resourceId_;
+	std::string resourceType_;
+	std::string regionId_;
+	std::vector<Tag> tag_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_TAGRESOURCESREQUEST_H_

kms/include/alibabacloud/kms/model/TagResourcesResult.h

@@ -0,0 +1,49 @@
+/*
+ * 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.
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_TAGRESOURCESRESULT_H_
+#define ALIBABACLOUD_KMS_MODEL_TAGRESOURCESRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/kms/KmsExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Kms
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_KMS_EXPORT TagResourcesResult : public ServiceResult
+			{
+			public:
+
+
+				TagResourcesResult();
+				explicit TagResourcesResult(const std::string &payload);
+				~TagResourcesResult();
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_KMS_MODEL_TAGRESOURCESRESULT_H_

kms/include/alibabacloud/kms/model/UntagResourceRequest.h

@@ -32,17 +32,17 @@ public:
 	~UntagResourceRequest();
 	std::string getCertificateId() const;
 	void setCertificateId(const std::string &certificateId);
-	std::string getTagKeys() const;
-	void setTagKeys(const std::string &tagKeys);
 	std::string getKeyId() const;
 	void setKeyId(const std::string &keyId);
+	std::string getTagKeys() const;
+	void setTagKeys(const std::string &tagKeys);
 	std::string getSecretName() const;
 	void setSecretName(const std::string &secretName);
 
 private:
 	std::string certificateId_;
-	std::string tagKeys_;
 	std::string keyId_;
+	std::string tagKeys_;
 	std::string secretName_;
 };
 } // namespace Model

kms/include/alibabacloud/kms/model/UntagResourcesRequest.h

@@ -0,0 +1,54 @@
+/*
+ * 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.
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_UNTAGRESOURCESREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_UNTAGRESOURCESREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT UntagResourcesRequest : public RpcServiceRequest {
+public:
+	UntagResourcesRequest();
+	~UntagResourcesRequest();
+	bool getAll() const;
+	void setAll(bool all);
+	std::vector<std::string> getResourceId() const;
+	void setResourceId(const std::vector<std::string> &resourceId);
+	std::string getResourceType() const;
+	void setResourceType(const std::string &resourceType);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
+	std::vector<std::string> getTagKey() const;
+	void setTagKey(const std::vector<std::string> &tagKey);
+
+private:
+	bool all_;
+	std::vector<std::string> resourceId_;
+	std::string resourceType_;
+	std::string regionId_;
+	std::vector<std::string> tagKey_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_UNTAGRESOURCESREQUEST_H_

kms/include/alibabacloud/kms/model/UntagResourcesResult.h

@@ -0,0 +1,49 @@
+/*
+ * 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.
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_UNTAGRESOURCESRESULT_H_
+#define ALIBABACLOUD_KMS_MODEL_UNTAGRESOURCESRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/kms/KmsExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Kms
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_KMS_EXPORT UntagResourcesResult : public ServiceResult
+			{
+			public:
+
+
+				UntagResourcesResult();
+				explicit UntagResourcesResult(const std::string &payload);
+				~UntagResourcesResult();
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_KMS_MODEL_UNTAGRESOURCESRESULT_H_

kms/include/alibabacloud/kms/model/UpdateSecretRotationPolicyRequest.h

@@ -32,15 +32,15 @@ public:
 	~UpdateSecretRotationPolicyRequest();
 	std::string getRotationInterval() const;
 	void setRotationInterval(const std::string &rotationInterval);
-	std::string getSecretName() const;
-	void setSecretName(const std::string &secretName);
 	bool getEnableAutomaticRotation() const;
 	void setEnableAutomaticRotation(bool enableAutomaticRotation);
+	std::string getSecretName() const;
+	void setSecretName(const std::string &secretName);
 
 private:
 	std::string rotationInterval_;
-	std::string secretName_;
 	bool enableAutomaticRotation_;
+	std::string secretName_;
 };
 } // namespace Model
 } // namespace Kms

kms/include/alibabacloud/kms/model/UpdateSecretVersionStageRequest.h

@@ -30,18 +30,18 @@ class ALIBABACLOUD_KMS_EXPORT UpdateSecretVersionStageRequest : public RpcServic
 public:
 	UpdateSecretVersionStageRequest();
 	~UpdateSecretVersionStageRequest();
-	std::string getRemoveFromVersion() const;
-	void setRemoveFromVersion(const std::string &removeFromVersion);
 	std::string getMoveToVersion() const;
 	void setMoveToVersion(const std::string &moveToVersion);
+	std::string getRemoveFromVersion() const;
+	void setRemoveFromVersion(const std::string &removeFromVersion);
 	std::string getVersionStage() const;
 	void setVersionStage(const std::string &versionStage);
 	std::string getSecretName() const;
 	void setSecretName(const std::string &secretName);
 
 private:
-	std::string removeFromVersion_;
 	std::string moveToVersion_;
+	std::string removeFromVersion_;
 	std::string versionStage_;
 	std::string secretName_;
 };

kms/src/KmsClient.cc

@@ -1671,6 +1671,42 @@ KmsClient::ListSecretsOutcomeCallable KmsClient::listSecretsCallable(const ListS
 	return task->get_future();
 }
 
+KmsClient::ListTagResourcesOutcome KmsClient::listTagResources(const ListTagResourcesRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return ListTagResourcesOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return ListTagResourcesOutcome(ListTagResourcesResult(outcome.result()));
+	else
+		return ListTagResourcesOutcome(outcome.error());
+}
+
+void KmsClient::listTagResourcesAsync(const ListTagResourcesRequest& request, const ListTagResourcesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, listTagResources(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+KmsClient::ListTagResourcesOutcomeCallable KmsClient::listTagResourcesCallable(const ListTagResourcesRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<ListTagResourcesOutcome()>>(
+			[this, request]()
+			{
+			return this->listTagResources(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 KmsClient::OpenKmsServiceOutcome KmsClient::openKmsService(const OpenKmsServiceRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -1959,6 +1995,42 @@ KmsClient::TagResourceOutcomeCallable KmsClient::tagResourceCallable(const TagRe
 	return task->get_future();
 }
 
+KmsClient::TagResourcesOutcome KmsClient::tagResources(const TagResourcesRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return TagResourcesOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return TagResourcesOutcome(TagResourcesResult(outcome.result()));
+	else
+		return TagResourcesOutcome(outcome.error());
+}
+
+void KmsClient::tagResourcesAsync(const TagResourcesRequest& request, const TagResourcesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, tagResources(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+KmsClient::TagResourcesOutcomeCallable KmsClient::tagResourcesCallable(const TagResourcesRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<TagResourcesOutcome()>>(
+			[this, request]()
+			{
+			return this->tagResources(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 KmsClient::UntagResourceOutcome KmsClient::untagResource(const UntagResourceRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -1995,6 +2067,42 @@ KmsClient::UntagResourceOutcomeCallable KmsClient::untagResourceCallable(const U
 	return task->get_future();
 }
 
+KmsClient::UntagResourcesOutcome KmsClient::untagResources(const UntagResourcesRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return UntagResourcesOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return UntagResourcesOutcome(UntagResourcesResult(outcome.result()));
+	else
+		return UntagResourcesOutcome(outcome.error());
+}
+
+void KmsClient::untagResourcesAsync(const UntagResourcesRequest& request, const UntagResourcesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, untagResources(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+KmsClient::UntagResourcesOutcomeCallable KmsClient::untagResourcesCallable(const UntagResourcesRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<UntagResourcesOutcome()>>(
+			[this, request]()
+			{
+			return this->untagResources(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 KmsClient::UpdateAliasOutcome KmsClient::updateAlias(const UpdateAliasRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

kms/src/model/AsymmetricSignRequest.cc

@@ -34,15 +34,6 @@ void AsymmetricSignRequest::setKeyVersionId(const std::string &keyVersionId) {
   setParameter(std::string("KeyVersionId"), keyVersionId);
 }
 
-std::string AsymmetricSignRequest::getDigest() const {
-  return digest_;
-}
-
-void AsymmetricSignRequest::setDigest(const std::string &digest) {
-  digest_ = digest;
-  setParameter(std::string("Digest"), digest);
-}
-
 std::string AsymmetricSignRequest::getKeyId() const {
   return keyId_;
 }
@@ -52,6 +43,15 @@ void AsymmetricSignRequest::setKeyId(const std::string &keyId) {
   setParameter(std::string("KeyId"), keyId);
 }
 
+std::string AsymmetricSignRequest::getDigest() const {
+  return digest_;
+}
+
+void AsymmetricSignRequest::setDigest(const std::string &digest) {
+  digest_ = digest;
+  setParameter(std::string("Digest"), digest);
+}
+
 std::string AsymmetricSignRequest::getAlgorithm() const {
   return algorithm_;
 }

kms/src/model/AsymmetricVerifyRequest.cc

@@ -34,15 +34,6 @@ void AsymmetricVerifyRequest::setKeyVersionId(const std::string &keyVersionId) {
   setParameter(std::string("KeyVersionId"), keyVersionId);
 }
 
-std::string AsymmetricVerifyRequest::getDigest() const {
-  return digest_;
-}
-
-void AsymmetricVerifyRequest::setDigest(const std::string &digest) {
-  digest_ = digest;
-  setParameter(std::string("Digest"), digest);
-}
-
 std::string AsymmetricVerifyRequest::getKeyId() const {
   return keyId_;
 }
@@ -52,6 +43,15 @@ void AsymmetricVerifyRequest::setKeyId(const std::string &keyId) {
   setParameter(std::string("KeyId"), keyId);
 }
 
+std::string AsymmetricVerifyRequest::getDigest() const {
+  return digest_;
+}
+
+void AsymmetricVerifyRequest::setDigest(const std::string &digest) {
+  digest_ = digest;
+  setParameter(std::string("Digest"), digest);
+}
+
 std::string AsymmetricVerifyRequest::getValue() const {
   return value_;
 }

kms/src/model/CertificatePublicKeyVerifyRequest.cc

@@ -25,15 +25,6 @@ CertificatePublicKeyVerifyRequest::CertificatePublicKeyVerifyRequest()
 
 CertificatePublicKeyVerifyRequest::~CertificatePublicKeyVerifyRequest() {}
 
-std::string CertificatePublicKeyVerifyRequest::getSignatureValue() const {
-  return signatureValue_;
-}
-
-void CertificatePublicKeyVerifyRequest::setSignatureValue(const std::string &signatureValue) {
-  signatureValue_ = signatureValue;
-  setParameter(std::string("SignatureValue"), signatureValue);
-}
-
 std::string CertificatePublicKeyVerifyRequest::getMessageType() const {
   return messageType_;
 }
@@ -61,6 +52,15 @@ void CertificatePublicKeyVerifyRequest::setMessage(const std::string &message) {
   setParameter(std::string("Message"), message);
 }
 
+std::string CertificatePublicKeyVerifyRequest::getSignatureValue() const {
+  return signatureValue_;
+}
+
+void CertificatePublicKeyVerifyRequest::setSignatureValue(const std::string &signatureValue) {
+  signatureValue_ = signatureValue;
+  setParameter(std::string("SignatureValue"), signatureValue);
+}
+
 std::string CertificatePublicKeyVerifyRequest::getAlgorithm() const {
   return algorithm_;
 }

kms/src/model/CreateCertificateRequest.cc

@@ -25,24 +25,6 @@ CreateCertificateRequest::CreateCertificateRequest()
 
 CreateCertificateRequest::~CreateCertificateRequest() {}
 
-std::string CreateCertificateRequest::getProtectionLevel() const {
-  return protectionLevel_;
-}
-
-void CreateCertificateRequest::setProtectionLevel(const std::string &protectionLevel) {
-  protectionLevel_ = protectionLevel;
-  setParameter(std::string("ProtectionLevel"), protectionLevel);
-}
-
-bool CreateCertificateRequest::getExportablePrivateKey() const {
-  return exportablePrivateKey_;
-}
-
-void CreateCertificateRequest::setExportablePrivateKey(bool exportablePrivateKey) {
-  exportablePrivateKey_ = exportablePrivateKey;
-  setParameter(std::string("ExportablePrivateKey"), exportablePrivateKey ? "true" : "false");
-}
-
 std::string CreateCertificateRequest::getClientToken() const {
   return clientToken_;
 }
@@ -61,15 +43,6 @@ void CreateCertificateRequest::setSubject(const std::string &subject) {
   setParameter(std::string("Subject"), subject);
 }
 
-std::map<std::string, std::string> CreateCertificateRequest::getSubjectAlternativeNames() const {
-  return subjectAlternativeNames_;
-}
-
-void CreateCertificateRequest::setSubjectAlternativeNames(std::map<std::string, std::string> subjectAlternativeNames) {
-  subjectAlternativeNames_ = subjectAlternativeNames;
-  setParameter(std::string("SubjectAlternativeNames"), subjectAlternativeNames);
-}
-
 std::string CreateCertificateRequest::getKeySpec() const {
   return keySpec_;
 }
@@ -79,3 +52,30 @@ void CreateCertificateRequest::setKeySpec(const std::string &keySpec) {
   setParameter(std::string("KeySpec"), keySpec);
 }
 
+std::string CreateCertificateRequest::getProtectionLevel() const {
+  return protectionLevel_;
+}
+
+void CreateCertificateRequest::setProtectionLevel(const std::string &protectionLevel) {
+  protectionLevel_ = protectionLevel;
+  setParameter(std::string("ProtectionLevel"), protectionLevel);
+}
+
+bool CreateCertificateRequest::getExportablePrivateKey() const {
+  return exportablePrivateKey_;
+}
+
+void CreateCertificateRequest::setExportablePrivateKey(bool exportablePrivateKey) {
+  exportablePrivateKey_ = exportablePrivateKey;
+  setParameter(std::string("ExportablePrivateKey"), exportablePrivateKey ? "true" : "false");
+}
+
+std::map<std::string, std::string> CreateCertificateRequest::getSubjectAlternativeNames() const {
+  return subjectAlternativeNames_;
+}
+
+void CreateCertificateRequest::setSubjectAlternativeNames(std::map<std::string, std::string> subjectAlternativeNames) {
+  subjectAlternativeNames_ = subjectAlternativeNames;
+  setParameter(std::string("SubjectAlternativeNames"), subjectAlternativeNames);
+}
+

kms/src/model/CreateKeyRequest.cc

@@ -25,24 +25,6 @@ CreateKeyRequest::CreateKeyRequest()
 
 CreateKeyRequest::~CreateKeyRequest() {}
 
-std::string CreateKeyRequest::getProtectionLevel() const {
-  return protectionLevel_;
-}
-
-void CreateKeyRequest::setProtectionLevel(const std::string &protectionLevel) {
-  protectionLevel_ = protectionLevel;
-  setParameter(std::string("ProtectionLevel"), protectionLevel);
-}
-
-std::string CreateKeyRequest::getKeyUsage() const {
-  return keyUsage_;
-}
-
-void CreateKeyRequest::setKeyUsage(const std::string &keyUsage) {
-  keyUsage_ = keyUsage;
-  setParameter(std::string("KeyUsage"), keyUsage);
-}
-
 std::string CreateKeyRequest::getOrigin() const {
   return origin_;
 }
@@ -52,15 +34,6 @@ void CreateKeyRequest::setOrigin(const std::string &origin) {
   setParameter(std::string("Origin"), origin);
 }
 
-std::string CreateKeyRequest::getDKMSInstanceId() const {
-  return dKMSInstanceId_;
-}
-
-void CreateKeyRequest::setDKMSInstanceId(const std::string &dKMSInstanceId) {
-  dKMSInstanceId_ = dKMSInstanceId;
-  setParameter(std::string("DKMSInstanceId"), dKMSInstanceId);
-}
-
 std::string CreateKeyRequest::getDescription() const {
   return description_;
 }
@@ -97,3 +70,39 @@ void CreateKeyRequest::setEnableAutomaticRotation(bool enableAutomaticRotation)
   setParameter(std::string("EnableAutomaticRotation"), enableAutomaticRotation ? "true" : "false");
 }
 
+std::string CreateKeyRequest::getTags() const {
+  return tags_;
+}
+
+void CreateKeyRequest::setTags(const std::string &tags) {
+  tags_ = tags;
+  setParameter(std::string("Tags"), tags);
+}
+
+std::string CreateKeyRequest::getProtectionLevel() const {
+  return protectionLevel_;
+}
+
+void CreateKeyRequest::setProtectionLevel(const std::string &protectionLevel) {
+  protectionLevel_ = protectionLevel;
+  setParameter(std::string("ProtectionLevel"), protectionLevel);
+}
+
+std::string CreateKeyRequest::getKeyUsage() const {
+  return keyUsage_;
+}
+
+void CreateKeyRequest::setKeyUsage(const std::string &keyUsage) {
+  keyUsage_ = keyUsage;
+  setParameter(std::string("KeyUsage"), keyUsage);
+}
+
+std::string CreateKeyRequest::getDKMSInstanceId() const {
+  return dKMSInstanceId_;
+}
+
+void CreateKeyRequest::setDKMSInstanceId(const std::string &dKMSInstanceId) {
+  dKMSInstanceId_ = dKMSInstanceId;
+  setParameter(std::string("DKMSInstanceId"), dKMSInstanceId);
+}
+

kms/src/model/CreateSecretRequest.cc

@@ -34,33 +34,6 @@ void CreateSecretRequest::setSecretType(const std::string &secretType) {
   setParameter(std::string("SecretType"), secretType);
 }
 
-std::string CreateSecretRequest::getVersionId() const {
-  return versionId_;
-}
-
-void CreateSecretRequest::setVersionId(const std::string &versionId) {
-  versionId_ = versionId;
-  setParameter(std::string("VersionId"), versionId);
-}
-
-std::string CreateSecretRequest::getDKMSInstanceId() const {
-  return dKMSInstanceId_;
-}
-
-void CreateSecretRequest::setDKMSInstanceId(const std::string &dKMSInstanceId) {
-  dKMSInstanceId_ = dKMSInstanceId;
-  setParameter(std::string("DKMSInstanceId"), dKMSInstanceId);
-}
-
-std::string CreateSecretRequest::getSecretData() const {
-  return secretData_;
-}
-
-void CreateSecretRequest::setSecretData(const std::string &secretData) {
-  secretData_ = secretData;
-  setParameter(std::string("SecretData"), secretData);
-}
-
 std::string CreateSecretRequest::getDescription() const {
   return description_;
 }
@@ -79,15 +52,6 @@ void CreateSecretRequest::setRotationInterval(const std::string &rotationInterva
   setParameter(std::string("RotationInterval"), rotationInterval);
 }
 
-std::string CreateSecretRequest::getSecretName() const {
-  return secretName_;
-}
-
-void CreateSecretRequest::setSecretName(const std::string &secretName) {
-  secretName_ = secretName;
-  setParameter(std::string("SecretName"), secretName);
-}
-
 bool CreateSecretRequest::getEnableAutomaticRotation() const {
   return enableAutomaticRotation_;
 }
@@ -106,15 +70,6 @@ void CreateSecretRequest::setEncryptionKeyId(const std::string &encryptionKeyId)
   setParameter(std::string("EncryptionKeyId"), encryptionKeyId);
 }
 
-std::string CreateSecretRequest::getSecretDataType() const {
-  return secretDataType_;
-}
-
-void CreateSecretRequest::setSecretDataType(const std::string &secretDataType) {
-  secretDataType_ = secretDataType;
-  setParameter(std::string("SecretDataType"), secretDataType);
-}
-
 std::string CreateSecretRequest::getTags() const {
   return tags_;
 }
@@ -133,3 +88,48 @@ void CreateSecretRequest::setExtendedConfig(const std::string &extendedConfig) {
   setParameter(std::string("ExtendedConfig"), extendedConfig);
 }
 
+std::string CreateSecretRequest::getVersionId() const {
+  return versionId_;
+}
+
+void CreateSecretRequest::setVersionId(const std::string &versionId) {
+  versionId_ = versionId;
+  setParameter(std::string("VersionId"), versionId);
+}
+
+std::string CreateSecretRequest::getDKMSInstanceId() const {
+  return dKMSInstanceId_;
+}
+
+void CreateSecretRequest::setDKMSInstanceId(const std::string &dKMSInstanceId) {
+  dKMSInstanceId_ = dKMSInstanceId;
+  setParameter(std::string("DKMSInstanceId"), dKMSInstanceId);
+}
+
+std::string CreateSecretRequest::getSecretData() const {
+  return secretData_;
+}
+
+void CreateSecretRequest::setSecretData(const std::string &secretData) {
+  secretData_ = secretData;
+  setParameter(std::string("SecretData"), secretData);
+}
+
+std::string CreateSecretRequest::getSecretName() const {
+  return secretName_;
+}
+
+void CreateSecretRequest::setSecretName(const std::string &secretName) {
+  secretName_ = secretName;
+  setParameter(std::string("SecretName"), secretName);
+}
+
+std::string CreateSecretRequest::getSecretDataType() const {
+  return secretDataType_;
+}
+
+void CreateSecretRequest::setSecretDataType(const std::string &secretDataType) {
+  secretDataType_ = secretDataType;
+  setParameter(std::string("SecretDataType"), secretDataType);
+}
+

kms/src/model/EncryptRequest.cc

@@ -25,15 +25,6 @@ EncryptRequest::EncryptRequest()
 
 EncryptRequest::~EncryptRequest() {}
 
-std::string EncryptRequest::getEncryptionContext() const {
-  return encryptionContext_;
-}
-
-void EncryptRequest::setEncryptionContext(const std::string &encryptionContext) {
-  encryptionContext_ = encryptionContext;
-  setParameter(std::string("EncryptionContext"), encryptionContext);
-}
-
 std::string EncryptRequest::getKeyId() const {
   return keyId_;
 }
@@ -52,3 +43,12 @@ void EncryptRequest::setPlaintext(const std::string &plaintext) {
   setParameter(std::string("Plaintext"), plaintext);
 }
 
+std::string EncryptRequest::getEncryptionContext() const {
+  return encryptionContext_;
+}
+
+void EncryptRequest::setEncryptionContext(const std::string &encryptionContext) {
+  encryptionContext_ = encryptionContext;
+  setParameter(std::string("EncryptionContext"), encryptionContext);
+}
+

kms/src/model/ExportDataKeyRequest.cc

@@ -25,6 +25,15 @@ ExportDataKeyRequest::ExportDataKeyRequest()
 
 ExportDataKeyRequest::~ExportDataKeyRequest() {}
 
+std::string ExportDataKeyRequest::getPublicKeyBlob() const {
+  return publicKeyBlob_;
+}
+
+void ExportDataKeyRequest::setPublicKeyBlob(const std::string &publicKeyBlob) {
+  publicKeyBlob_ = publicKeyBlob;
+  setParameter(std::string("PublicKeyBlob"), publicKeyBlob);
+}
+
 std::string ExportDataKeyRequest::getEncryptionContext() const {
   return encryptionContext_;
 }
@@ -52,15 +61,6 @@ void ExportDataKeyRequest::setCiphertextBlob(const std::string &ciphertextBlob)
   setParameter(std::string("CiphertextBlob"), ciphertextBlob);
 }
 
-std::string ExportDataKeyRequest::getPublicKeyBlob() const {
-  return publicKeyBlob_;
-}
-
-void ExportDataKeyRequest::setPublicKeyBlob(const std::string &publicKeyBlob) {
-  publicKeyBlob_ = publicKeyBlob;
-  setParameter(std::string("PublicKeyBlob"), publicKeyBlob);
-}
-
 std::string ExportDataKeyRequest::getWrappingKeySpec() const {
   return wrappingKeySpec_;
 }

kms/src/model/GenerateAndExportDataKeyRequest.cc

@@ -25,15 +25,6 @@ GenerateAndExportDataKeyRequest::GenerateAndExportDataKeyRequest()
 
 GenerateAndExportDataKeyRequest::~GenerateAndExportDataKeyRequest() {}
 
-std::string GenerateAndExportDataKeyRequest::getEncryptionContext() const {
-  return encryptionContext_;
-}
-
-void GenerateAndExportDataKeyRequest::setEncryptionContext(const std::string &encryptionContext) {
-  encryptionContext_ = encryptionContext;
-  setParameter(std::string("EncryptionContext"), encryptionContext);
-}
-
 std::string GenerateAndExportDataKeyRequest::getKeyId() const {
   return keyId_;
 }
@@ -61,15 +52,6 @@ void GenerateAndExportDataKeyRequest::setNumberOfBytes(int numberOfBytes) {
   setParameter(std::string("NumberOfBytes"), std::to_string(numberOfBytes));
 }
 
-std::string GenerateAndExportDataKeyRequest::getWrappingAlgorithm() const {
-  return wrappingAlgorithm_;
-}
-
-void GenerateAndExportDataKeyRequest::setWrappingAlgorithm(const std::string &wrappingAlgorithm) {
-  wrappingAlgorithm_ = wrappingAlgorithm;
-  setParameter(std::string("WrappingAlgorithm"), wrappingAlgorithm);
-}
-
 std::string GenerateAndExportDataKeyRequest::getPublicKeyBlob() const {
   return publicKeyBlob_;
 }
@@ -79,6 +61,24 @@ void GenerateAndExportDataKeyRequest::setPublicKeyBlob(const std::string &public
   setParameter(std::string("PublicKeyBlob"), publicKeyBlob);
 }
 
+std::string GenerateAndExportDataKeyRequest::getEncryptionContext() const {
+  return encryptionContext_;
+}
+
+void GenerateAndExportDataKeyRequest::setEncryptionContext(const std::string &encryptionContext) {
+  encryptionContext_ = encryptionContext;
+  setParameter(std::string("EncryptionContext"), encryptionContext);
+}
+
+std::string GenerateAndExportDataKeyRequest::getWrappingAlgorithm() const {
+  return wrappingAlgorithm_;
+}
+
+void GenerateAndExportDataKeyRequest::setWrappingAlgorithm(const std::string &wrappingAlgorithm) {
+  wrappingAlgorithm_ = wrappingAlgorithm;
+  setParameter(std::string("WrappingAlgorithm"), wrappingAlgorithm);
+}
+
 std::string GenerateAndExportDataKeyRequest::getWrappingKeySpec() const {
   return wrappingKeySpec_;
 }

kms/src/model/GenerateDataKeyRequest.cc

@@ -25,15 +25,6 @@ GenerateDataKeyRequest::GenerateDataKeyRequest()
 
 GenerateDataKeyRequest::~GenerateDataKeyRequest() {}
 
-std::string GenerateDataKeyRequest::getEncryptionContext() const {
-  return encryptionContext_;
-}
-
-void GenerateDataKeyRequest::setEncryptionContext(const std::string &encryptionContext) {
-  encryptionContext_ = encryptionContext;
-  setParameter(std::string("EncryptionContext"), encryptionContext);
-}
-
 std::string GenerateDataKeyRequest::getKeyId() const {
   return keyId_;
 }
@@ -61,3 +52,12 @@ void GenerateDataKeyRequest::setNumberOfBytes(int numberOfBytes) {
   setParameter(std::string("NumberOfBytes"), std::to_string(numberOfBytes));
 }
 
+std::string GenerateDataKeyRequest::getEncryptionContext() const {
+  return encryptionContext_;
+}
+
+void GenerateDataKeyRequest::setEncryptionContext(const std::string &encryptionContext) {
+  encryptionContext_ = encryptionContext;
+  setParameter(std::string("EncryptionContext"), encryptionContext);
+}
+

kms/src/model/GenerateDataKeyWithoutPlaintextRequest.cc

@@ -25,15 +25,6 @@ GenerateDataKeyWithoutPlaintextRequest::GenerateDataKeyWithoutPlaintextRequest()
 
 GenerateDataKeyWithoutPlaintextRequest::~GenerateDataKeyWithoutPlaintextRequest() {}
 
-std::string GenerateDataKeyWithoutPlaintextRequest::getEncryptionContext() const {
-  return encryptionContext_;
-}
-
-void GenerateDataKeyWithoutPlaintextRequest::setEncryptionContext(const std::string &encryptionContext) {
-  encryptionContext_ = encryptionContext;
-  setParameter(std::string("EncryptionContext"), encryptionContext);
-}
-
 std::string GenerateDataKeyWithoutPlaintextRequest::getKeyId() const {
   return keyId_;
 }
@@ -61,3 +52,12 @@ void GenerateDataKeyWithoutPlaintextRequest::setNumberOfBytes(int numberOfBytes)
   setParameter(std::string("NumberOfBytes"), std::to_string(numberOfBytes));
 }
 
+std::string GenerateDataKeyWithoutPlaintextRequest::getEncryptionContext() const {
+  return encryptionContext_;
+}
+
+void GenerateDataKeyWithoutPlaintextRequest::setEncryptionContext(const std::string &encryptionContext) {
+  encryptionContext_ = encryptionContext;
+  setParameter(std::string("EncryptionContext"), encryptionContext);
+}
+

kms/src/model/GetRandomPasswordRequest.cc

@@ -25,15 +25,6 @@ GetRandomPasswordRequest::GetRandomPasswordRequest()
 
 GetRandomPasswordRequest::~GetRandomPasswordRequest() {}
 
-std::string GetRandomPasswordRequest::getExcludeLowercase() const {
-  return excludeLowercase_;
-}
-
-void GetRandomPasswordRequest::setExcludeLowercase(const std::string &excludeLowercase) {
-  excludeLowercase_ = excludeLowercase;
-  setParameter(std::string("ExcludeLowercase"), excludeLowercase);
-}
-
 std::string GetRandomPasswordRequest::getExcludeCharacters() const {
   return excludeCharacters_;
 }
@@ -61,15 +52,6 @@ void GetRandomPasswordRequest::setExcludePunctuation(const std::string &excludeP
   setParameter(std::string("ExcludePunctuation"), excludePunctuation);
 }
 
-std::string GetRandomPasswordRequest::getExcludeUppercase() const {
-  return excludeUppercase_;
-}
-
-void GetRandomPasswordRequest::setExcludeUppercase(const std::string &excludeUppercase) {
-  excludeUppercase_ = excludeUppercase;
-  setParameter(std::string("ExcludeUppercase"), excludeUppercase);
-}
-
 std::string GetRandomPasswordRequest::getRequireEachIncludedType() const {
   return requireEachIncludedType_;
 }
@@ -88,3 +70,21 @@ void GetRandomPasswordRequest::setExcludeNumbers(const std::string &excludeNumbe
   setParameter(std::string("ExcludeNumbers"), excludeNumbers);
 }
 
+std::string GetRandomPasswordRequest::getExcludeLowercase() const {
+  return excludeLowercase_;
+}
+
+void GetRandomPasswordRequest::setExcludeLowercase(const std::string &excludeLowercase) {
+  excludeLowercase_ = excludeLowercase;
+  setParameter(std::string("ExcludeLowercase"), excludeLowercase);
+}
+
+std::string GetRandomPasswordRequest::getExcludeUppercase() const {
+  return excludeUppercase_;
+}
+
+void GetRandomPasswordRequest::setExcludeUppercase(const std::string &excludeUppercase) {
+  excludeUppercase_ = excludeUppercase;
+  setParameter(std::string("ExcludeUppercase"), excludeUppercase);
+}
+

kms/src/model/ListAliasesByKeyIdRequest.cc

@@ -25,15 +25,6 @@ ListAliasesByKeyIdRequest::ListAliasesByKeyIdRequest()
 
 ListAliasesByKeyIdRequest::~ListAliasesByKeyIdRequest() {}
 
-int ListAliasesByKeyIdRequest::getPageSize() const {
-  return pageSize_;
-}
-
-void ListAliasesByKeyIdRequest::setPageSize(int pageSize) {
-  pageSize_ = pageSize;
-  setParameter(std::string("PageSize"), std::to_string(pageSize));
-}
-
 std::string ListAliasesByKeyIdRequest::getKeyId() const {
   return keyId_;
 }
@@ -52,3 +43,12 @@ void ListAliasesByKeyIdRequest::setPageNumber(int pageNumber) {
   setParameter(std::string("PageNumber"), std::to_string(pageNumber));
 }
 
+int ListAliasesByKeyIdRequest::getPageSize() const {
+  return pageSize_;
+}
+
+void ListAliasesByKeyIdRequest::setPageSize(int pageSize) {
+  pageSize_ = pageSize;
+  setParameter(std::string("PageSize"), std::to_string(pageSize));
+}
+

kms/src/model/ListKeyVersionsRequest.cc

@@ -25,15 +25,6 @@ ListKeyVersionsRequest::ListKeyVersionsRequest()
 
 ListKeyVersionsRequest::~ListKeyVersionsRequest() {}
 
-int ListKeyVersionsRequest::getPageSize() const {
-  return pageSize_;
-}
-
-void ListKeyVersionsRequest::setPageSize(int pageSize) {
-  pageSize_ = pageSize;
-  setParameter(std::string("PageSize"), std::to_string(pageSize));
-}
-
 std::string ListKeyVersionsRequest::getKeyId() const {
   return keyId_;
 }
@@ -52,3 +43,12 @@ void ListKeyVersionsRequest::setPageNumber(int pageNumber) {
   setParameter(std::string("PageNumber"), std::to_string(pageNumber));
 }
 
+int ListKeyVersionsRequest::getPageSize() const {
+  return pageSize_;
+}
+
+void ListKeyVersionsRequest::setPageSize(int pageSize) {
+  pageSize_ = pageSize;
+  setParameter(std::string("PageSize"), std::to_string(pageSize));
+}
+

kms/src/model/ListKeysRequest.cc

@@ -25,15 +25,6 @@ ListKeysRequest::ListKeysRequest()
 
 ListKeysRequest::~ListKeysRequest() {}
 
-int ListKeysRequest::getPageSize() const {
-  return pageSize_;
-}
-
-void ListKeysRequest::setPageSize(int pageSize) {
-  pageSize_ = pageSize;
-  setParameter(std::string("PageSize"), std::to_string(pageSize));
-}
-
 std::string ListKeysRequest::getFilters() const {
   return filters_;
 }
@@ -52,3 +43,12 @@ void ListKeysRequest::setPageNumber(int pageNumber) {
   setParameter(std::string("PageNumber"), std::to_string(pageNumber));
 }
 
+int ListKeysRequest::getPageSize() const {
+  return pageSize_;
+}
+
+void ListKeysRequest::setPageSize(int pageSize) {
+  pageSize_ = pageSize;
+  setParameter(std::string("PageSize"), std::to_string(pageSize));
+}
+

kms/src/model/ListSecretVersionIdsRequest.cc

@@ -34,6 +34,15 @@ void ListSecretVersionIdsRequest::setIncludeDeprecated(const std::string &includ
   setParameter(std::string("IncludeDeprecated"), includeDeprecated);
 }
 
+int ListSecretVersionIdsRequest::getPageNumber() const {
+  return pageNumber_;
+}
+
+void ListSecretVersionIdsRequest::setPageNumber(int pageNumber) {
+  pageNumber_ = pageNumber;
+  setParameter(std::string("PageNumber"), std::to_string(pageNumber));
+}
+
 int ListSecretVersionIdsRequest::getPageSize() const {
   return pageSize_;
 }
@@ -52,12 +61,3 @@ void ListSecretVersionIdsRequest::setSecretName(const std::string &secretName) {
   setParameter(std::string("SecretName"), secretName);
 }
 
-int ListSecretVersionIdsRequest::getPageNumber() const {
-  return pageNumber_;
-}
-
-void ListSecretVersionIdsRequest::setPageNumber(int pageNumber) {
-  pageNumber_ = pageNumber;
-  setParameter(std::string("PageNumber"), std::to_string(pageNumber));
-}
-

kms/src/model/ListSecretsRequest.cc

@@ -25,15 +25,6 @@ ListSecretsRequest::ListSecretsRequest()
 
 ListSecretsRequest::~ListSecretsRequest() {}
 
-int ListSecretsRequest::getPageSize() const {
-  return pageSize_;
-}
-
-void ListSecretsRequest::setPageSize(int pageSize) {
-  pageSize_ = pageSize;
-  setParameter(std::string("PageSize"), std::to_string(pageSize));
-}
-
 std::string ListSecretsRequest::getFilters() const {
   return filters_;
 }
@@ -43,15 +34,6 @@ void ListSecretsRequest::setFilters(const std::string &filters) {
   setParameter(std::string("Filters"), filters);
 }
 
-std::string ListSecretsRequest::getFetchTags() const {
-  return fetchTags_;
-}
-
-void ListSecretsRequest::setFetchTags(const std::string &fetchTags) {
-  fetchTags_ = fetchTags;
-  setParameter(std::string("FetchTags"), fetchTags);
-}
-
 int ListSecretsRequest::getPageNumber() const {
   return pageNumber_;
 }
@@ -61,3 +43,21 @@ void ListSecretsRequest::setPageNumber(int pageNumber) {
   setParameter(std::string("PageNumber"), std::to_string(pageNumber));
 }
 
+int ListSecretsRequest::getPageSize() const {
+  return pageSize_;
+}
+
+void ListSecretsRequest::setPageSize(int pageSize) {
+  pageSize_ = pageSize;
+  setParameter(std::string("PageSize"), std::to_string(pageSize));
+}
+
+std::string ListSecretsRequest::getFetchTags() const {
+  return fetchTags_;
+}
+
+void ListSecretsRequest::setFetchTags(const std::string &fetchTags) {
+  fetchTags_ = fetchTags;
+  setParameter(std::string("FetchTags"), fetchTags);
+}
+

kms/src/model/ListTagResourcesRequest.cc

@@ -0,0 +1,76 @@
+/*
+ * 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/kms/model/ListTagResourcesRequest.h>
+
+using AlibabaCloud::Kms::Model::ListTagResourcesRequest;
+
+ListTagResourcesRequest::ListTagResourcesRequest()
+    : RpcServiceRequest("kms", "2016-01-20", "ListTagResources") {
+  setMethod(HttpRequest::Method::Post);
+}
+
+ListTagResourcesRequest::~ListTagResourcesRequest() {}
+
+std::vector<std::string> ListTagResourcesRequest::getResourceId() const {
+  return resourceId_;
+}
+
+void ListTagResourcesRequest::setResourceId(const std::vector<std::string> &resourceId) {
+  resourceId_ = resourceId;
+}
+
+std::string ListTagResourcesRequest::getResourceType() const {
+  return resourceType_;
+}
+
+void ListTagResourcesRequest::setResourceType(const std::string &resourceType) {
+  resourceType_ = resourceType;
+  setParameter(std::string("ResourceType"), resourceType);
+}
+
+std::string ListTagResourcesRequest::getRegionId() const {
+  return regionId_;
+}
+
+void ListTagResourcesRequest::setRegionId(const std::string &regionId) {
+  regionId_ = regionId;
+  setParameter(std::string("RegionId"), regionId);
+}
+
+std::string ListTagResourcesRequest::getNextToken() const {
+  return nextToken_;
+}
+
+void ListTagResourcesRequest::setNextToken(const std::string &nextToken) {
+  nextToken_ = nextToken;
+  setParameter(std::string("NextToken"), nextToken);
+}
+
+std::vector<ListTagResourcesRequest::Tag> ListTagResourcesRequest::getTag() const {
+  return tag_;
+}
+
+void ListTagResourcesRequest::setTag(const std::vector<ListTagResourcesRequest::Tag> &tag) {
+  tag_ = tag;
+  for(int dep1 = 0; dep1 != tag.size(); dep1++) {
+  auto tagObj = tag.at(dep1);
+  std::string tagObjStr = std::string("Tag") + "." + std::to_string(dep1 + 1);
+    setParameter(tagObjStr + ".Value", tagObj.value);
+    setParameter(tagObjStr + ".Key", tagObj.key);
+  }
+}
+

kms/src/model/ListTagResourcesResult.cc

@@ -0,0 +1,70 @@
+/*
+ * 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/kms/model/ListTagResourcesResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Kms;
+using namespace AlibabaCloud::Kms::Model;
+
+ListTagResourcesResult::ListTagResourcesResult() :
+	ServiceResult()
+{}
+
+ListTagResourcesResult::ListTagResourcesResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+ListTagResourcesResult::~ListTagResourcesResult()
+{}
+
+void ListTagResourcesResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	auto allTagResourcesNode = value["TagResources"]["TagResource"];
+	for (auto valueTagResourcesTagResource : allTagResourcesNode)
+	{
+		TagResource tagResourcesObject;
+		if(!valueTagResourcesTagResource["ResourceType"].isNull())
+			tagResourcesObject.resourceType = valueTagResourcesTagResource["ResourceType"].asString();
+		if(!valueTagResourcesTagResource["TagValue"].isNull())
+			tagResourcesObject.tagValue = valueTagResourcesTagResource["TagValue"].asString();
+		if(!valueTagResourcesTagResource["ResourceId"].isNull())
+			tagResourcesObject.resourceId = valueTagResourcesTagResource["ResourceId"].asString();
+		if(!valueTagResourcesTagResource["TagKey"].isNull())
+			tagResourcesObject.tagKey = valueTagResourcesTagResource["TagKey"].asString();
+		tagResources_.push_back(tagResourcesObject);
+	}
+	if(!value["NextToken"].isNull())
+		nextToken_ = value["NextToken"].asString();
+
+}
+
+std::string ListTagResourcesResult::getNextToken()const
+{
+	return nextToken_;
+}
+
+std::vector<ListTagResourcesResult::TagResource> ListTagResourcesResult::getTagResources()const
+{
+	return tagResources_;
+}
+

kms/src/model/ReEncryptRequest.cc

@@ -34,6 +34,15 @@ void ReEncryptRequest::setDestinationEncryptionContext(const std::string &destin
   setParameter(std::string("DestinationEncryptionContext"), destinationEncryptionContext);
 }
 
+std::string ReEncryptRequest::getSourceKeyId() const {
+  return sourceKeyId_;
+}
+
+void ReEncryptRequest::setSourceKeyId(const std::string &sourceKeyId) {
+  sourceKeyId_ = sourceKeyId;
+  setParameter(std::string("SourceKeyId"), sourceKeyId);
+}
+
 std::string ReEncryptRequest::getSourceEncryptionAlgorithm() const {
   return sourceEncryptionAlgorithm_;
 }
@@ -61,15 +70,6 @@ void ReEncryptRequest::setDestinationKeyId(const std::string &destinationKeyId)
   setParameter(std::string("DestinationKeyId"), destinationKeyId);
 }
 
-std::string ReEncryptRequest::getSourceKeyId() const {
-  return sourceKeyId_;
-}
-
-void ReEncryptRequest::setSourceKeyId(const std::string &sourceKeyId) {
-  sourceKeyId_ = sourceKeyId;
-  setParameter(std::string("SourceKeyId"), sourceKeyId);
-}
-
 std::string ReEncryptRequest::getSourceEncryptionContext() const {
   return sourceEncryptionContext_;
 }

kms/src/model/SetDeletionProtectionRequest.cc

@@ -25,6 +25,15 @@ SetDeletionProtectionRequest::SetDeletionProtectionRequest()
 
 SetDeletionProtectionRequest::~SetDeletionProtectionRequest() {}
 
+std::string SetDeletionProtectionRequest::getDeletionProtectionDescription() const {
+  return deletionProtectionDescription_;
+}
+
+void SetDeletionProtectionRequest::setDeletionProtectionDescription(const std::string &deletionProtectionDescription) {
+  deletionProtectionDescription_ = deletionProtectionDescription;
+  setParameter(std::string("DeletionProtectionDescription"), deletionProtectionDescription);
+}
+
 bool SetDeletionProtectionRequest::getEnableDeletionProtection() const {
   return enableDeletionProtection_;
 }
@@ -43,12 +52,3 @@ void SetDeletionProtectionRequest::setProtectedResourceArn(const std::string &pr
   setParameter(std::string("ProtectedResourceArn"), protectedResourceArn);
 }
 
-std::string SetDeletionProtectionRequest::getDeletionProtectionDescription() const {
-  return deletionProtectionDescription_;
-}
-
-void SetDeletionProtectionRequest::setDeletionProtectionDescription(const std::string &deletionProtectionDescription) {
-  deletionProtectionDescription_ = deletionProtectionDescription;
-  setParameter(std::string("DeletionProtectionDescription"), deletionProtectionDescription);
-}
-

kms/src/model/TagResourceRequest.cc

@@ -43,15 +43,6 @@ void TagResourceRequest::setKeyId(const std::string &keyId) {
   setParameter(std::string("KeyId"), keyId);
 }
 
-std::string TagResourceRequest::getSecretName() const {
-  return secretName_;
-}
-
-void TagResourceRequest::setSecretName(const std::string &secretName) {
-  secretName_ = secretName;
-  setParameter(std::string("SecretName"), secretName);
-}
-
 std::string TagResourceRequest::getTags() const {
   return tags_;
 }
@@ -61,3 +52,12 @@ void TagResourceRequest::setTags(const std::string &tags) {
   setParameter(std::string("Tags"), tags);
 }
 
+std::string TagResourceRequest::getSecretName() const {
+  return secretName_;
+}
+
+void TagResourceRequest::setSecretName(const std::string &secretName) {
+  secretName_ = secretName;
+  setParameter(std::string("SecretName"), secretName);
+}
+

kms/src/model/TagResourcesRequest.cc

@@ -0,0 +1,67 @@
+/*
+ * 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/kms/model/TagResourcesRequest.h>
+
+using AlibabaCloud::Kms::Model::TagResourcesRequest;
+
+TagResourcesRequest::TagResourcesRequest()
+    : RpcServiceRequest("kms", "2016-01-20", "TagResources") {
+  setMethod(HttpRequest::Method::Post);
+}
+
+TagResourcesRequest::~TagResourcesRequest() {}
+
+std::vector<std::string> TagResourcesRequest::getResourceId() const {
+  return resourceId_;
+}
+
+void TagResourcesRequest::setResourceId(const std::vector<std::string> &resourceId) {
+  resourceId_ = resourceId;
+}
+
+std::string TagResourcesRequest::getResourceType() const {
+  return resourceType_;
+}
+
+void TagResourcesRequest::setResourceType(const std::string &resourceType) {
+  resourceType_ = resourceType;
+  setParameter(std::string("ResourceType"), resourceType);
+}
+
+std::string TagResourcesRequest::getRegionId() const {
+  return regionId_;
+}
+
+void TagResourcesRequest::setRegionId(const std::string &regionId) {
+  regionId_ = regionId;
+  setParameter(std::string("RegionId"), regionId);
+}
+
+std::vector<TagResourcesRequest::Tag> TagResourcesRequest::getTag() const {
+  return tag_;
+}
+
+void TagResourcesRequest::setTag(const std::vector<TagResourcesRequest::Tag> &tag) {
+  tag_ = tag;
+  for(int dep1 = 0; dep1 != tag.size(); dep1++) {
+  auto tagObj = tag.at(dep1);
+  std::string tagObjStr = std::string("Tag") + "." + std::to_string(dep1 + 1);
+    setParameter(tagObjStr + ".Value", tagObj.value);
+    setParameter(tagObjStr + ".Key", tagObj.key);
+  }
+}
+

kms/src/model/TagResourcesResult.cc

@@ -0,0 +1,44 @@
+/*
+ * 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/kms/model/TagResourcesResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Kms;
+using namespace AlibabaCloud::Kms::Model;
+
+TagResourcesResult::TagResourcesResult() :
+	ServiceResult()
+{}
+
+TagResourcesResult::TagResourcesResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+TagResourcesResult::~TagResourcesResult()
+{}
+
+void TagResourcesResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+
+}
+

kms/src/model/UntagResourceRequest.cc

@@ -34,15 +34,6 @@ void UntagResourceRequest::setCertificateId(const std::string &certificateId) {
   setParameter(std::string("CertificateId"), certificateId);
 }
 
-std::string UntagResourceRequest::getTagKeys() const {
-  return tagKeys_;
-}
-
-void UntagResourceRequest::setTagKeys(const std::string &tagKeys) {
-  tagKeys_ = tagKeys;
-  setParameter(std::string("TagKeys"), tagKeys);
-}
-
 std::string UntagResourceRequest::getKeyId() const {
   return keyId_;
 }
@@ -52,6 +43,15 @@ void UntagResourceRequest::setKeyId(const std::string &keyId) {
   setParameter(std::string("KeyId"), keyId);
 }
 
+std::string UntagResourceRequest::getTagKeys() const {
+  return tagKeys_;
+}
+
+void UntagResourceRequest::setTagKeys(const std::string &tagKeys) {
+  tagKeys_ = tagKeys;
+  setParameter(std::string("TagKeys"), tagKeys);
+}
+
 std::string UntagResourceRequest::getSecretName() const {
   return secretName_;
 }

kms/src/model/UntagResourcesRequest.cc

@@ -0,0 +1,70 @@
+/*
+ * 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/kms/model/UntagResourcesRequest.h>
+
+using AlibabaCloud::Kms::Model::UntagResourcesRequest;
+
+UntagResourcesRequest::UntagResourcesRequest()
+    : RpcServiceRequest("kms", "2016-01-20", "UntagResources") {
+  setMethod(HttpRequest::Method::Post);
+}
+
+UntagResourcesRequest::~UntagResourcesRequest() {}
+
+bool UntagResourcesRequest::getAll() const {
+  return all_;
+}
+
+void UntagResourcesRequest::setAll(bool all) {
+  all_ = all;
+  setParameter(std::string("All"), all ? "true" : "false");
+}
+
+std::vector<std::string> UntagResourcesRequest::getResourceId() const {
+  return resourceId_;
+}
+
+void UntagResourcesRequest::setResourceId(const std::vector<std::string> &resourceId) {
+  resourceId_ = resourceId;
+}
+
+std::string UntagResourcesRequest::getResourceType() const {
+  return resourceType_;
+}
+
+void UntagResourcesRequest::setResourceType(const std::string &resourceType) {
+  resourceType_ = resourceType;
+  setParameter(std::string("ResourceType"), resourceType);
+}
+
+std::string UntagResourcesRequest::getRegionId() const {
+  return regionId_;
+}
+
+void UntagResourcesRequest::setRegionId(const std::string &regionId) {
+  regionId_ = regionId;
+  setParameter(std::string("RegionId"), regionId);
+}
+
+std::vector<std::string> UntagResourcesRequest::getTagKey() const {
+  return tagKey_;
+}
+
+void UntagResourcesRequest::setTagKey(const std::vector<std::string> &tagKey) {
+  tagKey_ = tagKey;
+}
+

kms/src/model/UntagResourcesResult.cc

@@ -0,0 +1,44 @@
+/*
+ * 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/kms/model/UntagResourcesResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Kms;
+using namespace AlibabaCloud::Kms::Model;
+
+UntagResourcesResult::UntagResourcesResult() :
+	ServiceResult()
+{}
+
+UntagResourcesResult::UntagResourcesResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+UntagResourcesResult::~UntagResourcesResult()
+{}
+
+void UntagResourcesResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+
+}
+

kms/src/model/UpdateSecretRotationPolicyRequest.cc

@@ -34,15 +34,6 @@ void UpdateSecretRotationPolicyRequest::setRotationInterval(const std::string &r
   setParameter(std::string("RotationInterval"), rotationInterval);
 }
 
-std::string UpdateSecretRotationPolicyRequest::getSecretName() const {
-  return secretName_;
-}
-
-void UpdateSecretRotationPolicyRequest::setSecretName(const std::string &secretName) {
-  secretName_ = secretName;
-  setParameter(std::string("SecretName"), secretName);
-}
-
 bool UpdateSecretRotationPolicyRequest::getEnableAutomaticRotation() const {
   return enableAutomaticRotation_;
 }
@@ -52,3 +43,12 @@ void UpdateSecretRotationPolicyRequest::setEnableAutomaticRotation(bool enableAu
   setParameter(std::string("EnableAutomaticRotation"), enableAutomaticRotation ? "true" : "false");
 }
 
+std::string UpdateSecretRotationPolicyRequest::getSecretName() const {
+  return secretName_;
+}
+
+void UpdateSecretRotationPolicyRequest::setSecretName(const std::string &secretName) {
+  secretName_ = secretName;
+  setParameter(std::string("SecretName"), secretName);
+}
+

kms/src/model/UpdateSecretVersionStageRequest.cc

@@ -25,15 +25,6 @@ UpdateSecretVersionStageRequest::UpdateSecretVersionStageRequest()
 
 UpdateSecretVersionStageRequest::~UpdateSecretVersionStageRequest() {}
 
-std::string UpdateSecretVersionStageRequest::getRemoveFromVersion() const {
-  return removeFromVersion_;
-}
-
-void UpdateSecretVersionStageRequest::setRemoveFromVersion(const std::string &removeFromVersion) {
-  removeFromVersion_ = removeFromVersion;
-  setParameter(std::string("RemoveFromVersion"), removeFromVersion);
-}
-
 std::string UpdateSecretVersionStageRequest::getMoveToVersion() const {
   return moveToVersion_;
 }
@@ -43,6 +34,15 @@ void UpdateSecretVersionStageRequest::setMoveToVersion(const std::string &moveTo
   setParameter(std::string("MoveToVersion"), moveToVersion);
 }
 
+std::string UpdateSecretVersionStageRequest::getRemoveFromVersion() const {
+  return removeFromVersion_;
+}
+
+void UpdateSecretVersionStageRequest::setRemoveFromVersion(const std::string &removeFromVersion) {
+  removeFromVersion_ = removeFromVersion;
+  setParameter(std::string("RemoveFromVersion"), removeFromVersion);
+}
+
 std::string UpdateSecretVersionStageRequest::getVersionStage() const {
   return versionStage_;
 }