Merge pull request #1674 from tencentcloudstack/feat/ccn_attachment_support_update

ccn attachment support des

Author: lyu571

.changelog/1674.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/tencentcloud_ccn_attachment: support set `description`
+```

tencentcloud/resource_tc_ccn_attachment.go

@@ -51,8 +51,12 @@ import (
 	"context"
 	"crypto/md5"
 	"fmt"
+	"log"
 	"strings"
 
+	vpc "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312"
+	"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/ratelimit"
+
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
@@ -61,6 +65,7 @@ func resourceTencentCloudCcnAttachment() *schema.Resource {
 	return &schema.Resource{
 		Create: resourceTencentCloudCcnAttachmentCreate,
 		Read:   resourceTencentCloudCcnAttachmentRead,
+		Update: resourceTencentCloudCcnAttachmentUpdate,
 		Delete: resourceTencentCloudCcnAttachmentDelete,
 
 		Schema: map[string]*schema.Schema{
@@ -89,6 +94,11 @@ func resourceTencentCloudCcnAttachment() *schema.Resource {
 				ForceNew:    true,
 				Description: "ID of instance is attached.",
 			},
+			"description": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "Remark of attachment.",
+			},
 			"ccn_uin": {
 				Type:        schema.TypeString,
 				Optional:    true,
@@ -132,13 +142,18 @@ func resourceTencentCloudCcnAttachmentCreate(d *schema.ResourceData, meta interf
 		instanceType   = d.Get("instance_type").(string)
 		instanceRegion = d.Get("instance_region").(string)
 		instanceId     = d.Get("instance_id").(string)
+		description    = ""
 		ccnUin         = ""
 	)
 
 	if len(ccnId) < 4 || len(instanceRegion) < 3 || len(instanceId) < 3 {
 		return fmt.Errorf("param ccn_id or instance_region or instance_id  error")
 	}
 
+	if v, ok := d.GetOk("description"); ok {
+		description = v.(string)
+	}
+
 	if v, ok := d.GetOk("ccn_uin"); ok {
 		ccnUin = v.(string)
 		if ccnUin != "" && instanceType != CNN_INSTANCE_TYPE_VPC {
@@ -154,7 +169,7 @@ func resourceTencentCloudCcnAttachmentCreate(d *schema.ResourceData, meta interf
 		}
 	}
 
-	if err := service.AttachCcnInstances(ctx, ccnId, instanceRegion, instanceType, instanceId, ccnUin); err != nil {
+	if err := service.AttachCcnInstances(ctx, ccnId, instanceRegion, instanceType, instanceId, ccnUin, description); err != nil {
 		return err
 	}
 
@@ -253,6 +268,7 @@ func resourceTencentCloudCcnAttachmentRead(d *schema.ResourceData, meta interfac
 			return nil
 		}
 
+		_ = d.Set("description", info.description)
 		_ = d.Set("state", strings.ToUpper(info.state))
 		_ = d.Set("attached_time", info.attachedTime)
 		_ = d.Set("cidr_block", info.cidrBlock)
@@ -264,6 +280,49 @@ func resourceTencentCloudCcnAttachmentRead(d *schema.ResourceData, meta interfac
 	return nil
 }
 
+func resourceTencentCloudCcnAttachmentUpdate(d *schema.ResourceData, meta interface{}) error {
+	defer logElapsed("resource.tencentcloud_ccn_attachment.create")()
+	logId := getLogId(contextNil)
+
+	if d.HasChange("description") {
+		var (
+			ccnId          = d.Get("ccn_id").(string)
+			instanceType   = d.Get("instance_type").(string)
+			instanceRegion = d.Get("instance_region").(string)
+			instanceId     = d.Get("instance_id").(string)
+			description    = d.Get("description").(string)
+		)
+
+		request := vpc.NewModifyCcnAttachedInstancesAttributeRequest()
+		request.CcnId = &ccnId
+
+		var ccnInstance vpc.CcnInstance
+		ccnInstance.InstanceId = &instanceId
+		ccnInstance.InstanceRegion = &instanceRegion
+		ccnInstance.InstanceType = &instanceType
+		ccnInstance.Description = &description
+
+		request.Instances = []*vpc.CcnInstance{&ccnInstance}
+
+		err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
+			ratelimit.Check(request.GetAction())
+			response, err := meta.(*TencentCloudClient).apiV3Conn.UseVpcClient().ModifyCcnAttachedInstancesAttribute(request)
+			if err != nil {
+				log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n",
+					logId, request.GetAction(), request.ToJsonString(), err.Error())
+				return retryError(err)
+			}
+			log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n",
+				logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
+			return nil
+		})
+		if err != nil {
+			return err
+		}
+	}
+	return resourceTencentCloudCcnAttachmentRead(d, meta)
+}
+
 func resourceTencentCloudCcnAttachmentDelete(d *schema.ResourceData, meta interface{}) error {
 	defer logElapsed("resource.tencentcloud_ccn_attachment.delete")()
 

tencentcloud/service_tencentcloud_ccn.go

@@ -32,6 +32,7 @@ type CcnAttachedInstanceInfo struct {
 	state          string
 	attachedTime   string
 	cidrBlock      []string
+	description    string
 }
 
 type CcnBandwidthLimit struct {
@@ -398,6 +399,7 @@ func (me *VpcService) DescribeCcnAttachedInstances(ctx context.Context, ccnId st
 		info.instanceRegion = *item.InstanceRegion
 		info.instanceType = *item.InstanceType
 		info.state = *item.State
+		info.description = *item.Description
 		infos = append(infos, info)
 	}
 	return
@@ -448,7 +450,7 @@ func (me *VpcService) DescribeCcnAttachmentsByInstance(ctx context.Context, inst
 	return
 }
 
-func (me *VpcService) AttachCcnInstances(ctx context.Context, ccnId, instanceRegion, instanceType, instanceId string, ccnUin string) (errRet error) {
+func (me *VpcService) AttachCcnInstances(ctx context.Context, ccnId, instanceRegion, instanceType, instanceId string, ccnUin string, description string) (errRet error) {
 
 	logId := getLogId(ctx)
 	request := vpc.NewAttachCcnInstancesRequest()
@@ -457,10 +459,14 @@ func (me *VpcService) AttachCcnInstances(ctx context.Context, ccnId, instanceReg
 	if ccnUin != "" {
 		request.CcnUin = &ccnUin
 	}
+
 	var ccnInstance vpc.CcnInstance
 	ccnInstance.InstanceId = &instanceId
 	ccnInstance.InstanceRegion = &instanceRegion
 	ccnInstance.InstanceType = &instanceType
+	if description != "" {
+		ccnInstance.Description = &description
+	}
 
 	request.Instances = []*vpc.CcnInstance{&ccnInstance}
 	ratelimit.Check(request.GetAction())

website/docs/r/ccn_attachment.html.markdown

@@ -64,6 +64,7 @@ The following arguments are supported:
 * `instance_region` - (Required, String, ForceNew) The region that the instance locates at.
 * `instance_type` - (Required, String, ForceNew) Type of attached instance network, and available values include `VPC`, `DIRECTCONNECT`, `BMVPC` and `VPNGW`. Note: `VPNGW` type is only for whitelist customer now.
 * `ccn_uin` - (Optional, String, ForceNew) Uin of the ccn attached. Default is ``, which means the uin of this account. This parameter is used with case when attaching ccn of other account to the instance of this account. For now only support instance type `VPC`.
+* `description` - (Optional, String) Remark of attachment.
 
 ## Attributes Reference