IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-09 23:16:16 -06:00
Code Issues Packages Projects Releases Wiki Activity

CloudWatch: Fetch externalId from settings instead of env (#83332)

Browse Source
This commit is contained in:
Isabella Siu 2024-02-26 16:18:22 -05:00 committed by GitHub
parent f8dc40df52
commit 44639e1063
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/tsdb/cloudwatch/routes/external_id.go
View File

@ -5,9 +5,7 @@ import (
"encoding/json"
"net/http"
"net/url"
"os"
"github.com/grafana/grafana-aws-sdk/pkg/awsds"
"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
)
@ -17,8 +15,13 @@ type ExternalIdResponse struct {
}
func ExternalIdHandler(ctx context.Context, pluginCtx backend.PluginContext, reqCtxFactory models.RequestContextFactoryFunc, parameters url.Values) ([]byte, *models.HttpError) {
reqCtx, err := reqCtxFactory(ctx, pluginCtx, "default")
if err != nil {
return nil, models.NewHttpError("error in ExternalIdHandler", http.StatusInternalServerError, err)
}
response := ExternalIdResponse{
ExternalId: os.Getenv(awsds.GrafanaAssumeRoleExternalIdKeyName),
ExternalId: reqCtx.Settings.GrafanaSettings.ExternalID,
}
jsonResponse, err := json.Marshal(response)
if err != nil {

22
pkg/tsdb/cloudwatch/routes/external_id_test.go
View File

@ -1,19 +1,30 @@
package routes
import (
"context"
"net/http"
"net/http/httptest"
"testing"
"github.com/grafana/grafana-aws-sdk/pkg/awsds"
"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
"github.com/stretchr/testify/assert"
)
func Test_external_id_route(t *testing.T) {
t.Run("successfully returns an external id from the env", func(t *testing.T) {
t.Run("successfully returns an external id from the instance", func(t *testing.T) {
t.Setenv("AWS_AUTH_EXTERNAL_ID", "mock-external-id")
rr := httptest.NewRecorder()
handler := http.HandlerFunc(ResourceRequestMiddleware(ExternalIdHandler, logger, nil))
factoryFunc := func(_ context.Context, _ backend.PluginContext, region string) (reqCtx models.RequestContext, err error) {
return models.RequestContext{
Settings: models.CloudWatchSettings{
GrafanaSettings: awsds.AuthSettings{ExternalID: "mock-external-id"},
},
}, nil
}
handler := http.HandlerFunc(ResourceRequestMiddleware(ExternalIdHandler, logger, factoryFunc))
req := httptest.NewRequest("GET", "/external-id", nil)
handler.ServeHTTP(rr, req)
@ -25,7 +36,12 @@ func Test_external_id_route(t *testing.T) {
t.Run("returns an empty string if there is no external id", func(t *testing.T) {
rr := httptest.NewRecorder()
handler := http.HandlerFunc(ResourceRequestMiddleware(ExternalIdHandler, logger, nil))
factoryFunc := func(_ context.Context, _ backend.PluginContext, region string) (reqCtx models.RequestContext, err error) {
return models.RequestContext{
Settings: models.CloudWatchSettings{},
}, nil
}
handler := http.HandlerFunc(ResourceRequestMiddleware(ExternalIdHandler, logger, factoryFunc))
req := httptest.NewRequest("GET", "/external-id", nil)
handler.ServeHTTP(rr, req)