set empty id;add filter for attach rules

Author: crab21

tencentcloud/data_source_tc_vpc_acls.go

@@ -197,30 +197,11 @@ func dataSourceTencentCloudVpcACLRead(d *schema.ResourceData, meta interface{})
 		ctx     = context.WithValue(context.TODO(), logIdKey, logId)
 		service = VpcService{client: meta.(*TencentCloudClient).apiV3Conn}
 
-		vpcID string
-		name  string
-		id    string
+		vpcID = d.Get("vpc_id").(string)
+		name  = d.Get("name").(string)
+		id    = d.Get("id").(string)
 	)
 
-	if temp, ok := d.GetOk("vpc_id"); ok {
-		tempStr := temp.(string)
-		if tempStr != "" {
-			vpcID = tempStr
-		}
-	}
-	if temp, ok := d.GetOk("name"); ok {
-		tempStr := temp.(string)
-		if tempStr != "" {
-			name = tempStr
-		}
-	}
-	if temp, ok := d.GetOk("id"); ok {
-		tempStr := temp.(string)
-		if tempStr != "" {
-			id = tempStr
-		}
-	}
-
 	networkAcls, err := service.DescribeNetWorkAcls(ctx, id, vpcID, name)
 	if err != nil {
 		return err

tencentcloud/resource_tc_vpc_acl.go

@@ -35,6 +35,7 @@ import (
 	"context"
 	"fmt"
 	"log"
+	"strings"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/terraform-providers/terraform-provider-tencentcloud/tencentcloud/internal/helper"
@@ -131,7 +132,6 @@ func resourceTencentCloudVpcACLCreate(d *schema.ResourceData, meta interface{})
 	if err != nil {
 		return err
 	}
-
 	return resourceTencentCloudVpcACLRead(d, meta)
 }
 
@@ -164,26 +164,32 @@ func resourceTencentCloudVpcACLRead(d *schema.ResourceData, meta interface{}) er
 	_ = d.Set("vpc_id", info.VpcId)
 	_ = d.Set("create_time", info.CreatedTime)
 	_ = d.Set("name", info.NetworkAclName)
-	egressList := make([]map[string]interface{}, 0, len(info.EgressEntries))
+	egressList := make([]string, 0, len(info.EgressEntries))
 	for i := range info.EgressEntries {
-		result := map[string]interface{}{
-			"protocol": info.EgressEntries[i].Protocol,
-			"port":     info.EgressEntries[i].Port,
-			"cidr_ip":  info.EgressEntries[i].CidrBlock,
-			"policy":   info.EgressEntries[i].Action,
+		if info.EgressEntries[i].Port == nil || *info.EgressEntries[i].Port == "" {
+			continue
 		}
-		egressList = append(egressList, result)
+		result := strings.Join([]string{
+			*info.EgressEntries[i].Action,
+			*info.EgressEntries[i].CidrBlock,
+			*info.EgressEntries[i].Port,
+			*info.EgressEntries[i].Protocol,
+		}, "#")
+		egressList = append(egressList, strings.ToUpper(result))
 	}
 
-	ingressList := make([]map[string]interface{}, 0, len(info.IngressEntries))
+	ingressList := make([]string, 0, len(info.IngressEntries))
 	for i := range info.IngressEntries {
-		result := map[string]interface{}{
-			"protocol": info.IngressEntries[i].Protocol,
-			"port":     info.IngressEntries[i].Port,
-			"cidr_ip":  info.IngressEntries[i].CidrBlock,
-			"policy":   info.IngressEntries[i].Action,
+		if info.IngressEntries[i].Port == nil || *info.IngressEntries[i].Port == "" {
+			continue
 		}
-		ingressList = append(ingressList, result)
+		result := strings.Join([]string{
+			*info.IngressEntries[i].Action,
+			*info.IngressEntries[i].CidrBlock,
+			*info.IngressEntries[i].Port,
+			*info.IngressEntries[i].Protocol,
+		}, "#")
+		ingressList = append(ingressList, strings.ToUpper(result))
 	}
 	_ = d.Set("egress", egressList)
 	_ = d.Set("ingress", ingressList)

tencentcloud/resource_tc_vpc_acl_attachment.go

@@ -109,6 +109,7 @@ func resourceTencentCloudVpcAclAttachmentRead(d *schema.ResourceData, meta inter
 		return err
 	}
 	if len(results) > 0 && len(results[0].SubnetSet) < 1 {
+		d.SetId("")
 		return fmt.Errorf("[TECENT_TERRAFORM_CHECK][ACL attachment][Read] check: acl attachment  is not create")
 	}
 	return nil

tencentcloud/service_tencentcloud_vpc.go

@@ -2858,6 +2858,9 @@ func (me *VpcService) CreateVpcNetworkAcl(ctx context.Context, vpcID string, nam
 func (me *VpcService) AttachRulesToACL(ctx context.Context, aclID string, ingressParm, egressParm []VpcACLRule) (errRet error) {
 	logId := getLogId(ctx)
 
+	if len(ingressParm) == 0 && len(egressParm) == 0 {
+		return
+	}
 	if errRet = me.ModifyNetWorkAclRules(ctx, aclID, ingressParm, egressParm); errRet != nil {
 		log.Printf("[CRITAL]%s attach rules to acl failed, reason: %v", logId, errRet)
 	}