Merge pull request #2 from ysicing/master

fix #1  update sdk version

Author: rehiy

client.go

@@ -2,125 +2,126 @@ package tencentcloud
 
 import (
 	"context"
-	"encoding/json"
 	"strconv"
 	"strings"
+	"sync"
 	"time"
 
 	"github.com/libdns/libdns"
 
-	tc "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common"
-	th "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/http"
+	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common"
 	tp "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile"
+	dnspod "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dnspod/v20210323"
 )
 
-func (p *Provider) describeRecordList(ctx context.Context, zone string) ([]libdns.Record, error) {
-
-	list := []libdns.Record{}
-
-	payload := map[string]any{
-		"Domain": strings.Trim(zone, "."),
-	}
+// getClient gets the client for Tencent Cloud DNS
+func (p *Provider) getClient() (*dnspod.Client, error) {
+	client := sync.OnceValues(func() (*dnspod.Client, error) {
+		credential := common.NewCredential(
+			p.SecretId,
+			p.SecretKey,
+		)
+		cpf := tp.NewClientProfile()
+		cpf.HttpProfile.Endpoint = "dnspod.tencentcloudapi.com"
+		client, err := dnspod.NewClient(credential, "", cpf)
+		if err != nil {
+			return nil, err
+		}
+		return client, nil
+	})
+	return client()
+}
 
-	resp, err := p.doRequest("DescribeRecordList", payload)
+// describeRecordList describes the records for a zone
+func (p *Provider) describeRecordList(ctx context.Context, zone string) ([]libdns.Record, error) {
+	client, err := p.getClient()
 	if err != nil {
-		return list, err
-	}
-
-	data := DescribeRecordListResponse{}
-	if err = json.Unmarshal(resp, &data); err != nil {
-		return list, err
+		return nil, err
 	}
-
-	for _, record := range data.Response.RecordList {
-		list = append(list, libdns.Record{
-			ID:    strconv.Itoa(record.RecordId),
-			Type:  record.Type,
-			Name:  record.Name,
-			Value: record.Value,
-			TTL:   time.Duration(record.TTL) * time.Second,
-		})
+	list := []libdns.Record{}
+	request := dnspod.NewDescribeRecordListRequest()
+	request.Domain = common.StringPtr(strings.Trim(zone, "."))
+	request.Offset = common.Uint64Ptr(0)
+	request.Limit = common.Uint64Ptr(3000)
+
+	totalCount := uint64(100)
+	for *request.Offset < totalCount {
+		response, err := client.DescribeRecordList(request)
+		if err != nil {
+			return nil, err
+		}
+		if response.Response.RecordList != nil && len(response.Response.RecordList) > 0 {
+			for _, record := range response.Response.RecordList {
+				list = append(list, libdns.Record{
+					ID:    strconv.Itoa(int(*record.RecordId)),
+					Type:  *record.Type,
+					Name:  *record.Name,
+					Value: *record.Value,
+					TTL:   time.Duration(*record.TTL) * time.Second,
+				})
+			}
+		}
+		totalCount = *response.Response.RecordCountInfo.TotalCount
+		request.Offset = common.Uint64Ptr(*request.Offset + uint64(len(response.Response.RecordList)))
 	}
-
 	return list, err
-
 }
 
+// createRecord creates a record for a zone
 func (p *Provider) createRecord(ctx context.Context, zone string, record libdns.Record) (string, error) {
-
-	payload := map[string]any{
-		"Domain":     strings.Trim(zone, "."),
-		"SubDomain":  record.Name,
-		"RecordType": record.Type,
-		"RecordLine": "默认",
-		"Value":      record.Value,
-	}
-
-	resp, err := p.doRequest("CreateRecord", payload)
+	client, err := p.getClient()
 	if err != nil {
 		return "", err
 	}
-
-	data := CreateRecordResponse{}
-	if err = json.Unmarshal(resp, &data); err != nil {
+	request := dnspod.NewCreateRecordRequest()
+	request.Domain = common.StringPtr(strings.Trim(zone, "."))
+	request.SubDomain = common.StringPtr(record.Name)
+	request.RecordType = common.StringPtr(record.Type)
+	request.RecordLine = common.StringPtr("默认")
+	request.Value = common.StringPtr(record.Value)
+	response, err := client.CreateRecord(request)
+	if err != nil {
 		return "", err
 	}
-
-	return strconv.Itoa(data.Response.RecordId), nil
-
+	return strconv.Itoa(int(*response.Response.RecordId)), nil
 }
 
+// modifyRecord modifies a record for a zone
 func (p *Provider) modifyRecord(ctx context.Context, zone string, record libdns.Record) error {
-
+	client, err := p.getClient()
+	if err != nil {
+		return err
+	}
 	recordId, _ := strconv.Atoi(record.ID)
-
-	payload := map[string]any{
-		"Domain":     strings.Trim(zone, "."),
-		"SubDomain":  record.Name,
-		"RecordType": record.Type,
-		"RecordLine": "默认",
-		"Value":      record.Value,
-		"RecordId":   recordId,
+	request := dnspod.NewModifyRecordRequest()
+	request.Domain = common.StringPtr(strings.Trim(zone, "."))
+	request.SubDomain = common.StringPtr(record.Name)
+	request.RecordType = common.StringPtr(record.Type)
+	request.RecordLine = common.StringPtr("默认")
+	request.Value = common.StringPtr(record.Value)
+	request.RecordId = common.Uint64Ptr(uint64(recordId))
+
+	_, err = client.ModifyRecord(request)
+	if err != nil {
+		return err
 	}
-
-	_, err := p.doRequest("ModifyRecord", payload)
-
-	return err
-
+	return nil
 }
 
+// deleteRecord deletes a record for a zone
 func (p *Provider) deleteRecord(ctx context.Context, zone string, record libdns.Record) error {
-
-	recordId, _ := strconv.Atoi(record.ID)
-
-	payload := map[string]any{
-		"Domain":   strings.Trim(zone, "."),
-		"RecordId": recordId,
+	client, err := p.getClient()
+	if err != nil {
+		return err
 	}
+	recordId, _ := strconv.Atoi(record.ID)
+	request := dnspod.NewDeleteRecordRequest()
+	request.Domain = common.StringPtr(strings.Trim(zone, "."))
+	request.RecordId = common.Uint64Ptr(uint64(recordId))
 
-	_, err := p.doRequest("DeleteRecord", payload)
-
-	return err
-
-}
-
-func (p *Provider) doRequest(action string, payload any) ([]byte, error) {
-
-	cpf := tp.NewClientProfile()
-	cpf.HttpProfile.RootDomain = "tencentcloudapi.com"
-
-	cred := tc.NewCredential(p.SecretId, p.SecretKey)
-	client := tc.NewCommonClient(cred, "", cpf)
-
-	request := th.NewCommonRequest("dnspod", "2021-03-23", action)
-	request.SetActionParameters(payload)
-
-	response := th.NewCommonResponse()
-
-	if err := client.Send(request, response); err != nil {
-		return nil, err
+	_, err = client.DeleteRecord(request)
+	if err != nil {
+		return err
 	}
-
-	return response.GetBody(), nil
-
+	return nil
 }

go.mod

@@ -2,5 +2,9 @@ module github.com/libdns/tencentcloud
 
 go 1.18
 
-require github.com/libdns/libdns v0.2.1
-require github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.597
+require github.com/libdns/libdns v0.2.2
+
+require (
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1033
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dnspod v1.0.1033
+)

go.sum

@@ -1,4 +1,6 @@
-github.com/libdns/libdns v0.2.1 h1:Wu59T7wSHRgtA0cfxC+n1c/e+O3upJGWytknkmFEDis=
-github.com/libdns/libdns v0.2.1/go.mod h1:yQCXzk1lEZmmCPa857bnk4TsOiqYasqpyOEeSObbb40=
-github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.597 h1:C0GHdLTfikLVoEzfhgPfrZ7LwlG0xiCmk6iwNKE+xs0=
-github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.597/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
+github.com/libdns/libdns v0.2.2 h1:O6ws7bAfRPaBsgAYt8MDe2HcNBGC29hkZ9MX2eUSX3s=
+github.com/libdns/libdns v0.2.2/go.mod h1:4Bj9+5CQiNMVGf87wjX4CY3HQJypUHRuLvlsfsZqLWQ=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1033 h1:g263/dapUpOAZJa1Y9x07WgfOl7Yy+FM5Mrf4WyttS8=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1033/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dnspod v1.0.1033 h1:bRCo+X6i/6B+5Q/G4+rexcMRxpSq+9XS/8+Usn6OcOA=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dnspod v1.0.1033/go.mod h1:ta9FOsQP/SvQAhDD6IhVhYWyY+eboPEbPWq7zpiNwZA=

model.go

@@ -6,48 +6,57 @@ import (
 	"github.com/libdns/libdns"
 )
 
-func (p *Provider) GetRecords(ctx context.Context, zone string) ([]libdns.Record, error) {
+// Provider is a libdns provider for Tencent Cloud DNS
+type Provider struct {
+	// SecretId is the secret ID for Tencent Cloud DNS
+	SecretId string
+	// SecretKey is the secret key for Tencent Cloud DNS
+	SecretKey string
+}
 
+// GetRecords gets the records for a zone
+func (p *Provider) GetRecords(ctx context.Context, zone string) ([]libdns.Record, error) {
 	return p.describeRecordList(ctx, zone)
-
 }
 
+// AppendRecords appends records to a zone
 func (p *Provider) AppendRecords(ctx context.Context, zone string, records []libdns.Record) ([]libdns.Record, error) {
-
 	for k, record := range records {
 		if id, err := p.createRecord(ctx, zone, record); err != nil {
 			return records, err
 		} else {
 			records[k].ID = id
 		}
 	}
-
 	return records, nil
-
 }
 
+// SetRecords sets the records for a zone
 func (p *Provider) SetRecords(ctx context.Context, zone string, records []libdns.Record) ([]libdns.Record, error) {
-
-	for _, record := range records {
-		if err := p.modifyRecord(ctx, zone, record); err != nil {
-			return nil, err
+	for i, record := range records {
+		if record.ID == "" {
+			newRecord, err := p.AppendRecords(ctx, zone, []libdns.Record{record})
+			if err != nil {
+				return nil, err
+			}
+			records[i].ID = newRecord[0].ID
+		} else {
+			if err := p.modifyRecord(ctx, zone, record); err != nil {
+				return nil, err
+			}
 		}
 	}
-
 	return records, nil
-
 }
 
+// DeleteRecords deletes the records for a zone
 func (p *Provider) DeleteRecords(ctx context.Context, zone string, records []libdns.Record) ([]libdns.Record, error) {
-
 	for _, record := range records {
 		if err := p.deleteRecord(ctx, zone, record); err != nil {
 			return nil, err
 		}
 	}
-
 	return records, nil
-
 }
 
 // Interface guards