Fix various lint issues

Author: Gandem

.golangci.yml

@@ -23,6 +23,10 @@ issues:
     - target
     - virt-tests
     - vm-images
+  exclude-rules:
+    - path: hostmetadata/azure/azure.go
+      linters:
+        - lll
 
 linters:
   enable-all: true

config/env.go

@@ -80,7 +80,7 @@ func (e EnvironmentType) String() string {
 	case envAzure:
 		return "azure"
 	case envAWS:
-		// nolint: goconst
+		//nolint: goconst
 		return "aws"
 	default:
 		return fmt.Sprintf("unknown environment %d", e)

containermetadata/containermetadata_test.go

@@ -362,7 +362,7 @@ func BenchmarkGetKubernetesPodMetadata(b *testing.B) {
 
 			file, err := os.CreateTemp("", "test_containermetadata_cgroup*")
 			require.NoError(b, err)
-			defer os.Remove(file.Name()) // nolint: gocritic
+			defer os.Remove(file.Name()) //nolint: gocritic
 
 			_, err = fmt.Fprintf(file,
 				"0::/kubepods/besteffort/poda9c80282-3f6b-4d5b-84d5-a137a6668011/"+

hostmetadata/azure/azure.go

@@ -82,7 +82,6 @@ type IMDS struct {
 // Failures (missing keys, etc) are logged and ignored.
 //
 // We extract the Azure metadata according to the information at
-// nolint:lll
 // https://docs.microsoft.com/en-us/azure/virtual-machines/windows/instance-metadata-service?tabs=linux#endpoint-categories
 //
 // - 169.254.169.254 is the standard endpoint for the instance metadata service in all clouds.

hostmetadata/azure/azure_test.go

@@ -15,7 +15,7 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-// nolint:lll
+//nolint:lll
 const fakeAzureAnswer = `{
   "compute": {
     "azEnvironment": "AzurePublicCloud",

hostmetadata/host/cpuid_test.go

@@ -42,6 +42,7 @@ func TestCPUID_ParseOnlineCPUCoreIDs(t *testing.T) {
 func prepareFakeCPUOnlineFile(t *testing.T, content string) *os.File {
 	f, err := os.CreateTemp("", "sys_device_cpu_online")
 	require.NoError(t, err)
+	//nolint:gosec
 	_ = os.WriteFile(f.Name(), []byte(content), os.ModePerm)
 	return f
 }

hostmetadata/host/cpuinfo_test.go

@@ -59,7 +59,7 @@ func TestReadCPUInfo(t *testing.T) {
 			assert.NotEmpty(t, cps)
 			i, err := strconv.Atoi(cps)
 			require.NoErrorf(t, err, "%v must be parseable as a number", cps)
-			assert.Greater(t, i, 0)
+			assert.Positive(t, i)
 		},
 		"OnlineCPUs": func(t *testing.T) {
 			assert.Contains(t, info[key(keyCPUOnline)], 0)

libpf/pfelf/pfelf_test.go

@@ -57,7 +57,6 @@ func TestGetGoBuildID(t *testing.T) {
 		t.Fatalf("GetGoBuildID failed with error: %s", err)
 	}
 
-	// nolint:lll
 	if buildID !=
 		"tUhrGOwxi48kXlLhYlY3/WlmPekR2qonrFvofssLt/8beXJbt0rDaHhn3I6x8D/IA6Zd8Qc8Rsh_bFKoPVn" {
 		t.Fatalf("Invalid build-id: %s", buildID)

main.go

@@ -186,7 +186,7 @@ func mainWithExitCode() exitCode {
 	}
 
 	if err = tracer.ProbeBPFSyscall(); err != nil {
-		log.Errorf(fmt.Sprintf("Failed to probe eBPF syscall: %v", err))
+		log.Errorf("Failed to probe eBPF syscall: %v", err)
 		return exitFailure
 	}
 

metrics/cpumetrics/cpu.go

@@ -223,11 +223,11 @@ func getCPUUsage() (pAvgCPU uint16, err error) {
 	// Calculate the maximum possible value for the elapsed time (duration).
 	// nCPUs*userHZ: The max. number of ticks per second.
 	// duration / time.Second: Time elapsed in seconds.
-	max := float64(nCPUs*userHZ) * (float64(duration) / float64(time.Second))
+	maximum := float64(nCPUs*userHZ) * (float64(duration) / float64(time.Second))
 
 	// Calculate the % value of the CPU usage with rounding.
-	if max > 0 {
-		pAvgCPU = uint16(float64(load*100)/max + 0.5)
+	if maximum > 0 {
+		pAvgCPU = uint16(float64(load*100)/maximum + 0.5)
 		if pAvgCPU > 100 {
 			pAvgCPU = 100
 		}