BUILD/MAJOR: ci: apply new linting rules

oktalz · oktalz · commit c1a980efc882 · 2023-03-09T14:30:09.000+01:00
diff --git a/crs/generated/clientset/versioned/fake/register.go b/crs/generated/clientset/versioned/fake/register.go
diff --git a/crs/generated/clientset/versioned/scheme/register.go b/crs/generated/clientset/versioned/scheme/register.go
diff --git a/deploy/tests/e2e/client.go b/deploy/tests/e2e/client.go
@@ -20,7 +20,7 @@ import (
 	"context"
 	"crypto/tls"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net"
 	"net/http"
 	"os"
@@ -177,7 +177,7 @@ func ProxyProtoConn() (result []byte, err error) {
 		return
 	}
 
-	return ioutil.ReadAll(conn)
+	return io.ReadAll(conn)
 }
 
 func runtimeCommand(command string) (result []byte, err error) {
diff --git a/deploy/tests/e2e/haproxy-files/patternfiles_test.go b/deploy/tests/e2e/haproxy-files/patternfiles_test.go
@@ -17,8 +17,9 @@
 package haproxyfiles
 
 import (
-	"github.com/haproxytech/kubernetes-ingress/deploy/tests/e2e"
 	"strconv"
+
+	"github.com/haproxytech/kubernetes-ingress/deploy/tests/e2e"
 )
 
 var tests1 = []string{
diff --git a/deploy/tests/e2e/ingress-match/ingress_match_path_test.go b/deploy/tests/e2e/ingress-match/ingress_match_path_test.go
@@ -44,6 +44,7 @@ var ingressRules = []IngressRule{
 	{Service: "http-echo-9", Host: "*.haproxy", PathType: "ImplementationSpecific"},
 	{Service: "http-echo-10", Path: "/test", PathType: "ImplementationSpecific"},
 }
+
 var tests = []test{
 	{ingressRules[0].Service, "app.haproxy", []string{"/", "/test", "/exact/", "/exactslash", "/exactslash/foo", "/prefixxx"}},
 	{ingressRules[1].Service, "app.haproxy", []string{"/a"}},
diff --git a/deploy/tests/e2e/service-discovery/port_discovery.go b/deploy/tests/e2e/service-discovery/port_discovery.go
@@ -50,5 +50,4 @@ func (suite *ServiceDiscoverySuite) testServicePort(serviceName, servicePort, po
 		}
 		return strings.HasPrefix(string(body), serviceName)
 	}, e2e.WaitDuration, e2e.TickDuration)
-
 }
diff --git a/deploy/tests/e2e/utils.go b/deploy/tests/e2e/utils.go
@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"flag"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -54,7 +53,7 @@ func NewTest() (test Test, err error) {
 		return nil
 	}}
 	// TemplateDir
-	test.templateDir, err = ioutil.TempDir("/tmp/", "haproxy-ic-test-tmpl")
+	test.templateDir, err = os.MkdirTemp("/tmp/", "haproxy-ic-test-tmpl")
 	if err != nil {
 		return test, fmt.Errorf("error creating template dir: %w ", err)
 	}
@@ -73,7 +72,7 @@ func (t *Test) Apply(path string, namespace string, tmplData interface{}) error
 			return err
 		}
 	}
-	if file, err = ioutil.ReadFile(path); err != nil {
+	if file, err = os.ReadFile(path); err != nil {
 		return fmt.Errorf("error reading yaml file: %w", err)
 	}
 	// kubectl -n $NS apply -f -
@@ -84,7 +83,7 @@ func (t *Test) Apply(path string, namespace string, tmplData interface{}) error
 }
 
 func (t *Test) processTemplate(path string, tmplData interface{}) (string, error) {
-	file, err := ioutil.ReadFile(path)
+	file, err := os.ReadFile(path)
 	if err != nil {
 		return "", fmt.Errorf("error reading yaml template: %w", err)
 	}
@@ -95,13 +94,13 @@ func (t *Test) processTemplate(path string, tmplData interface{}) (string, error
 		return "", fmt.Errorf("error parsing yaml template: %w", err)
 	}
 	yaml := filepath.Join(t.templateDir, t.namespace+time.Now().Format("2006-01-02-1504051111")+".yaml")
-	return yaml, ioutil.WriteFile(yaml, result.Bytes(), 0o600)
+	return yaml, os.WriteFile(yaml, result.Bytes(), 0o600)
 }
 
 func (t *Test) Delete(path string) error {
 	var err error
 	var file []byte
-	if file, err = ioutil.ReadFile(path); err != nil {
+	if file, err = os.ReadFile(path); err != nil {
 		return fmt.Errorf("error reading yaml file: %w", err)
 	}
 	if out, errApply := t.execute(string(file), "kubectl", "delete", "-f", "-"); errApply != nil {
diff --git a/deploy/tests/images/http-echo/handlers.go b/deploy/tests/images/http-echo/handlers.go
@@ -15,7 +15,7 @@ func (c context) echoHostname(writer http.ResponseWriter, request *http.Request)
 	fmt.Fprintln(writer, c.hostname)
 }
 
-//  echoAll echos back request in response
+// echoAll echos back request in response
 func (c context) echoAll(writer http.ResponseWriter, request *http.Request) {
 	log.Println("Echoing back request made to " + request.URL.Path + " to client (" + request.RemoteAddr + ")")
 	attr := make(map[string]interface{})
diff --git a/deploy/tests/integration/customresources/suite_test.go b/deploy/tests/integration/customresources/suite_test.go
@@ -15,7 +15,6 @@
 package customresources
 
 import (
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"testing"
@@ -48,7 +47,7 @@ type Test struct {
 }
 
 func (suite *CustomResourceSuite) BeforeTest(suiteName, testName string) {
-	tempDir, err := ioutil.TempDir("", "ut-"+testName+"-*")
+	tempDir, err := os.MkdirTemp("", "ut-"+testName+"-*")
 	if err != nil {
 		suite.T().Fatalf("Suite '%s': Test '%s' : error : %s", suiteName, testName, err)
 	}
diff --git a/deploy/tests/tnr/routeacl/suite_test.go b/deploy/tests/tnr/routeacl/suite_test.go
@@ -15,7 +15,6 @@
 package routeacl
 
 import (
-	"io/ioutil"
 	"os"
 	"testing"
 
@@ -46,7 +45,7 @@ type Test struct {
 }
 
 func (suite *UseBackendSuite) BeforeTest(suiteName, testName string) {
-	tempDir, err := ioutil.TempDir("", "tnr-"+testName+"-*")
+	tempDir, err := os.MkdirTemp("", "tnr-"+testName+"-*")
 	if err != nil {
 		suite.T().Fatalf("Suite '%s': Test '%s' : error : %s", suiteName, testName, err)
 	}
diff --git a/deploy/tests/tnr/routeacl/usebackend_test.go b/deploy/tests/tnr/routeacl/usebackend_test.go
@@ -15,7 +15,7 @@
 package routeacl
 
 import (
-	"io/ioutil"
+	"os"
 	"path/filepath"
 	"strings"
 )
@@ -24,7 +24,7 @@ func (suite *UseBackendSuite) TestUseBackend() {
 	// This test addresses https://github.com/haproxytech/kubernetes-ingress/issues/476
 	suite.UseBackendFixture()
 	suite.Run("Modifying service annotations should not duplicate use_backend clause", func() {
-		contents, err := ioutil.ReadFile(filepath.Join(suite.test.TempDir, "haproxy.cfg"))
+		contents, err := os.ReadFile(filepath.Join(suite.test.TempDir, "haproxy.cfg"))
 		if err != nil {
 			suite.T().Error(err.Error())
 		}
diff --git a/documentation/gen/controller.go b/documentation/gen/controller.go
@@ -75,7 +75,7 @@ func (c *Conf) generateReadmeController() {
 		buff.WriteString("<p align='right'><a href='#haproxy-kubernetes-ingress-controller'>:arrow_up_small: back to top</a></p>\n\n***\n\n")
 	}
 
-	err := renameio.WriteFile("../controller.md", []byte(buff.String()), 0644)
+	err := renameio.WriteFile("../controller.md", []byte(buff.String()), 0o644)
 	if err != nil {
 		log.Println(err)
 	}
diff --git a/pkg/handler/refresh.go b/pkg/handler/refresh.go
@@ -23,7 +23,7 @@ import (
 type Refresh struct{}
 
 func (handler Refresh) Update(k store.K8s, h haproxy.HAProxy, a annotations.Annotations) (reload bool, err error) {
-	var cleanCrts = true
+	cleanCrts := true
 	cleanCrtsAnn, _ := annotations.ParseBool("clean-certs", k.ConfigMaps.Main.Annotations)
 	// cleanCrtsAnn is empty if clean-certs not set or set with a non boolean value =>  error
 	if cleanCrtsAnn == "false" {
diff --git a/pkg/haproxy/certs/main.go b/pkg/haproxy/certs/main.go
@@ -3,7 +3,6 @@ package certs
 import (
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path"
 	"strings"
@@ -183,7 +182,7 @@ func (c *certs) CertsUpdated() (reload bool) {
 }
 
 func refreshCerts(certs map[string]*cert, certDir string) (removed bool) {
-	files, err := ioutil.ReadDir(certDir)
+	files, err := os.ReadDir(certDir)
 	if err != nil {
 		logger.Error(err)
 		return false
diff --git a/pkg/ingress/ingress.go b/pkg/ingress/ingress.go
@@ -143,7 +143,7 @@ func (i *Ingress) handlePath(k store.K8s, h haproxy.HAProxy, host string, path *
 // without the need to map Rule IDs to specific ingress traffic.
 func (i *Ingress) handleAnnotations(k store.K8s, h haproxy.HAProxy) {
 	var err error
-	var result = rules.List{}
+	result := rules.List{}
 	for _, a := range i.annotations.Frontend(i.resource, &result, h.Maps) {
 		err = a.Process(k, i.resource.Annotations, k.ConfigMaps.Main.Annotations)
 		if err != nil {
@@ -155,7 +155,7 @@ func (i *Ingress) handleAnnotations(k store.K8s, h haproxy.HAProxy) {
 
 func HandleCfgMapAnnotations(k store.K8s, h haproxy.HAProxy, a annotations.Annotations) {
 	var err error
-	var result = rules.List{}
+	result := rules.List{}
 	logger.Tracef("Processing Ingress annotations in ConfigMap")
 	for _, a := range a.Frontend(nil, &result, h.Maps) {
 		err = a.Process(k, k.ConfigMaps.Main.Annotations)
diff --git a/pkg/utils/logging.go b/pkg/utils/logging.go
@@ -44,6 +44,7 @@ const (
 //
 // if nil is sent, it won't be printed. This is useful for printing errors only
 // if they exist.
+//
 // ```
 //
 //	if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,9 @@`
`17`	`17`	`package haproxyfiles`
`18`	`18`
`19`	`19`	`import (`
`20`		`- "github.com/haproxytech/kubernetes-ingress/deploy/tests/e2e"`
`21`	`20`	`"strconv"`
	`21`	`+`
	`22`	`+ "github.com/haproxytech/kubernetes-ingress/deploy/tests/e2e"`
`22`	`23`	`)`
`23`	`24`
`24`	`25`	`var tests1 = []string{`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ var ingressRules = []IngressRule{`
`44`	`44`	`{Service: "http-echo-9", Host: "*.haproxy", PathType: "ImplementationSpecific"},`
`45`	`45`	`{Service: "http-echo-10", Path: "/test", PathType: "ImplementationSpecific"},`
`46`	`46`	`}`
	`47`	`+`
`47`	`48`	`var tests = []test{`
`48`	`49`	`{ingressRules[0].Service, "app.haproxy", []string{"/", "/test", "/exact/", "/exactslash", "/exactslash/foo", "/prefixxx"}},`
`49`	`50`	`{ingressRules[1].Service, "app.haproxy", []string{"/a"}},`
Original file line number	Diff line number	Diff line change
`@@ -50,5 +50,4 @@ func (suite *ServiceDiscoverySuite) testServicePort(serviceName, servicePort, po`
`50`	`50`	`}`
`51`	`51`	`return strings.HasPrefix(string(body), serviceName)`
`52`	`52`	`}, e2e.WaitDuration, e2e.TickDuration)`
`53`		`-`
`54`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@ import (`
`4`	`4`	`"bytes"`
`5`	`5`	`"flag"`
`6`	`6`	`"fmt"`
`7`		`- "io/ioutil"`
`8`	`7`	`"os"`
`9`	`8`	`"os/exec"`
`10`	`9`	`"path/filepath"`
`@@ -54,7 +53,7 @@ func NewTest() (test Test, err error) {`
`54`	`53`	`return nil`
`55`	`54`	`}}`
`56`	`55`	`// TemplateDir`
`57`		`- test.templateDir, err = ioutil.TempDir("/tmp/", "haproxy-ic-test-tmpl")`
	`56`	`+ test.templateDir, err = os.MkdirTemp("/tmp/", "haproxy-ic-test-tmpl")`
`58`	`57`	`if err != nil {`
`59`	`58`	`return test, fmt.Errorf("error creating template dir: %w ", err)`
`60`	`59`	`}`
`@@ -73,7 +72,7 @@ func (t *Test) Apply(path string, namespace string, tmplData interface{}) error`
`73`	`72`	`return err`
`74`	`73`	`}`
`75`	`74`	`}`
`76`		`- if file, err = ioutil.ReadFile(path); err != nil {`
	`75`	`+ if file, err = os.ReadFile(path); err != nil {`
`77`	`76`	`return fmt.Errorf("error reading yaml file: %w", err)`
`78`	`77`	`}`
`79`	`78`	`// kubectl -n $NS apply -f -`
`@@ -84,7 +83,7 @@ func (t *Test) Apply(path string, namespace string, tmplData interface{}) error`
`84`	`83`	`}`
`85`	`84`
`86`	`85`	`func (t *Test) processTemplate(path string, tmplData interface{}) (string, error) {`
`87`		`- file, err := ioutil.ReadFile(path)`
	`86`	`+ file, err := os.ReadFile(path)`
`88`	`87`	`if err != nil {`
`89`	`88`	`return "", fmt.Errorf("error reading yaml template: %w", err)`
`90`	`89`	`}`
`@@ -95,13 +94,13 @@ func (t *Test) processTemplate(path string, tmplData interface{}) (string, error`
`95`	`94`	`return "", fmt.Errorf("error parsing yaml template: %w", err)`
`96`	`95`	`}`
`97`	`96`	`yaml := filepath.Join(t.templateDir, t.namespace+time.Now().Format("2006-01-02-1504051111")+".yaml")`
`98`		`- return yaml, ioutil.WriteFile(yaml, result.Bytes(), 0o600)`
	`97`	`+ return yaml, os.WriteFile(yaml, result.Bytes(), 0o600)`
`99`	`98`	`}`
`100`	`99`
`101`	`100`	`func (t *Test) Delete(path string) error {`
`102`	`101`	`var err error`
`103`	`102`	`var file []byte`
`104`		`- if file, err = ioutil.ReadFile(path); err != nil {`
	`103`	`+ if file, err = os.ReadFile(path); err != nil {`
`105`	`104`	`return fmt.Errorf("error reading yaml file: %w", err)`
`106`	`105`	`}`
`107`	`106`	`if out, errApply := t.execute(string(file), "kubectl", "delete", "-f", "-"); errApply != nil {`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ func (c context) echoHostname(writer http.ResponseWriter, request *http.Request)`
`15`	`15`	`fmt.Fprintln(writer, c.hostname)`
`16`	`16`	`}`
`17`	`17`
`18`		`-// echoAll echos back request in response`
	`18`	`+// echoAll echos back request in response`
`19`	`19`	`func (c context) echoAll(writer http.ResponseWriter, request *http.Request) {`
`20`	`20`	`log.Println("Echoing back request made to " + request.URL.Path + " to client (" + request.RemoteAddr + ")")`
`21`	`21`	`attr := make(map[string]interface{})`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@`
`15`	`15`	`package customresources`
`16`	`16`
`17`	`17`	`import (`
`18`		`- "io/ioutil"`
`19`	`18`	`"os"`
`20`	`19`	`"path/filepath"`
`21`	`20`	`"testing"`
`@@ -48,7 +47,7 @@ type Test struct {`
`48`	`47`	`}`
`49`	`48`
`50`	`49`	`func (suite *CustomResourceSuite) BeforeTest(suiteName, testName string) {`
`51`		`- tempDir, err := ioutil.TempDir("", "ut-"+testName+"-*")`
	`50`	`+ tempDir, err := os.MkdirTemp("", "ut-"+testName+"-*")`
`52`	`51`	`if err != nil {`
`53`	`52`	`suite.T().Fatalf("Suite '%s': Test '%s' : error : %s", suiteName, testName, err)`
`54`	`53`	`}`