say byebye to api v2

Author: likexian

go.mod

@@ -4,7 +4,7 @@ go 1.13
 
 require (
 	github.com/athom/goset v0.0.0-20151103071336-f07be69aa101
-	github.com/aws/aws-sdk-go v1.25.18
+	github.com/aws/aws-sdk-go v1.25.21
 	github.com/bflad/tfproviderlint v0.5.0
 	github.com/client9/misspell v0.3.4
 	github.com/golangci/golangci-lint v1.21.0
@@ -14,7 +14,6 @@ require (
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/tencentcloud/tencentcloud-sdk-go v3.0.94+incompatible
 	github.com/yangwenmai/ratelimit v0.0.0-20180104140304-44221c2292e1
-	github.com/zqfan/tencentcloud-sdk-go v0.1.2
 	labix.org/v2/mgo v0.0.0-20140701140051-000000000287 // indirect
 	launchpad.net/gocheck v0.0.0-20140225173054-000000000087 // indirect
 )

go.sum

@@ -2,7 +2,6 @@ package tencentcloud
 
 import (
 	"github.com/terraform-providers/terraform-provider-tencentcloud/tencentcloud/connectivity"
-	"github.com/zqfan/tencentcloud-sdk-go/client"
 )
 
 type Config struct {
@@ -13,14 +12,11 @@ type Config struct {
 }
 
 type TencentCloudClient struct {
-	commonConn *client.Client
-	apiV3Conn  *connectivity.TencentCloudClient
+	apiV3Conn *connectivity.TencentCloudClient
 }
 
 func (c *Config) Client() (interface{}, error) {
 	var tcClient TencentCloudClient
-
-	tcClient.commonConn = client.NewClient(c.SecretId, c.SecretKey, c.Region)
 	tcClient.apiV3Conn = connectivity.NewTencentCloudClient(c.SecretId, c.SecretKey, c.SecurityToken, c.Region)
 
 	return &tcClient, nil

tencentcloud/config.go

@@ -1,9 +1,8 @@
 package tencentcloud
 
 import (
-	"encoding/json"
+	"context"
 	"fmt"
-	"log"
 	"strings"
 
 	"github.com/hashicorp/terraform/helper/schema"
@@ -19,10 +18,6 @@ func dataSourceTencentCloudRouteTable() *schema.Resource {
 				Type:     schema.TypeString,
 				Required: true,
 			},
-			"vpc_id": {
-				Type:     schema.TypeString,
-				Computed: true,
-			},
 			"name": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -34,6 +29,10 @@ func dataSourceTencentCloudRouteTable() *schema.Resource {
 					return
 				},
 			},
+			"vpc_id": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"subnet_num": {
 				Type:     schema.TypeInt,
 				Computed: true,
@@ -70,85 +69,68 @@ func dataSourceTencentCloudRouteTable() *schema.Resource {
 	}
 }
 
-func dataSourceTencentCloudRouteTableRead(d *schema.ResourceData, m interface{}) error {
-	client := m.(*TencentCloudClient).commonConn
-	params := map[string]string{
-		"Action":       "DescribeRouteTable",
-		"routeTableId": d.Get("route_table_id").(string),
-	}
-	if _, ok := d.GetOk("name"); ok {
-		params["routeTableName"] = d.Get("name").(string)
-	}
+func dataSourceTencentCloudRouteTableRead(d *schema.ResourceData, meta interface{}) error {
+	defer logElapsed("data_source.tencentcloud_route_table.read")()
 
-	log.Printf("[DEBUG] data_source_tc_route_table read params:%v", params)
+	logId := getLogId(contextNil)
+	ctx := context.WithValue(context.TODO(), "logId", logId)
+	service := VpcService{client: meta.(*TencentCloudClient).apiV3Conn}
 
-	response, err := client.SendRequest("vpc", params)
-	if err != nil {
-		log.Printf("[DEBUG] data_source_tc_route_table read client.SendRequest error:%v", err)
-		return err
+	var (
+		routeTableId string
+		name         string
+	)
+	if temp, ok := d.GetOk("route_table_id"); ok {
+		tempStr := temp.(string)
+		if tempStr != "" {
+			routeTableId = tempStr
+		}
 	}
-
-	var jsonresp struct {
-		Code       int    `json:"code"`
-		Message    string `json:"message"`
-		CodeDesc   string `json:"codeDesc"`
-		TotalCount int    `json:"totalCount"`
-		Data       []struct {
-			UnVpcId              string `json:"UnVpcId"`
-			UnRouteTableId       string `json:"unRouteTableId"`
-			RouteTableName       string `json:"routeTableName"`
-			RouteTableCreateTime string `json:"routeTableCreateTime"`
-			SubnetNum            int    `json:"subnetNum"`
-			RouteTableSet        []struct {
-				DestinationCidrBlock string `json:"destinationCidrBlock"`
-				NextType             int    `json:"nextType"`
-				UnNextHub            string `json:"unNextHub"`
-				Description          string `json:"description"`
-			} `json:"routeSet"`
+	if temp, ok := d.GetOk("name"); ok {
+		tempStr := temp.(string)
+		if tempStr != "" {
+			name = tempStr
 		}
 	}
-	err = json.Unmarshal([]byte(response), &jsonresp)
+
+	var infos, err = service.DescribeRouteTables(ctx, routeTableId, name, "", map[string]string{})
 	if err != nil {
-		log.Printf("[DEBUG] data_source_tc_route_table read json.Unmarshal error:%v", err)
 		return err
 	}
-	if jsonresp.Code != 0 {
-		return fmt.Errorf("data_source_tc_route_table read error, code:%v, message:%v, CodeDesc:%v", jsonresp.Code, jsonresp.Message, jsonresp.CodeDesc)
-	} else if jsonresp.TotalCount <= 0 || len(jsonresp.Data) <= 0 {
-		return fmt.Errorf("Your query returned no results. Please change your search criteria and try again.")
-	}
 
-	rt := jsonresp.Data[0]
-
-	log.Printf("[DEBUG] data_source_tc_route_table read result route_table_id:%v", rt.UnRouteTableId)
+	if len(infos) == 0 {
+		return fmt.Errorf("route table route_table_id=%s, name=%s not found", routeTableId, name)
+	}
 
-	d.SetId(rt.UnRouteTableId)
-	d.Set("route_table_id", rt.UnRouteTableId)
-	d.Set("vpc_id", rt.UnVpcId)
-	d.Set("name", rt.RouteTableName)
-	d.Set("subnet_num", rt.SubnetNum)
-	d.Set("create_time", rt.RouteTableCreateTime)
+	routetable := infos[0]
+	d.SetId(routetable.routeTableId)
+	d.Set("route_table_id", routetable.routeTableId)
+	d.Set("vpc_id", routetable.vpcId)
+	d.Set("name", routetable.name)
+	d.Set("subnet_num", len(routetable.entryInfos))
+	d.Set("create_time", routetable.createTime)
 
-	routes := make([]map[string]interface{}, 0, len(rt.RouteTableSet))
-	for _, r := range rt.RouteTableSet {
-		if strings.ToUpper(r.UnNextHub) == "LOCAL" {
+	routes := make([]map[string]interface{}, 0, len(routetable.entryInfos))
+	for _, r := range routetable.entryInfos {
+		if strings.ToUpper(r.nextBub) == "LOCAL" {
 			continue
 		}
 		m := make(map[string]interface{})
-		for vgwKey, vgwType := range nextTypes {
-			if vgwType == r.NextType {
-				m["next_type"] = vgwKey
+		nextType := ""
+		for k, v := range routeTypeNewMap {
+			if v == r.nextType {
+				nextType = k
 				break
 			}
 		}
-		m["next_hub"] = r.UnNextHub
-		m["cidr_block"] = r.DestinationCidrBlock
-		m["description"] = r.Description
+		m["next_type"] = nextType
+		m["next_hub"] = r.nextBub
+		m["cidr_block"] = r.destinationCidr
+		m["description"] = r.description
 		routes = append(routes, m)
 	}
 
 	if err := d.Set("routes", routes); err != nil {
-		log.Printf("[DEBUG] data_source_tc_route_table read d.Set routes error:%v", err)
 		return err
 	}
 

tencentcloud/data_source_tc_route_table.go

@@ -15,7 +15,7 @@ func TestAccDataSourceTencentCloudRouteTable_basic(t *testing.T) {
 				Config: testAccDataSourceTencentCloudRouteTableConfig,
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckTencentCloudDataSourceID("data.tencentcloud_route_table.foo"),
-					resource.TestCheckResourceAttr("data.tencentcloud_route_table.foo", "name", "ci-temp-test-rt"),
+					resource.TestCheckResourceAttr("data.tencentcloud_route_table.foo", "name", "tf-ci-test"),
 				),
 			},
 		},
@@ -24,20 +24,20 @@ func TestAccDataSourceTencentCloudRouteTable_basic(t *testing.T) {
 
 const testAccDataSourceTencentCloudRouteTableConfig = `
 variable "availability_zone" {
-	default = "ap-guangzhou-3"
+  default = "ap-guangzhou-3"
 }
 
 resource "tencentcloud_vpc" "foo" {
-    name       = "guagua-ci-temp-test"
-    cidr_block = "10.0.0.0/16"
+  name       = "tf-ci-test"
+  cidr_block = "10.0.0.0/16"
 }
 
 resource "tencentcloud_route_table" "route_table" {
-   vpc_id = "${tencentcloud_vpc.foo.id}"
-   name   = "ci-temp-test-rt"
+  vpc_id = "${tencentcloud_vpc.foo.id}"
+  name   = "tf-ci-test"
 }
 
 data "tencentcloud_route_table" "foo" {
-	route_table_id = "${tencentcloud_route_table.route_table.id}"
+  route_table_id = "${tencentcloud_route_table.route_table.id}"
 }
 `

tencentcloud/data_source_tc_route_table_test.go

@@ -14,14 +14,11 @@ data "tencentcloud_security_group" "sglab" {
 package tencentcloud
 
 import (
-	"encoding/json"
-	"errors"
+	"context"
 	"fmt"
-	"log"
-	"reflect"
-	"strconv"
 
 	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common"
 )
 
 func dataSourceTencentCloudSecurityGroup() *schema.Resource {
@@ -30,23 +27,22 @@ func dataSourceTencentCloudSecurityGroup() *schema.Resource {
 		Read:               dataSourceTencentCloudSecurityGroupRead,
 		Schema: map[string]*schema.Schema{
 			"security_group_id": {
-				Type:        schema.TypeString,
-				Required:    true,
-				Description: "ID of the security group to be queried.",
+				Type:          schema.TypeString,
+				Optional:      true,
+				ConflictsWith: []string{"name"},
+				Description:   "ID of the security group to be queried. Conflict with `name`.",
 			},
 			"name": {
-				Type:         schema.TypeString,
-				Optional:     true,
-				Computed:     true,
-				ValidateFunc: validateStringLengthInRange(2, 60),
-				Description:  "Name of the security group to be queried.",
+				Type:          schema.TypeString,
+				Optional:      true,
+				ValidateFunc:  validateStringLengthInRange(1, 60),
+				ConflictsWith: []string{"security_group_id"},
+				Description:   "Name of the security group to be queried. Conflict with `security_group_id`.",
 			},
 			"description": {
-				Type:         schema.TypeString,
-				Optional:     true,
-				Computed:     true,
-				ValidateFunc: validateStringLengthInRange(2, 100),
-				Description:  "Description of the security group.",
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Description of the security group.",
 			},
 			"create_time": {
 				Type:        schema.TypeString,
@@ -59,73 +55,58 @@ func dataSourceTencentCloudSecurityGroup() *schema.Resource {
 				Description: "Number of security group binding resources.",
 			},
 			"project_id": {
-				Type:     schema.TypeInt,
-				Computed: true,
+				Type:        schema.TypeInt,
+				Computed:    true,
+				Description: "Project ID of the security group.",
 			},
 		},
 	}
 }
 
-func dataSourceTencentCloudSecurityGroupRead(d *schema.ResourceData, m interface{}) error {
-	client := m.(*TencentCloudClient).commonConn
-	params := map[string]string{
-		"Action": "DescribeSecurityGroupEx",
-		"sgId":   d.Get("security_group_id").(string),
+func dataSourceTencentCloudSecurityGroupRead(d *schema.ResourceData, meta interface{}) error {
+	defer logElapsed("data_source.tencentcloud_security_group.read")()
+
+	logId := getLogId(contextNil)
+	ctx := context.WithValue(context.TODO(), "logId", logId)
+
+	client := meta.(*TencentCloudClient).apiV3Conn
+	vpcService := VpcService{client: client}
+
+	var (
+		sgId   *string
+		sgName *string
+	)
+
+	if raw, ok := d.GetOk("security_group_id"); ok {
+		sgId = common.StringPtr(raw.(string))
 	}
 
-	log.Printf("[DEBUG] resource_tc_security_group read params:%v", params)
+	if raw, ok := d.GetOk("name"); ok {
+		sgName = common.StringPtr(raw.(string))
+	}
 
-	response, err := client.SendRequest("dfw", params)
+	sgs, err := vpcService.DescribeSecurityGroups(ctx, sgId, sgName, nil, map[string]string{})
 	if err != nil {
-		log.Printf("[ERROR] resource_tc_security_group read client.SendRequest error:%v", err)
 		return err
 	}
 
-	var jsonresp struct {
-		Code    int    `json:"code"`
-		Message string `json:"message"`
-		Data    struct {
-			TotalNum int `json:"totalNum"`
-			Detail   []struct {
-				SgId             string      `json:"sgId"`
-				SgName           string      `json:"sgName"`
-				SgRemark         string      `json:"sgRemark"`
-				BeAssociateCount int         `json:"beAssociateCount"`
-				CreateTime       string      `json:"createTime"`
-				ProjectId        interface{} `json:"projectId"`
-			}
-		}
+	if len(sgs) == 0 {
+		return fmt.Errorf("security group security_group_id=%s, name=%s not found", *sgId, *sgName)
 	}
-	err = json.Unmarshal([]byte(response), &jsonresp)
+
+	sg := sgs[0]
+	in, out, _, err := vpcService.DescribeSecurityGroupPolices(ctx, *sg.SecurityGroupId)
 	if err != nil {
-		log.Printf("[ERROR] resource_tc_security_group read json.Unmarshal error:%v", err)
 		return err
 	}
-	if jsonresp.Code != 0 {
-		log.Printf("[ERROR] resource_tc_security_group read error, code:%v, message:%v", jsonresp.Code, jsonresp.Message)
-		return errors.New(jsonresp.Message)
-	} else if jsonresp.Data.TotalNum <= 0 || len(jsonresp.Data.Detail) <= 0 {
-		return errors.New("Security group not found")
-	}
 
-	sg := jsonresp.Data.Detail[0]
+	d.SetId(*sg.SecurityGroupId)
+	d.Set("security_group_id", sg.SecurityGroupId)
+	d.Set("name", sg.SecurityGroupName)
+	d.Set("description", sg.SecurityGroupDesc)
+	d.Set("create_time", sg.CreatedTime)
+	d.Set("be_associate_count", len(in)+len(out))
+	d.Set("project_id", sg.ProjectId)
 
-	d.SetId(sg.SgId)
-	d.Set("security_group_id", sg.SgId)
-	d.Set("name", sg.SgName)
-	d.Set("description", sg.SgRemark)
-	d.Set("create_time", sg.CreateTime)
-	d.Set("be_associate_count", sg.BeAssociateCount)
-
-	if "string" == reflect.TypeOf(sg.ProjectId).String() {
-		if intVal, err := strconv.ParseInt(sg.ProjectId.(string), 10, 64); err != nil {
-			return fmt.Errorf("create security_group project ParseInt  error ,%s", err.Error())
-		} else {
-			d.Set("project_id", int(intVal))
-		}
-
-	} else {
-		d.Set("project_id", sg.ProjectId.(int))
-	}
 	return nil
 }