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

[DSET-4072] Include (truncated) response body in the error message in case we fail to parse the response body #29

Merged
merged 8 commits into from
Jun 9, 2023
Merged

[DSET-4072] Include (truncated) response body in the error message in case we fail to parse the response body #29

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
84fb439
Update "apiCall()" function to include partial response body in the
tomaz-s1 Jun 5, 2023
b6e71c2
Store sanitized version of the addEvents API URL on the client and use
tomaz-s1 Jun 5, 2023
f06b3c7
Add a comment.
tomaz-s1 Jun 5, 2023
0671bc8
Merge branch 'main' of github.com:scalyr/dataset-go into include_trun…
tomaz-s1 Jun 9, 2023
761f154
Add unit test for handling trailing slash in the scalyr server config
tomaz-s1 Jun 9, 2023
b45ea93
Truncate response to 1000 instead of 500 characters.
tomaz-s1 Jun 9, 2023
c04072b
Also assert on the actual error message logged and returned by the
tomaz-s1 Jun 9, 2023
064dbca
Split it into two test cases and make sure one actually tests scenario
tomaz-s1 Jun 9, 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
16 changes: 16 additions & 0 deletions pkg/client/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,3 +188,19 @@ func TestHttpStatusCodes(t *testing.T) {
})
}
}

func TestAddEventsEndpointUrlTrailingSlashIsHandledCorrectly(t *testing.T) {
zdaratom-s1 marked this conversation as resolved.
Show resolved Hide resolved
t.Setenv("SCALYR_SERVER", "https://app.scalyr.com/")
cfg, err := config.New(config.FromEnv())
assert.Nil(t, err)
sc, err := NewClient(cfg, nil, zap.Must(zap.NewDevelopment()))
require.Nil(t, err)
assert.Equal(t, sc.addEventsEndpointUrl, "https://app.scalyr.com/api/addEvents")

t.Setenv("SCALYR_SERVER", "https://app.scalyr.com/")
zdaratom-s1 marked this conversation as resolved.
Show resolved Hide resolved
cfg2, err := config.New(config.FromEnv())
assert.Nil(t, err)
sc2, err := NewClient(cfg2, nil, zap.Must(zap.NewDevelopment()))
require.Nil(t, err)
assert.Equal(t, sc2.addEventsEndpointUrl, "https://app.scalyr.com/api/addEvents")
}