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”

CHANGELOG.md

@@ -1,4 +1,12 @@
-## 1.40.0 (Unreleased)
+## 1.40.1 (Unreleased)
+
+FEATURES:
+
+* **New Data Source**: `tencentcloud_vpc_acls`
+* **New Resource**: `tencentcloud_vpc_acl`
+* **New Resource**: `tencentcloud_vpc_acl_attachment`
+
+## 1.40.0 (July 31, 2020)
 
 FEATURES:
 

tencentcloud/resource_tc_vpc_acl_attachment.go

@@ -3,11 +3,12 @@ package tencentcloud
 import (
 	"context"
 	"fmt"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"log"
 	"strings"
 	"time"
+
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func resourceTencentCloudVpcAclAttachment() *schema.Resource {
@@ -118,11 +119,12 @@ func resourceTencentCloudVpcAclAttachmentRead(d *schema.ResourceData, meta inter
 
 func resourceTencentCloudVpcAclAttachmentDelete(d *schema.ResourceData, meta interface{}) error {
 	defer logElapsed("resource.tencentcloud_acl_attachment.delete")()
-
-	logId := getLogId(contextNil)
-	ctx := context.WithValue(context.TODO(), logIdKey, logId)
-	service := VpcService{client: meta.(*TencentCloudClient).apiV3Conn}
-	attachmentAcl := d.Id()
+	var (
+		logId         = getLogId(contextNil)
+		ctx           = context.WithValue(context.TODO(), logIdKey, logId)
+		service       = VpcService{client: meta.(*TencentCloudClient).apiV3Conn}
+		attachmentAcl = d.Id()
+	)
 
 	err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
 		e := service.DeleteAclAttachment(ctx, attachmentAcl)

tencentcloud/resource_tc_vpc_acl_attachment_test.go

@@ -16,7 +16,7 @@ func TestAccTencentCloudVpcAclAttachment_basic(t *testing.T) {
 		CheckDestroy: testVpcAclAttachmentDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccCamGroupPolicyAttachment_basic,
+				Config: testAclAttachment_basic,
 				Check: resource.ComposeTestCheckFunc(
 					testVpcAclAttachmentExists("tencentcloud_vpc_acl_attachment.attachment"),
 					resource.TestCheckResourceAttrSet("tencentcloud_vpc_acl_attachment.attachment", "id"),
@@ -65,9 +65,9 @@ func testVpcAclAttachmentExists(n string) resource.TestCheckFunc {
 	}
 }
 
-const testAccCamGroupPolicyAttachment_basic = `
+const testAclAttachment_basic = `
 resource "tencentcloud_vpc" "foo" {
-  name       = "guagua_vpc_instance_test"
+  name       = "vpc_instance_test"
   cidr_block = "10.0.0.0/16"
 }
 
@@ -76,8 +76,8 @@ data "tencentcloud_vpc_instances" "id_instances" {
 }
 
 resource "tencentcloud_vpc_acl" "foo" {  
-    vpc_id            	= data.tencentcloud_vpc_instances.default.instance_list.0.vpc_id
-    name  	= "test_acl_gogoowang"
+    vpc_id  = data.tencentcloud_vpc_instances.default.instance_list.0.vpc_id
+    name  	= "test_acl"
 	ingress = [
 		"ACCEPT#192.168.1.0/24#800#TCP",
 		"ACCEPT#192.168.1.0/24#800-900#TCP",