Merge remote-tracking branch 'origin/master'

# Conflicts:
#	tencentcloud/data_source_tc_vpc_acls.go
#	tencentcloud/resource_tc_vpc_acl.go
#	tencentcloud/service_tencentcloud_vpc.go

Author: “guojunchu”

tencentcloud/resource_tc_vpc_acl_attachment.go

@@ -57,7 +57,7 @@ func resourceTencentCloudVpcAclAttachment() *schema.Resource {
 				Type:        schema.TypeString,
 				Required:    true,
 				ForceNew:    true,
-				Description: " the Subnet instance ID.",
+				Description: "The Subnet instance ID.",
 			},
 		},
 	}
@@ -69,17 +69,12 @@ func resourceTencentCloudVpcAclAttachmentCreate(d *schema.ResourceData, meta int
 		logId     = getLogId(contextNil)
 		ctx       = context.WithValue(context.TODO(), logIdKey, logId)
 		service   = VpcService{client: meta.(*TencentCloudClient).apiV3Conn}
-		aclId     string
 		subnetIds []string
-		subnetId  string
 	)
 
-	if temp, ok := d.GetOk("acl_id"); ok {
-		aclId = temp.(string)
-	}
-	if temp, ok := d.GetOk("subnet_id"); ok {
-		subnetId = temp.(string)
-	}
+	aclId := d.Get("acl_id").(string)
+	subnetId := d.Get("acl_id").(string)
+
 	subnetIds = append(subnetIds, subnetId)
 
 	err := service.AssociateAclSubnets(ctx, aclId, subnetIds)

tencentcloud/service_tencentcloud_vpc.go

@@ -3217,7 +3217,7 @@ func (me *VpcService) DescribeByAclId(ctx context.Context, attachmentAcl string)
 	}()
 
 	if attachmentAcl == "" {
-		errRet = fmt.Errorf("DeleteRouteTable can not invoke by empty routeTableId.")
+		errRet = fmt.Errorf("DisassociateNetworkAclSubnets  can not invoke by empty routeTableId.")
 		return
 	}