Merge pull request #44573 from hashicorp/b-eusc-valid-arn

Correctly validate AWS European Sovereign Cloud Regions in ARNs

Author: ewbankkit

.changelog/44573.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+provider: Correctly validate AWS European Sovereign Cloud Regions in ARNs
+```

internal/types/aws_region.go

@@ -9,5 +9,5 @@ import (
 
 // IsAWSRegion returns whether or not the specified string is a valid AWS Region.
 func IsAWSRegion(s string) bool { // nosemgrep:ci.aws-in-func-name
-	return regexache.MustCompile(`^[a-z]{2}(-[a-z]+)+-\d{1,2}$`).MatchString(s)
+	return regexache.MustCompile(`^[a-z]{2,4}(-[a-z]+)+-\d{1,2}$`).MatchString(s)
 }

internal/types/aws_region_test.go

@@ -18,6 +18,7 @@ func TestIsAWSRegion(t *testing.T) { // nosemgrep:ci.aws-in-func-name
 		{"", false},
 		{"eu-isoe-west-1", true},
 		{"mars", false},
+		{"eusc-de-east-1", true},
 	} {
 		ok := IsAWSRegion(tc.id)
 		if got, want := ok, tc.valid; got != want {

internal/verify/validate_test.go

@@ -176,6 +176,7 @@ func TestValidARN(t *testing.T) {
 		"arn:aws-us-gov:s3:::bucket/object",                                                                                       // lintignore:AWSAT005          // GovCloud S3 ARN
 		"arn:aws:cloudwatch::cw0000000000:alarm:my-alarm",                                                                         // lintignore:AWSAT005          // CloudWatch Alarm
 		"arn:aws:imagebuilder:eu-central-1:aws-marketplace:component/crowdstrike-falcon-install-linux-prod-nhzsem4gwwfja/1.2.2/1", // lintignore:AWSAT003,AWSAT005 // EC2 image builder marketplace subscription ARN
+		"arn:aws-eusc:acm-pca:eusc-de-east-1:123456789012:certificate-authority/12345678-1234-1234-1234-123456789012",             // lintignore:AWSAT003,AWSAT005 // ESC ACMPCA ARN
 	}
 	for _, v := range validNames {
 		_, errors := ValidARN(v, "arn")