From 086309700e6fefd49958defc68ea1592b361a066 Mon Sep 17 00:00:00 2001
From: Andres Martinez Gotor <andres.martinez@grafana.com>
Date: Wed, 9 Jun 2021 17:19:43 +0200
Subject: [PATCH] Fix missing defaultRegion (#35436)

---
 pkg/tsdb/cloudwatch/cloudwatch.go      |  2 +-
 pkg/tsdb/cloudwatch/cloudwatch_test.go | 73 ++++++++++++++++++++++++++
 2 files changed, 74 insertions(+), 1 deletion(-)
 create mode 100644 pkg/tsdb/cloudwatch/cloudwatch_test.go

diff --git a/pkg/tsdb/cloudwatch/cloudwatch.go b/pkg/tsdb/cloudwatch/cloudwatch.go
index c26d00f8adb..daf6baa3782 100644
--- a/pkg/tsdb/cloudwatch/cloudwatch.go
+++ b/pkg/tsdb/cloudwatch/cloudwatch.go
@@ -102,7 +102,7 @@ func NewInstanceSettings() datasource.InstanceFactoryFunc {
 	return func(settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
 		jsonData := struct {
 			Profile       string `json:"profile"`
-			Region        string `json:"defaulRegion"`
+			Region        string `json:"defaultRegion"`
 			AssumeRoleARN string `json:"assumeRoleArn"`
 			ExternalID    string `json:"externalId"`
 			Endpoint      string `json:"endpoint"`
diff --git a/pkg/tsdb/cloudwatch/cloudwatch_test.go b/pkg/tsdb/cloudwatch/cloudwatch_test.go
new file mode 100644
index 00000000000..def00c2e7e2
--- /dev/null
+++ b/pkg/tsdb/cloudwatch/cloudwatch_test.go
@@ -0,0 +1,73 @@
+package cloudwatch
+
+import (
+	"testing"
+
+	"github.com/google/go-cmp/cmp"
+	"github.com/grafana/grafana-aws-sdk/pkg/awsds"
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/stretchr/testify/require"
+)
+
+func TestNewInstanceSettings(t *testing.T) {
+	tests := []struct {
+		name       string
+		settings   backend.DataSourceInstanceSettings
+		expectedDS datasourceInfo
+		Err        require.ErrorAssertionFunc
+	}{
+		{
+			name: "creates a request",
+			settings: backend.DataSourceInstanceSettings{
+				JSONData: []byte(`{
+					"profile": "foo",
+					"defaultRegion": "us-east2",
+					"assumeRoleArn": "role",
+					"externalId": "id",
+					"endpoint": "bar",
+					"customMetricsNamespaces": "ns",
+					"authType": "keys"
+				}`),
+				DecryptedSecureJSONData: map[string]string{
+					"accessKey": "A123",
+					"secretKey": "secret",
+				},
+			},
+			expectedDS: datasourceInfo{
+				profile:       "foo",
+				region:        "us-east2",
+				assumeRoleARN: "role",
+				externalID:    "id",
+				endpoint:      "bar",
+				namespace:     "ns",
+				authType:      awsds.AuthTypeKeys,
+				accessKey:     "A123",
+				secretKey:     "secret",
+			},
+			Err: require.NoError,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			f := NewInstanceSettings()
+			model, err := f(tt.settings)
+			tt.Err(t, err)
+			datasourceComparer := cmp.Comparer(func(d1 datasourceInfo, d2 datasourceInfo) bool {
+				return d1.profile == d2.profile &&
+					d1.region == d2.region &&
+					d1.authType == d2.authType &&
+					d1.assumeRoleARN == d2.assumeRoleARN &&
+					d1.externalID == d2.externalID &&
+					d1.namespace == d2.namespace &&
+					d1.endpoint == d2.endpoint &&
+					d1.accessKey == d2.accessKey &&
+					d1.secretKey == d2.secretKey &&
+					d1.datasourceID == d2.datasourceID
+			})
+			if !cmp.Equal(model.(datasourceInfo), tt.expectedDS, datasourceComparer) {
+				t.Errorf("Unexpected result. Expecting\n%v \nGot:\n%v", model, tt.expectedDS)
+			}
+		})
+	}
+}