realloc/frostfs-s3-gw
1
0
Fork 0
forked from TrueCloudLab/frostfs-s3-gw
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#122] Add versioning put object

Browse source 
Signed-off-by: Denis Kirillov <denis@nspcc.ru>
This commit is contained in:
Denis Kirillov 2021-08-10 11:58:40 +03:00
parent feb45d0633
commit f463522f34
3 changed files with 90 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

22
api/handler/versioning.go
View file

@ -3,7 +3,6 @@ package handler
import (
"encoding/xml"
"net/http"
"strconv"
"github.com/nspcc-dev/neofs-s3-gw/api"
"github.com/nspcc-dev/neofs-s3-gw/api/layer"
@ -20,8 +19,8 @@ func (h *handler) PutBucketVersioningHandler(w http.ResponseWriter, r *http.Requ
}
p := &layer.PutVersioningParams{
Bucket: reqInfo.BucketName,
VersioningEnabled: configuration.Status == "Enabled",
Bucket: reqInfo.BucketName,
Settings: &layer.BucketSettings{VersioningEnabled: configuration.Status == "Enabled"},
}
if _, err := h.obj.PutBucketVersioning(r.Context(), p); err != nil {
@ -33,7 +32,7 @@ func (h *handler) PutBucketVersioningHandler(w http.ResponseWriter, r *http.Requ
func (h *handler) GetBucketVersioningHandler(w http.ResponseWriter, r *http.Request) {
reqInfo := api.GetReqInfo(r.Context())
objInfo, err := h.obj.GetBucketVersioning(r.Context(), reqInfo.BucketName)
settings, err := h.obj.GetBucketVersioning(r.Context(), reqInfo.BucketName)
if err != nil {
h.log.Warn("couldn't get version settings object: default version settings will be used",
zap.String("request_id", reqInfo.RequestID),
@ -42,23 +41,18 @@ func (h *handler) GetBucketVersioningHandler(w http.ResponseWriter, r *http.Requ
zap.Error(err))
}
if err = api.EncodeToResponse(w, formVersioningConfiguration(objInfo)); err != nil {
if err = api.EncodeToResponse(w, formVersioningConfiguration(settings)); err != nil {
h.logAndSendError(w, "something went wrong", reqInfo, err)
}
}
func formVersioningConfiguration(inf *layer.ObjectInfo) *VersioningConfiguration {
func formVersioningConfiguration(settings *layer.BucketSettings) *VersioningConfiguration {
res := &VersioningConfiguration{Status: "Suspended"}
if inf == nil {
if settings == nil {
return res
}
enabled, ok := inf.Headers["S3-Settings-Versioning-enabled"]
if ok {
if parsed, err := strconv.ParseBool(enabled); err == nil && parsed {
res.Status = "Enabled"
}
if settings.VersioningEnabled {
res.Status = "Enabled"
}
return res
}