Merge remote-tracking branch 'origin/master'

“guojunchu” · “guojunchu” · commit 9e88aa00dcfd · 2020-08-11T15:44:21.000+08:00
# Conflicts:
#	tencentcloud/data_source_tc_vpc_acls.go
#	tencentcloud/resource_tc_vpc_acl.go
#	tencentcloud/service_tencentcloud_vpc.go
diff --git a/tencentcloud/resource_tc_vpc_acl_attachment.go b/tencentcloud/resource_tc_vpc_acl_attachment.go
@@ -138,7 +138,7 @@ func resourceTencentCloudVpcAclAttachmentRead(d *schema.ResourceData, meta inter
 		return err
 	}
 	if len(results) > 0 && len(results[0].SubnetSet) < 1 {
-		return fmt.Errorf("[TECENT_TERRAFORM_CHECK][ACL attachment][Read] check: acl attachment  is not creat")
+		return fmt.Errorf("[TECENT_TERRAFORM_CHECK][ACL attachment][Read] check: acl attachment  is not create")
 	}
 	return nil
 

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ func resourceTencentCloudVpcAclAttachmentRead(d *schema.ResourceData, meta inter`
`138`	`138`	`return err`
`139`	`139`	`}`
`140`	`140`	`if len(results) > 0 && len(results[0].SubnetSet) < 1 {`
`141`		`- return fmt.Errorf("[TECENT_TERRAFORM_CHECK][ACL attachment][Read] check: acl attachment is not creat")`
	`141`	`+ return fmt.Errorf("[TECENT_TERRAFORM_CHECK][ACL attachment][Read] check: acl attachment is not create")`
`142`	`142`	`}`
`143`	`143`	`return nil`
`144`	`144`