From c5224b104836539dce0a07dc58004e943f8ec812 Mon Sep 17 00:00:00 2001 From: Miek Gieben Date: Wed, 22 Feb 2017 07:25:58 +0000 Subject: [PATCH] Golint (#548) * linter fixes * Golint and format code * fmt --- core/dnsserver/zdirectives.go | 1 + core/zmiddleware.go | 2 ++ directives_generate.go | 3 ++- middleware/kubernetes/handler.go | 2 +- middleware/kubernetes/kubernetes.go | 2 +- middleware/kubernetes/setup.go | 4 ++-- middleware/proxy/dns.go | 2 +- middleware/rewrite/class.go | 2 +- middleware/rewrite/field.go | 8 +++---- middleware/rewrite/name.go | 2 +- middleware/rewrite/type.go | 2 +- middleware/trace/setup.go | 34 ++++++++++++++--------------- middleware/trace/setup_test.go | 12 +++++----- middleware/trace/trace.go | 8 +++---- 14 files changed, 43 insertions(+), 41 deletions(-) diff --git a/core/dnsserver/zdirectives.go b/core/dnsserver/zdirectives.go index 9de0df252..48e862bfd 100644 --- a/core/dnsserver/zdirectives.go +++ b/core/dnsserver/zdirectives.go @@ -1,4 +1,5 @@ // generated by directives_generate.go; DO NOT EDIT + package dnsserver // Directives are registered in the order they should be diff --git a/core/zmiddleware.go b/core/zmiddleware.go index 3929e04ac..e77d800cf 100644 --- a/core/zmiddleware.go +++ b/core/zmiddleware.go @@ -1,7 +1,9 @@ // generated by directives_generate.go; DO NOT EDIT + package core import ( + // Include all middleware. _ "github.com/coredns/coredns/middleware/auto" _ "github.com/coredns/coredns/middleware/bind" _ "github.com/coredns/coredns/middleware/cache" diff --git a/directives_generate.go b/directives_generate.go index 8ca5fb0d1..74f7e2be2 100644 --- a/directives_generate.go +++ b/directives_generate.go @@ -59,6 +59,7 @@ func genImports(file, pack string, mi map[string]string) { outs += "\n" } + outs += "// Include all middleware.\n" for _, v := range mi { outs += `_ "` + v + `"` + "\n" } @@ -114,5 +115,5 @@ func fatalIfErr(err error) { const ( middlewarePath = "github.com/coredns/coredns/middleware/" middlewareFile = "middleware.cfg" - header = "// generated by directives_generate.go; DO NOT EDIT\n" + header = "// generated by directives_generate.go; DO NOT EDIT\n\n" ) diff --git a/middleware/kubernetes/handler.go b/middleware/kubernetes/handler.go index dd2a8a7a1..7ecce88d2 100644 --- a/middleware/kubernetes/handler.go +++ b/middleware/kubernetes/handler.go @@ -32,7 +32,7 @@ func (k Kubernetes) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.M // If this is a PTR request, and the request is in a defined // pod/service cidr range, process the request in this middleware, // otherwise pass to next middleware. - if !k.IsRequestInReverseRange(state) { + if !k.isRequestInReverseRange(state) { return middleware.NextOrFailure(k.Name(), k.Next, ctx, w, r) } // Set the zone to this specific request. diff --git a/middleware/kubernetes/kubernetes.go b/middleware/kubernetes/kubernetes.go index 4b95c82e8..54aa8b060 100644 --- a/middleware/kubernetes/kubernetes.go +++ b/middleware/kubernetes/kubernetes.go @@ -130,7 +130,7 @@ func (k *Kubernetes) Reverse(state request.Request, exact bool, opt middleware.O return records, nil, nil } -func (k *Kubernetes) IsRequestInReverseRange(state request.Request) bool { +func (k *Kubernetes) isRequestInReverseRange(state request.Request) bool { ip := dnsutil.ExtractAddressFromReverse(state.Name()) for _, c := range k.ReverseCidrs { if c.Contains(net.ParseIP(ip)) { diff --git a/middleware/kubernetes/setup.go b/middleware/kubernetes/setup.go index f853db8ce..be045a522 100644 --- a/middleware/kubernetes/setup.go +++ b/middleware/kubernetes/setup.go @@ -67,7 +67,7 @@ func kubernetesParse(c *caddy.Controller) (*Kubernetes, error) { middleware.Zones(k8s.Zones).Normalize() if k8s.Zones == nil || len(k8s.Zones) < 1 { - return nil, errors.New("Zone name must be provided for kubernetes middleware.") + return nil, errors.New("zone name must be provided for kubernetes middleware") } k8s.primaryZone = -1 @@ -80,7 +80,7 @@ func kubernetesParse(c *caddy.Controller) (*Kubernetes, error) { } if k8s.primaryZone == -1 { - return nil, errors.New("A non-reverse zone name must be given for Kubernetes.") + return nil, errors.New("non-reverse zone name must be given for Kubernetes") } for c.NextBlock() { diff --git a/middleware/proxy/dns.go b/middleware/proxy/dns.go index 3e212c7c3..7fa975733 100644 --- a/middleware/proxy/dns.go +++ b/middleware/proxy/dns.go @@ -20,7 +20,7 @@ func newDNSEx() *dnsEx { return &dnsEx{group: new(singleflight.Group), Timeout: defaultTimeout * time.Second} } -func (g *dnsEx) Protocol() string { return "dns" } +func (d *dnsEx) Protocol() string { return "dns" } func (d *dnsEx) OnShutdown(p *Proxy) error { return nil } func (d *dnsEx) OnStartup(p *Proxy) error { return nil } diff --git a/middleware/rewrite/class.go b/middleware/rewrite/class.go index 78cca1a13..ba383df81 100644 --- a/middleware/rewrite/class.go +++ b/middleware/rewrite/class.go @@ -12,7 +12,7 @@ type ClassRule struct { fromClass, toClass uint16 } -// Initializer +// New initializes rule. func (rule ClassRule) New(args ...string) Rule { from, to := args[0], strings.Join(args[1:], " ") return &ClassRule{dns.StringToClass[from], dns.StringToClass[to]} diff --git a/middleware/rewrite/field.go b/middleware/rewrite/field.go index 5ccad0d60..2b5ae60be 100644 --- a/middleware/rewrite/field.go +++ b/middleware/rewrite/field.go @@ -1,11 +1,9 @@ // Package rewrite is middleware for rewriting requests internally to something different. package rewrite -/* -Additional FIELD keywords may be implemented to support more rewrite use-cases. -New Rule types must be added to the Fields map. -The type must implement `New` and `Rewrite` functions. -*/ +// Fields defines additional FIELD keywords may be implemented to support more rewrite use-cases. +// New Rule types must be added to the Fields map. +// The type must implement `New` and `Rewrite` functions. var Fields = map[string]Rule{ "name": NameRule{}, "type": TypeRule{}, diff --git a/middleware/rewrite/name.go b/middleware/rewrite/name.go index 895c80070..6b885c5c5 100644 --- a/middleware/rewrite/name.go +++ b/middleware/rewrite/name.go @@ -13,7 +13,7 @@ type NameRule struct { From, To string } -// Initializer +// New initializes a new rule. func (rule NameRule) New(args ...string) Rule { from, to := args[0], strings.Join(args[1:], " ") return &NameRule{middleware.Name(from).Normalize(), middleware.Name(to).Normalize()} diff --git a/middleware/rewrite/type.go b/middleware/rewrite/type.go index 1cbc882ec..a04361c79 100644 --- a/middleware/rewrite/type.go +++ b/middleware/rewrite/type.go @@ -12,7 +12,7 @@ type TypeRule struct { fromType, toType uint16 } -// Initializer +// New initializes a rule. func (rule TypeRule) New(args ...string) Rule { from, to := args[0], strings.Join(args[1:], " ") return &TypeRule{dns.StringToType[from], dns.StringToType[to]} diff --git a/middleware/trace/setup.go b/middleware/trace/setup.go index 0c5350c09..4538e5f1d 100644 --- a/middleware/trace/setup.go +++ b/middleware/trace/setup.go @@ -59,22 +59,22 @@ func traceParse(c *caddy.Controller) (*Trace, error) { if err != nil { return tr, err } - for c.NextBlock() { - switch c.Val() { - case "every": - args := c.RemainingArgs() - if len(args) != 1 { - return nil, c.ArgErr() - } - tr.every, err = strconv.ParseUint(args[0], 10, 64) - if err != nil { - return nil, err - } + for c.NextBlock() { + switch c.Val() { + case "every": + args := c.RemainingArgs() + if len(args) != 1 { + return nil, c.ArgErr() + } + tr.every, err = strconv.ParseUint(args[0], 10, 64) + if err != nil { + return nil, err + } case "service": args := c.RemainingArgs() - if len(args) != 1 { - return nil, c.ArgErr() - } + if len(args) != 1 { + return nil, c.ArgErr() + } tr.serviceName = args[0] case "client_server": args := c.RemainingArgs() @@ -102,12 +102,12 @@ func normalizeEndpoint(epType, ep string) (string, error) { } return ep, nil default: - return "", fmt.Errorf("Tracing endpoint type '%s' is not supported.", epType) + return "", fmt.Errorf("tracing endpoint type '%s' is not supported", epType) } } const ( - defEP = "localhost:9411" - defEpType = "zipkin" + defEP = "localhost:9411" + defEpType = "zipkin" defServiceName = "coredns" ) diff --git a/middleware/trace/setup_test.go b/middleware/trace/setup_test.go index b565cd5d1..3c12b76e4 100644 --- a/middleware/trace/setup_test.go +++ b/middleware/trace/setup_test.go @@ -8,12 +8,12 @@ import ( func TestTraceParse(t *testing.T) { tests := []struct { - input string - shouldErr bool - endpoint string - every uint64 - serviceName string - clientServer bool + input string + shouldErr bool + endpoint string + every uint64 + serviceName string + clientServer bool }{ // oks {`trace`, false, "http://localhost:9411/api/v1/spans", 1, `coredns`, false}, diff --git a/middleware/trace/trace.go b/middleware/trace/trace.go index 00c476d76..1b09e2914 100644 --- a/middleware/trace/trace.go +++ b/middleware/trace/trace.go @@ -21,10 +21,10 @@ type Trace struct { Endpoint string EndpointType string Tracer ot.Tracer - serviceName string - clientServer bool - every uint64 - count uint64 + serviceName string + clientServer bool + every uint64 + count uint64 Once sync.Once }