Upgrade to Go 1.20.3

go.mod

@@ -8,6 +8,7 @@ require (
 	github.com/smartystreets/goconvey v1.7.2
 	golang.org/x/sync v0.1.0
 	golang.org/x/term v0.7.0
+	golang.org/x/tools v0.0.0-20190328211700-ab21143f2384
 )
 
 require (

go.sum

@@ -20,4 +20,5 @@ golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.7.0 h1:BEvjmm5fURWqcfbSKTdpkDXYBrUS1c0m8agp14W48vQ=
 golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/tools v0.0.0-20190328211700-ab21143f2384 h1:TFlARGu6Czu1z7q93HTxcP1P+/ZFC/IKythI5RzrnRg=
 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=

internal/dnsmasq/dnsmasq_test.go

@@ -5,7 +5,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"path/filepath"
 	"testing"
 
@@ -32,7 +31,7 @@ func TestConfigFile(t *testing.T) {
 						Printf("cannot open configuration file %s!", f)
 					}
 
-					b, _ = ioutil.ReadAll(r)
+					b, _ = io.ReadAll(r)
 					c := make(Conf)
 					ip := "0.0.0.0"
 					So(c.Parse(&Mapping{Contents: b}), ShouldBeNil)

internal/edgeos/config_test.go

@@ -396,7 +396,7 @@ func TestReadCfg(t *testing.T) {
 			Printf("cannot open configuration file %s!", f)
 		}
 
-		b, _ = ioutil.ReadAll(r)
+		b, _ = io.ReadAll(r)
 
 		Convey("Testing with a configuration loaded from a file", func() {
 			act := NewConfig().Blacklist(&CFGstatic{Cfg: string(b)})

internal/edgeos/content_test.go

@@ -38,7 +38,7 @@ func (d *dummyConfig) ProcessContent(cts ...Contenter) error {
 			src.ctr.Lock()
 			src.ctr.stat[area] = tally
 			src.ctr.Unlock()
-			b, _ := ioutil.ReadAll(src.process().r)
+			b, _ := io.ReadAll(src.process().r)
 			d.s = append(d.s, strings.TrimSuffix(string(b), "\n"))
 		}
 	}
@@ -902,7 +902,7 @@ address=/really.bad.phishing.site.ru/10.10.10.10
 						reader, err := GetFile(tt.f)
 						So(err, ShouldBeNil)
 
-						act, err := ioutil.ReadAll(reader)
+						act, err := io.ReadAll(reader)
 						So(err, ShouldBeNil)
 
 						Convey("Testing "+tt.name+" ProcessContent(): file data should match expected", func() {

internal/edgeos/data.go

@@ -14,8 +14,9 @@ import (
 // ntype for labeling blacklist source types
 type ntype int
 
-//go:generate go run golang.org/x/tools/cmd/stringer -type=ntype
 // ntype label blacklist source types
+//
+//go:generate go run golang.org/x/tools/cmd/stringer -type=ntype
 const (
 	unknown ntype = iota // denotes a coding error
 	domn                 // Format type e.g. address=/d.com/0.0.0.0

internal/edgeos/data_test.go

@@ -5,7 +5,6 @@ import (
 	"bytes"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"math/rand"
 	"sort"
 	"strings"
@@ -91,7 +90,7 @@ func TestFormatData(t *testing.T) {
 
 			sort.Strings(lines)
 			expBytes = []byte(strings.Join(lines, ""))
-			actBytes, err := ioutil.ReadAll(formatData(fmttr, actList))
+			actBytes, err := io.ReadAll(formatData(fmttr, actList))
 
 			So(err, ShouldBeNil)
 			So(actBytes, ShouldResemble, expBytes)

internal/edgeos/http.go

@@ -3,7 +3,7 @@ package edgeos
 import (
 	"bytes"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 )
 
@@ -33,7 +33,7 @@ func download(s *source) *source {
 		return s
 	}
 
-	body, err = ioutil.ReadAll(resp.Body)
+	body, err = io.ReadAll(resp.Body)
 
 	if len(body) < 1 {
 		str := fmt.Sprintf("No data returned for %s", s.url)

internal/edgeos/http_test.go

@@ -2,7 +2,7 @@ package edgeos
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/http/httptest"
 	"net/url"
@@ -70,7 +70,7 @@ func TestGetHTTP(t *testing.T) {
 				fmt.Printf("Test: %v, error: %v\n", i, o.err)
 			}
 
-			act, err := ioutil.ReadAll(o.r)
+			act, err := io.ReadAll(o.r)
 			So(err, ShouldBeNil)
 
 			So(string(act), ShouldEqual, tt.exp)
@@ -103,7 +103,7 @@ func TestMyHandler(t *testing.T) {
 			So(resp.StatusCode, ShouldEqual, 200)
 
 			exp := fmt.Sprintf("Visitor count: %d.", i)
-			act, err := ioutil.ReadAll(resp.Body)
+			act, err := io.ReadAll(resp.Body)
 			So(err, ShouldBeNil)
 			So(string(act), ShouldEqual, exp)
 		}

internal/edgeos/io_test.go

@@ -2,6 +2,7 @@ package edgeos
 
 import (
 	"fmt"
+	"io"
 	"io/ioutil"
 	"os"
 	"testing"
@@ -24,7 +25,7 @@ func TestLoad(t *testing.T) {
 		So(err, ShouldNotBeNil)
 
 		r := CFGcli{Config: c}
-		act, err := ioutil.ReadAll(r.read())
+		act, err := io.ReadAll(r.read())
 		So(err, ShouldBeNil)
 		So(string(act), ShouldEqual, "")
 

internal/edgeos/tools.go

@@ -0,0 +1,8 @@
+//go:build tools
+// +build tools
+
+package edgeos
+
+import (
+	_ "golang.org/x/tools/cmd/stringer"
+)

internal/regx/regx.go

@@ -12,8 +12,9 @@ import (
 // Leaf is a config label
 type Leaf int
 
-//ggo:generate go run golang.org/x/tools/cmd/stringer -type=Leaf
 // Leaf label regx map keys
+//
+//ggo:generate go run golang.org/x/tools/cmd/stringer -type=Leaf
 const (
 	CMNT Leaf = iota + 1000
 	DESC

main_test.go

@@ -5,7 +5,6 @@ import (
 	"errors"
 	"flag"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path"
 	"path/filepath"
@@ -35,7 +34,7 @@ var update = flag.Bool("update", false, "update .golden files")
 
 func readGolden(t *testing.T, name string) []byte {
 	path := filepath.Join("testdata", name+".golden") // relative path
-	bytes, err := ioutil.ReadFile(path)
+	bytes, err := os.ReadFile(path)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -45,7 +44,7 @@ func readGolden(t *testing.T, name string) []byte {
 func writeGolden(t *testing.T, actual []byte, name string) error {
 	golden := filepath.Join("testdata", name+".golden")
 	if *update {
-		return ioutil.WriteFile(golden, actual, 0o644)
+		return os.WriteFile(golden, actual, 0o644)
 	}
 	return nil
 }

opts.go

@@ -3,7 +3,6 @@ package main
 import (
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"runtime"
 	"strings"
@@ -59,7 +58,7 @@ func (o *opts) getCFG(c *e.Config) e.ConfLoader {
 			logFatalf("cannot open configuration file %s!", *o.File)
 		}
 
-		if f, err = ioutil.ReadAll(r); err != nil {
+		if f, err = io.ReadAll(r); err != nil {
 			logFatalf("cannot read configuration file %s!", *o.File)
 		}
 		return &e.CFGstatic{Config: c, Cfg: string(f)}