Move describe flags to utils and reformat

.golangci.yml

@@ -95,6 +95,7 @@ issues:
     - path: _test\.go
       linters:
         - bodyclose
+        - errcheck
         - funlen
         - gochecknoglobals
         - gocognit

cmd/forwarder/httpbin/httpbin.go

@@ -13,6 +13,7 @@ import (
 	"github.com/saucelabs/forwarder/log"
 	"github.com/saucelabs/forwarder/log/stdlog"
 	"github.com/saucelabs/forwarder/runctx"
+	"github.com/saucelabs/forwarder/utils/cobrautil"
 	"github.com/saucelabs/forwarder/utils/httpbin"
 	"github.com/spf13/cobra"
 )
@@ -24,7 +25,7 @@ type command struct {
 }
 
 func (c *command) runE(cmd *cobra.Command, _ []string) error {
-	config, err := bind.DescribeFlags(cmd.Flags(), false, bind.Plain)
+	config, err := cobrautil.DescribeFlags(cmd.Flags(), false, cobrautil.Plain)
 	if err != nil {
 		return err
 	}

cmd/forwarder/pac/server/server.go

@@ -18,6 +18,7 @@ import (
 	"github.com/saucelabs/forwarder/log/stdlog"
 	"github.com/saucelabs/forwarder/pac"
 	"github.com/saucelabs/forwarder/runctx"
+	"github.com/saucelabs/forwarder/utils/cobrautil"
 	"github.com/saucelabs/forwarder/utils/osdns"
 	"github.com/spf13/cobra"
 )
@@ -31,7 +32,7 @@ type command struct {
 }
 
 func (c *command) runE(cmd *cobra.Command, _ []string) error {
-	config, err := bind.DescribeFlags(cmd.Flags(), false, bind.Plain)
+	config, err := cobrautil.DescribeFlags(cmd.Flags(), false, cobrautil.Plain)
 	if err != nil {
 		return err
 	}

cmd/forwarder/run/run.go

@@ -21,6 +21,7 @@ import (
 	"github.com/saucelabs/forwarder/log/stdlog"
 	"github.com/saucelabs/forwarder/pac"
 	"github.com/saucelabs/forwarder/runctx"
+	"github.com/saucelabs/forwarder/utils/cobrautil"
 	"github.com/saucelabs/forwarder/utils/osdns"
 	"github.com/spf13/cobra"
 	"go.uber.org/goleak"
@@ -43,7 +44,7 @@ type command struct {
 }
 
 func (c *command) runE(cmd *cobra.Command, _ []string) error {
-	config, err := bind.DescribeFlags(cmd.Flags(), false, bind.Plain)
+	config, err := cobrautil.DescribeFlags(cmd.Flags(), false, cobrautil.Plain)
 	if err != nil {
 		return err
 	}

dialvia/http_test.go

@@ -114,7 +114,7 @@ func TestHTTPProxyDialerDialContext(t *testing.T) {
 
 		done := make(chan struct{})
 		go func() {
-			serveOne(l, func(conn net.Conn) error { //nolint:errcheck // this function always returns nil error
+			serveOne(l, func(conn net.Conn) error {
 				cancel()
 				<-done
 				return nil

bind/describe.go → utils/cobrautil/describe.go

@@ -4,7 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-package bind
+package cobrautil
 
 import (
 	"encoding/json"
@@ -13,6 +13,7 @@ import (
 	"strings"
 
 	"github.com/spf13/pflag"
+	"golang.org/x/exp/maps"
 )
 
 type DescribeFormat int
@@ -24,13 +25,11 @@ const (
 
 func DescribeFlags(fs *pflag.FlagSet, showHidden bool, format DescribeFormat) (string, error) {
 	args := make(map[string]any, fs.NFlag())
-	keys := make([]string, 0, fs.NFlag())
 
 	fs.VisitAll(func(flag *pflag.Flag) {
 		if flag.Name == "help" {
 			return
 		}
-
 		if flag.Hidden && !showHidden {
 			return
 		}
@@ -40,14 +39,12 @@ func DescribeFlags(fs *pflag.FlagSet, showHidden bool, format DescribeFormat) (s
 		} else {
 			args[flag.Name] = strings.Trim(flag.Value.String(), "[]")
 		}
-
-		keys = append(keys, flag.Name)
 	})
 
-	sort.Strings(keys)
-
 	switch format {
 	case Plain:
+		keys := maps.Keys(args)
+		sort.Strings(keys)
 		var b strings.Builder
 		for _, name := range keys {
 			b.WriteString(fmt.Sprintf("%s=%s\n", name, args[name]))