Supported more query conditions when searching resource group.

CHANGELOG

@@ -1,3 +1,15 @@
+2022-08-03 Version: 1.36.1217
+- Supported more query conditions when searching resource group.
+
+2022-08-02 Version: 1.36.1216
+- Support ecs instance diagnostic features.
+
+2022-08-01 Version: 1.36.1215
+- Update CreateKey and CreateSecret.
+
+2022-07-29 Version: 1.36.1213
+- Change ListCheckInstanceResult Public.
+
 2022-07-28 Version: 1.36.1212
 - AMP version.
 

VERSION

@@ -1 +1 @@
-1.36.1212
+1.36.1217

ecs/CMakeLists.txt

@@ -97,6 +97,10 @@ set(ecs_public_header_model
 	include/alibabacloud/ecs/model/CreateDemandResult.h
 	include/alibabacloud/ecs/model/CreateDeploymentSetRequest.h
 	include/alibabacloud/ecs/model/CreateDeploymentSetResult.h
+	include/alibabacloud/ecs/model/CreateDiagnosticMetricSetRequest.h
+	include/alibabacloud/ecs/model/CreateDiagnosticMetricSetResult.h
+	include/alibabacloud/ecs/model/CreateDiagnosticReportRequest.h
+	include/alibabacloud/ecs/model/CreateDiagnosticReportResult.h
 	include/alibabacloud/ecs/model/CreateDiskRequest.h
 	include/alibabacloud/ecs/model/CreateDiskResult.h
 	include/alibabacloud/ecs/model/CreateElasticityAssuranceRequest.h
@@ -169,6 +173,10 @@ set(ecs_public_header_model
 	include/alibabacloud/ecs/model/DeleteDemandResult.h
 	include/alibabacloud/ecs/model/DeleteDeploymentSetRequest.h
 	include/alibabacloud/ecs/model/DeleteDeploymentSetResult.h
+	include/alibabacloud/ecs/model/DeleteDiagnosticMetricSetsRequest.h
+	include/alibabacloud/ecs/model/DeleteDiagnosticMetricSetsResult.h
+	include/alibabacloud/ecs/model/DeleteDiagnosticReportsRequest.h
+	include/alibabacloud/ecs/model/DeleteDiagnosticReportsResult.h
 	include/alibabacloud/ecs/model/DeleteDiskRequest.h
 	include/alibabacloud/ecs/model/DeleteDiskResult.h
 	include/alibabacloud/ecs/model/DeleteForwardEntryRequest.h
@@ -271,6 +279,12 @@ set(ecs_public_header_model
 	include/alibabacloud/ecs/model/DescribeDeploymentSetSupportedInstanceTypeFamilyResult.h
 	include/alibabacloud/ecs/model/DescribeDeploymentSetsRequest.h
 	include/alibabacloud/ecs/model/DescribeDeploymentSetsResult.h
+	include/alibabacloud/ecs/model/DescribeDiagnosticMetricSetsRequest.h
+	include/alibabacloud/ecs/model/DescribeDiagnosticMetricSetsResult.h
+	include/alibabacloud/ecs/model/DescribeDiagnosticMetricsRequest.h
+	include/alibabacloud/ecs/model/DescribeDiagnosticMetricsResult.h
+	include/alibabacloud/ecs/model/DescribeDiagnosticReportsRequest.h
+	include/alibabacloud/ecs/model/DescribeDiagnosticReportsResult.h
 	include/alibabacloud/ecs/model/DescribeDiskMonitorDataRequest.h
 	include/alibabacloud/ecs/model/DescribeDiskMonitorDataResult.h
 	include/alibabacloud/ecs/model/DescribeDisksRequest.h
@@ -513,6 +527,8 @@ set(ecs_public_header_model
 	include/alibabacloud/ecs/model/ModifyDemandResult.h
 	include/alibabacloud/ecs/model/ModifyDeploymentSetAttributeRequest.h
 	include/alibabacloud/ecs/model/ModifyDeploymentSetAttributeResult.h
+	include/alibabacloud/ecs/model/ModifyDiagnosticMetricSetRequest.h
+	include/alibabacloud/ecs/model/ModifyDiagnosticMetricSetResult.h
 	include/alibabacloud/ecs/model/ModifyDiskAttributeRequest.h
 	include/alibabacloud/ecs/model/ModifyDiskAttributeResult.h
 	include/alibabacloud/ecs/model/ModifyDiskChargeTypeRequest.h
@@ -770,6 +786,10 @@ set(ecs_src
 	src/model/CreateDemandResult.cc
 	src/model/CreateDeploymentSetRequest.cc
 	src/model/CreateDeploymentSetResult.cc
+	src/model/CreateDiagnosticMetricSetRequest.cc
+	src/model/CreateDiagnosticMetricSetResult.cc
+	src/model/CreateDiagnosticReportRequest.cc
+	src/model/CreateDiagnosticReportResult.cc
 	src/model/CreateDiskRequest.cc
 	src/model/CreateDiskResult.cc
 	src/model/CreateElasticityAssuranceRequest.cc
@@ -842,6 +862,10 @@ set(ecs_src
 	src/model/DeleteDemandResult.cc
 	src/model/DeleteDeploymentSetRequest.cc
 	src/model/DeleteDeploymentSetResult.cc
+	src/model/DeleteDiagnosticMetricSetsRequest.cc
+	src/model/DeleteDiagnosticMetricSetsResult.cc
+	src/model/DeleteDiagnosticReportsRequest.cc
+	src/model/DeleteDiagnosticReportsResult.cc
 	src/model/DeleteDiskRequest.cc
 	src/model/DeleteDiskResult.cc
 	src/model/DeleteForwardEntryRequest.cc
@@ -944,6 +968,12 @@ set(ecs_src
 	src/model/DescribeDeploymentSetSupportedInstanceTypeFamilyResult.cc
 	src/model/DescribeDeploymentSetsRequest.cc
 	src/model/DescribeDeploymentSetsResult.cc
+	src/model/DescribeDiagnosticMetricSetsRequest.cc
+	src/model/DescribeDiagnosticMetricSetsResult.cc
+	src/model/DescribeDiagnosticMetricsRequest.cc
+	src/model/DescribeDiagnosticMetricsResult.cc
+	src/model/DescribeDiagnosticReportsRequest.cc
+	src/model/DescribeDiagnosticReportsResult.cc
 	src/model/DescribeDiskMonitorDataRequest.cc
 	src/model/DescribeDiskMonitorDataResult.cc
 	src/model/DescribeDisksRequest.cc
@@ -1186,6 +1216,8 @@ set(ecs_src
 	src/model/ModifyDemandResult.cc
 	src/model/ModifyDeploymentSetAttributeRequest.cc
 	src/model/ModifyDeploymentSetAttributeResult.cc
+	src/model/ModifyDiagnosticMetricSetRequest.cc
+	src/model/ModifyDiagnosticMetricSetResult.cc
 	src/model/ModifyDiskAttributeRequest.cc
 	src/model/ModifyDiskAttributeResult.cc
 	src/model/ModifyDiskChargeTypeRequest.cc

ecs/include/alibabacloud/ecs/EcsClient.h

@@ -98,6 +98,10 @@
 #include "model/CreateDemandResult.h"
 #include "model/CreateDeploymentSetRequest.h"
 #include "model/CreateDeploymentSetResult.h"
+#include "model/CreateDiagnosticMetricSetRequest.h"
+#include "model/CreateDiagnosticMetricSetResult.h"
+#include "model/CreateDiagnosticReportRequest.h"
+#include "model/CreateDiagnosticReportResult.h"
 #include "model/CreateDiskRequest.h"
 #include "model/CreateDiskResult.h"
 #include "model/CreateElasticityAssuranceRequest.h"
@@ -170,6 +174,10 @@
 #include "model/DeleteDemandResult.h"
 #include "model/DeleteDeploymentSetRequest.h"
 #include "model/DeleteDeploymentSetResult.h"
+#include "model/DeleteDiagnosticMetricSetsRequest.h"
+#include "model/DeleteDiagnosticMetricSetsResult.h"
+#include "model/DeleteDiagnosticReportsRequest.h"
+#include "model/DeleteDiagnosticReportsResult.h"
 #include "model/DeleteDiskRequest.h"
 #include "model/DeleteDiskResult.h"
 #include "model/DeleteForwardEntryRequest.h"
@@ -272,6 +280,12 @@
 #include "model/DescribeDeploymentSetSupportedInstanceTypeFamilyResult.h"
 #include "model/DescribeDeploymentSetsRequest.h"
 #include "model/DescribeDeploymentSetsResult.h"
+#include "model/DescribeDiagnosticMetricSetsRequest.h"
+#include "model/DescribeDiagnosticMetricSetsResult.h"
+#include "model/DescribeDiagnosticMetricsRequest.h"
+#include "model/DescribeDiagnosticMetricsResult.h"
+#include "model/DescribeDiagnosticReportsRequest.h"
+#include "model/DescribeDiagnosticReportsResult.h"
 #include "model/DescribeDiskMonitorDataRequest.h"
 #include "model/DescribeDiskMonitorDataResult.h"
 #include "model/DescribeDisksRequest.h"
@@ -514,6 +528,8 @@
 #include "model/ModifyDemandResult.h"
 #include "model/ModifyDeploymentSetAttributeRequest.h"
 #include "model/ModifyDeploymentSetAttributeResult.h"
+#include "model/ModifyDiagnosticMetricSetRequest.h"
+#include "model/ModifyDiagnosticMetricSetResult.h"
 #include "model/ModifyDiskAttributeRequest.h"
 #include "model/ModifyDiskAttributeResult.h"
 #include "model/ModifyDiskChargeTypeRequest.h"
@@ -815,6 +831,12 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::CreateDeploymentSetResult> CreateDeploymentSetOutcome;
 			typedef std::future<CreateDeploymentSetOutcome> CreateDeploymentSetOutcomeCallable;
 			typedef std::function<void(const EcsClient*, const Model::CreateDeploymentSetRequest&, const CreateDeploymentSetOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CreateDeploymentSetAsyncHandler;
+			typedef Outcome<Error, Model::CreateDiagnosticMetricSetResult> CreateDiagnosticMetricSetOutcome;
+			typedef std::future<CreateDiagnosticMetricSetOutcome> CreateDiagnosticMetricSetOutcomeCallable;
+			typedef std::function<void(const EcsClient*, const Model::CreateDiagnosticMetricSetRequest&, const CreateDiagnosticMetricSetOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CreateDiagnosticMetricSetAsyncHandler;
+			typedef Outcome<Error, Model::CreateDiagnosticReportResult> CreateDiagnosticReportOutcome;
+			typedef std::future<CreateDiagnosticReportOutcome> CreateDiagnosticReportOutcomeCallable;
+			typedef std::function<void(const EcsClient*, const Model::CreateDiagnosticReportRequest&, const CreateDiagnosticReportOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CreateDiagnosticReportAsyncHandler;
 			typedef Outcome<Error, Model::CreateDiskResult> CreateDiskOutcome;
 			typedef std::future<CreateDiskOutcome> CreateDiskOutcomeCallable;
 			typedef std::function<void(const EcsClient*, const Model::CreateDiskRequest&, const CreateDiskOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CreateDiskAsyncHandler;
@@ -923,6 +945,12 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DeleteDeploymentSetResult> DeleteDeploymentSetOutcome;
 			typedef std::future<DeleteDeploymentSetOutcome> DeleteDeploymentSetOutcomeCallable;
 			typedef std::function<void(const EcsClient*, const Model::DeleteDeploymentSetRequest&, const DeleteDeploymentSetOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DeleteDeploymentSetAsyncHandler;
+			typedef Outcome<Error, Model::DeleteDiagnosticMetricSetsResult> DeleteDiagnosticMetricSetsOutcome;
+			typedef std::future<DeleteDiagnosticMetricSetsOutcome> DeleteDiagnosticMetricSetsOutcomeCallable;
+			typedef std::function<void(const EcsClient*, const Model::DeleteDiagnosticMetricSetsRequest&, const DeleteDiagnosticMetricSetsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DeleteDiagnosticMetricSetsAsyncHandler;
+			typedef Outcome<Error, Model::DeleteDiagnosticReportsResult> DeleteDiagnosticReportsOutcome;
+			typedef std::future<DeleteDiagnosticReportsOutcome> DeleteDiagnosticReportsOutcomeCallable;
+			typedef std::function<void(const EcsClient*, const Model::DeleteDiagnosticReportsRequest&, const DeleteDiagnosticReportsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DeleteDiagnosticReportsAsyncHandler;
 			typedef Outcome<Error, Model::DeleteDiskResult> DeleteDiskOutcome;
 			typedef std::future<DeleteDiskOutcome> DeleteDiskOutcomeCallable;
 			typedef std::function<void(const EcsClient*, const Model::DeleteDiskRequest&, const DeleteDiskOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DeleteDiskAsyncHandler;
@@ -1076,6 +1104,15 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DescribeDeploymentSetsResult> DescribeDeploymentSetsOutcome;
 			typedef std::future<DescribeDeploymentSetsOutcome> DescribeDeploymentSetsOutcomeCallable;
 			typedef std::function<void(const EcsClient*, const Model::DescribeDeploymentSetsRequest&, const DescribeDeploymentSetsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDeploymentSetsAsyncHandler;
+			typedef Outcome<Error, Model::DescribeDiagnosticMetricSetsResult> DescribeDiagnosticMetricSetsOutcome;
+			typedef std::future<DescribeDiagnosticMetricSetsOutcome> DescribeDiagnosticMetricSetsOutcomeCallable;
+			typedef std::function<void(const EcsClient*, const Model::DescribeDiagnosticMetricSetsRequest&, const DescribeDiagnosticMetricSetsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDiagnosticMetricSetsAsyncHandler;
+			typedef Outcome<Error, Model::DescribeDiagnosticMetricsResult> DescribeDiagnosticMetricsOutcome;
+			typedef std::future<DescribeDiagnosticMetricsOutcome> DescribeDiagnosticMetricsOutcomeCallable;
+			typedef std::function<void(const EcsClient*, const Model::DescribeDiagnosticMetricsRequest&, const DescribeDiagnosticMetricsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDiagnosticMetricsAsyncHandler;
+			typedef Outcome<Error, Model::DescribeDiagnosticReportsResult> DescribeDiagnosticReportsOutcome;
+			typedef std::future<DescribeDiagnosticReportsOutcome> DescribeDiagnosticReportsOutcomeCallable;
+			typedef std::function<void(const EcsClient*, const Model::DescribeDiagnosticReportsRequest&, const DescribeDiagnosticReportsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDiagnosticReportsAsyncHandler;
 			typedef Outcome<Error, Model::DescribeDiskMonitorDataResult> DescribeDiskMonitorDataOutcome;
 			typedef std::future<DescribeDiskMonitorDataOutcome> DescribeDiskMonitorDataOutcomeCallable;
 			typedef std::function<void(const EcsClient*, const Model::DescribeDiskMonitorDataRequest&, const DescribeDiskMonitorDataOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDiskMonitorDataAsyncHandler;
@@ -1439,6 +1476,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::ModifyDeploymentSetAttributeResult> ModifyDeploymentSetAttributeOutcome;
 			typedef std::future<ModifyDeploymentSetAttributeOutcome> ModifyDeploymentSetAttributeOutcomeCallable;
 			typedef std::function<void(const EcsClient*, const Model::ModifyDeploymentSetAttributeRequest&, const ModifyDeploymentSetAttributeOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ModifyDeploymentSetAttributeAsyncHandler;
+			typedef Outcome<Error, Model::ModifyDiagnosticMetricSetResult> ModifyDiagnosticMetricSetOutcome;
+			typedef std::future<ModifyDiagnosticMetricSetOutcome> ModifyDiagnosticMetricSetOutcomeCallable;
+			typedef std::function<void(const EcsClient*, const Model::ModifyDiagnosticMetricSetRequest&, const ModifyDiagnosticMetricSetOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ModifyDiagnosticMetricSetAsyncHandler;
 			typedef Outcome<Error, Model::ModifyDiskAttributeResult> ModifyDiskAttributeOutcome;
 			typedef std::future<ModifyDiskAttributeOutcome> ModifyDiskAttributeOutcomeCallable;
 			typedef std::function<void(const EcsClient*, const Model::ModifyDiskAttributeRequest&, const ModifyDiskAttributeOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ModifyDiskAttributeAsyncHandler;
@@ -1825,6 +1865,12 @@ namespace AlibabaCloud
 			CreateDeploymentSetOutcome createDeploymentSet(const Model::CreateDeploymentSetRequest &request)const;
 			void createDeploymentSetAsync(const Model::CreateDeploymentSetRequest& request, const CreateDeploymentSetAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			CreateDeploymentSetOutcomeCallable createDeploymentSetCallable(const Model::CreateDeploymentSetRequest& request) const;
+			CreateDiagnosticMetricSetOutcome createDiagnosticMetricSet(const Model::CreateDiagnosticMetricSetRequest &request)const;
+			void createDiagnosticMetricSetAsync(const Model::CreateDiagnosticMetricSetRequest& request, const CreateDiagnosticMetricSetAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			CreateDiagnosticMetricSetOutcomeCallable createDiagnosticMetricSetCallable(const Model::CreateDiagnosticMetricSetRequest& request) const;
+			CreateDiagnosticReportOutcome createDiagnosticReport(const Model::CreateDiagnosticReportRequest &request)const;
+			void createDiagnosticReportAsync(const Model::CreateDiagnosticReportRequest& request, const CreateDiagnosticReportAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			CreateDiagnosticReportOutcomeCallable createDiagnosticReportCallable(const Model::CreateDiagnosticReportRequest& request) const;
 			CreateDiskOutcome createDisk(const Model::CreateDiskRequest &request)const;
 			void createDiskAsync(const Model::CreateDiskRequest& request, const CreateDiskAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			CreateDiskOutcomeCallable createDiskCallable(const Model::CreateDiskRequest& request) const;
@@ -1933,6 +1979,12 @@ namespace AlibabaCloud
 			DeleteDeploymentSetOutcome deleteDeploymentSet(const Model::DeleteDeploymentSetRequest &request)const;
 			void deleteDeploymentSetAsync(const Model::DeleteDeploymentSetRequest& request, const DeleteDeploymentSetAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DeleteDeploymentSetOutcomeCallable deleteDeploymentSetCallable(const Model::DeleteDeploymentSetRequest& request) const;
+			DeleteDiagnosticMetricSetsOutcome deleteDiagnosticMetricSets(const Model::DeleteDiagnosticMetricSetsRequest &request)const;
+			void deleteDiagnosticMetricSetsAsync(const Model::DeleteDiagnosticMetricSetsRequest& request, const DeleteDiagnosticMetricSetsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DeleteDiagnosticMetricSetsOutcomeCallable deleteDiagnosticMetricSetsCallable(const Model::DeleteDiagnosticMetricSetsRequest& request) const;
+			DeleteDiagnosticReportsOutcome deleteDiagnosticReports(const Model::DeleteDiagnosticReportsRequest &request)const;
+			void deleteDiagnosticReportsAsync(const Model::DeleteDiagnosticReportsRequest& request, const DeleteDiagnosticReportsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DeleteDiagnosticReportsOutcomeCallable deleteDiagnosticReportsCallable(const Model::DeleteDiagnosticReportsRequest& request) const;
 			DeleteDiskOutcome deleteDisk(const Model::DeleteDiskRequest &request)const;
 			void deleteDiskAsync(const Model::DeleteDiskRequest& request, const DeleteDiskAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DeleteDiskOutcomeCallable deleteDiskCallable(const Model::DeleteDiskRequest& request) const;
@@ -2086,6 +2138,15 @@ namespace AlibabaCloud
 			DescribeDeploymentSetsOutcome describeDeploymentSets(const Model::DescribeDeploymentSetsRequest &request)const;
 			void describeDeploymentSetsAsync(const Model::DescribeDeploymentSetsRequest& request, const DescribeDeploymentSetsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeDeploymentSetsOutcomeCallable describeDeploymentSetsCallable(const Model::DescribeDeploymentSetsRequest& request) const;
+			DescribeDiagnosticMetricSetsOutcome describeDiagnosticMetricSets(const Model::DescribeDiagnosticMetricSetsRequest &request)const;
+			void describeDiagnosticMetricSetsAsync(const Model::DescribeDiagnosticMetricSetsRequest& request, const DescribeDiagnosticMetricSetsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribeDiagnosticMetricSetsOutcomeCallable describeDiagnosticMetricSetsCallable(const Model::DescribeDiagnosticMetricSetsRequest& request) const;
+			DescribeDiagnosticMetricsOutcome describeDiagnosticMetrics(const Model::DescribeDiagnosticMetricsRequest &request)const;
+			void describeDiagnosticMetricsAsync(const Model::DescribeDiagnosticMetricsRequest& request, const DescribeDiagnosticMetricsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribeDiagnosticMetricsOutcomeCallable describeDiagnosticMetricsCallable(const Model::DescribeDiagnosticMetricsRequest& request) const;
+			DescribeDiagnosticReportsOutcome describeDiagnosticReports(const Model::DescribeDiagnosticReportsRequest &request)const;
+			void describeDiagnosticReportsAsync(const Model::DescribeDiagnosticReportsRequest& request, const DescribeDiagnosticReportsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribeDiagnosticReportsOutcomeCallable describeDiagnosticReportsCallable(const Model::DescribeDiagnosticReportsRequest& request) const;
 			DescribeDiskMonitorDataOutcome describeDiskMonitorData(const Model::DescribeDiskMonitorDataRequest &request)const;
 			void describeDiskMonitorDataAsync(const Model::DescribeDiskMonitorDataRequest& request, const DescribeDiskMonitorDataAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeDiskMonitorDataOutcomeCallable describeDiskMonitorDataCallable(const Model::DescribeDiskMonitorDataRequest& request) const;
@@ -2449,6 +2510,9 @@ namespace AlibabaCloud
 			ModifyDeploymentSetAttributeOutcome modifyDeploymentSetAttribute(const Model::ModifyDeploymentSetAttributeRequest &request)const;
 			void modifyDeploymentSetAttributeAsync(const Model::ModifyDeploymentSetAttributeRequest& request, const ModifyDeploymentSetAttributeAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ModifyDeploymentSetAttributeOutcomeCallable modifyDeploymentSetAttributeCallable(const Model::ModifyDeploymentSetAttributeRequest& request) const;
+			ModifyDiagnosticMetricSetOutcome modifyDiagnosticMetricSet(const Model::ModifyDiagnosticMetricSetRequest &request)const;
+			void modifyDiagnosticMetricSetAsync(const Model::ModifyDiagnosticMetricSetRequest& request, const ModifyDiagnosticMetricSetAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			ModifyDiagnosticMetricSetOutcomeCallable modifyDiagnosticMetricSetCallable(const Model::ModifyDiagnosticMetricSetRequest& request) const;
 			ModifyDiskAttributeOutcome modifyDiskAttribute(const Model::ModifyDiskAttributeRequest &request)const;
 			void modifyDiskAttributeAsync(const Model::ModifyDiskAttributeRequest& request, const ModifyDiskAttributeAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ModifyDiskAttributeOutcomeCallable modifyDiskAttributeCallable(const Model::ModifyDiskAttributeRequest& request) const;

ecs/include/alibabacloud/ecs/model/CreateDiagnosticMetricSetRequest.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_ECS_MODEL_CREATEDIAGNOSTICMETRICSETREQUEST_H_
+#define ALIBABACLOUD_ECS_MODEL_CREATEDIAGNOSTICMETRICSETREQUEST_H_
+
+#include <alibabacloud/ecs/EcsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Ecs {
+namespace Model {
+class ALIBABACLOUD_ECS_EXPORT CreateDiagnosticMetricSetRequest : public RpcServiceRequest {
+public:
+	CreateDiagnosticMetricSetRequest();
+	~CreateDiagnosticMetricSetRequest();
+	std::vector<std::string> getMetricIds() const;
+	void setMetricIds(const std::vector<std::string> &metricIds);
+	std::string getDescription() const;
+	void setDescription(const std::string &description);
+	std::string getMetricSetName() const;
+	void setMetricSetName(const std::string &metricSetName);
+	std::string getResourceType() const;
+	void setResourceType(const std::string &resourceType);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
+
+private:
+	std::vector<std::string> metricIds_;
+	std::string description_;
+	std::string metricSetName_;
+	std::string resourceType_;
+	std::string regionId_;
+};
+} // namespace Model
+} // namespace Ecs
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ECS_MODEL_CREATEDIAGNOSTICMETRICSETREQUEST_H_

ecs/include/alibabacloud/ecs/model/CreateDiagnosticMetricSetResult.h

@@ -14,40 +14,38 @@
  * limitations under the License.
  */
 
-#ifndef ALIBABACLOUD_KMS_MODEL_IMPORTCERTIFICATERESULT_H_
-#define ALIBABACLOUD_KMS_MODEL_IMPORTCERTIFICATERESULT_H_
+#ifndef ALIBABACLOUD_ECS_MODEL_CREATEDIAGNOSTICMETRICSETRESULT_H_
+#define ALIBABACLOUD_ECS_MODEL_CREATEDIAGNOSTICMETRICSETRESULT_H_
 
 #include <string>
 #include <vector>
 #include <utility>
 #include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/ecs/EcsExport.h>
 
 namespace AlibabaCloud
 {
-	namespace Kms
+	namespace Ecs
 	{
 		namespace Model
 		{
-			class ALIBABACLOUD_KMS_EXPORT ImportCertificateResult : public ServiceResult
+			class ALIBABACLOUD_ECS_EXPORT CreateDiagnosticMetricSetResult : public ServiceResult
 			{
 			public:
 
 
-				ImportCertificateResult();
-				explicit ImportCertificateResult(const std::string &payload);
-				~ImportCertificateResult();
-				std::string getCertificateId()const;
-				std::string getArn()const;
+				CreateDiagnosticMetricSetResult();
+				explicit CreateDiagnosticMetricSetResult(const std::string &payload);
+				~CreateDiagnosticMetricSetResult();
+				std::string getMetricSetId()const;
 
 			protected:
 				void parse(const std::string &payload);
 			private:
-				std::string certificateId_;
-				std::string arn_;
+				std::string metricSetId_;
 
 			};
 		}
 	}
 }
-#endif // !ALIBABACLOUD_KMS_MODEL_IMPORTCERTIFICATERESULT_H_
+#endif // !ALIBABACLOUD_ECS_MODEL_CREATEDIAGNOSTICMETRICSETRESULT_H_

ecs/include/alibabacloud/ecs/model/CreateDiagnosticReportRequest.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_ECS_MODEL_CREATEDIAGNOSTICREPORTREQUEST_H_
+#define ALIBABACLOUD_ECS_MODEL_CREATEDIAGNOSTICREPORTREQUEST_H_
+
+#include <alibabacloud/ecs/EcsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Ecs {
+namespace Model {
+class ALIBABACLOUD_ECS_EXPORT CreateDiagnosticReportRequest : public RpcServiceRequest {
+public:
+	CreateDiagnosticReportRequest();
+	~CreateDiagnosticReportRequest();
+	std::string getResourceId() const;
+	void setResourceId(const std::string &resourceId);
+	std::string getMetricSetId() const;
+	void setMetricSetId(const std::string &metricSetId);
+	std::string getEndTime() const;
+	void setEndTime(const std::string &endTime);
+	std::string getStartTime() const;
+	void setStartTime(const std::string &startTime);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
+
+private:
+	std::string resourceId_;
+	std::string metricSetId_;
+	std::string endTime_;
+	std::string startTime_;
+	std::string regionId_;
+};
+} // namespace Model
+} // namespace Ecs
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ECS_MODEL_CREATEDIAGNOSTICREPORTREQUEST_H_

ecs/include/alibabacloud/ecs/model/CreateDiagnosticReportResult.h

@@ -14,46 +14,38 @@
  * limitations under the License.
  */
 
-#ifndef ALIBABACLOUD_KMS_MODEL_EXPORTCERTIFICATERESULT_H_
-#define ALIBABACLOUD_KMS_MODEL_EXPORTCERTIFICATERESULT_H_
+#ifndef ALIBABACLOUD_ECS_MODEL_CREATEDIAGNOSTICREPORTRESULT_H_
+#define ALIBABACLOUD_ECS_MODEL_CREATEDIAGNOSTICREPORTRESULT_H_
 
 #include <string>
 #include <vector>
 #include <utility>
 #include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/ecs/EcsExport.h>
 
 namespace AlibabaCloud
 {
-	namespace Kms
+	namespace Ecs
 	{
 		namespace Model
 		{
-			class ALIBABACLOUD_KMS_EXPORT ExportCertificateResult : public ServiceResult
+			class ALIBABACLOUD_ECS_EXPORT CreateDiagnosticReportResult : public ServiceResult
 			{
 			public:
 
 
-				ExportCertificateResult();
-				explicit ExportCertificateResult(const std::string &payload);
-				~ExportCertificateResult();
-				std::string getPrivateKey()const;
-				std::string getCertificateId()const;
-				std::string getCertificateChain()const;
-				std::string getPKCS12Blob()const;
-				std::string getCertificate()const;
+				CreateDiagnosticReportResult();
+				explicit CreateDiagnosticReportResult(const std::string &payload);
+				~CreateDiagnosticReportResult();
+				std::string getReportId()const;
 
 			protected:
 				void parse(const std::string &payload);
 			private:
-				std::string privateKey_;
-				std::string certificateId_;
-				std::string certificateChain_;
-				std::string pKCS12Blob_;
-				std::string certificate_;
+				std::string reportId_;
 
 			};
 		}
 	}
 }
-#endif // !ALIBABACLOUD_KMS_MODEL_EXPORTCERTIFICATERESULT_H_
+#endif // !ALIBABACLOUD_ECS_MODEL_CREATEDIAGNOSTICREPORTRESULT_H_

ecs/include/alibabacloud/ecs/model/DeleteDiagnosticMetricSetsRequest.h

@@ -0,0 +1,45 @@
+/*
+ * 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_ECS_MODEL_DELETEDIAGNOSTICMETRICSETSREQUEST_H_
+#define ALIBABACLOUD_ECS_MODEL_DELETEDIAGNOSTICMETRICSETSREQUEST_H_
+
+#include <alibabacloud/ecs/EcsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Ecs {
+namespace Model {
+class ALIBABACLOUD_ECS_EXPORT DeleteDiagnosticMetricSetsRequest : public RpcServiceRequest {
+public:
+	DeleteDiagnosticMetricSetsRequest();
+	~DeleteDiagnosticMetricSetsRequest();
+	std::vector<std::string> getMetricSetIds() const;
+	void setMetricSetIds(const std::vector<std::string> &metricSetIds);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
+
+private:
+	std::vector<std::string> metricSetIds_;
+	std::string regionId_;
+};
+} // namespace Model
+} // namespace Ecs
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ECS_MODEL_DELETEDIAGNOSTICMETRICSETSREQUEST_H_

ecs/include/alibabacloud/ecs/model/DeleteDiagnosticMetricSetsResult.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_ECS_MODEL_DELETEDIAGNOSTICMETRICSETSRESULT_H_
+#define ALIBABACLOUD_ECS_MODEL_DELETEDIAGNOSTICMETRICSETSRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/ecs/EcsExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Ecs
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ECS_EXPORT DeleteDiagnosticMetricSetsResult : public ServiceResult
+			{
+			public:
+
+
+				DeleteDiagnosticMetricSetsResult();
+				explicit DeleteDiagnosticMetricSetsResult(const std::string &payload);
+				~DeleteDiagnosticMetricSetsResult();
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ECS_MODEL_DELETEDIAGNOSTICMETRICSETSRESULT_H_

ecs/include/alibabacloud/ecs/model/DeleteDiagnosticReportsRequest.h

@@ -0,0 +1,45 @@
+/*
+ * 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_ECS_MODEL_DELETEDIAGNOSTICREPORTSREQUEST_H_
+#define ALIBABACLOUD_ECS_MODEL_DELETEDIAGNOSTICREPORTSREQUEST_H_
+
+#include <alibabacloud/ecs/EcsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Ecs {
+namespace Model {
+class ALIBABACLOUD_ECS_EXPORT DeleteDiagnosticReportsRequest : public RpcServiceRequest {
+public:
+	DeleteDiagnosticReportsRequest();
+	~DeleteDiagnosticReportsRequest();
+	std::vector<std::string> getReportIds() const;
+	void setReportIds(const std::vector<std::string> &reportIds);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
+
+private:
+	std::vector<std::string> reportIds_;
+	std::string regionId_;
+};
+} // namespace Model
+} // namespace Ecs
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ECS_MODEL_DELETEDIAGNOSTICREPORTSREQUEST_H_

ecs/include/alibabacloud/ecs/model/DeleteDiagnosticReportsResult.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_ECS_MODEL_DELETEDIAGNOSTICREPORTSRESULT_H_
+#define ALIBABACLOUD_ECS_MODEL_DELETEDIAGNOSTICREPORTSRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/ecs/EcsExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Ecs
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ECS_EXPORT DeleteDiagnosticReportsResult : public ServiceResult
+			{
+			public:
+
+
+				DeleteDiagnosticReportsResult();
+				explicit DeleteDiagnosticReportsResult(const std::string &payload);
+				~DeleteDiagnosticReportsResult();
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ECS_MODEL_DELETEDIAGNOSTICREPORTSRESULT_H_

ecs/include/alibabacloud/ecs/model/DescribeCommandsRequest.h

@@ -28,6 +28,10 @@ namespace Ecs {
 namespace Model {
 class ALIBABACLOUD_ECS_EXPORT DescribeCommandsRequest : public RpcServiceRequest {
 public:
+	struct Tag {
+		std::string key;
+		std::string value;
+	};
 	DescribeCommandsRequest();
 	~DescribeCommandsRequest();
 	long getResourceOwnerId() const;
@@ -48,6 +52,8 @@ public:
 	void setContentEncoding(const std::string &contentEncoding);
 	long getPageSize() const;
 	void setPageSize(long pageSize);
+	std::vector<Tag> getTag() const;
+	void setTag(const std::vector<Tag> &tag);
 	bool getLatest() const;
 	void setLatest(bool latest);
 	std::string getResourceOwnerAccount() const;
@@ -69,6 +75,7 @@ private:
 	std::string provider_;
 	std::string contentEncoding_;
 	long pageSize_;
+	std::vector<Tag> tag_;
 	bool latest_;
 	std::string resourceOwnerAccount_;
 	std::string ownerAccount_;

ecs/include/alibabacloud/ecs/model/DescribeCommandsResult.h

@@ -42,6 +42,11 @@ namespace AlibabaCloud
 						std::string parameterName;
 						std::vector<std::string> possibleValues;
 					};
+					struct Tag
+					{
+						std::string tagKey;
+						std::string tagValue;
+					};
 					std::vector<Command::ParameterDefinition> parameterDefinitions;
 					std::string description;
 					std::string category;
@@ -58,6 +63,7 @@ namespace AlibabaCloud
 					bool latest;
 					bool enableParameter;
 					std::string commandId;
+					std::vector<Command::Tag> tags;
 				};
 
 

ecs/include/alibabacloud/ecs/model/DescribeDiagnosticMetricSetsRequest.h

@@ -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.
+ */
+
+#ifndef ALIBABACLOUD_ECS_MODEL_DESCRIBEDIAGNOSTICMETRICSETSREQUEST_H_
+#define ALIBABACLOUD_ECS_MODEL_DESCRIBEDIAGNOSTICMETRICSETSREQUEST_H_
+
+#include <alibabacloud/ecs/EcsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Ecs {
+namespace Model {
+class ALIBABACLOUD_ECS_EXPORT DescribeDiagnosticMetricSetsRequest : public RpcServiceRequest {
+public:
+	DescribeDiagnosticMetricSetsRequest();
+	~DescribeDiagnosticMetricSetsRequest();
+	std::vector<std::string> getMetricSetIds() const;
+	void setMetricSetIds(const std::vector<std::string> &metricSetIds);
+	std::string getType() const;
+	void setType(const std::string &type);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
+	std::string getNextToken() const;
+	void setNextToken(const std::string &nextToken);
+	std::string getResourceType() const;
+	void setResourceType(const std::string &resourceType);
+	int getMaxResults() const;
+	void setMaxResults(int maxResults);
+
+private:
+	std::vector<std::string> metricSetIds_;
+	std::string type_;
+	std::string regionId_;
+	std::string nextToken_;
+	std::string resourceType_;
+	int maxResults_;
+};
+} // namespace Model
+} // namespace Ecs
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ECS_MODEL_DESCRIBEDIAGNOSTICMETRICSETSREQUEST_H_

ecs/include/alibabacloud/ecs/model/DescribeDiagnosticMetricSetsResult.h

@@ -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.
+ */
+
+#ifndef ALIBABACLOUD_ECS_MODEL_DESCRIBEDIAGNOSTICMETRICSETSRESULT_H_
+#define ALIBABACLOUD_ECS_MODEL_DESCRIBEDIAGNOSTICMETRICSETSRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/ecs/EcsExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Ecs
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ECS_EXPORT DescribeDiagnosticMetricSetsResult : public ServiceResult
+			{
+			public:
+				struct MetricSet
+				{
+					std::string type;
+					std::string description;
+					std::vector<std::string> metricIds;
+					std::string metricSetId;
+					std::string resourceType;
+					std::string metricSetName;
+				};
+
+
+				DescribeDiagnosticMetricSetsResult();
+				explicit DescribeDiagnosticMetricSetsResult(const std::string &payload);
+				~DescribeDiagnosticMetricSetsResult();
+				std::string getNextToken()const;
+				std::vector<MetricSet> getMetricSets()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::string nextToken_;
+				std::vector<MetricSet> metricSets_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ECS_MODEL_DESCRIBEDIAGNOSTICMETRICSETSRESULT_H_

ecs/include/alibabacloud/ecs/model/DescribeDiagnosticMetricsRequest.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_ECS_MODEL_DESCRIBEDIAGNOSTICMETRICSREQUEST_H_
+#define ALIBABACLOUD_ECS_MODEL_DESCRIBEDIAGNOSTICMETRICSREQUEST_H_
+
+#include <alibabacloud/ecs/EcsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Ecs {
+namespace Model {
+class ALIBABACLOUD_ECS_EXPORT DescribeDiagnosticMetricsRequest : public RpcServiceRequest {
+public:
+	DescribeDiagnosticMetricsRequest();
+	~DescribeDiagnosticMetricsRequest();
+	std::vector<std::string> getMetricIds() const;
+	void setMetricIds(const std::vector<std::string> &metricIds);
+	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);
+	int getMaxResults() const;
+	void setMaxResults(int maxResults);
+
+private:
+	std::vector<std::string> metricIds_;
+	std::string resourceType_;
+	std::string regionId_;
+	std::string nextToken_;
+	int maxResults_;
+};
+} // namespace Model
+} // namespace Ecs
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ECS_MODEL_DESCRIBEDIAGNOSTICMETRICSREQUEST_H_

ecs/include/alibabacloud/ecs/model/DescribeDiagnosticMetricsResult.h

@@ -0,0 +1,63 @@
+/*
+ * 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_ECS_MODEL_DESCRIBEDIAGNOSTICMETRICSRESULT_H_
+#define ALIBABACLOUD_ECS_MODEL_DESCRIBEDIAGNOSTICMETRICSRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/ecs/EcsExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Ecs
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ECS_EXPORT DescribeDiagnosticMetricsResult : public ServiceResult
+			{
+			public:
+				struct Metric
+				{
+					std::string metricName;
+					std::string metricId;
+					std::string description;
+					std::string resourceType;
+					bool guestMetric;
+					std::string supportedOperatingSystem;
+					std::string metricCategory;
+				};
+
+
+				DescribeDiagnosticMetricsResult();
+				explicit DescribeDiagnosticMetricsResult(const std::string &payload);
+				~DescribeDiagnosticMetricsResult();
+				std::vector<Metric> getMetrics()const;
+				std::string getNextToken()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::vector<Metric> metrics_;
+				std::string nextToken_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ECS_MODEL_DESCRIBEDIAGNOSTICMETRICSRESULT_H_

ecs/include/alibabacloud/ecs/model/DescribeDiagnosticReportsRequest.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_ECS_MODEL_DESCRIBEDIAGNOSTICREPORTSREQUEST_H_
+#define ALIBABACLOUD_ECS_MODEL_DESCRIBEDIAGNOSTICREPORTSREQUEST_H_
+
+#include <alibabacloud/ecs/EcsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Ecs {
+namespace Model {
+class ALIBABACLOUD_ECS_EXPORT DescribeDiagnosticReportsRequest : public RpcServiceRequest {
+public:
+	DescribeDiagnosticReportsRequest();
+	~DescribeDiagnosticReportsRequest();
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
+	std::string getNextToken() const;
+	void setNextToken(const std::string &nextToken);
+	std::string getSeverity() const;
+	void setSeverity(const std::string &severity);
+	std::vector<std::string> getReportIds() const;
+	void setReportIds(const std::vector<std::string> &reportIds);
+	int getMaxResults() const;
+	void setMaxResults(int maxResults);
+	std::string getStatus() const;
+	void setStatus(const std::string &status);
+	std::vector<std::string> getResourceIds() const;
+	void setResourceIds(const std::vector<std::string> &resourceIds);
+
+private:
+	std::string regionId_;
+	std::string nextToken_;
+	std::string severity_;
+	std::vector<std::string> reportIds_;
+	int maxResults_;
+	std::string status_;
+	std::vector<std::string> resourceIds_;
+};
+} // namespace Model
+} // namespace Ecs
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ECS_MODEL_DESCRIBEDIAGNOSTICREPORTSREQUEST_H_

ecs/include/alibabacloud/ecs/model/DescribeDiagnosticReportsResult.h

@@ -0,0 +1,74 @@
+/*
+ * 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_ECS_MODEL_DESCRIBEDIAGNOSTICREPORTSRESULT_H_
+#define ALIBABACLOUD_ECS_MODEL_DESCRIBEDIAGNOSTICREPORTSRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/ecs/EcsExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Ecs
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ECS_EXPORT DescribeDiagnosticReportsResult : public ServiceResult
+			{
+			public:
+				struct Report
+				{
+					struct Issue
+					{
+						std::string metricId;
+						std::string severity;
+						std::string issueId;
+						std::string metricCategory;
+					};
+					std::string status;
+					std::string endTime;
+					std::string resourceId;
+					std::vector<Report::Issue> issues;
+					std::string metricSetId;
+					std::string startTime;
+					std::string creationTime;
+					std::string reportId;
+					std::string resourceType;
+					std::string severity;
+					std::string finishedTime;
+				};
+
+
+				DescribeDiagnosticReportsResult();
+				explicit DescribeDiagnosticReportsResult(const std::string &payload);
+				~DescribeDiagnosticReportsResult();
+				std::string getNextToken()const;
+				std::vector<Report> getReports()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::string nextToken_;
+				std::vector<Report> reports_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ECS_MODEL_DESCRIBEDIAGNOSTICREPORTSRESULT_H_

ecs/include/alibabacloud/ecs/model/DescribeInvocationResultsRequest.h

@@ -28,6 +28,10 @@ namespace Ecs {
 namespace Model {
 class ALIBABACLOUD_ECS_EXPORT DescribeInvocationResultsRequest : public RpcServiceRequest {
 public:
+	struct Tag {
+		std::string key;
+		std::string value;
+	};
 	DescribeInvocationResultsRequest();
 	~DescribeInvocationResultsRequest();
 	long getResourceOwnerId() const;
@@ -42,6 +46,8 @@ public:
 	void setContentEncoding(const std::string &contentEncoding);
 	long getPageSize() const;
 	void setPageSize(long pageSize);
+	std::vector<Tag> getTag() const;
+	void setTag(const std::vector<Tag> &tag);
 	std::string getInvokeId() const;
 	void setInvokeId(const std::string &invokeId);
 	std::string getResourceOwnerAccount() const;
@@ -64,6 +70,7 @@ private:
 	std::string regionId_;
 	std::string contentEncoding_;
 	long pageSize_;
+	std::vector<Tag> tag_;
 	std::string invokeId_;
 	std::string resourceOwnerAccount_;
 	std::string ownerAccount_;

ecs/include/alibabacloud/ecs/model/DescribeInvocationResultsResult.h

@@ -36,6 +36,11 @@ namespace AlibabaCloud
 				{
 					struct InvocationResult
 					{
+						struct Tag
+						{
+							std::string tagKey;
+							std::string tagValue;
+						};
 						int dropped;
 						std::string invocationStatus;
 						std::string instanceId;
@@ -49,6 +54,7 @@ namespace AlibabaCloud
 						std::string output;
 						std::string commandId;
 						std::string errorCode;
+						std::vector<InvocationResult::Tag> tags;
 						std::string invokeId;
 						std::string stopTime;
 					};

ecs/include/alibabacloud/ecs/model/DescribeInvocationsRequest.h

@@ -28,6 +28,10 @@ namespace Ecs {
 namespace Model {
 class ALIBABACLOUD_ECS_EXPORT DescribeInvocationsRequest : public RpcServiceRequest {
 public:
+	struct Tag {
+		std::string key;
+		std::string value;
+	};
 	DescribeInvocationsRequest();
 	~DescribeInvocationsRequest();
 	long getResourceOwnerId() const;
@@ -48,6 +52,8 @@ public:
 	void setRepeatMode(const std::string &repeatMode);
 	long getPageSize() const;
 	void setPageSize(long pageSize);
+	std::vector<Tag> getTag() const;
+	void setTag(const std::vector<Tag> &tag);
 	std::string getInvokeId() const;
 	void setInvokeId(const std::string &invokeId);
 	bool getTimed() const;
@@ -75,6 +81,7 @@ private:
 	std::string contentEncoding_;
 	std::string repeatMode_;
 	long pageSize_;
+	std::vector<Tag> tag_;
 	std::string invokeId_;
 	bool timed_;
 	std::string commandName_;

ecs/include/alibabacloud/ecs/model/DescribeInvocationsResult.h

@@ -52,6 +52,11 @@ namespace AlibabaCloud
 						std::string errorCode;
 						std::string stopTime;
 					};
+					struct Tag
+					{
+						std::string tagKey;
+						std::string tagValue;
+					};
 					std::string invocationStatus;
 					std::string parameters;
 					bool timed;
@@ -68,6 +73,7 @@ namespace AlibabaCloud
 					std::string frequency;
 					std::string commandId;
 					std::string commandName;
+					std::vector<Invocation::Tag> tags;
 					std::string invokeId;
 				};
 

ecs/include/alibabacloud/ecs/model/ModifyDiagnosticMetricSetRequest.h

@@ -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.
+ */
+
+#ifndef ALIBABACLOUD_ECS_MODEL_MODIFYDIAGNOSTICMETRICSETREQUEST_H_
+#define ALIBABACLOUD_ECS_MODEL_MODIFYDIAGNOSTICMETRICSETREQUEST_H_
+
+#include <alibabacloud/ecs/EcsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Ecs {
+namespace Model {
+class ALIBABACLOUD_ECS_EXPORT ModifyDiagnosticMetricSetRequest : public RpcServiceRequest {
+public:
+	ModifyDiagnosticMetricSetRequest();
+	~ModifyDiagnosticMetricSetRequest();
+	std::vector<std::string> getMetricIds() const;
+	void setMetricIds(const std::vector<std::string> &metricIds);
+	std::string getMetricSetId() const;
+	void setMetricSetId(const std::string &metricSetId);
+	std::string getDescription() const;
+	void setDescription(const std::string &description);
+	std::string getMetricSetName() const;
+	void setMetricSetName(const std::string &metricSetName);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
+	std::string getResourceType() const;
+	void setResourceType(const std::string &resourceType);
+
+private:
+	std::vector<std::string> metricIds_;
+	std::string metricSetId_;
+	std::string description_;
+	std::string metricSetName_;
+	std::string regionId_;
+	std::string resourceType_;
+};
+} // namespace Model
+} // namespace Ecs
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ECS_MODEL_MODIFYDIAGNOSTICMETRICSETREQUEST_H_

ecs/include/alibabacloud/ecs/model/ModifyDiagnosticMetricSetResult.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_ECS_MODEL_MODIFYDIAGNOSTICMETRICSETRESULT_H_
+#define ALIBABACLOUD_ECS_MODEL_MODIFYDIAGNOSTICMETRICSETRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/ecs/EcsExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Ecs
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ECS_EXPORT ModifyDiagnosticMetricSetResult : public ServiceResult
+			{
+			public:
+
+
+				ModifyDiagnosticMetricSetResult();
+				explicit ModifyDiagnosticMetricSetResult(const std::string &payload);
+				~ModifyDiagnosticMetricSetResult();
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ECS_MODEL_MODIFYDIAGNOSTICMETRICSETRESULT_H_

ecs/include/alibabacloud/ecs/model/ModifySecurityGroupEgressRuleRequest.h

@@ -46,12 +46,12 @@ public:
 	void setDescription(const std::string &description);
 	std::string getRegionId() const;
 	void setRegionId(const std::string &regionId);
+	std::string getPolicy() const;
+	void setPolicy(const std::string &policy);
 	std::string getIpv6DestCidrIp() const;
 	void setIpv6DestCidrIp(const std::string &ipv6DestCidrIp);
 	std::string getIpv6SourceCidrIp() const;
 	void setIpv6SourceCidrIp(const std::string &ipv6SourceCidrIp);
-	std::string getPolicy() const;
-	void setPolicy(const std::string &policy);
 	std::string getPortRange() const;
 	void setPortRange(const std::string &portRange);
 	std::string getResourceOwnerAccount() const;
@@ -66,10 +66,10 @@ public:
 	void setDestGroupId(const std::string &destGroupId);
 	long getOwnerId() const;
 	void setOwnerId(long ownerId);
-	std::string getDestGroupOwnerAccount() const;
-	void setDestGroupOwnerAccount(const std::string &destGroupOwnerAccount);
 	std::string getPriority() const;
 	void setPriority(const std::string &priority);
+	std::string getDestGroupOwnerAccount() const;
+	void setDestGroupOwnerAccount(const std::string &destGroupOwnerAccount);
 	std::string getDestCidrIp() const;
 	void setDestCidrIp(const std::string &destCidrIp);
 	long getDestGroupOwnerId() const;
@@ -84,9 +84,9 @@ private:
 	std::string securityGroupId_;
 	std::string description_;
 	std::string regionId_;
+	std::string policy_;
 	std::string ipv6DestCidrIp_;
 	std::string ipv6SourceCidrIp_;
-	std::string policy_;
 	std::string portRange_;
 	std::string resourceOwnerAccount_;
 	std::string ipProtocol_;
@@ -94,8 +94,8 @@ private:
 	std::string sourceCidrIp_;
 	std::string destGroupId_;
 	long ownerId_;
-	std::string destGroupOwnerAccount_;
 	std::string priority_;
+	std::string destGroupOwnerAccount_;
 	std::string destCidrIp_;
 	long destGroupOwnerId_;
 };

ecs/include/alibabacloud/ecs/model/ModifySecurityGroupRuleRequest.h

@@ -50,12 +50,12 @@ public:
 	void setSourceGroupOwnerAccount(const std::string &sourceGroupOwnerAccount);
 	std::string getRegionId() const;
 	void setRegionId(const std::string &regionId);
+	std::string getPolicy() const;
+	void setPolicy(const std::string &policy);
 	std::string getIpv6SourceCidrIp() const;
 	void setIpv6SourceCidrIp(const std::string &ipv6SourceCidrIp);
 	std::string getIpv6DestCidrIp() const;
 	void setIpv6DestCidrIp(const std::string &ipv6DestCidrIp);
-	std::string getPolicy() const;
-	void setPolicy(const std::string &policy);
 	std::string getPortRange() const;
 	void setPortRange(const std::string &portRange);
 	std::string getResourceOwnerAccount() const;
@@ -86,9 +86,9 @@ private:
 	long sourceGroupOwnerId_;
 	std::string sourceGroupOwnerAccount_;
 	std::string regionId_;
+	std::string policy_;
 	std::string ipv6SourceCidrIp_;
 	std::string ipv6DestCidrIp_;
-	std::string policy_;
 	std::string portRange_;
 	std::string resourceOwnerAccount_;
 	std::string ipProtocol_;

ecs/include/alibabacloud/ecs/model/RunCommandRequest.h

@@ -28,6 +28,10 @@ namespace Ecs {
 namespace Model {
 class ALIBABACLOUD_ECS_EXPORT RunCommandRequest : public RpcServiceRequest {
 public:
+	struct Tag {
+		std::string key;
+		std::string value;
+	};
 	RunCommandRequest();
 	~RunCommandRequest();
 	long getResourceOwnerId() const;
@@ -52,6 +56,8 @@ public:
 	void setRepeatMode(const std::string &repeatMode);
 	std::string getWindowsPasswordName() const;
 	void setWindowsPasswordName(const std::string &windowsPasswordName);
+	std::vector<Tag> getTag() const;
+	void setTag(const std::vector<Tag> &tag);
 	bool getKeepCommand() const;
 	void setKeepCommand(bool keepCommand);
 	bool getTimed() const;
@@ -85,6 +91,7 @@ private:
 	std::string contentEncoding_;
 	std::string repeatMode_;
 	std::string windowsPasswordName_;
+	std::vector<Tag> tag_;
 	bool keepCommand_;
 	bool timed_;
 	std::string resourceOwnerAccount_;

ecs/src/EcsClient.cc

@@ -1419,6 +1419,78 @@ EcsClient::CreateDeploymentSetOutcomeCallable EcsClient::createDeploymentSetCall
 	return task->get_future();
 }
 
+EcsClient::CreateDiagnosticMetricSetOutcome EcsClient::createDiagnosticMetricSet(const CreateDiagnosticMetricSetRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return CreateDiagnosticMetricSetOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return CreateDiagnosticMetricSetOutcome(CreateDiagnosticMetricSetResult(outcome.result()));
+	else
+		return CreateDiagnosticMetricSetOutcome(outcome.error());
+}
+
+void EcsClient::createDiagnosticMetricSetAsync(const CreateDiagnosticMetricSetRequest& request, const CreateDiagnosticMetricSetAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, createDiagnosticMetricSet(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+EcsClient::CreateDiagnosticMetricSetOutcomeCallable EcsClient::createDiagnosticMetricSetCallable(const CreateDiagnosticMetricSetRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<CreateDiagnosticMetricSetOutcome()>>(
+			[this, request]()
+			{
+			return this->createDiagnosticMetricSet(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
+EcsClient::CreateDiagnosticReportOutcome EcsClient::createDiagnosticReport(const CreateDiagnosticReportRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return CreateDiagnosticReportOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return CreateDiagnosticReportOutcome(CreateDiagnosticReportResult(outcome.result()));
+	else
+		return CreateDiagnosticReportOutcome(outcome.error());
+}
+
+void EcsClient::createDiagnosticReportAsync(const CreateDiagnosticReportRequest& request, const CreateDiagnosticReportAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, createDiagnosticReport(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+EcsClient::CreateDiagnosticReportOutcomeCallable EcsClient::createDiagnosticReportCallable(const CreateDiagnosticReportRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<CreateDiagnosticReportOutcome()>>(
+			[this, request]()
+			{
+			return this->createDiagnosticReport(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 EcsClient::CreateDiskOutcome EcsClient::createDisk(const CreateDiskRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -2715,6 +2787,78 @@ EcsClient::DeleteDeploymentSetOutcomeCallable EcsClient::deleteDeploymentSetCall
 	return task->get_future();
 }
 
+EcsClient::DeleteDiagnosticMetricSetsOutcome EcsClient::deleteDiagnosticMetricSets(const DeleteDiagnosticMetricSetsRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return DeleteDiagnosticMetricSetsOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return DeleteDiagnosticMetricSetsOutcome(DeleteDiagnosticMetricSetsResult(outcome.result()));
+	else
+		return DeleteDiagnosticMetricSetsOutcome(outcome.error());
+}
+
+void EcsClient::deleteDiagnosticMetricSetsAsync(const DeleteDiagnosticMetricSetsRequest& request, const DeleteDiagnosticMetricSetsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, deleteDiagnosticMetricSets(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+EcsClient::DeleteDiagnosticMetricSetsOutcomeCallable EcsClient::deleteDiagnosticMetricSetsCallable(const DeleteDiagnosticMetricSetsRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<DeleteDiagnosticMetricSetsOutcome()>>(
+			[this, request]()
+			{
+			return this->deleteDiagnosticMetricSets(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
+EcsClient::DeleteDiagnosticReportsOutcome EcsClient::deleteDiagnosticReports(const DeleteDiagnosticReportsRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return DeleteDiagnosticReportsOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return DeleteDiagnosticReportsOutcome(DeleteDiagnosticReportsResult(outcome.result()));
+	else
+		return DeleteDiagnosticReportsOutcome(outcome.error());
+}
+
+void EcsClient::deleteDiagnosticReportsAsync(const DeleteDiagnosticReportsRequest& request, const DeleteDiagnosticReportsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, deleteDiagnosticReports(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+EcsClient::DeleteDiagnosticReportsOutcomeCallable EcsClient::deleteDiagnosticReportsCallable(const DeleteDiagnosticReportsRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<DeleteDiagnosticReportsOutcome()>>(
+			[this, request]()
+			{
+			return this->deleteDiagnosticReports(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 EcsClient::DeleteDiskOutcome EcsClient::deleteDisk(const DeleteDiskRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -4551,6 +4695,114 @@ EcsClient::DescribeDeploymentSetsOutcomeCallable EcsClient::describeDeploymentSe
 	return task->get_future();
 }
 
+EcsClient::DescribeDiagnosticMetricSetsOutcome EcsClient::describeDiagnosticMetricSets(const DescribeDiagnosticMetricSetsRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return DescribeDiagnosticMetricSetsOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return DescribeDiagnosticMetricSetsOutcome(DescribeDiagnosticMetricSetsResult(outcome.result()));
+	else
+		return DescribeDiagnosticMetricSetsOutcome(outcome.error());
+}
+
+void EcsClient::describeDiagnosticMetricSetsAsync(const DescribeDiagnosticMetricSetsRequest& request, const DescribeDiagnosticMetricSetsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, describeDiagnosticMetricSets(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+EcsClient::DescribeDiagnosticMetricSetsOutcomeCallable EcsClient::describeDiagnosticMetricSetsCallable(const DescribeDiagnosticMetricSetsRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<DescribeDiagnosticMetricSetsOutcome()>>(
+			[this, request]()
+			{
+			return this->describeDiagnosticMetricSets(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
+EcsClient::DescribeDiagnosticMetricsOutcome EcsClient::describeDiagnosticMetrics(const DescribeDiagnosticMetricsRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return DescribeDiagnosticMetricsOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return DescribeDiagnosticMetricsOutcome(DescribeDiagnosticMetricsResult(outcome.result()));
+	else
+		return DescribeDiagnosticMetricsOutcome(outcome.error());
+}
+
+void EcsClient::describeDiagnosticMetricsAsync(const DescribeDiagnosticMetricsRequest& request, const DescribeDiagnosticMetricsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, describeDiagnosticMetrics(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+EcsClient::DescribeDiagnosticMetricsOutcomeCallable EcsClient::describeDiagnosticMetricsCallable(const DescribeDiagnosticMetricsRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<DescribeDiagnosticMetricsOutcome()>>(
+			[this, request]()
+			{
+			return this->describeDiagnosticMetrics(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
+EcsClient::DescribeDiagnosticReportsOutcome EcsClient::describeDiagnosticReports(const DescribeDiagnosticReportsRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return DescribeDiagnosticReportsOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return DescribeDiagnosticReportsOutcome(DescribeDiagnosticReportsResult(outcome.result()));
+	else
+		return DescribeDiagnosticReportsOutcome(outcome.error());
+}
+
+void EcsClient::describeDiagnosticReportsAsync(const DescribeDiagnosticReportsRequest& request, const DescribeDiagnosticReportsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, describeDiagnosticReports(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+EcsClient::DescribeDiagnosticReportsOutcomeCallable EcsClient::describeDiagnosticReportsCallable(const DescribeDiagnosticReportsRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<DescribeDiagnosticReportsOutcome()>>(
+			[this, request]()
+			{
+			return this->describeDiagnosticReports(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 EcsClient::DescribeDiskMonitorDataOutcome EcsClient::describeDiskMonitorData(const DescribeDiskMonitorDataRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -8907,6 +9159,42 @@ EcsClient::ModifyDeploymentSetAttributeOutcomeCallable EcsClient::modifyDeployme
 	return task->get_future();
 }
 
+EcsClient::ModifyDiagnosticMetricSetOutcome EcsClient::modifyDiagnosticMetricSet(const ModifyDiagnosticMetricSetRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return ModifyDiagnosticMetricSetOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return ModifyDiagnosticMetricSetOutcome(ModifyDiagnosticMetricSetResult(outcome.result()));
+	else
+		return ModifyDiagnosticMetricSetOutcome(outcome.error());
+}
+
+void EcsClient::modifyDiagnosticMetricSetAsync(const ModifyDiagnosticMetricSetRequest& request, const ModifyDiagnosticMetricSetAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, modifyDiagnosticMetricSet(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+EcsClient::ModifyDiagnosticMetricSetOutcomeCallable EcsClient::modifyDiagnosticMetricSetCallable(const ModifyDiagnosticMetricSetRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<ModifyDiagnosticMetricSetOutcome()>>(
+			[this, request]()
+			{
+			return this->modifyDiagnosticMetricSet(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 EcsClient::ModifyDiskAttributeOutcome EcsClient::modifyDiskAttribute(const ModifyDiskAttributeRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

ecs/src/model/CreateDiagnosticMetricSetRequest.cc

@@ -0,0 +1,71 @@
+/*
+ * 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/ecs/model/CreateDiagnosticMetricSetRequest.h>
+
+using AlibabaCloud::Ecs::Model::CreateDiagnosticMetricSetRequest;
+
+CreateDiagnosticMetricSetRequest::CreateDiagnosticMetricSetRequest()
+    : RpcServiceRequest("ecs", "2014-05-26", "CreateDiagnosticMetricSet") {
+  setMethod(HttpRequest::Method::Post);
+}
+
+CreateDiagnosticMetricSetRequest::~CreateDiagnosticMetricSetRequest() {}
+
+std::vector<std::string> CreateDiagnosticMetricSetRequest::getMetricIds() const {
+  return metricIds_;
+}
+
+void CreateDiagnosticMetricSetRequest::setMetricIds(const std::vector<std::string> &metricIds) {
+  metricIds_ = metricIds;
+}
+
+std::string CreateDiagnosticMetricSetRequest::getDescription() const {
+  return description_;
+}
+
+void CreateDiagnosticMetricSetRequest::setDescription(const std::string &description) {
+  description_ = description;
+  setParameter(std::string("Description"), description);
+}
+
+std::string CreateDiagnosticMetricSetRequest::getMetricSetName() const {
+  return metricSetName_;
+}
+
+void CreateDiagnosticMetricSetRequest::setMetricSetName(const std::string &metricSetName) {
+  metricSetName_ = metricSetName;
+  setParameter(std::string("MetricSetName"), metricSetName);
+}
+
+std::string CreateDiagnosticMetricSetRequest::getResourceType() const {
+  return resourceType_;
+}
+
+void CreateDiagnosticMetricSetRequest::setResourceType(const std::string &resourceType) {
+  resourceType_ = resourceType;
+  setParameter(std::string("ResourceType"), resourceType);
+}
+
+std::string CreateDiagnosticMetricSetRequest::getRegionId() const {
+  return regionId_;
+}
+
+void CreateDiagnosticMetricSetRequest::setRegionId(const std::string &regionId) {
+  regionId_ = regionId;
+  setParameter(std::string("RegionId"), regionId);
+}
+

ecs/src/model/CreateDiagnosticMetricSetResult.cc

@@ -0,0 +1,51 @@
+/*
+ * 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/ecs/model/CreateDiagnosticMetricSetResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Ecs;
+using namespace AlibabaCloud::Ecs::Model;
+
+CreateDiagnosticMetricSetResult::CreateDiagnosticMetricSetResult() :
+	ServiceResult()
+{}
+
+CreateDiagnosticMetricSetResult::CreateDiagnosticMetricSetResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+CreateDiagnosticMetricSetResult::~CreateDiagnosticMetricSetResult()
+{}
+
+void CreateDiagnosticMetricSetResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	if(!value["MetricSetId"].isNull())
+		metricSetId_ = value["MetricSetId"].asString();
+
+}
+
+std::string CreateDiagnosticMetricSetResult::getMetricSetId()const
+{
+	return metricSetId_;
+}
+

ecs/src/model/CreateDiagnosticReportRequest.cc

@@ -0,0 +1,72 @@
+/*
+ * 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/ecs/model/CreateDiagnosticReportRequest.h>
+
+using AlibabaCloud::Ecs::Model::CreateDiagnosticReportRequest;
+
+CreateDiagnosticReportRequest::CreateDiagnosticReportRequest()
+    : RpcServiceRequest("ecs", "2014-05-26", "CreateDiagnosticReport") {
+  setMethod(HttpRequest::Method::Post);
+}
+
+CreateDiagnosticReportRequest::~CreateDiagnosticReportRequest() {}
+
+std::string CreateDiagnosticReportRequest::getResourceId() const {
+  return resourceId_;
+}
+
+void CreateDiagnosticReportRequest::setResourceId(const std::string &resourceId) {
+  resourceId_ = resourceId;
+  setParameter(std::string("ResourceId"), resourceId);
+}
+
+std::string CreateDiagnosticReportRequest::getMetricSetId() const {
+  return metricSetId_;
+}
+
+void CreateDiagnosticReportRequest::setMetricSetId(const std::string &metricSetId) {
+  metricSetId_ = metricSetId;
+  setParameter(std::string("MetricSetId"), metricSetId);
+}
+
+std::string CreateDiagnosticReportRequest::getEndTime() const {
+  return endTime_;
+}
+
+void CreateDiagnosticReportRequest::setEndTime(const std::string &endTime) {
+  endTime_ = endTime;
+  setParameter(std::string("EndTime"), endTime);
+}
+
+std::string CreateDiagnosticReportRequest::getStartTime() const {
+  return startTime_;
+}
+
+void CreateDiagnosticReportRequest::setStartTime(const std::string &startTime) {
+  startTime_ = startTime;
+  setParameter(std::string("StartTime"), startTime);
+}
+
+std::string CreateDiagnosticReportRequest::getRegionId() const {
+  return regionId_;
+}
+
+void CreateDiagnosticReportRequest::setRegionId(const std::string &regionId) {
+  regionId_ = regionId;
+  setParameter(std::string("RegionId"), regionId);
+}
+

ecs/src/model/CreateDiagnosticReportResult.cc

@@ -14,45 +14,38 @@
  * limitations under the License.
  */
 
-#include <alibabacloud/kms/model/ImportCertificateResult.h>
+#include <alibabacloud/ecs/model/CreateDiagnosticReportResult.h>
 #include <json/json.h>
 
-using namespace AlibabaCloud::Kms;
-using namespace AlibabaCloud::Kms::Model;
+using namespace AlibabaCloud::Ecs;
+using namespace AlibabaCloud::Ecs::Model;
 
-ImportCertificateResult::ImportCertificateResult() :
+CreateDiagnosticReportResult::CreateDiagnosticReportResult() :
 	ServiceResult()
 {}
 
-ImportCertificateResult::ImportCertificateResult(const std::string &payload) :
+CreateDiagnosticReportResult::CreateDiagnosticReportResult(const std::string &payload) :
 	ServiceResult()
 {
 	parse(payload);
 }
 
-ImportCertificateResult::~ImportCertificateResult()
+CreateDiagnosticReportResult::~CreateDiagnosticReportResult()
 {}
 
-void ImportCertificateResult::parse(const std::string &payload)
+void CreateDiagnosticReportResult::parse(const std::string &payload)
 {
 	Json::Reader reader;
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	if(!value["CertificateId"].isNull())
-		certificateId_ = value["CertificateId"].asString();
-	if(!value["Arn"].isNull())
-		arn_ = value["Arn"].asString();
+	if(!value["ReportId"].isNull())
+		reportId_ = value["ReportId"].asString();
 
 }
 
-std::string ImportCertificateResult::getCertificateId()const
+std::string CreateDiagnosticReportResult::getReportId()const
 {
-	return certificateId_;
-}
-
-std::string ImportCertificateResult::getArn()const
-{
-	return arn_;
+	return reportId_;
 }
 

ecs/src/model/DeleteDiagnosticMetricSetsRequest.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/ecs/model/DeleteDiagnosticMetricSetsRequest.h>
+
+using AlibabaCloud::Ecs::Model::DeleteDiagnosticMetricSetsRequest;
+
+DeleteDiagnosticMetricSetsRequest::DeleteDiagnosticMetricSetsRequest()
+    : RpcServiceRequest("ecs", "2014-05-26", "DeleteDiagnosticMetricSets") {
+  setMethod(HttpRequest::Method::Post);
+}
+
+DeleteDiagnosticMetricSetsRequest::~DeleteDiagnosticMetricSetsRequest() {}
+
+std::vector<std::string> DeleteDiagnosticMetricSetsRequest::getMetricSetIds() const {
+  return metricSetIds_;
+}
+
+void DeleteDiagnosticMetricSetsRequest::setMetricSetIds(const std::vector<std::string> &metricSetIds) {
+  metricSetIds_ = metricSetIds;
+}
+
+std::string DeleteDiagnosticMetricSetsRequest::getRegionId() const {
+  return regionId_;
+}
+
+void DeleteDiagnosticMetricSetsRequest::setRegionId(const std::string &regionId) {
+  regionId_ = regionId;
+  setParameter(std::string("RegionId"), regionId);
+}
+

ecs/src/model/DeleteDiagnosticMetricSetsResult.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/ecs/model/DeleteDiagnosticMetricSetsResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Ecs;
+using namespace AlibabaCloud::Ecs::Model;
+
+DeleteDiagnosticMetricSetsResult::DeleteDiagnosticMetricSetsResult() :
+	ServiceResult()
+{}
+
+DeleteDiagnosticMetricSetsResult::DeleteDiagnosticMetricSetsResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+DeleteDiagnosticMetricSetsResult::~DeleteDiagnosticMetricSetsResult()
+{}
+
+void DeleteDiagnosticMetricSetsResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+
+}
+

ecs/src/model/DeleteDiagnosticReportsRequest.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/ecs/model/DeleteDiagnosticReportsRequest.h>
+
+using AlibabaCloud::Ecs::Model::DeleteDiagnosticReportsRequest;
+
+DeleteDiagnosticReportsRequest::DeleteDiagnosticReportsRequest()
+    : RpcServiceRequest("ecs", "2014-05-26", "DeleteDiagnosticReports") {
+  setMethod(HttpRequest::Method::Post);
+}
+
+DeleteDiagnosticReportsRequest::~DeleteDiagnosticReportsRequest() {}
+
+std::vector<std::string> DeleteDiagnosticReportsRequest::getReportIds() const {
+  return reportIds_;
+}
+
+void DeleteDiagnosticReportsRequest::setReportIds(const std::vector<std::string> &reportIds) {
+  reportIds_ = reportIds;
+}
+
+std::string DeleteDiagnosticReportsRequest::getRegionId() const {
+  return regionId_;
+}
+
+void DeleteDiagnosticReportsRequest::setRegionId(const std::string &regionId) {
+  regionId_ = regionId;
+  setParameter(std::string("RegionId"), regionId);
+}
+

ecs/src/model/DeleteDiagnosticReportsResult.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/ecs/model/DeleteDiagnosticReportsResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Ecs;
+using namespace AlibabaCloud::Ecs::Model;
+
+DeleteDiagnosticReportsResult::DeleteDiagnosticReportsResult() :
+	ServiceResult()
+{}
+
+DeleteDiagnosticReportsResult::DeleteDiagnosticReportsResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+DeleteDiagnosticReportsResult::~DeleteDiagnosticReportsResult()
+{}
+
+void DeleteDiagnosticReportsResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+
+}
+

ecs/src/model/DescribeCommandsRequest.cc

@@ -106,6 +106,20 @@ void DescribeCommandsRequest::setPageSize(long pageSize) {
   setParameter(std::string("PageSize"), std::to_string(pageSize));
 }
 
+std::vector<DescribeCommandsRequest::Tag> DescribeCommandsRequest::getTag() const {
+  return tag_;
+}
+
+void DescribeCommandsRequest::setTag(const std::vector<DescribeCommandsRequest::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 + ".Key", tagObj.key);
+    setParameter(tagObjStr + ".Value", tagObj.value);
+  }
+}
+
 bool DescribeCommandsRequest::getLatest() const {
   return latest_;
 }

ecs/src/model/DescribeCommandsResult.cc

@@ -88,6 +88,16 @@ void DescribeCommandsResult::parse(const std::string &payload)
 				parameterDefinitionsObject.possibleValues.push_back(value.asString());
 			commandsObject.parameterDefinitions.push_back(parameterDefinitionsObject);
 		}
+		auto allTagsNode = valueCommandsCommand["Tags"]["Tag"];
+		for (auto valueCommandsCommandTagsTag : allTagsNode)
+		{
+			Command::Tag tagsObject;
+			if(!valueCommandsCommandTagsTag["TagKey"].isNull())
+				tagsObject.tagKey = valueCommandsCommandTagsTag["TagKey"].asString();
+			if(!valueCommandsCommandTagsTag["TagValue"].isNull())
+				tagsObject.tagValue = valueCommandsCommandTagsTag["TagValue"].asString();
+			commandsObject.tags.push_back(tagsObject);
+		}
 		auto allParameterNames = value["ParameterNames"]["ParameterName"];
 		for (auto value : allParameterNames)
 			commandsObject.parameterNames.push_back(value.asString());

ecs/src/model/DescribeDiagnosticMetricSetsRequest.cc

@@ -0,0 +1,80 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/ecs/model/DescribeDiagnosticMetricSetsRequest.h>
+
+using AlibabaCloud::Ecs::Model::DescribeDiagnosticMetricSetsRequest;
+
+DescribeDiagnosticMetricSetsRequest::DescribeDiagnosticMetricSetsRequest()
+    : RpcServiceRequest("ecs", "2014-05-26", "DescribeDiagnosticMetricSets") {
+  setMethod(HttpRequest::Method::Post);
+}
+
+DescribeDiagnosticMetricSetsRequest::~DescribeDiagnosticMetricSetsRequest() {}
+
+std::vector<std::string> DescribeDiagnosticMetricSetsRequest::getMetricSetIds() const {
+  return metricSetIds_;
+}
+
+void DescribeDiagnosticMetricSetsRequest::setMetricSetIds(const std::vector<std::string> &metricSetIds) {
+  metricSetIds_ = metricSetIds;
+}
+
+std::string DescribeDiagnosticMetricSetsRequest::getType() const {
+  return type_;
+}
+
+void DescribeDiagnosticMetricSetsRequest::setType(const std::string &type) {
+  type_ = type;
+  setParameter(std::string("Type"), type);
+}
+
+std::string DescribeDiagnosticMetricSetsRequest::getRegionId() const {
+  return regionId_;
+}
+
+void DescribeDiagnosticMetricSetsRequest::setRegionId(const std::string &regionId) {
+  regionId_ = regionId;
+  setParameter(std::string("RegionId"), regionId);
+}
+
+std::string DescribeDiagnosticMetricSetsRequest::getNextToken() const {
+  return nextToken_;
+}
+
+void DescribeDiagnosticMetricSetsRequest::setNextToken(const std::string &nextToken) {
+  nextToken_ = nextToken;
+  setParameter(std::string("NextToken"), nextToken);
+}
+
+std::string DescribeDiagnosticMetricSetsRequest::getResourceType() const {
+  return resourceType_;
+}
+
+void DescribeDiagnosticMetricSetsRequest::setResourceType(const std::string &resourceType) {
+  resourceType_ = resourceType;
+  setParameter(std::string("ResourceType"), resourceType);
+}
+
+int DescribeDiagnosticMetricSetsRequest::getMaxResults() const {
+  return maxResults_;
+}
+
+void DescribeDiagnosticMetricSetsRequest::setMaxResults(int maxResults) {
+  maxResults_ = maxResults;
+  setParameter(std::string("MaxResults"), std::to_string(maxResults));
+}
+

ecs/src/model/DescribeDiagnosticMetricSetsResult.cc

@@ -0,0 +1,75 @@
+/*
+ * 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/ecs/model/DescribeDiagnosticMetricSetsResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Ecs;
+using namespace AlibabaCloud::Ecs::Model;
+
+DescribeDiagnosticMetricSetsResult::DescribeDiagnosticMetricSetsResult() :
+	ServiceResult()
+{}
+
+DescribeDiagnosticMetricSetsResult::DescribeDiagnosticMetricSetsResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+DescribeDiagnosticMetricSetsResult::~DescribeDiagnosticMetricSetsResult()
+{}
+
+void DescribeDiagnosticMetricSetsResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	auto allMetricSetsNode = value["MetricSets"]["MetricSet"];
+	for (auto valueMetricSetsMetricSet : allMetricSetsNode)
+	{
+		MetricSet metricSetsObject;
+		if(!valueMetricSetsMetricSet["MetricSetId"].isNull())
+			metricSetsObject.metricSetId = valueMetricSetsMetricSet["MetricSetId"].asString();
+		if(!valueMetricSetsMetricSet["MetricSetName"].isNull())
+			metricSetsObject.metricSetName = valueMetricSetsMetricSet["MetricSetName"].asString();
+		if(!valueMetricSetsMetricSet["Description"].isNull())
+			metricSetsObject.description = valueMetricSetsMetricSet["Description"].asString();
+		if(!valueMetricSetsMetricSet["Type"].isNull())
+			metricSetsObject.type = valueMetricSetsMetricSet["Type"].asString();
+		if(!valueMetricSetsMetricSet["ResourceType"].isNull())
+			metricSetsObject.resourceType = valueMetricSetsMetricSet["ResourceType"].asString();
+		auto allMetricIds = value["MetricIds"]["MetricId"];
+		for (auto value : allMetricIds)
+			metricSetsObject.metricIds.push_back(value.asString());
+		metricSets_.push_back(metricSetsObject);
+	}
+	if(!value["NextToken"].isNull())
+		nextToken_ = value["NextToken"].asString();
+
+}
+
+std::string DescribeDiagnosticMetricSetsResult::getNextToken()const
+{
+	return nextToken_;
+}
+
+std::vector<DescribeDiagnosticMetricSetsResult::MetricSet> DescribeDiagnosticMetricSetsResult::getMetricSets()const
+{
+	return metricSets_;
+}
+

ecs/src/model/DescribeDiagnosticMetricsRequest.cc

@@ -0,0 +1,71 @@
+/*
+ * 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/ecs/model/DescribeDiagnosticMetricsRequest.h>
+
+using AlibabaCloud::Ecs::Model::DescribeDiagnosticMetricsRequest;
+
+DescribeDiagnosticMetricsRequest::DescribeDiagnosticMetricsRequest()
+    : RpcServiceRequest("ecs", "2014-05-26", "DescribeDiagnosticMetrics") {
+  setMethod(HttpRequest::Method::Post);
+}
+
+DescribeDiagnosticMetricsRequest::~DescribeDiagnosticMetricsRequest() {}
+
+std::vector<std::string> DescribeDiagnosticMetricsRequest::getMetricIds() const {
+  return metricIds_;
+}
+
+void DescribeDiagnosticMetricsRequest::setMetricIds(const std::vector<std::string> &metricIds) {
+  metricIds_ = metricIds;
+}
+
+std::string DescribeDiagnosticMetricsRequest::getResourceType() const {
+  return resourceType_;
+}
+
+void DescribeDiagnosticMetricsRequest::setResourceType(const std::string &resourceType) {
+  resourceType_ = resourceType;
+  setParameter(std::string("ResourceType"), resourceType);
+}
+
+std::string DescribeDiagnosticMetricsRequest::getRegionId() const {
+  return regionId_;
+}
+
+void DescribeDiagnosticMetricsRequest::setRegionId(const std::string &regionId) {
+  regionId_ = regionId;
+  setParameter(std::string("RegionId"), regionId);
+}
+
+std::string DescribeDiagnosticMetricsRequest::getNextToken() const {
+  return nextToken_;
+}
+
+void DescribeDiagnosticMetricsRequest::setNextToken(const std::string &nextToken) {
+  nextToken_ = nextToken;
+  setParameter(std::string("NextToken"), nextToken);
+}
+
+int DescribeDiagnosticMetricsRequest::getMaxResults() const {
+  return maxResults_;
+}
+
+void DescribeDiagnosticMetricsRequest::setMaxResults(int maxResults) {
+  maxResults_ = maxResults;
+  setParameter(std::string("MaxResults"), std::to_string(maxResults));
+}
+

ecs/src/model/DescribeDiagnosticMetricsResult.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/ecs/model/DescribeDiagnosticMetricsResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Ecs;
+using namespace AlibabaCloud::Ecs::Model;
+
+DescribeDiagnosticMetricsResult::DescribeDiagnosticMetricsResult() :
+	ServiceResult()
+{}
+
+DescribeDiagnosticMetricsResult::DescribeDiagnosticMetricsResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+DescribeDiagnosticMetricsResult::~DescribeDiagnosticMetricsResult()
+{}
+
+void DescribeDiagnosticMetricsResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	auto allMetricsNode = value["Metrics"]["Metric"];
+	for (auto valueMetricsMetric : allMetricsNode)
+	{
+		Metric metricsObject;
+		if(!valueMetricsMetric["MetricId"].isNull())
+			metricsObject.metricId = valueMetricsMetric["MetricId"].asString();
+		if(!valueMetricsMetric["MetricName"].isNull())
+			metricsObject.metricName = valueMetricsMetric["MetricName"].asString();
+		if(!valueMetricsMetric["MetricCategory"].isNull())
+			metricsObject.metricCategory = valueMetricsMetric["MetricCategory"].asString();
+		if(!valueMetricsMetric["Description"].isNull())
+			metricsObject.description = valueMetricsMetric["Description"].asString();
+		if(!valueMetricsMetric["ResourceType"].isNull())
+			metricsObject.resourceType = valueMetricsMetric["ResourceType"].asString();
+		if(!valueMetricsMetric["GuestMetric"].isNull())
+			metricsObject.guestMetric = valueMetricsMetric["GuestMetric"].asString() == "true";
+		if(!valueMetricsMetric["SupportedOperatingSystem"].isNull())
+			metricsObject.supportedOperatingSystem = valueMetricsMetric["SupportedOperatingSystem"].asString();
+		metrics_.push_back(metricsObject);
+	}
+	if(!value["NextToken"].isNull())
+		nextToken_ = value["NextToken"].asString();
+
+}
+
+std::vector<DescribeDiagnosticMetricsResult::Metric> DescribeDiagnosticMetricsResult::getMetrics()const
+{
+	return metrics_;
+}
+
+std::string DescribeDiagnosticMetricsResult::getNextToken()const
+{
+	return nextToken_;
+}
+

ecs/src/model/DescribeDiagnosticReportsRequest.cc

@@ -0,0 +1,88 @@
+/*
+ * 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/ecs/model/DescribeDiagnosticReportsRequest.h>
+
+using AlibabaCloud::Ecs::Model::DescribeDiagnosticReportsRequest;
+
+DescribeDiagnosticReportsRequest::DescribeDiagnosticReportsRequest()
+    : RpcServiceRequest("ecs", "2014-05-26", "DescribeDiagnosticReports") {
+  setMethod(HttpRequest::Method::Post);
+}
+
+DescribeDiagnosticReportsRequest::~DescribeDiagnosticReportsRequest() {}
+
+std::string DescribeDiagnosticReportsRequest::getRegionId() const {
+  return regionId_;
+}
+
+void DescribeDiagnosticReportsRequest::setRegionId(const std::string &regionId) {
+  regionId_ = regionId;
+  setParameter(std::string("RegionId"), regionId);
+}
+
+std::string DescribeDiagnosticReportsRequest::getNextToken() const {
+  return nextToken_;
+}
+
+void DescribeDiagnosticReportsRequest::setNextToken(const std::string &nextToken) {
+  nextToken_ = nextToken;
+  setParameter(std::string("NextToken"), nextToken);
+}
+
+std::string DescribeDiagnosticReportsRequest::getSeverity() const {
+  return severity_;
+}
+
+void DescribeDiagnosticReportsRequest::setSeverity(const std::string &severity) {
+  severity_ = severity;
+  setParameter(std::string("Severity"), severity);
+}
+
+std::vector<std::string> DescribeDiagnosticReportsRequest::getReportIds() const {
+  return reportIds_;
+}
+
+void DescribeDiagnosticReportsRequest::setReportIds(const std::vector<std::string> &reportIds) {
+  reportIds_ = reportIds;
+}
+
+int DescribeDiagnosticReportsRequest::getMaxResults() const {
+  return maxResults_;
+}
+
+void DescribeDiagnosticReportsRequest::setMaxResults(int maxResults) {
+  maxResults_ = maxResults;
+  setParameter(std::string("MaxResults"), std::to_string(maxResults));
+}
+
+std::string DescribeDiagnosticReportsRequest::getStatus() const {
+  return status_;
+}
+
+void DescribeDiagnosticReportsRequest::setStatus(const std::string &status) {
+  status_ = status;
+  setParameter(std::string("Status"), status);
+}
+
+std::vector<std::string> DescribeDiagnosticReportsRequest::getResourceIds() const {
+  return resourceIds_;
+}
+
+void DescribeDiagnosticReportsRequest::setResourceIds(const std::vector<std::string> &resourceIds) {
+  resourceIds_ = resourceIds;
+}
+

ecs/src/model/DescribeDiagnosticReportsResult.cc

@@ -0,0 +1,96 @@
+/*
+ * 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/ecs/model/DescribeDiagnosticReportsResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Ecs;
+using namespace AlibabaCloud::Ecs::Model;
+
+DescribeDiagnosticReportsResult::DescribeDiagnosticReportsResult() :
+	ServiceResult()
+{}
+
+DescribeDiagnosticReportsResult::DescribeDiagnosticReportsResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+DescribeDiagnosticReportsResult::~DescribeDiagnosticReportsResult()
+{}
+
+void DescribeDiagnosticReportsResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	auto allReportsNode = value["Reports"]["Report"];
+	for (auto valueReportsReport : allReportsNode)
+	{
+		Report reportsObject;
+		if(!valueReportsReport["ResourceId"].isNull())
+			reportsObject.resourceId = valueReportsReport["ResourceId"].asString();
+		if(!valueReportsReport["ResourceType"].isNull())
+			reportsObject.resourceType = valueReportsReport["ResourceType"].asString();
+		if(!valueReportsReport["MetricSetId"].isNull())
+			reportsObject.metricSetId = valueReportsReport["MetricSetId"].asString();
+		if(!valueReportsReport["StartTime"].isNull())
+			reportsObject.startTime = valueReportsReport["StartTime"].asString();
+		if(!valueReportsReport["EndTime"].isNull())
+			reportsObject.endTime = valueReportsReport["EndTime"].asString();
+		if(!valueReportsReport["ReportId"].isNull())
+			reportsObject.reportId = valueReportsReport["ReportId"].asString();
+		if(!valueReportsReport["Status"].isNull())
+			reportsObject.status = valueReportsReport["Status"].asString();
+		if(!valueReportsReport["CreationTime"].isNull())
+			reportsObject.creationTime = valueReportsReport["CreationTime"].asString();
+		if(!valueReportsReport["FinishedTime"].isNull())
+			reportsObject.finishedTime = valueReportsReport["FinishedTime"].asString();
+		if(!valueReportsReport["Severity"].isNull())
+			reportsObject.severity = valueReportsReport["Severity"].asString();
+		auto allIssuesNode = valueReportsReport["Issues"]["Issue"];
+		for (auto valueReportsReportIssuesIssue : allIssuesNode)
+		{
+			Report::Issue issuesObject;
+			if(!valueReportsReportIssuesIssue["MetricId"].isNull())
+				issuesObject.metricId = valueReportsReportIssuesIssue["MetricId"].asString();
+			if(!valueReportsReportIssuesIssue["MetricCategory"].isNull())
+				issuesObject.metricCategory = valueReportsReportIssuesIssue["MetricCategory"].asString();
+			if(!valueReportsReportIssuesIssue["IssueId"].isNull())
+				issuesObject.issueId = valueReportsReportIssuesIssue["IssueId"].asString();
+			if(!valueReportsReportIssuesIssue["Severity"].isNull())
+				issuesObject.severity = valueReportsReportIssuesIssue["Severity"].asString();
+			reportsObject.issues.push_back(issuesObject);
+		}
+		reports_.push_back(reportsObject);
+	}
+	if(!value["NextToken"].isNull())
+		nextToken_ = value["NextToken"].asString();
+
+}
+
+std::string DescribeDiagnosticReportsResult::getNextToken()const
+{
+	return nextToken_;
+}
+
+std::vector<DescribeDiagnosticReportsResult::Report> DescribeDiagnosticReportsResult::getReports()const
+{
+	return reports_;
+}
+

ecs/src/model/DescribeInvocationResultsRequest.cc

@@ -79,6 +79,20 @@ void DescribeInvocationResultsRequest::setPageSize(long pageSize) {
   setParameter(std::string("PageSize"), std::to_string(pageSize));
 }
 
+std::vector<DescribeInvocationResultsRequest::Tag> DescribeInvocationResultsRequest::getTag() const {
+  return tag_;
+}
+
+void DescribeInvocationResultsRequest::setTag(const std::vector<DescribeInvocationResultsRequest::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 + ".Key", tagObj.key);
+    setParameter(tagObjStr + ".Value", tagObj.value);
+  }
+}
+
 std::string DescribeInvocationResultsRequest::getInvokeId() const {
   return invokeId_;
 }

ecs/src/model/DescribeInvocationResultsResult.cc

@@ -80,6 +80,16 @@ void DescribeInvocationResultsResult::parse(const std::string &payload)
 			invocationResultObject.invokeRecordStatus = invocationNodeInvocationResultsInvocationResult["InvokeRecordStatus"].asString();
 		if(!invocationNodeInvocationResultsInvocationResult["Username"].isNull())
 			invocationResultObject.username = invocationNodeInvocationResultsInvocationResult["Username"].asString();
+		auto allTagsNode = invocationNodeInvocationResultsInvocationResult["Tags"]["Tag"];
+		for (auto invocationNodeInvocationResultsInvocationResultTagsTag : allTagsNode)
+		{
+			Invocation::InvocationResult::Tag tagsObject;
+			if(!invocationNodeInvocationResultsInvocationResultTagsTag["TagKey"].isNull())
+				tagsObject.tagKey = invocationNodeInvocationResultsInvocationResultTagsTag["TagKey"].asString();
+			if(!invocationNodeInvocationResultsInvocationResultTagsTag["TagValue"].isNull())
+				tagsObject.tagValue = invocationNodeInvocationResultsInvocationResultTagsTag["TagValue"].asString();
+			invocationResultObject.tags.push_back(tagsObject);
+		}
 		invocation_.invocationResults.push_back(invocationResultObject);
 	}
 

ecs/src/model/DescribeInvocationsRequest.cc

@@ -106,6 +106,20 @@ void DescribeInvocationsRequest::setPageSize(long pageSize) {
   setParameter(std::string("PageSize"), std::to_string(pageSize));
 }
 
+std::vector<DescribeInvocationsRequest::Tag> DescribeInvocationsRequest::getTag() const {
+  return tag_;
+}
+
+void DescribeInvocationsRequest::setTag(const std::vector<DescribeInvocationsRequest::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 + ".Key", tagObj.key);
+    setParameter(tagObjStr + ".Value", tagObj.value);
+  }
+}
+
 std::string DescribeInvocationsRequest::getInvokeId() const {
   return invokeId_;
 }

ecs/src/model/DescribeInvocationsResult.cc

@@ -111,6 +111,16 @@ void DescribeInvocationsResult::parse(const std::string &payload)
 				invokeInstancesObject.instanceInvokeStatus = valueInvocationsInvocationInvokeInstancesInvokeInstance["InstanceInvokeStatus"].asString();
 			invocationsObject.invokeInstances.push_back(invokeInstancesObject);
 		}
+		auto allTagsNode = valueInvocationsInvocation["Tags"]["Tag"];
+		for (auto valueInvocationsInvocationTagsTag : allTagsNode)
+		{
+			Invocation::Tag tagsObject;
+			if(!valueInvocationsInvocationTagsTag["TagKey"].isNull())
+				tagsObject.tagKey = valueInvocationsInvocationTagsTag["TagKey"].asString();
+			if(!valueInvocationsInvocationTagsTag["TagValue"].isNull())
+				tagsObject.tagValue = valueInvocationsInvocationTagsTag["TagValue"].asString();
+			invocationsObject.tags.push_back(tagsObject);
+		}
 		invocations_.push_back(invocationsObject);
 	}
 	if(!value["PageSize"].isNull())

ecs/src/model/ModifyDiagnosticMetricSetRequest.cc

@@ -0,0 +1,80 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/ecs/model/ModifyDiagnosticMetricSetRequest.h>
+
+using AlibabaCloud::Ecs::Model::ModifyDiagnosticMetricSetRequest;
+
+ModifyDiagnosticMetricSetRequest::ModifyDiagnosticMetricSetRequest()
+    : RpcServiceRequest("ecs", "2014-05-26", "ModifyDiagnosticMetricSet") {
+  setMethod(HttpRequest::Method::Post);
+}
+
+ModifyDiagnosticMetricSetRequest::~ModifyDiagnosticMetricSetRequest() {}
+
+std::vector<std::string> ModifyDiagnosticMetricSetRequest::getMetricIds() const {
+  return metricIds_;
+}
+
+void ModifyDiagnosticMetricSetRequest::setMetricIds(const std::vector<std::string> &metricIds) {
+  metricIds_ = metricIds;
+}
+
+std::string ModifyDiagnosticMetricSetRequest::getMetricSetId() const {
+  return metricSetId_;
+}
+
+void ModifyDiagnosticMetricSetRequest::setMetricSetId(const std::string &metricSetId) {
+  metricSetId_ = metricSetId;
+  setParameter(std::string("MetricSetId"), metricSetId);
+}
+
+std::string ModifyDiagnosticMetricSetRequest::getDescription() const {
+  return description_;
+}
+
+void ModifyDiagnosticMetricSetRequest::setDescription(const std::string &description) {
+  description_ = description;
+  setParameter(std::string("Description"), description);
+}
+
+std::string ModifyDiagnosticMetricSetRequest::getMetricSetName() const {
+  return metricSetName_;
+}
+
+void ModifyDiagnosticMetricSetRequest::setMetricSetName(const std::string &metricSetName) {
+  metricSetName_ = metricSetName;
+  setParameter(std::string("MetricSetName"), metricSetName);
+}
+
+std::string ModifyDiagnosticMetricSetRequest::getRegionId() const {
+  return regionId_;
+}
+
+void ModifyDiagnosticMetricSetRequest::setRegionId(const std::string &regionId) {
+  regionId_ = regionId;
+  setParameter(std::string("RegionId"), regionId);
+}
+
+std::string ModifyDiagnosticMetricSetRequest::getResourceType() const {
+  return resourceType_;
+}
+
+void ModifyDiagnosticMetricSetRequest::setResourceType(const std::string &resourceType) {
+  resourceType_ = resourceType;
+  setParameter(std::string("ResourceType"), resourceType);
+}
+

ecs/src/model/ModifyDiagnosticMetricSetResult.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/ecs/model/ModifyDiagnosticMetricSetResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Ecs;
+using namespace AlibabaCloud::Ecs::Model;
+
+ModifyDiagnosticMetricSetResult::ModifyDiagnosticMetricSetResult() :
+	ServiceResult()
+{}
+
+ModifyDiagnosticMetricSetResult::ModifyDiagnosticMetricSetResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+ModifyDiagnosticMetricSetResult::~ModifyDiagnosticMetricSetResult()
+{}
+
+void ModifyDiagnosticMetricSetResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+
+}
+

ecs/src/model/ModifySecurityGroupEgressRuleRequest.cc

@@ -97,6 +97,15 @@ void ModifySecurityGroupEgressRuleRequest::setRegionId(const std::string &region
   setParameter(std::string("RegionId"), regionId);
 }
 
+std::string ModifySecurityGroupEgressRuleRequest::getPolicy() const {
+  return policy_;
+}
+
+void ModifySecurityGroupEgressRuleRequest::setPolicy(const std::string &policy) {
+  policy_ = policy;
+  setParameter(std::string("Policy"), policy);
+}
+
 std::string ModifySecurityGroupEgressRuleRequest::getIpv6DestCidrIp() const {
   return ipv6DestCidrIp_;
 }
@@ -115,15 +124,6 @@ void ModifySecurityGroupEgressRuleRequest::setIpv6SourceCidrIp(const std::string
   setParameter(std::string("Ipv6SourceCidrIp"), ipv6SourceCidrIp);
 }
 
-std::string ModifySecurityGroupEgressRuleRequest::getPolicy() const {
-  return policy_;
-}
-
-void ModifySecurityGroupEgressRuleRequest::setPolicy(const std::string &policy) {
-  policy_ = policy;
-  setParameter(std::string("Policy"), policy);
-}
-
 std::string ModifySecurityGroupEgressRuleRequest::getPortRange() const {
   return portRange_;
 }
@@ -187,15 +187,6 @@ void ModifySecurityGroupEgressRuleRequest::setOwnerId(long ownerId) {
   setParameter(std::string("OwnerId"), std::to_string(ownerId));
 }
 
-std::string ModifySecurityGroupEgressRuleRequest::getDestGroupOwnerAccount() const {
-  return destGroupOwnerAccount_;
-}
-
-void ModifySecurityGroupEgressRuleRequest::setDestGroupOwnerAccount(const std::string &destGroupOwnerAccount) {
-  destGroupOwnerAccount_ = destGroupOwnerAccount;
-  setParameter(std::string("DestGroupOwnerAccount"), destGroupOwnerAccount);
-}
-
 std::string ModifySecurityGroupEgressRuleRequest::getPriority() const {
   return priority_;
 }
@@ -205,6 +196,15 @@ void ModifySecurityGroupEgressRuleRequest::setPriority(const std::string &priori
   setParameter(std::string("Priority"), priority);
 }
 
+std::string ModifySecurityGroupEgressRuleRequest::getDestGroupOwnerAccount() const {
+  return destGroupOwnerAccount_;
+}
+
+void ModifySecurityGroupEgressRuleRequest::setDestGroupOwnerAccount(const std::string &destGroupOwnerAccount) {
+  destGroupOwnerAccount_ = destGroupOwnerAccount;
+  setParameter(std::string("DestGroupOwnerAccount"), destGroupOwnerAccount);
+}
+
 std::string ModifySecurityGroupEgressRuleRequest::getDestCidrIp() const {
   return destCidrIp_;
 }

ecs/src/model/ModifySecurityGroupRuleRequest.cc

@@ -115,6 +115,15 @@ void ModifySecurityGroupRuleRequest::setRegionId(const std::string &regionId) {
   setParameter(std::string("RegionId"), regionId);
 }
 
+std::string ModifySecurityGroupRuleRequest::getPolicy() const {
+  return policy_;
+}
+
+void ModifySecurityGroupRuleRequest::setPolicy(const std::string &policy) {
+  policy_ = policy;
+  setParameter(std::string("Policy"), policy);
+}
+
 std::string ModifySecurityGroupRuleRequest::getIpv6SourceCidrIp() const {
   return ipv6SourceCidrIp_;
 }
@@ -133,15 +142,6 @@ void ModifySecurityGroupRuleRequest::setIpv6DestCidrIp(const std::string &ipv6De
   setParameter(std::string("Ipv6DestCidrIp"), ipv6DestCidrIp);
 }
 
-std::string ModifySecurityGroupRuleRequest::getPolicy() const {
-  return policy_;
-}
-
-void ModifySecurityGroupRuleRequest::setPolicy(const std::string &policy) {
-  policy_ = policy;
-  setParameter(std::string("Policy"), policy);
-}
-
 std::string ModifySecurityGroupRuleRequest::getPortRange() const {
   return portRange_;
 }

ecs/src/model/RunCommandRequest.cc

@@ -124,6 +124,20 @@ void RunCommandRequest::setWindowsPasswordName(const std::string &windowsPasswor
   setParameter(std::string("WindowsPasswordName"), windowsPasswordName);
 }
 
+std::vector<RunCommandRequest::Tag> RunCommandRequest::getTag() const {
+  return tag_;
+}
+
+void RunCommandRequest::setTag(const std::vector<RunCommandRequest::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 + ".Key", tagObj.key);
+    setParameter(tagObjStr + ".Value", tagObj.value);
+  }
+}
+
 bool RunCommandRequest::getKeepCommand() const {
   return keepCommand_;
 }

kms/CMakeLists.txt

@@ -71,16 +71,12 @@ set(kms_public_header_model
 	include/alibabacloud/kms/model/DescribeRegionsResult.h
 	include/alibabacloud/kms/model/DescribeSecretRequest.h
 	include/alibabacloud/kms/model/DescribeSecretResult.h
-	include/alibabacloud/kms/model/DescribeServiceRequest.h
-	include/alibabacloud/kms/model/DescribeServiceResult.h
 	include/alibabacloud/kms/model/DisableKeyRequest.h
 	include/alibabacloud/kms/model/DisableKeyResult.h
 	include/alibabacloud/kms/model/EnableKeyRequest.h
 	include/alibabacloud/kms/model/EnableKeyResult.h
 	include/alibabacloud/kms/model/EncryptRequest.h
 	include/alibabacloud/kms/model/EncryptResult.h
-	include/alibabacloud/kms/model/ExportCertificateRequest.h
-	include/alibabacloud/kms/model/ExportCertificateResult.h
 	include/alibabacloud/kms/model/ExportDataKeyRequest.h
 	include/alibabacloud/kms/model/ExportDataKeyResult.h
 	include/alibabacloud/kms/model/GenerateAndExportDataKeyRequest.h
@@ -99,18 +95,12 @@ set(kms_public_header_model
 	include/alibabacloud/kms/model/GetRandomPasswordResult.h
 	include/alibabacloud/kms/model/GetSecretValueRequest.h
 	include/alibabacloud/kms/model/GetSecretValueResult.h
-	include/alibabacloud/kms/model/ImportCertificateRequest.h
-	include/alibabacloud/kms/model/ImportCertificateResult.h
-	include/alibabacloud/kms/model/ImportEncryptionCertificateRequest.h
-	include/alibabacloud/kms/model/ImportEncryptionCertificateResult.h
 	include/alibabacloud/kms/model/ImportKeyMaterialRequest.h
 	include/alibabacloud/kms/model/ImportKeyMaterialResult.h
 	include/alibabacloud/kms/model/ListAliasesRequest.h
 	include/alibabacloud/kms/model/ListAliasesResult.h
 	include/alibabacloud/kms/model/ListAliasesByKeyIdRequest.h
 	include/alibabacloud/kms/model/ListAliasesByKeyIdResult.h
-	include/alibabacloud/kms/model/ListCertificatesRequest.h
-	include/alibabacloud/kms/model/ListCertificatesResult.h
 	include/alibabacloud/kms/model/ListKeyVersionsRequest.h
 	include/alibabacloud/kms/model/ListKeyVersionsResult.h
 	include/alibabacloud/kms/model/ListKeysRequest.h
@@ -208,16 +198,12 @@ set(kms_src
 	src/model/DescribeRegionsResult.cc
 	src/model/DescribeSecretRequest.cc
 	src/model/DescribeSecretResult.cc
-	src/model/DescribeServiceRequest.cc
-	src/model/DescribeServiceResult.cc
 	src/model/DisableKeyRequest.cc
 	src/model/DisableKeyResult.cc
 	src/model/EnableKeyRequest.cc
 	src/model/EnableKeyResult.cc
 	src/model/EncryptRequest.cc
 	src/model/EncryptResult.cc
-	src/model/ExportCertificateRequest.cc
-	src/model/ExportCertificateResult.cc
 	src/model/ExportDataKeyRequest.cc
 	src/model/ExportDataKeyResult.cc
 	src/model/GenerateAndExportDataKeyRequest.cc
@@ -236,18 +222,12 @@ set(kms_src
 	src/model/GetRandomPasswordResult.cc
 	src/model/GetSecretValueRequest.cc
 	src/model/GetSecretValueResult.cc
-	src/model/ImportCertificateRequest.cc
-	src/model/ImportCertificateResult.cc
-	src/model/ImportEncryptionCertificateRequest.cc
-	src/model/ImportEncryptionCertificateResult.cc
 	src/model/ImportKeyMaterialRequest.cc
 	src/model/ImportKeyMaterialResult.cc
 	src/model/ListAliasesRequest.cc
 	src/model/ListAliasesResult.cc
 	src/model/ListAliasesByKeyIdRequest.cc
 	src/model/ListAliasesByKeyIdResult.cc
-	src/model/ListCertificatesRequest.cc
-	src/model/ListCertificatesResult.cc
 	src/model/ListKeyVersionsRequest.cc
 	src/model/ListKeyVersionsResult.cc
 	src/model/ListKeysRequest.cc

kms/include/alibabacloud/kms/KmsClient.h

@@ -72,16 +72,12 @@
 #include "model/DescribeRegionsResult.h"
 #include "model/DescribeSecretRequest.h"
 #include "model/DescribeSecretResult.h"
-#include "model/DescribeServiceRequest.h"
-#include "model/DescribeServiceResult.h"
 #include "model/DisableKeyRequest.h"
 #include "model/DisableKeyResult.h"
 #include "model/EnableKeyRequest.h"
 #include "model/EnableKeyResult.h"
 #include "model/EncryptRequest.h"
 #include "model/EncryptResult.h"
-#include "model/ExportCertificateRequest.h"
-#include "model/ExportCertificateResult.h"
 #include "model/ExportDataKeyRequest.h"
 #include "model/ExportDataKeyResult.h"
 #include "model/GenerateAndExportDataKeyRequest.h"
@@ -100,18 +96,12 @@
 #include "model/GetRandomPasswordResult.h"
 #include "model/GetSecretValueRequest.h"
 #include "model/GetSecretValueResult.h"
-#include "model/ImportCertificateRequest.h"
-#include "model/ImportCertificateResult.h"
-#include "model/ImportEncryptionCertificateRequest.h"
-#include "model/ImportEncryptionCertificateResult.h"
 #include "model/ImportKeyMaterialRequest.h"
 #include "model/ImportKeyMaterialResult.h"
 #include "model/ListAliasesRequest.h"
 #include "model/ListAliasesResult.h"
 #include "model/ListAliasesByKeyIdRequest.h"
 #include "model/ListAliasesByKeyIdResult.h"
-#include "model/ListCertificatesRequest.h"
-#include "model/ListCertificatesResult.h"
 #include "model/ListKeyVersionsRequest.h"
 #include "model/ListKeyVersionsResult.h"
 #include "model/ListKeysRequest.h"
@@ -240,9 +230,6 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DescribeSecretResult> DescribeSecretOutcome;
 			typedef std::future<DescribeSecretOutcome> DescribeSecretOutcomeCallable;
 			typedef std::function<void(const KmsClient*, const Model::DescribeSecretRequest&, const DescribeSecretOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeSecretAsyncHandler;
-			typedef Outcome<Error, Model::DescribeServiceResult> DescribeServiceOutcome;
-			typedef std::future<DescribeServiceOutcome> DescribeServiceOutcomeCallable;
-			typedef std::function<void(const KmsClient*, const Model::DescribeServiceRequest&, const DescribeServiceOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeServiceAsyncHandler;
 			typedef Outcome<Error, Model::DisableKeyResult> DisableKeyOutcome;
 			typedef std::future<DisableKeyOutcome> DisableKeyOutcomeCallable;
 			typedef std::function<void(const KmsClient*, const Model::DisableKeyRequest&, const DisableKeyOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DisableKeyAsyncHandler;
@@ -252,9 +239,6 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::EncryptResult> EncryptOutcome;
 			typedef std::future<EncryptOutcome> EncryptOutcomeCallable;
 			typedef std::function<void(const KmsClient*, const Model::EncryptRequest&, const EncryptOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> EncryptAsyncHandler;
-			typedef Outcome<Error, Model::ExportCertificateResult> ExportCertificateOutcome;
-			typedef std::future<ExportCertificateOutcome> ExportCertificateOutcomeCallable;
-			typedef std::function<void(const KmsClient*, const Model::ExportCertificateRequest&, const ExportCertificateOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ExportCertificateAsyncHandler;
 			typedef Outcome<Error, Model::ExportDataKeyResult> ExportDataKeyOutcome;
 			typedef std::future<ExportDataKeyOutcome> ExportDataKeyOutcomeCallable;
 			typedef std::function<void(const KmsClient*, const Model::ExportDataKeyRequest&, const ExportDataKeyOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ExportDataKeyAsyncHandler;
@@ -282,12 +266,6 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::GetSecretValueResult> GetSecretValueOutcome;
 			typedef std::future<GetSecretValueOutcome> GetSecretValueOutcomeCallable;
 			typedef std::function<void(const KmsClient*, const Model::GetSecretValueRequest&, const GetSecretValueOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> GetSecretValueAsyncHandler;
-			typedef Outcome<Error, Model::ImportCertificateResult> ImportCertificateOutcome;
-			typedef std::future<ImportCertificateOutcome> ImportCertificateOutcomeCallable;
-			typedef std::function<void(const KmsClient*, const Model::ImportCertificateRequest&, const ImportCertificateOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ImportCertificateAsyncHandler;
-			typedef Outcome<Error, Model::ImportEncryptionCertificateResult> ImportEncryptionCertificateOutcome;
-			typedef std::future<ImportEncryptionCertificateOutcome> ImportEncryptionCertificateOutcomeCallable;
-			typedef std::function<void(const KmsClient*, const Model::ImportEncryptionCertificateRequest&, const ImportEncryptionCertificateOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ImportEncryptionCertificateAsyncHandler;
 			typedef Outcome<Error, Model::ImportKeyMaterialResult> ImportKeyMaterialOutcome;
 			typedef std::future<ImportKeyMaterialOutcome> ImportKeyMaterialOutcomeCallable;
 			typedef std::function<void(const KmsClient*, const Model::ImportKeyMaterialRequest&, const ImportKeyMaterialOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ImportKeyMaterialAsyncHandler;
@@ -297,9 +275,6 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::ListAliasesByKeyIdResult> ListAliasesByKeyIdOutcome;
 			typedef std::future<ListAliasesByKeyIdOutcome> ListAliasesByKeyIdOutcomeCallable;
 			typedef std::function<void(const KmsClient*, const Model::ListAliasesByKeyIdRequest&, const ListAliasesByKeyIdOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ListAliasesByKeyIdAsyncHandler;
-			typedef Outcome<Error, Model::ListCertificatesResult> ListCertificatesOutcome;
-			typedef std::future<ListCertificatesOutcome> ListCertificatesOutcomeCallable;
-			typedef std::function<void(const KmsClient*, const Model::ListCertificatesRequest&, const ListCertificatesOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ListCertificatesAsyncHandler;
 			typedef Outcome<Error, Model::ListKeyVersionsResult> ListKeyVersionsOutcome;
 			typedef std::future<ListKeyVersionsOutcome> ListKeyVersionsOutcomeCallable;
 			typedef std::function<void(const KmsClient*, const Model::ListKeyVersionsRequest&, const ListKeyVersionsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ListKeyVersionsAsyncHandler;
@@ -446,9 +421,6 @@ namespace AlibabaCloud
 			DescribeSecretOutcome describeSecret(const Model::DescribeSecretRequest &request)const;
 			void describeSecretAsync(const Model::DescribeSecretRequest& request, const DescribeSecretAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeSecretOutcomeCallable describeSecretCallable(const Model::DescribeSecretRequest& request) const;
-			DescribeServiceOutcome describeService(const Model::DescribeServiceRequest &request)const;
-			void describeServiceAsync(const Model::DescribeServiceRequest& request, const DescribeServiceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			DescribeServiceOutcomeCallable describeServiceCallable(const Model::DescribeServiceRequest& request) const;
 			DisableKeyOutcome disableKey(const Model::DisableKeyRequest &request)const;
 			void disableKeyAsync(const Model::DisableKeyRequest& request, const DisableKeyAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DisableKeyOutcomeCallable disableKeyCallable(const Model::DisableKeyRequest& request) const;
@@ -458,9 +430,6 @@ namespace AlibabaCloud
 			EncryptOutcome encrypt(const Model::EncryptRequest &request)const;
 			void encryptAsync(const Model::EncryptRequest& request, const EncryptAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			EncryptOutcomeCallable encryptCallable(const Model::EncryptRequest& request) const;
-			ExportCertificateOutcome exportCertificate(const Model::ExportCertificateRequest &request)const;
-			void exportCertificateAsync(const Model::ExportCertificateRequest& request, const ExportCertificateAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			ExportCertificateOutcomeCallable exportCertificateCallable(const Model::ExportCertificateRequest& request) const;
 			ExportDataKeyOutcome exportDataKey(const Model::ExportDataKeyRequest &request)const;
 			void exportDataKeyAsync(const Model::ExportDataKeyRequest& request, const ExportDataKeyAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ExportDataKeyOutcomeCallable exportDataKeyCallable(const Model::ExportDataKeyRequest& request) const;
@@ -488,12 +457,6 @@ namespace AlibabaCloud
 			GetSecretValueOutcome getSecretValue(const Model::GetSecretValueRequest &request)const;
 			void getSecretValueAsync(const Model::GetSecretValueRequest& request, const GetSecretValueAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			GetSecretValueOutcomeCallable getSecretValueCallable(const Model::GetSecretValueRequest& request) const;
-			ImportCertificateOutcome importCertificate(const Model::ImportCertificateRequest &request)const;
-			void importCertificateAsync(const Model::ImportCertificateRequest& request, const ImportCertificateAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			ImportCertificateOutcomeCallable importCertificateCallable(const Model::ImportCertificateRequest& request) const;
-			ImportEncryptionCertificateOutcome importEncryptionCertificate(const Model::ImportEncryptionCertificateRequest &request)const;
-			void importEncryptionCertificateAsync(const Model::ImportEncryptionCertificateRequest& request, const ImportEncryptionCertificateAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			ImportEncryptionCertificateOutcomeCallable importEncryptionCertificateCallable(const Model::ImportEncryptionCertificateRequest& request) const;
 			ImportKeyMaterialOutcome importKeyMaterial(const Model::ImportKeyMaterialRequest &request)const;
 			void importKeyMaterialAsync(const Model::ImportKeyMaterialRequest& request, const ImportKeyMaterialAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ImportKeyMaterialOutcomeCallable importKeyMaterialCallable(const Model::ImportKeyMaterialRequest& request) const;
@@ -503,9 +466,6 @@ namespace AlibabaCloud
 			ListAliasesByKeyIdOutcome listAliasesByKeyId(const Model::ListAliasesByKeyIdRequest &request)const;
 			void listAliasesByKeyIdAsync(const Model::ListAliasesByKeyIdRequest& request, const ListAliasesByKeyIdAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ListAliasesByKeyIdOutcomeCallable listAliasesByKeyIdCallable(const Model::ListAliasesByKeyIdRequest& request) const;
-			ListCertificatesOutcome listCertificates(const Model::ListCertificatesRequest &request)const;
-			void listCertificatesAsync(const Model::ListCertificatesRequest& request, const ListCertificatesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			ListCertificatesOutcomeCallable listCertificatesCallable(const Model::ListCertificatesRequest& request) const;
 			ListKeyVersionsOutcome listKeyVersions(const Model::ListKeyVersionsRequest &request)const;
 			void listKeyVersionsAsync(const Model::ListKeyVersionsRequest& request, const ListKeyVersionsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ListKeyVersionsOutcomeCallable listKeyVersionsCallable(const Model::ListKeyVersionsRequest& request) const;

kms/include/alibabacloud/kms/model/AsymmetricDecryptRequest.h

@@ -1,57 +1,51 @@
 /*
  * 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_ASYMMETRICDECRYPTREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_ASYMMETRICDECRYPTREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT AsymmetricDecryptRequest : public RpcServiceRequest
-			{
-
-			public:
-				AsymmetricDecryptRequest();
-				~AsymmetricDecryptRequest();
-
-				std::string getKeyVersionId()const;
-				void setKeyVersionId(const std::string& keyVersionId);
-				std::string getKeyId()const;
-				void setKeyId(const std::string& keyId);
-				std::string getCiphertextBlob()const;
-				void setCiphertextBlob(const std::string& ciphertextBlob);
-				std::string getAlgorithm()const;
-				void setAlgorithm(const std::string& algorithm);
-
-            private:
-				std::string keyVersionId_;
-				std::string keyId_;
-				std::string ciphertextBlob_;
-				std::string algorithm_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_ASYMMETRICDECRYPTREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_ASYMMETRICDECRYPTREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_ASYMMETRICDECRYPTREQUEST_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 AsymmetricDecryptRequest : public RpcServiceRequest {
+public:
+	AsymmetricDecryptRequest();
+	~AsymmetricDecryptRequest();
+	std::string getKeyVersionId() const;
+	void setKeyVersionId(const std::string &keyVersionId);
+	std::string getKeyId() const;
+	void setKeyId(const std::string &keyId);
+	std::string getCiphertextBlob() const;
+	void setCiphertextBlob(const std::string &ciphertextBlob);
+	std::string getAlgorithm() const;
+	void setAlgorithm(const std::string &algorithm);
+
+private:
+	std::string keyVersionId_;
+	std::string keyId_;
+	std::string ciphertextBlob_;
+	std::string algorithm_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_ASYMMETRICDECRYPTREQUEST_H_

kms/include/alibabacloud/kms/model/AsymmetricEncryptRequest.h

@@ -1,57 +1,51 @@
 /*
  * 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_ASYMMETRICENCRYPTREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_ASYMMETRICENCRYPTREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT AsymmetricEncryptRequest : public RpcServiceRequest
-			{
-
-			public:
-				AsymmetricEncryptRequest();
-				~AsymmetricEncryptRequest();
-
-				std::string getKeyVersionId()const;
-				void setKeyVersionId(const std::string& keyVersionId);
-				std::string getKeyId()const;
-				void setKeyId(const std::string& keyId);
-				std::string getPlaintext()const;
-				void setPlaintext(const std::string& plaintext);
-				std::string getAlgorithm()const;
-				void setAlgorithm(const std::string& algorithm);
-
-            private:
-				std::string keyVersionId_;
-				std::string keyId_;
-				std::string plaintext_;
-				std::string algorithm_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_ASYMMETRICENCRYPTREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_ASYMMETRICENCRYPTREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_ASYMMETRICENCRYPTREQUEST_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 AsymmetricEncryptRequest : public RpcServiceRequest {
+public:
+	AsymmetricEncryptRequest();
+	~AsymmetricEncryptRequest();
+	std::string getKeyVersionId() const;
+	void setKeyVersionId(const std::string &keyVersionId);
+	std::string getKeyId() const;
+	void setKeyId(const std::string &keyId);
+	std::string getPlaintext() const;
+	void setPlaintext(const std::string &plaintext);
+	std::string getAlgorithm() const;
+	void setAlgorithm(const std::string &algorithm);
+
+private:
+	std::string keyVersionId_;
+	std::string keyId_;
+	std::string plaintext_;
+	std::string algorithm_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_ASYMMETRICENCRYPTREQUEST_H_

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

@@ -1,57 +1,51 @@
 /*
  * 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_ASYMMETRICSIGNREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_ASYMMETRICSIGNREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT AsymmetricSignRequest : public RpcServiceRequest
-			{
-
-			public:
-				AsymmetricSignRequest();
-				~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 getAlgorithm()const;
-				void setAlgorithm(const std::string& algorithm);
-
-            private:
-				std::string keyVersionId_;
-				std::string digest_;
-				std::string keyId_;
-				std::string algorithm_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_ASYMMETRICSIGNREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_ASYMMETRICSIGNREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_ASYMMETRICSIGNREQUEST_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 AsymmetricSignRequest : public RpcServiceRequest {
+public:
+	AsymmetricSignRequest();
+	~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 getAlgorithm() const;
+	void setAlgorithm(const std::string &algorithm);
+
+private:
+	std::string keyVersionId_;
+	std::string digest_;
+	std::string keyId_;
+	std::string algorithm_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_ASYMMETRICSIGNREQUEST_H_

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

@@ -1,60 +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_ASYMMETRICVERIFYREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_ASYMMETRICVERIFYREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT AsymmetricVerifyRequest : public RpcServiceRequest
-			{
-
-			public:
-				AsymmetricVerifyRequest();
-				~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 getValue()const;
-				void setValue(const std::string& value);
-				std::string getAlgorithm()const;
-				void setAlgorithm(const std::string& algorithm);
-
-            private:
-				std::string keyVersionId_;
-				std::string digest_;
-				std::string keyId_;
-				std::string value_;
-				std::string algorithm_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_ASYMMETRICVERIFYREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_ASYMMETRICVERIFYREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_ASYMMETRICVERIFYREQUEST_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 AsymmetricVerifyRequest : public RpcServiceRequest {
+public:
+	AsymmetricVerifyRequest();
+	~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 getValue() const;
+	void setValue(const std::string &value);
+	std::string getAlgorithm() const;
+	void setAlgorithm(const std::string &algorithm);
+
+private:
+	std::string keyVersionId_;
+	std::string digest_;
+	std::string keyId_;
+	std::string value_;
+	std::string algorithm_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_ASYMMETRICVERIFYREQUEST_H_

kms/include/alibabacloud/kms/model/CancelKeyDeletionRequest.h

@@ -1,48 +1,42 @@
 /*
  * 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_CANCELKEYDELETIONREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_CANCELKEYDELETIONREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT CancelKeyDeletionRequest : public RpcServiceRequest
-			{
-
-			public:
-				CancelKeyDeletionRequest();
-				~CancelKeyDeletionRequest();
-
-				std::string getKeyId()const;
-				void setKeyId(const std::string& keyId);
-
-            private:
-				std::string keyId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_CANCELKEYDELETIONREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_CANCELKEYDELETIONREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_CANCELKEYDELETIONREQUEST_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 CancelKeyDeletionRequest : public RpcServiceRequest {
+public:
+	CancelKeyDeletionRequest();
+	~CancelKeyDeletionRequest();
+	std::string getKeyId() const;
+	void setKeyId(const std::string &keyId);
+
+private:
+	std::string keyId_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_CANCELKEYDELETIONREQUEST_H_

kms/include/alibabacloud/kms/model/CertificatePrivateKeyDecryptRequest.h

@@ -1,54 +1,48 @@
 /*
  * 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_CERTIFICATEPRIVATEKEYDECRYPTREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_CERTIFICATEPRIVATEKEYDECRYPTREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT CertificatePrivateKeyDecryptRequest : public RpcServiceRequest
-			{
-
-			public:
-				CertificatePrivateKeyDecryptRequest();
-				~CertificatePrivateKeyDecryptRequest();
-
-				std::string getCertificateId()const;
-				void setCertificateId(const std::string& certificateId);
-				std::string getAlgorithm()const;
-				void setAlgorithm(const std::string& algorithm);
-				std::string getCiphertextBlob()const;
-				void setCiphertextBlob(const std::string& ciphertextBlob);
-
-            private:
-				std::string certificateId_;
-				std::string algorithm_;
-				std::string ciphertextBlob_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_CERTIFICATEPRIVATEKEYDECRYPTREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_CERTIFICATEPRIVATEKEYDECRYPTREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_CERTIFICATEPRIVATEKEYDECRYPTREQUEST_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 CertificatePrivateKeyDecryptRequest : public RpcServiceRequest {
+public:
+	CertificatePrivateKeyDecryptRequest();
+	~CertificatePrivateKeyDecryptRequest();
+	std::string getCertificateId() const;
+	void setCertificateId(const std::string &certificateId);
+	std::string getAlgorithm() const;
+	void setAlgorithm(const std::string &algorithm);
+	std::string getCiphertextBlob() const;
+	void setCiphertextBlob(const std::string &ciphertextBlob);
+
+private:
+	std::string certificateId_;
+	std::string algorithm_;
+	std::string ciphertextBlob_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_CERTIFICATEPRIVATEKEYDECRYPTREQUEST_H_

kms/include/alibabacloud/kms/model/CertificatePrivateKeySignRequest.h

@@ -1,57 +1,51 @@
 /*
  * 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_CERTIFICATEPRIVATEKEYSIGNREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_CERTIFICATEPRIVATEKEYSIGNREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT CertificatePrivateKeySignRequest : public RpcServiceRequest
-			{
-
-			public:
-				CertificatePrivateKeySignRequest();
-				~CertificatePrivateKeySignRequest();
-
-				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 getAlgorithm()const;
-				void setAlgorithm(const std::string& algorithm);
-
-            private:
-				std::string messageType_;
-				std::string certificateId_;
-				std::string message_;
-				std::string algorithm_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_CERTIFICATEPRIVATEKEYSIGNREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_CERTIFICATEPRIVATEKEYSIGNREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_CERTIFICATEPRIVATEKEYSIGNREQUEST_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 CertificatePrivateKeySignRequest : public RpcServiceRequest {
+public:
+	CertificatePrivateKeySignRequest();
+	~CertificatePrivateKeySignRequest();
+	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 getAlgorithm() const;
+	void setAlgorithm(const std::string &algorithm);
+
+private:
+	std::string messageType_;
+	std::string certificateId_;
+	std::string message_;
+	std::string algorithm_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_CERTIFICATEPRIVATEKEYSIGNREQUEST_H_

kms/include/alibabacloud/kms/model/CertificatePublicKeyEncryptRequest.h

@@ -1,54 +1,48 @@
 /*
  * 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_CERTIFICATEPUBLICKEYENCRYPTREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_CERTIFICATEPUBLICKEYENCRYPTREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT CertificatePublicKeyEncryptRequest : public RpcServiceRequest
-			{
-
-			public:
-				CertificatePublicKeyEncryptRequest();
-				~CertificatePublicKeyEncryptRequest();
-
-				std::string getCertificateId()const;
-				void setCertificateId(const std::string& certificateId);
-				std::string getPlaintext()const;
-				void setPlaintext(const std::string& plaintext);
-				std::string getAlgorithm()const;
-				void setAlgorithm(const std::string& algorithm);
-
-            private:
-				std::string certificateId_;
-				std::string plaintext_;
-				std::string algorithm_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_CERTIFICATEPUBLICKEYENCRYPTREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_CERTIFICATEPUBLICKEYENCRYPTREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_CERTIFICATEPUBLICKEYENCRYPTREQUEST_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 CertificatePublicKeyEncryptRequest : public RpcServiceRequest {
+public:
+	CertificatePublicKeyEncryptRequest();
+	~CertificatePublicKeyEncryptRequest();
+	std::string getCertificateId() const;
+	void setCertificateId(const std::string &certificateId);
+	std::string getPlaintext() const;
+	void setPlaintext(const std::string &plaintext);
+	std::string getAlgorithm() const;
+	void setAlgorithm(const std::string &algorithm);
+
+private:
+	std::string certificateId_;
+	std::string plaintext_;
+	std::string algorithm_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_CERTIFICATEPUBLICKEYENCRYPTREQUEST_H_

kms/include/alibabacloud/kms/model/CertificatePublicKeyEncryptResult.h

@@ -37,14 +37,14 @@ namespace AlibabaCloud
 				CertificatePublicKeyEncryptResult();
 				explicit CertificatePublicKeyEncryptResult(const std::string &payload);
 				~CertificatePublicKeyEncryptResult();
-				std::string getCertificateId()const;
 				std::string getCiphertextBlob()const;
+				std::string getCertificateId()const;
 
 			protected:
 				void parse(const std::string &payload);
 			private:
-				std::string certificateId_;
 				std::string ciphertextBlob_;
+				std::string certificateId_;
 
 			};
 		}

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

@@ -1,60 +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_CERTIFICATEPUBLICKEYVERIFYREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_CERTIFICATEPUBLICKEYVERIFYREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT CertificatePublicKeyVerifyRequest : public RpcServiceRequest
-			{
-
-			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 getAlgorithm()const;
-				void setAlgorithm(const std::string& algorithm);
-
-            private:
-				std::string signatureValue_;
-				std::string messageType_;
-				std::string certificateId_;
-				std::string message_;
-				std::string algorithm_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_CERTIFICATEPUBLICKEYVERIFYREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_CERTIFICATEPUBLICKEYVERIFYREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_CERTIFICATEPUBLICKEYVERIFYREQUEST_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 CertificatePublicKeyVerifyRequest : public RpcServiceRequest {
+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 getAlgorithm() const;
+	void setAlgorithm(const std::string &algorithm);
+
+private:
+	std::string signatureValue_;
+	std::string messageType_;
+	std::string certificateId_;
+	std::string message_;
+	std::string algorithm_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_CERTIFICATEPUBLICKEYVERIFYREQUEST_H_

kms/include/alibabacloud/kms/model/CreateAliasRequest.h

@@ -1,51 +1,45 @@
 /*
  * 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_CREATEALIASREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_CREATEALIASREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT CreateAliasRequest : public RpcServiceRequest
-			{
-
-			public:
-				CreateAliasRequest();
-				~CreateAliasRequest();
-
-				std::string getAliasName()const;
-				void setAliasName(const std::string& aliasName);
-				std::string getKeyId()const;
-				void setKeyId(const std::string& keyId);
-
-            private:
-				std::string aliasName_;
-				std::string keyId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_CREATEALIASREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_CREATEALIASREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_CREATEALIASREQUEST_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 CreateAliasRequest : public RpcServiceRequest {
+public:
+	CreateAliasRequest();
+	~CreateAliasRequest();
+	std::string getAliasName() const;
+	void setAliasName(const std::string &aliasName);
+	std::string getKeyId() const;
+	void setKeyId(const std::string &keyId);
+
+private:
+	std::string aliasName_;
+	std::string keyId_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_CREATEALIASREQUEST_H_

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

@@ -1,63 +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.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_CREATECERTIFICATEREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_CREATECERTIFICATEREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT CreateCertificateRequest : public RpcServiceRequest
-			{
-
-			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(const std::map<std::string, std::string>& subjectAlternativeNames);
-				std::string getKeySpec()const;
-				void setKeySpec(const std::string& keySpec);
-
-            private:
-				std::string protectionLevel_;
-				bool exportablePrivateKey_;
-				std::string clientToken_;
-				std::string subject_;
-				std::map<std::string, std::string> subjectAlternativeNames_;
-				std::string keySpec_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_CREATECERTIFICATEREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_CREATECERTIFICATEREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_CREATECERTIFICATEREQUEST_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 CreateCertificateRequest : public RpcServiceRequest {
+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);
+
+private:
+	std::string protectionLevel_;
+	bool exportablePrivateKey_;
+	std::string clientToken_;
+	std::string subject_;
+	std::map<std::string, std::string> subjectAlternativeNames_;
+	std::string keySpec_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_CREATECERTIFICATEREQUEST_H_

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

@@ -1,66 +1,63 @@
 /*
  * 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_CREATEKEYREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_CREATEKEYREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			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 getDescription()const;
-				void setDescription(const std::string& description);
-				std::string getKeySpec()const;
-				void setKeySpec(const std::string& keySpec);
-				std::string getRotationInterval()const;
-				void setRotationInterval(const std::string& rotationInterval);
-				bool getEnableAutomaticRotation()const;
-				void setEnableAutomaticRotation(bool enableAutomaticRotation);
-
-            private:
-				std::string protectionLevel_;
-				std::string keyUsage_;
-				std::string origin_;
-				std::string description_;
-				std::string keySpec_;
-				std::string rotationInterval_;
-				bool enableAutomaticRotation_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_CREATEKEYREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_CREATEKEYREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_CREATEKEYREQUEST_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 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;
+	void setKeySpec(const std::string &keySpec);
+	std::string getRotationInterval() const;
+	void setRotationInterval(const std::string &rotationInterval);
+	bool getEnableAutomaticRotation() const;
+	void setEnableAutomaticRotation(bool enableAutomaticRotation);
+
+private:
+	std::string protectionLevel_;
+	std::string keyUsage_;
+	std::string origin_;
+	std::string dKMSInstanceId_;
+	std::string description_;
+	std::string keySpec_;
+	std::string rotationInterval_;
+	bool enableAutomaticRotation_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_CREATEKEYREQUEST_H_

kms/include/alibabacloud/kms/model/CreateKeyResult.h

@@ -35,16 +35,17 @@ namespace AlibabaCloud
 				struct KeyMetadata
 				{
 					std::string origin;
-					std::string creationDate;
 					std::string protectionLevel;
+					std::string creationDate;
 					std::string description;
-					std::string lastRotationDate;
 					std::string rotationInterval;
+					std::string lastRotationDate;
 					std::string keySpec;
 					std::string keyUsage;
 					std::string keyId;
 					std::string primaryKeyVersion;
 					std::string creator;
+					std::string dKMSInstanceId;
 					std::string deleteDate;
 					std::string automaticRotation;
 					std::string nextRotationDate;

kms/include/alibabacloud/kms/model/CreateKeyVersionRequest.h

@@ -1,48 +1,42 @@
 /*
  * 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_CREATEKEYVERSIONREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_CREATEKEYVERSIONREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT CreateKeyVersionRequest : public RpcServiceRequest
-			{
-
-			public:
-				CreateKeyVersionRequest();
-				~CreateKeyVersionRequest();
-
-				std::string getKeyId()const;
-				void setKeyId(const std::string& keyId);
-
-            private:
-				std::string keyId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_CREATEKEYVERSIONREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_CREATEKEYVERSIONREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_CREATEKEYVERSIONREQUEST_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 CreateKeyVersionRequest : public RpcServiceRequest {
+public:
+	CreateKeyVersionRequest();
+	~CreateKeyVersionRequest();
+	std::string getKeyId() const;
+	void setKeyId(const std::string &keyId);
+
+private:
+	std::string keyId_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_CREATEKEYVERSIONREQUEST_H_

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

@@ -1,78 +1,75 @@
 /*
  * 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_CREATESECRETREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_CREATESECRETREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT CreateSecretRequest : public RpcServiceRequest
-			{
-
-			public:
-				CreateSecretRequest();
-				~CreateSecretRequest();
-
-				std::string getSecretType()const;
-				void setSecretType(const std::string& secretType);
-				std::string getVersionId()const;
-				void setVersionId(const std::string& versionId);
-				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);
-
-            private:
-				std::string secretType_;
-				std::string versionId_;
-				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_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_CREATESECRETREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_CREATESECRETREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_CREATESECRETREQUEST_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 CreateSecretRequest : public RpcServiceRequest {
+public:
+	CreateSecretRequest();
+	~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);
+
+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_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_CREATESECRETREQUEST_H_

kms/include/alibabacloud/kms/model/CreateSecretResult.h

@@ -37,24 +37,26 @@ namespace AlibabaCloud
 				CreateSecretResult();
 				explicit CreateSecretResult(const std::string &payload);
 				~CreateSecretResult();
-				std::string getVersionId()const;
 				std::string getSecretName()const;
+				std::string getVersionId()const;
 				std::string getNextRotationDate()const;
 				std::string getSecretType()const;
 				std::string getRotationInterval()const;
 				std::string getExtendedConfig()const;
+				std::string getDKMSInstanceId()const;
 				std::string getArn()const;
 				std::string getAutomaticRotation()const;
 
 			protected:
 				void parse(const std::string &payload);
 			private:
-				std::string versionId_;
 				std::string secretName_;
+				std::string versionId_;
 				std::string nextRotationDate_;
 				std::string secretType_;
 				std::string rotationInterval_;
 				std::string extendedConfig_;
+				std::string dKMSInstanceId_;
 				std::string arn_;
 				std::string automaticRotation_;
 

kms/include/alibabacloud/kms/model/DecryptRequest.h

@@ -1,51 +1,45 @@
 /*
  * 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_DECRYPTREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_DECRYPTREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT DecryptRequest : public RpcServiceRequest
-			{
-
-			public:
-				DecryptRequest();
-				~DecryptRequest();
-
-				std::string getEncryptionContext()const;
-				void setEncryptionContext(const std::string& encryptionContext);
-				std::string getCiphertextBlob()const;
-				void setCiphertextBlob(const std::string& ciphertextBlob);
-
-            private:
-				std::string encryptionContext_;
-				std::string ciphertextBlob_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_DECRYPTREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_DECRYPTREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_DECRYPTREQUEST_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 DecryptRequest : public RpcServiceRequest {
+public:
+	DecryptRequest();
+	~DecryptRequest();
+	std::string getEncryptionContext() const;
+	void setEncryptionContext(const std::string &encryptionContext);
+	std::string getCiphertextBlob() const;
+	void setCiphertextBlob(const std::string &ciphertextBlob);
+
+private:
+	std::string encryptionContext_;
+	std::string ciphertextBlob_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_DECRYPTREQUEST_H_

kms/include/alibabacloud/kms/model/DeleteAliasRequest.h

@@ -1,48 +1,42 @@
 /*
  * 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_DELETEALIASREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_DELETEALIASREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT DeleteAliasRequest : public RpcServiceRequest
-			{
-
-			public:
-				DeleteAliasRequest();
-				~DeleteAliasRequest();
-
-				std::string getAliasName()const;
-				void setAliasName(const std::string& aliasName);
-
-            private:
-				std::string aliasName_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_DELETEALIASREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_DELETEALIASREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_DELETEALIASREQUEST_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 DeleteAliasRequest : public RpcServiceRequest {
+public:
+	DeleteAliasRequest();
+	~DeleteAliasRequest();
+	std::string getAliasName() const;
+	void setAliasName(const std::string &aliasName);
+
+private:
+	std::string aliasName_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_DELETEALIASREQUEST_H_

kms/include/alibabacloud/kms/model/DeleteCertificateRequest.h

@@ -1,48 +1,42 @@
 /*
  * 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_DELETECERTIFICATEREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_DELETECERTIFICATEREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT DeleteCertificateRequest : public RpcServiceRequest
-			{
-
-			public:
-				DeleteCertificateRequest();
-				~DeleteCertificateRequest();
-
-				std::string getCertificateId()const;
-				void setCertificateId(const std::string& certificateId);
-
-            private:
-				std::string certificateId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_DELETECERTIFICATEREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_DELETECERTIFICATEREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_DELETECERTIFICATEREQUEST_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 DeleteCertificateRequest : public RpcServiceRequest {
+public:
+	DeleteCertificateRequest();
+	~DeleteCertificateRequest();
+	std::string getCertificateId() const;
+	void setCertificateId(const std::string &certificateId);
+
+private:
+	std::string certificateId_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_DELETECERTIFICATEREQUEST_H_

kms/include/alibabacloud/kms/model/DeleteKeyMaterialRequest.h

@@ -1,48 +1,42 @@
 /*
  * 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_DELETEKEYMATERIALREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_DELETEKEYMATERIALREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT DeleteKeyMaterialRequest : public RpcServiceRequest
-			{
-
-			public:
-				DeleteKeyMaterialRequest();
-				~DeleteKeyMaterialRequest();
-
-				std::string getKeyId()const;
-				void setKeyId(const std::string& keyId);
-
-            private:
-				std::string keyId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_DELETEKEYMATERIALREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_DELETEKEYMATERIALREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_DELETEKEYMATERIALREQUEST_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 DeleteKeyMaterialRequest : public RpcServiceRequest {
+public:
+	DeleteKeyMaterialRequest();
+	~DeleteKeyMaterialRequest();
+	std::string getKeyId() const;
+	void setKeyId(const std::string &keyId);
+
+private:
+	std::string keyId_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_DELETEKEYMATERIALREQUEST_H_

kms/include/alibabacloud/kms/model/DeleteSecretRequest.h

@@ -1,54 +1,48 @@
 /*
  * 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_DELETESECRETREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_DELETESECRETREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT DeleteSecretRequest : public RpcServiceRequest
-			{
-
-			public:
-				DeleteSecretRequest();
-				~DeleteSecretRequest();
-
-				std::string getForceDeleteWithoutRecovery()const;
-				void setForceDeleteWithoutRecovery(const std::string& forceDeleteWithoutRecovery);
-				std::string getRecoveryWindowInDays()const;
-				void setRecoveryWindowInDays(const std::string& recoveryWindowInDays);
-				std::string getSecretName()const;
-				void setSecretName(const std::string& secretName);
-
-            private:
-				std::string forceDeleteWithoutRecovery_;
-				std::string recoveryWindowInDays_;
-				std::string secretName_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_DELETESECRETREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_DELETESECRETREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_DELETESECRETREQUEST_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 DeleteSecretRequest : public RpcServiceRequest {
+public:
+	DeleteSecretRequest();
+	~DeleteSecretRequest();
+	std::string getForceDeleteWithoutRecovery() const;
+	void setForceDeleteWithoutRecovery(const std::string &forceDeleteWithoutRecovery);
+	std::string getRecoveryWindowInDays() const;
+	void setRecoveryWindowInDays(const std::string &recoveryWindowInDays);
+	std::string getSecretName() const;
+	void setSecretName(const std::string &secretName);
+
+private:
+	std::string forceDeleteWithoutRecovery_;
+	std::string recoveryWindowInDays_;
+	std::string secretName_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_DELETESECRETREQUEST_H_

kms/include/alibabacloud/kms/model/DescribeAccountKmsStatusRequest.h

@@ -1,45 +1,39 @@
 /*
  * 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_DESCRIBEACCOUNTKMSSTATUSREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_DESCRIBEACCOUNTKMSSTATUSREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT DescribeAccountKmsStatusRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeAccountKmsStatusRequest();
-				~DescribeAccountKmsStatusRequest();
-
-
-            private:
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_DESCRIBEACCOUNTKMSSTATUSREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_DESCRIBEACCOUNTKMSSTATUSREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_DESCRIBEACCOUNTKMSSTATUSREQUEST_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 DescribeAccountKmsStatusRequest : public RpcServiceRequest {
+public:
+	DescribeAccountKmsStatusRequest();
+	~DescribeAccountKmsStatusRequest();
+
+private:
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_DESCRIBEACCOUNTKMSSTATUSREQUEST_H_

kms/include/alibabacloud/kms/model/DescribeCertificateRequest.h

@@ -1,48 +1,42 @@
 /*
  * 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_DESCRIBECERTIFICATEREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_DESCRIBECERTIFICATEREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT DescribeCertificateRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeCertificateRequest();
-				~DescribeCertificateRequest();
-
-				std::string getCertificateId()const;
-				void setCertificateId(const std::string& certificateId);
-
-            private:
-				std::string certificateId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_DESCRIBECERTIFICATEREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_DESCRIBECERTIFICATEREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_DESCRIBECERTIFICATEREQUEST_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 DescribeCertificateRequest : public RpcServiceRequest {
+public:
+	DescribeCertificateRequest();
+	~DescribeCertificateRequest();
+	std::string getCertificateId() const;
+	void setCertificateId(const std::string &certificateId);
+
+private:
+	std::string certificateId_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_DESCRIBECERTIFICATEREQUEST_H_

kms/include/alibabacloud/kms/model/DescribeCertificateResult.h

@@ -41,8 +41,8 @@ namespace AlibabaCloud
 				std::string getProtectionLevel()const;
 				std::string getIssuer()const;
 				std::string getCertificateId()const;
-				std::string getKeySpec()const;
 				std::string getCreatedAt()const;
+				std::string getKeySpec()const;
 				std::vector<std::string> getSubjectAlternativeNames()const;
 				std::string getSignatureAlgorithm()const;
 				std::string getSubjectKeyIdentifier()const;
@@ -63,8 +63,8 @@ namespace AlibabaCloud
 				std::string protectionLevel_;
 				std::string issuer_;
 				std::string certificateId_;
-				std::string keySpec_;
 				std::string createdAt_;
+				std::string keySpec_;
 				std::vector<std::string> subjectAlternativeNames_;
 				std::string signatureAlgorithm_;
 				std::string subjectKeyIdentifier_;

kms/include/alibabacloud/kms/model/DescribeKeyRequest.h

@@ -1,48 +1,42 @@
 /*
  * 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_DESCRIBEKEYREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_DESCRIBEKEYREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT DescribeKeyRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeKeyRequest();
-				~DescribeKeyRequest();
-
-				std::string getKeyId()const;
-				void setKeyId(const std::string& keyId);
-
-            private:
-				std::string keyId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_DESCRIBEKEYREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_DESCRIBEKEYREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_DESCRIBEKEYREQUEST_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 DescribeKeyRequest : public RpcServiceRequest {
+public:
+	DescribeKeyRequest();
+	~DescribeKeyRequest();
+	std::string getKeyId() const;
+	void setKeyId(const std::string &keyId);
+
+private:
+	std::string keyId_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_DESCRIBEKEYREQUEST_H_

kms/include/alibabacloud/kms/model/DescribeKeyResult.h

@@ -35,17 +35,18 @@ namespace AlibabaCloud
 				struct KeyMetadata
 				{
 					std::string origin;
-					std::string creationDate;
 					std::string protectionLevel;
+					std::string creationDate;
 					std::string description;
-					std::string lastRotationDate;
 					std::string rotationInterval;
+					std::string lastRotationDate;
 					std::string keySpec;
 					std::string keyUsage;
 					std::string keyId;
 					std::string primaryKeyVersion;
-					std::string creator;
 					std::string deletionProtection;
+					std::string creator;
+					std::string dKMSInstanceId;
 					std::string deleteDate;
 					std::string automaticRotation;
 					std::string nextRotationDate;

kms/include/alibabacloud/kms/model/DescribeKeyVersionRequest.h

@@ -1,51 +1,45 @@
 /*
  * 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_DESCRIBEKEYVERSIONREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_DESCRIBEKEYVERSIONREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT DescribeKeyVersionRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeKeyVersionRequest();
-				~DescribeKeyVersionRequest();
-
-				std::string getKeyVersionId()const;
-				void setKeyVersionId(const std::string& keyVersionId);
-				std::string getKeyId()const;
-				void setKeyId(const std::string& keyId);
-
-            private:
-				std::string keyVersionId_;
-				std::string keyId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_DESCRIBEKEYVERSIONREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_DESCRIBEKEYVERSIONREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_DESCRIBEKEYVERSIONREQUEST_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 DescribeKeyVersionRequest : public RpcServiceRequest {
+public:
+	DescribeKeyVersionRequest();
+	~DescribeKeyVersionRequest();
+	std::string getKeyVersionId() const;
+	void setKeyVersionId(const std::string &keyVersionId);
+	std::string getKeyId() const;
+	void setKeyId(const std::string &keyId);
+
+private:
+	std::string keyVersionId_;
+	std::string keyId_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_DESCRIBEKEYVERSIONREQUEST_H_

kms/include/alibabacloud/kms/model/DescribeRegionsRequest.h

@@ -1,45 +1,39 @@
 /*
  * 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_DESCRIBEREGIONSREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_DESCRIBEREGIONSREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT DescribeRegionsRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeRegionsRequest();
-				~DescribeRegionsRequest();
-
-
-            private:
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_DESCRIBEREGIONSREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_DESCRIBEREGIONSREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_DESCRIBEREGIONSREQUEST_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 DescribeRegionsRequest : public RpcServiceRequest {
+public:
+	DescribeRegionsRequest();
+	~DescribeRegionsRequest();
+
+private:
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_DESCRIBEREGIONSREQUEST_H_

kms/include/alibabacloud/kms/model/DescribeSecretRequest.h

@@ -1,51 +1,45 @@
 /*
  * 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_DESCRIBESECRETREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_DESCRIBESECRETREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT DescribeSecretRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeSecretRequest();
-				~DescribeSecretRequest();
-
-				std::string getSecretName()const;
-				void setSecretName(const std::string& secretName);
-				std::string getFetchTags()const;
-				void setFetchTags(const std::string& fetchTags);
-
-            private:
-				std::string secretName_;
-				std::string fetchTags_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_DESCRIBESECRETREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_DESCRIBESECRETREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_DESCRIBESECRETREQUEST_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 DescribeSecretRequest : public RpcServiceRequest {
+public:
+	DescribeSecretRequest();
+	~DescribeSecretRequest();
+	std::string getSecretName() const;
+	void setSecretName(const std::string &secretName);
+	std::string getFetchTags() const;
+	void setFetchTags(const std::string &fetchTags);
+
+private:
+	std::string secretName_;
+	std::string fetchTags_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_DESCRIBESECRETREQUEST_H_

kms/include/alibabacloud/kms/model/DescribeSecretResult.h

@@ -43,16 +43,17 @@ namespace AlibabaCloud
 				explicit DescribeSecretResult(const std::string &payload);
 				~DescribeSecretResult();
 				std::string getDescription()const;
-				std::string getLastRotationDate()const;
 				std::string getRotationInterval()const;
+				std::string getLastRotationDate()const;
 				std::string getSecretType()const;
 				std::string getCreateTime()const;
+				std::string getDKMSInstanceId()const;
 				std::string getAutomaticRotation()const;
 				std::string getSecretName()const;
 				std::string getNextRotationDate()const;
 				std::string getUpdateTime()const;
-				std::string getPlannedDeleteTime()const;
 				std::string getExtendedConfig()const;
+				std::string getPlannedDeleteTime()const;
 				std::string getArn()const;
 				std::vector<Tag> getTags()const;
 				std::string getEncryptionKeyId()const;
@@ -61,16 +62,17 @@ namespace AlibabaCloud
 				void parse(const std::string &payload);
 			private:
 				std::string description_;
-				std::string lastRotationDate_;
 				std::string rotationInterval_;
+				std::string lastRotationDate_;
 				std::string secretType_;
 				std::string createTime_;
+				std::string dKMSInstanceId_;
 				std::string automaticRotation_;
 				std::string secretName_;
 				std::string nextRotationDate_;
 				std::string updateTime_;
-				std::string plannedDeleteTime_;
 				std::string extendedConfig_;
+				std::string plannedDeleteTime_;
 				std::string arn_;
 				std::vector<Tag> tags_;
 				std::string encryptionKeyId_;

kms/include/alibabacloud/kms/model/DisableKeyRequest.h

@@ -1,48 +1,42 @@
 /*
  * 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_DISABLEKEYREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_DISABLEKEYREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT DisableKeyRequest : public RpcServiceRequest
-			{
-
-			public:
-				DisableKeyRequest();
-				~DisableKeyRequest();
-
-				std::string getKeyId()const;
-				void setKeyId(const std::string& keyId);
-
-            private:
-				std::string keyId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_DISABLEKEYREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_DISABLEKEYREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_DISABLEKEYREQUEST_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 DisableKeyRequest : public RpcServiceRequest {
+public:
+	DisableKeyRequest();
+	~DisableKeyRequest();
+	std::string getKeyId() const;
+	void setKeyId(const std::string &keyId);
+
+private:
+	std::string keyId_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_DISABLEKEYREQUEST_H_

kms/include/alibabacloud/kms/model/EnableKeyRequest.h

@@ -1,48 +1,42 @@
 /*
  * 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_ENABLEKEYREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_ENABLEKEYREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT EnableKeyRequest : public RpcServiceRequest
-			{
-
-			public:
-				EnableKeyRequest();
-				~EnableKeyRequest();
-
-				std::string getKeyId()const;
-				void setKeyId(const std::string& keyId);
-
-            private:
-				std::string keyId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_ENABLEKEYREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_ENABLEKEYREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_ENABLEKEYREQUEST_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 EnableKeyRequest : public RpcServiceRequest {
+public:
+	EnableKeyRequest();
+	~EnableKeyRequest();
+	std::string getKeyId() const;
+	void setKeyId(const std::string &keyId);
+
+private:
+	std::string keyId_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_ENABLEKEYREQUEST_H_

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

@@ -1,54 +1,48 @@
 /*
  * 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_ENCRYPTREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_ENCRYPTREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			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);
-
-            private:
-				std::string encryptionContext_;
-				std::string keyId_;
-				std::string plaintext_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_ENCRYPTREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_ENCRYPTREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_ENCRYPTREQUEST_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 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);
+
+private:
+	std::string encryptionContext_;
+	std::string keyId_;
+	std::string plaintext_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_ENCRYPTREQUEST_H_

kms/include/alibabacloud/kms/model/ExportCertificateRequest.h

@@ -1,54 +0,0 @@
-/*
- * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_EXPORTCERTIFICATEREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_EXPORTCERTIFICATEREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT ExportCertificateRequest : public RpcServiceRequest
-			{
-
-			public:
-				ExportCertificateRequest();
-				~ExportCertificateRequest();
-
-				std::string getCertificateId()const;
-				void setCertificateId(const std::string& certificateId);
-				std::string getPassphrase()const;
-				void setPassphrase(const std::string& passphrase);
-				std::string getExportFormat()const;
-				void setExportFormat(const std::string& exportFormat);
-
-            private:
-				std::string certificateId_;
-				std::string passphrase_;
-				std::string exportFormat_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_EXPORTCERTIFICATEREQUEST_H_

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

@@ -1,60 +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_EXPORTDATAKEYREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_EXPORTDATAKEYREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT ExportDataKeyRequest : public RpcServiceRequest
-			{
-
-			public:
-				ExportDataKeyRequest();
-				~ExportDataKeyRequest();
-
-				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 encryptionContext_;
-				std::string wrappingAlgorithm_;
-				std::string ciphertextBlob_;
-				std::string publicKeyBlob_;
-				std::string wrappingKeySpec_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_EXPORTDATAKEYREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_EXPORTDATAKEYREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_EXPORTDATAKEYREQUEST_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 ExportDataKeyRequest : public RpcServiceRequest {
+public:
+	ExportDataKeyRequest();
+	~ExportDataKeyRequest();
+	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 encryptionContext_;
+	std::string wrappingAlgorithm_;
+	std::string ciphertextBlob_;
+	std::string publicKeyBlob_;
+	std::string wrappingKeySpec_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_EXPORTDATAKEYREQUEST_H_

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

@@ -1,66 +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_GENERATEANDEXPORTDATAKEYREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_GENERATEANDEXPORTDATAKEYREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT GenerateAndExportDataKeyRequest : public RpcServiceRequest
-			{
-
-			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 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 wrappingKeySpec_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_GENERATEANDEXPORTDATAKEYREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_GENERATEANDEXPORTDATAKEYREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_GENERATEANDEXPORTDATAKEYREQUEST_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 GenerateAndExportDataKeyRequest : public RpcServiceRequest {
+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 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 wrappingKeySpec_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_GENERATEANDEXPORTDATAKEYREQUEST_H_

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

@@ -1,57 +1,51 @@
 /*
  * 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_GENERATEDATAKEYREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_GENERATEDATAKEYREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			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);
-
-            private:
-				std::string encryptionContext_;
-				std::string keyId_;
-				std::string keySpec_;
-				int numberOfBytes_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_GENERATEDATAKEYREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_GENERATEDATAKEYREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_GENERATEDATAKEYREQUEST_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 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);
+
+private:
+	std::string encryptionContext_;
+	std::string keyId_;
+	std::string keySpec_;
+	int numberOfBytes_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_GENERATEDATAKEYREQUEST_H_

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

@@ -1,57 +1,51 @@
 /*
  * 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_GENERATEDATAKEYWITHOUTPLAINTEXTREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_GENERATEDATAKEYWITHOUTPLAINTEXTREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT GenerateDataKeyWithoutPlaintextRequest : public RpcServiceRequest
-			{
-
-			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);
-
-            private:
-				std::string encryptionContext_;
-				std::string keyId_;
-				std::string keySpec_;
-				int numberOfBytes_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_GENERATEDATAKEYWITHOUTPLAINTEXTREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_GENERATEDATAKEYWITHOUTPLAINTEXTREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_GENERATEDATAKEYWITHOUTPLAINTEXTREQUEST_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 GenerateDataKeyWithoutPlaintextRequest : public RpcServiceRequest {
+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);
+
+private:
+	std::string encryptionContext_;
+	std::string keyId_;
+	std::string keySpec_;
+	int numberOfBytes_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_GENERATEDATAKEYWITHOUTPLAINTEXTREQUEST_H_

kms/include/alibabacloud/kms/model/GetCertificateRequest.h

@@ -1,48 +1,42 @@
 /*
  * 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_GETCERTIFICATEREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_GETCERTIFICATEREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT GetCertificateRequest : public RpcServiceRequest
-			{
-
-			public:
-				GetCertificateRequest();
-				~GetCertificateRequest();
-
-				std::string getCertificateId()const;
-				void setCertificateId(const std::string& certificateId);
-
-            private:
-				std::string certificateId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_GETCERTIFICATEREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_GETCERTIFICATEREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_GETCERTIFICATEREQUEST_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 GetCertificateRequest : public RpcServiceRequest {
+public:
+	GetCertificateRequest();
+	~GetCertificateRequest();
+	std::string getCertificateId() const;
+	void setCertificateId(const std::string &certificateId);
+
+private:
+	std::string certificateId_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_GETCERTIFICATEREQUEST_H_

kms/include/alibabacloud/kms/model/GetParametersForImportRequest.h

@@ -1,54 +1,48 @@
 /*
  * 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_GETPARAMETERSFORIMPORTREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_GETPARAMETERSFORIMPORTREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT GetParametersForImportRequest : public RpcServiceRequest
-			{
-
-			public:
-				GetParametersForImportRequest();
-				~GetParametersForImportRequest();
-
-				std::string getKeyId()const;
-				void setKeyId(const std::string& keyId);
-				std::string getWrappingAlgorithm()const;
-				void setWrappingAlgorithm(const std::string& wrappingAlgorithm);
-				std::string getWrappingKeySpec()const;
-				void setWrappingKeySpec(const std::string& wrappingKeySpec);
-
-            private:
-				std::string keyId_;
-				std::string wrappingAlgorithm_;
-				std::string wrappingKeySpec_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_GETPARAMETERSFORIMPORTREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_GETPARAMETERSFORIMPORTREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_GETPARAMETERSFORIMPORTREQUEST_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 GetParametersForImportRequest : public RpcServiceRequest {
+public:
+	GetParametersForImportRequest();
+	~GetParametersForImportRequest();
+	std::string getKeyId() const;
+	void setKeyId(const std::string &keyId);
+	std::string getWrappingAlgorithm() const;
+	void setWrappingAlgorithm(const std::string &wrappingAlgorithm);
+	std::string getWrappingKeySpec() const;
+	void setWrappingKeySpec(const std::string &wrappingKeySpec);
+
+private:
+	std::string keyId_;
+	std::string wrappingAlgorithm_;
+	std::string wrappingKeySpec_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_GETPARAMETERSFORIMPORTREQUEST_H_

kms/include/alibabacloud/kms/model/GetPublicKeyRequest.h

@@ -1,51 +1,45 @@
 /*
  * 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_GETPUBLICKEYREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_GETPUBLICKEYREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT GetPublicKeyRequest : public RpcServiceRequest
-			{
-
-			public:
-				GetPublicKeyRequest();
-				~GetPublicKeyRequest();
-
-				std::string getKeyVersionId()const;
-				void setKeyVersionId(const std::string& keyVersionId);
-				std::string getKeyId()const;
-				void setKeyId(const std::string& keyId);
-
-            private:
-				std::string keyVersionId_;
-				std::string keyId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_GETPUBLICKEYREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_GETPUBLICKEYREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_GETPUBLICKEYREQUEST_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 GetPublicKeyRequest : public RpcServiceRequest {
+public:
+	GetPublicKeyRequest();
+	~GetPublicKeyRequest();
+	std::string getKeyVersionId() const;
+	void setKeyVersionId(const std::string &keyVersionId);
+	std::string getKeyId() const;
+	void setKeyId(const std::string &keyId);
+
+private:
+	std::string keyVersionId_;
+	std::string keyId_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_GETPUBLICKEYREQUEST_H_

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

@@ -1,66 +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_GETRANDOMPASSWORDREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_GETRANDOMPASSWORDREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT GetRandomPasswordRequest : public RpcServiceRequest
-			{
-
-			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);
-
-            private:
-				std::string excludeLowercase_;
-				std::string excludeCharacters_;
-				std::string passwordLength_;
-				std::string excludePunctuation_;
-				std::string excludeUppercase_;
-				std::string requireEachIncludedType_;
-				std::string excludeNumbers_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_GETRANDOMPASSWORDREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_GETRANDOMPASSWORDREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_GETRANDOMPASSWORDREQUEST_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 GetRandomPasswordRequest : public RpcServiceRequest {
+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);
+
+private:
+	std::string excludeLowercase_;
+	std::string excludeCharacters_;
+	std::string passwordLength_;
+	std::string excludePunctuation_;
+	std::string excludeUppercase_;
+	std::string requireEachIncludedType_;
+	std::string excludeNumbers_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_GETRANDOMPASSWORDREQUEST_H_