CloudWatch: Add ap-east-1 to hard-coded region lists (#19523)

* CloudWatch: Add ap-east-1 to hard-coded region lists (#17448)

* CloudWatch: Fix handleGetRegion tests
pull/19528/head
Sean Nessworthy 6 years ago committed by Erik Sundell
parent 8de6ba6aad
commit 404bf2e0dd
  1. 2
      pkg/tsdb/cloudwatch/metric_find_query.go
  2. 5
      pkg/tsdb/cloudwatch/metric_find_query_test.go
  3. 1
      public/app/plugins/datasource/cloudwatch/config_ctrl.ts

@ -285,7 +285,7 @@ func (e *CloudWatchExecutor) handleGetRegions(ctx context.Context, parameters *s
}
regions := []string{
"ap-northeast-1", "ap-northeast-2", "ap-northeast-3", "ap-south-1", "ap-southeast-1", "ap-southeast-2", "ca-central-1",
"ap-east-1", "ap-northeast-1", "ap-northeast-2", "ap-northeast-3", "ap-south-1", "ap-southeast-1", "ap-southeast-2", "ca-central-1",
"eu-central-1", "eu-north-1", "eu-west-1", "eu-west-2", "eu-west-3", "me-south-1", "sa-east-1", "us-east-1", "us-east-2", "us-west-1", "us-west-2",
"cn-north-1", "cn-northwest-1", "us-gov-east-1", "us-gov-west-1", "us-isob-east-1", "us-iso-east-1",
}

@ -120,8 +120,9 @@ func TestCloudWatchMetrics(t *testing.T) {
result, _ := executor.handleGetRegions(context.Background(), simplejson.New(), &tsdb.TsdbQuery{})
Convey("Should return regions", func() {
So(result[0].Text, ShouldEqual, "ap-northeast-1")
So(result[1].Text, ShouldEqual, "ap-northeast-2")
So(result[0].Text, ShouldEqual, "ap-east-1")
So(result[1].Text, ShouldEqual, "ap-northeast-1")
So(result[2].Text, ShouldEqual, "ap-northeast-2")
})
})

@ -44,6 +44,7 @@ export class CloudWatchConfigCtrl {
];
regions = [
'ap-east-1',
'ap-northeast-1',
'ap-northeast-2',
'ap-northeast-3',

Loading…
Cancel
Save