Handling more S3 VPC endpoint patterns

cr: https://code.amazon.com/reviews/CR-106240944

Author: JingyiAWS

agent/s3util/s3uri.go

@@ -30,15 +30,16 @@ const (
 		"(bucket|accesspoint|control)\\.vpce-[-a-z0-9]+\\." + // VPC endpoint DNS name
 		"s3[.-]" + // S3 service name
 		"(([-a-z0-9]+)\\.)?" + // region name, optional for us-east-1
-		"vpce\\.amazonaws\\.com"
+		"vpce\\." +
+		"(amazonaws\\.com|c2s\\.ic\\.gov|sc2s\\.sgov\\.gov)"
 	vpceUrlPatternBucketIdx = 2
 	vpceUrlPatternRegionIdx = 5
 
 	// Regex for S3 URLs, public S3 endpoint
 	nonVpceUrlPattern = "^((.+)\\.)?" + // maybe a bucket name
 		"s3[.-](website[-.])?(accelerate\\.)?(dualstack[-.])?" + // S3 service name with optional features
 		"(([-a-z0-9]+)\\.)?" + // region name, optional for us-east-1
-		"amazonaws\\.com"
+		"(amazonaws\\.com|c2s\\.ic\\.gov|sc2s\\.sgov\\.gov)"
 	nonVpceUrlPatternBucketIdx = 2
 	nonVpceUrlPatternRegionIdx = 7
 

agent/s3util/s3uri_test.go

@@ -31,6 +31,8 @@ var (
 	sslTests = []s3BucketTest{
 		// {bucket, url, AmazonS3URL{IsValidS3URI, IsPathStyle, Bucket, Key, Region}},
 		{"abc", "https://abc.s3.mock-region.amazonaws.com/", AmazonS3URL{true, false, "abc", "", "mock-region"}},
+		{"abc", "https://abc.s3.mock-region.c2s.ic.gov/", AmazonS3URL{true, false, "abc", "", "mock-region"}},
+		{"abc", "https://abc.s3.mock-region.sc2s.sgov.gov/", AmazonS3URL{true, false, "abc", "", "mock-region"}},
 		{"a$b$c", "https://s3.mock-region.amazonaws.com/a%24b%24c", AmazonS3URL{true, true, "a$b$c", "", "mock-region"}},
 		{"a.b.c", "https://s3.mock-region.amazonaws.com/a.b.c", AmazonS3URL{true, true, "a.b.c", "", "mock-region"}},
 		{"a..bc", "https://s3.mock-region.amazonaws.com/a..bc", AmazonS3URL{true, true, "a..bc", "", "mock-region"}},
@@ -194,6 +196,28 @@ var (
 				"us-gov-west-1",
 			},
 		},
+		{
+			"mybucket",
+			"https://bucket.vpce-07dd6fec74b812c52-2gqlpwuc.s3.us-iso-east-1.vpce.c2s.ic.gov/mybucket/mykey",
+			AmazonS3URL{
+				true,
+				true,
+				"mybucket",
+				"mykey",
+				"us-iso-east-1",
+			},
+		},
+		{
+			"mybucket",
+			"https://bucket.vpce-07dd6fec74b812c52-2gqlpwuc.s3.us-isob-east-1.vpce.sc2s.sgov.gov/mybucket/mykey",
+			AmazonS3URL{
+				true,
+				true,
+				"mybucket",
+				"mykey",
+				"us-isob-east-1",
+			},
+		},
 	}
 )