* 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>
166 lines
7.4 KiB
Go
166 lines
7.4 KiB
Go
package services
|
|
|
|
import (
|
|
"fmt"
|
|
"testing"
|
|
|
|
"github.com/aws/aws-sdk-go/aws"
|
|
"github.com/aws/aws-sdk-go/aws/awserr"
|
|
"github.com/aws/aws-sdk-go/service/oam"
|
|
"github.com/grafana/grafana/pkg/tsdb/cloudwatch/mocks"
|
|
"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models/resources"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/mock"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestHandleGetAccounts(t *testing.T) {
|
|
t.Run("Should return an error in case of insufficient permissions from ListSinks", func(t *testing.T) {
|
|
fakeOAMClient := &mocks.FakeOAMClient{}
|
|
fakeOAMClient.On("ListSinks", mock.Anything).Return(&oam.ListSinksOutput{}, awserr.New("AccessDeniedException",
|
|
"AWS message", nil))
|
|
accounts := NewAccountsService(fakeOAMClient)
|
|
|
|
resp, err := accounts.GetAccountsForCurrentUserOrRole()
|
|
|
|
assert.Error(t, err)
|
|
assert.Nil(t, resp)
|
|
assert.Equal(t, err.Error(), "access denied. please check your IAM policy: AWS message")
|
|
assert.ErrorIs(t, err, ErrAccessDeniedException)
|
|
})
|
|
|
|
t.Run("Should return an error in case of any error from ListSinks", func(t *testing.T) {
|
|
fakeOAMClient := &mocks.FakeOAMClient{}
|
|
fakeOAMClient.On("ListSinks", mock.Anything).Return(&oam.ListSinksOutput{}, fmt.Errorf("some error"))
|
|
accounts := NewAccountsService(fakeOAMClient)
|
|
|
|
resp, err := accounts.GetAccountsForCurrentUserOrRole()
|
|
|
|
assert.Error(t, err)
|
|
assert.Nil(t, resp)
|
|
assert.Equal(t, err.Error(), "ListSinks error: some error")
|
|
})
|
|
|
|
t.Run("Should return empty array in case no monitoring account exists", func(t *testing.T) {
|
|
fakeOAMClient := &mocks.FakeOAMClient{}
|
|
fakeOAMClient.On("ListSinks", mock.Anything).Return(&oam.ListSinksOutput{}, nil)
|
|
accounts := NewAccountsService(fakeOAMClient)
|
|
|
|
resp, err := accounts.GetAccountsForCurrentUserOrRole()
|
|
|
|
assert.NoError(t, err)
|
|
assert.Empty(t, resp)
|
|
})
|
|
|
|
t.Run("Should return one monitoring account (the first) even though ListSinks returns multiple sinks", func(t *testing.T) {
|
|
fakeOAMClient := &mocks.FakeOAMClient{}
|
|
fakeOAMClient.On("ListSinks", mock.Anything).Return(&oam.ListSinksOutput{
|
|
Items: []*oam.ListSinksItem{
|
|
{Name: aws.String("Account 1"), Arn: aws.String("arn:aws:logs:us-east-1:123456789012:log-group:my-log-group1")},
|
|
{Name: aws.String("Account 2"), Arn: aws.String("arn:aws:logs:us-east-1:123456789012:log-group:my-log-group2")},
|
|
},
|
|
NextToken: new(string),
|
|
}, nil).Once()
|
|
fakeOAMClient.On("ListSinks", mock.Anything).Return(&oam.ListSinksOutput{
|
|
Items: []*oam.ListSinksItem{
|
|
{Name: aws.String("Account 3"), Arn: aws.String("arn:aws:logs:us-east-1:123456789012:log-group:my-log-group3")},
|
|
},
|
|
NextToken: nil,
|
|
}, nil)
|
|
fakeOAMClient.On("ListAttachedLinks", mock.Anything).Return(&oam.ListAttachedLinksOutput{}, nil)
|
|
accounts := NewAccountsService(fakeOAMClient)
|
|
|
|
resp, err := accounts.GetAccountsForCurrentUserOrRole()
|
|
|
|
assert.NoError(t, err)
|
|
fakeOAMClient.AssertNumberOfCalls(t, "ListSinks", 2)
|
|
require.Len(t, resp, 1)
|
|
assert.True(t, resp[0].Value.IsMonitoringAccount)
|
|
assert.Equal(t, "Account 1", resp[0].Value.Label)
|
|
assert.Equal(t, "arn:aws:logs:us-east-1:123456789012:log-group:my-log-group1", resp[0].Value.Arn)
|
|
})
|
|
|
|
t.Run("Should merge the first sink with attached links", func(t *testing.T) {
|
|
fakeOAMClient := &mocks.FakeOAMClient{}
|
|
fakeOAMClient.On("ListSinks", mock.Anything).Return(&oam.ListSinksOutput{
|
|
Items: []*oam.ListSinksItem{
|
|
{Name: aws.String("Account 1"), Arn: aws.String("arn:aws:logs:us-east-1:123456789012:log-group:my-log-group1")},
|
|
{Name: aws.String("Account 2"), Arn: aws.String("arn:aws:logs:us-east-1:123456789012:log-group:my-log-group2")},
|
|
},
|
|
NextToken: new(string),
|
|
}, nil).Once()
|
|
fakeOAMClient.On("ListSinks", mock.Anything).Return(&oam.ListSinksOutput{
|
|
Items: []*oam.ListSinksItem{
|
|
{Name: aws.String("Account 3"), Arn: aws.String("arn:aws:logs:us-east-1:123456789012:log-group:my-log-group3")},
|
|
},
|
|
NextToken: nil,
|
|
}, nil)
|
|
fakeOAMClient.On("ListAttachedLinks", mock.Anything).Return(&oam.ListAttachedLinksOutput{
|
|
Items: []*oam.ListAttachedLinksItem{
|
|
{Label: aws.String("Account 10"), LinkArn: aws.String("arn:aws:logs:us-east-1:123456789013:log-group:my-log-group10")},
|
|
{Label: aws.String("Account 11"), LinkArn: aws.String("arn:aws:logs:us-east-1:123456789014:log-group:my-log-group11")},
|
|
},
|
|
NextToken: new(string),
|
|
}, nil).Once()
|
|
fakeOAMClient.On("ListAttachedLinks", mock.Anything).Return(&oam.ListAttachedLinksOutput{
|
|
Items: []*oam.ListAttachedLinksItem{
|
|
{Label: aws.String("Account 12"), LinkArn: aws.String("arn:aws:logs:us-east-1:123456789012:log-group:my-log-group12")},
|
|
},
|
|
NextToken: nil,
|
|
}, nil)
|
|
accounts := NewAccountsService(fakeOAMClient)
|
|
|
|
resp, err := accounts.GetAccountsForCurrentUserOrRole()
|
|
|
|
assert.NoError(t, err)
|
|
fakeOAMClient.AssertNumberOfCalls(t, "ListSinks", 2)
|
|
fakeOAMClient.AssertNumberOfCalls(t, "ListAttachedLinks", 2)
|
|
expectedAccounts := []resources.ResourceResponse[resources.Account]{
|
|
{Value: resources.Account{Id: "123456789012", Label: "Account 1", Arn: "arn:aws:logs:us-east-1:123456789012:log-group:my-log-group1", IsMonitoringAccount: true}},
|
|
{Value: resources.Account{Id: "123456789013", Label: "Account 10", Arn: "arn:aws:logs:us-east-1:123456789013:log-group:my-log-group10", IsMonitoringAccount: false}},
|
|
{Value: resources.Account{Id: "123456789014", Label: "Account 11", Arn: "arn:aws:logs:us-east-1:123456789014:log-group:my-log-group11", IsMonitoringAccount: false}},
|
|
{Value: resources.Account{Id: "123456789012", Label: "Account 12", Arn: "arn:aws:logs:us-east-1:123456789012:log-group:my-log-group12", IsMonitoringAccount: false}},
|
|
}
|
|
assert.Equal(t, expectedAccounts, resp)
|
|
})
|
|
|
|
t.Run("Should call ListAttachedLinks with arn of first sink", func(t *testing.T) {
|
|
fakeOAMClient := &mocks.FakeOAMClient{}
|
|
fakeOAMClient.On("ListSinks", mock.Anything).Return(&oam.ListSinksOutput{
|
|
Items: []*oam.ListSinksItem{
|
|
{Name: aws.String("Account 1"), Arn: aws.String("arn:aws:logs:us-east-1:123456789012:log-group:my-log-group1")},
|
|
},
|
|
NextToken: new(string),
|
|
}, nil).Once()
|
|
fakeOAMClient.On("ListSinks", mock.Anything).Return(&oam.ListSinksOutput{
|
|
Items: []*oam.ListSinksItem{
|
|
{Name: aws.String("Account 3"), Arn: aws.String("arn:aws:logs:us-east-1:123456789012:log-group:my-log-group3")},
|
|
},
|
|
NextToken: nil,
|
|
}, nil).Once()
|
|
fakeOAMClient.On("ListAttachedLinks", mock.Anything).Return(&oam.ListAttachedLinksOutput{}, nil)
|
|
accounts := NewAccountsService(fakeOAMClient)
|
|
|
|
_, _ = accounts.GetAccountsForCurrentUserOrRole()
|
|
|
|
fakeOAMClient.AssertCalled(t, "ListAttachedLinks", &oam.ListAttachedLinksInput{
|
|
SinkIdentifier: aws.String("arn:aws:logs:us-east-1:123456789012:log-group:my-log-group1"),
|
|
})
|
|
})
|
|
|
|
t.Run("Should return an error in case of any error from ListAttachedLinks", func(t *testing.T) {
|
|
fakeOAMClient := &mocks.FakeOAMClient{}
|
|
fakeOAMClient.On("ListSinks", mock.Anything).Return(&oam.ListSinksOutput{
|
|
Items: []*oam.ListSinksItem{{Name: aws.String("Account 1"), Arn: aws.String("arn:aws:logs:us-east-1:123456789012:log-group:my-log-group1")}},
|
|
}, nil)
|
|
fakeOAMClient.On("ListAttachedLinks", mock.Anything).Return(&oam.ListAttachedLinksOutput{}, fmt.Errorf("some error")).Once()
|
|
accounts := NewAccountsService(fakeOAMClient)
|
|
|
|
resp, err := accounts.GetAccountsForCurrentUserOrRole()
|
|
|
|
assert.Error(t, err)
|
|
assert.Nil(t, resp)
|
|
assert.Equal(t, err.Error(), "ListAttachedLinks error: some error")
|
|
})
|
|
}
|