CLEANUP/MINOR: do not use naked returns

Author: oktalz

deploy/tests/e2e/client.go

@@ -129,10 +129,10 @@ func (c *Client) DoMethod(method string) (res *http.Response, closeFunc func() e
 	c.Req.Method = method
 	res, err = client.Do(c.Req)
 	if err != nil {
-		return
+		return res, closeFunc, err
 	}
 	closeFunc = res.Body.Close
-	return
+	return res, closeFunc, err
 }
 
 func (c *Client) Do() (res *http.Response, closeFunc func() error, err error) {
@@ -178,12 +178,12 @@ func ProxyProtoConn() (result []byte, err error) {
 
 	_, err = header.WriteTo(conn)
 	if err != nil {
-		return
+		return result, err
 	}
 
 	_, err = conn.Write([]byte("HEAD / HTTP/1.0\r\n\r\n"))
 	if err != nil {
-		return
+		return result, err
 	}
 
 	return io.ReadAll(conn)
@@ -196,23 +196,23 @@ func runtimeCommand(command string) (result []byte, err error) {
 	}
 	conn, err := net.Dial("tcp", fmt.Sprintf("%s:%d", kindURL, STATS_PORT))
 	if err != nil {
-		return
+		return result, err
 	}
 	_, err = conn.Write([]byte(command + "\n"))
 	if err != nil {
-		return
+		return result, err
 	}
 	result = make([]byte, 2048)
 	_, err = conn.Read(result)
 	conn.Close()
-	return
+	return result, err
 }
 
 func GetHAProxyMapCount(mapName string) (count int, err error) {
 	var result []byte
 	result, err = runtimeCommand("show map")
 	if err != nil {
-		return
+		return count, err
 	}
 	scanner := bufio.NewScanner(bytes.NewReader(result))
 	for scanner.Scan() {
@@ -225,14 +225,14 @@ func GetHAProxyMapCount(mapName string) (count int, err error) {
 			break
 		}
 	}
-	return
+	return count, err
 }
 
 func GetGlobalHAProxyInfo() (info GlobalHAProxyInfo, err error) {
 	var result []byte
 	result, err = runtimeCommand("show info")
 	if err != nil {
-		return
+		return info, err
 	}
 	scanner := bufio.NewScanner(bytes.NewReader(result))
 	for scanner.Scan() {
@@ -246,7 +246,7 @@ func GetGlobalHAProxyInfo() (info GlobalHAProxyInfo, err error) {
 			info.Pid = strings.Split(line, ": ")[1]
 		}
 	}
-	return
+	return info, err
 }
 
 type CertInfo struct {
@@ -259,7 +259,7 @@ func GetCertSubject(filename string) (certInfo CertInfo, err error) {
 	var result []byte
 	result, err = runtimeCommand("show ssl cert " + filename)
 	if err != nil {
-		return
+		return certInfo, err
 	}
 	scanner := bufio.NewScanner(bytes.NewReader(result))
 	for scanner.Scan() {
@@ -268,7 +268,7 @@ func GetCertSubject(filename string) (certInfo CertInfo, err error) {
 		case strings.HasPrefix(line, "Used:"):
 			used, convErr := strconv.ParseBool(strings.Split(line, ": ")[1])
 			if convErr != nil {
-				return //nolint:nilnesserr
+				return certInfo, err //nolint:nilnesserr
 			}
 			certInfo.Used = used
 		case strings.HasPrefix(line, "Subject:"):
@@ -277,5 +277,5 @@ func GetCertSubject(filename string) (certInfo CertInfo, err error) {
 			certInfo.Issuer = strings.Split(line, ": ")[1]
 		}
 	}
-	return
+	return certInfo, err
 }

deploy/tests/e2e/endpoints/http_test.go

@@ -80,8 +80,8 @@ func (suite *EndpointsSuite) getPID() (pid string) {
 	r, err := e2e.GetGlobalHAProxyInfo()
 	if err != nil {
 		suite.T().Log(err)
-		return
+		return pid
 	}
 	pid = r.Pid
-	return
+	return pid
 }

deploy/tests/integration/base-suite.go

@@ -70,7 +70,7 @@ type updateStatusManager struct{}
 
 func (m *updateStatusManager) AddIngress(ingress *ingress.Ingress) {}
 func (m *updateStatusManager) Update(k store.K8s, h haproxy.HAProxy, a annotations.Annotations) (err error) {
-	return
+	return err
 }
 
 type TestController struct {

deploy/tests/tnr/routeacl/suite_test.go

@@ -41,7 +41,7 @@ type updateStatusManager struct{}
 
 func (m *updateStatusManager) AddIngress(ingress *ingress.Ingress) {}
 func (m *updateStatusManager) Update(k store.K8s, h haproxy.HAProxy, a annotations.Annotations) (err error) {
-	return
+	return err
 }
 
 func TestUseBackend(t *testing.T) {
@@ -199,5 +199,5 @@ func (suite *UseBackendSuite) UseBackendFixture() (eventChan chan k8ssync.SyncDa
 	controllerHasWorked := make(chan struct{})
 	eventChan <- k8ssync.SyncDataEvent{SyncType: k8ssync.COMMAND, EventProcessed: controllerHasWorked}
 	<-controllerHasWorked
-	return
+	return eventChan
 }

deploy/tests/ut/acls/suite_test.go

@@ -41,7 +41,7 @@ type FakeUpdateSatusManager struct{}
 
 func (m *FakeUpdateSatusManager) AddIngress(ingress *ingress.Ingress) {}
 func (m *FakeUpdateSatusManager) Update(k store.K8s, h haproxy.HAProxy, a annotations.Annotations) (err error) {
-	return
+	return err
 }
 
 type ACLSuite struct {
@@ -200,5 +200,5 @@ func (suite *ACLSuite) UseACLFixture() (eventChan chan k8ssync.SyncDataEvent) {
 	eventChan <- k8ssync.SyncDataEvent{SyncType: k8ssync.COMMAND}
 	eventChan <- k8ssync.SyncDataEvent{EventProcessed: controllerHasWorked}
 	<-controllerHasWorked
-	return
+	return eventChan
 }

deploy/tests/ut/httprequests/suite_test.go

@@ -41,7 +41,7 @@ type FakeUpdateSatusManager struct{}
 
 func (m *FakeUpdateSatusManager) AddIngress(ingress *ingress.Ingress) {}
 func (m *FakeUpdateSatusManager) Update(k store.K8s, h haproxy.HAProxy, a annotations.Annotations) (err error) {
-	return
+	return err
 }
 
 type HTTPRequestsSuite struct {
@@ -202,5 +202,5 @@ func (suite *HTTPRequestsSuite) UseHTTPRequestsFixture() (eventChan chan k8ssync
 	eventChan <- k8ssync.SyncDataEvent{SyncType: k8ssync.COMMAND}
 	eventChan <- k8ssync.SyncDataEvent{EventProcessed: controllerHasWorked}
 	<-controllerHasWorked
-	return
+	return eventChan
 }

pkg/annotations/annotations.go

@@ -178,55 +178,55 @@ func SetDefaultValue(annotation, value string) {
 func Bool(name string, annotations ...map[string]string) (out bool, err error) {
 	boolean, err := ParseBool(name, annotations...)
 	out = boolean == "true"
-	return
+	return out, err
 }
 
 func ParseBool(name string, annotations ...map[string]string) (out string, err error) {
 	input := common.GetValue(name, annotations...)
 	if input == "" {
-		return
+		return out, err
 	}
 	_, err = utils.GetBoolValue(input, name)
 	if err != nil {
 		err = fmt.Errorf("%s annotation: %w", name, err)
-		return
+		return out, err
 	}
 	out = input
-	return
+	return out, err
 }
 
 func Int(name string, annotations ...map[string]string) (out int, err error) {
 	input := common.GetValue(name, annotations...)
 	if input == "" {
-		return
+		return out, err
 	}
 	out, err = strconv.Atoi(input)
 	if err != nil {
 		err = fmt.Errorf("annotation '%s': %w", name, err)
-		return
+		return out, err
 	}
-	return
+	return out, err
 }
 
 func Secret(name, defaultNs string, k store.K8s, annotations ...map[string]string) (secret *store.Secret, err error) {
 	var secNs, secName string
 	secNs, secName, err = common.GetK8sPath(name, annotations...)
 	if err != nil {
 		err = fmt.Errorf("annotation '%s': %w", name, err)
-		return
+		return secret, err
 	}
 	if secName == "" {
-		return
+		return secret, err
 	}
 	if secNs == "" {
 		secNs = defaultNs
 	}
 	secret, err = k.GetSecret(secNs, secName)
 	if err != nil {
 		err = fmt.Errorf("annotation '%s': %w", name, err)
-		return
+		return secret, err
 	}
-	return
+	return secret, err
 }
 
 func String(name string, annotations ...map[string]string) string {
@@ -236,12 +236,12 @@ func String(name string, annotations ...map[string]string) string {
 func Timeout(name string, annotations ...map[string]string) (out *int64, err error) {
 	input := common.GetValue(name, annotations...)
 	if input == "" {
-		return
+		return out, err
 	}
 	out, err = utils.ParseTime(input)
 	if err != nil {
 		err = fmt.Errorf("annotation '%s': %w", name, err)
-		return
+		return out, err
 	}
-	return
+	return out, err
 }

pkg/annotations/cfgSnippet.go

@@ -226,16 +226,16 @@ func (a *CfgSnippet) Process(k store.K8s, annotations ...map[string]string) erro
 func UpdateGlobalCfgSnippet(api api.HAProxyClient) (updated []string, err error) {
 	err = api.GlobalCfgSnippet(cfgSnippet.global.value)
 	if err != nil {
-		return
+		return updated, err
 	}
 
 	if len(cfgSnippet.global.updated) == 0 {
-		return
+		return updated, err
 	}
 
 	updated = cfgSnippet.global.updated
 	cfgSnippet.global.updated = nil
-	return
+	return updated, err
 }
 
 func UpdateFrontendCfgSnippet(api api.HAProxyClient, frontends ...string) (updated []string, err error) {
@@ -247,7 +247,7 @@ func UpdateFrontendCfgSnippet(api api.HAProxyClient, frontends ...string) (updat
 
 		err = api.FrontendCfgSnippetSet(ft, data.value)
 		if err != nil {
-			return
+			return updated, err
 		}
 
 		if len(data.updated) == 0 {
@@ -258,27 +258,27 @@ func UpdateFrontendCfgSnippet(api api.HAProxyClient, frontends ...string) (updat
 		data.updated = nil
 		cfgSnippet.frontends[ft] = data
 	}
-	return
+	return updated, err
 }
 
 func CheckBackendConfigSnippetError(configErr error, cfgDir string) (rerun bool, err error) {
 	// No error ? no configsnippet to disable.
 	if configErr == nil {
-		return
+		return rerun, err
 	}
 	file, lineNumbers, err := processConfigurationError(configErr)
 	if err != nil {
-		return
+		return rerun, err
 	}
 	// Read contents from failed configuration file
 	file = filepath.Join(cfgDir, "failed", filepath.Base(file))
 	contents, err := os.ReadFile(file)
 	if err != nil {
-		return
+		return rerun, err
 	}
 
 	rerun = disableFaultyCfgSnippet(string(contents), lineNumbers)
-	return
+	return rerun, err
 }
 
 func RemoveBackendCfgSnippet(backend string) {
@@ -328,11 +328,11 @@ func getErrorLineNumberAndFileName(msg string) (lineNumber int, file string, err
 	lineNumber = -1
 	openSquareBracket := strings.Index(msg, "[")
 	if openSquareBracket == -1 {
-		return
+		return lineNumber, file, err
 	}
 	closeSquareBracket := strings.Index(msg, "]")
 	if closeSquareBracket == -1 {
-		return
+		return lineNumber, file, err
 	}
 	configsnippetComment := msg[openSquareBracket+1 : closeSquareBracket]
 	fileLineNumber := strings.Split(configsnippetComment, ":")
@@ -341,12 +341,12 @@ func getErrorLineNumberAndFileName(msg string) (lineNumber int, file string, err
 		file = fileLineNumber[0]
 		lineNumber, err = strconv.Atoi(fileLineNumber[1])
 		if err != nil {
-			return
+			return lineNumber, file, err
 		}
 	} else {
 		err = fmt.Errorf("invalid config snippet information : '%s'", configsnippetComment)
 	}
-	return
+	return lineNumber, file, err
 }
 
 func disableFaultyCfgSnippet(contents string, lineNumbers []int) (rerun bool) {
@@ -405,7 +405,7 @@ func disableFaultyCfgSnippet(contents string, lineNumbers []int) (rerun bool) {
 			rerun = true
 		}
 	}
-	return
+	return rerun
 }
 
 func processConfigurationError(configErr error) (file string, lineNumbers []int, err error) {
@@ -423,8 +423,8 @@ func processConfigurationError(configErr error) (file string, lineNumbers []int,
 			}
 			lineNumbers = append(lineNumbers, lineNumber)
 		} else if err != nil {
-			return
+			return file, lineNumbers, err
 		}
 	}
-	return
+	return file, lineNumbers, err
 }

pkg/annotations/cfgSnippetHandler.go

@@ -47,7 +47,7 @@ func getConfigmapConfigSnippet(backendsWithNoConfigSnippets map[string]struct{},
 			err = errGet
 		}
 	}
-	return
+	return configmapCfgSnippetValue, err
 }
 
 func updateConfigSnippet(api api.HAProxyClient, configmapCfgSnippetValue []string) (err error) {

pkg/annotations/common/main.go

@@ -19,7 +19,7 @@ func GetValue(annotationName string, annotations ...map[string]string) string {
 func GetK8sPath(annotationName string, annotations ...map[string]string) (ns, name string, err error) {
 	a := GetValue(annotationName, annotations...)
 	if a == "" {
-		return
+		return ns, name, err
 	}
 	parts := strings.Split(a, "/")
 	switch len(parts) {
@@ -35,7 +35,7 @@ func GetK8sPath(annotationName string, annotations ...map[string]string) (ns, na
 	if name == "" {
 		err = errors.New("invalid format")
 	}
-	return
+	return ns, name, err
 }
 
 var DefaultValues = map[string]string{