IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Cloudwatch: Remove unused parameters (#45237)

Browse Source 
* Remove unused parameters

* Remove unused context

* Make plugin context first parameter
This commit is contained in:
Shirley 2022-02-10 17:15:11 +01:00 committed by GitHub
parent 642f0a250d
commit 89a0c0fc37
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 56 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/tsdb/cloudwatch/annotation_query.go
View File

@ -1,7 +1,6 @@
package cloudwatch package cloudwatch
import ( import (
"context"
"errors" "errors"
"time" "time"
@ -13,7 +12,7 @@ import (
"github.com/grafana/grafana/pkg/util/errutil" "github.com/grafana/grafana/pkg/util/errutil"
) )
func (e *cloudWatchExecutor) executeAnnotationQuery(ctx context.Context, model *simplejson.Json, query backend.DataQuery, pluginCtx backend.PluginContext) (*backend.QueryDataResponse, error) { func (e *cloudWatchExecutor) executeAnnotationQuery(pluginCtx backend.PluginContext, model *simplejson.Json, query backend.DataQuery) (*backend.QueryDataResponse, error) {
result := backend.NewQueryDataResponse() result := backend.NewQueryDataResponse()
usePrefixMatch := model.Get("prefixMatching").MustBool(false) usePrefixMatch := model.Get("prefixMatching").MustBool(false)
@ -29,7 +28,7 @@ func (e *cloudWatchExecutor) executeAnnotationQuery(ctx context.Context, model *
actionPrefix := model.Get("actionPrefix").MustString("") actionPrefix := model.Get("actionPrefix").MustString("")
alarmNamePrefix := model.Get("alarmNamePrefix").MustString("") alarmNamePrefix := model.Get("alarmNamePrefix").MustString("")
cli, err := e.getCWClient(region, pluginCtx) cli, err := e.getCWClient(pluginCtx, region)
if err != nil { if err != nil {
return nil, err return nil, err
} }

24
pkg/tsdb/cloudwatch/cloudwatch.go
View File

@ -160,7 +160,7 @@ type cloudWatchExecutor struct {
sessions SessionCache sessions SessionCache
} }
func (e *cloudWatchExecutor) newSession(region string, pluginCtx backend.PluginContext) (*session.Session, error) { func (e *cloudWatchExecutor) newSession(pluginCtx backend.PluginContext, region string) (*session.Session, error) {
dsInfo, err := e.getDSInfo(pluginCtx) dsInfo, err := e.getDSInfo(pluginCtx)
if err != nil { if err != nil {
return nil, err return nil, err
@ -187,16 +187,16 @@ func (e *cloudWatchExecutor) newSession(region string, pluginCtx backend.PluginC
}) })
} }
func (e *cloudWatchExecutor) getCWClient(region string, pluginCtx backend.PluginContext) (cloudwatchiface.CloudWatchAPI, error) { func (e *cloudWatchExecutor) getCWClient(pluginCtx backend.PluginContext, region string) (cloudwatchiface.CloudWatchAPI, error) {
sess, err := e.newSession(region, pluginCtx) sess, err := e.newSession(pluginCtx, region)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return NewCWClient(sess), nil return NewCWClient(sess), nil
} }
func (e *cloudWatchExecutor) getCWLogsClient(region string, pluginCtx backend.PluginContext) (cloudwatchlogsiface.CloudWatchLogsAPI, error) { func (e *cloudWatchExecutor) getCWLogsClient(pluginCtx backend.PluginContext, region string) (cloudwatchlogsiface.CloudWatchLogsAPI, error) {
sess, err := e.newSession(region, pluginCtx) sess, err := e.newSession(pluginCtx, region)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -206,8 +206,8 @@ func (e *cloudWatchExecutor) getCWLogsClient(region string, pluginCtx backend.Pl
return logsClient, nil return logsClient, nil
} }
func (e *cloudWatchExecutor) getEC2Client(region string, pluginCtx backend.PluginContext) (ec2iface.EC2API, error) { func (e *cloudWatchExecutor) getEC2Client(pluginCtx backend.PluginContext, region string) (ec2iface.EC2API, error) {
sess, err := e.newSession(region, pluginCtx) sess, err := e.newSession(pluginCtx, region)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -215,9 +215,9 @@ func (e *cloudWatchExecutor) getEC2Client(region string, pluginCtx backend.Plugi
return newEC2Client(sess), nil return newEC2Client(sess), nil
} }
func (e *cloudWatchExecutor) getRGTAClient(region string, pluginCtx backend.PluginContext) (resourcegroupstaggingapiiface.ResourceGroupsTaggingAPIAPI, func (e *cloudWatchExecutor) getRGTAClient(pluginCtx backend.PluginContext, region string) (resourcegroupstaggingapiiface.ResourceGroupsTaggingAPIAPI,
error) { error) {
sess, err := e.newSession(region, pluginCtx) sess, err := e.newSession(pluginCtx, region)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -284,9 +284,9 @@ func (e *cloudWatchExecutor) QueryData(ctx context.Context, req *backend.QueryDa
var result *backend.QueryDataResponse var result *backend.QueryDataResponse
switch queryType { switch queryType {
case "metricFindQuery": case "metricFindQuery":
result, err = e.executeMetricFindQuery(ctx, model, q, req.PluginContext) result, err = e.executeMetricFindQuery(req.PluginContext, model, q)
case "annotationQuery": case "annotationQuery":
result, err = e.executeAnnotationQuery(ctx, model, q, req.PluginContext) result, err = e.executeAnnotationQuery(req.PluginContext, model, q)
case "logAction": case "logAction":
result, err = e.executeLogActions(ctx, req) result, err = e.executeLogActions(ctx, req)
case "timeSeriesQuery": case "timeSeriesQuery":
@ -319,7 +319,7 @@ func (e *cloudWatchExecutor) executeLogAlertQuery(ctx context.Context, req *back
model.Set("region", dsInfo.region) model.Set("region", dsInfo.region)
} }
logsClient, err := e.getCWLogsClient(region, req.PluginContext) logsClient, err := e.getCWLogsClient(req.PluginContext, region)
if err != nil { if err != nil {
return nil, err return nil, err
} }

2
pkg/tsdb/cloudwatch/log_actions.go
View File

@ -98,7 +98,7 @@ func (e *cloudWatchExecutor) executeLogAction(ctx context.Context, model *simple
defaultRegion := dsInfo.region defaultRegion := dsInfo.region
region := model.Get("region").MustString(defaultRegion) region := model.Get("region").MustString(defaultRegion)
logsClient, err := e.getCWLogsClient(region, pluginCtx) logsClient, err := e.getCWLogsClient(pluginCtx, region)
if err != nil { if err != nil {
return nil, err return nil, err
} }

76
pkg/tsdb/cloudwatch/metric_find_query.go
View File

@ -1,7 +1,6 @@
package cloudwatch package cloudwatch
import ( import (
"context"
"errors" "errors"
"fmt" "fmt"
"reflect" "reflect"
@ -37,30 +36,30 @@ var customMetricsDimensionsMap = make(map[string]map[string]map[string]*customMe
var regionCache sync.Map var regionCache sync.Map
func (e *cloudWatchExecutor) executeMetricFindQuery(ctx context.Context, model *simplejson.Json, query backend.DataQuery, pluginCtx backend.PluginContext) (*backend.QueryDataResponse, error) { func (e *cloudWatchExecutor) executeMetricFindQuery(pluginCtx backend.PluginContext, model *simplejson.Json, query backend.DataQuery) (*backend.QueryDataResponse, error) {
subType := model.Get("subtype").MustString() subType := model.Get("subtype").MustString()
var data []suggestData var data []suggestData
var err error var err error
switch subType { switch subType {
case "regions": case "regions":
data, err = e.handleGetRegions(ctx, model, pluginCtx) data, err = e.handleGetRegions(pluginCtx)
case "namespaces": case "namespaces":
data, err = e.handleGetNamespaces(ctx, model, pluginCtx) data, err = e.handleGetNamespaces(pluginCtx)
case "metrics": case "metrics":
data, err = e.handleGetMetrics(ctx, model, pluginCtx) data, err = e.handleGetMetrics(pluginCtx, model)
case "all_metrics": case "all_metrics":
data, err = e.handleGetAllMetrics(ctx, model, pluginCtx) data, err = e.handleGetAllMetrics()
case "dimension_keys": case "dimension_keys":
data, err = e.handleGetDimensions(ctx, model, pluginCtx) data, err = e.handleGetDimensions(pluginCtx, model)
case "dimension_values": case "dimension_values":
data, err = e.handleGetDimensionValues(ctx, model, pluginCtx) data, err = e.handleGetDimensionValues(pluginCtx, model)
case "ebs_volume_ids": case "ebs_volume_ids":
data, err = e.handleGetEbsVolumeIds(ctx, model, pluginCtx) data, err = e.handleGetEbsVolumeIds(pluginCtx, model)
case "ec2_instance_attribute": case "ec2_instance_attribute":
data, err = e.handleGetEc2InstanceAttribute(ctx, model, pluginCtx) data, err = e.handleGetEc2InstanceAttribute(pluginCtx, model)
case "resource_arns": case "resource_arns":
data, err = e.handleGetResourceArns(ctx, model, pluginCtx) data, err = e.handleGetResourceArns(pluginCtx, model)
} }
if err != nil { if err != nil {
return nil, err return nil, err
@ -108,8 +107,7 @@ func parseMultiSelectValue(input string) []string {
// Whenever this list is updated, the frontend list should also be updated. // Whenever this list is updated, the frontend list should also be updated.
// Please update the region list in public/app/plugins/datasource/cloudwatch/partials/config.html // Please update the region list in public/app/plugins/datasource/cloudwatch/partials/config.html
func (e *cloudWatchExecutor) handleGetRegions(ctx context.Context, parameters *simplejson.Json, func (e *cloudWatchExecutor) handleGetRegions(pluginCtx backend.PluginContext) ([]suggestData, error) {
pluginCtx backend.PluginContext) ([]suggestData, error) {
dsInfo, err := e.getDSInfo(pluginCtx) dsInfo, err := e.getDSInfo(pluginCtx)
if err != nil { if err != nil {
return nil, err return nil, err
@ -122,7 +120,7 @@ func (e *cloudWatchExecutor) handleGetRegions(ctx context.Context, parameters *s
} }
} }
client, err := e.getEC2Client(defaultRegion, pluginCtx) client, err := e.getEC2Client(pluginCtx, defaultRegion)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -158,7 +156,7 @@ func (e *cloudWatchExecutor) handleGetRegions(ctx context.Context, parameters *s
return result, nil return result, nil
} }
func (e *cloudWatchExecutor) handleGetNamespaces(ctx context.Context, parameters *simplejson.Json, pluginCtx backend.PluginContext) ([]suggestData, error) { func (e *cloudWatchExecutor) handleGetNamespaces(pluginCtx backend.PluginContext) ([]suggestData, error) {
var keys []string var keys []string
for key := range metricsMap { for key := range metricsMap {
keys = append(keys, key) keys = append(keys, key)
@ -183,7 +181,7 @@ func (e *cloudWatchExecutor) handleGetNamespaces(ctx context.Context, parameters
return result, nil return result, nil
} }
func (e *cloudWatchExecutor) handleGetMetrics(ctx context.Context, parameters *simplejson.Json, pluginCtx backend.PluginContext) ([]suggestData, error) { func (e *cloudWatchExecutor) handleGetMetrics(pluginCtx backend.PluginContext, parameters *simplejson.Json) ([]suggestData, error) {
region := parameters.Get("region").MustString() region := parameters.Get("region").MustString()
namespace := parameters.Get("namespace").MustString() namespace := parameters.Get("namespace").MustString()
@ -210,7 +208,7 @@ func (e *cloudWatchExecutor) handleGetMetrics(ctx context.Context, parameters *s
} }
// handleGetAllMetrics returns a slice of suggestData structs with metric and its namespace // handleGetAllMetrics returns a slice of suggestData structs with metric and its namespace
func (e *cloudWatchExecutor) handleGetAllMetrics(ctx context.Context, parameters *simplejson.Json, pluginCtx backend.PluginContext) ([]suggestData, error) { func (e *cloudWatchExecutor) handleGetAllMetrics() ([]suggestData, error) {
result := make([]suggestData, 0) result := make([]suggestData, 0)
for namespace, metrics := range metricsMap { for namespace, metrics := range metricsMap {
for _, metric := range metrics { for _, metric := range metrics {
@ -224,7 +222,7 @@ func (e *cloudWatchExecutor) handleGetAllMetrics(ctx context.Context, parameters
// handleGetDimensions returns a slice of suggestData structs with dimension keys. // handleGetDimensions returns a slice of suggestData structs with dimension keys.
// If a dimension filters parameter is specified, a new api call to list metrics will be issued to load dimension keys for the given filter. // If a dimension filters parameter is specified, a new api call to list metrics will be issued to load dimension keys for the given filter.
// If no dimension filter is specified, dimension keys will be retrieved from the hard coded map in this file. // If no dimension filter is specified, dimension keys will be retrieved from the hard coded map in this file.
func (e *cloudWatchExecutor) handleGetDimensions(ctx context.Context, parameters *simplejson.Json, pluginCtx backend.PluginContext) ([]suggestData, error) { func (e *cloudWatchExecutor) handleGetDimensions(pluginCtx backend.PluginContext, parameters *simplejson.Json) ([]suggestData, error) {
region := parameters.Get("region").MustString() region := parameters.Get("region").MustString()
namespace := parameters.Get("namespace").MustString() namespace := parameters.Get("namespace").MustString()
metricName := parameters.Get("metricName").MustString("") metricName := parameters.Get("metricName").MustString("")
@ -266,7 +264,8 @@ func (e *cloudWatchExecutor) handleGetDimensions(ctx context.Context, parameters
input.MetricName = aws.String(metricName) input.MetricName = aws.String(metricName)
} }
metrics, err := e.listMetrics(region, input, pluginCtx) metrics, err := e.listMetrics(pluginCtx,
region, input)
if err != nil { if err != nil {
return nil, errutil.Wrap("unable to call AWS API", err) return nil, errutil.Wrap("unable to call AWS API", err)
@ -312,7 +311,7 @@ func (e *cloudWatchExecutor) handleGetDimensions(ctx context.Context, parameters
// handleGetDimensionValues returns a slice of suggestData structs with dimension values. // handleGetDimensionValues returns a slice of suggestData structs with dimension values.
// A call to the list metrics api is issued to retrieve the dimension values. All parameters are used as input args to the list metrics call. // A call to the list metrics api is issued to retrieve the dimension values. All parameters are used as input args to the list metrics call.
func (e *cloudWatchExecutor) handleGetDimensionValues(ctx context.Context, parameters *simplejson.Json, pluginCtx backend.PluginContext) ([]suggestData, error) { func (e *cloudWatchExecutor) handleGetDimensionValues(pluginCtx backend.PluginContext, parameters *simplejson.Json) ([]suggestData, error) {
region := parameters.Get("region").MustString() region := parameters.Get("region").MustString()
namespace := parameters.Get("namespace").MustString() namespace := parameters.Get("namespace").MustString()
metricName := parameters.Get("metricName").MustString() metricName := parameters.Get("metricName").MustString()
@ -350,7 +349,7 @@ func (e *cloudWatchExecutor) handleGetDimensionValues(ctx context.Context, param
if metricName != "" { if metricName != "" {
params.MetricName = aws.String(metricName) params.MetricName = aws.String(metricName)
} }
metrics, err := e.listMetrics(region, params, pluginCtx) metrics, err := e.listMetrics(pluginCtx, region, params)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -377,13 +376,12 @@ func (e *cloudWatchExecutor) handleGetDimensionValues(ctx context.Context, param
return result, nil return result, nil
} }
func (e *cloudWatchExecutor) handleGetEbsVolumeIds(ctx context.Context, parameters *simplejson.Json, func (e *cloudWatchExecutor) handleGetEbsVolumeIds(pluginCtx backend.PluginContext, parameters *simplejson.Json) ([]suggestData, error) {
pluginCtx backend.PluginContext) ([]suggestData, error) {
region := parameters.Get("region").MustString() region := parameters.Get("region").MustString()
instanceId := parameters.Get("instanceId").MustString() instanceId := parameters.Get("instanceId").MustString()
instanceIds := aws.StringSlice(parseMultiSelectValue(instanceId)) instanceIds := aws.StringSlice(parseMultiSelectValue(instanceId))
instances, err := e.ec2DescribeInstances(region, nil, instanceIds, pluginCtx) instances, err := e.ec2DescribeInstances(pluginCtx, region, nil, instanceIds)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -400,8 +398,7 @@ func (e *cloudWatchExecutor) handleGetEbsVolumeIds(ctx context.Context, paramete
return result, nil return result, nil
} }
func (e *cloudWatchExecutor) handleGetEc2InstanceAttribute(ctx context.Context, parameters *simplejson.Json, func (e *cloudWatchExecutor) handleGetEc2InstanceAttribute(pluginCtx backend.PluginContext, parameters *simplejson.Json) ([]suggestData, error) {
pluginCtx backend.PluginContext) ([]suggestData, error) {
region := parameters.Get("region").MustString() region := parameters.Get("region").MustString()
attributeName := parameters.Get("attributeName").MustString() attributeName := parameters.Get("attributeName").MustString()
filterJson := parameters.Get("filters").MustMap() filterJson := parameters.Get("filters").MustMap()
@ -422,7 +419,7 @@ func (e *cloudWatchExecutor) handleGetEc2InstanceAttribute(ctx context.Context,
} }
} }
instances, err := e.ec2DescribeInstances(region, filters, nil, pluginCtx) instances, err := e.ec2DescribeInstances(pluginCtx, region, filters, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -480,8 +477,7 @@ func (e *cloudWatchExecutor) handleGetEc2InstanceAttribute(ctx context.Context,
return result, nil return result, nil
} }
func (e *cloudWatchExecutor) handleGetResourceArns(ctx context.Context, parameters *simplejson.Json, func (e *cloudWatchExecutor) handleGetResourceArns(pluginCtx backend.PluginContext, parameters *simplejson.Json) ([]suggestData, error) {
pluginCtx backend.PluginContext) ([]suggestData, error) {
region := parameters.Get("region").MustString() region := parameters.Get("region").MustString()
resourceType := parameters.Get("resourceType").MustString() resourceType := parameters.Get("resourceType").MustString()
filterJson := parameters.Get("tags").MustMap() filterJson := parameters.Get("tags").MustMap()
@ -505,7 +501,7 @@ func (e *cloudWatchExecutor) handleGetResourceArns(ctx context.Context, paramete
var resourceTypes []*string var resourceTypes []*string
resourceTypes = append(resourceTypes, &resourceType) resourceTypes = append(resourceTypes, &resourceType)
resources, err := e.resourceGroupsGetResources(region, filters, resourceTypes, pluginCtx) resources, err := e.resourceGroupsGetResources(pluginCtx, region, filters, resourceTypes)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -519,8 +515,8 @@ func (e *cloudWatchExecutor) handleGetResourceArns(ctx context.Context, paramete
return result, nil return result, nil
} }
func (e *cloudWatchExecutor) listMetrics(region string, params *cloudwatch.ListMetricsInput, pluginCtx backend.PluginContext) ([]*cloudwatch.Metric, error) { func (e *cloudWatchExecutor) listMetrics(pluginCtx backend.PluginContext, region string, params *cloudwatch.ListMetricsInput) ([]*cloudwatch.Metric, error) {
client, err := e.getCWClient(region, pluginCtx) client, err := e.getCWClient(pluginCtx, region)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -544,13 +540,13 @@ func (e *cloudWatchExecutor) listMetrics(region string, params *cloudwatch.ListM
return cloudWatchMetrics, err return cloudWatchMetrics, err
} }
func (e *cloudWatchExecutor) ec2DescribeInstances(region string, filters []*ec2.Filter, instanceIds []*string, pluginCtx backend.PluginContext) (*ec2.DescribeInstancesOutput, error) { func (e *cloudWatchExecutor) ec2DescribeInstances(pluginCtx backend.PluginContext, region string, filters []*ec2.Filter, instanceIds []*string) (*ec2.DescribeInstancesOutput, error) {
params := &ec2.DescribeInstancesInput{ params := &ec2.DescribeInstancesInput{
Filters: filters, Filters: filters,
InstanceIds: instanceIds, InstanceIds: instanceIds,
} }
client, err := e.getEC2Client(region, pluginCtx) client, err := e.getEC2Client(pluginCtx, region)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -566,14 +562,14 @@ func (e *cloudWatchExecutor) ec2DescribeInstances(region string, filters []*ec2.
return &resp, nil return &resp, nil
} }
func (e *cloudWatchExecutor) resourceGroupsGetResources(region string, filters []*resourcegroupstaggingapi.TagFilter, func (e *cloudWatchExecutor) resourceGroupsGetResources(pluginCtx backend.PluginContext, region string, filters []*resourcegroupstaggingapi.TagFilter,
resourceTypes []*string, pluginCtx backend.PluginContext) (*resourcegroupstaggingapi.GetResourcesOutput, error) { resourceTypes []*string) (*resourcegroupstaggingapi.GetResourcesOutput, error) {
params := &resourcegroupstaggingapi.GetResourcesInput{ params := &resourcegroupstaggingapi.GetResourcesInput{
ResourceTypeFilters: resourceTypes, ResourceTypeFilters: resourceTypes,
TagFilters: filters, TagFilters: filters,
} }
client, err := e.getRGTAClient(region, pluginCtx) client, err := e.getRGTAClient(pluginCtx, region)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -616,9 +612,9 @@ func (e *cloudWatchExecutor) getMetricsForCustomMetrics(region, namespace string
if customMetricsMetricsMap[dsInfo.profile][dsInfo.region][namespace].Expire.After(time.Now()) { if customMetricsMetricsMap[dsInfo.profile][dsInfo.region][namespace].Expire.After(time.Now()) {
return customMetricsMetricsMap[dsInfo.profile][dsInfo.region][namespace].Cache, nil return customMetricsMetricsMap[dsInfo.profile][dsInfo.region][namespace].Cache, nil
} }
metrics, err := e.listMetrics(region, &cloudwatch.ListMetricsInput{ metrics, err := e.listMetrics(pluginCtx, region, &cloudwatch.ListMetricsInput{
Namespace: aws.String(namespace), Namespace: aws.String(namespace),
}, pluginCtx) })
if err != nil { if err != nil {
return []string{}, err return []string{}, err
} }
@ -662,7 +658,7 @@ func (e *cloudWatchExecutor) getDimensionsForCustomMetrics(region, namespace str
if customMetricsDimensionsMap[dsInfo.profile][dsInfo.region][namespace].Expire.After(time.Now()) { if customMetricsDimensionsMap[dsInfo.profile][dsInfo.region][namespace].Expire.After(time.Now()) {
return customMetricsDimensionsMap[dsInfo.profile][dsInfo.region][namespace].Cache, nil return customMetricsDimensionsMap[dsInfo.profile][dsInfo.region][namespace].Cache, nil
} }
metrics, err := e.listMetrics(region, &cloudwatch.ListMetricsInput{Namespace: aws.String(namespace)}, pluginCtx) metrics, err := e.listMetrics(pluginCtx, region, &cloudwatch.ListMetricsInput{Namespace: aws.String(namespace)})
if err != nil { if err != nil {
return []string{}, err return []string{}, err
} }

8
pkg/tsdb/cloudwatch/metric_find_query_test.go
View File

@ -687,9 +687,9 @@ func TestQuery_ListMetricsPagination(t *testing.T) {
return datasourceInfo{}, nil return datasourceInfo{}, nil
}) })
executor := newExecutor(im, &setting.Cfg{AWSListMetricsPageLimit: 3, AWSAllowedAuthProviders: []string{"default"}, AWSAssumeRoleEnabled: true}, fakeSessionCache{}) executor := newExecutor(im, &setting.Cfg{AWSListMetricsPageLimit: 3, AWSAllowedAuthProviders: []string{"default"}, AWSAssumeRoleEnabled: true}, fakeSessionCache{})
response, err := executor.listMetrics("default", &cloudwatch.ListMetricsInput{}, backend.PluginContext{ response, err := executor.listMetrics(backend.PluginContext{
DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{}, DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{},
}) }, "default", &cloudwatch.ListMetricsInput{})
require.NoError(t, err) require.NoError(t, err)
expectedMetrics := client.MetricsPerPage * executor.cfg.AWSListMetricsPageLimit expectedMetrics := client.MetricsPerPage * executor.cfg.AWSListMetricsPageLimit
@ -702,9 +702,9 @@ func TestQuery_ListMetricsPagination(t *testing.T) {
return datasourceInfo{}, nil return datasourceInfo{}, nil
}) })
executor := newExecutor(im, &setting.Cfg{AWSListMetricsPageLimit: 1000, AWSAllowedAuthProviders: []string{"default"}, AWSAssumeRoleEnabled: true}, fakeSessionCache{}) executor := newExecutor(im, &setting.Cfg{AWSListMetricsPageLimit: 1000, AWSAllowedAuthProviders: []string{"default"}, AWSAssumeRoleEnabled: true}, fakeSessionCache{})
response, err := executor.listMetrics("default", &cloudwatch.ListMetricsInput{}, backend.PluginContext{ response, err := executor.listMetrics(backend.PluginContext{
DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{}, DataSourceInstanceSettings: &backend.DataSourceInstanceSettings{},
}) }, "default", &cloudwatch.ListMetricsInput{})
require.NoError(t, err) require.NoError(t, err)
assert.Equal(t, len(metrics), len(response)) assert.Equal(t, len(metrics), len(response))

2
pkg/tsdb/cloudwatch/time_series_query.go
View File

@ -56,7 +56,7 @@ func (e *cloudWatchExecutor) executeTimeSeriesQuery(ctx context.Context, req *ba
} }
}() }()
client, err := e.getCWClient(region, req.PluginContext) client, err := e.getCWClient(req.PluginContext, region)
if err != nil { if err != nil {
return err return err
} }