please the linters

Signed-off-by: Sebastiaan van Stijn <[email protected]>

Author: thaJeztah

executor/oci/internal/resolvconf/resolvconf.go

@@ -115,7 +115,7 @@ func Parse(reader io.Reader, path string) (ResolvConf, error) {
 		rc.processLine(scanner.Text())
 	}
 	if err := scanner.Err(); err != nil {
-		return ResolvConf{}, errSystem{err}
+		return ResolvConf{}, systemErr{err}
 	}
 	if _, ok := rc.Option("ndots"); ok {
 		rc.md.NDotsFrom = "host"
@@ -177,7 +177,7 @@ func (rc *ResolvConf) Options() []string {
 //	Option("ndots") -> ("1", true)
 //	Option("edns0") -> ("", true)
 func (rc *ResolvConf) Option(search string) (string, bool) {
-	for i := len(rc.options) - 1; i >= 0; i -= 1 {
+	for i := len(rc.options) - 1; i >= 0; i-- {
 		k, v, _ := strings.Cut(rc.options[i], ":")
 		if k == search {
 			return v, true
@@ -344,10 +344,10 @@ options {{join . " "}}
 	var buf bytes.Buffer
 	templ, err := template.New("summary").Funcs(funcs).Parse(templateText)
 	if err != nil {
-		return nil, errSystem{err}
+		return nil, systemErr{err}
 	}
 	if err := templ.Execute(&buf, s); err != nil {
-		return nil, errSystem{err}
+		return nil, systemErr{err}
 	}
 	return buf.Bytes(), nil
 }
@@ -419,15 +419,15 @@ func removeInvalidNDots(options []string) []string {
 	return options[:n]
 }
 
-// errSystem implements [github.com/docker/docker/errdefs.ErrSystem].
+// systemErr implements [github.com/docker/docker/errdefs.ErrSystem].
 //
 // We don't use the errdefs helpers here, because the resolvconf package
 // is imported in BuildKit, and this is the only location that used the
 // errdefs package outside of the client.
-type errSystem struct{ error }
+type systemErr struct{ error }
 
-func (errSystem) System() {}
+func (systemErr) System() {}
 
-func (e errSystem) Unwrap() error {
+func (e systemErr) Unwrap() error {
 	return e.error
 }

executor/oci/resolvconf.go

@@ -2,7 +2,6 @@ package oci
 
 import (
 	"context"
-	"fmt"
 	"net/netip"
 	"os"
 	"path/filepath"
@@ -89,7 +88,7 @@ func GetResolvConf(ctx context.Context, stateDir string, idmap *user.IdentityMap
 				for _, addr := range dns.Nameservers {
 					ipAddr, err := netip.ParseAddr(addr)
 					if err != nil {
-						return struct{}{}, errors.WithStack(fmt.Errorf("bad nameserver address: %w", err))
+						return struct{}{}, errors.WithStack(errors.Wrap(err, "bad nameserver address"))
 					}
 					ns = append(ns, ipAddr)
 				}