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

* 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
+68
View File
@@ -0,0 +1,68 @@
package cloudwatch
import (
"net/http"
"net/http/httptest"
"testing"
"github.com/stretchr/testify/assert"
"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models/resources"
"github.com/grafana/grafana/pkg/tsdb/cloudwatch/services"
)
func Test_Namespaces_Route(t *testing.T) {
t.Run("calls GetHardCodedNamespaces", func(t *testing.T) {
origGetHardCodedNamespaces := services.GetHardCodedNamespaces
t.Cleanup(func() {
services.GetHardCodedNamespaces = origGetHardCodedNamespaces
})
haveBeenCalled := false
services.GetHardCodedNamespaces = func() []resources.ResourceResponse[string] {
haveBeenCalled = true
return []resources.ResourceResponse[string]{}
}
rr := httptest.NewRecorder()
req := httptest.NewRequest("GET", "/namespaces", nil)
ds := newTestDatasource()
handler := http.HandlerFunc(ds.resourceRequestMiddleware(ds.NamespacesHandler))
handler.ServeHTTP(rr, req)
assert.True(t, haveBeenCalled)
})
t.Run("returns merges hardcoded namespaces and custom namespaces", func(t *testing.T) {
origGetHardCodedNamespaces := services.GetHardCodedNamespaces
t.Cleanup(func() {
services.GetHardCodedNamespaces = origGetHardCodedNamespaces
})
services.GetHardCodedNamespaces = func() []resources.ResourceResponse[string] {
return []resources.ResourceResponse[string]{{Value: "AWS/EC2"}, {Value: "AWS/ELB"}}
}
rr := httptest.NewRecorder()
req := httptest.NewRequest("GET", "/namespaces", nil)
ds := newTestDatasource(func(ds *DataSource) {
ds.Settings.Namespace = "customNamespace1,customNamespace2"
})
handler := http.HandlerFunc(ds.resourceRequestMiddleware(ds.NamespacesHandler))
handler.ServeHTTP(rr, req)
assert.JSONEq(t, `[{"value":"AWS/EC2"}, {"value":"AWS/ELB"}, {"value":"customNamespace1"}, {"value":"customNamespace2"}]`, rr.Body.String())
})
t.Run("sorts result", func(t *testing.T) {
origGetHardCodedNamespaces := services.GetHardCodedNamespaces
t.Cleanup(func() {
services.GetHardCodedNamespaces = origGetHardCodedNamespaces
})
services.GetHardCodedNamespaces = func() []resources.ResourceResponse[string] {
return []resources.ResourceResponse[string]{{Value: "AWS/XYZ"}, {Value: "AWS/ELB"}}
}
rr := httptest.NewRecorder()
req := httptest.NewRequest("GET", "/namespaces", nil)
ds := newTestDatasource(func(ds *DataSource) {
ds.Settings.Namespace = "DCustomNamespace1,ACustomNamespace2"
})
handler := http.HandlerFunc(ds.resourceRequestMiddleware(ds.NamespacesHandler))
handler.ServeHTTP(rr, req)
assert.JSONEq(t, `[{"value":"ACustomNamespace2"}, {"value":"AWS/ELB"}, {"value":"AWS/XYZ"}, {"value":"DCustomNamespace1"}]`, rr.Body.String())
})
}