update IsAmazonFIPSGovCloudEndpoint endpoint (#1560)

minio · Oct 4, 2021 · 3b57c1e · 3b57c1e
1 parent 89f47e7
commit 3b57c1e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/pkg/s3utils/utils.go b/pkg/s3utils/utils.go
@@ -171,6 +171,7 @@ func IsAmazonFIPSGovCloudEndpoint(endpointURL url.URL) bool {
 		return false
 	}
 	return endpointURL.Host == "s3-fips-us-gov-west-1.amazonaws.com" ||
+		endpointURL.Host == "s3-fips.us-gov-west-1.amazonaws.com" ||
 		endpointURL.Host == "s3-fips.dualstack.us-gov-west-1.amazonaws.com"
 }
 

diff --git a/pkg/s3utils/utils_test.go b/pkg/s3utils/utils_test.go
@@ -54,6 +54,10 @@ func TestGetRegionFromURL(t *testing.T) {
 			u:              url.URL{Host: "s3-fips-us-gov-west-1.amazonaws.com"},
 			expectedRegion: "us-gov-west-1",
 		},
+		{
+			u:              url.URL{Host: "s3-fips.us-gov-west-1.amazonaws.com"},
+			expectedRegion: "us-gov-west-1",
+		},
 		{
 			u:              url.URL{Host: "s3-us-gov-west-1.amazonaws.com"},
 			expectedRegion: "us-gov-west-1",

diff --git a/utils_test.go b/utils_test.go
@@ -118,6 +118,7 @@ func TestIsValidEndpointURL(t *testing.T) {
 		{"https://s3.cn-north-1.amazonaws.com.cn", nil, true},
 		{"https://s3-us-gov-west-1.amazonaws.com", nil, true},
 		{"https://s3-fips-us-gov-west-1.amazonaws.com", nil, true},
+		{"https://s3-fips.us-gov-west-1.amazonaws.com", nil, true},
 		{"https://s3.amazonaws.com/", nil, true},
 		{"https://storage.googleapis.com/", nil, true},
 		{"https://z3.amazonaws.com", nil, true},