mongodb support multi zone (#2013)

* mongodb support multi zone

* add changelog

* rm needfix

---------

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

Author: tongyiming

.changelog/2013.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/tencentcloud_mongodb_instance: support params `node_num`, `availability_zone_list` and `hidden_zone`
+```

tencentcloud/resource_tc_mongodb_instance.go

@@ -8,11 +8,11 @@ resource "tencentcloud_mongodb_instance" "mongodb" {
   instance_name  = "mongodb"
   memory         = 4
   volume         = 100
-  engine_version = "MONGO_3_WT"
-  machine_type   = "GIO"
+  engine_version = "MONGO_36_WT"
+  machine_type   = "HIO10G"
   available_zone = "ap-guangzhou-2"
-  vpc_id         = "vpc-mz3efvbw"
-  subnet_id      = "subnet-lk0svi3p"
+  vpc_id         = "vpc-xxxxxx"
+  subnet_id      = "subnet-xxxxxx"
   project_id     = 0
   password       = "password1234"
 }
@@ -63,6 +63,33 @@ func resourceTencentCloudMongodbInstance() *schema.Resource {
 				},
 			},
 		},
+		"node_num": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Computed:    true,
+			Description: "The number of nodes in each replica set. Default value: 3.",
+		},
+		"availability_zone_list": {
+			Type:     schema.TypeList,
+			Optional: true,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeString,
+			},
+			RequiredWith: []string{"hidden_zone"},
+			Description: `A list of nodes deployed in multiple availability zones. For more information, please use the API DescribeSpecInfo.
+			- Multi-availability zone deployment nodes can only be deployed in 3 different availability zones. It is not supported to deploy most nodes of the cluster in the same availability zone. For example, a 3-node cluster does not support the deployment of 2 nodes in the same zone.
+			- Version 4.2 and above are not supported.
+			- Read-only disaster recovery instances are not supported.
+			- Basic network cannot be selected.`,
+		},
+		"hidden_zone": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Computed:     true,
+			RequiredWith: []string{"availability_zone_list"},
+			Description:  "The availability zone to which the Hidden node belongs. This parameter must be configured to deploy instances across availability zones.",
+		},
 	}
 	basic := TencentMongodbBasicInfo()
 	conflictList := []string{"mongos_cpu", "mongos_memory", "mongos_node_num"}
@@ -108,6 +135,10 @@ func mongodbAllInstanceReqSet(requestInter interface{}, d *schema.ResourceData)
 		machine = MONGODB_MACHINE_TYPE_HIO10G
 	}
 
+	if v, ok := d.GetOk("node_num"); ok {
+		nodeNum = v.(int)
+	}
+
 	if v, ok := d.GetOk("password"); ok && v.(string) != "" {
 		password = v.(string)
 	} else {
@@ -159,7 +190,13 @@ func mongodbAllInstanceReqSet(requestInter interface{}, d *schema.ResourceData)
 		}
 		value.FieldByName("AutoRenewFlag").Set(reflect.ValueOf(helper.IntUint64(d.Get("auto_renew_flag").(int))))
 	}
-
+	if v, ok := d.GetOk("availability_zone_list"); ok {
+		availabilityZoneList := helper.InterfacesStringsPoint(v.([]interface{}))
+		value.FieldByName("AvailabilityZoneList").Set(reflect.ValueOf(availabilityZoneList))
+	}
+	if v, ok := d.GetOk("hidden_zone"); ok {
+		value.FieldByName("HiddenZone").Set(reflect.ValueOf(helper.String(v.(string))))
+	}
 	return nil
 }
 
@@ -361,6 +398,25 @@ func resourceTencentCloudMongodbInstanceRead(d *schema.ResourceData, meta interf
 	_ = d.Set("vip", instance.Vip)
 	_ = d.Set("vport", instance.Vport)
 	_ = d.Set("create_time", instance.CreateTime)
+	_ = d.Set("node_num", *instance.SecondaryNum+1)
+
+	replicateSets, err := mongodbService.DescribeDBInstanceNodeProperty(ctx, instanceId)
+	if err != nil {
+		return err
+	}
+	if len(replicateSets) > 0 {
+		var hiddenZone string
+		availabilityZoneList := make([]string, 0, 3)
+		for _, replicate := range replicateSets[0].Nodes {
+			itemZone := *replicate.Zone
+			if *replicate.Hidden {
+				hiddenZone = itemZone
+			}
+			availabilityZoneList = append(availabilityZoneList, itemZone)
+		}
+		_ = d.Set("hidden_zone", hiddenZone)
+		_ = d.Set("availability_zone_list", availabilityZoneList)
+	}
 
 	// standby instance list
 	var standbyInsList []map[string]string
@@ -401,6 +457,14 @@ func resourceTencentCloudMongodbInstanceUpdate(d *schema.ResourceData, meta inte
 
 	d.Partial(true)
 
+	immutableArgs := []string{"node_num", "availability_zone_list", "hidden_zone"}
+
+	for _, v := range immutableArgs {
+		if d.HasChange(v) {
+			return fmt.Errorf("argument `%s` cannot be changed", v)
+		}
+	}
+
 	if d.HasChange("memory") || d.HasChange("volume") {
 		memory := d.Get("memory").(int)
 		volume := d.Get("volume").(int)
@@ -531,12 +595,15 @@ func resourceTencentCloudMongodbInstanceDelete(d *schema.ResourceData, meta inte
 		return nil
 	}
 	if MONGODB_CHARGE_TYPE[*instanceDetail.PayMode] == MONGODB_CHARGE_TYPE_PREPAID {
-		return fmt.Errorf("PREPAID instances are not allowed to be deleted now, please isolate them on console")
-	}
-
-	err = mongodbService.IsolateInstance(ctx, instanceId)
-	if err != nil {
-		return err
+		err := mongodbService.TerminateDBInstances(ctx, instanceId)
+		if err != nil {
+			return err
+		}
+	} else {
+		err := mongodbService.IsolateInstance(ctx, instanceId)
+		if err != nil {
+			return err
+		}
 	}
 	err = mongodbService.OfflineIsolatedDBInstance(ctx, instanceId, true)
 	if err != nil {

tencentcloud/resource_tc_mongodb_instance_test.go

@@ -75,7 +75,7 @@ func TestAccTencentCloudMongodbInstanceResourcePostPaid(t *testing.T) {
 		CheckDestroy: testAccCheckMongodbInstanceDestroy,
 		Steps: []resource.TestStep{
 			{
-				PreConfig: func() { testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_COMMON) },
+				PreConfig: func() { testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_PREPAY) },
 				Config:    testAccMongodbInstance,
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckMongodbInstanceExists("tencentcloud_mongodb_instance.mongodb"),
@@ -84,7 +84,7 @@ func TestAccTencentCloudMongodbInstanceResourcePostPaid(t *testing.T) {
 					resource.TestCheckResourceAttrSet("tencentcloud_mongodb_instance.mongodb", "volume"),
 					resource.TestCheckResourceAttrSet("tencentcloud_mongodb_instance.mongodb", "engine_version"),
 					resource.TestCheckResourceAttrSet("tencentcloud_mongodb_instance.mongodb", "machine_type"),
-					resource.TestCheckResourceAttr("tencentcloud_mongodb_instance.mongodb", "available_zone", "ap-guangzhou-6"),
+					resource.TestCheckResourceAttr("tencentcloud_mongodb_instance.mongodb", "available_zone", "ap-guangzhou-3"),
 					resource.TestCheckResourceAttr("tencentcloud_mongodb_instance.mongodb", "project_id", "0"),
 					resource.TestCheckResourceAttrSet("tencentcloud_mongodb_instance.mongodb", "status"),
 					resource.TestCheckResourceAttrSet("tencentcloud_mongodb_instance.mongodb", "vip"),
@@ -106,7 +106,7 @@ func TestAccTencentCloudMongodbInstanceResourcePostPaid(t *testing.T) {
 					log.Printf("[WARN] MongoDB Update Need DealID query available, skip checking.")
 					return true, nil
 				},
-				PreConfig: func() { testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_COMMON) },
+				PreConfig: func() { testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_PREPAY) },
 				Config:    testAccMongodbInstance_update,
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("tencentcloud_mongodb_instance.mongodb", "instance_name", "tf-mongodb-update"),
@@ -120,7 +120,28 @@ func TestAccTencentCloudMongodbInstanceResourcePostPaid(t *testing.T) {
 	})
 }
 
-func TestAccTencentCloudNeedFixMongodbInstanceResourcePrepaid(t *testing.T) {
+func TestAccTencentCloudMongodbInstanceResource_multiZone(t *testing.T) {
+	t.Parallel()
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckMongodbInstanceDestroy,
+		Steps: []resource.TestStep{
+			{
+				PreConfig: func() { testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_PREPAY) },
+				Config:    testAccMongodbInstance_multiZone,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckMongodbInstanceExists("tencentcloud_mongodb_instance.mongodb_mutil_zone"),
+					resource.TestCheckResourceAttr("tencentcloud_mongodb_instance.mongodb_mutil_zone", "node_num", "5"),
+					resource.TestCheckResourceAttr("tencentcloud_mongodb_instance.mongodb_mutil_zone", "availability_zone_list.#", "5"),
+					resource.TestCheckResourceAttr("tencentcloud_mongodb_instance.mongodb_mutil_zone", "hidden_zone", "ap-guangzhou-6"),
+				),
+			},
+		},
+	})
+}
+
+func TestAccTencentCloudMongodbInstanceResourcePrepaid(t *testing.T) {
 	// Avoid to set Parallel to make sure EnvVar secure
 	resource.Test(t, resource.TestCase{
 		PreCheck:  func() { testAccPreCheckCommon(t, ACCOUNT_TYPE_PREPAY) },
@@ -136,7 +157,7 @@ func TestAccTencentCloudNeedFixMongodbInstanceResourcePrepaid(t *testing.T) {
 					resource.TestCheckResourceAttrSet("tencentcloud_mongodb_instance.mongodb_prepaid", "volume"),
 					resource.TestCheckResourceAttrSet("tencentcloud_mongodb_instance.mongodb_prepaid", "engine_version"),
 					resource.TestCheckResourceAttrSet("tencentcloud_mongodb_instance.mongodb_prepaid", "machine_type"),
-					resource.TestCheckResourceAttr("tencentcloud_mongodb_instance.mongodb_prepaid", "available_zone", "ap-guangzhou-6"),
+					resource.TestCheckResourceAttr("tencentcloud_mongodb_instance.mongodb_prepaid", "available_zone", "ap-guangzhou-3"),
 					resource.TestCheckResourceAttr("tencentcloud_mongodb_instance.mongodb_prepaid", "project_id", "0"),
 					resource.TestCheckResourceAttrSet("tencentcloud_mongodb_instance.mongodb_prepaid", "status"),
 					resource.TestCheckResourceAttrSet("tencentcloud_mongodb_instance.mongodb_prepaid", "vip"),
@@ -153,8 +174,6 @@ func TestAccTencentCloudNeedFixMongodbInstanceResourcePrepaid(t *testing.T) {
 				Config:    testAccMongodbInstancePrepaid_update,
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("tencentcloud_mongodb_instance.mongodb_prepaid", "instance_name", "tf-mongodb-test-prepaid-update"),
-					resource.TestCheckResourceAttr("tencentcloud_mongodb_instance.mongodb_prepaid", "memory", "4"),
-					resource.TestCheckResourceAttr("tencentcloud_mongodb_instance.mongodb_prepaid", "volume", "100"),
 					resource.TestCheckNoResourceAttr("tencentcloud_mongodb_instance.mongodb_prepaid", "tags.test"),
 					resource.TestCheckResourceAttr("tencentcloud_mongodb_instance.mongodb_prepaid", "tags.prepaid", "prepaid"),
 				),
@@ -226,9 +245,11 @@ resource "tencentcloud_mongodb_instance" "mongodb" {
   volume         = local.volume
   engine_version = local.engine_version
   machine_type   = local.machine_type
-  available_zone = "ap-guangzhou-6"
+  available_zone = "ap-guangzhou-3"
   project_id     = 0
   password       = "test1234"
+  vpc_id         = var.vpc_id
+  subnet_id      = var.subnet_id
 
   tags = {
     test = "test"
@@ -243,9 +264,11 @@ resource "tencentcloud_mongodb_instance" "mongodb" {
   volume         = local.volume * 2
   engine_version = local.engine_version
   machine_type   = local.machine_type
-  available_zone = "ap-guangzhou-6"
+  available_zone = "ap-guangzhou-3"
   project_id     = 0
   password       = "test1234update"
+  vpc_id         = var.vpc_id
+  subnet_id      = var.subnet_id
 
   tags = {
     abc = "abc"
@@ -260,12 +283,14 @@ resource "tencentcloud_mongodb_instance" "mongodb_prepaid" {
   volume         = local.volume
   engine_version = local.engine_version
   machine_type   = local.machine_type
-  available_zone  = "ap-guangzhou-6"
+  available_zone  = "ap-guangzhou-3"
   project_id      = 0
   password        = "test1234"
   charge_type     = "PREPAID"
   prepaid_period  = 1
   auto_renew_flag = 1
+  vpc_id         = var.vpc_id
+  subnet_id      = var.subnet_id
 
   tags = {
     test = "test-prepaid"
@@ -280,15 +305,38 @@ resource "tencentcloud_mongodb_instance" "mongodb_prepaid" {
   volume         = local.volume
   engine_version = local.engine_version
   machine_type   = local.machine_type
-  available_zone  = "ap-guangzhou-6"
+  available_zone  = "ap-guangzhou-3"
   project_id      = 0
   password        = "test1234update"
   charge_type     = "PREPAID"
   prepaid_period  = 1
   auto_renew_flag = 1
+  vpc_id         = var.vpc_id
+  subnet_id      = var.subnet_id
 
   tags = {
     prepaid = "prepaid"
   }
 }
 `
+
+const testAccMongodbInstance_multiZone = DefaultMongoDBSpec + `
+resource "tencentcloud_mongodb_instance" "mongodb_mutil_zone" {
+  instance_name   = "mongodb-mutil-zone-test"
+  memory         = local.memory
+  volume         = local.volume
+  engine_version = local.engine_version
+  machine_type   = local.machine_type
+  available_zone = "ap-guangzhou-3"
+  project_id     = 0
+  password       = "test1234"
+  vpc_id         = var.vpc_id
+  subnet_id      = var.subnet_id
+  node_num = 5
+  availability_zone_list = ["ap-guangzhou-3", "ap-guangzhou-3", "ap-guangzhou-4", "ap-guangzhou-4", "ap-guangzhou-6"]
+  hidden_zone = "ap-guangzhou-6"
+  tags = {
+    test = "test"
+  }
+}
+`

website/docs/r/mongodb_instance.html.markdown

@@ -18,11 +18,11 @@ resource "tencentcloud_mongodb_instance" "mongodb" {
   instance_name  = "mongodb"
   memory         = 4
   volume         = 100
-  engine_version = "MONGO_3_WT"
-  machine_type   = "GIO"
+  engine_version = "MONGO_36_WT"
+  machine_type   = "HIO10G"
   available_zone = "ap-guangzhou-2"
-  vpc_id         = "vpc-mz3efvbw"
-  subnet_id      = "subnet-lk0svi3p"
+  vpc_id         = "vpc-xxxxxx"
+  subnet_id      = "subnet-xxxxxx"
   project_id     = 0
   password       = "password1234"
 }
@@ -39,7 +39,14 @@ The following arguments are supported:
 * `memory` - (Required, Int) Memory size. The minimum value is 2, and unit is GB. Memory and volume must be upgraded or degraded simultaneously.
 * `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.
+* `availability_zone_list` - (Optional, List: [`String`]) A list of nodes deployed in multiple availability zones. For more information, please use the API DescribeSpecInfo.
+			- Multi-availability zone deployment nodes can only be deployed in 3 different availability zones. It is not supported to deploy most nodes of the cluster in the same availability zone. For example, a 3-node cluster does not support the deployment of 2 nodes in the same zone.
+			- Version 4.2 and above are not supported.
+			- Read-only disaster recovery instances are not supported.
+			- Basic network cannot be selected.
 * `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.
+* `hidden_zone` - (Optional, String) The availability zone to which the Hidden node belongs. This parameter must be configured to deploy instances across availability zones.
+* `node_num` - (Optional, Int) The number of nodes in each replica set. Default value: 3.
 * `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.