cleanup: go vet and golint run (#736)

* cleanup: go vet and golint run

Various cleanups trickered by go vet and golint.

* Fix tests and lowercase all errors

Lowercase all errors, some tests in kubernetes use errors from
kubernetes which do start with a capital letter.

1 files changed, 6 insertions, 8 deletions

diff --git a/middleware/kubernetes/setup.go b/middleware/kubernetes/setup.go
index 05eeaa02f..1f8a1f0e3 100644
--- a/middleware/kubernetes/setup.go
+++ b/middleware/kubernetes/setup.go
@@ -96,7 +96,7 @@ func kubernetesParse(c *caddy.Controller) (*Kubernetes, error) {
 						for _, cidrStr := range args {
 							_, cidr, err := net.ParseCIDR(cidrStr)
 							if err != nil {
-								return nil, errors.New("Invalid cidr: " + cidrStr)
+								return nil, fmt.Errorf("invalid cidr: %s", cidrStr)
 							}
 							k8s.ReverseCidrs = append(k8s.ReverseCidrs, *cidr)
 
@@ -111,7 +111,7 @@ func kubernetesParse(c *caddy.Controller) (*Kubernetes, error) {
 						case PodModeDisabled, PodModeInsecure, PodModeVerified:
 							k8s.PodMode = args[0]
 						default:
-							return nil, errors.New("Value for pods must be one of: disabled, verified, insecure")
+							return nil, fmt.Errorf("wrong value for pods: %s,  must be one of: disabled, verified, insecure", args[0])
 						}
 						continue
 					}
@@ -142,7 +142,7 @@ func kubernetesParse(c *caddy.Controller) (*Kubernetes, error) {
 					if len(args) > 0 {
 						rp, err := time.ParseDuration(args[0])
 						if err != nil {
-							return nil, fmt.Errorf("Unable to parse resync duration value. Value provided was '%v'. Example valid values: '15s', '5m', '1h'. Error was: %v", args[0], err)
+							return nil, fmt.Errorf("unable to parse resync duration value: '%v': %v", args[0], err)
 						}
 						k8s.ResyncPeriod = rp
 						continue
@@ -154,7 +154,7 @@ func kubernetesParse(c *caddy.Controller) (*Kubernetes, error) {
 						labelSelectorString := strings.Join(args, " ")
 						ls, err := unversionedapi.ParseToLabelSelector(labelSelectorString)
 						if err != nil {
-							return nil, fmt.Errorf("Unable to parse label selector. Value provided was '%v'. Error was: %v", labelSelectorString, err)
+							return nil, fmt.Errorf("unable to parse label selector value: '%v': %v", labelSelectorString, err)
 						}
 						k8s.LabelSelector = ls
 						continue
@@ -185,17 +185,15 @@ func kubernetesParse(c *caddy.Controller) (*Kubernetes, error) {
 							zone: args[1],
 						})
 						continue
-					} else {
-						return nil, fmt.Errorf("Incorrect number of arguments for federation. Got %v, expect 2.", len(args))
 					}
-					return nil, c.ArgErr()
+					return nil, fmt.Errorf("incorrect number of arguments for federation, got %v, expected 2", len(args))
 
 				}
 			}
 			return k8s, nil
 		}
 	}
-	return nil, errors.New("Kubernetes setup called without keyword 'kubernetes' in Corefile")
+	return nil, errors.New("kubernetes setup called without keyword 'kubernetes' in Corefile")
 }
 
 const (