Add lint option to Makefile and fix lint issues

Author: Raul Marrero

CONTRIBUTING.md

@@ -71,3 +71,4 @@ Note: if you’d like to implement a new feature, please consider creating a fea
 * Run `gofmt` over your code to automatically resolve a lot of style issues. Most editors support this running automatically when saving a code file.
 * Run `go lint` and `go vet` on your code too to catch any other issues.
 * Follow this guide on some good practice and idioms for Go -  https://github.com/golang/go/wiki/CodeReviewComments
+* To check for extra issues, install [golangci-lint](https://github.com/golangci/golangci-lint) and run `make lint` or `golangci-lint run`

Makefile

@@ -24,6 +24,9 @@ else
 	CGO_ENABLED=0 GOOS=linux go build -installsuffix cgo -ldflags "-w -X main.version=${VERSION} -X main.gitCommit=${GIT_COMMIT}" -o nginx-ingress github.com/nginxinc/kubernetes-ingress/cmd/nginx-ingress
 endif
 
+lint:
+	golangci-lint run
+
 test:
 ifeq ($(BUILD_IN_CONTAINER),1)
 	$(DOCKER_RUN) $(GOLANG_CONTAINER) go test ./...

cmd/nginx-ingress/main.go

@@ -107,7 +107,11 @@ The external address of the service is used when reporting the status of Ingress
 
 func main() {
 	flag.Parse()
-	flag.Lookup("logtostderr").Value.Set("true")
+
+	err := flag.Lookup("logtostderr").Value.Set("true")
+	if err != nil {
+		glog.Fatalf("Error setting logtostderr to true: %v", err)
+	}
 
 	if *versionFlag {
 		fmt.Printf("Version=%v GitCommit=%v\n", version, gitCommit)
@@ -124,7 +128,6 @@ func main() {
 		glog.Fatalf("Invalid value for prometheus-metrics-listen-port: %v", metricsPortValidationError)
 	}
 
-	var err error
 	allowedCIDRs, err := parseNginxStatusAllowCIDRs(*nginxStatusAllowCIDRs)
 	if err != nil {
 		glog.Fatalf(`Invalid value for nginx-status-allow-cidrs: %v`, err)

cmd/nginx-ingress/main_test.go

@@ -98,12 +98,3 @@ func TestValidateCIDRorIP(t *testing.T) {
 		}
 	}
 }
-
-func contains(s []string, e string) bool {
-	for _, a := range s {
-		if a == e {
-			return true
-		}
-	}
-	return false
-}

internal/configs/configurator.go

@@ -122,9 +122,8 @@ func (cnf *Configurator) generateNginxCfgForMergeableIngresses(mergeableIngs *Me
 	var upstreams []Upstream
 	healthChecks := make(map[string]HealthCheck)
 	var keepalive string
-	var removedAnnotations []string
 
-	removedAnnotations = filterMasterAnnotations(mergeableIngs.Master.Ingress.Annotations)
+	removedAnnotations := filterMasterAnnotations(mergeableIngs.Master.Ingress.Annotations)
 	if len(removedAnnotations) != 0 {
 		glog.Errorf("Ingress Resource %v/%v with the annotation 'nginx.org/mergeable-ingress-type' set to 'master' cannot contain the '%v' annotation(s). They will be ignored",
 			mergeableIngs.Master.Ingress.Namespace, mergeableIngs.Master.Ingress.Name, strings.Join(removedAnnotations, ","))
@@ -139,9 +138,8 @@ func (cnf *Configurator) generateNginxCfgForMergeableIngresses(mergeableIngs *Me
 	masterServer = masterNginxCfg.Servers[0]
 	masterServer.Locations = []Location{}
 
-	for _, val := range masterNginxCfg.Upstreams {
-		upstreams = append(upstreams, val)
-	}
+	upstreams = append(upstreams, masterNginxCfg.Upstreams...)
+
 	if masterNginxCfg.Keepalive != "" {
 		keepalive = masterNginxCfg.Keepalive
 	}
@@ -176,9 +174,7 @@ func (cnf *Configurator) generateNginxCfgForMergeableIngresses(mergeableIngs *Me
 			masterServer.JWTRedirectLocations = append(masterServer.JWTRedirectLocations, server.JWTRedirectLocations...)
 		}
 
-		for _, val := range nginxCfg.Upstreams {
-			upstreams = append(upstreams, val)
-		}
+		upstreams = append(upstreams, nginxCfg.Upstreams...)
 	}
 
 	masterServer.HealthChecks = healthChecks
@@ -369,7 +365,7 @@ func (cnf *Configurator) generateNginxCfg(ingEx *IngressEx, pems map[string]stri
 			}
 		}
 
-		if rootLocation == false && ingEx.Ingress.Spec.Backend != nil {
+		if !rootLocation && ingEx.Ingress.Spec.Backend != nil {
 			upsName := getNameForUpstream(ingEx.Ingress, emptyHost, ingEx.Ingress.Spec.Backend)
 
 			loc := createLocation(pathOrDefault("/"), upstreams[upsName], &ingCfg, wsServices[ingEx.Ingress.Spec.Backend.ServiceName], rewrites[ingEx.Ingress.Spec.Backend.ServiceName],

internal/configs/templates/templates_test.go

@@ -116,7 +116,7 @@ func TestIngressForNGINXPlus(t *testing.T) {
 	var buf bytes.Buffer
 
 	err = tmpl.Execute(&buf, ingCfg)
-	t.Log(string(buf.Bytes()))
+	t.Log(buf.String())
 	if err != nil {
 		t.Fatalf("Failed to write template %v", err)
 	}
@@ -131,7 +131,7 @@ func TestIngressForNGINX(t *testing.T) {
 	var buf bytes.Buffer
 
 	err = tmpl.Execute(&buf, ingCfg)
-	t.Log(string(buf.Bytes()))
+	t.Log(buf.String())
 	if err != nil {
 		t.Fatalf("Failed to write template %v", err)
 	}
@@ -146,7 +146,7 @@ func TestMainForNGINXPlus(t *testing.T) {
 	var buf bytes.Buffer
 
 	err = tmpl.Execute(&buf, mainCfg)
-	t.Log(string(buf.Bytes()))
+	t.Log(buf.String())
 	if err != nil {
 		t.Fatalf("Failed to write template %v", err)
 	}
@@ -161,7 +161,7 @@ func TestMainForNGINX(t *testing.T) {
 	var buf bytes.Buffer
 
 	err = tmpl.Execute(&buf, mainCfg)
-	t.Log(string(buf.Bytes()))
+	t.Log(buf.String())
 	if err != nil {
 		t.Fatalf("Failed to write template %v", err)
 	}

internal/k8s/controller.go

@@ -120,7 +120,7 @@ func NewLoadBalancerController(input NewLoadBalancerControllerInput) *LoadBalanc
 	eventBroadcaster := record.NewBroadcaster()
 	eventBroadcaster.StartLogging(glog.Infof)
 	eventBroadcaster.StartRecordingToSink(&core_v1.EventSinkImpl{
-		Interface: core_v1.New(input.KubeClient.Core().RESTClient()).Events(""),
+		Interface: core_v1.New(input.KubeClient.CoreV1().RESTClient()).Events(""),
 	})
 	lbc.recorder = eventBroadcaster.NewRecorder(scheme.Scheme,
 		api_v1.EventSource{Component: "nginx-ingress-controller"})
@@ -183,7 +183,7 @@ func (lbc *LoadBalancerController) AddSyncQueue(item interface{}) {
 func (lbc *LoadBalancerController) addSecretHandler(handlers cache.ResourceEventHandlerFuncs) {
 	lbc.secretLister.Store, lbc.secretController = cache.NewInformer(
 		cache.NewListWatchFromClient(
-			lbc.client.Core().RESTClient(),
+			lbc.client.CoreV1().RESTClient(),
 			"secrets",
 			lbc.namespace,
 			fields.Everything()),
@@ -197,7 +197,7 @@ func (lbc *LoadBalancerController) addSecretHandler(handlers cache.ResourceEvent
 func (lbc *LoadBalancerController) addServiceHandler(handlers cache.ResourceEventHandlerFuncs) {
 	lbc.svcLister, lbc.svcController = cache.NewInformer(
 		cache.NewListWatchFromClient(
-			lbc.client.Core().RESTClient(),
+			lbc.client.CoreV1().RESTClient(),
 			"services",
 			lbc.namespace,
 			fields.Everything()),
@@ -211,7 +211,7 @@ func (lbc *LoadBalancerController) addServiceHandler(handlers cache.ResourceEven
 func (lbc *LoadBalancerController) addIngressHandler(handlers cache.ResourceEventHandlerFuncs) {
 	lbc.ingressLister.Store, lbc.ingressController = cache.NewInformer(
 		cache.NewListWatchFromClient(
-			lbc.client.Extensions().RESTClient(),
+			lbc.client.ExtensionsV1beta1().RESTClient(),
 			"ingresses",
 			lbc.namespace,
 			fields.Everything()),
@@ -225,7 +225,7 @@ func (lbc *LoadBalancerController) addIngressHandler(handlers cache.ResourceEven
 func (lbc *LoadBalancerController) addEndpointHandler(handlers cache.ResourceEventHandlerFuncs) {
 	lbc.endpointLister.Store, lbc.endpointController = cache.NewInformer(
 		cache.NewListWatchFromClient(
-			lbc.client.Core().RESTClient(),
+			lbc.client.CoreV1().RESTClient(),
 			"endpoints",
 			lbc.namespace,
 			fields.Everything()),
@@ -239,7 +239,7 @@ func (lbc *LoadBalancerController) addEndpointHandler(handlers cache.ResourceEve
 func (lbc *LoadBalancerController) addConfigMapHandler(handlers cache.ResourceEventHandlerFuncs, namespace string) {
 	lbc.configMapLister.Store, lbc.configMapController = cache.NewInformer(
 		cache.NewListWatchFromClient(
-			lbc.client.Core().RESTClient(),
+			lbc.client.CoreV1().RESTClient(),
 			"configmaps",
 			namespace,
 			fields.Everything()),
@@ -961,7 +961,7 @@ func (lbc *LoadBalancerController) createIngress(ing *extensions.Ingress) (*conf
 		if jwtKey, exists := ingEx.Ingress.Annotations[configs.JWTKeyAnnotation]; exists {
 			secretName := jwtKey
 
-			secret, err := lbc.client.Core().Secrets(ing.Namespace).Get(secretName, meta_v1.GetOptions{})
+			secret, err := lbc.client.CoreV1().Secrets(ing.Namespace).Get(secretName, meta_v1.GetOptions{})
 			if err != nil {
 				glog.Warningf("Error retrieving secret %v for Ingress %v: %v", secretName, ing.Name, err)
 				secret = nil
@@ -1198,7 +1198,7 @@ func (lbc *LoadBalancerController) getTargetPort(svcPort *api_v1.ServicePort, sv
 		return int32(svcPort.TargetPort.IntValue()), nil
 	}
 
-	pods, err := lbc.client.Core().Pods(svc.Namespace).List(meta_v1.ListOptions{LabelSelector: labels.Set(svc.Spec.Selector).String()})
+	pods, err := lbc.client.CoreV1().Pods(svc.Namespace).List(meta_v1.ListOptions{LabelSelector: labels.Set(svc.Spec.Selector).String()})
 	if err != nil {
 		return 0, fmt.Errorf("Error getting pod information: %v", err)
 	}