Upstream versity/versitygw state of the touched files before 6c6b14f7e8

s3err/invalid-argument.go

@@ -73,15 +73,9 @@ const (
 	InvalidArgSSECIncompatibleEncryption
 	InvalidArgSSEInvalidEncryptionMethod
 	InvalidArgSSECRequiresTLS
-	InvalidArgUploadIdWithUploads
-	InvalidArgBucketRegionEndpoint
 )
 
 var invalidArgErrResponses = map[InvalidArgErrorCode]InvalidArgumentError{
-	InvalidArgBucketRegionEndpoint: {
-		Description:  "Requests with bucket-region specified must be made to the corresponding regional endpoint",
-		ArgumentName: "bucket-region",
-	},
 	InvalidArgMaxBuckets: {
 		Description:  "Argument max-buckets must be an integer between 1 and 10000.",
 		ArgumentName: "max-buckets",
@@ -218,10 +212,6 @@ var invalidArgErrResponses = map[InvalidArgErrorCode]InvalidArgumentError{
 		Description:  "Invalid uploadId marker",
 		ArgumentName: "upload-id-marker",
 	},
-	InvalidArgUploadIdWithUploads: {
-		Description:  "Conflicting query string parameters: uploadId, uploads",
-		ArgumentName: "ResourceType",
-	},
 	InvalidArgCannedAcl: {
 		Description:  "",
 		ArgumentName: "x-amz-acl",
@@ -389,15 +379,3 @@ func GetInvalidArgObjectOwnership(value string) InvalidArgumentError {
 		Description: fmt.Sprintf("Invalid x-amz-object-ownership header: %s", value),
 	}
 }
-
-func GetInvalidArgBucketRegion(value string) InvalidArgumentError {
-	description := fmt.Sprintf("Argument value %s is not a valid AWS Region", value)
-	if value == "" {
-		description = "Argument value is not a valid AWS Region"
-	}
-	return InvalidArgumentError{
-		ArgumentName: "bucket-region",
-		// no ArgumentValue is returned for this error
-		Description: description,
-	}
-}