upgrade go to 1.17

.github/workflows/build.yml

@@ -19,7 +19,7 @@ jobs:
       - name: "setup go"
         uses: "actions/setup-go@v2"
         with:
-          go-version: "1.16.4"
+          go-version: "1.17"
       - name: "install python3-pytest"
         run: "sudo apt install -y python3-pytest"
       - name: "make install"

Dockerfile

@@ -1,5 +1,5 @@
 ## build ergo binary
-FROM golang:1.16-alpine3.13 AS build-env
+FROM golang:1.17-alpine AS build-env
 
 RUN apk add -U --force-refresh --no-cache --purge --clean-protected -l -u make
 

go.mod

@@ -1,6 +1,6 @@
 module github.com/ergochat/ergo
 
-go 1.16
+go 1.17
 
 require (
 	code.cloudfoundry.org/bytefmt v0.0.0-20200131002437-cf55d5288a48
@@ -25,6 +25,19 @@ require (
 	gopkg.in/yaml.v2 v2.4.0
 )
 
+require (
+	github.com/tidwall/btree v0.6.0 // indirect
+	github.com/tidwall/gjson v1.8.0 // indirect
+	github.com/tidwall/grect v0.1.2 // indirect
+	github.com/tidwall/match v1.0.3 // indirect
+	github.com/tidwall/pretty v1.1.0 // indirect
+	github.com/tidwall/rtred v0.1.2 // indirect
+	github.com/tidwall/tinyqueue v0.1.1 // indirect
+	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
+	golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 // indirect
+	golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect
+)
+
 replace github.com/gorilla/websocket => github.com/ergochat/websocket v1.4.2-oragono1
 
 replace github.com/xdg-go/scram => github.com/ergochat/scram v1.0.2-ergo1

go.sum

@@ -39,20 +39,12 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/tidwall/btree v0.4.2 h1:aLwwJlG+InuFzdAPuBf9YCAR1LvSQ9zhC5aorFPlIPs=
-github.com/tidwall/btree v0.4.2/go.mod h1:huei1BkDWJ3/sLXmO+bsCNELL+Bp2Kks9OLyQFkzvA8=
 github.com/tidwall/btree v0.6.0 h1:JLYAFGV+1gjyFi3iQbO/fupBin+Ooh7dxqVV0twJ1Bo=
 github.com/tidwall/btree v0.6.0/go.mod h1:TzIRzen6yHbibdSfK6t8QimqbUnoxUSrZfeW7Uob0q4=
-github.com/tidwall/buntdb v1.2.3 h1:AoGVe4yrhKmnEPHrPrW5EUOATHOCIk4VtFvd8xn/ZtU=
-github.com/tidwall/buntdb v1.2.3/go.mod h1:+i/gBwYOHWG19wLgwMXFLkl00twh9+VWkkaOhuNQ4PA=
 github.com/tidwall/buntdb v1.2.6 h1:eS0QSmzHfCKjxxYGh8eH6wnK5VLsJ7UjyyIr29JmnEg=
 github.com/tidwall/buntdb v1.2.6/go.mod h1:zpXqlA5D2772I4cTqV3ifr2AZihDgi8FV7xAQu6edfc=
-github.com/tidwall/gjson v1.7.4 h1:19cchw8FOxkG5mdLRkGf9jqIqEyqdZhPqW60XfyFxk8=
-github.com/tidwall/gjson v1.7.4/go.mod h1:5/xDoumyyDNerp2U36lyolv46b3uF/9Bu6OfyQ9GImk=
 github.com/tidwall/gjson v1.8.0 h1:Qt+orfosKn0rbNTZqHYDqBrmm3UDA4KRkv70fDzG+PQ=
 github.com/tidwall/gjson v1.8.0/go.mod h1:5/xDoumyyDNerp2U36lyolv46b3uF/9Bu6OfyQ9GImk=
-github.com/tidwall/grect v0.1.1 h1:+kMEkxhoqB7rniVXzMEIA66XwU07STgINqxh+qVIndY=
-github.com/tidwall/grect v0.1.1/go.mod h1:CzvbGiFbWUwiJ1JohXLb28McpyBsI00TK9Y6pDWLGRQ=
 github.com/tidwall/grect v0.1.2 h1:wKVeQVZhjaFCKTTlpkDe3Ex4ko3cMGW3MRKawRe8uQ4=
 github.com/tidwall/grect v0.1.2/go.mod h1:v+n4ewstPGduVJebcp5Eh2WXBJBumNzyhK8GZt4gHNw=
 github.com/tidwall/lotsa v1.0.2 h1:dNVBH5MErdaQ/xd9s769R31/n2dXavsQ0Yf4TMEHHw8=

irc/signals.go

@@ -1,3 +1,4 @@
+//go:build !plan9
 // +build !plan9
 
 // Copyright (c) 2020 Shivaram Lingamneni

irc/signals_plan9.go

@@ -1,3 +1,4 @@
+//go:build plan9
 // +build plan9
 
 // Copyright (c) 2020 Shivaram Lingamneni

irc/utils/net_linux.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package utils

irc/utils/net_nonlinux.go

@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 package utils

vendor/github.com/go-sql-driver/mysql/go.mod

@@ -1,3 +0,0 @@
-module github.com/go-sql-driver/mysql
-
-go 1.10

vendor/github.com/gorilla/websocket/go.mod

@@ -1,3 +0,0 @@
-module github.com/gorilla/websocket
-
-go 1.12

vendor/github.com/tidwall/btree/go.mod

@@ -1,3 +0,0 @@
-module github.com/tidwall/btree
-
-go 1.16

vendor/github.com/tidwall/buntdb/go.mod

@@ -1,12 +0,0 @@
-module github.com/tidwall/buntdb
-
-go 1.16
-
-require (
-	github.com/tidwall/btree v0.6.0
-	github.com/tidwall/gjson v1.8.0
-	github.com/tidwall/grect v0.1.2
-	github.com/tidwall/lotsa v1.0.2
-	github.com/tidwall/match v1.0.3
-	github.com/tidwall/rtred v0.1.2
-)

vendor/github.com/tidwall/buntdb/go.sum

@@ -1,16 +0,0 @@
-github.com/tidwall/btree v0.6.0 h1:JLYAFGV+1gjyFi3iQbO/fupBin+Ooh7dxqVV0twJ1Bo=
-github.com/tidwall/btree v0.6.0/go.mod h1:TzIRzen6yHbibdSfK6t8QimqbUnoxUSrZfeW7Uob0q4=
-github.com/tidwall/gjson v1.8.0 h1:Qt+orfosKn0rbNTZqHYDqBrmm3UDA4KRkv70fDzG+PQ=
-github.com/tidwall/gjson v1.8.0/go.mod h1:5/xDoumyyDNerp2U36lyolv46b3uF/9Bu6OfyQ9GImk=
-github.com/tidwall/grect v0.1.2 h1:wKVeQVZhjaFCKTTlpkDe3Ex4ko3cMGW3MRKawRe8uQ4=
-github.com/tidwall/grect v0.1.2/go.mod h1:v+n4ewstPGduVJebcp5Eh2WXBJBumNzyhK8GZt4gHNw=
-github.com/tidwall/lotsa v1.0.2 h1:dNVBH5MErdaQ/xd9s769R31/n2dXavsQ0Yf4TMEHHw8=
-github.com/tidwall/lotsa v1.0.2/go.mod h1:X6NiU+4yHA3fE3Puvpnn1XMDrFZrE9JO2/w+UMuqgR8=
-github.com/tidwall/match v1.0.3 h1:FQUVvBImDutD8wJLN6c5eMzWtjgONK9MwIBCOrUJKeE=
-github.com/tidwall/match v1.0.3/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
-github.com/tidwall/pretty v1.1.0 h1:K3hMW5epkdAVwibsQEfR/7Zj0Qgt4DxtNumTq/VloO8=
-github.com/tidwall/pretty v1.1.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
-github.com/tidwall/rtred v0.1.2 h1:exmoQtOLvDoO8ud++6LwVsAMTu0KPzLTUrMln8u1yu8=
-github.com/tidwall/rtred v0.1.2/go.mod h1:hd69WNXQ5RP9vHd7dqekAz+RIdtfBogmglkZSRxCHFQ=
-github.com/tidwall/tinyqueue v0.1.1 h1:SpNEvEggbpyN5DIReaJ2/1ndroY8iyEGxPYxoSaymYE=
-github.com/tidwall/tinyqueue v0.1.1/go.mod h1:O/QNHwrnjqr6IHItYrzoHAKYhBkLI67Q096fQP5zMYw=

vendor/github.com/tidwall/gjson/go.mod

@@ -1,8 +0,0 @@
-module github.com/tidwall/gjson
-
-go 1.12
-
-require (
-	github.com/tidwall/match v1.0.3
-	github.com/tidwall/pretty v1.1.0
-)

vendor/github.com/tidwall/gjson/go.sum

@@ -1,4 +0,0 @@
-github.com/tidwall/match v1.0.3 h1:FQUVvBImDutD8wJLN6c5eMzWtjgONK9MwIBCOrUJKeE=
-github.com/tidwall/match v1.0.3/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
-github.com/tidwall/pretty v1.1.0 h1:K3hMW5epkdAVwibsQEfR/7Zj0Qgt4DxtNumTq/VloO8=
-github.com/tidwall/pretty v1.1.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=

vendor/github.com/tidwall/grect/go.mod

@@ -1,5 +0,0 @@
-module github.com/tidwall/grect
-
-go 1.15
-
-require github.com/tidwall/gjson v1.8.0

vendor/github.com/tidwall/grect/go.sum

@@ -1,6 +0,0 @@
-github.com/tidwall/gjson v1.8.0 h1:Qt+orfosKn0rbNTZqHYDqBrmm3UDA4KRkv70fDzG+PQ=
-github.com/tidwall/gjson v1.8.0/go.mod h1:5/xDoumyyDNerp2U36lyolv46b3uF/9Bu6OfyQ9GImk=
-github.com/tidwall/match v1.0.3 h1:FQUVvBImDutD8wJLN6c5eMzWtjgONK9MwIBCOrUJKeE=
-github.com/tidwall/match v1.0.3/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
-github.com/tidwall/pretty v1.1.0 h1:K3hMW5epkdAVwibsQEfR/7Zj0Qgt4DxtNumTq/VloO8=
-github.com/tidwall/pretty v1.1.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=

vendor/github.com/tidwall/match/go.mod

@@ -1,3 +0,0 @@
-module github.com/tidwall/match
-
-go 1.15

vendor/github.com/tidwall/rtred/go.mod

@@ -1,5 +0,0 @@
-module github.com/tidwall/rtred
-
-go 1.15
-
-require github.com/tidwall/tinyqueue v0.1.1

vendor/github.com/tidwall/rtred/go.sum

@@ -1,2 +0,0 @@
-github.com/tidwall/tinyqueue v0.1.1 h1:SpNEvEggbpyN5DIReaJ2/1ndroY8iyEGxPYxoSaymYE=
-github.com/tidwall/tinyqueue v0.1.1/go.mod h1:O/QNHwrnjqr6IHItYrzoHAKYhBkLI67Q096fQP5zMYw=

vendor/github.com/tidwall/tinyqueue/go.mod

@@ -1,3 +0,0 @@
-module github.com/tidwall/tinyqueue
-
-go 1.15

vendor/github.com/xdg-go/pbkdf2/go.mod

@@ -1,3 +0,0 @@
-module github.com/xdg-go/pbkdf2
-
-go 1.9

vendor/github.com/xdg-go/scram/go.mod

@@ -1,8 +0,0 @@
-module github.com/xdg-go/scram
-
-go 1.11
-
-require (
-	github.com/xdg-go/pbkdf2 v1.0.0
-	github.com/xdg-go/stringprep v1.0.2
-)

vendor/github.com/xdg-go/scram/go.sum

@@ -1,7 +0,0 @@
-github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c=
-github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
-github.com/xdg-go/stringprep v1.0.2 h1:6iq84/ryjjeRmMJwxutI51F2GIPlP5BfTvXHeYjyhBc=
-github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM=
-golang.org/x/text v0.3.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ=
-golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

vendor/golang.org/x/term/go.mod

@@ -1,5 +0,0 @@
-module golang.org/x/term
-
-go 1.11
-
-require golang.org/x/sys v0.0.0-20201119102817-f84b799fce68

vendor/golang.org/x/term/go.sum

@@ -1,2 +0,0 @@
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 h1:nxC68pudNYkKU6jWhgrqdreuFiOQWj1Fs7T3VrH4Pjw=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

vendor/gopkg.in/yaml.v2/go.mod

@@ -1,5 +0,0 @@
-module gopkg.in/yaml.v2
-
-go 1.15
-
-require gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405

vendor/modules.txt

@@ -17,74 +17,84 @@ github.com/ergochat/confusables
 ## explicit
 github.com/ergochat/go-ident
 # github.com/ergochat/irc-go v0.0.0-20210617222258-256f1601d3ce
-## explicit
+## explicit; go 1.15
 github.com/ergochat/irc-go/ircfmt
 github.com/ergochat/irc-go/ircmsg
 github.com/ergochat/irc-go/ircreader
 github.com/ergochat/irc-go/ircutils
 # github.com/go-sql-driver/mysql v1.6.0
-## explicit
+## explicit; go 1.10
 github.com/go-sql-driver/mysql
 # github.com/go-test/deep v1.0.6
-## explicit
+## explicit; go 1.13
 # github.com/golang-jwt/jwt v3.2.1+incompatible
 ## explicit
 github.com/golang-jwt/jwt
 # github.com/gorilla/websocket v1.4.2 => github.com/ergochat/websocket v1.4.2-oragono1
-## explicit
+## explicit; go 1.12
 github.com/gorilla/websocket
 # github.com/okzk/sdnotify v0.0.0-20180710141335-d9becc38acbd
 ## explicit
 github.com/okzk/sdnotify
 # github.com/onsi/ginkgo v1.12.0
-## explicit
+## explicit; go 1.12
 # github.com/onsi/gomega v1.9.0
 ## explicit
 # github.com/stretchr/testify v1.4.0
 ## explicit
 # github.com/tidwall/btree v0.6.0
+## explicit; go 1.16
 github.com/tidwall/btree
 # github.com/tidwall/buntdb v1.2.6
-## explicit
+## explicit; go 1.16
 github.com/tidwall/buntdb
 # github.com/tidwall/gjson v1.8.0
+## explicit; go 1.12
 github.com/tidwall/gjson
 # github.com/tidwall/grect v0.1.2
+## explicit; go 1.15
 github.com/tidwall/grect
 # github.com/tidwall/match v1.0.3
+## explicit; go 1.15
 github.com/tidwall/match
 # github.com/tidwall/pretty v1.1.0
+## explicit
 github.com/tidwall/pretty
 # github.com/tidwall/rtred v0.1.2
+## explicit; go 1.15
 github.com/tidwall/rtred
 github.com/tidwall/rtred/base
 # github.com/tidwall/tinyqueue v0.1.1
+## explicit; go 1.15
 github.com/tidwall/tinyqueue
 # github.com/toorop/go-dkim v0.0.0-20201103131630-e1cd1a0a5208
 ## explicit
 github.com/toorop/go-dkim
 # github.com/xdg-go/pbkdf2 v1.0.0
+## explicit; go 1.9
 github.com/xdg-go/pbkdf2
 # github.com/xdg-go/scram v1.0.2 => github.com/ergochat/scram v1.0.2-ergo1
-## explicit
+## explicit; go 1.11
 github.com/xdg-go/scram
 # golang.org/x/crypto v0.0.0-20210415154028-4f45737414dc
-## explicit
+## explicit; go 1.11
 golang.org/x/crypto/bcrypt
 golang.org/x/crypto/blowfish
 golang.org/x/crypto/pbkdf2
 golang.org/x/crypto/sha3
 golang.org/x/crypto/ssh/terminal
 # golang.org/x/sys v0.0.0-20201119102817-f84b799fce68
+## explicit; go 1.12
 golang.org/x/sys/cpu
 golang.org/x/sys/internal/unsafeheader
 golang.org/x/sys/plan9
 golang.org/x/sys/unix
 golang.org/x/sys/windows
 # golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1
+## explicit; go 1.11
 golang.org/x/term
 # golang.org/x/text v0.3.6
-## explicit
+## explicit; go 1.11
 golang.org/x/text/cases
 golang.org/x/text/internal
 golang.org/x/text/internal/language
@@ -99,7 +109,7 @@ golang.org/x/text/unicode/bidi
 golang.org/x/text/unicode/norm
 golang.org/x/text/width
 # gopkg.in/yaml.v2 v2.4.0
-## explicit
+## explicit; go 1.15
 gopkg.in/yaml.v2
 # github.com/gorilla/websocket => github.com/ergochat/websocket v1.4.2-oragono1
 # github.com/xdg-go/scram => github.com/ergochat/scram v1.0.2-ergo1