Upstream versity/versitygw state of the touched files before 91e4790870

s3api/controllers/bucket-put.go

@@ -658,19 +658,18 @@ func (c S3ApiController) CreateBucket(ctx fiber.Ctx) (*Response, error) {
 				},
 			}, s3err.GetAPIError(s3err.ErrMalformedXML)
 		}
-	}
 
-	region, ok := utils.ContextKeyRegion.Get(ctx).(string)
-	if !ok {
-		region = defaultRegion
-	}
-
-	if err := utils.ValidateLocationConstraint(body.LocationConstraint, region); err != nil {
-		return &Response{
-			MetaOpts: &MetaOptions{
-				BucketOwner: bucketOwner.Access,
-			},
-		}, err
+		if body.LocationConstraint != nil {
+			region := utils.ContextKeyRegion.Get(ctx).(string)
+			if *body.LocationConstraint != region || *body.LocationConstraint == "us-east-1" {
+				debuglogger.Logf("invalid location constraint: %s", *body.LocationConstraint)
+				return &Response{
+					MetaOpts: &MetaOptions{
+						BucketOwner: bucketOwner.Access,
+					},
+				}, s3err.GetInvalidLocationConstraintErr(*body.LocationConstraint)
+			}
+		}
 	}
 
 	defACL := auth.ACL{