From 1433fcb9b20c77eff93b8147b78c78d7fbea58e7 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Fri, 14 Apr 2023 17:29:44 +0200
Subject: [PATCH] [v9.5.x] Google Cloud Monitoring: Fix project variable
 (#66603)

Google Cloud Monitoring: Fix project variable (#66524)

Google Cloud Monitoring: fix project variable

Also fix typo found while debugging

(cherry picked from commit 02951e8a26f650b812164e95a7b9683d7f177e08)

Co-authored-by: Adam Simpson <adam@adamsimpson.net>
---
 pkg/tsdb/cloudmonitoring/cloudmonitoring.go                     | 2 +-
 .../cloud-monitoring/components/VariableQueryEditor.tsx         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/tsdb/cloudmonitoring/cloudmonitoring.go b/pkg/tsdb/cloudmonitoring/cloudmonitoring.go
index dd289beec01..172c40fafc1 100644
--- a/pkg/tsdb/cloudmonitoring/cloudmonitoring.go
+++ b/pkg/tsdb/cloudmonitoring/cloudmonitoring.go
@@ -645,7 +645,7 @@ func (s *Service) getDSInfo(pluginCtx backend.PluginContext) (*datasourceInfo, e
 
 	instance, ok := i.(*datasourceInfo)
 	if !ok {
-		return nil, fmt.Errorf("failed to cast datsource info")
+		return nil, fmt.Errorf("failed to cast datasource info")
 	}
 
 	return instance, nil
diff --git a/public/app/plugins/datasource/cloud-monitoring/components/VariableQueryEditor.tsx b/public/app/plugins/datasource/cloud-monitoring/components/VariableQueryEditor.tsx
index 9a7c3ac571c..b34098d6464 100644
--- a/public/app/plugins/datasource/cloud-monitoring/components/VariableQueryEditor.tsx
+++ b/public/app/plugins/datasource/cloud-monitoring/components/VariableQueryEditor.tsx
@@ -62,7 +62,7 @@ export class CloudMonitoringVariableQueryEditor extends PureComponent<Props, Var
 
   async componentDidMount() {
     await this.props.datasource.ensureGCEDefaultProject();
-    const projectName = this.props.datasource.getDefaultProject();
+    const projectName = this.props.query.projectName || this.props.datasource.getDefaultProject();
     const projects = (await this.props.datasource.getProjects()) as MetricDescriptor[];
     const metricDescriptors = await this.props.datasource.getMetricTypes(
       this.props.query.projectName || this.props.datasource.getDefaultProject()