mirror of https://github.com/grafana/grafana
CloudWatch: Migrate to aws-sdk-go-v2 (#103106)
* Cloudwatch: Migrate to aws-sdk-go-v2 (#99643) * CloudWatch: use PDC fix from new grafana-aws-sdkpull/102850/head
Nathan Vērzemnieks
9 months ago
committed by
GitHub
parent
3e15459d20
commit
a65cc0df93
@ -1,64 +1,53 @@ |
||||
package cloudwatch |
||||
|
||||
import ( |
||||
"github.com/aws/aws-sdk-go/aws/client" |
||||
"github.com/aws/aws-sdk-go/aws/session" |
||||
"github.com/aws/aws-sdk-go/service/cloudwatch" |
||||
"github.com/aws/aws-sdk-go/service/cloudwatch/cloudwatchiface" |
||||
"github.com/aws/aws-sdk-go/service/cloudwatchlogs" |
||||
"github.com/aws/aws-sdk-go/service/cloudwatchlogs/cloudwatchlogsiface" |
||||
"github.com/aws/aws-sdk-go/service/ec2" |
||||
"github.com/aws/aws-sdk-go/service/oam" |
||||
"github.com/aws/aws-sdk-go/service/resourcegroupstaggingapi" |
||||
"github.com/aws/aws-sdk-go/service/resourcegroupstaggingapi/resourcegroupstaggingapiiface" |
||||
"github.com/aws/aws-sdk-go-v2/aws" |
||||
"github.com/aws/aws-sdk-go-v2/service/cloudwatch" |
||||
"github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs" |
||||
"github.com/aws/aws-sdk-go-v2/service/ec2" |
||||
"github.com/aws/aws-sdk-go-v2/service/oam" |
||||
"github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi" |
||||
"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models" |
||||
) |
||||
|
||||
// NewMetricsAPI is a CloudWatch metrics api factory.
|
||||
// NewCWClient is a CloudWatch metrics api factory.
|
||||
//
|
||||
// Stubbable by tests.
|
||||
var NewMetricsAPI = func(sess *session.Session) models.CloudWatchMetricsAPIProvider { |
||||
return cloudwatch.New(sess) |
||||
var NewCWClient = func(cfg aws.Config) models.CWClient { |
||||
return cloudwatch.NewFromConfig(cfg) |
||||
} |
||||
|
||||
// NewLogsAPI is a CloudWatch logs api factory.
|
||||
//
|
||||
// Stubbable by tests.
|
||||
var NewLogsAPI = func(sess *session.Session) models.CloudWatchLogsAPIProvider { |
||||
return cloudwatchlogs.New(sess) |
||||
var NewLogsAPI = func(cfg aws.Config) models.CloudWatchLogsAPIProvider { |
||||
return cloudwatchlogs.NewFromConfig(cfg) |
||||
} |
||||
|
||||
// NewOAMAPI is a CloudWatch OAM api factory.
|
||||
// NewOAMAPI is a CloudWatch OAM API factory
|
||||
//
|
||||
// Stubbable by tests.
|
||||
var NewOAMAPI = func(sess *session.Session) models.OAMAPIProvider { |
||||
return oam.New(sess) |
||||
var NewOAMAPI = func(cfg aws.Config) models.OAMAPIProvider { |
||||
return oam.NewFromConfig(cfg) |
||||
} |
||||
|
||||
// NewCWClient is a CloudWatch client factory.
|
||||
// NewEC2API is a CloudWatch EC2 API factory
|
||||
//
|
||||
// Stubbable by tests.
|
||||
var NewCWClient = func(sess *session.Session) cloudwatchiface.CloudWatchAPI { |
||||
return cloudwatch.New(sess) |
||||
// Stubbable by tests
|
||||
var NewEC2API = func(cfg aws.Config) models.EC2APIProvider { |
||||
return ec2.NewFromConfig(cfg) |
||||
} |
||||
|
||||
// NewCWLogsClient is a CloudWatch logs client factory.
|
||||
//
|
||||
// Stubbable by tests.
|
||||
var NewCWLogsClient = func(sess *session.Session) cloudwatchlogsiface.CloudWatchLogsAPI { |
||||
return cloudwatchlogs.New(sess) |
||||
} |
||||
|
||||
// NewEC2Client is a client factory.
|
||||
//
|
||||
// Stubbable by tests.
|
||||
var NewEC2Client = func(provider client.ConfigProvider) models.EC2APIProvider { |
||||
return ec2.New(provider) |
||||
var NewCWLogsClient = func(cfg aws.Config) models.CWLogsClient { |
||||
return cloudwatchlogs.NewFromConfig(cfg) |
||||
} |
||||
|
||||
// RGTA client factory.
|
||||
// NewRGTAClient is a ResourceGroupsTaggingAPI Client factory.
|
||||
//
|
||||
// Stubbable by tests.
|
||||
var newRGTAClient = func(provider client.ConfigProvider) resourcegroupstaggingapiiface.ResourceGroupsTaggingAPIAPI { |
||||
return resourcegroupstaggingapi.New(provider) |
||||
var NewRGTAClient = func(cfg aws.Config) resourcegroupstaggingapi.GetResourcesAPIClient { |
||||
return resourcegroupstaggingapi.NewFromConfig(cfg) |
||||
} |
||||
|
||||
@ -1,71 +1,65 @@ |
||||
package mocks |
||||
|
||||
import ( |
||||
"github.com/aws/aws-sdk-go/aws" |
||||
"github.com/aws/aws-sdk-go/aws/request" |
||||
"github.com/aws/aws-sdk-go/service/cloudwatch" |
||||
"github.com/aws/aws-sdk-go/service/cloudwatch/cloudwatchiface" |
||||
"context" |
||||
|
||||
"github.com/aws/aws-sdk-go-v2/aws" |
||||
"github.com/aws/aws-sdk-go-v2/service/cloudwatch" |
||||
cloudwatchtypes "github.com/aws/aws-sdk-go-v2/service/cloudwatch/types" |
||||
|
||||
"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models" |
||||
|
||||
"github.com/stretchr/testify/mock" |
||||
) |
||||
|
||||
type FakeMetricsAPI struct { |
||||
Metrics []*cloudwatch.Metric |
||||
OwningAccounts []*string |
||||
models.CWClient |
||||
|
||||
Metrics []cloudwatchtypes.Metric |
||||
OwningAccounts []string |
||||
MetricsPerPage int |
||||
|
||||
cursor int |
||||
} |
||||
|
||||
func (c *FakeMetricsAPI) ListMetricsPagesWithContext(ctx aws.Context, input *cloudwatch.ListMetricsInput, fn func(*cloudwatch.ListMetricsOutput, bool) bool, opts ...request.Option) error { |
||||
func (c *FakeMetricsAPI) ListMetrics(_ context.Context, _ *cloudwatch.ListMetricsInput, _ ...func(*cloudwatch.Options)) (*cloudwatch.ListMetricsOutput, error) { |
||||
if c.MetricsPerPage == 0 { |
||||
c.MetricsPerPage = 1000 |
||||
} |
||||
chunks := chunkSlice(c.Metrics, c.MetricsPerPage) |
||||
|
||||
for i, metrics := range chunks { |
||||
response := fn(&cloudwatch.ListMetricsOutput{ |
||||
Metrics: metrics, |
||||
OwningAccounts: c.OwningAccounts, |
||||
}, i+1 == len(chunks)) |
||||
if !response { |
||||
break |
||||
var metrics []cloudwatchtypes.Metric |
||||
nextToken := aws.String("yes") |
||||
if c.cursor < len(c.Metrics) { |
||||
end := c.cursor + c.MetricsPerPage |
||||
if end > len(c.Metrics) { |
||||
end = len(c.Metrics) |
||||
nextToken = nil |
||||
} |
||||
metrics = c.Metrics[c.cursor:end] |
||||
} |
||||
return nil |
||||
} |
||||
c.cursor += c.MetricsPerPage |
||||
|
||||
func chunkSlice(slice []*cloudwatch.Metric, chunkSize int) [][]*cloudwatch.Metric { |
||||
var chunks [][]*cloudwatch.Metric |
||||
for { |
||||
if len(slice) == 0 { |
||||
break |
||||
} |
||||
if len(slice) < chunkSize { |
||||
chunkSize = len(slice) |
||||
} |
||||
|
||||
chunks = append(chunks, slice[0:chunkSize]) |
||||
slice = slice[chunkSize:] |
||||
} |
||||
|
||||
return chunks |
||||
return &cloudwatch.ListMetricsOutput{ |
||||
Metrics: metrics, |
||||
OwningAccounts: c.OwningAccounts, |
||||
NextToken: nextToken, |
||||
}, nil |
||||
} |
||||
|
||||
type MetricsAPI struct { |
||||
cloudwatchiface.CloudWatchAPI |
||||
mock.Mock |
||||
models.CWClient |
||||
|
||||
Metrics []*cloudwatch.Metric |
||||
Metrics []cloudwatchtypes.Metric |
||||
} |
||||
|
||||
func (m *MetricsAPI) GetMetricDataWithContext(ctx aws.Context, input *cloudwatch.GetMetricDataInput, opts ...request.Option) (*cloudwatch.GetMetricDataOutput, error) { |
||||
args := m.Called(ctx, input, opts) |
||||
func (m *MetricsAPI) GetMetricData(ctx context.Context, input *cloudwatch.GetMetricDataInput, optFns ...func(*cloudwatch.Options)) (*cloudwatch.GetMetricDataOutput, error) { |
||||
args := m.Called(ctx, input, optFns) |
||||
|
||||
return args.Get(0).(*cloudwatch.GetMetricDataOutput), args.Error(1) |
||||
} |
||||
|
||||
func (m *MetricsAPI) ListMetricsPagesWithContext(ctx aws.Context, input *cloudwatch.ListMetricsInput, fn func(*cloudwatch.ListMetricsOutput, bool) bool, opts ...request.Option) error { |
||||
fn(&cloudwatch.ListMetricsOutput{ |
||||
func (m *MetricsAPI) ListMetrics(_ context.Context, _ *cloudwatch.ListMetricsInput, _ ...func(*cloudwatch.Options)) (*cloudwatch.ListMetricsOutput, error) { |
||||
return &cloudwatch.ListMetricsOutput{ |
||||
Metrics: m.Metrics, |
||||
}, true) |
||||
|
||||
return m.Called().Error(0) |
||||
}, m.Called().Error(0) |
||||
} |
||||
|
||||
Loading…
Reference in new issue