opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8013 from lvyangyang/error-info-fix

Browse Source 
fix: dns 错误信息补全
This commit is contained in:
Zexi Li
2020-09-25 01:39:47 +08:00
committed by GitHub
parent 6830851925 8f7a59894a
commit df08ea35fc
3 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/multicloud/aws/dnsrecordset.go
+2 -3
View File
@@ -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 {
pkg/multicloud/qcloud/dnspod_domain.go
+11 -12
View File
@@ -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
pkg/multicloud/qcloud/dnspod_record.go
+8 -9
View File
@@ -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
}