sdk-team 5 лет назад
Родитель
Сommit
0a08e77127

+ 3 - 0
CHANGELOG

@@ -1,3 +1,6 @@
+2020-12-24 Version: patch
+- Update Open API.
+
 2020-12-23 Version: patch
 - CDRS First edition.
 

+ 0 - 4
rds/CMakeLists.txt

@@ -187,8 +187,6 @@ set(rds_public_header_model
 	include/alibabacloud/rds/model/DescribeDBInstancesByPerformanceResult.h
 	include/alibabacloud/rds/model/DescribeDBInstancesForCloneRequest.h
 	include/alibabacloud/rds/model/DescribeDBInstancesForCloneResult.h
-	include/alibabacloud/rds/model/DescribeDBInstancesOverviewRequest.h
-	include/alibabacloud/rds/model/DescribeDBInstancesOverviewResult.h
 	include/alibabacloud/rds/model/DescribeDBProxyRequest.h
 	include/alibabacloud/rds/model/DescribeDBProxyResult.h
 	include/alibabacloud/rds/model/DescribeDBProxyEndpointRequest.h
@@ -642,8 +640,6 @@ set(rds_src
 	src/model/DescribeDBInstancesByPerformanceResult.cc
 	src/model/DescribeDBInstancesForCloneRequest.cc
 	src/model/DescribeDBInstancesForCloneResult.cc
-	src/model/DescribeDBInstancesOverviewRequest.cc
-	src/model/DescribeDBInstancesOverviewResult.cc
 	src/model/DescribeDBProxyRequest.cc
 	src/model/DescribeDBProxyResult.cc
 	src/model/DescribeDBProxyEndpointRequest.cc

+ 0 - 8
rds/include/alibabacloud/rds/RdsClient.h

@@ -188,8 +188,6 @@
 #include "model/DescribeDBInstancesByPerformanceResult.h"
 #include "model/DescribeDBInstancesForCloneRequest.h"
 #include "model/DescribeDBInstancesForCloneResult.h"
-#include "model/DescribeDBInstancesOverviewRequest.h"
-#include "model/DescribeDBInstancesOverviewResult.h"
 #include "model/DescribeDBProxyRequest.h"
 #include "model/DescribeDBProxyResult.h"
 #include "model/DescribeDBProxyEndpointRequest.h"
@@ -732,9 +730,6 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DescribeDBInstancesForCloneResult> DescribeDBInstancesForCloneOutcome;
 			typedef std::future<DescribeDBInstancesForCloneOutcome> DescribeDBInstancesForCloneOutcomeCallable;
 			typedef std::function<void(const RdsClient*, const Model::DescribeDBInstancesForCloneRequest&, const DescribeDBInstancesForCloneOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDBInstancesForCloneAsyncHandler;
-			typedef Outcome<Error, Model::DescribeDBInstancesOverviewResult> DescribeDBInstancesOverviewOutcome;
-			typedef std::future<DescribeDBInstancesOverviewOutcome> DescribeDBInstancesOverviewOutcomeCallable;
-			typedef std::function<void(const RdsClient*, const Model::DescribeDBInstancesOverviewRequest&, const DescribeDBInstancesOverviewOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDBInstancesOverviewAsyncHandler;
 			typedef Outcome<Error, Model::DescribeDBProxyResult> DescribeDBProxyOutcome;
 			typedef std::future<DescribeDBProxyOutcome> DescribeDBProxyOutcomeCallable;
 			typedef std::function<void(const RdsClient*, const Model::DescribeDBProxyRequest&, const DescribeDBProxyOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDBProxyAsyncHandler;
@@ -1415,9 +1410,6 @@ namespace AlibabaCloud
 			DescribeDBInstancesForCloneOutcome describeDBInstancesForClone(const Model::DescribeDBInstancesForCloneRequest &request)const;
 			void describeDBInstancesForCloneAsync(const Model::DescribeDBInstancesForCloneRequest& request, const DescribeDBInstancesForCloneAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeDBInstancesForCloneOutcomeCallable describeDBInstancesForCloneCallable(const Model::DescribeDBInstancesForCloneRequest& request) const;
-			DescribeDBInstancesOverviewOutcome describeDBInstancesOverview(const Model::DescribeDBInstancesOverviewRequest &request)const;
-			void describeDBInstancesOverviewAsync(const Model::DescribeDBInstancesOverviewRequest& request, const DescribeDBInstancesOverviewAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			DescribeDBInstancesOverviewOutcomeCallable describeDBInstancesOverviewCallable(const Model::DescribeDBInstancesOverviewRequest& request) const;
 			DescribeDBProxyOutcome describeDBProxy(const Model::DescribeDBProxyRequest &request)const;
 			void describeDBProxyAsync(const Model::DescribeDBProxyRequest& request, const DescribeDBProxyAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeDBProxyOutcomeCallable describeDBProxyCallable(const Model::DescribeDBProxyRequest& request) const;

+ 0 - 81
rds/include/alibabacloud/rds/model/DescribeDBInstancesOverviewRequest.h

@@ -1,81 +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_RDS_MODEL_DESCRIBEDBINSTANCESOVERVIEWREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_DESCRIBEDBINSTANCESOVERVIEWREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/rds/RdsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Rds
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_RDS_EXPORT DescribeDBInstancesOverviewRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeDBInstancesOverviewRequest();
-				~DescribeDBInstancesOverviewRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getClientToken()const;
-				void setClientToken(const std::string& clientToken);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getResourceGroupId()const;
-				void setResourceGroupId(const std::string& resourceGroupId);
-				std::string getExpired()const;
-				void setExpired(const std::string& expired);
-				std::string getEngine()const;
-				void setEngine(const std::string& engine);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getDBInstanceId()const;
-				void setDBInstanceId(const std::string& dBInstanceId);
-				std::string getProxyId()const;
-				void setProxyId(const std::string& proxyId);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				std::string getZoneId()const;
-				void setZoneId(const std::string& zoneId);
-
-            private:
-				long resourceOwnerId_;
-				std::string clientToken_;
-				std::string accessKeyId_;
-				std::string resourceGroupId_;
-				std::string expired_;
-				std::string engine_;
-				std::string regionId_;
-				std::string dBInstanceId_;
-				std::string proxyId_;
-				std::string resourceOwnerAccount_;
-				long ownerId_;
-				std::string zoneId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_DESCRIBEDBINSTANCESOVERVIEWREQUEST_H_

+ 0 - 76
rds/include/alibabacloud/rds/model/DescribeDBInstancesOverviewResult.h

@@ -1,76 +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_RDS_MODEL_DESCRIBEDBINSTANCESOVERVIEWRESULT_H_
-#define ALIBABACLOUD_RDS_MODEL_DESCRIBEDBINSTANCESOVERVIEWRESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/rds/RdsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Rds
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_RDS_EXPORT DescribeDBInstancesOverviewResult : public ServiceResult
-			{
-			public:
-				struct RegionModel
-				{
-					struct TypeModel
-					{
-						struct InstanceModel
-						{
-							std::string createdTime;
-							std::string zoneId;
-							std::string dBInstanceStatus;
-							std::string dBInstanceId;
-							std::string region;
-							std::string payType;
-							std::string lockMode;
-							std::string expireTime;
-							std::string engine;
-						};
-						std::vector<TypeModel::InstanceModel> instanceModels;
-						int count;
-						std::string instanceDateType;
-					};
-					int totalCount;
-					std::string region;
-					std::vector<RegionModel::TypeModel> typeModels;
-					std::string engineCount;
-				};
-
-
-				DescribeDBInstancesOverviewResult();
-				explicit DescribeDBInstancesOverviewResult(const std::string &payload);
-				~DescribeDBInstancesOverviewResult();
-				std::vector<RegionModel> getRegions()const;
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-				std::vector<RegionModel> regions_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_DESCRIBEDBINSTANCESOVERVIEWRESULT_H_

+ 0 - 36
rds/src/RdsClient.cc

@@ -3039,42 +3039,6 @@ RdsClient::DescribeDBInstancesForCloneOutcomeCallable RdsClient::describeDBInsta
 	return task->get_future();
 }
 
-RdsClient::DescribeDBInstancesOverviewOutcome RdsClient::describeDBInstancesOverview(const DescribeDBInstancesOverviewRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return DescribeDBInstancesOverviewOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return DescribeDBInstancesOverviewOutcome(DescribeDBInstancesOverviewResult(outcome.result()));
-	else
-		return DescribeDBInstancesOverviewOutcome(outcome.error());
-}
-
-void RdsClient::describeDBInstancesOverviewAsync(const DescribeDBInstancesOverviewRequest& request, const DescribeDBInstancesOverviewAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, describeDBInstancesOverview(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-RdsClient::DescribeDBInstancesOverviewOutcomeCallable RdsClient::describeDBInstancesOverviewCallable(const DescribeDBInstancesOverviewRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<DescribeDBInstancesOverviewOutcome()>>(
-			[this, request]()
-			{
-			return this->describeDBInstancesOverview(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
 RdsClient::DescribeDBProxyOutcome RdsClient::describeDBProxy(const DescribeDBProxyRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

+ 0 - 161
rds/src/model/DescribeDBInstancesOverviewRequest.cc

@@ -1,161 +0,0 @@
-/*
- * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <alibabacloud/rds/model/DescribeDBInstancesOverviewRequest.h>
-
-using AlibabaCloud::Rds::Model::DescribeDBInstancesOverviewRequest;
-
-DescribeDBInstancesOverviewRequest::DescribeDBInstancesOverviewRequest() :
-	RpcServiceRequest("rds", "2014-08-15", "DescribeDBInstancesOverview")
-{
-	setMethod(HttpRequest::Method::Post);
-}
-
-DescribeDBInstancesOverviewRequest::~DescribeDBInstancesOverviewRequest()
-{}
-
-long DescribeDBInstancesOverviewRequest::getResourceOwnerId()const
-{
-	return resourceOwnerId_;
-}
-
-void DescribeDBInstancesOverviewRequest::setResourceOwnerId(long resourceOwnerId)
-{
-	resourceOwnerId_ = resourceOwnerId;
-	setParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
-}
-
-std::string DescribeDBInstancesOverviewRequest::getClientToken()const
-{
-	return clientToken_;
-}
-
-void DescribeDBInstancesOverviewRequest::setClientToken(const std::string& clientToken)
-{
-	clientToken_ = clientToken;
-	setParameter("ClientToken", clientToken);
-}
-
-std::string DescribeDBInstancesOverviewRequest::getAccessKeyId()const
-{
-	return accessKeyId_;
-}
-
-void DescribeDBInstancesOverviewRequest::setAccessKeyId(const std::string& accessKeyId)
-{
-	accessKeyId_ = accessKeyId;
-	setParameter("AccessKeyId", accessKeyId);
-}
-
-std::string DescribeDBInstancesOverviewRequest::getResourceGroupId()const
-{
-	return resourceGroupId_;
-}
-
-void DescribeDBInstancesOverviewRequest::setResourceGroupId(const std::string& resourceGroupId)
-{
-	resourceGroupId_ = resourceGroupId;
-	setParameter("ResourceGroupId", resourceGroupId);
-}
-
-std::string DescribeDBInstancesOverviewRequest::getExpired()const
-{
-	return expired_;
-}
-
-void DescribeDBInstancesOverviewRequest::setExpired(const std::string& expired)
-{
-	expired_ = expired;
-	setParameter("Expired", expired);
-}
-
-std::string DescribeDBInstancesOverviewRequest::getEngine()const
-{
-	return engine_;
-}
-
-void DescribeDBInstancesOverviewRequest::setEngine(const std::string& engine)
-{
-	engine_ = engine;
-	setParameter("Engine", engine);
-}
-
-std::string DescribeDBInstancesOverviewRequest::getRegionId()const
-{
-	return regionId_;
-}
-
-void DescribeDBInstancesOverviewRequest::setRegionId(const std::string& regionId)
-{
-	regionId_ = regionId;
-	setParameter("RegionId", regionId);
-}
-
-std::string DescribeDBInstancesOverviewRequest::getDBInstanceId()const
-{
-	return dBInstanceId_;
-}
-
-void DescribeDBInstancesOverviewRequest::setDBInstanceId(const std::string& dBInstanceId)
-{
-	dBInstanceId_ = dBInstanceId;
-	setParameter("DBInstanceId", dBInstanceId);
-}
-
-std::string DescribeDBInstancesOverviewRequest::getProxyId()const
-{
-	return proxyId_;
-}
-
-void DescribeDBInstancesOverviewRequest::setProxyId(const std::string& proxyId)
-{
-	proxyId_ = proxyId;
-	setParameter("ProxyId", proxyId);
-}
-
-std::string DescribeDBInstancesOverviewRequest::getResourceOwnerAccount()const
-{
-	return resourceOwnerAccount_;
-}
-
-void DescribeDBInstancesOverviewRequest::setResourceOwnerAccount(const std::string& resourceOwnerAccount)
-{
-	resourceOwnerAccount_ = resourceOwnerAccount;
-	setParameter("ResourceOwnerAccount", resourceOwnerAccount);
-}
-
-long DescribeDBInstancesOverviewRequest::getOwnerId()const
-{
-	return ownerId_;
-}
-
-void DescribeDBInstancesOverviewRequest::setOwnerId(long ownerId)
-{
-	ownerId_ = ownerId;
-	setParameter("OwnerId", std::to_string(ownerId));
-}
-
-std::string DescribeDBInstancesOverviewRequest::getZoneId()const
-{
-	return zoneId_;
-}
-
-void DescribeDBInstancesOverviewRequest::setZoneId(const std::string& zoneId)
-{
-	zoneId_ = zoneId;
-	setParameter("ZoneId", zoneId);
-}
-

+ 0 - 95
rds/src/model/DescribeDBInstancesOverviewResult.cc

@@ -1,95 +0,0 @@
-/*
- * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <alibabacloud/rds/model/DescribeDBInstancesOverviewResult.h>
-#include <json/json.h>
-
-using namespace AlibabaCloud::Rds;
-using namespace AlibabaCloud::Rds::Model;
-
-DescribeDBInstancesOverviewResult::DescribeDBInstancesOverviewResult() :
-	ServiceResult()
-{}
-
-DescribeDBInstancesOverviewResult::DescribeDBInstancesOverviewResult(const std::string &payload) :
-	ServiceResult()
-{
-	parse(payload);
-}
-
-DescribeDBInstancesOverviewResult::~DescribeDBInstancesOverviewResult()
-{}
-
-void DescribeDBInstancesOverviewResult::parse(const std::string &payload)
-{
-	Json::Reader reader;
-	Json::Value value;
-	reader.parse(payload, value);
-	setRequestId(value["RequestId"].asString());
-	auto allRegionsNode = value["Regions"]["RegionModel"];
-	for (auto valueRegionsRegionModel : allRegionsNode)
-	{
-		RegionModel regionsObject;
-		if(!valueRegionsRegionModel["Region"].isNull())
-			regionsObject.region = valueRegionsRegionModel["Region"].asString();
-		if(!valueRegionsRegionModel["EngineCount"].isNull())
-			regionsObject.engineCount = valueRegionsRegionModel["EngineCount"].asString();
-		if(!valueRegionsRegionModel["TotalCount"].isNull())
-			regionsObject.totalCount = std::stoi(valueRegionsRegionModel["TotalCount"].asString());
-		auto allTypeModelsNode = valueRegionsRegionModel["TypeModels"]["TypeModel"];
-		for (auto valueRegionsRegionModelTypeModelsTypeModel : allTypeModelsNode)
-		{
-			RegionModel::TypeModel typeModelsObject;
-			if(!valueRegionsRegionModelTypeModelsTypeModel["InstanceDateType"].isNull())
-				typeModelsObject.instanceDateType = valueRegionsRegionModelTypeModelsTypeModel["InstanceDateType"].asString();
-			if(!valueRegionsRegionModelTypeModelsTypeModel["Count"].isNull())
-				typeModelsObject.count = std::stoi(valueRegionsRegionModelTypeModelsTypeModel["Count"].asString());
-			auto allInstanceModelsNode = valueRegionsRegionModelTypeModelsTypeModel["InstanceModels"]["InstanceModel"];
-			for (auto valueRegionsRegionModelTypeModelsTypeModelInstanceModelsInstanceModel : allInstanceModelsNode)
-			{
-				RegionModel::TypeModel::InstanceModel instanceModelsObject;
-				if(!valueRegionsRegionModelTypeModelsTypeModelInstanceModelsInstanceModel["DBInstanceId"].isNull())
-					instanceModelsObject.dBInstanceId = valueRegionsRegionModelTypeModelsTypeModelInstanceModelsInstanceModel["DBInstanceId"].asString();
-				if(!valueRegionsRegionModelTypeModelsTypeModelInstanceModelsInstanceModel["Region"].isNull())
-					instanceModelsObject.region = valueRegionsRegionModelTypeModelsTypeModelInstanceModelsInstanceModel["Region"].asString();
-				if(!valueRegionsRegionModelTypeModelsTypeModelInstanceModelsInstanceModel["ZoneId"].isNull())
-					instanceModelsObject.zoneId = valueRegionsRegionModelTypeModelsTypeModelInstanceModelsInstanceModel["ZoneId"].asString();
-				if(!valueRegionsRegionModelTypeModelsTypeModelInstanceModelsInstanceModel["Engine"].isNull())
-					instanceModelsObject.engine = valueRegionsRegionModelTypeModelsTypeModelInstanceModelsInstanceModel["Engine"].asString();
-				if(!valueRegionsRegionModelTypeModelsTypeModelInstanceModelsInstanceModel["PayType"].isNull())
-					instanceModelsObject.payType = valueRegionsRegionModelTypeModelsTypeModelInstanceModelsInstanceModel["PayType"].asString();
-				if(!valueRegionsRegionModelTypeModelsTypeModelInstanceModelsInstanceModel["CreatedTime"].isNull())
-					instanceModelsObject.createdTime = valueRegionsRegionModelTypeModelsTypeModelInstanceModelsInstanceModel["CreatedTime"].asString();
-				if(!valueRegionsRegionModelTypeModelsTypeModelInstanceModelsInstanceModel["ExpireTime"].isNull())
-					instanceModelsObject.expireTime = valueRegionsRegionModelTypeModelsTypeModelInstanceModelsInstanceModel["ExpireTime"].asString();
-				if(!valueRegionsRegionModelTypeModelsTypeModelInstanceModelsInstanceModel["LockMode"].isNull())
-					instanceModelsObject.lockMode = valueRegionsRegionModelTypeModelsTypeModelInstanceModelsInstanceModel["LockMode"].asString();
-				if(!valueRegionsRegionModelTypeModelsTypeModelInstanceModelsInstanceModel["DBInstanceStatus"].isNull())
-					instanceModelsObject.dBInstanceStatus = valueRegionsRegionModelTypeModelsTypeModelInstanceModelsInstanceModel["DBInstanceStatus"].asString();
-				typeModelsObject.instanceModels.push_back(instanceModelsObject);
-			}
-			regionsObject.typeModels.push_back(typeModelsObject);
-		}
-		regions_.push_back(regionsObject);
-	}
-
-}
-
-std::vector<DescribeDBInstancesOverviewResult::RegionModel> DescribeDBInstancesOverviewResult::getRegions()const
-{
-	return regions_;
-}
-