Skip to content

Commit 98e6eef

Browse files
authored
Merge pull request #20294 from hashicorp/sweeper-cur-report-definition
sweeper/aws_cur_report_definition: Checks for region support
2 parents f9743a3 + c36c03e commit 98e6eef

File tree

2 files changed

+17
-3
lines changed

2 files changed

+17
-3
lines changed

aws/cur_test.go

+8
Original file line numberDiff line numberDiff line change
@@ -97,3 +97,11 @@ func testAccGetCurRegion() string {
9797

9898
return testAccCurRegion
9999
}
100+
101+
func testAccRegionSupportsCur(region, partition string) bool {
102+
if rs, ok := endpoints.RegionsForService(endpoints.DefaultPartitions(), partition, costandusagereportservice.ServiceName); ok {
103+
_, ok := rs[region]
104+
return ok
105+
}
106+
return false
107+
}

aws/resource_aws_cur_report_definition_test.go

+9-3
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,20 @@ func init() {
2323
}
2424

2525
func testSweepCurReportDefinitions(region string) error {
26-
client, err := sharedClientForRegion(region)
26+
c, err := sharedClientForRegion(region)
2727
if err != nil {
2828
return fmt.Errorf("error getting client: %s", err)
2929
}
30-
conn := client.(*AWSClient).costandusagereportconn
30+
client := c.(*AWSClient)
31+
if !testAccRegionSupportsCur(client.region, client.partition) {
32+
log.Printf("[WARN] Skipping Cost and Usage Report Definitions sweep for %s: not supported in this region", region)
33+
return nil
34+
}
35+
36+
conn := client.costandusagereportconn
37+
3138
input := &cur.DescribeReportDefinitionsInput{}
3239
var sweeperErrs *multierror.Error
33-
3440
err = conn.DescribeReportDefinitionsPages(input, func(page *cur.DescribeReportDefinitionsOutput, lastPage bool) bool {
3541
if page == nil {
3642
return !lastPage

0 commit comments

Comments
 (0)