add vpc route (#1866)

* add vpc route

* add change log

.changelog/1866.txt

@@ -0,0 +1,7 @@
+```release-note:new-data-source
+tencentcloud_vpc_net_detect_state_check
+```
+
+```release-note:new-resource
+tencentcloud_eni_sg_attachment
+```

tencentcloud/data_source_tc_vpc_net_detect_state_check.go

@@ -0,0 +1,209 @@
+/*
+Use this data source to query detailed information of vpc net_detect_state_check
+
+Example Usage
+
+```hcl
+data "tencentcloud_vpc_net_detect_state_check" "net_detect_state_check" {
+  net_detect_id         = "netd-12345678"
+  detect_destination_ip = [
+    "10.0.0.3",
+    "10.0.0.2"
+  ]
+  next_hop_type        = "NORMAL_CVM"
+  next_hop_destination = "10.0.0.4"
+}
+```
+*/
+package tencentcloud
+
+import (
+	"context"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	vpc "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312"
+	"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
+)
+
+func dataSourceTencentCloudVpcNetDetectStateCheck() *schema.Resource {
+	return &schema.Resource{
+		Read: dataSourceTencentCloudVpcNetDetectStateCheckRead,
+		Schema: map[string]*schema.Schema{
+			"detect_destination_ip": {
+				Required: true,
+				Type:     schema.TypeSet,
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
+				},
+				Description: "The array of detection destination IPv4 addresses, which contains at most two IP addresses.",
+			},
+
+			"next_hop_type": {
+				Required:    true,
+				Type:        schema.TypeString,
+				Description: "The type of the next hop. Currently supported types are:VPN: VPN gateway;DIRECTCONNECT: direct connect gateway;PEERCONNECTION: peering connection;NAT: NAT gateway;NORMAL_CVM: normal CVM.",
+			},
+
+			"next_hop_destination": {
+				Required:    true,
+				Type:        schema.TypeString,
+				Description: "The next-hop destination gateway. The value is related to NextHopType.If NextHopType is set to VPN, the value of this parameter is the VPN gateway ID, such as vpngw-12345678.If NextHopType is set to DIRECTCONNECT, the value of this parameter is the direct connect gateway ID, such as dcg-12345678.If NextHopType is set to PEERCONNECTION, the value of this parameter is the peering connection ID, such as pcx-12345678.If NextHopType is set to NAT, the value of this parameter is the NAT gateway ID, such as nat-12345678.If NextHopType is set to NORMAL_CVM, the value of this parameter is the IPv4 address of the CVM, such as 10.0.0.12.",
+			},
+
+			"net_detect_id": {
+				Optional:    true,
+				Type:        schema.TypeString,
+				Description: "ID of a network inspector instance, e.g. netd-12345678. Enter at least one of this parameter, VpcId, SubnetId, and NetDetectName. Use NetDetectId if it is present.",
+			},
+
+			"vpc_id": {
+				Optional:    true,
+				Type:        schema.TypeString,
+				Description: "ID of a `VPC` instance, e.g. `vpc-12345678`, which is used together with SubnetId and NetDetectName. You should enter either this parameter or NetDetectId, or both. Use NetDetectId if it is present.",
+			},
+
+			"subnet_id": {
+				Optional:    true,
+				Type:        schema.TypeString,
+				Description: "ID of a subnet instance, e.g. `subnet-12345678`, which is used together with VpcId and NetDetectName. You should enter either this parameter or NetDetectId, or both. Use NetDetectId if it is present.",
+			},
+
+			"net_detect_name": {
+				Optional:    true,
+				Type:        schema.TypeString,
+				Description: "The name of a network inspector, up to 60 bytes in length. It is used together with VpcId and NetDetectName. You should enter either this parameter or NetDetectId, or both. Use NetDetectId if it is present.",
+			},
+
+			"net_detect_ip_state_set": {
+				Computed:    true,
+				Type:        schema.TypeList,
+				Description: "The array of network detection verification results.",
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"detect_destination_ip": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "The destination IPv4 address of network detection.",
+						},
+						"state": {
+							Type:        schema.TypeInt,
+							Computed:    true,
+							Description: "The detection result.0: successful;-1: no packet loss occurred during routing;-2: packet loss occurred when outbound traffic is blocked by the ACL;-3: packet loss occurred when inbound traffic is blocked by the ACL;-4: other errors.",
+						},
+						"delay": {
+							Type:        schema.TypeInt,
+							Computed:    true,
+							Description: "The latency. Unit: ms.",
+						},
+						"packet_loss_rate": {
+							Type:        schema.TypeInt,
+							Computed:    true,
+							Description: "The packet loss rate.",
+						},
+					},
+				},
+			},
+
+			"result_output_file": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "Used to save results.",
+			},
+		},
+	}
+}
+
+func dataSourceTencentCloudVpcNetDetectStateCheckRead(d *schema.ResourceData, meta interface{}) error {
+	defer logElapsed("data_source.tencentcloud_vpc_net_detect_state_check.read")()
+	defer inconsistentCheck(d, meta)()
+
+	logId := getLogId(contextNil)
+
+	ctx := context.WithValue(context.TODO(), logIdKey, logId)
+
+	paramMap := make(map[string]interface{})
+	if v, ok := d.GetOk("detect_destination_ip"); ok {
+		detectDestinationIpSet := v.(*schema.Set).List()
+		paramMap["DetectDestinationIp"] = helper.InterfacesStringsPoint(detectDestinationIpSet)
+	}
+
+	if v, ok := d.GetOk("next_hop_type"); ok {
+		paramMap["NextHopType"] = helper.String(v.(string))
+	}
+
+	if v, ok := d.GetOk("next_hop_destination"); ok {
+		paramMap["NextHopDestination"] = helper.String(v.(string))
+	}
+
+	if v, ok := d.GetOk("net_detect_id"); ok {
+		paramMap["NetDetectId"] = helper.String(v.(string))
+	}
+
+	if v, ok := d.GetOk("vpc_id"); ok {
+		paramMap["VpcId"] = helper.String(v.(string))
+	}
+
+	if v, ok := d.GetOk("subnet_id"); ok {
+		paramMap["SubnetId"] = helper.String(v.(string))
+	}
+
+	if v, ok := d.GetOk("net_detect_name"); ok {
+		paramMap["NetDetectName"] = helper.String(v.(string))
+	}
+
+	service := VpcService{client: meta.(*TencentCloudClient).apiV3Conn}
+
+	var netDetectIpStateSet []*vpc.NetDetectIpState
+
+	err := resource.Retry(readRetryTimeout, func() *resource.RetryError {
+		result, e := service.DescribeVpcNetDetectStateCheck(ctx, paramMap)
+		if e != nil {
+			return retryError(e)
+		}
+		netDetectIpStateSet = result
+		return nil
+	})
+	if err != nil {
+		return err
+	}
+
+	ids := make([]string, 0, len(netDetectIpStateSet))
+	tmpList := make([]map[string]interface{}, 0, len(netDetectIpStateSet))
+
+	if netDetectIpStateSet != nil {
+		for _, netDetectIpState := range netDetectIpStateSet {
+			netDetectIpStateMap := map[string]interface{}{}
+
+			if netDetectIpState.DetectDestinationIp != nil {
+				netDetectIpStateMap["detect_destination_ip"] = netDetectIpState.DetectDestinationIp
+			}
+
+			if netDetectIpState.State != nil {
+				netDetectIpStateMap["state"] = netDetectIpState.State
+			}
+
+			if netDetectIpState.Delay != nil {
+				netDetectIpStateMap["delay"] = netDetectIpState.Delay
+			}
+
+			if netDetectIpState.PacketLossRate != nil {
+				netDetectIpStateMap["packet_loss_rate"] = netDetectIpState.PacketLossRate
+			}
+
+			ids = append(ids, *netDetectIpState.DetectDestinationIp)
+			tmpList = append(tmpList, netDetectIpStateMap)
+		}
+
+		_ = d.Set("net_detect_ip_state_set", tmpList)
+	}
+
+	d.SetId(helper.DataResourceIdsHash(ids))
+	output, ok := d.GetOk("result_output_file")
+	if ok && output.(string) != "" {
+		if e := writeToFile(output.(string), tmpList); e != nil {
+			return e
+		}
+	}
+	return nil
+}

tencentcloud/data_source_tc_vpc_net_detect_state_check_test.go

@@ -0,0 +1,37 @@
+package tencentcloud
+
+import (
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+)
+
+func TestAccTencentCloudNeedFixVpcNetDetectStateCheckDataSource_basic(t *testing.T) {
+	t.Parallel()
+	resource.Test(t, resource.TestCase{
+		PreCheck: func() {
+			testAccPreCheck(t)
+		},
+		Providers: testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccVpcNetDetectStateCheckDataSource,
+				Check:  resource.ComposeTestCheckFunc(testAccCheckTencentCloudDataSourceID("data.tencentcloud_vpc_net_detect_state_check.net_detect_state_check")),
+			},
+		},
+	})
+}
+
+const testAccVpcNetDetectStateCheckDataSource = `
+
+data "tencentcloud_vpc_net_detect_state_check" "net_detect_state_check" {
+  net_detect_id         = "netd-12345678"
+  detect_destination_ip = [
+    "10.0.0.3",
+    "10.0.0.2"
+  ]
+  next_hop_type        = "NORMAL_CVM"
+  next_hop_destination = "10.0.0.4"
+}
+
+`

tencentcloud/provider.go

@@ -858,6 +858,7 @@ Virtual Private Cloud(VPC)
 	tencentcloud_vpc_gateway_flow_qos
 	tencentcloud_vpc_cvm_instances
 	tencentcloud_vpc_net_detect_states
+	tencentcloud_vpc_net_detect_state_check
 	tencentcloud_vpc_network_interface_limit
 	tencentcloud_vpc_private_ip_addresses
 	tencentcloud_vpc_product_quota
@@ -888,6 +889,7 @@ Virtual Private Cloud(VPC)
   Resource
     tencentcloud_eni
     tencentcloud_eni_attachment
+	tencentcloud_eni_sg_attachment
     tencentcloud_vpc
 	tencentcloud_vpc_acl
 	tencentcloud_vpc_acl_attachment
@@ -1557,6 +1559,7 @@ func Provider() *schema.Provider {
 			"tencentcloud_vpc_template_limits":                       dataSourceTencentCloudVpcTemplateLimits(),
 			"tencentcloud_vpc_limits":                                dataSourceTencentCloudVpcLimits(),
 			"tencentcloud_vpc_used_ip_address":                       dataSourceTencentCloudVpcUsedIpAddress(),
+			"tencentcloud_vpc_net_detect_state_check":                dataSourceTencentCloudVpcNetDetectStateCheck(),
 			"tencentcloud_subnet":                                    dataSourceTencentCloudSubnet(),
 			"tencentcloud_route_table":                               dataSourceTencentCloudRouteTable(),
 			"tencentcloud_domains":                                   dataSourceTencentCloudDomains(),
@@ -1977,6 +1980,8 @@ func Provider() *schema.Provider {
 			"tencentcloud_vpc":                                            resourceTencentCloudVpcInstance(),
 			"tencentcloud_vpc_acl":                                        resourceTencentCloudVpcACL(),
 			"tencentcloud_vpc_acl_attachment":                             resourceTencentCloudVpcAclAttachment(),
+			"tencentcloud_vpc_network_acl_quintuple":                      resourceTencentCloudVpcNetworkAclQuintuple(),
+			"tencentcloud_vpc_notify_routes":                              resourceTencentCloudVpcNotifyRoutes(),
 			"tencentcloud_vpc_bandwidth_package":                          resourceTencentCloudVpcBandwidthPackage(),
 			"tencentcloud_vpc_bandwidth_package_attachment":               resourceTencentCloudVpcBandwidthPackageAttachment(),
 			"tencentcloud_vpc_traffic_package":                            resourceTencentCloudVpcTrafficPackage(),
@@ -2009,6 +2014,7 @@ func Provider() *schema.Provider {
 			"tencentcloud_eip_normal_address_return":                      resourceTencentCloudEipNormalAddressReturn(),
 			"tencentcloud_eni":                                            resourceTencentCloudEni(),
 			"tencentcloud_eni_attachment":                                 resourceTencentCloudEniAttachment(),
+			"tencentcloud_eni_sg_attachment":                              resourceTencentCloudEniSgAttachment(),
 			"tencentcloud_ccn":                                            resourceTencentCloudCcn(),
 			"tencentcloud_ccn_attachment":                                 resourceTencentCloudCcnAttachment(),
 			"tencentcloud_ccn_bandwidth_limit":                            resourceTencentCloudCcnBandwidthLimit(),