Skip to content

update deps #20

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

Merged
joshraphael merged 2 commits into from
Jul 5, 2025
Merged

update deps #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5c6ae3
update deps
joshraphael Jul 5, 2025
4de3afd
fix new lint errors
joshraphael Jul 5, 2025
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
6 changes: 3 additions & 3 deletions .github/workflows/go.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ jobs:
with:
go-version: '^1.23.0'
- name: golangci-lint
uses: golangci/golangci-lint-action@v6.1.1
uses: golangci/golangci-lint-action@v8.0.0
with:
version: v1.61.0
version: v2.2.1

coverage:
name: coverage
Expand All @@ -35,7 +35,7 @@ jobs:
run: bash ./scripts/test.sh

- name: check test coverage
uses: vladopajic/go-test-coverage@v2.10.2
uses: vladopajic/go-test-coverage@v2.15.0
with:
config: ./.github/.testcoverage.yml
local-prefix: github.com/joshraphael/go-retroachievements
Expand Down
5 changes: 4 additions & 1 deletion client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,11 +127,14 @@ func (c *Client) do(details ...raHttp.RequestDetail) (*raHttp.Response, error) {
if err != nil {
return nil, err
}
defer resp.Body.Close()
data, err := io.ReadAll(resp.Body)
if err != nil {
return nil, err
}
err = resp.Body.Close()
if err != nil {
return nil, err
}
return &raHttp.Response{
StatusCode: resp.StatusCode,
Data: data,
Expand Down
10 changes: 8 additions & 2 deletions http/response.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,23 +28,29 @@ func unmarshalResponseObject[Obj any](data []byte) (*Obj, error) {
return nil, nil
}
body := io.NopCloser(bytes.NewReader(data))
defer body.Close()
obj := new(Obj)
err := json.NewDecoder(body).Decode(&obj)
if err != nil {
return nil, err
}
err = body.Close()
if err != nil {
return nil, err
}
return obj, nil
}

func unmarshalResponseList[Obj any](data []byte) ([]Obj, error) {
body := io.NopCloser(bytes.NewReader(data))
defer body.Close()
objs := []Obj{}
err := json.NewDecoder(body).Decode(&objs)
if err != nil {
return nil, err
}
err = body.Close()
if err != nil {
return nil, err
}
return objs, nil
}

Expand Down
8 changes: 4 additions & 4 deletions models/time_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ func TestDateTimeUnmarshalJSON(tt *testing.T) {
input: "\"\"",
assert: func(t *testing.T, date *models.DateTime, err error) {
require.NotNil(t, date)
require.True(t, date.Time.IsZero())
require.True(t, date.IsZero())
require.NoError(t, err)
},
},
Expand All @@ -28,7 +28,7 @@ func TestDateTimeUnmarshalJSON(tt *testing.T) {
input: "\"?>?>>L:\"",
assert: func(t *testing.T, date *models.DateTime, err error) {
require.NotNil(t, date)
require.True(t, date.Time.IsZero())
require.True(t, date.IsZero())
require.EqualError(t, err, "parsing time \"?>?>>L:\" as \"2006-01-02 15:04:05\": cannot parse \"?>?>>L:\" as \"2006\"")
},
},
Expand Down Expand Up @@ -72,7 +72,7 @@ func TestRFC3339NumColonTZUnmarshalJSON(tt *testing.T) {
input: "\"\"",
assert: func(t *testing.T, date *models.RFC3339NumColonTZ, err error) {
require.NotNil(t, date)
require.True(t, date.Time.IsZero())
require.True(t, date.IsZero())
require.NoError(t, err)
},
},
Expand All @@ -81,7 +81,7 @@ func TestRFC3339NumColonTZUnmarshalJSON(tt *testing.T) {
input: "\"?>?>>L:\"",
assert: func(t *testing.T, date *models.RFC3339NumColonTZ, err error) {
require.NotNil(t, date)
require.True(t, date.Time.IsZero())
require.True(t, date.IsZero())
require.EqualError(t, err, "parsing time \"?>?>>L:\" as \"2006-01-02T15:04:05-07:00\": cannot parse \"?>?>>L:\" as \"2006\"")
},
},
Expand Down