fix/vpc (#2047)

* fix/vpc

* fix/vpc-bug

Author: SevenEarth

.changelog/2047.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/tencentcloud_eni: Update `security_groups` field
+```

tencentcloud/resource_tc_eni.go

@@ -4,25 +4,53 @@ Provides a resource to create an ENI.
 Example Usage
 
 ```hcl
-resource "tencentcloud_vpc" "foo" {
-  name       = "ci-test-eni-vpc"
+data "tencentcloud_availability_zones_by_product" "zones" {
+  product = "vpc"
+}
+
+resource "tencentcloud_vpc" "vpc" {
+  name       = "vpc-example"
   cidr_block = "10.0.0.0/16"
 }
 
-resource "tencentcloud_subnet" "foo" {
-  availability_zone = "ap-guangzhou-3"
-  name              = "ci-test-eni-subnet"
-  vpc_id            = tencentcloud_vpc.foo.id
+resource "tencentcloud_subnet" "subnet" {
+  availability_zone = data.tencentcloud_availability_zones_by_product.zones.zones.0.name
+  name              = "subnet-example"
+  vpc_id            = tencentcloud_vpc.vpc.id
   cidr_block        = "10.0.0.0/16"
   is_multicast      = false
 }
 
-resource "tencentcloud_eni" "foo" {
-  name        = "ci-test-eni"
-  vpc_id      = tencentcloud_vpc.foo.id
-  subnet_id   = tencentcloud_subnet.foo.id
-  description = "eni desc"
-  ipv4_count  = 1
+resource "tencentcloud_security_group" "example1" {
+  name        = "tf-example-sg1"
+  description = "sg desc."
+  project_id  = 0
+
+  tags = {
+    "example" = "test"
+  }
+}
+
+resource "tencentcloud_security_group" "example2" {
+  name        = "tf-example-sg2"
+  description = "sg desc."
+  project_id  = 0
+
+  tags = {
+    "example" = "test"
+  }
+}
+
+resource "tencentcloud_eni" "example" {
+  name            = "tf-example-eni"
+  vpc_id          = tencentcloud_vpc.vpc.id
+  subnet_id       = tencentcloud_subnet.subnet.id
+  description     = "eni desc."
+  ipv4_count      = 1
+  security_groups = [
+    tencentcloud_security_group.example1.id,
+    tencentcloud_security_group.example2.id
+  ]
 }
 ```
 
@@ -108,6 +136,7 @@ func resourceTencentCloudEni() *schema.Resource {
 			"security_groups": {
 				Type:        schema.TypeSet,
 				Optional:    true,
+				Computed:    true,
 				Elem:        &schema.Schema{Type: schema.TypeString},
 				Set:         schema.HashString,
 				Description: "A set of security group IDs.",

tencentcloud/resource_tc_eni_sg_attachment.go

@@ -4,9 +4,57 @@ Provides a resource to create a eni_sg_attachment
 Example Usage
 
 ```hcl
+data "tencentcloud_availability_zones_by_product" "zones" {
+  product = "vpc"
+}
+
+resource "tencentcloud_vpc" "vpc" {
+  name       = "vpc-example"
+  cidr_block = "10.0.0.0/16"
+}
+
+resource "tencentcloud_subnet" "subnet" {
+  availability_zone = data.tencentcloud_availability_zones_by_product.zones.zones.0.name
+  name              = "subnet-example"
+  vpc_id            = tencentcloud_vpc.vpc.id
+  cidr_block        = "10.0.0.0/16"
+  is_multicast      = false
+}
+
+resource "tencentcloud_security_group" "example1" {
+  name        = "tf-example-sg1"
+  description = "sg desc."
+  project_id  = 0
+
+  tags = {
+    "example" = "test"
+  }
+}
+
+resource "tencentcloud_security_group" "example2" {
+  name        = "tf-example-sg2"
+  description = "sg desc."
+  project_id  = 0
+
+  tags = {
+    "example" = "test"
+  }
+}
+
+resource "tencentcloud_eni" "example" {
+  name        = "tf-example-eni"
+  vpc_id      = tencentcloud_vpc.vpc.id
+  subnet_id   = tencentcloud_subnet.subnet.id
+  description = "eni desc."
+  ipv4_count  = 1
+}
+
 resource "tencentcloud_eni_sg_attachment" "eni_sg_attachment" {
-  network_interface_ids = ["eni-p0hkgx8p"]
-  security_group_ids    = ["sg-902tl7t7", "sg-edmur627"]
+  network_interface_ids = [tencentcloud_eni.example.id]
+  security_group_ids    = [
+    tencentcloud_security_group.example1.id,
+    tencentcloud_security_group.example2.id
+  ]
 }
 ```
 

tencentcloud/resource_tc_security_group_rule_set.go

@@ -331,69 +331,68 @@ func resourceTencentCloudSecurityGroupRuleSetUpdate(d *schema.ResourceData, m in
 		request.SecurityGroupPolicySet = &vpc.SecurityGroupPolicySet{}
 		request.SortPolicys = helper.Bool(true)
 
-		ingressRules := d.Get("ingress").([]interface{})
-		egressRules := d.Get("egress").([]interface{})
-		if len(ingressRules) == 0 && len(egressRules) == 0 {
+		oldIngress, newIngress := d.GetChange("ingress")
+		oldEgress, newEgress := d.GetChange("egress")
+
+		oldIngressList := oldIngress.([]interface{})
+		newIngressList := newIngress.([]interface{})
+		oldEgressList := oldEgress.([]interface{})
+		newEgressList := newEgress.([]interface{})
+
+		if len(newIngressList) == 0 && len(newEgressList) == 0 {
 			ver = 0
-		} else if len(ingressRules) != 0 && len(egressRules) == 0 {
-			request.SecurityGroupPolicySet.Ingress, err = unmarshalSecurityPolicy(ingressRules)
+
+		} else if len(newIngressList) != 0 && len(newEgressList) == 0 {
+			request.SecurityGroupPolicySet.Ingress, err = unmarshalSecurityPolicy(newIngressList)
 			if err != nil {
 				return err
 			}
 
-			result, e := service.DescribeSecurityGroupPolicies(ctx, securityGroupId)
-			if e != nil {
-				return e
-			}
-
-			if len(result.Egress) > 0 {
-				tmpList := []*int64{}
-				egressRulesList := marshalSecurityPolicy(result.Egress)
-				for _, v := range egressRulesList {
+			if len(oldEgressList) > 0 {
+				tmpList := make([]*int64, 0)
+				for _, v := range oldEgressList {
 					item := v.(map[string]interface{})
-					tmpList = append(tmpList, item["policy_index"].(*int64))
+					policyIndex := int64(item["policy_index"].(int))
+					tmpList = append(tmpList, &policyIndex)
 				}
 
-				e = service.DeleteSecurityGroupPolicyByPolicyIndexList(ctx, securityGroupId, tmpList, "egress")
+				e := service.DeleteSecurityGroupPolicyByPolicyIndexList(ctx, securityGroupId, tmpList, "egress")
 				if e != nil {
 					return e
 				}
 
 				ver += 1
 			}
 
-		} else if len(ingressRules) == 0 && len(egressRules) != 0 {
-			request.SecurityGroupPolicySet.Egress, err = unmarshalSecurityPolicy(egressRules)
+		} else if len(newIngressList) == 0 && len(newEgressList) != 0 {
+			request.SecurityGroupPolicySet.Egress, err = unmarshalSecurityPolicy(newEgressList)
 			if err != nil {
 				return err
 			}
 
-			result, e := service.DescribeSecurityGroupPolicies(ctx, securityGroupId)
-			if e != nil {
-				return e
-			}
-
-			if len(result.Ingress) > 0 {
-				tmpList := []*int64{}
-				ingressRulesList := marshalSecurityPolicy(result.Ingress)
-				for _, v := range ingressRulesList {
+			if len(oldIngressList) > 0 {
+				tmpList := make([]*int64, 0)
+				for _, v := range oldIngressList {
 					item := v.(map[string]interface{})
-					tmpList = append(tmpList, item["policy_index"].(*int64))
+					policyIndex := int64(item["policy_index"].(int))
+					tmpList = append(tmpList, &policyIndex)
 				}
-				e = service.DeleteSecurityGroupPolicyByPolicyIndexList(ctx, securityGroupId, tmpList, "ingress")
+
+				e := service.DeleteSecurityGroupPolicyByPolicyIndexList(ctx, securityGroupId, tmpList, "ingress")
 				if e != nil {
 					return e
 				}
 
 				ver += 1
 			}
+
 		} else {
-			request.SecurityGroupPolicySet.Ingress, err = unmarshalSecurityPolicy(ingressRules)
+			request.SecurityGroupPolicySet.Ingress, err = unmarshalSecurityPolicy(newIngressList)
 			if err != nil {
 				return err
 			}
 
-			request.SecurityGroupPolicySet.Egress, err = unmarshalSecurityPolicy(egressRules)
+			request.SecurityGroupPolicySet.Egress, err = unmarshalSecurityPolicy(newEgressList)
 			if err != nil {
 				return err
 			}

website/docs/r/eni.html.markdown

@@ -14,25 +14,53 @@ Provides a resource to create an ENI.
 ## Example Usage
 
 ```hcl
-resource "tencentcloud_vpc" "foo" {
-  name       = "ci-test-eni-vpc"
+data "tencentcloud_availability_zones_by_product" "zones" {
+  product = "vpc"
+}
+
+resource "tencentcloud_vpc" "vpc" {
+  name       = "vpc-example"
   cidr_block = "10.0.0.0/16"
 }
 
-resource "tencentcloud_subnet" "foo" {
-  availability_zone = "ap-guangzhou-3"
-  name              = "ci-test-eni-subnet"
-  vpc_id            = tencentcloud_vpc.foo.id
+resource "tencentcloud_subnet" "subnet" {
+  availability_zone = data.tencentcloud_availability_zones_by_product.zones.zones.0.name
+  name              = "subnet-example"
+  vpc_id            = tencentcloud_vpc.vpc.id
   cidr_block        = "10.0.0.0/16"
   is_multicast      = false
 }
 
-resource "tencentcloud_eni" "foo" {
-  name        = "ci-test-eni"
-  vpc_id      = tencentcloud_vpc.foo.id
-  subnet_id   = tencentcloud_subnet.foo.id
-  description = "eni desc"
+resource "tencentcloud_security_group" "example1" {
+  name        = "tf-example-sg1"
+  description = "sg desc."
+  project_id  = 0
+
+  tags = {
+    "example" = "test"
+  }
+}
+
+resource "tencentcloud_security_group" "example2" {
+  name        = "tf-example-sg2"
+  description = "sg desc."
+  project_id  = 0
+
+  tags = {
+    "example" = "test"
+  }
+}
+
+resource "tencentcloud_eni" "example" {
+  name        = "tf-example-eni"
+  vpc_id      = tencentcloud_vpc.vpc.id
+  subnet_id   = tencentcloud_subnet.subnet.id
+  description = "eni desc."
   ipv4_count  = 1
+  security_groups = [
+    tencentcloud_security_group.example1.id,
+    tencentcloud_security_group.example2.id
+  ]
 }
 ```
 

website/docs/r/eni_sg_attachment.html.markdown

@@ -14,9 +14,57 @@ Provides a resource to create a eni_sg_attachment
 ## Example Usage
 
 ```hcl
+data "tencentcloud_availability_zones_by_product" "zones" {
+  product = "vpc"
+}
+
+resource "tencentcloud_vpc" "vpc" {
+  name       = "vpc-example"
+  cidr_block = "10.0.0.0/16"
+}
+
+resource "tencentcloud_subnet" "subnet" {
+  availability_zone = data.tencentcloud_availability_zones_by_product.zones.zones.0.name
+  name              = "subnet-example"
+  vpc_id            = tencentcloud_vpc.vpc.id
+  cidr_block        = "10.0.0.0/16"
+  is_multicast      = false
+}
+
+resource "tencentcloud_security_group" "example1" {
+  name        = "tf-example-sg1"
+  description = "sg desc."
+  project_id  = 0
+
+  tags = {
+    "example" = "test"
+  }
+}
+
+resource "tencentcloud_security_group" "example2" {
+  name        = "tf-example-sg2"
+  description = "sg desc."
+  project_id  = 0
+
+  tags = {
+    "example" = "test"
+  }
+}
+
+resource "tencentcloud_eni" "example" {
+  name        = "tf-example-eni"
+  vpc_id      = tencentcloud_vpc.vpc.id
+  subnet_id   = tencentcloud_subnet.subnet.id
+  description = "eni desc."
+  ipv4_count  = 1
+}
+
 resource "tencentcloud_eni_sg_attachment" "eni_sg_attachment" {
-  network_interface_ids = ["eni-p0hkgx8p"]
-  security_group_ids    = ["sg-902tl7t7", "sg-edmur627"]
+  network_interface_ids = [tencentcloud_eni.example.id]
+  security_group_ids = [
+    tencentcloud_security_group.example1.id,
+    tencentcloud_security_group.example2.id
+  ]
 }
 ```