Merge pull request #542 from aledbf/go-lint

Fix lint errors
kubernetes · Apr 2, 2017 · 2dc0ea3 · 2dc0ea3
2 parents ea7f943 + 4103537
commit 2dc0ea3
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 19 deletions.
diff --git a/controllers/nginx/pkg/template/template_test.go b/controllers/nginx/pkg/template/template_test.go
@@ -20,16 +20,16 @@ import (
 	"encoding/json"
 	"os"
 	"path"
-	"strings"
 	"reflect"
+	"strings"
 	"testing"
 
 	"io/ioutil"
 
 	"k8s.io/ingress/controllers/nginx/pkg/config"
 	"k8s.io/ingress/core/pkg/ingress"
-	"k8s.io/ingress/core/pkg/ingress/annotations/rewrite"
 	"k8s.io/ingress/core/pkg/ingress/annotations/authreq"
+	"k8s.io/ingress/core/pkg/ingress/annotations/rewrite"
 )
 
 var (

diff --git a/core/pkg/ingress/annotations/authreq/main.go b/core/pkg/ingress/annotations/authreq/main.go
@@ -18,8 +18,8 @@ package authreq
 
 import (
 	"net/url"
-	"strings"
 	"regexp"
+	"strings"
 
 	"k8s.io/kubernetes/pkg/apis/extensions"
 
@@ -33,20 +33,20 @@ const (
 	authSigninURL = "ingress.kubernetes.io/auth-signin"
 	authMethod    = "ingress.kubernetes.io/auth-method"
 	authBody      = "ingress.kubernetes.io/auth-send-body"
-	authHeaders = "ingress.kubernetes.io/auth-response-headers"
+	authHeaders   = "ingress.kubernetes.io/auth-response-headers"
 )
 
 // External returns external authentication configuration for an Ingress rule
 type External struct {
-	URL       string `json:"url"`
-	SigninURL string `json:"signinUrl"`
-	Method    string `json:"method"`
-	SendBody  bool   `json:"sendBody"`
+	URL             string   `json:"url"`
+	SigninURL       string   `json:"signinUrl"`
+	Method          string   `json:"method"`
+	SendBody        bool     `json:"sendBody"`
 	ResponseHeaders []string `json:"responseHeaders"`
 }
 
 var (
-	methods = []string{"GET", "HEAD", "POST", "PUT", "PATCH", "DELETE", "CONNECT", "OPTIONS", "TRACE"}
+	methods      = []string{"GET", "HEAD", "POST", "PUT", "PATCH", "DELETE", "CONNECT", "OPTIONS", "TRACE"}
 	headerRegexp = regexp.MustCompile(`^[a-zA-Z\d\-_]+$`)
 )
 
@@ -128,10 +128,10 @@ func (a authReq) Parse(ing *extensions.Ingress) (interface{}, error) {
 	sb, _ := parser.GetBoolAnnotation(authBody, ing)
 
 	return &External{
-		URL:       str,
-		SigninURL: signin,
-		Method:    m,
-		SendBody:  sb,
+		URL:             str,
+		SigninURL:       signin,
+		Method:          m,
+		SendBody:        sb,
 		ResponseHeaders: h,
 	}, nil
 }
diff --git a/core/pkg/ingress/annotations/authreq/main_test.go b/core/pkg/ingress/annotations/authreq/main_test.go
@@ -18,8 +18,8 @@ package authreq
 
 import (
 	"fmt"
-	"testing"
 	"reflect"
+	"testing"
 
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/apis/extensions"

diff --git a/core/pkg/k8s/main.go b/core/pkg/k8s/main.go
@@ -34,7 +34,7 @@ func IsValidService(kubeClient clientset.Interface, name string) (*api.Service,
 	return kubeClient.Core().Services(ns).Get(name)
 }
 
-// isValidConfigMap check if exists a configmap with the specified name
+// IsValidConfigMap check if exists a configmap with the specified name
 func IsValidConfigMap(kubeClient clientset.Interface, fullName string) (*api.ConfigMap, error) {
 
 	ns, name, err := ParseNameNS(fullName)
@@ -53,7 +53,7 @@ func IsValidConfigMap(kubeClient clientset.Interface, fullName string) (*api.Con
 
 }
 
-// isValidNamespace chck if exists a namespace with the specified name
+// IsValidNamespace chck if exists a namespace with the specified name
 func IsValidNamespace(kubeClient clientset.Interface, name string) (*api.Namespace, error) {
 	return kubeClient.Core().Namespaces().Get(name)
 }

diff --git a/examples/customization/external-auth-headers/nginx/authsvc/authsvc.go b/examples/customization/external-auth-headers/nginx/authsvc/authsvc.go
@@ -2,10 +2,10 @@ package main
 
 import (
 	"fmt"
-	"net/http"
-	"strings"
 	"math/rand"
+	"net/http"
 	"strconv"
+	"strings"
 )
 
 // Sample authentication service returning several HTTP headers in response

diff --git a/examples/customization/external-auth-headers/nginx/echosvc/echosvc.go b/examples/customization/external-auth-headers/nginx/echosvc/echosvc.go
@@ -6,7 +6,8 @@ import (
 )
 
 func handler(w http.ResponseWriter, r *http.Request) {
-	fmt.Fprintf(w, "UserID: %s, UserRole: %s", r.Header.Get("UserID"), r.Header.Get("UserRole"))}
+	fmt.Fprintf(w, "UserID: %s, UserRole: %s", r.Header.Get("UserID"), r.Header.Get("UserRole"))
+}
 
 // Sample  "echo" service displaying UserID and UserRole HTTP request headers
 func main() {