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

[v11.3.x] GCM: Fix error checking for GCE project getter (#95617)

Browse Source 
GCM: Fix error checking for GCE project getter (#95613)

Appropriately check error

(cherry picked from commit 08e880a823)

Co-authored-by: Andreas Christou <andreas.christou@grafana.com>
This commit is contained in:
grafana-delivery-bot[bot]
2024-10-30 15:50:25 +00:00
committed by GitHub
co-authored by Andreas Christou
parent 1540c767cc
commit fdc1859d0d
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/tsdb/cloud-monitoring/cloudmonitoring.go
+4 -1
View File
@@ -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
}