fix mongodb sharding mongos memory unit (#1573)

* fix mongodb sharding mongos memory unit

* add changelog

---------

Co-authored-by: mikatong <mikatong@tencent.com>

Author: tongyiming

.changelog/1573.txt

@@ -0,0 +1,11 @@
+```release-note:bug
+resource/tencentcloud_mongodb_instance: clean mongos params
+```
+
+```release-note:bug
+resource/tencentcloud_mongodb_sharding_instance: fix mongos_memory unit
+```
+
+```release-note:bug
+resource/tencentcloud_mongodb_standby_instance: clean mongos params
+```

tencentcloud/extension_mongodb.go

@@ -165,7 +165,7 @@ func TencentMongodbBasicInfo() map[string]*schema.Schema {
 			Type:        schema.TypeInt,
 			Optional:    true,
 			Computed:    true,
-			Description: "Mongos memory size.",
+			Description: "Mongos memory size in GB.",
 		},
 		"mongos_node_num": {
 			Type:        schema.TypeInt,

tencentcloud/resource_tc_mongodb_instance.go

@@ -65,6 +65,10 @@ func resourceTencentCloudMongodbInstance() *schema.Resource {
 		},
 	}
 	basic := TencentMongodbBasicInfo()
+	conflictList := []string{"mongos_cpu", "mongos_memory", "mongos_node_num"}
+	for _, item := range conflictList {
+		delete(basic, item)
+	}
 	for k, v := range basic {
 		mongodbInstanceInfo[k] = v
 	}

tencentcloud/resource_tc_mongodb_sharding_instance.go

@@ -371,7 +371,7 @@ func resourceMongodbShardingInstanceRead(d *schema.ResourceData, meta interface{
 	_ = d.Set("vport", instance.Vport)
 	_ = d.Set("create_time", instance.CreateTime)
 	_ = d.Set("mongos_cpu", instance.MongosCpuNum)
-	_ = d.Set("mongos_memory", instance.MongosMemory)
+	_ = d.Set("mongos_memory", *instance.MongosMemory/1024)
 	_ = d.Set("mongos_node_num", instance.MongosNodeNum)
 	_ = d.Set("auto_renew_flag", instance.AutoRenewFlag)
 

tencentcloud/resource_tc_mongodb_standby_instance.go

@@ -102,7 +102,7 @@ func resourceTencentCloudMongodbStandbyInstance() *schema.Resource {
 		},
 	}
 	basic := TencentMongodbBasicInfo()
-	conflictList := []string{"engine_version", "machine_type", "password", "available_zone"}
+	conflictList := []string{"engine_version", "machine_type", "password", "available_zone", "mongos_cpu", "mongos_memory", "mongos_node_num"}
 	for _, item := range conflictList {
 		delete(basic, item)
 	}

website/docs/r/mongodb_instance.html.markdown

@@ -40,9 +40,6 @@ The following arguments are supported:
 * `volume` - (Required, Int) Disk size. The minimum value is 25, and unit is GB. Memory and volume must be upgraded or degraded simultaneously.
 * `auto_renew_flag` - (Optional, Int) Auto renew flag. Valid values are `0`(NOTIFY_AND_MANUAL_RENEW), `1`(NOTIFY_AND_AUTO_RENEW) and `2`(DISABLE_NOTIFY_AND_MANUAL_RENEW). Default value is `0`. Note: only works for PREPAID instance. Only supports`0` and `1` for creation.
 * `charge_type` - (Optional, String, ForceNew) The charge type of instance. Valid values are `PREPAID` and `POSTPAID_BY_HOUR`. Default value is `POSTPAID_BY_HOUR`. Note: TencentCloud International only supports `POSTPAID_BY_HOUR`. Caution that update operation on this field will delete old instances and create new one with new charge type.
-* `mongos_cpu` - (Optional, Int) Number of mongos cpu.
-* `mongos_memory` - (Optional, Int) Mongos memory size.
-* `mongos_node_num` - (Optional, Int) Number of mongos.
 * `password` - (Optional, String) Password of this Mongodb account.
 * `prepaid_period` - (Optional, Int) The tenancy (time unit is month) of the prepaid instance. Valid values are 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 24, 36. NOTE: it only works when charge_type is set to `PREPAID`.
 * `project_id` - (Optional, Int) ID of the project which the instance belongs.

website/docs/r/mongodb_sharding_instance.html.markdown

@@ -48,7 +48,7 @@ The following arguments are supported:
 * `auto_renew_flag` - (Optional, Int) Auto renew flag. Valid values are `0`(NOTIFY_AND_MANUAL_RENEW), `1`(NOTIFY_AND_AUTO_RENEW) and `2`(DISABLE_NOTIFY_AND_MANUAL_RENEW). Default value is `0`. Note: only works for PREPAID instance. Only supports`0` and `1` for creation.
 * `charge_type` - (Optional, String, ForceNew) The charge type of instance. Valid values are `PREPAID` and `POSTPAID_BY_HOUR`. Default value is `POSTPAID_BY_HOUR`. Note: TencentCloud International only supports `POSTPAID_BY_HOUR`. Caution that update operation on this field will delete old instances and create new one with new charge type.
 * `mongos_cpu` - (Optional, Int) Number of mongos cpu.
-* `mongos_memory` - (Optional, Int) Mongos memory size.
+* `mongos_memory` - (Optional, Int) Mongos memory size in GB.
 * `mongos_node_num` - (Optional, Int) Number of mongos.
 * `password` - (Optional, String) Password of this Mongodb account.
 * `prepaid_period` - (Optional, Int) The tenancy (time unit is month) of the prepaid instance. Valid values are 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 24, 36. NOTE: it only works when charge_type is set to `PREPAID`.

website/docs/r/mongodb_standby_instance.html.markdown

@@ -66,9 +66,6 @@ The following arguments are supported:
 * `volume` - (Required, Int) Disk size. The minimum value is 25, and unit is GB. Memory and volume must be upgraded or degraded simultaneously.
 * `auto_renew_flag` - (Optional, Int) Auto renew flag. Valid values are `0`(NOTIFY_AND_MANUAL_RENEW), `1`(NOTIFY_AND_AUTO_RENEW) and `2`(DISABLE_NOTIFY_AND_MANUAL_RENEW). Default value is `0`. Note: only works for PREPAID instance. Only supports`0` and `1` for creation.
 * `charge_type` - (Optional, String, ForceNew) The charge type of instance. Valid values are `PREPAID` and `POSTPAID_BY_HOUR`. Default value is `POSTPAID_BY_HOUR`. Note: TencentCloud International only supports `POSTPAID_BY_HOUR`. Caution that update operation on this field will delete old instances and create new one with new charge type.
-* `mongos_cpu` - (Optional, Int) Number of mongos cpu.
-* `mongos_memory` - (Optional, Int) Mongos memory size.
-* `mongos_node_num` - (Optional, Int) Number of mongos.
 * `prepaid_period` - (Optional, Int) The tenancy (time unit is month) of the prepaid instance. Valid values are 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 24, 36. NOTE: it only works when charge_type is set to `PREPAID`.
 * `project_id` - (Optional, Int) ID of the project which the instance belongs.
 * `security_groups` - (Optional, Set: [`String`], ForceNew) ID of the security group. NOTE: for instance which `engine_version` is `MONGO_40_WT`, `security_groups` is not supported.