* Lattice: Point to private prerelease of aws-sdk-go (#515) * point to private prerelease of aws-sdk-go * fix build issue * Lattice: Adding a feature toggle (#549) * Adding a feature toggle for lattice * Change name of feature toggle * Lattice: List accounts (#543) * Separate layers * Introduce testify/mock library Co-authored-by: Shirley Leu <4163034+fridgepoet@users.noreply.github.com> * point to version that includes metric api changes (#574) * add accounts component (#575) * Test refactor: remove unneeded clientFactoryMock (#581) * Lattice: Add monitoring badge (#576) * add monitoring badge * fix tests * solve conflict * Lattice: Add dynamic label for account display name (#579) * Build: Automatically sync lattice-main with OSS * Lattice: Point to private prerelease of aws-sdk-go (#515) * point to private prerelease of aws-sdk-go * fix build issue * Lattice: Adding a feature toggle (#549) * Adding a feature toggle for lattice * Change name of feature toggle * Lattice: List accounts (#543) * Separate layers * Introduce testify/mock library Co-authored-by: Shirley Leu <4163034+fridgepoet@users.noreply.github.com> * point to version that includes metric api changes (#574) * add accounts component (#575) * Test refactor: remove unneeded clientFactoryMock (#581) * Lattice: Add monitoring badge (#576) * add monitoring badge * fix tests * solve conflict * add account label Co-authored-by: Shirley Leu <4163034+fridgepoet@users.noreply.github.com> Co-authored-by: Sarah Zinger <sarah.zinger@grafana.com> * fix import * solve merge related problem * add account info (#608) * add back namespaces handler * Lattice: Parse account id and return it to frontend (#609) * parse account id and return to frontend * fix route test * only show badge when feature toggle is enabled (#615) * Lattice: Refactor resource response type and return account (#613) * refactor resource response type * remove not used file. * go lint * fix tests * remove commented code * Lattice: Use account as input when listing metric names and dimensions (#611) * use account in resource requests * add account to response * revert accountInfo to accountId * PR feedback * unit test account in list metrics response * remove not used asserts * don't assert on response that is not relevant to the test * removed dupe test * pr feedback * rename request package (#626) * Lattice: Move account component and add tooltip (#630) * move accounts component to the top of metric stat editor * add tooltip * CloudWatch: add account to GetMetricData queries (#627) * Add AccountId to metric stat query * Lattice: Account variable support (#625) * add variable support in accounts component * add account variable query type * update variables * interpolate variable before its sent to backend * handle variable change in hooks * remove not used import * Update public/app/plugins/datasource/cloudwatch/components/Account.tsx Co-authored-by: Sarah Zinger <sarah.zinger@grafana.com> * Update public/app/plugins/datasource/cloudwatch/hooks.ts Co-authored-by: Sarah Zinger <sarah.zinger@grafana.com> * add one more unit test Co-authored-by: Sarah Zinger <sarah.zinger@grafana.com> * cleanup (#629) * Set account Id according to crossAccountQuerying feature flag in backend (#632) * CloudWatch: Change spelling of feature-toggle (#634) * Lattice Logs (#631) * Lattice Logs * Fixes after CR * Lattice: Bug: fix dimension keys request (#644) * fix dimension keys * fix lint * more lint * CloudWatch: Add tests for QueryData with AccountId (#637) * Update from breaking change (#645) * Update from breaking change * Remove extra interface and methods Co-authored-by: Shirley Leu <4163034+fridgepoet@users.noreply.github.com> * CloudWatch: Add business logic layer for getting log groups (#642) Co-authored-by: Sarah Zinger <sarah.zinger@grafana.com> * Lattice: Fix - unset account id in region change handler (#646) * move reset of account to region change handler * fix broken test * Lattice: Add account id to metric stat query deep link (#656) add account id to metric stat link * CloudWatch: Add new log groups handler for cross-account querying (#643) * Lattice: Add feature tracking (#660) * add tracking for account id prescense in metrics query * also check feature toggle * fix broken test * CloudWatch: Add route for DescribeLogGroups for cross-account querying (#647) Co-authored-by: Erik Sundell <erik.sundell87@gmail.com> * Lattice: Handle account id default value (#662) * make sure right type is returned * set right default values * Suggestions to lattice changes (#663) * Change ListMetricsWithPageLimit response to slice of non-pointers * Change GetAccountsForCurrentUserOrRole response to be not pointer * Clean test Cleanup calls in test * Remove CloudWatchAPI as part of mock * Resolve conflicts * Add Latest SDK (#672) * add tooltip (#674) * Docs: Add documentation for CloudWatch cross account querying (#676) * wip docs * change wordings * add sections about metrics and logs * change from monitoring to observability * Update docs/sources/datasources/aws-cloudwatch/_index.md Co-authored-by: Sarah Zinger <sarah.zinger@grafana.com> * Update docs/sources/datasources/aws-cloudwatch/query-editor/index.md Co-authored-by: Fiona Artiaga <89225282+GrafanaWriter@users.noreply.github.com> * Update docs/sources/datasources/aws-cloudwatch/query-editor/index.md Co-authored-by: Fiona Artiaga <89225282+GrafanaWriter@users.noreply.github.com> * Update docs/sources/datasources/aws-cloudwatch/query-editor/index.md Co-authored-by: Sarah Zinger <sarah.zinger@grafana.com> * Update docs/sources/datasources/aws-cloudwatch/query-editor/index.md Co-authored-by: Fiona Artiaga <89225282+GrafanaWriter@users.noreply.github.com> * apply pr feedback * fix file name * more pr feedback * pr feedback Co-authored-by: Sarah Zinger <sarah.zinger@grafana.com> Co-authored-by: Fiona Artiaga <89225282+GrafanaWriter@users.noreply.github.com> * use latest version of the aws-sdk-go * Fix tests' mock response type * Remove change in Azure Monitor Co-authored-by: Sarah Zinger <sarah.zinger@grafana.com> Co-authored-by: Shirley Leu <4163034+fridgepoet@users.noreply.github.com> Co-authored-by: Fiona Artiaga <89225282+GrafanaWriter@users.noreply.github.com>
241 lines
9.8 KiB
Go
241 lines
9.8 KiB
Go
package routes
|
|
|
|
import (
|
|
"fmt"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"testing"
|
|
|
|
"github.com/grafana/grafana-plugin-sdk-go/backend"
|
|
"github.com/grafana/grafana/pkg/services/featuremgmt"
|
|
"github.com/grafana/grafana/pkg/tsdb/cloudwatch/mocks"
|
|
"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
|
|
"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models/resources"
|
|
"github.com/grafana/grafana/pkg/tsdb/cloudwatch/utils"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/mock"
|
|
)
|
|
|
|
func Test_log_groups_route(t *testing.T) {
|
|
origLogGroupsService := newLogGroupsService
|
|
t.Cleanup(func() {
|
|
newLogGroupsService = origLogGroupsService
|
|
})
|
|
|
|
mockFeatures := mocks.MockFeatures{}
|
|
mockFeatures.On("IsEnabled", featuremgmt.FlagCloudWatchCrossAccountQuerying).Return(false)
|
|
reqCtxFunc := func(pluginCtx backend.PluginContext, region string) (reqCtx models.RequestContext, err error) {
|
|
return models.RequestContext{Features: &mockFeatures}, err
|
|
}
|
|
|
|
t.Run("successfully returns 1 log group with account id", func(t *testing.T) {
|
|
mockLogsService := mocks.LogsService{}
|
|
mockLogsService.On("GetLogGroups", mock.Anything).Return([]resources.ResourceResponse[resources.LogGroup]{{
|
|
Value: resources.LogGroup{
|
|
Arn: "some arn",
|
|
Name: "some name",
|
|
},
|
|
AccountId: utils.Pointer("111"),
|
|
}}, nil)
|
|
newLogGroupsService = func(pluginCtx backend.PluginContext, reqCtxFactory models.RequestContextFactoryFunc, region string) (models.LogGroupsProvider, error) {
|
|
return &mockLogsService, nil
|
|
}
|
|
|
|
rr := httptest.NewRecorder()
|
|
req := httptest.NewRequest("GET", "/log-groups", nil)
|
|
handler := http.HandlerFunc(ResourceRequestMiddleware(LogGroupsHandler, logger, reqCtxFunc))
|
|
handler.ServeHTTP(rr, req)
|
|
|
|
assert.Equal(t, http.StatusOK, rr.Code)
|
|
assert.JSONEq(t, `[{"value":{"name":"some name", "arn":"some arn"},"accountId":"111"}]`, rr.Body.String())
|
|
})
|
|
|
|
t.Run("successfully returns multiple log groups with account id", func(t *testing.T) {
|
|
mockLogsService := mocks.LogsService{}
|
|
mockLogsService.On("GetLogGroups", mock.Anything).Return(
|
|
[]resources.ResourceResponse[resources.LogGroup]{
|
|
{
|
|
Value: resources.LogGroup{
|
|
Arn: "arn 1",
|
|
Name: "name 1",
|
|
},
|
|
AccountId: utils.Pointer("111"),
|
|
}, {
|
|
Value: resources.LogGroup{
|
|
Arn: "arn 2",
|
|
Name: "name 2",
|
|
},
|
|
AccountId: utils.Pointer("222"),
|
|
},
|
|
}, nil)
|
|
newLogGroupsService = func(pluginCtx backend.PluginContext, reqCtxFactory models.RequestContextFactoryFunc, region string) (models.LogGroupsProvider, error) {
|
|
return &mockLogsService, nil
|
|
}
|
|
|
|
rr := httptest.NewRecorder()
|
|
req := httptest.NewRequest("GET", "/log-groups", nil)
|
|
handler := http.HandlerFunc(ResourceRequestMiddleware(LogGroupsHandler, logger, reqCtxFunc))
|
|
handler.ServeHTTP(rr, req)
|
|
|
|
assert.Equal(t, http.StatusOK, rr.Code)
|
|
assert.JSONEq(t, `[
|
|
{
|
|
"value":{
|
|
"name":"name 1",
|
|
"arn":"arn 1"
|
|
},
|
|
"accountId":"111"
|
|
},
|
|
{
|
|
"value":{
|
|
"name":"name 2",
|
|
"arn":"arn 2"
|
|
},
|
|
"accountId":"222"
|
|
}
|
|
]`, rr.Body.String())
|
|
})
|
|
|
|
t.Run("returns error when both logGroupPrefix and logGroup Pattern are provided", func(t *testing.T) {
|
|
mockLogsService := mocks.LogsService{}
|
|
mockLogsService.On("GetLogGroups", mock.Anything).Return([]resources.ResourceResponse[resources.LogGroup]{}, nil)
|
|
newLogGroupsService = func(pluginCtx backend.PluginContext, reqCtxFactory models.RequestContextFactoryFunc, region string) (models.LogGroupsProvider, error) {
|
|
return &mockLogsService, nil
|
|
}
|
|
|
|
rr := httptest.NewRecorder()
|
|
req := httptest.NewRequest("GET", "/log-groups?logGroupNamePrefix=some-prefix&logGroupPattern=some-pattern", nil)
|
|
handler := http.HandlerFunc(ResourceRequestMiddleware(LogGroupsHandler, logger, reqCtxFunc))
|
|
handler.ServeHTTP(rr, req)
|
|
|
|
assert.Equal(t, http.StatusBadRequest, rr.Code)
|
|
assert.JSONEq(t, `{"Error":"cannot set both log group name prefix and pattern", "Message":"cannot set both log group name prefix and pattern: cannot set both log group name prefix and pattern", "StatusCode":400}`, rr.Body.String())
|
|
})
|
|
|
|
t.Run("passes default log group limit and nil for logGroupNamePrefix, accountId, and logGroupPattern", func(t *testing.T) {
|
|
mockLogsService := mocks.LogsService{}
|
|
mockLogsService.On("GetLogGroups", mock.Anything).Return([]resources.ResourceResponse[resources.LogGroup]{}, nil)
|
|
newLogGroupsService = func(pluginCtx backend.PluginContext, reqCtxFactory models.RequestContextFactoryFunc, region string) (models.LogGroupsProvider, error) {
|
|
return &mockLogsService, nil
|
|
}
|
|
|
|
rr := httptest.NewRecorder()
|
|
req := httptest.NewRequest("GET", "/log-groups", nil)
|
|
handler := http.HandlerFunc(ResourceRequestMiddleware(LogGroupsHandler, logger, reqCtxFunc))
|
|
handler.ServeHTTP(rr, req)
|
|
|
|
mockLogsService.AssertCalled(t, "GetLogGroups", resources.LogGroupsRequest{
|
|
Limit: 50,
|
|
ResourceRequest: resources.ResourceRequest{},
|
|
LogGroupNamePrefix: nil,
|
|
LogGroupNamePattern: nil,
|
|
})
|
|
})
|
|
|
|
t.Run("passes default log group limit and nil for logGroupNamePrefix when both are absent", func(t *testing.T) {
|
|
mockLogsService := mocks.LogsService{}
|
|
mockLogsService.On("GetLogGroups", mock.Anything).Return([]resources.ResourceResponse[resources.LogGroup]{}, nil)
|
|
newLogGroupsService = func(pluginCtx backend.PluginContext, reqCtxFactory models.RequestContextFactoryFunc, region string) (models.LogGroupsProvider, error) {
|
|
return &mockLogsService, nil
|
|
}
|
|
|
|
rr := httptest.NewRecorder()
|
|
req := httptest.NewRequest("GET", "/log-groups", nil)
|
|
handler := http.HandlerFunc(ResourceRequestMiddleware(LogGroupsHandler, logger, reqCtxFunc))
|
|
handler.ServeHTTP(rr, req)
|
|
|
|
mockLogsService.AssertCalled(t, "GetLogGroups", resources.LogGroupsRequest{
|
|
Limit: 50,
|
|
LogGroupNamePrefix: nil,
|
|
})
|
|
})
|
|
|
|
t.Run("passes log group limit from query parameter", func(t *testing.T) {
|
|
mockLogsService := mocks.LogsService{}
|
|
mockLogsService.On("GetLogGroups", mock.Anything).Return([]resources.ResourceResponse[resources.LogGroup]{}, nil)
|
|
newLogGroupsService = func(pluginCtx backend.PluginContext, reqCtxFactory models.RequestContextFactoryFunc, region string) (models.LogGroupsProvider, error) {
|
|
return &mockLogsService, nil
|
|
}
|
|
|
|
rr := httptest.NewRecorder()
|
|
req := httptest.NewRequest("GET", "/log-groups?limit=2", nil)
|
|
handler := http.HandlerFunc(ResourceRequestMiddleware(LogGroupsHandler, logger, reqCtxFunc))
|
|
handler.ServeHTTP(rr, req)
|
|
|
|
mockLogsService.AssertCalled(t, "GetLogGroups", resources.LogGroupsRequest{
|
|
Limit: 2,
|
|
})
|
|
})
|
|
|
|
t.Run("passes logGroupPrefix from query parameter", func(t *testing.T) {
|
|
mockLogsService := mocks.LogsService{}
|
|
mockLogsService.On("GetLogGroups", mock.Anything).Return([]resources.ResourceResponse[resources.LogGroup]{}, nil)
|
|
newLogGroupsService = func(pluginCtx backend.PluginContext, reqCtxFactory models.RequestContextFactoryFunc, region string) (models.LogGroupsProvider, error) {
|
|
return &mockLogsService, nil
|
|
}
|
|
|
|
rr := httptest.NewRecorder()
|
|
req := httptest.NewRequest("GET", "/log-groups?logGroupNamePrefix=some-prefix", nil)
|
|
handler := http.HandlerFunc(ResourceRequestMiddleware(LogGroupsHandler, logger, reqCtxFunc))
|
|
handler.ServeHTTP(rr, req)
|
|
|
|
mockLogsService.AssertCalled(t, "GetLogGroups", resources.LogGroupsRequest{
|
|
Limit: 50,
|
|
LogGroupNamePrefix: utils.Pointer("some-prefix"),
|
|
})
|
|
})
|
|
|
|
t.Run("passes logGroupPattern from query parameter", func(t *testing.T) {
|
|
mockLogsService := mocks.LogsService{}
|
|
mockLogsService.On("GetLogGroups", mock.Anything).Return([]resources.ResourceResponse[resources.LogGroup]{}, nil)
|
|
newLogGroupsService = func(pluginCtx backend.PluginContext, reqCtxFactory models.RequestContextFactoryFunc, region string) (models.LogGroupsProvider, error) {
|
|
return &mockLogsService, nil
|
|
}
|
|
|
|
rr := httptest.NewRecorder()
|
|
req := httptest.NewRequest("GET", "/log-groups?logGroupPattern=some-pattern", nil)
|
|
handler := http.HandlerFunc(ResourceRequestMiddleware(LogGroupsHandler, logger, reqCtxFunc))
|
|
handler.ServeHTTP(rr, req)
|
|
|
|
mockLogsService.AssertCalled(t, "GetLogGroups", resources.LogGroupsRequest{
|
|
Limit: 50,
|
|
LogGroupNamePattern: utils.Pointer("some-pattern"),
|
|
})
|
|
})
|
|
|
|
t.Run("passes logGroupPattern from query parameter", func(t *testing.T) {
|
|
mockLogsService := mocks.LogsService{}
|
|
mockLogsService.On("GetLogGroups", mock.Anything).Return([]resources.ResourceResponse[resources.LogGroup]{}, nil)
|
|
newLogGroupsService = func(pluginCtx backend.PluginContext, reqCtxFactory models.RequestContextFactoryFunc, region string) (models.LogGroupsProvider, error) {
|
|
return &mockLogsService, nil
|
|
}
|
|
|
|
rr := httptest.NewRecorder()
|
|
req := httptest.NewRequest("GET", "/log-groups?accountId=some-account-id", nil)
|
|
handler := http.HandlerFunc(ResourceRequestMiddleware(LogGroupsHandler, logger, reqCtxFunc))
|
|
handler.ServeHTTP(rr, req)
|
|
|
|
mockLogsService.AssertCalled(t, "GetLogGroups", resources.LogGroupsRequest{
|
|
Limit: 50,
|
|
ResourceRequest: resources.ResourceRequest{AccountId: utils.Pointer("some-account-id")},
|
|
})
|
|
})
|
|
|
|
t.Run("returns error if service returns error", func(t *testing.T) {
|
|
mockLogsService := mocks.LogsService{}
|
|
mockLogsService.On("GetLogGroups", mock.Anything).
|
|
Return([]resources.ResourceResponse[resources.LogGroup]{}, fmt.Errorf("some error"))
|
|
newLogGroupsService = func(pluginCtx backend.PluginContext, reqCtxFactory models.RequestContextFactoryFunc, region string) (models.LogGroupsProvider, error) {
|
|
return &mockLogsService, nil
|
|
}
|
|
|
|
rr := httptest.NewRecorder()
|
|
req := httptest.NewRequest("GET", "/log-groups", nil)
|
|
handler := http.HandlerFunc(ResourceRequestMiddleware(LogGroupsHandler, logger, reqCtxFunc))
|
|
handler.ServeHTTP(rr, req)
|
|
|
|
assert.Equal(t, http.StatusInternalServerError, rr.Code)
|
|
assert.JSONEq(t, `{"Error":"some error","Message":"GetLogGroups error: some error","StatusCode":500}`, rr.Body.String())
|
|
})
|
|
}
|