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

@@ -32,7 +32,6 @@ import (
 	"log"
 	"strings"
 
-	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
@@ -73,7 +72,7 @@ func resourceTencentCloudVpcAclAttachmentCreate(d *schema.ResourceData, meta int
 	)
 
 	aclId := d.Get("acl_id").(string)
-	subnetId := d.Get("acl_id").(string)
+	subnetId := d.Get("subnet_id").(string)
 
 	subnetIds = append(subnetIds, subnetId)
 
@@ -84,19 +83,6 @@ func resourceTencentCloudVpcAclAttachmentCreate(d *schema.ResourceData, meta int
 
 	d.SetId(aclId + "#" + subnetId)
 
-	aclAttachmentId := d.Id()
-	err = resource.Retry(readRetryTimeout, func() *resource.RetryError {
-		e := service.DescribeByAclId(ctx, aclAttachmentId)
-		if e != nil {
-			return retryError(e)
-		}
-		return nil
-	})
-	if err != nil {
-		log.Printf("[CRITAL]%s read acl attachment failed, reason:%s\n", logId, err.Error())
-		return err
-	}
-
 	return resourceTencentCloudVpcAclAttachmentRead(d, meta)
 }
 

tencentcloud/service_tencentcloud_vpc.go

@@ -3227,7 +3227,7 @@ func (me *VpcService) DescribeByAclId(ctx context.Context, attachmentAcl string)
 	if err != nil {
 		return err
 	}
-	if len(results) < 1 && len(results[0].SubnetSet) < 1 {
+	if len(results) < 1 || len(results[0].SubnetSet) < 1 {
 		return fmt.Errorf("[TECENT_TERRAFORM_CHECK][ACL attachment][Exists] check: Acl id is not set")
 	}
 	return nil