fix linting errors

Author: mrogala-sauce

command/run/run.go

@@ -146,7 +146,6 @@ func (c *command) runE(cmd *cobra.Command, _ []string) (cmdErr error) {
 		if err != nil {
 			return fmt.Errorf("kerberos: %w", err)
 		}
-
 	}
 
 	if len(c.dnsConfig.Servers) > 0 {
@@ -339,7 +338,7 @@ func (c *command) configureHeadersModifiers() {
 	}
 }
 
-// configure upstream proxy transport - connect headers and/or Kerberos auth
+// Configure upstream proxy transport - connect headers and/or Kerberos auth.
 func (c *command) configureTransportProxy(tr *http.Transport, kerberosAdapter forwarder.KerberosAdapter) {
 	headersToAllocate := len(c.connectHeaders)
 
@@ -363,7 +362,6 @@ func (c *command) configureTransportProxy(tr *http.Transport, kerberosAdapter fo
 			}
 
 			maps.Copy(h, kerberosHeaders)
-
 		}
 
 		return h, nil

dialvia/http.go

@@ -147,7 +147,6 @@ func (d *HTTPProxyDialer) DialContextR(ctx context.Context, network, addr string
 		}
 
 		maps.Copy(req.Header, headers)
-
 	}
 
 	if err := req.Write(pbw); err != nil {

dialvia/http_test.go

@@ -9,6 +9,7 @@ package dialvia
 import (
 	"bufio"
 	"bytes"
+	"errors"
 	"fmt"
 	"io"
 	"net"
@@ -105,11 +106,11 @@ func TestHTTPProxyDialerDialContext(t *testing.T) {
 				}
 
 				if req.Method != http.MethodConnect {
-					return fmt.Errorf("HTTP CONNECT method expected")
+					return errors.New("HTTP CONNECT method expected")
 				}
 
 				if req.Header.Get("Proxy-Authorization") != "TEST-PROXY-AUTHORIZATION" {
-					return fmt.Errorf("Proxy-Authorization header expected but not present")
+					return errors.New("Proxy-Authorization header expected but not present")
 				}
 
 				return proxyutil.NewResponse(404, nil, req).Write(conn)

http_proxy.go

@@ -205,7 +205,9 @@ func NewHTTPProxy(cfg *HTTPProxyConfig, pr PACResolver, cm *CredentialsMatcher,
 }
 
 // NewHTTPProxyHandler is like NewHTTPProxy but returns http.Handler instead of *HTTPProxy.
-func NewHTTPProxyHandler(cfg *HTTPProxyConfig, pr PACResolver, cm *CredentialsMatcher, rt http.RoundTripper, log log.StructuredLogger, kerberosAdapter KerberosAdapter) (http.Handler, error) {
+func NewHTTPProxyHandler(cfg *HTTPProxyConfig, pr PACResolver, cm *CredentialsMatcher,
+	rt http.RoundTripper, log log.StructuredLogger, kerberosAdapter KerberosAdapter,
+) (http.Handler, error) {
 	hp, err := newHTTPProxy(cfg, pr, cm, rt, log, kerberosAdapter)
 	if err != nil {
 		return nil, err
@@ -354,7 +356,6 @@ func (hp *HTTPProxy) upstreamProxyURL() *url.URL {
 	// so http.RoundTripper would not try to add custom Authorization header
 
 	if hp.kerberosAdapter != nil && hp.kerberosAdapter.GetConfig().AuthUpstreamProxy {
-
 		proxyURL.User = nil
 		return proxyURL
 	}
@@ -386,7 +387,6 @@ func (hp *HTTPProxy) pacProxy(r *http.Request) (*url.URL, error) {
 	// so http.RoundTripper would not try to add custom Authorization header
 
 	if hp.kerberosAdapter != nil && hp.kerberosAdapter.GetConfig().AuthUpstreamProxy {
-
 		proxyURL.User = nil
 		return proxyURL, nil
 	}

internal/martian/proxy_connect.go

@@ -125,13 +125,11 @@ func (p *Proxy) connectHTTP(req *http.Request, proxyURL *url.URL) (res *http.Res
 		if tr, ok := p.rt.(*http.Transport); ok && tr.GetProxyConnectHeader != nil {
 			d.GetProxyConnectHeader = tr.GetProxyConnectHeader
 		}
-
 	} else {
 		d = dialvia.HTTPProxy(p.DialContext, proxyURL)
 		if tr, ok := p.rt.(*http.Transport); ok && tr.GetProxyConnectHeader != nil {
 			d.GetProxyConnectHeader = tr.GetProxyConnectHeader
 		}
-
 	}
 
 	d.Timeout = p.ConnectTimeout

kerberos.go

@@ -10,6 +10,7 @@ import (
 	"bytes"
 	"context"
 	"encoding/base64"
+	"errors"
 	"fmt"
 	"net/http"
 	"net/url"
@@ -58,18 +59,18 @@ func NewKerberosAdapter(cnf KerberosConfig, log log.StructuredLogger) (*Kerberos
 	// technically this should not happen as adapter should not be initialized without
 	// proper config present, but better safe than sorry
 	if cnf.CfgFilePath == "" {
-		return nil, fmt.Errorf("kerberos config file (krb5.conf) not specified")
+		return nil, errors.New("kerberos config file (krb5.conf) not specified")
 	}
 
 	if cnf.KeyTabFilePath == "" {
-		return nil, fmt.Errorf("kerberos keytab file not specified")
+		return nil, errors.New("kerberos keytab file not specified")
 	}
 
 	if cnf.UserName == "" {
-		return nil, fmt.Errorf("kerberos username not specified")
+		return nil, errors.New("kerberos username not specified")
 	}
 	if cnf.UserRealm == "" {
-		return nil, fmt.Errorf("kerberos user realm not specified")
+		return nil, errors.New("kerberos user realm not specified")
 	}
 
 	krb5Config, err := config.Load(cnf.CfgFilePath)
@@ -112,14 +113,13 @@ func (a *KerberosClient) ConnectToKDC() error {
 
 		// We need to print directly to stdout as it contains a nested structured text.
 		// Does not really matter as diagnostics mode should be used on local console only.
-		fmt.Printf("%s", buf.String())
+		fmt.Printf("%s", buf.String()) //nolint
 
 		if err != nil {
 			return fmt.Errorf("kerberos configuration potential problems: %w", err)
 		}
 
-		return fmt.Errorf("no kerberos configuration problems found. Exiting process")
-
+		return errors.New("no kerberos configuration problems found. Exiting process")
 	}
 
 	return nil

kerberos_test.go

@@ -11,30 +11,31 @@ import (
 
 	"github.com/saucelabs/forwarder/log/slog"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestKerberosAdapterFailsWithoutConfig(t *testing.T) {
 	cnf := KerberosConfig{}
 
 	_, err := NewKerberosAdapter(cnf, slog.Default())
-	assert.NotNil(t, err)
-	assert.ErrorContains(t, err, "kerberos config file (krb5.conf) not specified")
+	assert.Error(t, err)
+	require.ErrorContains(t, err, "kerberos config file (krb5.conf) not specified")
 
 	cnf.CfgFilePath = "/tmp/test.cfg"
 
 	_, err = NewKerberosAdapter(cnf, slog.Default())
-	assert.NotNil(t, err)
-	assert.ErrorContains(t, err, "kerberos keytab file not specified")
+	assert.Error(t, err)
+	require.ErrorContains(t, err, "kerberos keytab file not specified")
 
 	cnf.KeyTabFilePath = "/tmp/keytab"
 
 	_, err = NewKerberosAdapter(cnf, slog.Default())
-	assert.NotNil(t, err)
-	assert.ErrorContains(t, err, "kerberos username not specified")
+	assert.Error(t, err)
+	require.ErrorContains(t, err, "kerberos username not specified")
 
 	cnf.UserName = "user1"
 
 	_, err = NewKerberosAdapter(cnf, slog.Default())
-	assert.NotNil(t, err)
-	assert.ErrorContains(t, err, "kerberos user realm not specified")
+	assert.Error(t, err)
+	require.ErrorContains(t, err, "kerberos user realm not specified")
 }