Skip to content

Commit 6907dbb

Browse files
author
Derek Duncan
committed
remove deprecated ioutil
1 parent b1c5727 commit 6907dbb

File tree

57 files changed

+149
-125
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+149
-125
lines changed

‎go.mod‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ go 1.18
44

55
require (
66
github.com/go-chi/chi/v5 v5.1.0
7+
github.com/golang-jwt/jwt/v4 v4.5.1
78
github.com/golang-jwt/jwt/v5 v5.2.1
89
github.com/gorilla/mux v1.6.2
910
github.com/gorilla/pat v0.0.0-20180118222023-199c85a7f6d1
@@ -34,6 +35,7 @@ require (
3435
github.com/pkg/errors v0.9.1 // indirect
3536
github.com/pmezard/go-difflib v1.0.0 // indirect
3637
github.com/rogpeppe/go-internal v1.12.0 // indirect
38+
github.com/stretchr/objx v0.5.2 // indirect
3739
golang.org/x/crypto v0.21.0 // indirect
3840
google.golang.org/appengine v1.6.8 // indirect
3941
google.golang.org/protobuf v1.32.0 // indirect

‎go.sum‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ github.com/go-chi/chi/v5 v5.1.0 h1:acVI1TYaD+hhedDJ3r54HyA6sExp3HfXq7QWEEY/xMw=
1313
github.com/go-chi/chi/v5 v5.1.0/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
1414
github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
1515
github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
16+
github.com/golang-jwt/jwt/v4 v4.5.1 h1:JdqV9zKUdtaa9gdPlywC3aeoEsR681PlKC+4F5gQgeo=
17+
github.com/golang-jwt/jwt/v4 v4.5.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
1618
github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk=
1719
github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
1820
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
@@ -68,6 +70,7 @@ github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99
6870
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
6971
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
7072
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
73+
github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
7174
github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
7275
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
7376
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=

‎gothic/gothic.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"errors"
1717
"fmt"
1818
"io"
19-
"io/ioutil"
19+
2020
"net/http"
2121
"net/url"
2222
"os"
@@ -347,7 +347,7 @@ func getSessionValue(session *sessions.Session, key string) (string, error) {
347347
if err != nil {
348348
return "", err
349349
}
350-
s, err := ioutil.ReadAll(r)
350+
s, err := io.ReadAll(r)
351351
if err != nil {
352352
return "", err
353353
}

‎gothic/gothic_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ import (
55
"compress/gzip"
66
"fmt"
77
"html"
8-
"io/ioutil"
8+
"io"
9+
910
"net/http"
1011
"net/http/httptest"
1112
"net/url"
@@ -283,7 +284,7 @@ func ungzipString(value string) string {
283284
if err != nil {
284285
return "err"
285286
}
286-
s, err := ioutil.ReadAll(r)
287+
s, err := io.ReadAll(r)
287288
if err != nil {
288289
return "err"
289290
}

‎providers/amazon/amazon.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"encoding/json"
88
"fmt"
99
"io"
10-
"io/ioutil"
10+
1111
"net/http"
1212
"net/url"
1313

@@ -95,7 +95,7 @@ func (p *Provider) FetchUser(session goth.Session) (goth.User, error) {
9595
return user, fmt.Errorf("%s responded with a %d trying to fetch user information", p.providerName, response.StatusCode)
9696
}
9797

98-
bits, err := ioutil.ReadAll(response.Body)
98+
bits, err := io.ReadAll(response.Body)
9999
if err != nil {
100100
return user, err
101101
}

‎providers/azureadv2/azureadv2.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"encoding/json"
55
"fmt"
66
"io"
7-
"io/ioutil"
7+
88
"net/http"
99

1010
"github.com/markbates/goth"
@@ -199,7 +199,7 @@ func userFromReader(r io.Reader, user *goth.User) error {
199199
UserPrincipalName string `json:"userPrincipalName"` // The user's principal name.
200200
}{}
201201

202-
userBytes, err := ioutil.ReadAll(r)
202+
userBytes, err := io.ReadAll(r)
203203
if err != nil {
204204
return err
205205
}

‎providers/battlenet/battlenet.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ import (
66
"bytes"
77
"encoding/json"
88
"fmt"
9-
"io/ioutil"
9+
"io"
10+
1011
"net/http"
1112

1213
"github.com/markbates/goth"
@@ -103,7 +104,7 @@ func (p *Provider) FetchUser(session goth.Session) (goth.User, error) {
103104
return user, fmt.Errorf("%s responded with a %d trying to fetch user information", p.providerName, response.StatusCode)
104105
}
105106

106-
bits, err := ioutil.ReadAll(response.Body)
107+
bits, err := io.ReadAll(response.Body)
107108
if err != nil {
108109
return user, err
109110
}

‎providers/bitbucket/bitbucket.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ import (
55
"bytes"
66
"encoding/json"
77
"fmt"
8-
"io/ioutil"
8+
"io"
9+
910
"net/http"
1011

1112
"github.com/markbates/goth"
@@ -134,7 +135,7 @@ func (p *Provider) getUserInfo(user *goth.User, sess *Session) error {
134135
return fmt.Errorf("%s responded with a %d trying to fetch user information", p.providerName, response.StatusCode)
135136
}
136137

137-
bits, err := ioutil.ReadAll(response.Body)
138+
bits, err := io.ReadAll(response.Body)
138139
if err != nil {
139140
return err
140141
}

‎providers/bitly/bitly.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"errors"
99
"fmt"
1010
"io"
11-
"io/ioutil"
11+
1212
"net/http"
1313

1414
"github.com/markbates/goth"
@@ -97,7 +97,7 @@ func (p *Provider) FetchUser(session goth.Session) (goth.User, error) {
9797
}
9898
defer resp.Body.Close()
9999

100-
buf, err := ioutil.ReadAll(resp.Body)
100+
buf, err := io.ReadAll(resp.Body)
101101
if err != nil {
102102
return u, err
103103
}

‎providers/classlink/provider.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ import (
44
"encoding/json"
55
"errors"
66
"fmt"
7-
"io/ioutil"
7+
"io"
8+
89
"net/http"
910

1011
"github.com/markbates/goth"
@@ -102,7 +103,7 @@ func (p Provider) FetchUser(session goth.Session) (goth.User, error) {
102103

103104
defer resp.Body.Close()
104105

105-
bytes, err := ioutil.ReadAll(resp.Body)
106+
bytes, err := io.ReadAll(resp.Body)
106107
if err != nil {
107108
return user, err
108109
}

0 commit comments

Comments
 (0)