Merge pull request #549 from cyberHermanwang/master

1.sqlserver and sqlserver ro instance add tags. 2. es support disksiz…

Author: gailwang

CHANGELOG.md

@@ -5,7 +5,11 @@ ENHANCEMENTS:
 * Resource: `tencentcloud_clb_listener` add computed argument `listener_id`.
 * Resource: `tencentcloud_clb_listener_rule` support import.
 * Resource: `tencentcloud_cdn_domain` add example that use COS bucket url as origin.
+* Resource: `tencentcloud_sqlserver_instance` add new argument `tags`.
+* Resource: `tencentcloud_sqlserver_readonly_instance` add new argument `tags`.
+* Resource: `tencentcloud_elasticsearch_instance` support nodeType and diskSize modification.
 * Data Source: `tencentcloud_instance_types` add argument `exclude_sold_out` to support filtering sold out instance types. 
+* Data Source: `tencentcloud_sqlserver_instances` add new argument `tags`.
 
 BUG FIXES:
 

examples/tencentcloud-sqlserver/main.tf

@@ -24,6 +24,9 @@ resource "tencentcloud_sqlserver_instance" "example" {
   project_id        = 0
   memory            = 2
   storage           = 10
+  tags = {
+      "test" = "test"
+  }
 }
 
 resource "tencentcloud_sqlserver_db" "example" {
@@ -58,6 +61,9 @@ resource "tencentcloud_sqlserver_readonly_instance" "example" {
   master_instance_id  = tencentcloud_sqlserver_instance.test.id
   readonly_group_type = 1
   force_upgrade       = true
+  tags = {
+      "test" = "test"
+  }
 }
 
 resource "tencentcloud_sqlserver_publish_subscribe" "example" {

go.mod

@@ -15,7 +15,7 @@ require (
 	github.com/mattn/go-colorable v0.1.6 // indirect
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/pkg/errors v0.9.1
-	github.com/tencentcloud/tencentcloud-sdk-go v1.0.37
+	github.com/tencentcloud/tencentcloud-sdk-go v1.0.50
 	github.com/yangwenmai/ratelimit v0.0.0-20180104140304-44221c2292e1
 	github.com/zclconf/go-cty v1.4.2 // indirect
 	golang.org/x/sys v0.0.0-20200523222454-059865788121 // indirect

go.sum

@@ -443,6 +443,8 @@ github.com/tdakkota/asciicheck v0.0.0-20200416190851-d7f85be797a2 h1:Xr9gkxfOP0K
 github.com/tdakkota/asciicheck v0.0.0-20200416190851-d7f85be797a2/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM=
 github.com/tencentcloud/tencentcloud-sdk-go v1.0.37 h1:zNJfC6+5sj/OloSq6GzmdSC9lwlZbgQ438zz3qH+v4k=
 github.com/tencentcloud/tencentcloud-sdk-go v1.0.37/go.mod h1:asUz5BPXxgoPGaRgZaVm1iGcUAuHyYUo1nXqKa83cvI=
+github.com/tencentcloud/tencentcloud-sdk-go v1.0.50 h1:KAIRXHVSVMvRX3Dl5gvrcVqCxBv7fDLvHahU0F3GNsc=
+github.com/tencentcloud/tencentcloud-sdk-go v1.0.50/go.mod h1:asUz5BPXxgoPGaRgZaVm1iGcUAuHyYUo1nXqKa83cvI=
 github.com/tetafro/godot v0.3.7 h1:+mecr7RKrUKB5UQ1gwqEMn13sDKTyDR8KNIquB9mm+8=
 github.com/tetafro/godot v0.3.7/go.mod h1:/7NLHhv08H1+8DNj0MElpAACw1ajsCuf3TKNQxA5S+0=
 github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e h1:RumXZ56IrCj4CL+g1b9OL/oH0QnsF976bC8xQFYUD5Q=

tencentcloud/data_source_tc_sqlserver_instances.go

@@ -25,7 +25,6 @@ import (
 	"log"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-
 	"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
 )
 
@@ -149,6 +148,11 @@ func dataSourceTencentCloudSqlserverInstances() *schema.Resource {
 							Computed:    true,
 							Description: "Status of the SQL Server instance. 1 for applying, 2 for running, 3 for running with limit, 4 for isolated, 5 for recycling, 6 for recycled, 7 for running with task, 8 for off-line, 9 for expanding, 10 for migrating, 11 for readonly, 12 for rebooting.",
 						},
+						"tags": {
+							Type:        schema.TypeMap,
+							Computed:    true,
+							Description: "Tags of the SQL Server instance.",
+						},
 					},
 				},
 			},
@@ -162,7 +166,9 @@ func dataSourceTencentCloudSqlserverInstanceRead(d *schema.ResourceData, meta in
 	logId := getLogId(contextNil)
 	ctx := context.WithValue(context.TODO(), logIdKey, logId)
 
-	service := SqlserverService{client: meta.(*TencentCloudClient).apiV3Conn}
+	tcClient := meta.(*TencentCloudClient).apiV3Conn
+	tagService := &TagService{client: tcClient}
+	service := SqlserverService{client: tcClient}
 
 	id := d.Get("id").(string)
 
@@ -210,6 +216,13 @@ func dataSourceTencentCloudSqlserverInstanceRead(d *schema.ResourceData, meta in
 		} else {
 			listItem["charge_type"] = COMMON_PAYTYPE_POSTPAID
 		}
+
+		tagList, err := tagService.DescribeResourceTags(ctx, "sqlserver", "instance", tcClient.Region, *v.InstanceId)
+		if err != nil {
+			return err
+		}
+
+		listItem["tags"] = tagList
 		list = append(list, listItem)
 		ids = append(ids, *v.InstanceId)
 	}

tencentcloud/data_source_tc_sqlserver_instances_test.go

@@ -31,6 +31,7 @@ func TestAccTencentCloudDataSqlserverInstances(t *testing.T) {
 					resource.TestCheckResourceAttrSet(testDataSqlserverInstancesName, "instance_list.0.vport"),
 					resource.TestCheckResourceAttrSet(testDataSqlserverInstancesName, "instance_list.0.status"),
 					resource.TestCheckResourceAttrSet(testDataSqlserverInstancesName, "instance_list.0.used_storage"),
+					resource.TestCheckResourceAttr(testDataPostgresqlInstancesName, "instance_list.0.tags.tf", "test"),
 				),
 			},
 		},
@@ -39,16 +40,19 @@ func TestAccTencentCloudDataSqlserverInstances(t *testing.T) {
 
 const testAccTencentCloudDataSqlserverInstancesBasic = `
 variable "availability_zone"{
-default = "ap-guangzhou-2"
+	default = "ap-guangzhou-2"
 }
 
 resource "tencentcloud_sqlserver_instance" "test" {
-  name = "tf_postsql_instance"
+  name              = "tf_postsql_instance"
   availability_zone = var.availability_zone
-  charge_type = "POSTPAID_BY_HOUR"
-  project_id = 0
-  memory = 2
-  storage = 10
+  charge_type       = "POSTPAID_BY_HOUR"
+  project_id        = 0
+  memory            = 2
+  storage           = 10
+  tags = {
+	tf = "test"
+  }
 }
 
 data "tencentcloud_sqlserver_instances" "id_test"{

tencentcloud/resource_tc_elasticsearch_instance.go

@@ -156,7 +156,6 @@ func resourceTencentCloudElasticsearchInstance() *schema.Resource {
 				Type:        schema.TypeList,
 				Required:    true,
 				MinItems:    1,
-				ForceNew:    true,
 				Description: "Node information list, which is used to describe the specification information of various types of nodes in the cluster, such as node type, node quantity, node specification, disk type, and disk size.",
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
@@ -463,7 +462,7 @@ func resourceTencentCloudElasticsearchInstanceUpdate(d *schema.ResourceData, met
 		instanceName := d.Get("instance_name").(string)
 		// Update operation support at most one item at the same time
 		err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
-			errRet := elasticsearchService.UpdateInstance(ctx, instanceId, instanceName, "", 0)
+			errRet := elasticsearchService.UpdateInstance(ctx, instanceId, instanceName, "", 0, nil)
 			if errRet != nil {
 				return retryError(errRet)
 			}
@@ -477,7 +476,7 @@ func resourceTencentCloudElasticsearchInstanceUpdate(d *schema.ResourceData, met
 	if d.HasChange("password") {
 		password := d.Get("password").(string)
 		err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
-			errRet := elasticsearchService.UpdateInstance(ctx, instanceId, "", password, 0)
+			errRet := elasticsearchService.UpdateInstance(ctx, instanceId, "", password, 0, nil)
 			if errRet != nil {
 				return retryError(errRet)
 			}
@@ -550,7 +549,7 @@ func resourceTencentCloudElasticsearchInstanceUpdate(d *schema.ResourceData, met
 	if d.HasChange("basic_security_type") {
 		basicSecurityType := d.Get("basic_security_type").(int)
 		err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
-			errRet := elasticsearchService.UpdateInstance(ctx, instanceId, "", "", int64(basicSecurityType))
+			errRet := elasticsearchService.UpdateInstance(ctx, instanceId, "", "", int64(basicSecurityType), nil)
 			if errRet != nil {
 				return retryError(errRet)
 			}
@@ -562,6 +561,52 @@ func resourceTencentCloudElasticsearchInstanceUpdate(d *schema.ResourceData, met
 		d.SetPartial("basic_security_type")
 	}
 
+	if d.HasChange("node_info_list") {
+		nodeInfos := d.Get("node_info_list").([]interface{})
+		nodeInfoList := make([]*es.NodeInfo, 0, len(nodeInfos))
+		for _, d := range nodeInfos {
+			value := d.(map[string]interface{})
+			nodeType := value["node_type"].(string)
+			diskSize := uint64(value["disk_size"].(int))
+			nodeNum := uint64(value["node_num"].(int))
+			types := value["type"].(string)
+			diskType := value["disk_type"].(string)
+			encrypt := value["encrypt"].(bool)
+			dataDisk := es.NodeInfo{
+				NodeType:    &nodeType,
+				DiskSize:    &diskSize,
+				NodeNum:     &nodeNum,
+				Type:        &types,
+				DiskType:    &diskType,
+				DiskEncrypt: helper.BoolToInt64Pointer(encrypt),
+			}
+			nodeInfoList = append(nodeInfoList, &dataDisk)
+		}
+		err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
+			errRet := elasticsearchService.UpdateInstance(ctx, instanceId, "", "", 0, nodeInfoList)
+			if errRet != nil {
+				return retryError(errRet)
+			}
+			return nil
+		})
+		if err != nil {
+			return err
+		}
+		d.SetPartial("node_info_list")
+		err = resource.Retry(10*readRetryTimeout, func() *resource.RetryError {
+			instance, errRet := elasticsearchService.DescribeInstanceById(ctx, instanceId)
+			if errRet != nil {
+				return retryError(errRet, InternalError)
+			}
+			if instance != nil && *instance.Status == ES_INSTANCE_STATUS_PROCESSING {
+				return resource.RetryableError(errors.New("elasticsearch instance status is processing, retry..."))
+			}
+			return nil
+		})
+		if err != nil {
+			return err
+		}
+	}
 	if d.HasChange("tags") {
 		oldInterface, newInterface := d.GetChange("tags")
 		replaceTags, deleteTags := diffTags(oldInterface.(map[string]interface{}), newInterface.(map[string]interface{}))

tencentcloud/resource_tc_elasticsearch_instance_test.go

@@ -43,6 +43,8 @@ func TestAccTencentCloudElasticsearchInstance_basic(t *testing.T) {
 					resource.TestCheckResourceAttr("tencentcloud_elasticsearch_instance.foo", "license_type", "basic"),
 					resource.TestCheckResourceAttr("tencentcloud_elasticsearch_instance.foo", "basic_security_type", "2"),
 					resource.TestCheckResourceAttr("tencentcloud_elasticsearch_instance.foo", "tags.test", "test"),
+					resource.TestCheckResourceAttr("tencentcloud_elasticsearch_instance.foo", "node_info_list.0.node_type", "ES.S1.MEDIUM8"),
+					resource.TestCheckResourceAttr("tencentcloud_elasticsearch_instance.foo", "node_info_list.0.disk_size", "200"),
 				),
 			},
 			{
@@ -123,17 +125,17 @@ func testAccCheckElasticsearchInstanceExists(n string) resource.TestCheckFunc {
 
 const testAccElasticsearchInstance = defaultVpcVariable + `
 resource "tencentcloud_elasticsearch_instance" "foo" {
-	instance_name     = "tf-ci-test"
-	availability_zone = var.availability_zone
-	version           = "7.5.1"
-	vpc_id            = var.vpc_id
-	subnet_id         = var.subnet_id
-	password          = "Test1234"
-	license_type      = "oss"
+	instance_name       = "tf-ci-test"
+	availability_zone   = var.availability_zone
+	version             = "7.5.1"
+	vpc_id              = var.vpc_id
+	subnet_id           = var.subnet_id
+	password            = "Test1234"
+	license_type        = "oss"
   
 	node_info_list {
-	  node_num  = 2
-	  node_type = "ES.S1.SMALL2"
+	  node_num          = 2
+	  node_type         = "ES.S1.SMALL2"
 	}
   
 	tags = {
@@ -154,8 +156,9 @@ resource "tencentcloud_elasticsearch_instance" "foo" {
 	basic_security_type = 2
   
 	node_info_list {
-	  node_num  = 2
-	  node_type = "ES.S1.SMALL2"
+	  node_num          = 2
+	  node_type         = "ES.S1.MEDIUM8"
+	  disk_size         = 200
 	}
   
 	tags = {

tencentcloud/resource_tc_sqlserver_instance.go

@@ -33,6 +33,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	sqlserver "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/sqlserver/v20180328"
+	"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
 )
 
 func TencentSqlServerBasicInfo() map[string]*schema.Schema {
@@ -114,6 +115,11 @@ func TencentSqlServerBasicInfo() map[string]*schema.Schema {
 			Computed:    true,
 			Description: "Status of the SQL Server instance. 1 for applying, 2 for running, 3 for running with limit, 4 for isolated, 5 for recycling, 6 for recycled, 7 for running with task, 8 for off-line, 9 for expanding, 10 for migrating, 11 for readonly, 12 for rebooting.",
 		},
+		"tags": {
+			Type:        schema.TypeMap,
+			Optional:    true,
+			Description: "The tags of the SQL Server.",
+		},
 	}
 }
 
@@ -189,8 +195,10 @@ func resourceTencentCloudSqlserverInstanceCreate(d *schema.ResourceData, meta in
 	logId := getLogId(contextNil)
 	ctx := context.WithValue(context.TODO(), logIdKey, logId)
 
-	sqlserverService := SqlserverService{client: meta.(*TencentCloudClient).apiV3Conn}
-
+	client := meta.(*TencentCloudClient).apiV3Conn
+	sqlserverService := SqlserverService{client: client}
+	tagService := TagService{client: client}
+	region := client.Region
 	var (
 		name           = d.Get("name").(string)
 		dbVersion      = d.Get("engine_version").(string)
@@ -252,11 +260,20 @@ func resourceTencentCloudSqlserverInstanceCreate(d *schema.ResourceData, meta in
 		return outErr
 	}
 
+	if tags := helper.GetTags(d, "tags"); len(tags) > 0 {
+		resourceName := BuildTagResourceName("sqlserver", "instance", region, instanceId)
+		if err := tagService.ModifyTags(ctx, resourceName, tags, nil); err != nil {
+			return err
+		}
+	}
 	return resourceTencentCloudSqlserverInstanceRead(d, meta)
 }
 
 func sqlServerAllInstanceRoleUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) error {
-	sqlserverService := SqlserverService{client: meta.(*TencentCloudClient).apiV3Conn}
+	client := meta.(*TencentCloudClient).apiV3Conn
+	sqlserverService := SqlserverService{client: client}
+	tagService := TagService{client: client}
+	region := client.Region
 	instanceId := d.Id()
 
 	var outErr, inErr error
@@ -332,6 +349,18 @@ func sqlServerAllInstanceRoleUpdate(ctx context.Context, d *schema.ResourceData,
 		d.SetPartial("security_groups")
 	}
 
+	if d.HasChange("tags") {
+		oldTags, newTags := d.GetChange("tags")
+		replaceTags, deleteTags := diffTags(oldTags.(map[string]interface{}), newTags.(map[string]interface{}))
+
+		resourceName := BuildTagResourceName("sqlserver", "instance", region, instanceId)
+		if err := tagService.ModifyTags(ctx, resourceName, replaceTags, deleteTags); err != nil {
+			return err
+		}
+
+		d.SetPartial("tags")
+	}
+
 	return nil
 }
 
@@ -350,7 +379,10 @@ func resourceTencentCloudSqlserverInstanceUpdate(d *schema.ResourceData, meta in
 	var outErr, inErr error
 	instanceId := d.Id()
 
-	sqlserverService := SqlserverService{client: meta.(*TencentCloudClient).apiV3Conn}
+	client := meta.(*TencentCloudClient).apiV3Conn
+	sqlserverService := SqlserverService{client: client}
+	tagService := TagService{client: client}
+	region := client.Region
 	//update project id
 	if d.HasChange("project_id") {
 		projectId := d.Get("project_id").(int)
@@ -394,6 +426,17 @@ func resourceTencentCloudSqlserverInstanceUpdate(d *schema.ResourceData, meta in
 		d.SetPartial("maintenance_start_time")
 		d.SetPartial("maintenance_time_span")
 	}
+	if d.HasChange("tags") {
+		oldTags, newTags := d.GetChange("tags")
+		replaceTags, deleteTags := diffTags(oldTags.(map[string]interface{}), newTags.(map[string]interface{}))
+
+		resourceName := BuildTagResourceName("sqlserver", "instance", region, instanceId)
+		if err := tagService.ModifyTags(ctx, resourceName, replaceTags, deleteTags); err != nil {
+			return err
+		}
+
+		d.SetPartial("tags")
+	}
 
 	d.Partial(false)
 
@@ -504,6 +547,14 @@ func resourceTencentCloudSqlserverInstanceRead(d *schema.ResourceData, meta inte
 	_ = d.Set("maintenance_start_time", startTime)
 	_ = d.Set("maintenance_time_span", timeSpan)
 
+	tcClient := meta.(*TencentCloudClient).apiV3Conn
+	tagService := &TagService{client: tcClient}
+	tags, err := tagService.DescribeResourceTags(ctx, "sqlserver", "instance", tcClient.Region, d.Id())
+	if err != nil {
+		return err
+	}
+	_ = d.Set("tags", tags)
+
 	return nil
 }