Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: use io and os instead of ioutil #279

Merged
merged 5 commits into from
Sep 27, 2023
Merged

fix: use io and os instead of ioutil #279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
eb49e28
fix: version to work with 1.20
SputNikPlop Sep 26, 2023
c17f657
fix: api ioutil
SputNikPlop Sep 26, 2023
4e78b4e
fix: missed test
SputNikPlop Sep 26, 2023
512dba5
fix: events
SputNikPlop Sep 26, 2023
ba7d08a
fix: login and redundant array
SputNikPlop Sep 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmd/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ package cmd

import (
"fmt"
"io/ioutil"
"log"
"os"
"strings"

"github.com/twitchdev/twitch-cli/internal/api"
Expand Down Expand Up @@ -136,7 +136,7 @@ func cmdRun(cmd *cobra.Command, args []string) error {
}

func getBodyFromFile(filename string) (string, error) {
content, err := ioutil.ReadFile(filename)
content, err := os.ReadFile(filename)
if err != nil {
return "", err
}
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ require (
github.com/mattn/go-sqlite3 v1.14.7
github.com/spf13/cobra v1.1.3
github.com/spf13/viper v1.7.1
github.com/stretchr/testify v1.7.0
github.com/stretchr/testify v1.8.4
golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6
)

Expand Down Expand Up @@ -39,5 +39,5 @@ require (
golang.org/x/text v0.7.0 // indirect
gopkg.in/ini.v1 v1.62.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20220521103104-8f96da9f5d5e // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
4 changes: 4 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,8 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
Expand Down Expand Up @@ -380,6 +382,8 @@ gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.0-20220521103104-8f96da9f5d5e h1:3i3ny04XV6HbZ2N1oIBw1UBYATHAOpo4tfTF83JM3Z0=
gopkg.in/yaml.v3 v3.0.0-20220521103104-8f96da9f5d5e/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
Expand Down
4 changes: 2 additions & 2 deletions internal/api/api_request.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package api
import (
"bytes"
"fmt"
"io/ioutil"
"io"
"net/http"
"time"

Expand Down Expand Up @@ -49,7 +49,7 @@ func apiRequest(method string, url string, payload []byte, p apiRequestParameter
return apiRequestResponse{}, err
}

body, err := ioutil.ReadAll(resp.Body)
body, err := io.ReadAll(resp.Body)

defer resp.Body.Close()

Expand Down
4 changes: 2 additions & 2 deletions internal/api/api_request_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
package api

import (
"io/ioutil"
"io"
"net/http"
"net/http/httptest"
"testing"
Expand All @@ -21,7 +21,7 @@ func TestApiRequest(t *testing.T) {
a.Equal("1234", r.Header.Get("Client-ID"), "Client ID invalid.")
a.Equal("Bearer 4567", r.Header.Get("Authorization"), "Token invalid.")

_, err := ioutil.ReadAll(r.Body)
_, err := io.ReadAll(r.Body)
a.Nil(err)
}))

Expand Down
6 changes: 3 additions & 3 deletions internal/api/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
package api

import (
"io/ioutil"
"io"
"net/http"
"net/http/httptest"
"testing"
Expand All @@ -21,7 +21,7 @@ func TestNewClient(t *testing.T) {
w.WriteHeader(http.StatusOK)
w.Write([]byte(ok))

_, err := ioutil.ReadAll(r.Body)
_, err := io.ReadAll(r.Body)
a.Nil(err)

}))
Expand All @@ -33,7 +33,7 @@ func TestNewClient(t *testing.T) {
resp, err := c.Do(req)
a.Nil(err)

body, err := ioutil.ReadAll(resp.Body)
body, err := io.ReadAll(resp.Body)
defer resp.Body.Close()
a.NoError(err)
a.Equal(ok, string(body), "Body mismatch")
Expand Down
4 changes: 2 additions & 2 deletions internal/events/trigger/forward_event_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"crypto/hmac"
"crypto/sha256"
"fmt"
"io/ioutil"
"io"
"net/http"
"net/http/httptest"
"testing"
Expand All @@ -29,7 +29,7 @@ func TestForwardEventEventsub(t *testing.T) {
a.NotEmpty(r.Header.Get("Twitch-Eventsub-Subscription-Type"))
a.NotEmpty(r.Header.Get("Twitch-Eventsub-Message-Id"))

body, err := ioutil.ReadAll(r.Body)
body, err := io.ReadAll(r.Body)
a.Nil(err)
a.NotNil(body)

Expand Down
4 changes: 2 additions & 2 deletions internal/events/trigger/retrigger_event_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package trigger

import (
"encoding/json"
"io/ioutil"
"io"
"log"
"net/http"
"net/http/httptest"
Expand All @@ -19,7 +19,7 @@ func TestRefireEvent(t *testing.T) {
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(http.StatusAccepted)

_, err := ioutil.ReadAll(r.Body)
_, err := io.ReadAll(r.Body)
a.Nil(err)
}))
defer ts.Close()
Expand Down
4 changes: 2 additions & 2 deletions internal/events/trigger/trigger_event.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"encoding/json"
"errors"
"fmt"
"io/ioutil"
"io"
"net/rpc"
"strings"
"time"
Expand Down Expand Up @@ -202,7 +202,7 @@ https://dev.twitch.tv/docs/eventsub/handling-webhook-events#processing-an-event`
}
defer resp.Body.Close()

body, err := ioutil.ReadAll(resp.Body)
body, err := io.ReadAll(resp.Body)
if err != nil {
return "", err
}
Expand Down
4 changes: 2 additions & 2 deletions internal/events/trigger/trigger_event_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
package trigger

import (
"io/ioutil"
"io"
"net/http"
"net/http/httptest"
"testing"
Expand All @@ -17,7 +17,7 @@ func TestFire(t *testing.T) {
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(http.StatusAccepted)

_, err := ioutil.ReadAll(r.Body)
_, err := io.ReadAll(r.Body)
a.Nil(err)
}))
defer ts.Close()
Expand Down
4 changes: 2 additions & 2 deletions internal/events/verify/subscription_verify.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package verify
import (
"encoding/json"
"fmt"
"io/ioutil"
"io"
"mime"
"net/http"
"net/url"
Expand Down Expand Up @@ -86,7 +86,7 @@ func VerifyWebhookSubscription(p VerifyParameters) (VerifyResponse, error) {
}
defer resp.Body.Close()

body, err := ioutil.ReadAll(resp.Body)
body, err := io.ReadAll(resp.Body)
if err != nil {
return VerifyResponse{}, err
}
Expand Down
4 changes: 2 additions & 2 deletions internal/events/verify/subscription_verify_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package verify

import (
"encoding/json"
"io/ioutil"
"io"
"net/http"
"net/http/httptest"
"testing"
Expand All @@ -20,7 +20,7 @@ func TestSubscriptionVerify(t *testing.T) {
var challenge string
w.WriteHeader(http.StatusAccepted)

body, err := ioutil.ReadAll(r.Body)
body, err := io.ReadAll(r.Body)
a.Nil(err)

if r.Method == http.MethodPost {
Expand Down
2 changes: 1 addition & 1 deletion internal/login/login.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ func ValidateCredentials(p LoginParameters) (ValidateResponse, error) {
}

resp, err := loginRequestWithHeaders(http.MethodGet, u.String(), nil, []loginHeader{
loginHeader{
{
Key: "Authorization",
Value: "OAuth " + p.Token,
},
Expand Down
3 changes: 1 addition & 2 deletions internal/login/login_request.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ package login

import (
"io"
"io/ioutil"
"net/http"
"time"

Expand Down Expand Up @@ -40,7 +39,7 @@ func loginRequestWithHeaders(method string, url string, payload io.Reader, heade
return loginRequestResponse{}, err
}

body, err := ioutil.ReadAll(resp.Body)
body, err := io.ReadAll(resp.Body)

defer resp.Body.Close()

Expand Down
4 changes: 2 additions & 2 deletions internal/login/login_request_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
package login

import (
"io/ioutil"
"io"
"net/http"
"net/http/httptest"
"testing"
Expand All @@ -19,7 +19,7 @@ func TestLoginRequest(t *testing.T) {
w.WriteHeader(http.StatusOK)
w.Write([]byte(ok))

_, err := ioutil.ReadAll(r.Body)
_, err := io.ReadAll(r.Body)
a.Nil(err)

}))
Expand Down