From fdc1859d0dae234f9ac8678481be2bf1daabdc15 Mon Sep 17 00:00:00 2001 From: "grafana-delivery-bot[bot]" <132647405+grafana-delivery-bot[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2024 15:50:25 +0000 Subject: [PATCH] [v11.3.x] GCM: Fix error checking for GCE project getter (#95617) GCM: Fix error checking for GCE project getter (#95613) Appropriately check error (cherry picked from commit 08e880a823e635405bb7ca0c35a649716e594438) Co-authored-by: Andreas Christou --- pkg/tsdb/cloud-monitoring/cloudmonitoring.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkg/tsdb/cloud-monitoring/cloudmonitoring.go b/pkg/tsdb/cloud-monitoring/cloudmonitoring.go index c8fd4c85147..97a7516149f 100644 --- a/pkg/tsdb/cloud-monitoring/cloudmonitoring.go +++ b/pkg/tsdb/cloud-monitoring/cloudmonitoring.go @@ -591,7 +591,10 @@ func (s *Service) ensureProject(ctx context.Context, dsInfo datasourceInfo, proj func (s *Service) getDefaultProject(ctx context.Context, dsInfo datasourceInfo) (string, error) { if dsInfo.authenticationType == gceAuthentication { project, err := s.gceDefaultProjectGetter(ctx, cloudMonitorScope) - return project, errorsource.DownstreamError(err, false) + if err != nil { + return project, errorsource.DownstreamError(err, false) + } + return project, nil } return dsInfo.defaultProject, nil }