TrueCloudLab/frostfs-s3-gw
17
3
Fork 20
Code Issues 18 Pull requests 3 Projects Releases 36 Packages 1 Activity Actions

[#429] Refactor TreeService for notif,cors,settings

Browse source 
Signed-off-by: Angira Kekteeva <kira@nspcc.ru>
This commit is contained in:
Angira Kekteeva 2022-05-17 16:52:51 +03:00 • committed by Alex Vanin
parent 8eff857e41
commit ab5c44ac14
5 changed files with 88 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

11
api/layer/system_object.go
View file

@ -181,15 +181,16 @@ func (n *layer) getCORS(ctx context.Context, bkt *data.BucketInfo, sysName strin
if cors := n.systemCache.GetCORS(systemObjectKey(bkt, sysName)); cors != nil {
return cors, nil
}
ids, _, err := n.treeService.GetBucketCORS(ctx, &bkt.CID, true)
objID, err := n.treeService.GetBucketCORS(ctx, &bkt.CID)
if err != nil {
return nil, err
}
if len(ids) == 0 {
if objID == nil {
return nil, errors.GetAPIError(errors.ErrNoSuchCORSConfiguration)
}
obj, err := n.objectGet(ctx, bkt, *ids[0])
obj, err := n.objectGet(ctx, bkt, *objID)
if err != nil {
return nil, err
}
@ -259,7 +260,7 @@ func (n *layer) GetBucketSettings(ctx context.Context, bktInfo *data.BucketInfo)
return settings, nil
}
settings, err := n.treeService.GetSettingsNode(ctx, &bktInfo.CID, "version")
settings, err := n.treeService.GetSettingsNode(ctx, &bktInfo.CID)
if err != nil {
if !errorsStd.Is(err, ErrNodeNotFound) {
return nil, err
@ -278,7 +279,7 @@ func (n *layer) GetBucketSettings(ctx context.Context, bktInfo *data.BucketInfo)
}
func (n *layer) PutBucketSettings(ctx context.Context, p *PutSettingsParams) error {
if err := n.treeService.PutSettingsNode(ctx, &p.BktInfo.CID, "version", p.Settings); err != nil {
if err := n.treeService.PutSettingsNode(ctx, &p.BktInfo.CID, p.Settings); err != nil {
return fmt.Errorf("failed to get settings node: %w", err)
}