Merge branch 'sh-allow-blank-s3-region' into 'master'

Allow blank S3 regions to be used

See merge request gitlab-org/gitlab-workhorse!677

changelogs/unreleased/sh-allow-blank-s3-region.yml

+---
+title: Allow blank S3 regions to be used
+merge_request: 677
+author:
+type: changed

internal/filestore/save_file_opts.go

@@ -146,7 +146,7 @@ func (c *ObjectStorageConfig) IsGoCloud() bool {
 
 func (c *ObjectStorageConfig) IsValid() bool {
 	if c.IsAWS() {
-		return c.S3Config.Bucket != "" && c.S3Config.Region != "" && c.s3CredentialsValid()
+		return c.S3Config.Bucket != "" && c.s3CredentialsValid()
 	} else if c.IsGoCloud() {
 		// We could parse and validate the URL, but GoCloud providers
 		// such as AzureRM don't have a fallback to normal HTTP, so we

internal/filestore/save_file_opts_test.go

@@ -187,6 +187,9 @@ func TestUseWorkhorseClientEnabled(t *testing.T) {
 	iamConfig := missingCfg
 	iamConfig.S3Config.UseIamProfile = true
 
+	missingRegion := cfg
+	missingRegion.S3Config.Region = ""
+
 	tests := []struct {
 		name                string
 		UseWorkhorseClient  bool
@@ -245,6 +248,13 @@ func TestUseWorkhorseClientEnabled(t *testing.T) {
 			},
 			expected: false,
 		},
+		{
+			name:                "missing S3 region",
+			UseWorkhorseClient:  true,
+			remoteTempObjectID:  "test-object",
+			objectStorageConfig: missingRegion,
+			expected:            true,
+		},
 	}
 
 	for _, test := range tests {