Merge branch 'master' into master

Author: oliverpei

CHANGELOG.md

@@ -1,7 +1,8 @@
-## 1.39.0 (Unreleased)
+## 1.38.2 (Unreleased)
 
 BUG FIXES:
 
+* Resource: `tencentcloud_instance` fix `allocate_public_ip` inconsistency when eip is attached to the cvm.
 * Resource: `tencentcloud_mysql_instance` fix auto-forcenew on `charge_type` and `pay_type` when upgrading terraform version. ([#459](https://github.com/terraform-providers/terraform-provider-tencentcloud/pull/459)).
 
 ## 1.38.1 (June 30, 2020)

tencentcloud/common.go

@@ -191,6 +191,9 @@ func CheckNil(object interface{}, fields map[string]string) (nilFields []string)
 	return
 }
 
+// BuildTagResourceName builds the Tencent Clould specific name of a resource description.
+// The format is `qcs:project_id:service_type:region:account:resource`.
+// For more information, go to https://cloud.tencent.com/document/product/598/10606.
 func BuildTagResourceName(serviceType, resourceType, region, id string) string {
 	switch serviceType {
 	case "cos":

tencentcloud/resource_tc_instance.go

@@ -87,7 +87,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"
 	cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312"
-	vpc "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312"
 	"github.com/terraform-providers/terraform-provider-tencentcloud/tencentcloud/internal/helper"
 	"github.com/terraform-providers/terraform-provider-tencentcloud/tencentcloud/ratelimit"
 )
@@ -541,23 +540,6 @@ func resourceTencentCloudInstanceCreate(d *schema.ResourceData, meta interface{}
 		request.UserData = &userData
 	}
 
-	// tags
-	if v, ok := d.GetOk("tags"); ok {
-		tags := make([]*cvm.Tag, 0)
-		for key, value := range v.(map[string]interface{}) {
-			tag := &cvm.Tag{
-				Key:   helper.String(key),
-				Value: helper.String(value.(string)),
-			}
-			tags = append(tags, tag)
-		}
-		tagSpecification := &cvm.TagSpecification{
-			ResourceType: helper.String("instance"),
-			Tags:         tags,
-		}
-		request.TagSpecification = []*cvm.TagSpecification{tagSpecification}
-	}
-
 	instanceId := ""
 	err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
 		ratelimit.Check("create")
@@ -598,6 +580,17 @@ func resourceTencentCloudInstanceCreate(d *schema.ResourceData, meta interface{}
 		return err
 	}
 
+	// Wait for the tags attached to the vm since tags attachment it's async while vm creation.
+	if tags := helper.GetTags(d, "tags"); len(tags) > 0 {
+		tcClient := meta.(*TencentCloudClient).apiV3Conn
+		tagService := &TagService{client: tcClient}
+		resourceName := BuildTagResourceName("cvm", "instance", tcClient.Region, instanceId)
+		if err := tagService.ModifyTags(ctx, resourceName, tags, nil); err != nil {
+			// If tags attachment failed, the user will be notified, then plan/apply/update with terraform.
+			return err
+		}
+	}
+
 	if !(d.Get("running_flag").(bool)) {
 		err = cvmService.StopInstance(ctx, instanceId)
 		if err != nil {
@@ -695,26 +688,8 @@ func resourceTencentCloudInstanceRead(d *schema.ResourceData, meta interface{})
 	_ = d.Set("create_time", instance.CreatedTime)
 	_ = d.Set("expired_time", instance.ExpiredTime)
 
-	if len(instance.PublicIpAddresses) > 0 {
-		vpcService := VpcService{client: client}
-		filter := map[string][]string{
-			"address-ip": {*instance.PublicIpAddresses[0]},
-		}
-		var eips []*vpc.Address
-		var errRet error
-		err := resource.Retry(readRetryTimeout, func() *resource.RetryError {
-			eips, errRet = vpcService.DescribeEipByFilter(ctx, filter)
-			if errRet != nil {
-				return retryError(errRet, InternalError)
-			}
-			return nil
-		})
-		if err != nil {
-			return err
-		}
-		_ = d.Set("allocate_public_ip", len(eips) < 1)
-	} else {
-		_ = d.Set("allocate_public_ip", false)
+	if _, ok := d.GetOkExists("allocate_public_ip"); !ok {
+		_ = d.Set("allocate_public_ip", len(instance.PublicIpAddresses) > 0)
 	}
 
 	// as attachment add tencentcloud:autoscaling:auto-scaling-group-id tag automatically
@@ -960,7 +935,7 @@ func resourceTencentCloudInstanceUpdate(d *schema.ResourceData, meta interface{}
 			client: meta.(*TencentCloudClient).apiV3Conn,
 		}
 		region := meta.(*TencentCloudClient).apiV3Conn.Region
-		resourceName := fmt.Sprintf("qcs::cvm:%s:uin/:instance/%s", region, instanceId)
+		resourceName := BuildTagResourceName("cvm", "instance", region, instanceId)
 		err := tagService.ModifyTags(ctx, resourceName, replaceTags, deleteTags)
 		if err != nil {
 			return err