|
@ -2,6 +2,7 @@ package s3api |
|
|
|
|
|
|
|
|
import ( |
|
|
import ( |
|
|
"fmt" |
|
|
"fmt" |
|
|
|
|
|
"github.com/chrislusf/seaweedfs/weed/glog" |
|
|
"github.com/chrislusf/seaweedfs/weed/s3api/s3err" |
|
|
"github.com/chrislusf/seaweedfs/weed/s3api/s3err" |
|
|
"net/http" |
|
|
"net/http" |
|
|
"net/url" |
|
|
"net/url" |
|
@ -28,13 +29,13 @@ func (s3a *S3ApiServer) NewMultipartUploadHandler(w http.ResponseWriter, r *http |
|
|
Key: objectKey(aws.String(object)), |
|
|
Key: objectKey(aws.String(object)), |
|
|
}) |
|
|
}) |
|
|
|
|
|
|
|
|
|
|
|
glog.V(2).Info("NewMultipartUploadHandler", string(encodeResponse(response)), errCode) |
|
|
|
|
|
|
|
|
if errCode != s3err.ErrNone { |
|
|
if errCode != s3err.ErrNone { |
|
|
writeErrorResponse(w, errCode, r.URL) |
|
|
writeErrorResponse(w, errCode, r.URL) |
|
|
return |
|
|
return |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// println("NewMultipartUploadHandler", string(encodeResponse(response)))
|
|
|
|
|
|
|
|
|
|
|
|
writeSuccessResponseXML(w, encodeResponse(response)) |
|
|
writeSuccessResponseXML(w, encodeResponse(response)) |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
@ -52,7 +53,7 @@ func (s3a *S3ApiServer) CompleteMultipartUploadHandler(w http.ResponseWriter, r |
|
|
UploadId: aws.String(uploadID), |
|
|
UploadId: aws.String(uploadID), |
|
|
}) |
|
|
}) |
|
|
|
|
|
|
|
|
// println("CompleteMultipartUploadHandler", string(encodeResponse(response)), errCode)
|
|
|
|
|
|
|
|
|
glog.V(2).Info("CompleteMultipartUploadHandler", string(encodeResponse(response)), errCode) |
|
|
|
|
|
|
|
|
if errCode != s3err.ErrNone { |
|
|
if errCode != s3err.ErrNone { |
|
|
writeErrorResponse(w, errCode, r.URL) |
|
|
writeErrorResponse(w, errCode, r.URL) |
|
@ -81,7 +82,7 @@ func (s3a *S3ApiServer) AbortMultipartUploadHandler(w http.ResponseWriter, r *ht |
|
|
return |
|
|
return |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// println("AbortMultipartUploadHandler", string(encodeResponse(response)))
|
|
|
|
|
|
|
|
|
glog.V(2).Info("AbortMultipartUploadHandler", string(encodeResponse(response))) |
|
|
|
|
|
|
|
|
writeSuccessResponseXML(w, encodeResponse(response)) |
|
|
writeSuccessResponseXML(w, encodeResponse(response)) |
|
|
|
|
|
|
|
@ -114,13 +115,14 @@ func (s3a *S3ApiServer) ListMultipartUploadsHandler(w http.ResponseWriter, r *ht |
|
|
UploadIdMarker: aws.String(uploadIDMarker), |
|
|
UploadIdMarker: aws.String(uploadIDMarker), |
|
|
}) |
|
|
}) |
|
|
|
|
|
|
|
|
|
|
|
glog.V(2).Info("ListMultipartUploadsHandler", string(encodeResponse(response)), errCode) |
|
|
|
|
|
|
|
|
if errCode != s3err.ErrNone { |
|
|
if errCode != s3err.ErrNone { |
|
|
writeErrorResponse(w, errCode, r.URL) |
|
|
writeErrorResponse(w, errCode, r.URL) |
|
|
return |
|
|
return |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// TODO handle encodingType
|
|
|
// TODO handle encodingType
|
|
|
// println("ListMultipartUploadsHandler", string(encodeResponse(response)))
|
|
|
|
|
|
|
|
|
|
|
|
writeSuccessResponseXML(w, encodeResponse(response)) |
|
|
writeSuccessResponseXML(w, encodeResponse(response)) |
|
|
} |
|
|
} |
|
@ -147,13 +149,13 @@ func (s3a *S3ApiServer) ListObjectPartsHandler(w http.ResponseWriter, r *http.Re |
|
|
UploadId: aws.String(uploadID), |
|
|
UploadId: aws.String(uploadID), |
|
|
}) |
|
|
}) |
|
|
|
|
|
|
|
|
|
|
|
glog.V(2).Info("ListObjectPartsHandler", string(encodeResponse(response)), errCode) |
|
|
|
|
|
|
|
|
if errCode != s3err.ErrNone { |
|
|
if errCode != s3err.ErrNone { |
|
|
writeErrorResponse(w, errCode, r.URL) |
|
|
writeErrorResponse(w, errCode, r.URL) |
|
|
return |
|
|
return |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// println("ListObjectPartsHandler", string(encodeResponse(response)))
|
|
|
|
|
|
|
|
|
|
|
|
writeSuccessResponseXML(w, encodeResponse(response)) |
|
|
writeSuccessResponseXML(w, encodeResponse(response)) |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|