diff --git a/middlewares/custom/wakatime.go b/middlewares/custom/wakatime.go index 9e9e0ae..903f426 100644 --- a/middlewares/custom/wakatime.go +++ b/middlewares/custom/wakatime.go @@ -14,7 +14,6 @@ import ( routeutils "github.com/muety/wakapi/routes/utils" "github.com/patrickmn/go-cache" "io" - "io/ioutil" "net/http" "time" ) @@ -67,9 +66,9 @@ func (m *WakatimeRelayMiddleware) ServeHTTP(w http.ResponseWriter, r *http.Reque return } - body, _ := ioutil.ReadAll(r.Body) + body, _ := io.ReadAll(r.Body) r.Body.Close() - r.Body = ioutil.NopCloser(bytes.NewBuffer(body)) + r.Body = io.NopCloser(bytes.NewBuffer(body)) // prevent cycles downstreamInstanceId := ownInstanceId @@ -149,12 +148,12 @@ func (m *WakatimeRelayMiddleware) filterByCache(r *http.Request) error { return err } - body, _ := ioutil.ReadAll(r.Body) + body, _ := io.ReadAll(r.Body) r.Body.Close() - r.Body = ioutil.NopCloser(bytes.NewBuffer(body)) + r.Body = io.NopCloser(bytes.NewBuffer(body)) var rawData interface{} - if err := json.NewDecoder(ioutil.NopCloser(bytes.NewBuffer(body))).Decode(&rawData); err != nil { + if err := json.NewDecoder(io.NopCloser(bytes.NewBuffer(body))).Decode(&rawData); err != nil { return err } @@ -190,7 +189,7 @@ func (m *WakatimeRelayMiddleware) filterByCache(r *http.Request) error { if err := json.NewEncoder(&buf).Encode(newData); err != nil { return err } - r.Body = ioutil.NopCloser(&buf) + r.Body = io.NopCloser(&buf) return nil } diff --git a/routes/api/badge_test.go b/routes/api/badge_test.go index d6e4c63..7316509 100644 --- a/routes/api/badge_test.go +++ b/routes/api/badge_test.go @@ -8,7 +8,7 @@ import ( "github.com/muety/wakapi/models" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "io/ioutil" + "io" "net/http" "net/http/httptest" "regexp" @@ -69,7 +69,7 @@ func TestBadgeHandler_Get(t *testing.T) { assert.Equal(t, http.StatusOK, res.StatusCode) - data, err := ioutil.ReadAll(res.Body) + data, err := io.ReadAll(res.Body) if err != nil { t.Errorf("unextected error. Error: %s", err) } @@ -90,7 +90,7 @@ func TestBadgeHandler_Get(t *testing.T) { assert.Equal(t, http.StatusForbidden, res.StatusCode) - data, err := ioutil.ReadAll(res.Body) + data, err := io.ReadAll(res.Body) if err != nil { t.Errorf("unextected error. Error: %s", err) } @@ -110,7 +110,7 @@ func TestBadgeHandler_Get(t *testing.T) { assert.Equal(t, http.StatusForbidden, res.StatusCode) - data, err := ioutil.ReadAll(res.Body) + data, err := io.ReadAll(res.Body) if err != nil { t.Errorf("unextected error. Error: %s", err) } diff --git a/routes/compat/wakatime/v1/users_test.go b/routes/compat/wakatime/v1/users_test.go index 9f992b5..8833730 100644 --- a/routes/compat/wakatime/v1/users_test.go +++ b/routes/compat/wakatime/v1/users_test.go @@ -8,7 +8,7 @@ import ( "github.com/muety/wakapi/middlewares" "github.com/muety/wakapi/mocks" "github.com/muety/wakapi/models" - "io/ioutil" + "io" "net/http" "net/http/httptest" "strings" @@ -78,7 +78,7 @@ func TestUsersHandler_Get(t *testing.T) { res := rec.Result() defer res.Body.Close() - data, err := ioutil.ReadAll(res.Body) + data, err := io.ReadAll(res.Body) if err != nil { t.Errorf("unexpected error. Error: %s", err) } @@ -104,7 +104,7 @@ func TestUsersHandler_Get(t *testing.T) { res := rec.Result() defer res.Body.Close() - data, err := ioutil.ReadAll(res.Body) + data, err := io.ReadAll(res.Body) if err != nil { t.Errorf("unextected error. Error: %s", err) } @@ -128,7 +128,7 @@ func TestUsersHandler_Get(t *testing.T) { res := rec.Result() defer res.Body.Close() - data, err := ioutil.ReadAll(res.Body) + data, err := io.ReadAll(res.Body) if err != nil { t.Errorf("unextected error. Error: %s", err) } diff --git a/routes/home_test.go b/routes/home_test.go index 9af3899..9bd61b5 100644 --- a/routes/home_test.go +++ b/routes/home_test.go @@ -7,7 +7,7 @@ import ( "github.com/muety/wakapi/mocks" "github.com/muety/wakapi/models" "github.com/stretchr/testify/assert" - "io/ioutil" + "io" "net/http" "net/http/httptest" "os" @@ -58,7 +58,7 @@ func TestHomeHandler_Get_NotLoggedIn(t *testing.T) { assert.Equal(t, http.StatusOK, res.StatusCode) - data, err := ioutil.ReadAll(res.Body) + data, err := io.ReadAll(res.Body) if err != nil { t.Errorf("unextected error. Error: %s", err) } diff --git a/routes/subscription.go b/routes/subscription.go index e189827..700d5f0 100644 --- a/routes/subscription.go +++ b/routes/subscription.go @@ -19,7 +19,7 @@ import ( stripePrice "github.com/stripe/stripe-go/v74/price" stripeSubscription "github.com/stripe/stripe-go/v74/subscription" "github.com/stripe/stripe-go/v74/webhook" - "io/ioutil" + "io" "net/http" "strings" "time" @@ -197,7 +197,7 @@ func (h *SubscriptionHandler) PostPortal(w http.ResponseWriter, r *http.Request) func (h *SubscriptionHandler) PostWebhook(w http.ResponseWriter, r *http.Request) { bodyReader := http.MaxBytesReader(w, r.Body, int64(65536)) - payload, err := ioutil.ReadAll(bodyReader) + payload, err := io.ReadAll(bodyReader) if err != nil { conf.Log().Request(r).Error("error in stripe webhook request: %v", err) w.WriteHeader(http.StatusServiceUnavailable) diff --git a/routes/utils/heartbeat_utils.go b/routes/utils/heartbeat_utils.go index 1982a12..1c441a1 100644 --- a/routes/utils/heartbeat_utils.go +++ b/routes/utils/heartbeat_utils.go @@ -4,7 +4,7 @@ import ( "bytes" "encoding/json" "github.com/muety/wakapi/models" - "io/ioutil" + "io" "net/http" ) @@ -25,11 +25,11 @@ func ParseHeartbeats(r *http.Request) ([]*models.Heartbeat, error) { func tryParseBulk(r *http.Request) ([]*models.Heartbeat, error) { var heartbeats []*models.Heartbeat - body, _ := ioutil.ReadAll(r.Body) + body, _ := io.ReadAll(r.Body) r.Body.Close() - r.Body = ioutil.NopCloser(bytes.NewBuffer(body)) + r.Body = io.NopCloser(bytes.NewBuffer(body)) - dec := json.NewDecoder(ioutil.NopCloser(bytes.NewBuffer(body))) + dec := json.NewDecoder(io.NopCloser(bytes.NewBuffer(body))) if err := dec.Decode(&heartbeats); err != nil { return nil, err } @@ -40,11 +40,11 @@ func tryParseBulk(r *http.Request) ([]*models.Heartbeat, error) { func tryParseSingle(r *http.Request) ([]*models.Heartbeat, error) { var heartbeat models.Heartbeat - body, _ := ioutil.ReadAll(r.Body) + body, _ := io.ReadAll(r.Body) r.Body.Close() - r.Body = ioutil.NopCloser(bytes.NewBuffer(body)) + r.Body = io.NopCloser(bytes.NewBuffer(body)) - dec := json.NewDecoder(ioutil.NopCloser(bytes.NewBuffer(body))) + dec := json.NewDecoder(io.NopCloser(bytes.NewBuffer(body))) if err := dec.Decode(&heartbeat); err != nil { return nil, err } diff --git a/utils/template.go b/utils/template.go index 9282f4b..02d0e94 100644 --- a/utils/template.go +++ b/utils/template.go @@ -3,8 +3,8 @@ package utils import ( "encoding/json" "html/template" + "io" "io/fs" - "io/ioutil" "path" ) @@ -44,7 +44,7 @@ func LoadTemplates(templateFs fs.FS, funcs template.FuncMap) (TemplateMap, error if err != nil { return nil, err } - templateData, err := ioutil.ReadAll(templateFile) + templateData, err := io.ReadAll(templateFile) if err != nil { return nil, err }