Skip to content

Commit

Permalink
replace DNSRR.RR with DNSRR.DNSRR; deprecate moved method (#19)
Browse files Browse the repository at this point in the history
  • Loading branch information
fardog committed Dec 8, 2017
1 parent c43c55c commit 0c843b1
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 14 deletions.
2 changes: 1 addition & 1 deletion handler.go
Expand Up @@ -80,7 +80,7 @@ func transformRR(rrs []DNSRR, logType string) []dns.RR {
var t []dns.RR

for _, r := range rrs {
if rr, err := r.DNSRR(); err != nil {
if rr, err := r.RR(); err != nil {
log.Errorln("unable to translate record rr", logType, r, err)
} else {
t = append(t, rr)
Expand Down
14 changes: 5 additions & 9 deletions provider.go
Expand Up @@ -18,20 +18,16 @@ type DNSRR struct {
Data string `json:"data,omitempty"`
}

// RR is deprecated as of 2.2.0, use DNSRR instead
func (r DNSRR) RR() dns.RR {
// RR transforms a DNSRR to a dns.RR
func (r DNSRR) RR() (dns.RR, error) {
hdr := dns.RR_Header{Name: r.Name, Rrtype: r.Type, Class: dns.ClassINET, Ttl: r.TTL}
str := hdr.String() + r.Data
rr, _ := dns.NewRR(str)
return rr
return dns.NewRR(str)
}

// DNSRR transforms a DNSRR to a dns.RR; returns `nil` if an RR could not be
// created from the record.
// DNSRR is deprecated as of 3.0.0; use RR instead.
func (r DNSRR) DNSRR() (dns.RR, error) {
hdr := dns.RR_Header{Name: r.Name, Rrtype: r.Type, Class: dns.ClassINET, Ttl: r.TTL}
str := hdr.String() + r.Data
return dns.NewRR(str)
return r.RR()
}

func (r DNSRR) String() string {
Expand Down
8 changes: 4 additions & 4 deletions provider_test.go
Expand Up @@ -17,7 +17,7 @@ func TestDNSRRTypeA(t *testing.T) {
Data: "10.10.10.1",
}

rr, err := r.DNSRR()
rr, err := r.RR()
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -49,7 +49,7 @@ func TestDNSRRTypeMX(t *testing.T) {
Data: "10 mail.who.wut.co.jp",
}

rr, err := r.DNSRR()
rr, err := r.RR()
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -84,7 +84,7 @@ func TestDNSRRTypeCNAME(t *testing.T) {
Data: "omg.wtf.bbq",
}

rr, err := r.DNSRR()
rr, err := r.RR()
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -116,7 +116,7 @@ func TestDNSRRTypeAAAA(t *testing.T) {
Data: "::1",
}

rr, err := r.DNSRR()
rr, err := r.RR()
if err != nil {
t.Fatal(err)
}
Expand Down

0 comments on commit 0c843b1

Please sign in to comment.