chore: use revive linter

.golangci.yml

@@ -29,6 +29,7 @@ linters:
     - ineffassign
     - misspell
     - prealloc
+    - revive
     - staticcheck
     - typecheck
     - unconvert

caddyconfig/caddyfile/dispenser.go

@@ -236,8 +236,8 @@ func (d *Dispenser) ScalarVal() any {
 	if num, err := strconv.ParseFloat(text, 64); err == nil {
 		return num
 	}
-	if bool, err := strconv.ParseBool(text); err == nil {
-		return bool
+	if boolean, err := strconv.ParseBool(text); err == nil {
+		return boolean
 	}
 	return text
 }

caddyconfig/caddyfile/formatter.go

@@ -81,10 +81,10 @@ func Format(input []byte) []byte {
 				space = true
 				nextLine()
 				continue
-			} else {
-				write(ch)
-				continue
 			}
+			write(ch)
+			continue
+
 		}
 
 		if !escaped && ch == '\\' {

caddyconfig/caddyfile/parse.go

@@ -446,7 +446,7 @@ func (p *parser) doImport(nesting int) error {
 
 	var (
 		maybeSnippet   bool
-		maybeSnippetId bool
+		maybeSnippetID bool
 		index          int
 	)
 
@@ -472,16 +472,16 @@ func (p *parser) doImport(nesting int) error {
 			}
 
 			if index == 0 && len(token.Text) >= 3 && strings.HasPrefix(token.Text, "(") && strings.HasSuffix(token.Text, ")") {
-				maybeSnippetId = true
+				maybeSnippetID = true
 			}
 		}
 
 		switch token.Text {
 		case "{":
 			nesting++
-			if index == 1 && maybeSnippetId && nesting == 1 {
+			if index == 1 && maybeSnippetID && nesting == 1 {
 				maybeSnippet = true
-				maybeSnippetId = false
+				maybeSnippetID = false
 			}
 		case "}":
 			nesting--

caddyconfig/httploader.go

@@ -105,7 +105,7 @@ func (hl HTTPLoader) LoadConfig(ctx caddy.Context) ([]byte, error) {
 		}
 	}
 
-	resp, err := doHttpCallWithRetries(ctx, client, req)
+	resp, err := doHTTPCallWithRetries(ctx, client, req)
 	if err != nil {
 		return nil, err
 	}
@@ -135,7 +135,7 @@ func (hl HTTPLoader) LoadConfig(ctx caddy.Context) ([]byte, error) {
 	return result, nil
 }
 
-func attemptHttpCall(client *http.Client, request *http.Request) (*http.Response, error) {
+func attemptHTTPCall(client *http.Client, request *http.Request) (*http.Response, error) {
 	resp, err := client.Do(request)
 	if err != nil {
 		return nil, fmt.Errorf("problem calling http loader url: %v", err)
@@ -146,13 +146,13 @@ func attemptHttpCall(client *http.Client, request *http.Request) (*http.Response
 	return resp, nil
 }
 
-func doHttpCallWithRetries(ctx caddy.Context, client *http.Client, request *http.Request) (*http.Response, error) {
+func doHTTPCallWithRetries(ctx caddy.Context, client *http.Client, request *http.Request) (*http.Response, error) {
 	var resp *http.Response
 	var err error
 	const maxAttempts = 10
 
 	for i := 0; i < maxAttempts; i++ {
-		resp, err = attemptHttpCall(client, request)
+		resp, err = attemptHTTPCall(client, request)
 		if err != nil && i < maxAttempts-1 {
 			select {
 			case <-time.After(time.Millisecond * 500):

cmd/commandfuncs.go

@@ -630,7 +630,7 @@ func AdminAPIRequest(adminAddr, method, uri string, headers http.Header, body io
 	if err != nil {
 		return nil, fmt.Errorf("making request: %v", err)
 	}
-	if parsedAddr.IsUnixNetwork() {
+	if parsedAddr.IsUnixNetwork() { //nolint:revive
 		// We used to conform to RFC 2616 Section 14.26 which requires
 		// an empty host header when there is no host, as is the case
 		// with unix sockets. However, Go required a Host value so we

listeners.go

@@ -479,8 +479,8 @@ func ListenQUIC(ln net.PacketConn, tlsConf *tls.Config, activeRequests *int64) (
 		sqtc := newSharedQUICTLSConfig(tlsConf)
 		// http3.ConfigureTLSConfig only uses this field and tls App sets this field as well
 		//nolint:gosec
-		quicTlsConfig := &tls.Config{GetConfigForClient: sqtc.getConfigForClient}
-		earlyLn, err := quic.ListenEarly(ln, http3.ConfigureTLSConfig(quicTlsConfig), &quic.Config{
+		quicTLSConfig := &tls.Config{GetConfigForClient: sqtc.getConfigForClient}
+		earlyLn, err := quic.ListenEarly(ln, http3.ConfigureTLSConfig(quicTLSConfig), &quic.Config{
 			Allow0RTT: true,
 			RequireAddressValidation: func(clientAddr net.Addr) bool {
 				var highLoad bool
@@ -539,14 +539,14 @@ type contextAndCancelFunc struct {
 type sharedQUICTLSConfig struct {
 	rmu           sync.RWMutex
 	tlsConfs      map[*tls.Config]contextAndCancelFunc
-	activeTlsConf *tls.Config
+	activeTLSConf *tls.Config
 }
 
 // newSharedQUICTLSConfig creates a new sharedQUICTLSConfig
 func newSharedQUICTLSConfig(tlsConfig *tls.Config) *sharedQUICTLSConfig {
 	sqtc := &sharedQUICTLSConfig{
 		tlsConfs:      make(map[*tls.Config]contextAndCancelFunc),
-		activeTlsConf: tlsConfig,
+		activeTLSConf: tlsConfig,
 	}
 	sqtc.addTLSConfig(tlsConfig)
 	return sqtc
@@ -556,7 +556,7 @@ func newSharedQUICTLSConfig(tlsConfig *tls.Config) *sharedQUICTLSConfig {
 func (sqtc *sharedQUICTLSConfig) getConfigForClient(ch *tls.ClientHelloInfo) (*tls.Config, error) {
 	sqtc.rmu.RLock()
 	defer sqtc.rmu.RUnlock()
-	return sqtc.activeTlsConf.GetConfigForClient(ch)
+	return sqtc.activeTLSConf.GetConfigForClient(ch)
 }
 
 // addTLSConfig adds tls.Config to the map if not present and returns the corresponding context and its cancelFunc
@@ -577,11 +577,11 @@ func (sqtc *sharedQUICTLSConfig) addTLSConfig(tlsConfig *tls.Config) (context.Co
 		defer sqtc.rmu.Unlock()
 
 		delete(sqtc.tlsConfs, tlsConfig)
-		if sqtc.activeTlsConf == tlsConfig {
+		if sqtc.activeTLSConf == tlsConfig {
 			// select another tls.Config, if there is none,
 			// related sharedQuicListener will be destroyed anyway
 			for tc := range sqtc.tlsConfs {
-				sqtc.activeTlsConf = tc
+				sqtc.activeTLSConf = tc
 				break
 			}
 		}

modules/caddyhttp/encode/encode.go

@@ -269,9 +269,8 @@ func (rw *responseWriter) Write(p []byte) (int, error) {
 
 	if rw.w != nil {
 		return rw.w.Write(p)
-	} else {
-		return rw.ResponseWriter.Write(p)
 	}
+	return rw.ResponseWriter.Write(p)
 }
 
 // Close writes any remaining buffered response and

modules/caddyhttp/ip_range.go

@@ -86,16 +86,16 @@ func (s *StaticIPRange) GetIPRanges(_ *http.Request) []netip.Prefix {
 }
 
 // UnmarshalCaddyfile implements caddyfile.Unmarshaler.
-func (m *StaticIPRange) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
+func (f *StaticIPRange) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
 	if !d.Next() {
 		return nil
 	}
 	for d.NextArg() {
 		if d.Val() == "private_ranges" {
-			m.Ranges = append(m.Ranges, PrivateRangesCIDR()...)
+			f.Ranges = append(f.Ranges, PrivateRangesCIDR()...)
 			continue
 		}
-		m.Ranges = append(m.Ranges, d.Val())
+		f.Ranges = append(f.Ranges, d.Val())
 	}
 	return nil
 }

modules/caddyhttp/push/handler.go

@@ -122,11 +122,8 @@ func (h Handler) ServeHTTP(w http.ResponseWriter, r *http.Request, next caddyhtt
 	}
 
 	// serve only after pushing!
-	if err := next.ServeHTTP(lp, r); err != nil {
-		return err
-	}
-
-	return nil
+	err := next.ServeHTTP(lp, r)
+	return err
 }
 
 func (h Handler) initializePushHeaders(r *http.Request, repl *caddy.Replacer) http.Header {

modules/caddyhttp/reverseproxy/command.go

@@ -284,12 +284,12 @@ func cmdReverseProxy(fs caddycmd.Flags) (int, error) {
 		appsRaw["tls"] = caddyconfig.JSON(tlsApp, nil)
 	}
 
-	var false bool
+	var falseBool bool
 	cfg := &caddy.Config{
 		Admin: &caddy.AdminConfig{
 			Disabled: true,
 			Config: &caddy.ConfigSettings{
-				Persist: &false,
+				Persist: &falseBool,
 			},
 		},
 		AppsRaw: appsRaw,

modules/caddyhttp/reverseproxy/selectionpolicies.go

@@ -770,7 +770,7 @@ func leastRequests(upstreams []*Upstream) *Upstream {
 		return nil
 	}
 	var best []*Upstream
-	var bestReqs int = -1
+	bestReqs := -1
 	for _, upstream := range upstreams {
 		if upstream == nil {
 			continue

modules/caddyhttp/staticresp.go

@@ -394,12 +394,12 @@ func cmdRespond(fl caddycmd.Flags) (int, error) {
 	}
 
 	// finish building the config
-	var false bool
+	var falseBool bool
 	cfg := &caddy.Config{
 		Admin: &caddy.AdminConfig{
 			Disabled: true,
 			Config: &caddy.ConfigSettings{
-				Persist: &false,
+				Persist: &falseBool,
 			},
 		},
 		AppsRaw: caddy.ModuleMap{

modules/logging/filters.go

@@ -322,7 +322,7 @@ func (QueryFilter) CaddyModule() caddy.ModuleInfo {
 }
 
 // UnmarshalCaddyfile sets up the module from Caddyfile tokens.
-func (m *QueryFilter) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
+func (f *QueryFilter) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
 	for d.Next() {
 		for d.NextBlock(0) {
 			qfa := queryFilterAction{}
@@ -360,21 +360,21 @@ func (m *QueryFilter) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
 				return d.Errf("unrecognized subdirective %s", d.Val())
 			}
 
-			m.Actions = append(m.Actions, qfa)
+			f.Actions = append(f.Actions, qfa)
 		}
 	}
 	return nil
 }
 
 // Filter filters the input field.
-func (m QueryFilter) Filter(in zapcore.Field) zapcore.Field {
+func (f QueryFilter) Filter(in zapcore.Field) zapcore.Field {
 	u, err := url.Parse(in.String)
 	if err != nil {
 		return in
 	}
 
 	q := u.Query()
-	for _, a := range m.Actions {
+	for _, a := range f.Actions {
 		switch a.Type {
 		case replaceAction:
 			for i := range q[a.Parameter] {
@@ -442,7 +442,7 @@ func (CookieFilter) CaddyModule() caddy.ModuleInfo {
 }
 
 // UnmarshalCaddyfile sets up the module from Caddyfile tokens.
-func (m *CookieFilter) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
+func (f *CookieFilter) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
 	for d.Next() {
 		for d.NextBlock(0) {
 			cfa := cookieFilterAction{}
@@ -480,14 +480,14 @@ func (m *CookieFilter) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
 				return d.Errf("unrecognized subdirective %s", d.Val())
 			}
 
-			m.Actions = append(m.Actions, cfa)
+			f.Actions = append(f.Actions, cfa)
 		}
 	}
 	return nil
 }
 
 // Filter filters the input field.
-func (m CookieFilter) Filter(in zapcore.Field) zapcore.Field {
+func (f CookieFilter) Filter(in zapcore.Field) zapcore.Field {
 	cookiesSlice, ok := in.Interface.(caddyhttp.LoggableStringArray)
 	if !ok {
 		return in
@@ -500,7 +500,7 @@ func (m CookieFilter) Filter(in zapcore.Field) zapcore.Field {
 
 OUTER:
 	for _, c := range cookies {
-		for _, a := range m.Actions {
+		for _, a := range f.Actions {
 			if c.Name != a.Name {
 				continue
 			}
@@ -566,13 +566,13 @@ func (f *RegexpFilter) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
 }
 
 // Provision compiles m's regexp.
-func (m *RegexpFilter) Provision(ctx caddy.Context) error {
-	r, err := regexp.Compile(m.RawRegexp)
+func (f *RegexpFilter) Provision(ctx caddy.Context) error {
+	r, err := regexp.Compile(f.RawRegexp)
 	if err != nil {
 		return err
 	}
 
-	m.regexp = r
+	f.regexp = r
 
 	return nil
 }