mirror of
https://github.com/StackExchange/dnscontrol.git
synced 2024-05-11 05:55:12 +00:00
Switch to Go 1.13 error wrapping (#604)
* Replaced errors.Wrap with fmt.Errorf (#589) * Find: errors\.Wrap\(([^,]+),\s+(["`][^"`]*)(["`])\) Replace: fmt.Errorf($2: %w$3, $1) * Replaced errors.Wrapf with fmt.Errorf (#589) * Find: errors\.Wrapf\(([^,]+),\s+(["`][^"`]*)(["`])\) Replace: fmt.Errorf($2: %w$3, $1) * Find: errors\.Wrapf\(([^,]+),\s+(["`][^"`]*)(["`])(,[^)]+)\) * Replace: fmt.Errorf($2: %w$3$4, $1) * Replaced errors.Errorf with fmt.Errorf (#589) * Find: errors\.Errorf Replace: fmt.Errorf * Cleaned up remaining imports * Cleanup * Regenerate provider support matrix This was broken by #533 ... and it's now the third time this has been missed.
This commit is contained in:
committed by
Tom Limoncelli
parent
cae35a2c8f
commit
825ba2d081
@@ -1,12 +1,12 @@
|
||||
package namedotcom
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"regexp"
|
||||
"strings"
|
||||
|
||||
"github.com/namedotcom/go/namecom"
|
||||
"github.com/pkg/errors"
|
||||
|
||||
"github.com/StackExchange/dnscontrol/v2/models"
|
||||
"github.com/StackExchange/dnscontrol/v2/providers/diff"
|
||||
@@ -89,7 +89,7 @@ func toRecord(r *namecom.Record, origin string) *models.RecordConfig {
|
||||
Original: r,
|
||||
}
|
||||
if !strings.HasSuffix(r.Fqdn, ".") {
|
||||
panic(errors.Errorf("namedotcom suddenly changed protocol. Bailing. (%v)", r.Fqdn))
|
||||
panic(fmt.Errorf("namedotcom suddenly changed protocol. Bailing. (%v)", r.Fqdn))
|
||||
}
|
||||
fqdn := r.Fqdn[:len(r.Fqdn)-1]
|
||||
rc.SetLabelFromFQDN(fqdn, origin)
|
||||
@@ -98,15 +98,15 @@ func toRecord(r *namecom.Record, origin string) *models.RecordConfig {
|
||||
rc.SetTargetTXTs(decodeTxt(r.Answer))
|
||||
case "MX":
|
||||
if err := rc.SetTargetMX(uint16(r.Priority), r.Answer); err != nil {
|
||||
panic(errors.Wrap(err, "unparsable MX record received from ndc"))
|
||||
panic(fmt.Errorf("unparsable MX record received from ndc: %w", err))
|
||||
}
|
||||
case "SRV":
|
||||
if err := rc.SetTargetSRVPriorityString(uint16(r.Priority), r.Answer+"."); err != nil {
|
||||
panic(errors.Wrap(err, "unparsable SRV record received from ndc"))
|
||||
panic(fmt.Errorf("unparsable SRV record received from ndc: %w", err))
|
||||
}
|
||||
default: // "A", "AAAA", "ANAME", "CNAME", "NS"
|
||||
if err := rc.PopulateFromString(rtype, r.Answer, r.Fqdn); err != nil {
|
||||
panic(errors.Wrap(err, "unparsable record received from ndc"))
|
||||
panic(fmt.Errorf("unparsable record received from ndc: %w", err))
|
||||
}
|
||||
}
|
||||
return rc
|
||||
|
Reference in New Issue
Block a user