Merge pull request #709 from tencentcloudstack/feat/vpc-default-route-table

feat: vpc - support default route table

Author: Kagashino

tencentcloud/data_source_tc_vpc_route_tables.go

@@ -30,6 +30,11 @@ data "tencentcloud_vpc_route_tables" "name_instances" {
   name = tencentcloud_route_table.route_table.name
 }
 
+data "tencentcloud_vpc_route_tables" "vpc_default_instance" {
+  vpc_id           = tencentcloud_vpc.foo.id
+  association_main = true
+}
+
 data "tencentcloud_vpc_route_tables" "tags_instances" {
   tags = tencentcloud_route_table.route_table.tags
 }

tencentcloud/data_source_tc_vpc_route_tables_test.go

@@ -52,6 +52,11 @@ func TestAccDataSourceTencentCloudVpcV3RouteTables_basic(t *testing.T) {
 					testAccCheckTencentCloudDataSourceID("data.tencentcloud_vpc_route_tables.vpc_instances"),
 					resource.TestCheckResourceAttrSet("data.tencentcloud_vpc_route_tables.vpc_instances", "instance_list.#"),
 					resource.TestCheckResourceAttrSet("data.tencentcloud_vpc_route_tables.tags_instances", "instance_list.0.vpc_id"),
+
+					// vpc_id && association_main filter
+					testAccCheckTencentCloudDataSourceID("data.tencentcloud_vpc_route_tables.vpc_default_instance"),
+					resource.TestCheckResourceAttr("data.tencentcloud_vpc_route_tables.vpc_default_instance", "instance_list.#", "1"),
+					resource.TestCheckResourceAttrSet("data.tencentcloud_vpc_route_tables.vpc_default_instance", "instance_list.0.vpc_id"),
 				),
 			},
 		},
@@ -89,6 +94,11 @@ data "tencentcloud_vpc_route_tables" "vpc_instances" {
   vpc_id = tencentcloud_vpc.foo.id
 }
 
+data "tencentcloud_vpc_route_tables" "vpc_default_instance" {
+  vpc_id           = tencentcloud_vpc.foo.id
+  association_main = true
+}
+
 data "tencentcloud_vpc_route_tables" "tags_instances" {
   tags = tencentcloud_route_table.route_table.tags
 }

tencentcloud/resource_tc_vpc.go

@@ -95,6 +95,11 @@ func resourceTencentCloudVpcInstance() *schema.Resource {
 				Computed:    true,
 				Description: "Creation time of VPC.",
 			},
+			"default_route_table_id": {
+				Type:	    schema.TypeString,
+				Computed:   true,
+				Description: "Default route table id, which created automatically after VPC create.",
+			},
 		},
 	}
 }
@@ -186,6 +191,20 @@ func resourceTencentCloudVpcInstanceRead(d *schema.ResourceData, meta interface{
 			return resource.NonRetryableError(errRet)
 		}
 
+		routeTables, err := service.DescribeRouteTables(ctx, "", "", d.Id(), nil, helper.Bool(true), "")
+
+		if err != nil {
+			log.Printf("[WARN] Describe default Route Table error: %s", err.Error())
+		}
+
+		for i := range routeTables {
+			routeTable := routeTables[i]
+			if routeTable.isDefault {
+				_ = d.Set("default_route_table_id", routeTable.routeTableId)
+				break
+			}
+		}
+
 		tags := make(map[string]string, len(info.tags))
 		for _, tag := range info.tags {
 			if tag.Key == nil {
@@ -198,6 +217,7 @@ func resourceTencentCloudVpcInstanceRead(d *schema.ResourceData, meta interface{
 			tags[*tag.Key] = *tag.Value
 		}
 
+
 		_ = d.Set("name", info.name)
 		_ = d.Set("cidr_block", info.cidr)
 		_ = d.Set("dns_servers", info.dnsServers)

tencentcloud/resource_tc_vpc_test.go

@@ -24,6 +24,7 @@ func TestAccTencentCloudVpcV3Basic(t *testing.T) {
 					resource.TestCheckResourceAttr("tencentcloud_vpc.foo", "cidr_block", defaultVpcCidr),
 					resource.TestCheckResourceAttr("tencentcloud_vpc.foo", "name", defaultInsName),
 					resource.TestCheckResourceAttr("tencentcloud_vpc.foo", "is_multicast", "true"),
+					resource.TestCheckResourceAttrSet("tencentcloud_vpc.foo", "default_route_table_id"),
 				),
 			},
 			{