mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
9dc6cac1f2
* Use context in aws DescribeRegionsWithContext In the current way, DescribeRegions is used which doesn't allow cancelling the request if the context changes. Using DescribeRegionsWithContext is the preferred way. * Fix context variable * Revert GetRegionsWithContext to GetRegions GetRegions is not an AWS SDK method. Hence, GetRegions should be enough as the name change is not needed for context implementation.
63 lines
1.7 KiB
Go
63 lines
1.7 KiB
Go
package services
|
|
|
|
import (
|
|
"context"
|
|
"sort"
|
|
|
|
"github.com/aws/aws-sdk-go/service/ec2"
|
|
"github.com/grafana/grafana/pkg/infra/log"
|
|
"github.com/grafana/grafana/pkg/tsdb/cloudwatch/constants"
|
|
"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
|
|
"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models/resources"
|
|
)
|
|
|
|
type RegionsService struct {
|
|
models.EC2APIProvider
|
|
log.Logger
|
|
}
|
|
|
|
func NewRegionsService(ec2client models.EC2APIProvider, logger log.Logger) models.RegionsAPIProvider {
|
|
return &RegionsService{
|
|
ec2client,
|
|
logger,
|
|
}
|
|
}
|
|
|
|
func mergeEC2RegionsAndConstantRegions(regions map[string]struct{}, ec2Regions []*ec2.Region) {
|
|
for _, region := range ec2Regions {
|
|
if _, ok := regions[*region.RegionName]; !ok {
|
|
regions[*region.RegionName] = struct{}{}
|
|
}
|
|
}
|
|
}
|
|
|
|
func (r *RegionsService) GetRegions(ctx context.Context) ([]resources.ResourceResponse[resources.Region], error) {
|
|
regions := constants.Regions()
|
|
|
|
result := make([]resources.ResourceResponse[resources.Region], 0)
|
|
|
|
ec2Regions, err := r.DescribeRegionsWithContext(ctx, &ec2.DescribeRegionsInput{})
|
|
// we ignore this error and always send default regions
|
|
// we only fetch incase a user has enabled additional regions
|
|
// but we still log it in case the user is expecting to fetch regions specific to their account and are unable to
|
|
if err != nil {
|
|
r.Error("Failed to get regions: ", "error", err)
|
|
}
|
|
|
|
mergeEC2RegionsAndConstantRegions(regions, ec2Regions.Regions)
|
|
|
|
for region := range regions {
|
|
result = append(result, resources.ResourceResponse[resources.Region]{
|
|
Value: resources.Region{
|
|
Name: region,
|
|
},
|
|
})
|
|
}
|
|
|
|
sort.Slice(result, func(i, j int) bool {
|
|
return result[i].Value.Name < result[j].Value.Name
|
|
})
|
|
|
|
return result, nil
|
|
}
|