Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 8 additions & 2 deletions api/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ func (cl Client) newRequest(ctx context.Context, method, url string) (*http.Requ
return req, err
}

func (cl Client) Request(ctx context.Context, method, url string, out interface{}) error {
func (cl Client) Request(ctx context.Context, method, url string, out interface{}) (err error) {
req, err := cl.newRequest(ctx, method, url)
if err != nil {
return fmt.Errorf("new request: %w", err)
Expand All @@ -90,7 +90,13 @@ func (cl Client) Request(ctx context.Context, method, url string, out interface{
if err != nil {
return fmt.Errorf("do request: %w", err)
}
defer resp.Body.Close()
defer func() {
if closeErr := resp.Body.Close(); closeErr != nil {
if err == nil {
err = fmt.Errorf("close response body: %w", closeErr)
}
}
}()
if resp.StatusCode != http.StatusOK {
return fmt.Errorf("%w: %d", ErrBadStatusCode, resp.StatusCode)
}
Expand Down
2 changes: 1 addition & 1 deletion detector/detector_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ func unmarshalFromFile(fn string, out any) error {
if err != nil {
return err
}
defer f.Close()
defer func() { _ = f.Close() }()
return json.NewDecoder(f).Decode(out)
}

Expand Down
4 changes: 2 additions & 2 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -223,10 +223,10 @@ func handleReadyRequest(w http.ResponseWriter, r *http.Request, ready *atomic.Bo

if ready.Load() {
w.WriteHeader(http.StatusOK)
w.Write([]byte("Ready"))
_, _ = w.Write([]byte("Ready"))
} else {
w.WriteHeader(http.StatusServiceUnavailable)
w.Write([]byte("Not Ready"))
_, _ = w.Write([]byte("Not Ready"))
}
}

Expand Down
2 changes: 1 addition & 1 deletion output/output.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ func (o LoggerReadableOutput) Output(v []Dashboard) error {
}
o.log.Log("Found dashboard with Angular plugins %q %q:", dashboard.Title, dashboard.URL)
for _, detection := range dashboard.Detections {
o.log.Log(detection.String())
o.log.Log("%s", detection.String())
}
}
return nil
Expand Down