diff --git a/backend/backend.go b/backend/backend.go index cd853a3..0fc431b 100644 --- a/backend/backend.go +++ b/backend/backend.go @@ -39,8 +39,8 @@ type Backend interface { CreateMultipartUpload(context.Context, *s3.CreateMultipartUploadInput) (*s3.CreateMultipartUploadOutput, error) CompleteMultipartUpload(context.Context, *s3.CompleteMultipartUploadInput) (*s3.CompleteMultipartUploadOutput, error) AbortMultipartUpload(context.Context, *s3.AbortMultipartUploadInput) error - ListMultipartUploads(context.Context, *s3.ListMultipartUploadsInput) (s3response.ListMultipartUploadsResponse, error) - ListParts(context.Context, *s3.ListPartsInput) (s3response.ListPartsResponse, error) + ListMultipartUploads(context.Context, *s3.ListMultipartUploadsInput) (s3response.ListMultipartUploadsResult, error) + ListParts(context.Context, *s3.ListPartsInput) (s3response.ListPartsResult, error) UploadPart(context.Context, *s3.UploadPartInput) (etag string, err error) UploadPartCopy(context.Context, *s3.UploadPartCopyInput) (s3response.CopyObjectResult, error) @@ -110,11 +110,11 @@ func (BackendUnsupported) CompleteMultipartUpload(context.Context, *s3.CompleteM func (BackendUnsupported) AbortMultipartUpload(context.Context, *s3.AbortMultipartUploadInput) error { return s3err.GetAPIError(s3err.ErrNotImplemented) } -func (BackendUnsupported) ListMultipartUploads(context.Context, *s3.ListMultipartUploadsInput) (s3response.ListMultipartUploadsResponse, error) { - return s3response.ListMultipartUploadsResponse{}, s3err.GetAPIError(s3err.ErrNotImplemented) +func (BackendUnsupported) ListMultipartUploads(context.Context, *s3.ListMultipartUploadsInput) (s3response.ListMultipartUploadsResult, error) { + return s3response.ListMultipartUploadsResult{}, s3err.GetAPIError(s3err.ErrNotImplemented) } -func (BackendUnsupported) ListParts(context.Context, *s3.ListPartsInput) (s3response.ListPartsResponse, error) { - return s3response.ListPartsResponse{}, s3err.GetAPIError(s3err.ErrNotImplemented) +func (BackendUnsupported) ListParts(context.Context, *s3.ListPartsInput) (s3response.ListPartsResult, error) { + return s3response.ListPartsResult{}, s3err.GetAPIError(s3err.ErrNotImplemented) } func (BackendUnsupported) UploadPart(context.Context, *s3.UploadPartInput) (etag string, err error) { return "", s3err.GetAPIError(s3err.ErrNotImplemented) diff --git a/backend/posix/posix.go b/backend/posix/posix.go index 07c77ac..35dff8b 100644 --- a/backend/posix/posix.go +++ b/backend/posix/posix.go @@ -508,7 +508,7 @@ func (p *Posix) AbortMultipartUpload(_ context.Context, mpu *s3.AbortMultipartUp return nil } -func (p *Posix) ListMultipartUploads(_ context.Context, mpu *s3.ListMultipartUploadsInput) (s3response.ListMultipartUploadsResponse, error) { +func (p *Posix) ListMultipartUploads(_ context.Context, mpu *s3.ListMultipartUploadsInput) (s3response.ListMultipartUploadsResult, error) { bucket := *mpu.Bucket var delimiter string if mpu.Delimiter != nil { @@ -519,7 +519,7 @@ func (p *Posix) ListMultipartUploads(_ context.Context, mpu *s3.ListMultipartUpl prefix = *mpu.Prefix } - var lmu s3response.ListMultipartUploadsResponse + var lmu s3response.ListMultipartUploadsResult _, err := os.Stat(bucket) if errors.Is(err, fs.ErrNotExist) { @@ -595,7 +595,7 @@ func (p *Posix) ListMultipartUploads(_ context.Context, mpu *s3.ListMultipartUpl Initiated: fi.ModTime().Format(backend.RFC3339TimeFormat), }) if len(uploads) == int(mpu.MaxUploads) { - return s3response.ListMultipartUploadsResponse{ + return s3response.ListMultipartUploadsResult{ Bucket: bucket, Delimiter: delimiter, IsTruncated: i != len(objs) || j != len(upids), @@ -611,7 +611,7 @@ func (p *Posix) ListMultipartUploads(_ context.Context, mpu *s3.ListMultipartUpl } } - return s3response.ListMultipartUploadsResponse{ + return s3response.ListMultipartUploadsResult{ Bucket: bucket, Delimiter: delimiter, KeyMarker: keyMarker, @@ -622,14 +622,14 @@ func (p *Posix) ListMultipartUploads(_ context.Context, mpu *s3.ListMultipartUpl }, nil } -func (p *Posix) ListParts(_ context.Context, input *s3.ListPartsInput) (s3response.ListPartsResponse, error) { +func (p *Posix) ListParts(_ context.Context, input *s3.ListPartsInput) (s3response.ListPartsResult, error) { bucket := *input.Bucket object := *input.Key uploadID := *input.UploadId stringMarker := *input.PartNumberMarker maxParts := int(input.MaxParts) - var lpr s3response.ListPartsResponse + var lpr s3response.ListPartsResult var partNumberMarker int if stringMarker != "" { @@ -708,7 +708,7 @@ func (p *Posix) ListParts(_ context.Context, input *s3.ListPartsInput) (s3respon upiddir := filepath.Join(objdir, uploadID) loadUserMetaData(upiddir, userMetaData) - return s3response.ListPartsResponse{ + return s3response.ListPartsResult{ Bucket: bucket, IsTruncated: oldLen != newLen, Key: object, diff --git a/s3api/controllers/backend_moq_test.go b/s3api/controllers/backend_moq_test.go index a8793f8..19c277e 100644 --- a/s3api/controllers/backend_moq_test.go +++ b/s3api/controllers/backend_moq_test.go @@ -70,7 +70,7 @@ var _ backend.Backend = &BackendMock{} // ListBucketsFunc: func(contextMoqParam context.Context, owner string, isRoot bool) (s3response.ListAllMyBucketsResult, error) { // panic("mock out the ListBuckets method") // }, -// ListMultipartUploadsFunc: func(contextMoqParam context.Context, listMultipartUploadsInput *s3.ListMultipartUploadsInput) (s3response.ListMultipartUploadsResponse, error) { +// ListMultipartUploadsFunc: func(contextMoqParam context.Context, listMultipartUploadsInput *s3.ListMultipartUploadsInput) (s3response.ListMultipartUploadsResult, error) { // panic("mock out the ListMultipartUploads method") // }, // ListObjectsFunc: func(contextMoqParam context.Context, listObjectsInput *s3.ListObjectsInput) (*s3.ListObjectsOutput, error) { @@ -79,7 +79,7 @@ var _ backend.Backend = &BackendMock{} // ListObjectsV2Func: func(contextMoqParam context.Context, listObjectsV2Input *s3.ListObjectsV2Input) (*s3.ListObjectsV2Output, error) { // panic("mock out the ListObjectsV2 method") // }, -// ListPartsFunc: func(contextMoqParam context.Context, listPartsInput *s3.ListPartsInput) (s3response.ListPartsResponse, error) { +// ListPartsFunc: func(contextMoqParam context.Context, listPartsInput *s3.ListPartsInput) (s3response.ListPartsResult, error) { // panic("mock out the ListParts method") // }, // PutBucketAclFunc: func(contextMoqParam context.Context, bucket string, data []byte) error { @@ -168,7 +168,7 @@ type BackendMock struct { ListBucketsFunc func(contextMoqParam context.Context, owner string, isRoot bool) (s3response.ListAllMyBucketsResult, error) // ListMultipartUploadsFunc mocks the ListMultipartUploads method. - ListMultipartUploadsFunc func(contextMoqParam context.Context, listMultipartUploadsInput *s3.ListMultipartUploadsInput) (s3response.ListMultipartUploadsResponse, error) + ListMultipartUploadsFunc func(contextMoqParam context.Context, listMultipartUploadsInput *s3.ListMultipartUploadsInput) (s3response.ListMultipartUploadsResult, error) // ListObjectsFunc mocks the ListObjects method. ListObjectsFunc func(contextMoqParam context.Context, listObjectsInput *s3.ListObjectsInput) (*s3.ListObjectsOutput, error) @@ -177,7 +177,7 @@ type BackendMock struct { ListObjectsV2Func func(contextMoqParam context.Context, listObjectsV2Input *s3.ListObjectsV2Input) (*s3.ListObjectsV2Output, error) // ListPartsFunc mocks the ListParts method. - ListPartsFunc func(contextMoqParam context.Context, listPartsInput *s3.ListPartsInput) (s3response.ListPartsResponse, error) + ListPartsFunc func(contextMoqParam context.Context, listPartsInput *s3.ListPartsInput) (s3response.ListPartsResult, error) // PutBucketAclFunc mocks the PutBucketAcl method. PutBucketAclFunc func(contextMoqParam context.Context, bucket string, data []byte) error @@ -1049,7 +1049,7 @@ func (mock *BackendMock) ListBucketsCalls() []struct { } // ListMultipartUploads calls ListMultipartUploadsFunc. -func (mock *BackendMock) ListMultipartUploads(contextMoqParam context.Context, listMultipartUploadsInput *s3.ListMultipartUploadsInput) (s3response.ListMultipartUploadsResponse, error) { +func (mock *BackendMock) ListMultipartUploads(contextMoqParam context.Context, listMultipartUploadsInput *s3.ListMultipartUploadsInput) (s3response.ListMultipartUploadsResult, error) { if mock.ListMultipartUploadsFunc == nil { panic("BackendMock.ListMultipartUploadsFunc: method is nil but Backend.ListMultipartUploads was just called") } @@ -1157,7 +1157,7 @@ func (mock *BackendMock) ListObjectsV2Calls() []struct { } // ListParts calls ListPartsFunc. -func (mock *BackendMock) ListParts(contextMoqParam context.Context, listPartsInput *s3.ListPartsInput) (s3response.ListPartsResponse, error) { +func (mock *BackendMock) ListParts(contextMoqParam context.Context, listPartsInput *s3.ListPartsInput) (s3response.ListPartsResult, error) { if mock.ListPartsFunc == nil { panic("BackendMock.ListPartsFunc: method is nil but Backend.ListParts was just called") } diff --git a/s3api/controllers/base_test.go b/s3api/controllers/base_test.go index b20cd1c..aa536fb 100644 --- a/s3api/controllers/base_test.go +++ b/s3api/controllers/base_test.go @@ -186,8 +186,8 @@ func TestS3ApiController_GetActions(t *testing.T) { GetBucketAclFunc: func(context.Context, *s3.GetBucketAclInput) ([]byte, error) { return acldata, nil }, - ListPartsFunc: func(context.Context, *s3.ListPartsInput) (s3response.ListPartsResponse, error) { - return s3response.ListPartsResponse{}, nil + ListPartsFunc: func(context.Context, *s3.ListPartsInput) (s3response.ListPartsResult, error) { + return s3response.ListPartsResult{}, nil }, GetObjectAclFunc: func(context.Context, *s3.GetObjectAclInput) (*s3.GetObjectAclOutput, error) { return &s3.GetObjectAclOutput{}, nil @@ -339,8 +339,8 @@ func TestS3ApiController_ListActions(t *testing.T) { GetBucketAclFunc: func(context.Context, *s3.GetBucketAclInput) ([]byte, error) { return acldata, nil }, - ListMultipartUploadsFunc: func(_ context.Context, output *s3.ListMultipartUploadsInput) (s3response.ListMultipartUploadsResponse, error) { - return s3response.ListMultipartUploadsResponse{}, nil + ListMultipartUploadsFunc: func(_ context.Context, output *s3.ListMultipartUploadsInput) (s3response.ListMultipartUploadsResult, error) { + return s3response.ListMultipartUploadsResult{}, nil }, ListObjectsV2Func: func(context.Context, *s3.ListObjectsV2Input) (*s3.ListObjectsV2Output, error) { return &s3.ListObjectsV2Output{}, nil diff --git a/s3response/s3response.go b/s3response/s3response.go index dd3607e..39a0bd7 100644 --- a/s3response/s3response.go +++ b/s3response/s3response.go @@ -29,7 +29,7 @@ type Part struct { } // ListPartsResponse - s3 api list parts response. -type ListPartsResponse struct { +type ListPartsResult struct { XMLName xml.Name `xml:"http://s3.amazonaws.com/doc/2006-03-01/ ListPartsResult" json:"-"` Bucket string @@ -52,7 +52,7 @@ type ListPartsResponse struct { } // ListMultipartUploadsResponse - s3 api list multipart uploads response. -type ListMultipartUploadsResponse struct { +type ListMultipartUploadsResult struct { XMLName xml.Name `xml:"http://s3.amazonaws.com/doc/2006-03-01/ ListMultipartUploadsResult" json:"-"` Bucket string