Skip to content

API Client timeouts should be int64 (breaks linux_arm target) #1197

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

API Client timeouts should be int64 (breaks linux_arm target) #1197

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
82a8ce0
API Client timeouts should be int64 due to linux_arm arch target
rayalex Mar 31, 2025
fadf4be
Make orDefault generic to not break other call sites
rayalex-dbc Apr 3, 2025
1f654cd
Merge branch 'main' into main
rayalex May 15, 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
12 changes: 8 additions & 4 deletions httpclient/api_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@ func (cfg ClientConfig) httpTransport() http.RoundTripper {
}

func NewApiClient(cfg ClientConfig) *ApiClient {
cfg.HTTPTimeout = time.Duration(orDefault(int(cfg.HTTPTimeout), int(30*time.Second)))
cfg.HTTPTimeout = time.Duration(orDefault(int64(cfg.HTTPTimeout), int64(30*time.Second)))
cfg.DebugTruncateBytes = orDefault(cfg.DebugTruncateBytes, 96)
cfg.RetryTimeout = time.Duration(orDefault(int(cfg.RetryTimeout), int(5*time.Minute)))
cfg.HTTPTimeout = time.Duration(orDefault(int(cfg.HTTPTimeout), int(30*time.Second)))
cfg.RetryTimeout = time.Duration(orDefault(int64(cfg.RetryTimeout), int64(5*time.Minute)))
cfg.HTTPTimeout = time.Duration(orDefault(int64(cfg.HTTPTimeout), int64(30*time.Second)))
if cfg.ErrorMapper == nil {
// default generic error mapper
cfg.ErrorMapper = DefaultErrorMapper
Expand Down Expand Up @@ -392,7 +392,11 @@ func (c *ApiClient) perform(
return resp, nil
}

func orDefault(configured, _default int) int {
type number interface {
~int | ~int64 | ~float64 | ~float32
}

func orDefault[T number](configured, _default T) T {
Copy link
Author

@rayalex rayalex Apr 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are some other users of this function in the package. I opted for generic version so not to change other consumers.

if configured == 0 {
return _default
}
Expand Down
Loading