public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[v10.4.x] Google Cloud Monitor: Fix res being accessed after it becomes nil in promql_query.go (#85959)

Browse Source 
Google Cloud Monitor: Fix `res` being accessed after it becomes `nil` in `promql_query.go` (#84223)

Fix res being accessed after it becomes nil in promql_query.go

(cherry picked from commit c2b94429e4)

Co-authored-by: Adam Yeats <16296989+adamyeats@users.noreply.github.com>
This commit is contained in:
grafana-delivery-bot[bot]
2024-04-11 15:53:41 +01:00
committed by GitHub
co-authored by Adam Yeats
parent d922afa346
commit 701c851be7
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/tsdb/cloud-monitoring/promql_query.go
+5 -4
View File
@@ -42,15 +42,16 @@ func (promQLQ *cloudMonitoringProm) run(ctx context.Context, req *backend.QueryD
} }
res, err := doRequestProm(r, dsInfo, requestBody) res, err := doRequestProm(r, dsInfo, requestBody)
if err != nil {
dr.Error = err
return dr, promResponse{}, "", nil
}
defer func() { defer func() {
if err := res.Body.Close(); err != nil { if err := res.Body.Close(); err != nil {
s.logger.Error("Failed to close response body", "err", err) s.logger.Error("Failed to close response body", "err", err)
} }
}() }()
if err != nil {
dr.Error = err
return dr, promResponse{}, "", nil
}
return dr, parseProm(res), r.URL.RawQuery, nil return dr, parseProm(res), r.URL.RawQuery, nil
} }