Skip to content

Commit 853b1dc

Browse files
gdavisongdavison
authored
Merge pull request hashicorp#32515 from hashicorp/b-sweep-ses
sweepers: Fixes
2 parents d040180 + 140bc0c commit 853b1dc

File tree

5 files changed

+29
-16
lines changed

5 files changed

+29
-16
lines changed

‎GNUmakefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
SWEEP ?= us-west-2,us-east-1,us-east-2
1+
SWEEP ?= us-west-2,us-east-1,us-east-2,us-west-1
22
TEST ?= ./...
33
SWEEP_DIR ?= ./internal/sweep
44
PKG_NAME ?= internal

‎internal/service/opensearchserverless/sweep.go

+12-6
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
"github.com/aws/aws-sdk-go-v2/aws"
1414
"github.com/aws/aws-sdk-go-v2/service/opensearchserverless"
1515
"github.com/aws/aws-sdk-go-v2/service/opensearchserverless/types"
16+
"github.com/hashicorp/aws-sdk-go-base/v2/tfawserr"
1617
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
1718
"github.com/hashicorp/terraform-provider-aws/internal/sweep"
1819
"github.com/hashicorp/terraform-provider-aws/internal/sweep/awsv2"
@@ -60,7 +61,7 @@ func sweepAccessPolicies(region string) error {
6061

6162
for pages.HasMorePages() {
6263
page, err := pages.NextPage(ctx)
63-
if awsv2.SkipSweepError(err) {
64+
if awsv2.SkipSweepError(err) || skipSweepErr(err) {
6465
log.Printf("[WARN] Skipping OpenSearch Serverless Access Policies sweep for %s: %s", region, err)
6566
return nil
6667
}
@@ -103,7 +104,7 @@ func sweepCollections(region string) error {
103104

104105
for pages.HasMorePages() {
105106
page, err := pages.NextPage(ctx)
106-
if awsv2.SkipSweepError(err) {
107+
if awsv2.SkipSweepError(err) || skipSweepErr(err) {
107108
log.Printf("[WARN] Skipping OpenSearch Serverless Collections sweep for %s: %s", region, err)
108109
return nil
109110
}
@@ -146,7 +147,7 @@ func sweepSecurityConfigs(region string) error {
146147

147148
for pages.HasMorePages() {
148149
page, err := pages.NextPage(ctx)
149-
if awsv2.SkipSweepError(err) {
150+
if awsv2.SkipSweepError(err) || skipSweepErr(err) {
150151
log.Printf("[WARN] Skipping OpenSearch Serverless Security Configs sweep for %s: %s", region, err)
151152
return nil
152153
}
@@ -189,7 +190,7 @@ func sweepSecurityPolicies(region string) error {
189190

190191
for pagesEncryption.HasMorePages() {
191192
page, err := pagesEncryption.NextPage(ctx)
192-
if awsv2.SkipSweepError(err) {
193+
if awsv2.SkipSweepError(err) || skipSweepErr(err) {
193194
log.Printf("[WARN] Skipping OpenSearch Serverless Security Policies sweep for %s: %s", region, err)
194195
return nil
195196
}
@@ -216,7 +217,7 @@ func sweepSecurityPolicies(region string) error {
216217

217218
for pagesNetwork.HasMorePages() {
218219
page, err := pagesNetwork.NextPage(ctx)
219-
if awsv2.SkipSweepError(err) {
220+
if awsv2.SkipSweepError(err) || skipSweepErr(err) {
220221
log.Printf("[WARN] Skipping OpenSearch Serverless Security Policies sweep for %s: %s", region, err)
221222
return nil
222223
}
@@ -259,7 +260,7 @@ func sweepVPCEndpoints(region string) error {
259260

260261
for pages.HasMorePages() {
261262
page, err := pages.NextPage(ctx)
262-
if awsv2.SkipSweepError(err) {
263+
if awsv2.SkipSweepError(err) || skipSweepErr(err) {
263264
log.Printf("[WARN] Skipping OpenSearch Serverless VPC Endpoints sweep for %s: %s", region, err)
264265
return nil
265266
}
@@ -283,3 +284,8 @@ func sweepVPCEndpoints(region string) error {
283284

284285
return nil
285286
}
287+
288+
func skipSweepErr(err error) bool {
289+
// OpenSearch Serverless returns this error when the service is not supported in the region
290+
return tfawserr.ErrMessageContains(err, "AccessDeniedException", "UnknownError")
291+
}

‎internal/service/route53resolver/sweep.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ func init() {
6868

6969
resource.AddTestSweepers("aws_route53_resolver_query_log_config_association", &resource.Sweeper{
7070
Name: "aws_route53_resolver_query_log_config_association",
71-
F: sweepQueryLogAssociationsConfigs,
71+
F: sweepQueryLogConfigAssociations,
7272
})
7373

7474
resource.AddTestSweepers("aws_route53_resolver_query_log_config", &resource.Sweeper{
@@ -426,7 +426,7 @@ func sweepFirewallRules(region string) error {
426426
return sweeperErrs.ErrorOrNil()
427427
}
428428

429-
func sweepQueryLogAssociationsConfigs(region string) error {
429+
func sweepQueryLogConfigAssociations(region string) error {
430430
ctx := sweep.Context(region)
431431
client, err := sweep.SharedRegionalSweepClient(ctx, region)
432432
if err != nil {

‎internal/service/ses/sweep.go

+7-5
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import (
1616
"github.com/hashicorp/go-multierror"
1717
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
1818
"github.com/hashicorp/terraform-provider-aws/internal/sweep"
19+
"github.com/hashicorp/terraform-provider-aws/internal/sweep/awsv1"
1920
)
2021

2122
func init() {
@@ -52,7 +53,7 @@ func sweepConfigurationSets(region string) error {
5253

5354
for {
5455
output, err := conn.ListConfigurationSetsWithContext(ctx, input)
55-
if sweep.SkipSweepError(err) {
56+
if awsv1.SkipSweepError(err) {
5657
log.Printf("[WARN] Skipping SES Configuration Sets sweep for %s: %s", region, err)
5758
return sweeperErrs.ErrorOrNil() // In case we have completed some pages, but had errors
5859
}
@@ -122,7 +123,7 @@ func sweepIdentities(region, identityType string) error {
122123

123124
return !lastPage
124125
})
125-
if sweep.SkipSweepError(err) {
126+
if awsv1.SkipSweepError(err) {
126127
log.Printf("[WARN] Skipping SES Identities sweep for %s: %s", region, err)
127128
return sweeperErrs.ErrorOrNil() // In case we have completed some pages, but had errors
128129
}
@@ -142,10 +143,11 @@ func sweepReceiptRuleSets(region string) error {
142143
conn := client.SESConn(ctx)
143144

144145
// You cannot delete the receipt rule set that is currently active.
145-
// Setting the name of the receipt rule set to make active to null disables all email receiving.
146+
// Setting the name of the active receipt rule set to null disables all email receiving.
146147
log.Printf("[INFO] Disabling any currently active SES Receipt Rule Set")
147148
_, err = conn.SetActiveReceiptRuleSetWithContext(ctx, &ses.SetActiveReceiptRuleSetInput{})
148-
if sweep.SkipSweepError(err) {
149+
// In some regions, this will return "InvalidAction" with no message
150+
if awsv1.SkipSweepError(err) || tfawserr.ErrCodeEquals(err, "InvalidAction") {
149151
log.Printf("[WARN] Skipping SES Receipt Rule Sets sweep for %s: %s", region, err)
150152
return nil
151153
}
@@ -158,7 +160,7 @@ func sweepReceiptRuleSets(region string) error {
158160

159161
for {
160162
output, err := conn.ListReceiptRuleSetsWithContext(ctx, input)
161-
if sweep.SkipSweepError(err) {
163+
if awsv1.SkipSweepError(err) {
162164
log.Printf("[WARN] Skipping SES Receipt Rule Sets sweep for %s: %s", region, err)
163165
return sweeperErrs.ErrorOrNil() // In case we have completed some pages, but had errors
164166
}

‎internal/service/vpclattice/sweep.go

+7-2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212

1313
"github.com/aws/aws-sdk-go-v2/aws"
1414
"github.com/aws/aws-sdk-go-v2/service/vpclattice"
15+
"github.com/hashicorp/aws-sdk-go-base/v2/tfawserr"
1516
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
1617
"github.com/hashicorp/terraform-provider-aws/internal/sweep"
1718
"github.com/hashicorp/terraform-provider-aws/internal/sweep/awsv2"
@@ -46,7 +47,7 @@ func sweepServices(region string) error {
4647
for pages.HasMorePages() {
4748
page, err := pages.NextPage(ctx)
4849

49-
if awsv2.SkipSweepError(err) {
50+
if awsv2.SkipSweepError(err) || skipSweepErr(err) {
5051
log.Printf("[WARN] Skipping VPC Lattice Service sweep for %s: %s", region, err)
5152
return nil
5253
}
@@ -87,7 +88,7 @@ func sweepServiceNetworks(region string) error {
8788
for pages.HasMorePages() {
8889
page, err := pages.NextPage(ctx)
8990

90-
if awsv2.SkipSweepError(err) {
91+
if awsv2.SkipSweepError(err) || skipSweepErr(err) {
9192
log.Printf("[WARN] Skipping VPC Lattice Service Network sweep for %s: %s", region, err)
9293
return nil
9394
}
@@ -113,3 +114,7 @@ func sweepServiceNetworks(region string) error {
113114

114115
return nil
115116
}
117+
118+
func skipSweepErr(err error) bool {
119+
return tfawserr.ErrCodeEquals(err, "AccessDeniedException")
120+
}

0 commit comments

Comments
 (0)