CloudWatch: Use context in aws GetResourcesPagesWithContext (#76921)

pull/76999/head
Shabeeb Khalid 2 years ago committed by GitHub
parent 5eb0b2bedb
commit 3a9eb33b14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      pkg/tsdb/cloudwatch/metric_find_query.go
  2. 4
      pkg/tsdb/cloudwatch/test_utils.go

@ -274,7 +274,7 @@ func (e *cloudWatchExecutor) resourceGroupsGetResources(ctx context.Context, plu
} }
var resp resourcegroupstaggingapi.GetResourcesOutput var resp resourcegroupstaggingapi.GetResourcesOutput
if err := client.GetResourcesPages(params, if err := client.GetResourcesPagesWithContext(ctx, params,
func(page *resourcegroupstaggingapi.GetResourcesOutput, lastPage bool) bool { func(page *resourcegroupstaggingapi.GetResourcesOutput, lastPage bool) bool {
resp.ResourceTagMappingList = append(resp.ResourceTagMappingList, page.ResourceTagMappingList...) resp.ResourceTagMappingList = append(resp.ResourceTagMappingList, page.ResourceTagMappingList...)
return !lastPage return !lastPage

@ -187,8 +187,8 @@ type fakeRGTAClient struct {
tagMapping []*resourcegroupstaggingapi.ResourceTagMapping tagMapping []*resourcegroupstaggingapi.ResourceTagMapping
} }
func (c fakeRGTAClient) GetResourcesPages(in *resourcegroupstaggingapi.GetResourcesInput, func (c fakeRGTAClient) GetResourcesPagesWithContext(ctx context.Context, in *resourcegroupstaggingapi.GetResourcesInput,
fn func(*resourcegroupstaggingapi.GetResourcesOutput, bool) bool) error { fn func(*resourcegroupstaggingapi.GetResourcesOutput, bool) bool, opts ...request.Option) error {
fn(&resourcegroupstaggingapi.GetResourcesOutput{ fn(&resourcegroupstaggingapi.GetResourcesOutput{
ResourceTagMappingList: c.tagMapping, ResourceTagMappingList: c.tagMapping,
}, true) }, true)

Loading…
Cancel
Save