From 8f7a59894a4075dac6937daf1eaa54af5a018a02 Mon Sep 17 00:00:00 2001 From: lvyangyang Date: Wed, 23 Sep 2020 15:32:25 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20dns=20=E9=94=99=E8=AF=AF=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E8=A1=A5=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/multicloud/aws/dnsrecordset.go | 5 ++--- pkg/multicloud/qcloud/dnspod_domain.go | 23 +++++++++++------------ pkg/multicloud/qcloud/dnspod_record.go | 17 ++++++++--------- 3 files changed, 21 insertions(+), 24 deletions(-) diff --git a/pkg/multicloud/aws/dnsrecordset.go b/pkg/multicloud/aws/dnsrecordset.go index d20d1c3271..67b36442ca 100644 --- a/pkg/multicloud/aws/dnsrecordset.go +++ b/pkg/multicloud/aws/dnsrecordset.go @@ -15,7 +15,6 @@ package aws import ( - "fmt" "strconv" "strings" @@ -249,7 +248,7 @@ func Getroute53ResourceRecordSet(client *SAwsClient, opts *cloudprovider.DnsReco func (client *SAwsClient) AddDnsRecordSet(hostedZoneId string, opts *cloudprovider.DnsRecordSet) error { resourceRecordSet, err := Getroute53ResourceRecordSet(client, opts) if err != nil { - return errors.Wrapf(err, "Getroute53ResourceRecordSet(%s)", fmt.Sprintln(opts)) + return errors.Wrapf(err, "Getroute53ResourceRecordSet(%s)", jsonutils.Marshal(opts).String()) } err = client.ChangeResourceRecordSets("CREATE", hostedZoneId, resourceRecordSet) if err != nil { @@ -261,7 +260,7 @@ func (client *SAwsClient) AddDnsRecordSet(hostedZoneId string, opts *cloudprovid func (client *SAwsClient) UpdateDnsRecordSet(hostedZoneId string, opts *cloudprovider.DnsRecordSet) error { resourceRecordSet, err := Getroute53ResourceRecordSet(client, opts) if err != nil { - return errors.Wrapf(err, "Getroute53ResourceRecordSet(%s)", fmt.Sprintln(opts)) + return errors.Wrapf(err, "Getroute53ResourceRecordSet(%s)", jsonutils.Marshal(opts).String()) } err = client.ChangeResourceRecordSets("UPSERT", hostedZoneId, resourceRecordSet) if err != nil { diff --git a/pkg/multicloud/qcloud/dnspod_domain.go b/pkg/multicloud/qcloud/dnspod_domain.go index 87f3309177..56623cb76a 100644 --- a/pkg/multicloud/qcloud/dnspod_domain.go +++ b/pkg/multicloud/qcloud/dnspod_domain.go @@ -15,7 +15,6 @@ package qcloud import ( - "fmt" "strconv" "strings" @@ -65,17 +64,17 @@ func (client *SQcloudClient) GetDomains(offset int, limit int) ([]SDomian, int, params["length"] = strconv.Itoa(limit) resp, err := client.cnsRequest("DomainList", params) if err != nil { - return nil, 0, errors.Wrapf(err, "client.cnsRequest(DomainList, %s)", fmt.Sprintln(params)) + return nil, 0, errors.Wrapf(err, "client.cnsRequest(DomainList, %s)", jsonutils.Marshal(params).String()) } count := sDomianCountInfo{} err = resp.Unmarshal(&count, "info") if err != nil { - return nil, 0, errors.Wrapf(err, "%s.Unmarshal(info)", fmt.Sprintln(resp)) + return nil, 0, errors.Wrapf(err, "%s.Unmarshal(info)", resp.String()) } domains := []SDomian{} err = resp.Unmarshal(&domains, "domains") if err != nil { - return nil, 0, errors.Wrapf(err, "%s.Unmarshal(domains)", fmt.Sprintln(resp)) + return nil, 0, errors.Wrapf(err, "%s.Unmarshal(domains)", resp.String()) } for i := 0; i < len(domains); i++ { @@ -126,7 +125,7 @@ func (client *SQcloudClient) GetDomainById(domainId string) (*SDomian, error) { return &domains[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, "can't find %s in %s", domainId, fmt.Sprintln(domains)) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "can't find %s", domainId) } // https://cloud.tencent.com/document/product/302/8504 @@ -135,7 +134,7 @@ func (client *SQcloudClient) CreateDomian(domianName string) (*SDomian, error) { params["domain"] = domianName _, err := client.cnsRequest("DomainCreate", params) if err != nil { - return nil, errors.Wrapf(err, "client.cnsRequest(DomainCreate, %s)", fmt.Sprintln(params)) + return nil, errors.Wrapf(err, "client.cnsRequest(DomainCreate, %s)", jsonutils.Marshal(params).String()) } domains, err := client.GetAllDomains() if err != nil { @@ -159,7 +158,7 @@ func (client *SQcloudClient) DeleteDomian(domianName string) error { params["domain"] = domianName _, err := client.cnsRequest("DomainDelete", params) if err != nil { - return errors.Wrapf(err, "client.cnsRequest(DomainDelete, %s)", fmt.Sprintln(params)) + return errors.Wrapf(err, "client.cnsRequest(DomainDelete, %s)", jsonutils.Marshal(params).String()) } return nil } @@ -250,7 +249,7 @@ func (self *SDomian) AddDnsRecordSet(opts *cloudprovider.DnsRecordSet) error { opts.DnsValue = values[i] recordId, err := self.client.CreateDnsRecord(opts, self.Name) if err != nil { - return errors.Wrapf(err, "self.client.CreateDnsRecord(%s, %s)", fmt.Sprintln(opts), self.Name) + return errors.Wrapf(err, "self.client.CreateDnsRecord(%s, %s)", jsonutils.Marshal(opts).String(), self.Name) } opts.ExternalId = recordId if !opts.Enabled { @@ -271,7 +270,7 @@ func (self *SDomian) UpdateDnsRecordSet(opts *cloudprovider.DnsRecordSet) error opts.DnsValue = values[i] err := self.client.ModifyDnsRecord(opts, self.Name) if err != nil { - return errors.Wrapf(err, "self.client.CreateDnsRecord(%s, %s)", fmt.Sprintln(opts), self.Name) + return errors.Wrapf(err, "self.client.CreateDnsRecord(%s, %s)", jsonutils.Marshal(opts).String(), self.Name) } status := "enable" if !opts.Enabled { @@ -301,21 +300,21 @@ func (self *SDomian) SyncDnsRecordSets(common, add, del, update []cloudprovider. for i := 0; i < len(del); i++ { err := self.RemoveDnsRecordSet(&del[i]) if err != nil { - return errors.Wrapf(err, "self.RemoveDnsRecordSet(%s)", fmt.Sprintln(del[i])) + return errors.Wrapf(err, "self.RemoveDnsRecordSet(%s)", jsonutils.Marshal(del[i]).String()) } } for i := 0; i < len(add); i++ { err := self.AddDnsRecordSet(&add[i]) if err != nil { - return errors.Wrapf(err, "self.AddDnsRecordSet(%s)", fmt.Sprintln(add[i])) + return errors.Wrapf(err, "self.AddDnsRecordSet(%s)", jsonutils.Marshal(add[i]).String()) } } for i := 0; i < len(update); i++ { err := self.UpdateDnsRecordSet(&update[i]) if err != nil { - return errors.Wrapf(err, "self.UpdateDnsRecordSet(%s)", fmt.Sprintln(update[i])) + return errors.Wrapf(err, "self.UpdateDnsRecordSet(%s)", jsonutils.Marshal(update[i]).String()) } } return nil diff --git a/pkg/multicloud/qcloud/dnspod_record.go b/pkg/multicloud/qcloud/dnspod_record.go index ed455838a4..6d5e6b0332 100644 --- a/pkg/multicloud/qcloud/dnspod_record.go +++ b/pkg/multicloud/qcloud/dnspod_record.go @@ -15,7 +15,6 @@ package qcloud import ( - "fmt" "strconv" "strings" @@ -66,17 +65,17 @@ func (client *SQcloudClient) GetDnsRecords(sDomainName string, offset int, limit params["domain"] = sDomainName resp, err := client.cnsRequest("RecordList", params) if err != nil { - return nil, 0, errors.Wrapf(err, "client.cnsRequest(RecordList, %s)", fmt.Sprintln(params)) + return nil, 0, errors.Wrapf(err, "client.cnsRequest(RecordList, %s)", jsonutils.Marshal(params).String()) } count := SRecordCountInfo{} err = resp.Unmarshal(&count, "info") if err != nil { - return nil, 0, errors.Wrapf(err, "%s.Unmarshal(info)", fmt.Sprintln(resp)) + return nil, 0, errors.Wrapf(err, "%s.Unmarshal(info)", jsonutils.Marshal(resp).String()) } records := []SDnsRecord{} err = resp.Unmarshal(&records, "records") if err != nil { - return nil, 0, errors.Wrapf(err, "%s.Unmarshal(records)", fmt.Sprintln(resp)) + return nil, 0, errors.Wrapf(err, "%s.Unmarshal(records)", jsonutils.Marshal(resp).String()) } RecordTotal, err := strconv.Atoi(count.RecordTotal) if err != nil { @@ -161,12 +160,12 @@ func (client *SQcloudClient) CreateDnsRecord(opts *cloudprovider.DnsRecordSet, d } resp, err := client.cnsRequest("RecordCreate", params) if err != nil { - return "", errors.Wrapf(err, "client.cnsRequest(RecordCreate, %s)", fmt.Sprintln(params)) + return "", errors.Wrapf(err, "client.cnsRequest(RecordCreate, %s)", jsonutils.Marshal(params).String()) } SRecordCreateRet := SRecordCreateRet{} err = resp.Unmarshal(&SRecordCreateRet, "record") if err != nil { - return "", errors.Wrapf(err, "%s.Unmarshal(records)", fmt.Sprintln(resp)) + return "", errors.Wrapf(err, "%s.Unmarshal(records)", jsonutils.Marshal(resp).String()) } return SRecordCreateRet.ID, nil } @@ -197,7 +196,7 @@ func (client *SQcloudClient) ModifyDnsRecord(opts *cloudprovider.DnsRecordSet, d } _, err := client.cnsRequest("RecordModify", params) if err != nil { - return errors.Wrapf(err, "client.cnsRequest(RecordModify, %s)", fmt.Sprintln(params)) + return errors.Wrapf(err, "client.cnsRequest(RecordModify, %s)", jsonutils.Marshal(params).String()) } return nil } @@ -210,7 +209,7 @@ func (client *SQcloudClient) ModifyRecordStatus(status, recordId, domain string) params["status"] = status // “disable” 和 “enable” _, err := client.cnsRequest("RecordStatus", params) if err != nil { - return errors.Wrapf(err, "client.cnsRequest(RecordModify, %s)", fmt.Sprintln(params)) + return errors.Wrapf(err, "client.cnsRequest(RecordModify, %s)", jsonutils.Marshal(params).String()) } return nil } @@ -222,7 +221,7 @@ func (client *SQcloudClient) DeleteDnsRecord(recordId int, domainName string) er params["recordId"] = strconv.Itoa(recordId) _, err := client.cnsRequest("RecordDelete", params) if err != nil { - return errors.Wrapf(err, "client.cnsRequest(RecordDelete, %s)", fmt.Sprintln(params)) + return errors.Wrapf(err, "client.cnsRequest(RecordDelete, %s)", jsonutils.Marshal(params).String()) } return nil }