Upstream versity/versitygw state of the touched files before 95a6da83b9
This commit is contained in:
upstream committed
1 parent
b7ff97181d
commit
f12ba37b26
4 files changed
+208
-85
No files matched your search
@@ -17,7 +17,6 @@ package integration
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"sort"
|
||||
"strings"
|
||||
"time"
|
||||
@@ -580,30 +579,6 @@ func ListMultipartUploads_delimiter_no_matches(s *S3Conf) error {
|
||||
})
|
||||
}
|
||||
|
||||
func ListMultipartUploads_with_upload_id(s *S3Conf) error {
|
||||
testName := "ListMultipartUploads_with_upload_id"
|
||||
return actionHandler(s, testName, func(s3client *s3.Client, bucket string) error {
|
||||
out, err := createMp(s3client, bucket, "my-obj")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
req, err := createSignedReq(http.MethodGet, s.endpoint,
|
||||
fmt.Sprintf("%v?uploads&uploadId=%v", bucket, *out.UploadId),
|
||||
s.awsID, s.awsSecret, "s3", s.awsRegion, "", nil, time.Now(), nil)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
resp, err := s.httpClient.Do(req)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return checkHTTPResponseApiErr(resp, s3err.GetInvalidArgumentErr(s3err.InvalidArgUploadIdWithUploads, "uploadId"))
|
||||
})
|
||||
}
|
||||
|
||||
func ListMultipartUploads_with_checksums(s *S3Conf) error {
|
||||
testName := "ListMultipartUploads_with_checksums"
|
||||
return actionHandler(s, testName, func(s3client *s3.Client, bucket string) error {
|
||||
|
||||
@@ -110,8 +110,6 @@ func TestListBuckets(ts *TestState) {
|
||||
ts.Sync(ListBuckets_as_admin)
|
||||
ts.Sync(ListBuckets_with_prefix)
|
||||
ts.Sync(ListBuckets_invalid_max_buckets)
|
||||
ts.Sync(ListBuckets_invalid_bucket_region)
|
||||
ts.Sync(ListBuckets_bucket_region)
|
||||
ts.Sync(ListBuckets_truncated)
|
||||
ts.Sync(ListBuckets_success)
|
||||
ts.Sync(ListBuckets_empty_success)
|
||||
@@ -207,8 +205,6 @@ func TestPutObject(ts *TestState) {
|
||||
ts.Run(PutObject_with_metadata)
|
||||
}
|
||||
ts.Run(PutObject_success)
|
||||
ts.Run(PutObject_sse_c_invalid_headers)
|
||||
ts.Run(PutObject_unsupported_sse_not_implemented)
|
||||
ts.Run(PutObject_default_content_type)
|
||||
ts.Run(PutObject_overwrite_resets_attributes)
|
||||
ts.Run(PutObject_overwrite_multipart_object)
|
||||
@@ -242,7 +238,6 @@ func TestHeadObject(ts *TestState) {
|
||||
ts.Run(HeadObject_ranged_with_checksum_mode)
|
||||
}
|
||||
ts.Run(HeadObject_success)
|
||||
ts.Run(HeadObject_sse_c_invalid_headers)
|
||||
ts.Run(HeadObject_overrides_success)
|
||||
ts.Run(HeadObject_overrides_presign_success)
|
||||
ts.Run(HeadObject_overrides_fail_public)
|
||||
@@ -422,7 +417,6 @@ func TestCopyObject(ts *TestState) {
|
||||
}
|
||||
ts.Run(CopyObject_with_special_characters)
|
||||
ts.Run(CopyObject_success)
|
||||
ts.Run(CopyObject_sse_c_invalid_copy_source_headers)
|
||||
ts.Run(CopyObject_cross_bucket_server_side_copy)
|
||||
ts.Run(CopyObject_incorrect_source_bucket_expected_owner)
|
||||
}
|
||||
@@ -548,17 +542,14 @@ func TestListMultipartUploads(ts *TestState) {
|
||||
ts.Run(ListMultipartUploads_empty_result)
|
||||
ts.Run(ListMultipartUploads_invalid_max_uploads)
|
||||
ts.Run(ListMultipartUploads_max_uploads)
|
||||
ts.Run(ListMultipartUploads_next_markers_not_truncated)
|
||||
ts.Run(ListMultipartUploads_exceeding_max_uploads)
|
||||
ts.Run(ListMultipartUploads_ignore_upload_id_marker)
|
||||
ts.Run(ListMultipartUploads_invalid_uploadId_marker)
|
||||
ts.Run(ListMultipartUploads_keyMarker_not_from_list)
|
||||
ts.Run(ListMultipartUploads_upload_id_marker_with_key_marker)
|
||||
ts.Run(ListMultipartUploads_delimiter_truncated)
|
||||
ts.Run(ListMultipartUploads_prefix)
|
||||
ts.Run(ListMultipartUploads_both_delimiter_and_prefix)
|
||||
ts.Run(ListMultipartUploads_delimiter_no_matches)
|
||||
ts.Run(ListMultipartUploads_with_upload_id)
|
||||
//TODO: remove the condition after implementing checksums in azure
|
||||
if !ts.conf.azureTests {
|
||||
ts.Run(ListMultipartUploads_with_checksums)
|
||||
@@ -912,28 +903,6 @@ func TestNotImplementedActions(ts *TestState) {
|
||||
ts.Run(GetObjectAcl_not_implemented)
|
||||
}
|
||||
|
||||
// TestSSECNotImplemented is for backends that reject SSE-C rather than forward it.
|
||||
func TestSSECNotImplemented(ts *TestState) {
|
||||
ts.Run(PutObject_sse_c_not_implemented)
|
||||
ts.Run(PostObject_sse_c_not_implemented)
|
||||
ts.Run(GetObject_sse_c_not_implemented)
|
||||
ts.Run(HeadObject_sse_c_not_implemented)
|
||||
ts.Run(GetObjectAttributes_sse_c_not_implemented)
|
||||
ts.Run(CopyObject_sse_c_not_implemented)
|
||||
ts.Run(CreateMultipartUpload_sse_c_not_implemented)
|
||||
ts.Run(UploadPart_sse_c_not_implemented)
|
||||
ts.Run(UploadPartCopy_sse_c_not_implemented)
|
||||
ts.Run(CompleteMultipartUpload_sse_c_not_implemented)
|
||||
}
|
||||
|
||||
func TestSSECTransport(ts *TestState) {
|
||||
if ts.conf.tlsStatus {
|
||||
TestSSECNotImplemented(ts)
|
||||
return
|
||||
}
|
||||
ts.Run(PutObject_sse_c_requires_tls)
|
||||
}
|
||||
|
||||
func TestWORMProtection(ts *TestState) {
|
||||
ts.Run(WORMProtection_bucket_object_lock_configuration_compliance_mode)
|
||||
ts.Run(WORMProtection_bucket_object_lock_configuration_governance_mode)
|
||||
@@ -1034,9 +1003,6 @@ func TestFullFlow(ts *TestState) {
|
||||
if ts.conf.versioningEnabled {
|
||||
TestVersioning(ts)
|
||||
}
|
||||
if ts.conf.azureTests {
|
||||
TestSSECTransport(ts)
|
||||
}
|
||||
TestGatewayIAM(ts)
|
||||
TestServer(ts)
|
||||
}
|
||||
@@ -1067,7 +1033,6 @@ func TestPosix(ts *TestState) {
|
||||
if !ts.conf.versioningEnabled {
|
||||
TestVersioningDisabled(ts)
|
||||
}
|
||||
TestSSECTransport(ts)
|
||||
}
|
||||
|
||||
func TestScoutfs(ts *TestState) {
|
||||
@@ -1169,7 +1134,6 @@ func TestScoutfs(ts *TestState) {
|
||||
ts.Run(ObjectTagging_trailing_slash_counterpart)
|
||||
ts.Run(ObjectLock_trailing_slash_counterpart)
|
||||
ts.Run(DeleteObject_directory_not_empty)
|
||||
TestSSECTransport(ts)
|
||||
}
|
||||
|
||||
func TestGatewayIAM(ts *TestState) {
|
||||
@@ -2195,11 +2159,9 @@ func TestRouter(ts *TestState) {
|
||||
ts.Run(RouterGetUploadsWithKey)
|
||||
ts.Run(RouterCopySourceNotAllowed)
|
||||
ts.Run(RouterListVersionsWithKey)
|
||||
ts.Run(RouterUploadsWithUploadId)
|
||||
ts.Run(RouterObjectAnnotationNotImplemented)
|
||||
ts.Run(RouterRenameObjectNotImplemented)
|
||||
ts.Run(RouterObjectTorrentMethodNotAllowed)
|
||||
ts.Run(RouterInvalidURLEscape)
|
||||
}
|
||||
|
||||
func TestPostObject(ts *TestState) {
|
||||
@@ -2987,8 +2949,6 @@ func GetIntTests() IntTests {
|
||||
"ListBuckets_as_admin": ListBuckets_as_admin,
|
||||
"ListBuckets_with_prefix": ListBuckets_with_prefix,
|
||||
"ListBuckets_invalid_max_buckets": ListBuckets_invalid_max_buckets,
|
||||
"ListBuckets_invalid_bucket_region": ListBuckets_invalid_bucket_region,
|
||||
"ListBuckets_bucket_region": ListBuckets_bucket_region,
|
||||
"ListBuckets_truncated": ListBuckets_truncated,
|
||||
"ListBuckets_success": ListBuckets_success,
|
||||
"ListBuckets_empty_success": ListBuckets_empty_success,
|
||||
@@ -3290,16 +3250,13 @@ func GetIntTests() IntTests {
|
||||
"ListMultipartUploads_empty_result": ListMultipartUploads_empty_result,
|
||||
"ListMultipartUploads_invalid_max_uploads": ListMultipartUploads_invalid_max_uploads,
|
||||
"ListMultipartUploads_max_uploads": ListMultipartUploads_max_uploads,
|
||||
"ListMultipartUploads_next_markers_not_truncated": ListMultipartUploads_next_markers_not_truncated,
|
||||
"ListMultipartUploads_exceeding_max_uploads": ListMultipartUploads_exceeding_max_uploads,
|
||||
"ListMultipartUploads_ignore_upload_id_marker": ListMultipartUploads_ignore_upload_id_marker,
|
||||
"ListMultipartUploads_invalid_uploadId_marker": ListMultipartUploads_invalid_uploadId_marker,
|
||||
"ListMultipartUploads_keyMarker_not_from_list": ListMultipartUploads_keyMarker_not_from_list,
|
||||
"ListMultipartUploads_upload_id_marker_with_key_marker": ListMultipartUploads_upload_id_marker_with_key_marker,
|
||||
"ListMultipartUploads_delimiter_truncated": ListMultipartUploads_delimiter_truncated,
|
||||
"ListMultipartUploads_prefix": ListMultipartUploads_prefix,
|
||||
"ListMultipartUploads_both_delimiter_and_prefix": ListMultipartUploads_both_delimiter_and_prefix,
|
||||
"ListMultipartUploads_with_upload_id": ListMultipartUploads_with_upload_id,
|
||||
"ListMultipartUploads_with_checksums": ListMultipartUploads_with_checksums,
|
||||
"AbortMultipartUpload_non_existing_bucket": AbortMultipartUpload_non_existing_bucket,
|
||||
"AbortMultipartUpload_incorrect_uploadId": AbortMultipartUpload_incorrect_uploadId,
|
||||
@@ -3582,21 +3539,6 @@ func GetIntTests() IntTests {
|
||||
"PutObject_with_slashes": PutObject_with_slashes,
|
||||
"PutObject_race_with_delete": PutObject_race_with_delete,
|
||||
"CreateMultipartUpload_dir_obj": CreateMultipartUpload_dir_obj,
|
||||
"PutObject_sse_c_not_implemented": PutObject_sse_c_not_implemented,
|
||||
"PutObject_unsupported_sse_not_implemented": PutObject_unsupported_sse_not_implemented,
|
||||
"PutObject_sse_c_requires_tls": PutObject_sse_c_requires_tls,
|
||||
"PostObject_sse_c_not_implemented": PostObject_sse_c_not_implemented,
|
||||
"GetObject_sse_c_not_implemented": GetObject_sse_c_not_implemented,
|
||||
"HeadObject_sse_c_not_implemented": HeadObject_sse_c_not_implemented,
|
||||
"GetObjectAttributes_sse_c_not_implemented": GetObjectAttributes_sse_c_not_implemented,
|
||||
"CopyObject_sse_c_not_implemented": CopyObject_sse_c_not_implemented,
|
||||
"CreateMultipartUpload_sse_c_not_implemented": CreateMultipartUpload_sse_c_not_implemented,
|
||||
"UploadPart_sse_c_not_implemented": UploadPart_sse_c_not_implemented,
|
||||
"UploadPartCopy_sse_c_not_implemented": UploadPartCopy_sse_c_not_implemented,
|
||||
"CompleteMultipartUpload_sse_c_not_implemented": CompleteMultipartUpload_sse_c_not_implemented,
|
||||
"PutObject_sse_c_invalid_headers": PutObject_sse_c_invalid_headers,
|
||||
"HeadObject_sse_c_invalid_headers": HeadObject_sse_c_invalid_headers,
|
||||
"CopyObject_sse_c_invalid_copy_source_headers": CopyObject_sse_c_invalid_copy_source_headers,
|
||||
"IAM_user_access_denied": IAM_user_access_denied,
|
||||
"IAM_userplus_access_denied": IAM_userplus_access_denied,
|
||||
"IAM_userplus_CreateBucket": IAM_userplus_CreateBucket,
|
||||
@@ -3804,11 +3746,9 @@ func GetIntTests() IntTests {
|
||||
"RouterGetUploadsWithKey": RouterGetUploadsWithKey,
|
||||
"RouterCopySourceNotAllowed": RouterCopySourceNotAllowed,
|
||||
"RouterListVersionsWithKey": RouterListVersionsWithKey,
|
||||
"RouterUploadsWithUploadId": RouterUploadsWithUploadId,
|
||||
"RouterObjectAnnotationNotImplemented": RouterObjectAnnotationNotImplemented,
|
||||
"RouterRenameObjectNotImplemented": RouterRenameObjectNotImplemented,
|
||||
"RouterObjectTorrentMethodNotAllowed": RouterObjectTorrentMethodNotAllowed,
|
||||
"RouterInvalidURLEscape": RouterInvalidURLEscape,
|
||||
"UnsignedStreaminPayloadTrailer_malformed_trailer": UnsignedStreaminPayloadTrailer_malformed_trailer,
|
||||
"UnsignedStreamingPayloadTrailer_aborted_connection": UnsignedStreamingPayloadTrailer_aborted_connection,
|
||||
"UnsignedStreamingPayloadTrailer_missing_invalid_dec_content_length": UnsignedStreamingPayloadTrailer_missing_invalid_dec_content_length,
|
||||
|
||||
Reference in new issue
Block a user