fix golangci findings

Signed-off-by: Tim Ramlot <42113979+inteon@users.noreply.github.com>

Author: inteon

api/cluster_test.go

@@ -43,15 +43,15 @@ func TestClusterSummaryUnmarshalJSON(t *testing.T) {
 			FailureCount: 4,
 			SuccessCount: 1,
 			Reports: []*ReportSummary{
-				&ReportSummary{
+				{
 					ID:           "exampleReport1",
 					Package:      "examplePackage.ID.1",
 					Cluster:      "exampleCluster",
 					Timestamp:    Time{Time: ts},
 					FailureCount: 2,
 					SuccessCount: 1,
 				},
-				&ReportSummary{
+				{
 					ID:           "exampleReport2",
 					Package:      "examplePackage.ID.2",
 					Cluster:      "exampleCluster",

pkg/client/client_api_token.go

@@ -10,9 +10,10 @@ import (
 	"path/filepath"
 	"time"
 
+	"k8s.io/client-go/transport"
+
 	"github.com/jetstack/preflight/api"
 	"github.com/jetstack/preflight/pkg/version"
-	"k8s.io/client-go/transport"
 )
 
 type (

pkg/client/client_oauth.go

@@ -189,7 +189,7 @@ func (c *OAuthClient) renewAccessToken(ctx context.Context) error {
 	if err != nil {
 		return errors.WithStack(err)
 	}
-	req.Header.Add("content-type", "application/x-www-form-urlencoded")
+	req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
 	req.Header.Set("User-Agent", fmt.Sprintf("venafi-kubernetes-agent/%s", version.PreflightVersion))
 
 	res, err := http.DefaultClient.Do(req)

pkg/datagatherer/k8s/client_test.go

@@ -54,7 +54,7 @@ func TestNewDiscoveryClient_InferredKubeconfig(t *testing.T) {
 }
 
 func writeConfigToFile(t *testing.T, cfg clientcmdapi.Config) string {
-	f, err := os.CreateTemp("", "testcase-*")
+	f, err := os.CreateTemp(t.TempDir(), "testcase-*")
 	if err != nil {
 		t.Fatal(err)
 	}

pkg/datagatherer/k8s/fieldfilter_test.go

@@ -4,10 +4,11 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/jetstack/preflight/pkg/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+
+	"github.com/jetstack/preflight/pkg/testutil"
 )
 
 func TestSelect(t *testing.T) {

pkg/echo/echo_test.go

@@ -30,7 +30,7 @@ func TestEchoServerRequestResponse(t *testing.T) {
 				},
 				DataGatherTime: time.Now(),
 				DataReadings: []*api.DataReading{
-					&api.DataReading{
+					{
 						ClusterID:    "test_suite_cluster",
 						DataGatherer: "dummy",
 						Timestamp:    api.Time{Time: time.Now()},

pkg/logs/logs.go

@@ -13,9 +13,10 @@ import (
 	"k8s.io/component-base/featuregate"
 	"k8s.io/component-base/logs"
 	logsapi "k8s.io/component-base/logs/api/v1"
-	_ "k8s.io/component-base/logs/json/register"
 	"k8s.io/klog/v2"
 	ctrlruntimelog "sigs.k8s.io/controller-runtime/pkg/log"
+
+	_ "k8s.io/component-base/logs/json/register"
 )
 
 // venafi-kubernetes-agent follows [Kubernetes Logging Conventions] and writes

pkg/logs/logs_test.go

@@ -15,13 +15,14 @@ import (
 	"testing"
 	"time"
 
-	_ "github.com/Venafi/vcert/v5"
 	"github.com/spf13/pflag"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"k8s.io/klog/v2"
 
 	"github.com/jetstack/preflight/pkg/logs"
+
+	_ "github.com/Venafi/vcert/v5"
 )
 
 // TestLogs demonstrates how the logging flags affect the logging output.

pkg/testutil/envtest.go

@@ -200,10 +200,10 @@ func FakeVenafiCloud(t *testing.T) (_ *httptest.Server, _ *x509.Certificate, set
 		}
 
 		accessToken := strings.TrimPrefix(r.Header.Get("Authorization"), "Bearer ")
-		apiKey := r.Header.Get("tppl-api-key")
+		apiKey := r.Header.Get("Tppl-Api-Key")
 		if accessToken != "VALID_ACCESS_TOKEN" && apiKey != "VALID_API_KEY" {
 			w.WriteHeader(http.StatusUnauthorized)
-			w.Write([]byte(`{"error":"expected header 'Authorization: Bearer VALID_ACCESS_TOKEN' or 'tppl-api-key: VALID_API_KEY', but got Authorization=` + r.Header.Get("Authorization") + ` and tppl-api-key=` + r.Header.Get("tppl-api-key")))
+			w.Write([]byte(`{"error":"expected header 'Authorization: Bearer VALID_ACCESS_TOKEN' or 'tppl-api-key: VALID_API_KEY', but got Authorization=` + r.Header.Get("Authorization") + ` and tppl-api-key=` + r.Header.Get("Tppl-Api-Key")))
 			return
 		}
 		if r.URL.Path == "/v1/tlspk/upload/clusterdata/no" {

pkg/testutil/undent.go

@@ -68,7 +68,7 @@ func Undent(s string) string {
 	}
 
 	curLineIndent := 0 // Number of tabs or spaces in the current line.
-	for pos := 0; pos < len(s); pos++ {
+	for pos := range s {
 		if s[pos] == '\n' {
 			if pos+1 < len(s) {
 				lineOffsets = append(lineOffsets, pos+1)
@@ -102,7 +102,7 @@ func Undent(s string) string {
 	// Extract each line without indentation.
 	out := make([]byte, 0, len(s)-(indentsPerLine*indentedLinesCnt))
 
-	for line := 0; line < len(lineOffsets); line++ {
+	for line := range lineOffsets {
 		first := lineOffsets[line]
 
 		// Index of the last character of the line. It is often the '\n'