TrueCloudLab/coredns
16
0
Fork 2
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Tidy up most errors and warnings from lint tools. (#165)

Browse source
This commit is contained in:
Joe Blow 2016-06-11 08:00:47 +10:00 • committed by Miek Gieben
parent 255aa2e5d5
commit 2882991000
12 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
middleware/etcd/cname_test.go
View file

@ -24,7 +24,7 @@ func TestCnameLookup(t *testing.T) {
m := tc.Msg()
rec := middleware.NewResponseRecorder(&test.ResponseWriter{})
_, err := etc.ServeDNS(ctx, rec, m)
_, err := etc.ServeDNS(ctxt, rec, m)
if err != nil {
t.Errorf("expected no error, got %v\n", err)
return

4
middleware/etcd/debug_test.go
View file

@ -39,7 +39,7 @@ func TestDebugLookup(t *testing.T) {
m := tc.Msg()
rec := middleware.NewResponseRecorder(&test.ResponseWriter{})
_, err := etc.ServeDNS(ctx, rec, m)
_, err := etc.ServeDNS(ctxt, rec, m)
if err != nil {
t.Errorf("expected no error, got %v\n", err)
continue
@ -75,7 +75,7 @@ func TestDebugLookupFalse(t *testing.T) {
m := tc.Msg()
rec := middleware.NewResponseRecorder(&test.ResponseWriter{})
_, err := etc.ServeDNS(ctx, rec, m)
_, err := etc.ServeDNS(ctxt, rec, m)
if err != nil {
t.Errorf("expected no error, got %v\n", err)
continue

20
middleware/etcd/etcd.go
View file

@ -114,7 +114,7 @@ Nodes:
bx[b] = true
serv.Key = n.Key
serv.Ttl = g.Ttl(n, serv)
serv.Ttl = g.TTL(n, serv)
if serv.Priority == 0 {
serv.Priority = priority
}
@ -123,22 +123,22 @@ Nodes:
return sx, nil
}
// Ttl returns the smaller of the etcd TTL and the service's
// TTL returns the smaller of the etcd TTL and the service's
// TTL. If neither of these are set (have a zero value), a default is used.
func (g Etcd) Ttl(node *etcdc.Node, serv *msg.Service) uint32 {
etcdTtl := uint32(node.TTL)
func (g Etcd) TTL(node *etcdc.Node, serv *msg.Service) uint32 {
etcdTTL := uint32(node.TTL)
if etcdTtl == 0 && serv.Ttl == 0 {
if etcdTTL == 0 && serv.Ttl == 0 {
return ttl
}
if etcdTtl == 0 {
if etcdTTL == 0 {
return serv.Ttl
}
if serv.Ttl == 0 {
return etcdTtl
return etcdTTL
}
if etcdTtl < serv.Ttl {
return etcdTtl
if etcdTTL < serv.Ttl {
return etcdTTL
}
return serv.Ttl
}
@ -154,7 +154,7 @@ func isEtcdNameError(err error) bool {
const (
priority = 10 // default priority when nothing is set
ttl = 300 // default ttl when nothing is set
minTtl = 60
minTTL = 60
hostmaster = "hostmaster"
etcdTimeout = 5 * time.Second
)

2
middleware/etcd/group_test.go
View file

@ -22,7 +22,7 @@ func TestGroupLookup(t *testing.T) {
m := tc.Msg()
rec := middleware.NewResponseRecorder(&test.ResponseWriter{})
_, err := etc.ServeDNS(ctx, rec, m)
_, err := etc.ServeDNS(ctxt, rec, m)
if err != nil {
t.Errorf("expected no error, got %v\n", err)
continue

2
middleware/etcd/handler.go
View file

@ -28,7 +28,7 @@ func (e Etcd) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (i
// are not auth. for *but* do have a stubzone forward for. If we do the stubzone
// handler will handle the request.
if e.Stubmap != nil && len(*e.Stubmap) > 0 {
for zone, _ := range *e.Stubmap {
for zone := range *e.Stubmap {
if middleware.Name(zone).Matches(name) {
stub := Stub{Etcd: e, Zone: zone}
return stub.ServeDNS(ctx, w, r)

2
middleware/etcd/lookup.go
View file

@ -398,6 +398,6 @@ func isDuplicateCNAME(r *dns.CNAME, records []dns.RR) bool {
// TODO(miek): Move to middleware?
func copyState(state middleware.State, target string, typ uint16) middleware.State {
state1 := middleware.State{W: state.W, Req: state.Req.Copy()}
state1.Req.Question[0] = dns.Question{dns.Fqdn(target), dns.ClassINET, typ}
state1.Req.Question[0] = dns.Question{Name: dns.Fqdn(target), Qclass: dns.ClassINET, Qtype: typ}
return state1
}

2
middleware/etcd/multi_test.go
View file

@ -26,7 +26,7 @@ func TestMultiLookup(t *testing.T) {
m := tc.Msg()
rec := middleware.NewResponseRecorder(&test.ResponseWriter{})
_, err := etcMulti.ServeDNS(ctx, rec, m)
_, err := etcMulti.ServeDNS(ctxt, rec, m)
if err != nil {
t.Errorf("expected no error, got %v\n", err)
return

2
middleware/etcd/other_test.go
View file

@ -24,7 +24,7 @@ func TestOtherLookup(t *testing.T) {
m := tc.Msg()
rec := middleware.NewResponseRecorder(&test.ResponseWriter{})
_, err := etc.ServeDNS(ctx, rec, m)
_, err := etc.ServeDNS(ctxt, rec, m)
if err != nil {
t.Errorf("expected no error, got %v\n", err)
continue

10
middleware/etcd/setup_test.go
View file

@ -22,11 +22,11 @@ import (
var (
etc Etcd
client etcdc.KeysAPI
ctx context.Context
ctxt context.Context
)
func init() {
ctx, _ = context.WithTimeout(context.Background(), etcdTimeout)
ctxt, _ = context.WithTimeout(context.Background(), etcdTimeout)
etcdCfg := etcdc.Config{
Endpoints: []string{"http://localhost:2379"},
@ -48,12 +48,12 @@ func set(t *testing.T, e Etcd, k string, ttl time.Duration, m *msg.Service) {
t.Fatal(err)
}
path, _ := msg.PathWithWildcard(k, e.PathPrefix)
e.Client.Set(ctx, path, string(b), &etcdc.SetOptions{TTL: ttl})
e.Client.Set(ctxt, path, string(b), &etcdc.SetOptions{TTL: ttl})
}
func delete(t *testing.T, e Etcd, k string) {
path, _ := msg.PathWithWildcard(k, e.PathPrefix)
e.Client.Delete(ctx, path, &etcdc.DeleteOptions{Recursive: false})
e.Client.Delete(ctxt, path, &etcdc.DeleteOptions{Recursive: false})
}
func TestLookup(t *testing.T) {
@ -65,7 +65,7 @@ func TestLookup(t *testing.T) {
m := tc.Msg()
rec := middleware.NewResponseRecorder(&test.ResponseWriter{})
_, err := etc.ServeDNS(ctx, rec, m)
_, err := etc.ServeDNS(ctxt, rec, m)
if err != nil {
t.Errorf("expected no error, got: %v for %s %s\n", err, m.Question[0].Name, dns.Type(m.Question[0].Qtype))
return

2
middleware/etcd/stub_cycle_test.go
View file

@ -26,7 +26,7 @@ func TestStubCycle(t *testing.T) {
}
rec := middleware.NewResponseRecorder(&test.ResponseWriter{})
_, err := etc.ServeDNS(ctx, rec, m)
_, err := etc.ServeDNS(ctxt, rec, m)
if err == nil {
t.Errorf("expected error, got none")
continue

2
middleware/etcd/stub_handler.go
View file

@ -58,7 +58,7 @@ func addStubEdns0(m *dns.Msg) *dns.Msg {
option := m.IsEdns0()
// Add a custom EDNS0 option to the packet, so we can detect loops when 2 stubs are forwarding to each other.
if option != nil {
option.Option = append(option.Option, &dns.EDNS0_LOCAL{ednsStubCode, []byte{1}})
option.Option = append(option.Option, &dns.EDNS0_LOCAL{Code: ednsStubCode, Data: []byte{1}})
return m
}

2
middleware/etcd/stub_test.go
View file

@ -23,7 +23,7 @@ func TestStubLookup(t *testing.T) {
m := tc.Msg()
rec := middleware.NewResponseRecorder(&test.ResponseWriter{})
_, err := etc.ServeDNS(ctx, rec, m)
_, err := etc.ServeDNS(ctxt, rec, m)
if err != nil {
if tc.Rcode != dns.RcodeServerFailure {
t.Errorf("expected no error, got %v\n", err)