From 701c851be7a930e04fbc6ebb1cd4254da80edd4c Mon Sep 17 00:00:00 2001
From: "grafana-delivery-bot[bot]"
 <132647405+grafana-delivery-bot[bot]@users.noreply.github.com>
Date: Thu, 11 Apr 2024 15:53:41 +0100
Subject: [PATCH] [v10.4.x] Google Cloud Monitor: Fix `res` being accessed
 after it becomes `nil` in `promql_query.go` (#85959)

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 c2b94429e44db4e785210176f32bba85c08a994a)

Co-authored-by: Adam Yeats <16296989+adamyeats@users.noreply.github.com>
---
 pkg/tsdb/cloud-monitoring/promql_query.go | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkg/tsdb/cloud-monitoring/promql_query.go b/pkg/tsdb/cloud-monitoring/promql_query.go
index c33c7fa42bf..2ee2aba24ab 100644
--- a/pkg/tsdb/cloud-monitoring/promql_query.go
+++ b/pkg/tsdb/cloud-monitoring/promql_query.go
@@ -42,15 +42,16 @@ func (promQLQ *cloudMonitoringProm) run(ctx context.Context, req *backend.QueryD
 	}
 
 	res, err := doRequestProm(r, dsInfo, requestBody)
+	if err != nil {
+		dr.Error = err
+		return dr, promResponse{}, "", nil
+	}
+
 	defer func() {
 		if err := res.Body.Close(); err != nil {
 			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
 }