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

[#569] Rename versioning consts

Browse source 
Signed-off-by: Angira Kekteeva <kira@nspcc.ru>
This commit is contained in:
Angira Kekteeva 2022-07-20 14:30:19 +04:00 committed by Alex Vanin
parent 77f466b1d5
commit 56eb2dc3dc
9 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
api/cache/cache_test.go vendored
View file

@ -153,7 +153,7 @@ func TestSettingsCacheType(t *testing.T) {
cache := NewSystemCache(DefaultSystemConfig(logger)) cache := NewSystemCache(DefaultSystemConfig(logger))
key := "key" key := "key"
settings := &data.BucketSettings{Versioning: data.VerEnabled} settings := &data.BucketSettings{Versioning: data.VersioningEnabled}
err := cache.PutSettings(key, settings) err := cache.PutSettings(key, settings)
require.NoError(t, err) require.NoError(t, err)

12
api/data/info.go
View file

@ -14,9 +14,9 @@ const (
bktCORSConfigurationObject = ".s3-cors" bktCORSConfigurationObject = ".s3-cors"
bktNotificationConfigurationObject = ".s3-notifications" bktNotificationConfigurationObject = ".s3-notifications"
VerUnversioned = "Unversioned" VersioningUnversioned = "Unversioned"
VerEnabled = "Enabled" VersioningEnabled = "Enabled"
VerSuspended = "Suspended" VersioningSuspended = "Suspended"
) )
type ( type (
@ -96,13 +96,13 @@ func (o *ObjectInfo) Address() oid.Address {
} }
func (b BucketSettings) Unversioned() bool { func (b BucketSettings) Unversioned() bool {
return b.Versioning == VerUnversioned return b.Versioning == VersioningUnversioned
} }
func (b BucketSettings) VersioningEnabled() bool { func (b BucketSettings) VersioningEnabled() bool {
return b.Versioning == VerEnabled return b.Versioning == VersioningEnabled
} }
func (b BucketSettings) VersioningSuspended() bool { func (b BucketSettings) VersioningSuspended() bool {
return b.Versioning == VerSuspended return b.Versioning == VersioningSuspended
} }

2
api/handler/handlers_test.go
View file

@ -109,7 +109,7 @@ func createTestBucketWithLock(ctx context.Context, t *testing.T, h *handlerConte
sp := &layer.PutSettingsParams{ sp := &layer.PutSettingsParams{
BktInfo: bktInfo, BktInfo: bktInfo,
Settings: &data.BucketSettings{ Settings: &data.BucketSettings{
Versioning: data.VerEnabled, Versioning: data.VersioningEnabled,
LockConfiguration: conf, LockConfiguration: conf,
}, },
} }

2
api/handler/put.go
View file

@ -659,7 +659,7 @@ func (h *handler) CreateBucketHandler(w http.ResponseWriter, r *http.Request) {
if p.ObjectLockEnabled { if p.ObjectLockEnabled {
sp := &layer.PutSettingsParams{ sp := &layer.PutSettingsParams{
BktInfo: bktInfo, BktInfo: bktInfo,
Settings: &data.BucketSettings{Versioning: data.VerEnabled}, Settings: &data.BucketSettings{Versioning: data.VersioningEnabled},
} }
if err = h.obj.PutBucketSettings(r.Context(), sp); err != nil { if err = h.obj.PutBucketSettings(r.Context(), sp); err != nil {
h.logAndSendError(w, "couldn't enable bucket versioning", reqInfo, err, h.logAndSendError(w, "couldn't enable bucket versioning", reqInfo, err,

2
api/handler/versioning.go
View file

@ -33,7 +33,7 @@ func (h *handler) PutBucketVersioningHandler(w http.ResponseWriter, r *http.Requ
return return
} }
if configuration.Status != data.VerEnabled && configuration.Status != data.VerSuspended { if configuration.Status != data.VersioningEnabled && configuration.Status != data.VersioningSuspended {
h.logAndSendError(w, "invalid versioning configuration", reqInfo, err) h.logAndSendError(w, "invalid versioning configuration", reqInfo, err)
return return
} }

2
api/layer/locking_test.go
View file

@ -12,7 +12,7 @@ func TestObjectLockAttributes(t *testing.T) {
tc := prepareContext(t) tc := prepareContext(t)
err := tc.layer.PutBucketSettings(tc.ctx, &PutSettingsParams{ err := tc.layer.PutBucketSettings(tc.ctx, &PutSettingsParams{
BktInfo: tc.bktInfo, BktInfo: tc.bktInfo,
Settings: &data.BucketSettings{Versioning: data.VerEnabled}, Settings: &data.BucketSettings{Versioning: data.VersioningEnabled},
}) })
require.NoError(t, err) require.NoError(t, err)

2
api/layer/system_object.go
View file

@ -189,7 +189,7 @@ func (n *layer) GetBucketSettings(ctx context.Context, bktInfo *data.BucketInfo)
if !errorsStd.Is(err, ErrNodeNotFound) { if !errorsStd.Is(err, ErrNodeNotFound) {
return nil, err return nil, err
} }
settings = &data.BucketSettings{Versioning: data.VerUnversioned} settings = &data.BucketSettings{Versioning: data.VersioningUnversioned}
} }
if err = n.systemCache.PutSettings(systemKey, settings); err != nil { if err = n.systemCache.PutSettings(systemKey, settings); err != nil {

8
api/layer/versioning_test.go
View file

@ -183,7 +183,7 @@ func TestSimpleVersioning(t *testing.T) {
tc := prepareContext(t) tc := prepareContext(t)
err := tc.layer.PutBucketSettings(tc.ctx, &PutSettingsParams{ err := tc.layer.PutBucketSettings(tc.ctx, &PutSettingsParams{
BktInfo: tc.bktInfo, BktInfo: tc.bktInfo,
Settings: &data.BucketSettings{Versioning: data.VerEnabled}, Settings: &data.BucketSettings{Versioning: data.VersioningEnabled},
}) })
require.NoError(t, err) require.NoError(t, err)
@ -220,7 +220,7 @@ func TestSimpleNoVersioning(t *testing.T) {
func TestVersioningDeleteObject(t *testing.T) { func TestVersioningDeleteObject(t *testing.T) {
tc := prepareContext(t) tc := prepareContext(t)
settings := &data.BucketSettings{Versioning: data.VerEnabled} settings := &data.BucketSettings{Versioning: data.VersioningEnabled}
err := tc.layer.PutBucketSettings(tc.ctx, &PutSettingsParams{ err := tc.layer.PutBucketSettings(tc.ctx, &PutSettingsParams{
BktInfo: tc.bktInfo, BktInfo: tc.bktInfo,
Settings: settings, Settings: settings,
@ -242,7 +242,7 @@ func TestGetUnversioned(t *testing.T) {
objContent := []byte("content obj1 v1") objContent := []byte("content obj1 v1")
objInfo := tc.putObject(objContent) objInfo := tc.putObject(objContent)
settings := &data.BucketSettings{Versioning: data.VerUnversioned} settings := &data.BucketSettings{Versioning: data.VersioningUnversioned}
err := tc.layer.PutBucketSettings(tc.ctx, &PutSettingsParams{ err := tc.layer.PutBucketSettings(tc.ctx, &PutSettingsParams{
BktInfo: tc.bktInfo, BktInfo: tc.bktInfo,
Settings: settings, Settings: settings,
@ -256,7 +256,7 @@ func TestGetUnversioned(t *testing.T) {
func TestVersioningDeleteSpecificObjectVersion(t *testing.T) { func TestVersioningDeleteSpecificObjectVersion(t *testing.T) {
tc := prepareContext(t) tc := prepareContext(t)
settings := &data.BucketSettings{Versioning: data.VerEnabled} settings := &data.BucketSettings{Versioning: data.VersioningEnabled}
err := tc.layer.PutBucketSettings(tc.ctx, &PutSettingsParams{ err := tc.layer.PutBucketSettings(tc.ctx, &PutSettingsParams{
BktInfo: tc.bktInfo, BktInfo: tc.bktInfo,
Settings: settings, Settings: settings,

2
internal/neofs/tree.go
View file

@ -266,7 +266,7 @@ func (c *TreeClient) GetSettingsNode(ctx context.Context, cnrID cid.ID) (*data.B
return nil, fmt.Errorf("couldn't get node: %w", err) return nil, fmt.Errorf("couldn't get node: %w", err)
} }
settings := &data.BucketSettings{Versioning: data.VerUnversioned} settings := &data.BucketSettings{Versioning: data.VersioningUnversioned}
if versioningValue, ok := node.Get(versioningKV); ok { if versioningValue, ok := node.Get(versioningKV); ok {
settings.Versioning = versioningValue settings.Versioning = versioningValue
} }