fixing lint errors

Author: Akshay2191

internal/collector/nginxossreceiver/internal/scraper/stubstatus/stub_status_scraper_tls_test.go

@@ -46,11 +46,11 @@ func TestStubStatusScraperTLS(t *testing.T) {
 		IsCA:                  true,
 	}
 
-	caPrivKey, err := rsa.GenerateKey(rand.Reader, 2048)
-	require.NoError(t, err)
+	caPrivKey, caPrivKeyErr := rsa.GenerateKey(rand.Reader, 2048)
+	require.NoError(t, caPrivKeyErr)
 
-	caBytes, err := x509.CreateCertificate(rand.Reader, ca, ca, &caPrivKey.PublicKey, caPrivKey)
-	require.NoError(t, err)
+	caBytes, caBytesErr := x509.CreateCertificate(rand.Reader, ca, ca, &caPrivKey.PublicKey, caPrivKey)
+	require.NoError(t, caBytesErr)
 
 	// Create a test server certificate signed by the CA
 	cert := &x509.Certificate{
@@ -67,23 +67,24 @@ func TestStubStatusScraperTLS(t *testing.T) {
 		DNSNames:     []string{"localhost"},
 	}
 
-	certPrivKey, err := rsa.GenerateKey(rand.Reader, 2048)
-	require.NoError(t, err)
+	certPrivKey, certPrivKeyErr := rsa.GenerateKey(rand.Reader, 2048)
+	require.NoError(t, certPrivKeyErr)
 
-	certBytes, err := x509.CreateCertificate(rand.Reader, cert, ca, &certPrivKey.PublicKey, caPrivKey)
-	require.NoError(t, err)
+	certBytes, certBytesErr := x509.CreateCertificate(rand.Reader, cert, ca, &certPrivKey.PublicKey, caPrivKey)
+	require.NoError(t, certBytesErr)
 
 	// Create a temporary directory for test files
 	tempDir := t.TempDir()
 
 	// Save CA certificate to a file
 	caFile := filepath.Join(tempDir, "ca.crt")
 	caPEM := pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: caBytes})
-	err = os.WriteFile(caFile, caPEM, 0o600)
-	require.NoError(t, err)
+	writeErr := os.WriteFile(caFile, caPEM, 0o600)
+	require.NoError(t, writeErr)
 
 	// Create a TLS config for the server
 	serverTLSConfig := &tls.Config{
+		MinVersion: tls.VersionTLS13,
 		Certificates: []tls.Certificate{
 			{
 				Certificate: [][]byte{certBytes},
@@ -101,6 +102,7 @@ server accepts handled requests
  16630948 16630946 31070465
 Reading: 6 Writing: 179 Waiting: 106
 `))
+
 			return
 		}
 		rw.WriteHeader(http.StatusNotFound)
@@ -129,14 +131,14 @@ Reading: 6 Writing: 179 Waiting: 106
 }
 
 func TestStubStatusScraperUnixSocket(t *testing.T) {
-	tempDir, err := os.MkdirTemp("", "TestStubStatusScraperUnixSocket")
-	require.NoError(t, err)
-	t.Cleanup(func() { os.RemoveAll(tempDir) })
-	socketPath := filepath.Join(tempDir, "nginx.sock")
+	// Use a shorter path for the socket to avoid path length issues
+	socketPath := filepath.Join(os.TempDir(), "test-nginx.sock")
+	// Clean up the socket file after the test
+	t.Cleanup(func() { os.Remove(socketPath) })
 
 	// Create a Unix domain socket listener
-	listener, err := net.Listen("unix", socketPath)
-	require.NoError(t, err)
+	listener, listenErr := net.Listen("unix", socketPath)
+	require.NoError(t, listenErr)
 	defer listener.Close()
 
 	// Start a simple HTTP server on the Unix socket
@@ -149,6 +151,7 @@ server accepts handled requests
  16630948 16630946 31070465
 Reading: 6 Writing: 179 Waiting: 106
 `))
+
 				return
 			}
 			rw.WriteHeader(http.StatusNotFound)

internal/resource/resource_service_test.go

@@ -10,6 +10,7 @@ import (
 	"errors"
 	"fmt"
 	"os"
+	"path/filepath"
 	"testing"
 
 	"github.com/nginx/agent/v3/internal/model"
@@ -240,13 +241,11 @@ func TestResourceService_GetResource(t *testing.T) {
 
 func TestResourceService_createPlusClient(t *testing.T) {
 	// Create a temporary file for testing CA certificate
-	tempCAFile, err := os.CreateTemp("", "test-ca.crt")
-	require.NoError(t, err)
-	defer os.Remove(tempCAFile.Name())
+	tempDir := t.TempDir()
+	caFile := filepath.Join(tempDir, "test-ca.crt")
 
-	_, err = tempCAFile.Write([]byte("-----BEGIN CERTIFICATE-----\nMII...\n-----END CERTIFICATE-----"))
+	err := os.WriteFile(caFile, []byte("-----BEGIN CERTIFICATE-----\nMII...\n-----END CERTIFICATE-----"), 0o600)
 	require.NoError(t, err)
-	tempCAFile.Close()
 
 	instanceWithAPI := protos.NginxPlusInstance([]string{})
 	instanceWithAPI.InstanceRuntime.GetNginxPlusRuntimeInfo().PlusApi = &v1.APIDetails{
@@ -264,7 +263,7 @@ func TestResourceService_createPlusClient(t *testing.T) {
 	instanceWithCACert.InstanceRuntime.GetNginxPlusRuntimeInfo().PlusApi = &v1.APIDetails{
 		Location: "/api",
 		Listen:   "localhost:443",
-		Ca:       tempCAFile.Name(),
+		Ca:       caFile,
 	}
 
 	ctx := context.Background()
@@ -303,12 +302,12 @@ func TestResourceService_createPlusClient(t *testing.T) {
 				protos.NginxPlusInstance([]string{}),
 			}
 
-			_, err := resourceService.createPlusClient(test.instance)
+			_, clientErr := resourceService.createPlusClient(test.instance)
 			if test.err != nil {
-				assert.Error(tt, err)
-				assert.Contains(tt, err.Error(), test.err.Error())
+				require.Error(tt, clientErr)
+				assert.Contains(tt, clientErr.Error(), test.err.Error())
 			} else {
-				assert.NoError(tt, err)
+				require.NoError(tt, clientErr)
 				// For the CA cert test, we can't easily verify the internal http.Client configuration
 				// without exporting it or adding test hooks, so we'll just verify no error is returned
 			}