diff --git a/VERSION b/VERSION index d9bc507f9..9ca136cfc 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.1603 \ No newline at end of file +1.36.1604 \ No newline at end of file diff --git a/dds/include/alibabacloud/dds/model/CreateDBInstanceRequest.h b/dds/include/alibabacloud/dds/model/CreateDBInstanceRequest.h index b00469ad2..39c4d80f7 100644 --- a/dds/include/alibabacloud/dds/model/CreateDBInstanceRequest.h +++ b/dds/include/alibabacloud/dds/model/CreateDBInstanceRequest.h @@ -64,6 +64,8 @@ public: void setPeriod(int period); std::string getBackupId() const; void setBackupId(const std::string &backupId); + std::string getEncryptionKey() const; + void setEncryptionKey(const std::string &encryptionKey); long getOwnerId() const; void setOwnerId(long ownerId); std::string getDBInstanceClass() const; @@ -106,6 +108,8 @@ public: void setClusterId(const std::string &clusterId); std::string getAccountPassword() const; void setAccountPassword(const std::string &accountPassword); + bool getEncrypted() const; + void setEncrypted(bool encrypted); std::string getVpcId() const; void setVpcId(const std::string &vpcId); std::string getChargeType() const; @@ -127,6 +131,7 @@ private: std::string businessInfo_; int period_; std::string backupId_; + std::string encryptionKey_; long ownerId_; std::string dBInstanceClass_; std::string securityIPList_; @@ -148,6 +153,7 @@ private: std::string ownerAccount_; std::string clusterId_; std::string accountPassword_; + bool encrypted_; std::string vpcId_; std::string chargeType_; }; diff --git a/dds/include/alibabacloud/dds/model/CreateShardingDBInstanceRequest.h b/dds/include/alibabacloud/dds/model/CreateShardingDBInstanceRequest.h index 7308df1ff..78132ebbf 100644 --- a/dds/include/alibabacloud/dds/model/CreateShardingDBInstanceRequest.h +++ b/dds/include/alibabacloud/dds/model/CreateShardingDBInstanceRequest.h @@ -64,6 +64,8 @@ public: void setGlobalSecurityGroupIds(const std::string &globalSecurityGroupIds); int getPeriod() const; void setPeriod(int period); + std::string getEncryptionKey() const; + void setEncryptionKey(const std::string &encryptionKey); std::vector getConfigServer() const; void setConfigServer(const std::vector &configServer); long getOwnerId() const; @@ -100,6 +102,8 @@ public: void setOwnerAccount(const std::string &ownerAccount); std::string getAccountPassword() const; void setAccountPassword(const std::string &accountPassword); + bool getEncrypted() const; + void setEncrypted(bool encrypted); std::string getVpcId() const; void setVpcId(const std::string &vpcId); std::string getProtocolType() const; @@ -119,6 +123,7 @@ private: std::string dBInstanceDescription_; std::string globalSecurityGroupIds_; int period_; + std::string encryptionKey_; std::vector configServer_; long ownerId_; std::string securityIPList_; @@ -137,6 +142,7 @@ private: std::string srcDBInstanceId_; std::string ownerAccount_; std::string accountPassword_; + bool encrypted_; std::string vpcId_; std::string protocolType_; std::string chargeType_; diff --git a/dds/include/alibabacloud/dds/model/DescribeDBInstanceAttributeResult.h b/dds/include/alibabacloud/dds/model/DescribeDBInstanceAttributeResult.h index 24b547867..905c92b52 100644 --- a/dds/include/alibabacloud/dds/model/DescribeDBInstanceAttributeResult.h +++ b/dds/include/alibabacloud/dds/model/DescribeDBInstanceAttributeResult.h @@ -101,53 +101,55 @@ namespace AlibabaCloud std::string nodeId; std::string iPAddress; }; - std::string vPCCloudInstanceIds; std::string resourceGroupId; std::string capacityUnit; std::string hiddenZoneId; + bool encrypted; std::string destroyTime; std::string dBInstanceType; std::string replicaSetName; - std::string storageEngine; std::vector replicaSets; - std::string maintainEndTime; - std::vector mongosList; std::string dBInstanceId; - std::string networkType; std::string lastDowngradeTime; int dBInstanceStorage; - std::string paymentType; std::vector tags; std::string dBInstanceDescription; - std::string maintainStartTime; std::string engine; std::string replacateId; bool dBInstanceReleaseProtection; std::string engineVersion; std::string storageType; std::string dBInstanceStatus; - std::string zoneId; int maxConnections; + std::string vPCId; + std::string dBInstanceClass; + std::string vSwitchId; + std::string lockMode; + std::string currentKernelVersion; + std::string creationTime; + std::vector networkAddresses; + std::vector configserverList; + std::string expireTime; + std::string vPCCloudInstanceIds; + std::string encryptionKey; + std::string storageEngine; + std::string maintainEndTime; + std::vector mongosList; + std::string networkType; + std::string paymentType; + std::string maintainStartTime; + std::string zoneId; std::string readonlyReplicas; std::string replicationFactor; std::string cloudType; - std::string vPCId; - std::string dBInstanceClass; std::string dBInstanceOrderStatus; - std::string vSwitchId; std::vector shardList; - std::string lockMode; int maxIOPS; std::string secondaryZoneId; std::string vpcAuthMode; std::string protocolType; - std::string currentKernelVersion; std::string chargeType; - std::string creationTime; - std::vector networkAddresses; - std::vector configserverList; std::string regionId; - std::string expireTime; std::string kindCode; }; diff --git a/dds/src/model/CreateDBInstanceRequest.cc b/dds/src/model/CreateDBInstanceRequest.cc index 3f8f3adc3..7438c435e 100644 --- a/dds/src/model/CreateDBInstanceRequest.cc +++ b/dds/src/model/CreateDBInstanceRequest.cc @@ -165,6 +165,15 @@ void CreateDBInstanceRequest::setBackupId(const std::string &backupId) { setParameter(std::string("BackupId"), backupId); } +std::string CreateDBInstanceRequest::getEncryptionKey() const { + return encryptionKey_; +} + +void CreateDBInstanceRequest::setEncryptionKey(const std::string &encryptionKey) { + encryptionKey_ = encryptionKey; + setParameter(std::string("EncryptionKey"), encryptionKey); +} + long CreateDBInstanceRequest::getOwnerId() const { return ownerId_; } @@ -354,6 +363,15 @@ void CreateDBInstanceRequest::setAccountPassword(const std::string &accountPassw setParameter(std::string("AccountPassword"), accountPassword); } +bool CreateDBInstanceRequest::getEncrypted() const { + return encrypted_; +} + +void CreateDBInstanceRequest::setEncrypted(bool encrypted) { + encrypted_ = encrypted; + setParameter(std::string("Encrypted"), encrypted ? "true" : "false"); +} + std::string CreateDBInstanceRequest::getVpcId() const { return vpcId_; } diff --git a/dds/src/model/CreateShardingDBInstanceRequest.cc b/dds/src/model/CreateShardingDBInstanceRequest.cc index 08efe676e..d7ae8d945 100644 --- a/dds/src/model/CreateShardingDBInstanceRequest.cc +++ b/dds/src/model/CreateShardingDBInstanceRequest.cc @@ -130,6 +130,15 @@ void CreateShardingDBInstanceRequest::setPeriod(int period) { setParameter(std::string("Period"), std::to_string(period)); } +std::string CreateShardingDBInstanceRequest::getEncryptionKey() const { + return encryptionKey_; +} + +void CreateShardingDBInstanceRequest::setEncryptionKey(const std::string &encryptionKey) { + encryptionKey_ = encryptionKey; + setParameter(std::string("EncryptionKey"), encryptionKey); +} + std::vector CreateShardingDBInstanceRequest::getConfigServer() const { return configServer_; } @@ -301,6 +310,15 @@ void CreateShardingDBInstanceRequest::setAccountPassword(const std::string &acco setParameter(std::string("AccountPassword"), accountPassword); } +bool CreateShardingDBInstanceRequest::getEncrypted() const { + return encrypted_; +} + +void CreateShardingDBInstanceRequest::setEncrypted(bool encrypted) { + encrypted_ = encrypted; + setParameter(std::string("Encrypted"), encrypted ? "true" : "false"); +} + std::string CreateShardingDBInstanceRequest::getVpcId() const { return vpcId_; } diff --git a/dds/src/model/DescribeDBInstanceAttributeResult.cc b/dds/src/model/DescribeDBInstanceAttributeResult.cc index a898001af..64d795179 100644 --- a/dds/src/model/DescribeDBInstanceAttributeResult.cc +++ b/dds/src/model/DescribeDBInstanceAttributeResult.cc @@ -127,6 +127,10 @@ void DescribeDBInstanceAttributeResult::parse(const std::string &payload) dBInstancesObject.paymentType = valueDBInstancesDBInstance["PaymentType"].asString(); if(!valueDBInstancesDBInstance["DBInstanceOrderStatus"].isNull()) dBInstancesObject.dBInstanceOrderStatus = valueDBInstancesDBInstance["DBInstanceOrderStatus"].asString(); + if(!valueDBInstancesDBInstance["Encrypted"].isNull()) + dBInstancesObject.encrypted = valueDBInstancesDBInstance["Encrypted"].asString() == "true"; + if(!valueDBInstancesDBInstance["EncryptionKey"].isNull()) + dBInstancesObject.encryptionKey = valueDBInstancesDBInstance["EncryptionKey"].asString(); auto allReplicaSetsNode = valueDBInstancesDBInstance["ReplicaSets"]["ReplicaSet"]; for (auto valueDBInstancesDBInstanceReplicaSetsReplicaSet : allReplicaSetsNode) {