fix mongodb sharding instance support mongos params (#1543)

* fix mongodb sharding instance support mongos params

* add changelog

* update

---------

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

Author: tongyiming

.changelog/1543.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/tencentcloud_mongodb_sharding_instance: support mongos params
+```

go.mod

@@ -35,7 +35,7 @@ require (
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.445
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.544
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.412
-	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.584
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.588
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.553
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.572
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dayu v1.0.335
@@ -52,8 +52,9 @@ require (
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/lighthouse v1.0.413
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/live v1.0.535
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mariadb v1.0.532
-	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mongodb v1.0.199
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mongodb v1.0.588
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.518
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mps v1.0.584
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/organization v1.0.540
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/postgres v1.0.391
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/privatedns v1.0.290
@@ -81,7 +82,6 @@ require (
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod v1.0.199
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.569
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wss v1.0.199
-	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mps v1.0.584
 	github.com/tencentyun/cos-go-sdk-v5 v0.7.40
 	github.com/yangwenmai/ratelimit v0.0.0-20180104140304-44221c2292e1
 	github.com/zclconf/go-cty v1.4.2 // indirect

go.sum

@@ -567,6 +567,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.583 h1:1zUg
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.583/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.584 h1:FbppCUoExsYKd8orUHqcTJacEIGgFcTyvzdFNMb/7zI=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.584/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.588 h1:DYtBXB7sVc3EOW5horg8j55cLZynhsLYhHrvQ/jXKKM=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.588/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.445 h1:Bh7XD0ypNMHYyBOM8hhKsSu+y0VVKUnJVS+YKKhfpGg=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.445/go.mod h1:jMDD351efCFpT1+KVFbcpu6SbmP4TYmp4qkoCfr63nQ=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.553 h1:Pl1kYgFhJp0QSoVFSzRsiGk+HfEAkBTQg7+O60tytNA=
@@ -612,6 +614,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mariadb v1.0.532 h1:3PC
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mariadb v1.0.532/go.mod h1:lb1pdGQn9dzyXmq6+NkpN4avTVRvG+ziqFtOeL5D7y4=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mongodb v1.0.199 h1:2jsGprrewRIP3smcTsY5GpEuOuJ+qyV/BN3Py0Ivf1o=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mongodb v1.0.199/go.mod h1:f5GhbJyuYQBzRaDHGe3I4U9utb0Pmx2NlI+XcqSQRp0=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mongodb v1.0.588 h1:VfIklzFS9JFl4PrrR9Dk3jcEkgoaAkMrq/BUMk60M6c=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mongodb v1.0.588/go.mod h1:bAyanoZH6UqaapJOc6hTZACz/hi5AWJw2sa6oCQ5u0Y=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.518 h1:XClo3Xa5F9pko91olHT85aZXXcRkQiOYBCMqm8+tHG8=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.518/go.mod h1:WDTvvrrc90KE+90iizkoSQRsoSSQ3881eBC6NeypmTI=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mps v1.0.584 h1:FJxYOAolkBhXjQMWoiTek9Ag0bslcKFHyrM7w2Jsxos=

tencentcloud/extension_mongodb.go

@@ -155,6 +155,24 @@ func TencentMongodbBasicInfo() map[string]*schema.Schema {
 			Optional:    true,
 			Description: "The tags of the Mongodb. Key name `project` is system reserved and can't be used.",
 		},
+		"mongos_cpu": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Computed:    true,
+			Description: "Number of mongos cpu.",
+		},
+		"mongos_memory": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Computed:    true,
+			Description: "Mongos memory size.",
+		},
+		"mongos_node_num": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Computed:    true,
+			Description: "Number of mongos.",
+		},
 		// payment
 		"charge_type": {
 			Type:         schema.TypeString,

tencentcloud/resource_tc_mongodb_sharding_instance.go

@@ -10,23 +10,19 @@ resource "tencentcloud_mongodb_sharding_instance" "mongodb" {
   nodes_per_shard = 3
   memory          = 4
   volume          = 100
-  engine_version  = "MONGO_3_WT"
-  machine_type    = "GIO"
+  engine_version  = "MONGO_36_WT"
+  machine_type    = "HIO10G"
   available_zone  = "ap-guangzhou-3"
   vpc_id          = "vpc-mz3efvbw"
   subnet_id       = "subnet-lk0svi3p"
   project_id      = 0
   password        = "password1234"
+  mongos_cpu = 1
+  mongos_memory =  2
+  mongos_node_num = 3
 }
 ```
 
-Import
-
-Mongodb sharding instance can be imported using the id, e.g.
-
-```
-$ terraform import tencentcloud_mongodb_sharding_instance.mongodb cmgo-41s6jwy4
-```
 */
 package tencentcloud
 
@@ -72,9 +68,6 @@ func resourceTencentCloudMongodbShardingInstance() *schema.Resource {
 		Read:   resourceMongodbShardingInstanceRead,
 		Update: resourceMongodbShardingInstanceUpdate,
 		Delete: resourceMongodbShardingInstanceDelete,
-		Importer: &schema.ResourceImporter{
-			State: schema.ImportStatePassthrough,
-		},
 
 		Schema: mongodbShardingInstanceInfo,
 	}
@@ -154,6 +147,15 @@ func mongodbAllShardingInstanceReqSet(requestInter interface{}, d *schema.Resour
 		value.FieldByName("AutoRenewFlag").Set(reflect.ValueOf(helper.IntUint64(d.Get("auto_renew_flag").(int))))
 	}
 
+	if v, ok := d.GetOk("mongos_memory"); ok {
+		value.FieldByName("MongosMemory").Set(reflect.ValueOf(helper.IntUint64(v.(int))))
+	}
+	if v, ok := d.GetOk("mongos_cpu"); ok {
+		value.FieldByName("MongosCpu").Set(reflect.ValueOf(helper.IntUint64(v.(int))))
+	}
+	if v, ok := d.GetOk("mongos_node_num"); ok {
+		value.FieldByName("MongosNodeNum").Set(reflect.ValueOf(helper.IntUint64(v.(int))))
+	}
 	return nil
 }
 
@@ -392,7 +394,9 @@ func resourceMongodbShardingInstanceUpdate(d *schema.ResourceData, meta interfac
 	region := client.Region
 
 	d.Partial(true)
-
+	if d.HasChange("mongos_cpu") || d.HasChange("mongos_memory") || d.HasChange("mongos_node_num") {
+		return fmt.Errorf("setting of the field[mongos_cpu, mongos_memory, mongos_node_numZ] does not support update")
+	}
 	if d.HasChange("memory") || d.HasChange("volume") {
 		memory := d.Get("memory").(int)
 		volume := d.Get("volume").(int)
@@ -505,25 +509,21 @@ func resourceMongodbShardingInstanceDelete(d *schema.ResourceData, meta interfac
 		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.TerminateDBInstances(ctx, instanceId)
+		if err != nil {
+			return err
+		}
+	} else {
+		err := mongodbService.IsolateInstance(ctx, instanceId)
+		if err != nil {
+			return err
+		}
 	}
 
-	err = mongodbService.IsolateInstance(ctx, instanceId)
-	if err != nil {
-		return err
-	}
 	err = mongodbService.OfflineIsolatedDBInstance(ctx, instanceId, true)
 	if err != nil {
 		log.Printf("[CRITAL]%s mongodb %s fail, reason:%s", logId, "OfflineIsolatedDBInstance", err.Error())
 		return err
 	}
-	//describe and check not exist
-	_, has, errRet := mongodbService.DescribeInstanceById(ctx, instanceId)
-	if errRet != nil {
-		return errRet
-	}
-	if !has {
-		return nil
-	}
-	return fmt.Errorf("[CRITAL]%s mongodb %s fail", logId, "OfflineIsolatedDBInstance")
+	return nil
 }

tencentcloud/resource_tc_mongodb_sharding_instance_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
-func TestAccTencentCloudNeedFixMongodbShardingInstance(t *testing.T) {
+func TestAccTencentCloudMongodbShardingInstanceResource_postpaid(t *testing.T) {
 	t.Parallel()
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheckCommon(t, ACCOUNT_TYPE_PREPAY) },
@@ -47,12 +47,17 @@ func TestAccTencentCloudNeedFixMongodbShardingInstance(t *testing.T) {
 					resource.TestCheckResourceAttr("tencentcloud_mongodb_sharding_instance.mongodb", "tags.abc", "abc"),
 				),
 			},
-			{
-				ResourceName:            "tencentcloud_mongodb_sharding_instance.mongodb",
-				ImportState:             true,
-				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"security_groups", "password", "auto_renew_flag"},
-			},
+		},
+	})
+}
+
+func TestAccTencentCloudMongodbShardingInstanceResource_prepaid(t *testing.T) {
+	t.Parallel()
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheckCommon(t, ACCOUNT_TYPE_PREPAY) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckMongodbShardingInstanceDestroy,
+		Steps: []resource.TestStep{
 			{
 				Config: testAccMongodbShardingInstancePrepaid,
 				Check: resource.ComposeTestCheckFunc(
@@ -121,7 +126,9 @@ resource "tencentcloud_mongodb_sharding_instance" "mongodb" {
   available_zone  = "ap-guangzhou-6"
   project_id      = 0
   password        = "test1234"
-
+  mongos_cpu = 1
+  mongos_memory =  2
+  mongos_node_num = 3
   tags = {
     test = "test"
   }
@@ -133,13 +140,16 @@ resource "tencentcloud_mongodb_sharding_instance" "mongodb" {
   instance_name   = "tf-mongodb-sharding-update"
   shard_quantity  = 2
   nodes_per_shard = 3
-  memory          = local.sharding_memory * 2
-  volume          = local.sharding_volume + 50
+  memory          = local.sharding_memory
+  volume          = local.sharding_volume
   engine_version  = local.sharding_engine_version
   machine_type    = local.sharding_machine_type
   available_zone  = "ap-guangzhou-6"
   project_id      = 0
   password        = "test1234update"
+  mongos_cpu = 1
+  mongos_memory =  2
+  mongos_node_num = 3
 
   tags = {
     abc = "abc"
@@ -152,8 +162,8 @@ resource "tencentcloud_mongodb_sharding_instance" "mongodb_prepaid" {
   instance_name   = "tf-mongodb-sharding-prepaid"
   shard_quantity  = 2
   nodes_per_shard = 3
-  memory          = local.sharding_memory * 2
-  volume          = local.sharding_volume + 50
+  memory          = local.sharding_memory
+  volume          = local.sharding_volume
   engine_version  = local.sharding_engine_version
   machine_type    = local.sharding_machine_type
   available_zone  = "ap-guangzhou-6"
@@ -162,6 +172,9 @@ resource "tencentcloud_mongodb_sharding_instance" "mongodb_prepaid" {
   charge_type     = "PREPAID"
   prepaid_period  = 1
   auto_renew_flag = 0
+  mongos_cpu = 1
+  mongos_memory =  2
+  mongos_node_num = 3
 
   tags = {
     test = "test-prepaid"
@@ -174,8 +187,8 @@ resource "tencentcloud_mongodb_sharding_instance" "mongodb_prepaid" {
   instance_name   = "tf-mongodb-sharding-prepaid-update"
   shard_quantity  = 2
   nodes_per_shard = 3
-  memory          = local.sharding_memory * 2
-  volume          = local.sharding_volume + 50
+  memory          = local.sharding_memory
+  volume          = local.sharding_volume
   engine_version  = local.sharding_engine_version
   machine_type    = local.sharding_machine_type
   available_zone  = "ap-guangzhou-6"
@@ -184,6 +197,9 @@ resource "tencentcloud_mongodb_sharding_instance" "mongodb_prepaid" {
   charge_type     = "PREPAID"
   prepaid_period  = 1
   auto_renew_flag = 0
+  mongos_cpu = 1
+  mongos_memory =  2
+  mongos_node_num = 3
 
   tags = {
     prepaid = "prepaid"

tencentcloud/service_tencentcloud_mongodb.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"log"
-	"strings"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 	sdkErrors "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"
@@ -262,6 +261,35 @@ func (me *MongodbService) IsolateInstance(ctx context.Context, instanceId string
 	return
 }
 
+func (me *MongodbService) TerminateDBInstances(ctx context.Context, instanceId string) (errRet error) {
+	logId := getLogId(ctx)
+	request := mongodb.NewTerminateDBInstancesRequest()
+	request.InstanceId = &instanceId
+	defer func() {
+		if errRet != nil {
+			log.Printf("[CRITAL]%s api[%s] fail,reason[%s]", logId, request.GetAction(), errRet.Error())
+		}
+	}()
+	var response *mongodb.TerminateDBInstancesResponse
+	err := resource.Retry(10*writeRetryTimeout, func() *resource.RetryError {
+		ratelimit.Check(request.GetAction())
+		result, e := me.client.UseMongodbClient().TerminateDBInstances(request)
+		if e != nil {
+			log.Printf("[CRITAL]%s api[%s] fail, reason:%s", logId, request.GetAction(), e.Error())
+			return resource.RetryableError(fmt.Errorf("Terminate instance %s error", instanceId))
+		}
+		response = result
+		return nil
+	})
+	if err != nil {
+		return err
+	}
+
+	log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]",
+		logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
+	return
+}
+
 func (me *MongodbService) ModifyAutoRenewFlag(ctx context.Context, instanceId string, period int, renewFlag int) (errRet error) {
 	logId := getLogId(ctx)
 	request := mongodb.NewRenewDBInstancesRequest()
@@ -331,7 +359,7 @@ func (me *MongodbService) OfflineIsolatedDBInstance(ctx context.Context, instanc
 		ratelimit.Check(request.GetAction())
 		response, err = me.client.UseMongodbClient().OfflineIsolatedDBInstance(request)
 		if err != nil {
-			return retryError(err, mongodb.INVALIDPARAMETERVALUE_LOCKFAILED)
+			return resource.RetryableError(err)
 		}
 		return nil
 	})
@@ -343,14 +371,26 @@ func (me *MongodbService) OfflineIsolatedDBInstance(ctx context.Context, instanc
 	if response == nil || response.Response == nil {
 		return nil
 	}
-	err = me.DescribeAsyncRequestInfo(ctx, *response.Response.AsyncRequestId)
-	if err == nil {
-		return nil
-	}
-	isTimeout := strings.Contains(err.Error(), "retrying")
-	if err != nil && isTimeout && timeOutTolerant {
-		log.Printf("[WARN] Offline Task Timeout but tolerant, process continue.")
-		return nil
+
+	checkRequest := mongodb.NewDescribeDBInstancesRequest()
+	checkRequest.InstanceIds = []*string{&instanceId}
+	err = resource.Retry(20*readRetryTimeout, func() *resource.RetryError {
+		ratelimit.Check(checkRequest.GetAction())
+		result, e := me.client.UseMongodbClient().DescribeDBInstances(checkRequest)
+		if e != nil {
+			return resource.NonRetryableError(e)
+		}
+
+		if result != nil && result.Response != nil {
+			if len(result.Response.InstanceDetails) != 0 {
+				return resource.RetryableError(fmt.Errorf("Offline mongodb instance is processing"))
+			}
+			return nil
+		}
+		return resource.NonRetryableError(fmt.Errorf("response is null"))
+	})
+	if err != nil {
+		return err
 	}
-	return err
+	return nil
 }