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

CloudWatch: Backport aws-sdk-go-v2 update from external plugin (#107136)

Browse Source 
* CloudWatch: Backport aws-sdk-go-v2 update from external plugin

* Review feedback & cleaning up a couple typos
This commit is contained in:
Nathan Vērzemnieks
2025-06-26 15:56:50 +02:00
committed by GitHub
parent 069598c454
commit a18ea34688
91 changed files with 2468 additions and 2988 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/tsdb/cloudwatch/models/cloudwatch_query_test.go
+26 -24
View File
@@ -7,13 +7,15 @@ import (
"testing"
"time"
"github.com/aws/aws-sdk-go-v2/aws"
"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/grafana-plugin-sdk-go/backend/log"
"github.com/grafana/grafana/pkg/tsdb/cloudwatch/kinds/dataquery"
"github.com/grafana/grafana/pkg/tsdb/cloudwatch/utils"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/grafana/grafana/pkg/tsdb/cloudwatch/utils"
)
var logger = log.NewNullLogger()
@@ -368,7 +370,7 @@ func TestRequestParser(t *testing.T) {
assert.Equal(t, "CPUUtilization", res.MetricName)
assert.Equal(t, "queryref1", res.Id)
assert.Empty(t, res.Expression)
assert.Equal(t, 600, res.Period)
assert.Equal(t, int32(600), res.Period)
assert.True(t, res.ReturnData)
assert.Len(t, res.Dimensions, 2)
assert.Len(t, res.Dimensions["InstanceId"], 1)
@@ -411,7 +413,7 @@ func TestRequestParser(t *testing.T) {
assert.Equal(t, "CPUUtilization", res.MetricName)
assert.Equal(t, "queryref1", res.Id)
assert.Empty(t, res.Expression)
assert.Equal(t, 600, res.Period)
assert.Equal(t, int32(600), res.Period)
assert.True(t, res.ReturnData)
assert.Len(t, res.Dimensions, 2)
assert.Len(t, res.Dimensions["InstanceId"], 1)
@@ -466,7 +468,7 @@ func Test_ParseMetricDataQueries_periods(t *testing.T) {
assert.NoError(t, err)
require.Len(t, res, 1)
require.NotNil(t, res[0])
assert.Equal(t, 900, res[0].Period)
assert.Equal(t, int32(900), res[0].Period)
})
t.Run("Period is parsed correctly if not defined by user", func(t *testing.T) {
@@ -497,7 +499,7 @@ func Test_ParseMetricDataQueries_periods(t *testing.T) {
res, err := ParseMetricDataQueries(query, from, to, "us-east-2", logger, false)
require.NoError(t, err)
require.Len(t, res, 1)
assert.Equal(t, 60, res[0].Period)
assert.Equal(t, int32(60), res[0].Period)
})
t.Run("Time range is 1 day", func(t *testing.T) {
@@ -507,7 +509,7 @@ func Test_ParseMetricDataQueries_periods(t *testing.T) {
res, err := ParseMetricDataQueries(query, from, to, "us-east-2", logger, false)
require.NoError(t, err)
require.Len(t, res, 1)
assert.Equal(t, 60, res[0].Period)
assert.Equal(t, int32(60), res[0].Period)
})
t.Run("Time range is 2 days", func(t *testing.T) {
@@ -516,7 +518,7 @@ func Test_ParseMetricDataQueries_periods(t *testing.T) {
res, err := ParseMetricDataQueries(query, from, to, "us-east-2", logger, false)
require.NoError(t, err)
require.Len(t, res, 1)
assert.Equal(t, 300, res[0].Period)
assert.Equal(t, int32(300), res[0].Period)
})
t.Run("Time range is 7 days", func(t *testing.T) {
@@ -526,7 +528,7 @@ func Test_ParseMetricDataQueries_periods(t *testing.T) {
res, err := ParseMetricDataQueries(query, from, to, "us-east-2", logger, false)
require.NoError(t, err)
require.Len(t, res, 1)
assert.Equal(t, 900, res[0].Period)
assert.Equal(t, int32(900), res[0].Period)
})
t.Run("Time range is 30 days", func(t *testing.T) {
@@ -536,7 +538,7 @@ func Test_ParseMetricDataQueries_periods(t *testing.T) {
res, err := ParseMetricDataQueries(query, from, to, "us-east-2", logger, false)
require.NoError(t, err)
require.Len(t, res, 1)
assert.Equal(t, 3600, res[0].Period)
assert.Equal(t, int32(3600), res[0].Period)
})
t.Run("Time range is 90 days", func(t *testing.T) {
@@ -546,7 +548,7 @@ func Test_ParseMetricDataQueries_periods(t *testing.T) {
res, err := ParseMetricDataQueries(query, from, to, "us-east-2", logger, false)
require.NoError(t, err)
require.Len(t, res, 1)
assert.Equal(t, 21600, res[0].Period)
assert.Equal(t, int32(21600), res[0].Period)
})
t.Run("Time range is 1 year", func(t *testing.T) {
@@ -556,7 +558,7 @@ func Test_ParseMetricDataQueries_periods(t *testing.T) {
res, err := ParseMetricDataQueries(query, from, to, "us-east-2", logger, false)
require.Nil(t, err)
require.Len(t, res, 1)
assert.Equal(t, 21600, res[0].Period)
assert.Equal(t, int32(21600), res[0].Period)
})
t.Run("Time range is 2 years", func(t *testing.T) {
@@ -566,7 +568,7 @@ func Test_ParseMetricDataQueries_periods(t *testing.T) {
res, err := ParseMetricDataQueries(query, from, to, "us-east-2", logger, false)
require.NoError(t, err)
require.Len(t, res, 1)
assert.Equal(t, 86400, res[0].Period)
assert.Equal(t, int32(86400), res[0].Period)
})
t.Run("Time range is 2 days, but 16 days ago", func(t *testing.T) {
@@ -575,7 +577,7 @@ func Test_ParseMetricDataQueries_periods(t *testing.T) {
res, err := ParseMetricDataQueries(query, from, to, "us-east-2", logger, false)
require.NoError(t, err)
require.Len(t, res, 1)
assert.Equal(t, 300, res[0].Period)
assert.Equal(t, int32(300), res[0].Period)
})
t.Run("Time range is 2 days, but 90 days ago", func(t *testing.T) {
@@ -584,7 +586,7 @@ func Test_ParseMetricDataQueries_periods(t *testing.T) {
res, err := ParseMetricDataQueries(query, from, to, "us-east-2", logger, false)
require.NoError(t, err)
require.Len(t, res, 1)
assert.Equal(t, 3600, res[0].Period)
assert.Equal(t, int32(3600), res[0].Period)
})
t.Run("Time range is 2 days, but 456 days ago", func(t *testing.T) {
@@ -593,7 +595,7 @@ func Test_ParseMetricDataQueries_periods(t *testing.T) {
res, err := ParseMetricDataQueries(query, from, to, "us-east-2", logger, false)
require.NoError(t, err)
require.Len(t, res, 1)
assert.Equal(t, 21600, res[0].Period)
assert.Equal(t, int32(21600), res[0].Period)
})
})
t.Run("returns error if period is invalid duration", func(t *testing.T) {
@@ -624,7 +626,7 @@ func Test_ParseMetricDataQueries_periods(t *testing.T) {
assert.NoError(t, err)
require.Len(t, res, 1)
assert.Equal(t, 9900, res[0].Period)
assert.Equal(t, int32(9900), res[0].Period)
})
}
@@ -932,7 +934,6 @@ func Test_migrateAliasToDynamicLabel_single_query_preserves_old_alias_and_create
for name, tc := range testCases {
t.Run(name, func(t *testing.T) {
average := "Average"
false := false
queryToMigrate := metricsDataQuery{
CloudWatchMetricsQuery: dataquery.CloudWatchMetricsQuery{
@@ -945,7 +946,7 @@ func Test_migrateAliasToDynamicLabel_single_query_preserves_old_alias_and_create
},
Statistic: &average,
Period: utils.Pointer("600"),
Hide: &false,
Hide: aws.Bool(false),
},
}
@@ -982,7 +983,7 @@ func Test_ParseMetricDataQueries_migrate_alias_to_label(t *testing.T) {
assert.Equal(t, true, res[0].ReturnData)
assert.Equal(t, "CPUUtilization", res[0].MetricName)
assert.Equal(t, "ec2", res[0].Namespace)
assert.Equal(t, 600, res[0].Period)
assert.Equal(t, int32(600), res[0].Period)
assert.Equal(t, "us-east-1", res[0].Region)
assert.Equal(t, "Average", res[0].Statistic)
})
@@ -1031,7 +1032,7 @@ func Test_ParseMetricDataQueries_migrate_alias_to_label(t *testing.T) {
assert.Equal(t, true, res[0].ReturnData)
assert.Equal(t, "CPUUtilization", res[0].MetricName)
assert.Equal(t, "ec2", res[0].Namespace)
assert.Equal(t, 600, res[0].Period)
assert.Equal(t, int32(600), res[0].Period)
assert.Equal(t, "us-east-1", res[0].Region)
assert.Equal(t, "Average", res[0].Statistic)
@@ -1041,7 +1042,7 @@ func Test_ParseMetricDataQueries_migrate_alias_to_label(t *testing.T) {
assert.Equal(t, true, res[1].ReturnData)
assert.Equal(t, "CPUUtilization", res[1].MetricName)
assert.Equal(t, "ec2", res[1].Namespace)
assert.Equal(t, 600, res[1].Period)
assert.Equal(t, int32(600), res[1].Period)
assert.Equal(t, "us-east-1", res[1].Region)
assert.Equal(t, "Average", res[1].Statistic)
})
@@ -1087,7 +1088,7 @@ func Test_ParseMetricDataQueries_migrate_alias_to_label(t *testing.T) {
assert.Equal(t, true, res[0].ReturnData)
assert.Equal(t, "CPUUtilization", res[0].MetricName)
assert.Equal(t, "ec2", res[0].Namespace)
assert.Equal(t, 600, res[0].Period)
assert.Equal(t, int32(600), res[0].Period)
assert.Equal(t, "us-east-1", res[0].Region)
assert.Equal(t, "Average", res[0].Statistic)
})
@@ -1305,7 +1306,8 @@ func TestGetEndpoint(t *testing.T) {
}
for _, ts := range testcases {
t.Run(fmt.Sprintf("should create correct endpoint for %s", ts), func(t *testing.T) {
actual := getEndpoint(ts.region)
actual, err := getEndpoint(ts.region)
assert.NoError(t, err)
assert.Equal(t, ts.expectedEndpoint, actual)
})
}