Kaynağa Gözat

DiskEncryption.

sdk-team 5 yıl önce
ebeveyn
işleme
73a8478a41

+ 3 - 0
CHANGELOG

@@ -1,3 +1,6 @@
+2021-06-10 Version: 1.36.780
+- DiskEncryption.
+
 2021-06-10 Version: 1.36.779
 - Generated 2016-04-28 for `Vpc`.
 

+ 1 - 1
VERSION

@@ -1 +1 @@
-1.36.779
+1.36.780

+ 4 - 0
hbase/CMakeLists.txt

@@ -123,6 +123,8 @@ set(hbase_public_header_model
 	include/alibabacloud/hbase/model/DescribeServerlessClusterResult.h
 	include/alibabacloud/hbase/model/DescribeSubDomainRequest.h
 	include/alibabacloud/hbase/model/DescribeSubDomainResult.h
+	include/alibabacloud/hbase/model/DescribeUserEncryptionKeyListRequest.h
+	include/alibabacloud/hbase/model/DescribeUserEncryptionKeyListResult.h
 	include/alibabacloud/hbase/model/EnableHBaseueBackupRequest.h
 	include/alibabacloud/hbase/model/EnableHBaseueBackupResult.h
 	include/alibabacloud/hbase/model/EnableHBaseueModuleRequest.h
@@ -310,6 +312,8 @@ set(hbase_src
 	src/model/DescribeServerlessClusterResult.cc
 	src/model/DescribeSubDomainRequest.cc
 	src/model/DescribeSubDomainResult.cc
+	src/model/DescribeUserEncryptionKeyListRequest.cc
+	src/model/DescribeUserEncryptionKeyListResult.cc
 	src/model/EnableHBaseueBackupRequest.cc
 	src/model/EnableHBaseueBackupResult.cc
 	src/model/EnableHBaseueModuleRequest.cc

+ 8 - 0
hbase/include/alibabacloud/hbase/HBaseClient.h

@@ -124,6 +124,8 @@
 #include "model/DescribeServerlessClusterResult.h"
 #include "model/DescribeSubDomainRequest.h"
 #include "model/DescribeSubDomainResult.h"
+#include "model/DescribeUserEncryptionKeyListRequest.h"
+#include "model/DescribeUserEncryptionKeyListResult.h"
 #include "model/EnableHBaseueBackupRequest.h"
 #include "model/EnableHBaseueBackupResult.h"
 #include "model/EnableHBaseueModuleRequest.h"
@@ -368,6 +370,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DescribeSubDomainResult> DescribeSubDomainOutcome;
 			typedef std::future<DescribeSubDomainOutcome> DescribeSubDomainOutcomeCallable;
 			typedef std::function<void(const HBaseClient*, const Model::DescribeSubDomainRequest&, const DescribeSubDomainOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeSubDomainAsyncHandler;
+			typedef Outcome<Error, Model::DescribeUserEncryptionKeyListResult> DescribeUserEncryptionKeyListOutcome;
+			typedef std::future<DescribeUserEncryptionKeyListOutcome> DescribeUserEncryptionKeyListOutcomeCallable;
+			typedef std::function<void(const HBaseClient*, const Model::DescribeUserEncryptionKeyListRequest&, const DescribeUserEncryptionKeyListOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeUserEncryptionKeyListAsyncHandler;
 			typedef Outcome<Error, Model::EnableHBaseueBackupResult> EnableHBaseueBackupOutcome;
 			typedef std::future<EnableHBaseueBackupOutcome> EnableHBaseueBackupOutcomeCallable;
 			typedef std::function<void(const HBaseClient*, const Model::EnableHBaseueBackupRequest&, const EnableHBaseueBackupOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> EnableHBaseueBackupAsyncHandler;
@@ -649,6 +654,9 @@ namespace AlibabaCloud
 			DescribeSubDomainOutcome describeSubDomain(const Model::DescribeSubDomainRequest &request)const;
 			void describeSubDomainAsync(const Model::DescribeSubDomainRequest& request, const DescribeSubDomainAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeSubDomainOutcomeCallable describeSubDomainCallable(const Model::DescribeSubDomainRequest& request) const;
+			DescribeUserEncryptionKeyListOutcome describeUserEncryptionKeyList(const Model::DescribeUserEncryptionKeyListRequest &request)const;
+			void describeUserEncryptionKeyListAsync(const Model::DescribeUserEncryptionKeyListRequest& request, const DescribeUserEncryptionKeyListAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribeUserEncryptionKeyListOutcomeCallable describeUserEncryptionKeyListCallable(const Model::DescribeUserEncryptionKeyListRequest& request) const;
 			EnableHBaseueBackupOutcome enableHBaseueBackup(const Model::EnableHBaseueBackupRequest &request)const;
 			void enableHBaseueBackupAsync(const Model::EnableHBaseueBackupRequest& request, const EnableHBaseueBackupAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			EnableHBaseueBackupOutcomeCallable enableHBaseueBackupCallable(const Model::EnableHBaseueBackupRequest& request) const;

+ 3 - 0
hbase/include/alibabacloud/hbase/model/CreateClusterRequest.h

@@ -53,6 +53,8 @@ namespace AlibabaCloud
 				void setPeriod(int period);
 				int getDiskSize()const;
 				void setDiskSize(int diskSize);
+				std::string getEncryptionKey()const;
+				void setEncryptionKey(const std::string& encryptionKey);
 				std::string getMasterInstanceType()const;
 				void setMasterInstanceType(const std::string& masterInstanceType);
 				std::string getDiskType()const;
@@ -86,6 +88,7 @@ namespace AlibabaCloud
 				int autoRenewPeriod_;
 				int period_;
 				int diskSize_;
+				std::string encryptionKey_;
 				std::string masterInstanceType_;
 				std::string diskType_;
 				std::string vSwitchId_;

+ 4 - 0
hbase/include/alibabacloud/hbase/model/DescribeInstanceResult.h

@@ -46,6 +46,7 @@ namespace AlibabaCloud
 				bool getIsHa()const;
 				std::string getCreatedTime()const;
 				std::string getResourceGroupId()const;
+				std::string getEncryptionKey()const;
 				std::string getMasterInstanceType()const;
 				bool getIsDeletionProtection()const;
 				bool getIsLatestVersion()const;
@@ -63,6 +64,7 @@ namespace AlibabaCloud
 				std::string getCoreDiskCount()const;
 				std::string getParentId()const;
 				int getColdStorageSize()const;
+				bool getEncryptionType()const;
 				int getMasterDiskSize()const;
 				std::string getExpireTimeUTC()const;
 				std::string getZoneId()const;
@@ -94,6 +96,7 @@ namespace AlibabaCloud
 				bool isHa_;
 				std::string createdTime_;
 				std::string resourceGroupId_;
+				std::string encryptionKey_;
 				std::string masterInstanceType_;
 				bool isDeletionProtection_;
 				bool isLatestVersion_;
@@ -111,6 +114,7 @@ namespace AlibabaCloud
 				std::string coreDiskCount_;
 				std::string parentId_;
 				int coldStorageSize_;
+				bool encryptionType_;
 				int masterDiskSize_;
 				std::string expireTimeUTC_;
 				std::string zoneId_;

+ 36 - 32
hbase/include/alibabacloud/hbase/model/DescribeMultiZoneClusterResult.h

@@ -54,48 +54,50 @@ namespace AlibabaCloud
 				std::string getStandbyZoneId()const;
 				std::string getCreatedTime()const;
 				std::string getResourceGroupId()const;
+				int getModuleId()const;
+				std::string getStandbyVSwitchIds()const;
+				std::vector<Tag> getTags()const;
+				std::string getEngine()const;
+				std::string getStatus()const;
+				bool getEncryptionType()const;
+				std::string getExpireTimeUTC()const;
+				int getMasterDiskSize()const;
+				std::string getInstanceId()const;
+				int getDuration()const;
+				std::string getPayType()const;
+				std::string getInstanceName()const;
+				int getMasterNodeCount()const;
+				bool getAutoRenewal()const;
+				std::string getVpcId()const;
+				std::string getCoreDiskType()const;
+				std::string getExpireTime()const;
+				std::string getEncryptionKey()const;
 				std::string getMasterInstanceType()const;
 				std::string getPrimaryVSwitchIds()const;
 				bool getIsDeletionProtection()const;
 				std::string getLogDiskCount()const;
 				int getLogDiskSize()const;
-				int getModuleId()const;
 				std::string getArbiterVSwitchIds()const;
 				std::string getMaintainEndTime()const;
-				std::string getStandbyVSwitchIds()const;
 				std::string getNetworkType()const;
 				std::string getCoreInstanceType()const;
 				std::string getClusterName()const;
 				std::string getMasterDiskType()const;
-				std::vector<Tag> getTags()const;
-				std::string getEngine()const;
 				std::string getMaintainStartTime()const;
 				std::string getArbiterZoneId()const;
 				std::string getMajorVersion()const;
 				std::string getCoreDiskCount()const;
 				std::string getParentId()const;
-				std::string getStatus()const;
 				std::vector<MultiZoneInstanceModel> getMultiZoneInstanceModels()const;
-				std::string getExpireTimeUTC()const;
-				int getMasterDiskSize()const;
 				std::string getPrimaryZoneId()const;
 				std::string getMultiZoneCombination()const;
 				std::string getClusterId()const;
-				std::string getInstanceId()const;
 				int getCoreNodeCount()const;
 				std::string getCreatedTimeUTC()const;
-				int getDuration()const;
 				std::string getLogInstanceType()const;
-				std::string getPayType()const;
-				std::string getInstanceName()const;
-				int getMasterNodeCount()const;
-				bool getAutoRenewal()const;
-				std::string getVpcId()const;
-				std::string getCoreDiskType()const;
 				int getLogNodeCount()const;
 				std::string getLogDiskType()const;
 				std::string getRegionId()const;
-				std::string getExpireTime()const;
 				int getCoreDiskSize()const;
 
 			protected:
@@ -105,48 +107,50 @@ namespace AlibabaCloud
 				std::string standbyZoneId_;
 				std::string createdTime_;
 				std::string resourceGroupId_;
+				int moduleId_;
+				std::string standbyVSwitchIds_;
+				std::vector<Tag> tags_;
+				std::string engine_;
+				std::string status_;
+				bool encryptionType_;
+				std::string expireTimeUTC_;
+				int masterDiskSize_;
+				std::string instanceId_;
+				int duration_;
+				std::string payType_;
+				std::string instanceName_;
+				int masterNodeCount_;
+				bool autoRenewal_;
+				std::string vpcId_;
+				std::string coreDiskType_;
+				std::string expireTime_;
+				std::string encryptionKey_;
 				std::string masterInstanceType_;
 				std::string primaryVSwitchIds_;
 				bool isDeletionProtection_;
 				std::string logDiskCount_;
 				int logDiskSize_;
-				int moduleId_;
 				std::string arbiterVSwitchIds_;
 				std::string maintainEndTime_;
-				std::string standbyVSwitchIds_;
 				std::string networkType_;
 				std::string coreInstanceType_;
 				std::string clusterName_;
 				std::string masterDiskType_;
-				std::vector<Tag> tags_;
-				std::string engine_;
 				std::string maintainStartTime_;
 				std::string arbiterZoneId_;
 				std::string majorVersion_;
 				std::string coreDiskCount_;
 				std::string parentId_;
-				std::string status_;
 				std::vector<MultiZoneInstanceModel> multiZoneInstanceModels_;
-				std::string expireTimeUTC_;
-				int masterDiskSize_;
 				std::string primaryZoneId_;
 				std::string multiZoneCombination_;
 				std::string clusterId_;
-				std::string instanceId_;
 				int coreNodeCount_;
 				std::string createdTimeUTC_;
-				int duration_;
 				std::string logInstanceType_;
-				std::string payType_;
-				std::string instanceName_;
-				int masterNodeCount_;
-				bool autoRenewal_;
-				std::string vpcId_;
-				std::string coreDiskType_;
 				int logNodeCount_;
 				std::string logDiskType_;
 				std::string regionId_;
-				std::string expireTime_;
 				int coreDiskSize_;
 
 			};

+ 54 - 0
hbase/include/alibabacloud/hbase/model/DescribeUserEncryptionKeyListRequest.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_HBASE_MODEL_DESCRIBEUSERENCRYPTIONKEYLISTREQUEST_H_
+#define ALIBABACLOUD_HBASE_MODEL_DESCRIBEUSERENCRYPTIONKEYLISTREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/hbase/HBaseExport.h>
+
+namespace AlibabaCloud
+{
+	namespace HBase
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_HBASE_EXPORT DescribeUserEncryptionKeyListRequest : public RpcServiceRequest
+			{
+
+			public:
+				DescribeUserEncryptionKeyListRequest();
+				~DescribeUserEncryptionKeyListRequest();
+
+				std::string getPageNumber()const;
+				void setPageNumber(const std::string& pageNumber);
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
+				std::string getPageSize()const;
+				void setPageSize(const std::string& pageSize);
+
+            private:
+				std::string pageNumber_;
+				std::string regionId_;
+				std::string pageSize_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_HBASE_MODEL_DESCRIBEUSERENCRYPTIONKEYLISTREQUEST_H_

+ 55 - 0
hbase/include/alibabacloud/hbase/model/DescribeUserEncryptionKeyListResult.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_HBASE_MODEL_DESCRIBEUSERENCRYPTIONKEYLISTRESULT_H_
+#define ALIBABACLOUD_HBASE_MODEL_DESCRIBEUSERENCRYPTIONKEYLISTRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/hbase/HBaseExport.h>
+
+namespace AlibabaCloud
+{
+	namespace HBase
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_HBASE_EXPORT DescribeUserEncryptionKeyListResult : public ServiceResult
+			{
+			public:
+				struct KmsKeysItem
+				{
+					std::string keyId;
+				};
+
+
+				DescribeUserEncryptionKeyListResult();
+				explicit DescribeUserEncryptionKeyListResult(const std::string &payload);
+				~DescribeUserEncryptionKeyListResult();
+				std::vector<KmsKeysItem> getKmsKeys()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::vector<KmsKeysItem> kmsKeys_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_HBASE_MODEL_DESCRIBEUSERENCRYPTIONKEYLISTRESULT_H_

+ 36 - 0
hbase/src/HBaseClient.cc

@@ -1887,6 +1887,42 @@ HBaseClient::DescribeSubDomainOutcomeCallable HBaseClient::describeSubDomainCall
 	return task->get_future();
 }
 
+HBaseClient::DescribeUserEncryptionKeyListOutcome HBaseClient::describeUserEncryptionKeyList(const DescribeUserEncryptionKeyListRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return DescribeUserEncryptionKeyListOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return DescribeUserEncryptionKeyListOutcome(DescribeUserEncryptionKeyListResult(outcome.result()));
+	else
+		return DescribeUserEncryptionKeyListOutcome(outcome.error());
+}
+
+void HBaseClient::describeUserEncryptionKeyListAsync(const DescribeUserEncryptionKeyListRequest& request, const DescribeUserEncryptionKeyListAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, describeUserEncryptionKeyList(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+HBaseClient::DescribeUserEncryptionKeyListOutcomeCallable HBaseClient::describeUserEncryptionKeyListCallable(const DescribeUserEncryptionKeyListRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<DescribeUserEncryptionKeyListOutcome()>>(
+			[this, request]()
+			{
+			return this->describeUserEncryptionKeyList(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 HBaseClient::EnableHBaseueBackupOutcome HBaseClient::enableHBaseueBackup(const EnableHBaseueBackupRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

+ 11 - 0
hbase/src/model/CreateClusterRequest.cc

@@ -126,6 +126,17 @@ void CreateClusterRequest::setDiskSize(int diskSize)
 	setParameter("DiskSize", std::to_string(diskSize));
 }
 
+std::string CreateClusterRequest::getEncryptionKey()const
+{
+	return encryptionKey_;
+}
+
+void CreateClusterRequest::setEncryptionKey(const std::string& encryptionKey)
+{
+	encryptionKey_ = encryptionKey;
+	setParameter("EncryptionKey", encryptionKey);
+}
+
 std::string CreateClusterRequest::getMasterInstanceType()const
 {
 	return masterInstanceType_;

+ 14 - 0
hbase/src/model/DescribeInstanceResult.cc

@@ -135,6 +135,10 @@ void DescribeInstanceResult::parse(const std::string &payload)
 		coldStorageSize_ = std::stoi(value["ColdStorageSize"].asString());
 	if(!value["ResourceGroupId"].isNull())
 		resourceGroupId_ = value["ResourceGroupId"].asString();
+	if(!value["EncryptionType"].isNull())
+		encryptionType_ = value["EncryptionType"].asString() == "true";
+	if(!value["EncryptionKey"].isNull())
+		encryptionKey_ = value["EncryptionKey"].asString();
 
 }
 
@@ -158,6 +162,11 @@ std::string DescribeInstanceResult::getResourceGroupId()const
 	return resourceGroupId_;
 }
 
+std::string DescribeInstanceResult::getEncryptionKey()const
+{
+	return encryptionKey_;
+}
+
 std::string DescribeInstanceResult::getMasterInstanceType()const
 {
 	return masterInstanceType_;
@@ -243,6 +252,11 @@ int DescribeInstanceResult::getColdStorageSize()const
 	return coldStorageSize_;
 }
 
+bool DescribeInstanceResult::getEncryptionType()const
+{
+	return encryptionType_;
+}
+
 int DescribeInstanceResult::getMasterDiskSize()const
 {
 	return masterDiskSize_;

+ 94 - 80
hbase/src/model/DescribeMultiZoneClusterResult.cc

@@ -155,6 +155,10 @@ void DescribeMultiZoneClusterResult::parse(const std::string &payload)
 		vpcId_ = value["VpcId"].asString();
 	if(!value["ResourceGroupId"].isNull())
 		resourceGroupId_ = value["ResourceGroupId"].asString();
+	if(!value["EncryptionType"].isNull())
+		encryptionType_ = value["EncryptionType"].asString() == "true";
+	if(!value["EncryptionKey"].isNull())
+		encryptionKey_ = value["EncryptionKey"].asString();
 
 }
 
@@ -178,6 +182,96 @@ std::string DescribeMultiZoneClusterResult::getResourceGroupId()const
 	return resourceGroupId_;
 }
 
+int DescribeMultiZoneClusterResult::getModuleId()const
+{
+	return moduleId_;
+}
+
+std::string DescribeMultiZoneClusterResult::getStandbyVSwitchIds()const
+{
+	return standbyVSwitchIds_;
+}
+
+std::vector<DescribeMultiZoneClusterResult::Tag> DescribeMultiZoneClusterResult::getTags()const
+{
+	return tags_;
+}
+
+std::string DescribeMultiZoneClusterResult::getEngine()const
+{
+	return engine_;
+}
+
+std::string DescribeMultiZoneClusterResult::getStatus()const
+{
+	return status_;
+}
+
+bool DescribeMultiZoneClusterResult::getEncryptionType()const
+{
+	return encryptionType_;
+}
+
+std::string DescribeMultiZoneClusterResult::getExpireTimeUTC()const
+{
+	return expireTimeUTC_;
+}
+
+int DescribeMultiZoneClusterResult::getMasterDiskSize()const
+{
+	return masterDiskSize_;
+}
+
+std::string DescribeMultiZoneClusterResult::getInstanceId()const
+{
+	return instanceId_;
+}
+
+int DescribeMultiZoneClusterResult::getDuration()const
+{
+	return duration_;
+}
+
+std::string DescribeMultiZoneClusterResult::getPayType()const
+{
+	return payType_;
+}
+
+std::string DescribeMultiZoneClusterResult::getInstanceName()const
+{
+	return instanceName_;
+}
+
+int DescribeMultiZoneClusterResult::getMasterNodeCount()const
+{
+	return masterNodeCount_;
+}
+
+bool DescribeMultiZoneClusterResult::getAutoRenewal()const
+{
+	return autoRenewal_;
+}
+
+std::string DescribeMultiZoneClusterResult::getVpcId()const
+{
+	return vpcId_;
+}
+
+std::string DescribeMultiZoneClusterResult::getCoreDiskType()const
+{
+	return coreDiskType_;
+}
+
+std::string DescribeMultiZoneClusterResult::getExpireTime()const
+{
+	return expireTime_;
+}
+
+std::string DescribeMultiZoneClusterResult::getEncryptionKey()const
+{
+	return encryptionKey_;
+}
+
 std::string DescribeMultiZoneClusterResult::getMasterInstanceType()const
 {
 	return masterInstanceType_;
@@ -203,11 +297,6 @@ int DescribeMultiZoneClusterResult::getLogDiskSize()const
 	return logDiskSize_;
 }
 
-int DescribeMultiZoneClusterResult::getModuleId()const
-{
-	return moduleId_;
-}
-
 std::string DescribeMultiZoneClusterResult::getArbiterVSwitchIds()const
 {
 	return arbiterVSwitchIds_;
@@ -218,11 +307,6 @@ std::string DescribeMultiZoneClusterResult::getMaintainEndTime()const
 	return maintainEndTime_;
 }
 
-std::string DescribeMultiZoneClusterResult::getStandbyVSwitchIds()const
-{
-	return standbyVSwitchIds_;
-}
-
 std::string DescribeMultiZoneClusterResult::getNetworkType()const
 {
 	return networkType_;
@@ -243,16 +327,6 @@ std::string DescribeMultiZoneClusterResult::getMasterDiskType()const
 	return masterDiskType_;
 }
 
-std::vector<DescribeMultiZoneClusterResult::Tag> DescribeMultiZoneClusterResult::getTags()const
-{
-	return tags_;
-}
-
-std::string DescribeMultiZoneClusterResult::getEngine()const
-{
-	return engine_;
-}
-
 std::string DescribeMultiZoneClusterResult::getMaintainStartTime()const
 {
 	return maintainStartTime_;
@@ -278,26 +352,11 @@ std::string DescribeMultiZoneClusterResult::getParentId()const
 	return parentId_;
 }
 
-std::string DescribeMultiZoneClusterResult::getStatus()const
-{
-	return status_;
-}
-
 std::vector<DescribeMultiZoneClusterResult::MultiZoneInstanceModel> DescribeMultiZoneClusterResult::getMultiZoneInstanceModels()const
 {
 	return multiZoneInstanceModels_;
 }
 
-std::string DescribeMultiZoneClusterResult::getExpireTimeUTC()const
-{
-	return expireTimeUTC_;
-}
-
-int DescribeMultiZoneClusterResult::getMasterDiskSize()const
-{
-	return masterDiskSize_;
-}
-
 std::string DescribeMultiZoneClusterResult::getPrimaryZoneId()const
 {
 	return primaryZoneId_;
@@ -313,11 +372,6 @@ std::string DescribeMultiZoneClusterResult::getClusterId()const
 	return clusterId_;
 }
 
-std::string DescribeMultiZoneClusterResult::getInstanceId()const
-{
-	return instanceId_;
-}
-
 int DescribeMultiZoneClusterResult::getCoreNodeCount()const
 {
 	return coreNodeCount_;
@@ -328,46 +382,11 @@ std::string DescribeMultiZoneClusterResult::getCreatedTimeUTC()const
 	return createdTimeUTC_;
 }
 
-int DescribeMultiZoneClusterResult::getDuration()const
-{
-	return duration_;
-}
-
 std::string DescribeMultiZoneClusterResult::getLogInstanceType()const
 {
 	return logInstanceType_;
 }
 
-std::string DescribeMultiZoneClusterResult::getPayType()const
-{
-	return payType_;
-}
-
-std::string DescribeMultiZoneClusterResult::getInstanceName()const
-{
-	return instanceName_;
-}
-
-int DescribeMultiZoneClusterResult::getMasterNodeCount()const
-{
-	return masterNodeCount_;
-}
-
-bool DescribeMultiZoneClusterResult::getAutoRenewal()const
-{
-	return autoRenewal_;
-}
-
-std::string DescribeMultiZoneClusterResult::getVpcId()const
-{
-	return vpcId_;
-}
-
-std::string DescribeMultiZoneClusterResult::getCoreDiskType()const
-{
-	return coreDiskType_;
-}
-
 int DescribeMultiZoneClusterResult::getLogNodeCount()const
 {
 	return logNodeCount_;
@@ -383,11 +402,6 @@ std::string DescribeMultiZoneClusterResult::getRegionId()const
 	return regionId_;
 }
 
-std::string DescribeMultiZoneClusterResult::getExpireTime()const
-{
-	return expireTime_;
-}
-
 int DescribeMultiZoneClusterResult::getCoreDiskSize()const
 {
 	return coreDiskSize_;

+ 62 - 0
hbase/src/model/DescribeUserEncryptionKeyListRequest.cc

@@ -0,0 +1,62 @@
+/*
+ * 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/hbase/model/DescribeUserEncryptionKeyListRequest.h>
+
+using AlibabaCloud::HBase::Model::DescribeUserEncryptionKeyListRequest;
+
+DescribeUserEncryptionKeyListRequest::DescribeUserEncryptionKeyListRequest() :
+	RpcServiceRequest("hbase", "2019-01-01", "DescribeUserEncryptionKeyList")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+DescribeUserEncryptionKeyListRequest::~DescribeUserEncryptionKeyListRequest()
+{}
+
+std::string DescribeUserEncryptionKeyListRequest::getPageNumber()const
+{
+	return pageNumber_;
+}
+
+void DescribeUserEncryptionKeyListRequest::setPageNumber(const std::string& pageNumber)
+{
+	pageNumber_ = pageNumber;
+	setParameter("PageNumber", pageNumber);
+}
+
+std::string DescribeUserEncryptionKeyListRequest::getRegionId()const
+{
+	return regionId_;
+}
+
+void DescribeUserEncryptionKeyListRequest::setRegionId(const std::string& regionId)
+{
+	regionId_ = regionId;
+	setParameter("RegionId", regionId);
+}
+
+std::string DescribeUserEncryptionKeyListRequest::getPageSize()const
+{
+	return pageSize_;
+}
+
+void DescribeUserEncryptionKeyListRequest::setPageSize(const std::string& pageSize)
+{
+	pageSize_ = pageSize;
+	setParameter("PageSize", pageSize);
+}
+

+ 57 - 0
hbase/src/model/DescribeUserEncryptionKeyListResult.cc

@@ -0,0 +1,57 @@
+/*
+ * 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/hbase/model/DescribeUserEncryptionKeyListResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::HBase;
+using namespace AlibabaCloud::HBase::Model;
+
+DescribeUserEncryptionKeyListResult::DescribeUserEncryptionKeyListResult() :
+	ServiceResult()
+{}
+
+DescribeUserEncryptionKeyListResult::DescribeUserEncryptionKeyListResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+DescribeUserEncryptionKeyListResult::~DescribeUserEncryptionKeyListResult()
+{}
+
+void DescribeUserEncryptionKeyListResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	auto allKmsKeysNode = value["KmsKeys"]["KmsKeysItem"];
+	for (auto valueKmsKeysKmsKeysItem : allKmsKeysNode)
+	{
+		KmsKeysItem kmsKeysObject;
+		if(!valueKmsKeysKmsKeysItem["KeyId"].isNull())
+			kmsKeysObject.keyId = valueKmsKeysKmsKeysItem["KeyId"].asString();
+		kmsKeys_.push_back(kmsKeysObject);
+	}
+
+}
+
+std::vector<DescribeUserEncryptionKeyListResult::KmsKeysItem> DescribeUserEncryptionKeyListResult::getKmsKeys()const
+{
+	return kmsKeys_;
+}
+