Merge pull request #36092 from hashicorp/s-fixes

shield+memorydb: Fix sweepers
hashicorp · Mar 5, 2024 · 8f30f0e · 8f30f0e
2 parents fa99a66 + c81f372
commit 8f30f0e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/internal/sweep/awsv1/skip.go b/internal/sweep/awsv1/skip.go
@@ -78,6 +78,10 @@ func SkipSweepError(err error) bool {
 	if tfawserr.ErrMessageContains(err, "UnauthorizedException", "API is not available in") {
 		return true
 	}
+	// For example from us-gov-west-1 MemoryDB cluster
+	if tfawserr.ErrMessageContains(err, "InvalidParameterValueException", "Access Denied to API Version") {
+		return true
+	}
 
 	return false
 }
diff --git a/internal/sweep/awsv2/skip.go b/internal/sweep/awsv2/skip.go
@@ -33,6 +33,14 @@ func SkipSweepError(err error) bool {
 	if tfawserr.ErrMessageContains(err, "ValidationException", "Account not found for the request") {
 		return true
 	}
+	// Example (shield): ResourceNotFoundException: The subscription does not exist
+	if tfawserr.ErrMessageContains(err, "ResourceNotFoundException", "The subscription does not exist") {
+		return true
+	}
+	// Example (GovCloud): InvalidParameterValueException: Access Denied to API Version: CORNERSTONE_V1
+	if tfawserr.ErrMessageContains(err, "InvalidParameterValueException", "Access Denied to API Version") {
+		return true
+	}
 
 	return false
 }