diff --git a/CHANGELOG b/CHANGELOG index d640ce3aa..e9ddfd907 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +2021-12-27 Version: 1.36.997 +- DescribeDBInstances Add CapacityUnit. + 2021-12-27 Version: 1.36.996 - Update DeleteFCTrigger. diff --git a/VERSION b/VERSION index 50f675b54..393c78e53 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.996 \ No newline at end of file +1.36.997 \ No newline at end of file diff --git a/dds/include/alibabacloud/dds/model/CreateShardingDBInstanceRequest.h b/dds/include/alibabacloud/dds/model/CreateShardingDBInstanceRequest.h index 28dbd1686..d355bbcea 100644 --- a/dds/include/alibabacloud/dds/model/CreateShardingDBInstanceRequest.h +++ b/dds/include/alibabacloud/dds/model/CreateShardingDBInstanceRequest.h @@ -65,6 +65,8 @@ namespace AlibabaCloud void setAccessKeyId(const std::string& accessKeyId); std::string getStorageEngine()const; void setStorageEngine(const std::string& storageEngine); + std::string getResourceGroupId()const; + void setResourceGroupId(const std::string& resourceGroupId); std::string getRegionId()const; void setRegionId(const std::string& regionId); std::string getSecurityToken()const; @@ -114,6 +116,7 @@ namespace AlibabaCloud std::vector replicaSet_; std::string accessKeyId_; std::string storageEngine_; + std::string resourceGroupId_; std::string regionId_; std::string securityToken_; std::string engine_; diff --git a/dds/include/alibabacloud/dds/model/DescribeDBInstanceAttributeResult.h b/dds/include/alibabacloud/dds/model/DescribeDBInstanceAttributeResult.h index d8e090407..15b088215 100644 --- a/dds/include/alibabacloud/dds/model/DescribeDBInstanceAttributeResult.h +++ b/dds/include/alibabacloud/dds/model/DescribeDBInstanceAttributeResult.h @@ -113,6 +113,7 @@ namespace AlibabaCloud int maxConnections; std::string readonlyReplicas; std::string replicationFactor; + std::string cloudType; std::string vPCId; std::string dBInstanceClass; std::string vSwitchId; diff --git a/dds/include/alibabacloud/dds/model/DescribeDBInstancesResult.h b/dds/include/alibabacloud/dds/model/DescribeDBInstancesResult.h index 86b9425e4..ded4bb263 100644 --- a/dds/include/alibabacloud/dds/model/DescribeDBInstancesResult.h +++ b/dds/include/alibabacloud/dds/model/DescribeDBInstancesResult.h @@ -69,6 +69,7 @@ namespace AlibabaCloud std::string dBInstanceStatus; std::string zoneId; std::string replicationFactor; + std::string cloudType; std::string dBInstanceClass; std::vector shardList; std::string lockMode; diff --git a/dds/src/model/CreateShardingDBInstanceRequest.cc b/dds/src/model/CreateShardingDBInstanceRequest.cc index f537ae46f..0dfdfb30b 100644 --- a/dds/src/model/CreateShardingDBInstanceRequest.cc +++ b/dds/src/model/CreateShardingDBInstanceRequest.cc @@ -110,6 +110,17 @@ void CreateShardingDBInstanceRequest::setStorageEngine(const std::string& storag setParameter("StorageEngine", storageEngine); } +std::string CreateShardingDBInstanceRequest::getResourceGroupId()const +{ + return resourceGroupId_; +} + +void CreateShardingDBInstanceRequest::setResourceGroupId(const std::string& resourceGroupId) +{ + resourceGroupId_ = resourceGroupId; + setParameter("ResourceGroupId", resourceGroupId); +} + std::string CreateShardingDBInstanceRequest::getRegionId()const { return regionId_; diff --git a/dds/src/model/DescribeDBInstanceAttributeResult.cc b/dds/src/model/DescribeDBInstanceAttributeResult.cc index a7a5dd5c2..eadc43dce 100644 --- a/dds/src/model/DescribeDBInstanceAttributeResult.cc +++ b/dds/src/model/DescribeDBInstanceAttributeResult.cc @@ -113,6 +113,8 @@ void DescribeDBInstanceAttributeResult::parse(const std::string &payload) dBInstancesObject.kindCode = valueDBInstancesDBInstance["KindCode"].asString(); if(!valueDBInstancesDBInstance["CapacityUnit"].isNull()) dBInstancesObject.capacityUnit = valueDBInstancesDBInstance["CapacityUnit"].asString(); + if(!valueDBInstancesDBInstance["CloudType"].isNull()) + dBInstancesObject.cloudType = valueDBInstancesDBInstance["CloudType"].asString(); auto allReplicaSetsNode = valueDBInstancesDBInstance["ReplicaSets"]["ReplicaSet"]; for (auto valueDBInstancesDBInstanceReplicaSetsReplicaSet : allReplicaSetsNode) { diff --git a/dds/src/model/DescribeDBInstancesResult.cc b/dds/src/model/DescribeDBInstancesResult.cc index a8fee707f..2bd747753 100644 --- a/dds/src/model/DescribeDBInstancesResult.cc +++ b/dds/src/model/DescribeDBInstancesResult.cc @@ -71,8 +71,6 @@ void DescribeDBInstancesResult::parse(const std::string &payload) dBInstancesObject.regionId = valueDBInstancesDBInstance["RegionId"].asString(); if(!valueDBInstancesDBInstance["DBInstanceStorage"].isNull()) dBInstancesObject.dBInstanceStorage = std::stoi(valueDBInstancesDBInstance["DBInstanceStorage"].asString()); - if(!valueDBInstancesDBInstance["CapacityUnit"].isNull()) - dBInstancesObject.capacityUnit = valueDBInstancesDBInstance["CapacityUnit"].asString(); if(!valueDBInstancesDBInstance["ResourceGroupId"].isNull()) dBInstancesObject.resourceGroupId = valueDBInstancesDBInstance["ResourceGroupId"].asString(); if(!valueDBInstancesDBInstance["ZoneId"].isNull()) @@ -87,6 +85,10 @@ void DescribeDBInstancesResult::parse(const std::string &payload) dBInstancesObject.replicationFactor = valueDBInstancesDBInstance["ReplicationFactor"].asString(); if(!valueDBInstancesDBInstance["KindCode"].isNull()) dBInstancesObject.kindCode = valueDBInstancesDBInstance["KindCode"].asString(); + if(!valueDBInstancesDBInstance["CloudType"].isNull()) + dBInstancesObject.cloudType = valueDBInstancesDBInstance["CloudType"].asString(); + if(!valueDBInstancesDBInstance["CapacityUnit"].isNull()) + dBInstancesObject.capacityUnit = valueDBInstancesDBInstance["CapacityUnit"].asString(); auto allTagsNode = valueDBInstancesDBInstance["Tags"]["Tag"]; for (auto valueDBInstancesDBInstanceTagsTag : allTagsNode) { diff --git a/dds/src/model/ListTagResourcesResult.cc b/dds/src/model/ListTagResourcesResult.cc index e8395e863..a31b32271 100644 --- a/dds/src/model/ListTagResourcesResult.cc +++ b/dds/src/model/ListTagResourcesResult.cc @@ -43,14 +43,14 @@ void ListTagResourcesResult::parse(const std::string &payload) for (auto valueTagResourcesTagResource : allTagResourcesNode) { TagResource tagResourcesObject; - if(!valueTagResourcesTagResource["TagKey"].isNull()) - tagResourcesObject.tagKey = valueTagResourcesTagResource["TagKey"].asString(); - if(!valueTagResourcesTagResource["TagValue"].isNull()) - tagResourcesObject.tagValue = valueTagResourcesTagResource["TagValue"].asString(); if(!valueTagResourcesTagResource["ResourceType"].isNull()) tagResourcesObject.resourceType = valueTagResourcesTagResource["ResourceType"].asString(); + if(!valueTagResourcesTagResource["TagValue"].isNull()) + tagResourcesObject.tagValue = valueTagResourcesTagResource["TagValue"].asString(); if(!valueTagResourcesTagResource["ResourceId"].isNull()) tagResourcesObject.resourceId = valueTagResourcesTagResource["ResourceId"].asString(); + if(!valueTagResourcesTagResource["TagKey"].isNull()) + tagResourcesObject.tagKey = valueTagResourcesTagResource["TagKey"].asString(); tagResources_.push_back(tagResourcesObject); } if(!value["NextToken"].isNull())