[Maintenance] Unify References via golangci-linter (#1861)

Author: ajanikow

.golangci.yaml

@@ -163,6 +163,10 @@ linters-settings:
         pkg: k8s.io/client-go/kubernetes/typed/core/v1
       - alias: ugrpc
         pkg: github.com/arangodb/kube-arangodb/pkg/util/grpc
+      - alias: goStrings
+        pkg: strings
+      - alias: goHttp
+        pkg: net/http
   gci:
     sections:
       - standard

CHANGELOG.md

@@ -4,6 +4,7 @@
 - (Maintenance) Extend Documentation
 - (Bugfix) (Platform) Cover NoAuth Case for Identity Service
 - (Feature) Add ArangoMember Args
+- (Maintenance) Unify References via golangci-linter
 
 ## [1.2.47](https://github.com/arangodb/kube-arangodb/tree/1.2.47) (2025-03-28)
 - (Bugfix) Use Profile Annotations

cmd/admin.go

@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2016-2024 ArangoDB GmbH, Cologne, Germany
+// Copyright 2016-2025 ArangoDB GmbH, Cologne, Germany
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@ import (
 	"fmt"
 	"io"
 	"net"
-	"net/http"
+	goHttp "net/http"
 	"os"
 	"os/signal"
 	"strconv"
@@ -169,11 +169,11 @@ func cmdGetAgencyDump(cmd *cobra.Command, _ []string) {
 func getAgencyState(ctx context.Context, conn connection.Connection) (io.ReadCloser, error) {
 	url := connection.NewUrl("_api", "agency", "read")
 	data := []byte(`[["/"]]`)
-	resp, body, err := connection.CallStream(ctx, conn, http.MethodPost, url, connection.WithBody(data))
+	resp, body, err := connection.CallStream(ctx, conn, goHttp.MethodPost, url, connection.WithBody(data))
 	if err != nil {
 		return nil, err
 	}
-	if resp.Code() != http.StatusOK {
+	if resp.Code() != goHttp.StatusOK {
 		return nil, errors.New(fmt.Sprintf("unexpected HTTP status from \"%s\" endpoint", url))
 	}
 
@@ -241,7 +241,7 @@ func getAgencyLeader(ctx context.Context, conn connection.Connection) (string, e
 	if err != nil {
 		return "", err
 	}
-	if resp.Code() != http.StatusOK {
+	if resp.Code() != goHttp.StatusOK {
 		return "", errors.New("unexpected HTTP status from agency-dump endpoint")
 	}
 
@@ -257,11 +257,11 @@ func getAgencyLeader(ctx context.Context, conn connection.Connection) (string, e
 // getAgencyDump returns dump of the agency.
 func getAgencyDump(ctx context.Context, conn connection.Connection) (io.ReadCloser, error) {
 	url := connection.NewUrl("_api", "cluster", "agency-dump")
-	resp, body, err := connection.CallStream(ctx, conn, http.MethodGet, url)
+	resp, body, err := connection.CallStream(ctx, conn, goHttp.MethodGet, url)
 	if err != nil {
 		return nil, err
 	}
-	if resp.Code() != http.StatusOK {
+	if resp.Code() != goHttp.StatusOK {
 		return nil, errors.New("unexpected HTTP status from agency-dump endpoint")
 	}
 
@@ -285,7 +285,7 @@ func createClient(endpoints []string, certCA *x509.CertPool, auth connection.Aut
 		Authentication: auth,
 		ContentType:    contentType,
 		Endpoint:       connection.NewRoundRobinEndpoints(endpoints),
-		Transport: &http.Transport{
+		Transport: &goHttp.Transport{
 			TLSClientConfig: &tls.Config{
 				RootCAs: certCA,
 			},

cmd/cmd.go

@@ -25,11 +25,11 @@ import (
 	goflag "flag"
 	"fmt"
 	"net"
-	"net/http"
+	goHttp "net/http"
 	"os"
 	"reflect"
 	"strconv"
-	"strings"
+	goStrings "strings"
 	"time"
 
 	"github.com/gin-gonic/gin"
@@ -335,7 +335,7 @@ func executeMain(cmd *cobra.Command, args []string) {
 		logger.Err(err).Fatal("Unable to enable logger")
 	}
 
-	podNameParts := strings.Split(name, "-")
+	podNameParts := goStrings.Split(name, "-")
 	operatorID := podNameParts[len(podNameParts)-1]
 
 	if operatorID != "" {
@@ -565,7 +565,7 @@ func startVersionProcess() error {
 	r.GET("/_api/version", gin.WrapF(versionV1Responser.ServeHTTP))
 	r.GET("/api/v1/version", gin.WrapF(versionV1Responser.ServeHTTP))
 
-	s := http.Server{
+	s := goHttp.Server{
 		Addr:    listenAddr,
 		Handler: r,
 	}

cmd/crd.go

@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2016-2024 ArangoDB GmbH, Cologne, Germany
+// Copyright 2016-2025 ArangoDB GmbH, Cologne, Germany
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@ import (
 	"fmt"
 	"os"
 	"strconv"
-	"strings"
+	goStrings "strings"
 	"time"
 
 	"github.com/spf13/cobra"
@@ -92,7 +92,7 @@ func prepareCRDOptions(schemaEnabledArgs []string, preserveUnknownFieldsArgs []s
 	preserveUnknownFields := map[string]bool{}
 
 	for _, arg := range schemaEnabledArgs {
-		parts := strings.SplitN(arg, "=", 2)
+		parts := goStrings.SplitN(arg, "=", 2)
 
 		var enabled bool
 
@@ -108,7 +108,7 @@ func prepareCRDOptions(schemaEnabledArgs []string, preserveUnknownFieldsArgs []s
 	}
 
 	for _, arg := range preserveUnknownFieldsArgs {
-		parts := strings.SplitN(arg, "=", 2)
+		parts := goStrings.SplitN(arg, "=", 2)
 
 		var enabled bool
 

cmd/exporter.go

@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2016-2024 ArangoDB GmbH, Cologne, Germany
+// Copyright 2016-2025 ArangoDB GmbH, Cologne, Germany
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@ package cmd
 
 import (
 	"context"
-	"net/http"
+	goHttp "net/http"
 	"os"
 	"time"
 
@@ -111,10 +111,10 @@ func cmdExporterCheckE() error {
 
 	server, err := operatorHTTP.NewServer(ctx,
 		operatorHTTP.DefaultHTTPServerSettings,
-		operatorHTTP.WithServeMux(func(in *http.ServeMux) {
+		operatorHTTP.WithServeMux(func(in *goHttp.ServeMux) {
 			in.Handle("/metrics", p)
-		}, func(in *http.ServeMux) {
-			in.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
+		}, func(in *goHttp.ServeMux) {
+			in.HandleFunc("/", func(w goHttp.ResponseWriter, r *goHttp.Request) {
 				w.Write([]byte(`<html>
              <head><title>ArangoDB Exporter</title></head>
              <body>

cmd/lifecycle_probes.go

@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2016-2024 ArangoDB GmbH, Cologne, Germany
+// Copyright 2016-2025 ArangoDB GmbH, Cologne, Germany
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"net/http"
+	goHttp "net/http"
 	"os"
 	"path"
 	"strconv"
@@ -103,14 +103,14 @@ func init() {
 	f.BoolVar(&probeInput.Enterprise, "enterprise", enterprise, "Determines if ArangoDB is enterprise")
 }
 
-func probeClient() *http.Client {
-	tr := &http.Transport{}
+func probeClient() *goHttp.Client {
+	tr := &goHttp.Transport{}
 
 	if probeInput.SSL {
 		tr.TLSClientConfig = &tls.Config{InsecureSkipVerify: true}
 	}
 
-	client := &http.Client{
+	client := &goHttp.Client{
 		Transport: tr,
 	}
 
@@ -171,7 +171,7 @@ func getJWTToken() ([]byte, error) {
 	return nil, errors.Errorf("Unable to find any token")
 }
 
-func addAuthHeader(req *http.Request) error {
+func addAuthHeader(req *goHttp.Request) error {
 	if !probeInput.Auth {
 		return nil
 	}
@@ -190,10 +190,10 @@ func addAuthHeader(req *http.Request) error {
 	return nil
 }
 
-func doRequest(endpoint string) (*http.Response, error) {
+func doRequest(endpoint string) (*goHttp.Response, error) {
 	client := probeClient()
 
-	req, err := http.NewRequest(http.MethodGet, probeEndpoint(endpoint), nil)
+	req, err := goHttp.NewRequest(goHttp.MethodGet, probeEndpoint(endpoint), nil)
 	if err != nil {
 		return nil, err
 	}
@@ -222,7 +222,7 @@ func cmdLifecycleProbeRunE(cmd *cobra.Command) error {
 		defer resp.Body.Close()
 	}
 
-	if resp.StatusCode != http.StatusOK {
+	if resp.StatusCode != goHttp.StatusOK {
 		if resp.Body != nil {
 			if data, err := io.ReadAll(resp.Body); err == nil {
 				return errors.Errorf("Unexpected code: %d - %s", resp.StatusCode, string(data))

cmd/lifecycle_startup.go

@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2016-2024 ArangoDB GmbH, Cologne, Germany
+// Copyright 2016-2025 ArangoDB GmbH, Cologne, Germany
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@ package cmd
 
 import (
 	"fmt"
-	"net/http"
+	goHttp "net/http"
 	"time"
 
 	"github.com/spf13/cobra"
@@ -42,14 +42,14 @@ func cmdLifecycleStartupFunc(cmd *cobra.Command, args []string) error {
 
 	port := ProbePort.GetOrDefault(fmt.Sprintf("%d", shared.ArangoPort))
 
-	server := &http.Server{
+	server := &goHttp.Server{
 		Addr: fmt.Sprintf(":%s", port),
 	}
 
-	handlers := http.NewServeMux()
+	handlers := goHttp.NewServeMux()
 
-	handlers.HandleFunc("/stop", func(writer http.ResponseWriter, request *http.Request) {
-		writer.WriteHeader(http.StatusOK)
+	handlers.HandleFunc("/stop", func(writer goHttp.ResponseWriter, request *goHttp.Request) {
+		writer.WriteHeader(goHttp.StatusOK)
 		close = true
 	})
 
@@ -66,7 +66,7 @@ func cmdLifecycleStartupFunc(cmd *cobra.Command, args []string) error {
 	}()
 
 	if err := server.ListenAndServe(); err != nil {
-		if errors.Is(err, http.ErrServerClosed) {
+		if errors.Is(err, goHttp.ErrServerClosed) {
 			return nil
 		}
 

cmd/uuid.go

@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2016-2024 ArangoDB GmbH, Cologne, Germany
+// Copyright 2016-2025 ArangoDB GmbH, Cologne, Germany
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@ package cmd
 import (
 	"fmt"
 	"os"
-	"strings"
+	goStrings "strings"
 
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
@@ -156,7 +156,7 @@ func checkFileContent(path, expected string) (bool, string, error) {
 		return false, "", err
 	}
 
-	contentString := strings.TrimSuffix(string(content), "\n")
+	contentString := goStrings.TrimSuffix(string(content), "\n")
 
 	return contentString == expected, contentString, nil
 }