From 17717ac42e5028d8c2035f0dc5370d4519ba8125 Mon Sep 17 00:00:00 2001 From: Denis Kirillov Date: Mon, 5 Aug 2024 11:47:23 +0300 Subject: [PATCH] [#17] go.mod: Update s3-gw to eliminate redundant logs Signed-off-by: Denis Kirillov --- go.mod | 2 +- go.sum | 4 ++-- internal/lifecycle/dependencies.go | 2 +- internal/lifecycle/fetcher.go | 6 +----- internal/lifecycle/fetcher_test.go | 14 +++++++------- 5 files changed, 12 insertions(+), 16 deletions(-) diff --git a/go.mod b/go.mod index b48dd73..f5c0b41 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.21 require ( git.frostfs.info/TrueCloudLab/frostfs-contract v0.19.3-0.20240621131249-49e5270f673e git.frostfs.info/TrueCloudLab/frostfs-node v0.42.0-rc.5 - git.frostfs.info/TrueCloudLab/frostfs-s3-gw v0.30.1-0.20240722144417-a4a4573b107d + git.frostfs.info/TrueCloudLab/frostfs-s3-gw v0.30.1-0.20240802133702-0322c0c0b253 git.frostfs.info/TrueCloudLab/frostfs-sdk-go v0.0.0-20240722061523-7e94a6adf2ba git.frostfs.info/TrueCloudLab/hrw v1.2.1 git.frostfs.info/TrueCloudLab/policy-engine v0.0.0-20240611102930-ac965e8d176a diff --git a/go.sum b/go.sum index 0eb7adc..39cc65f 100644 --- a/go.sum +++ b/go.sum @@ -8,8 +8,8 @@ git.frostfs.info/TrueCloudLab/frostfs-node v0.42.0-rc.5 h1:lVWO3JtF3R4Irb+/xT5+w git.frostfs.info/TrueCloudLab/frostfs-node v0.42.0-rc.5/go.mod h1:IZBD+sRxSxpXXIkg0rAK5yvkGHZUaHBqmcWFu2UmbmQ= git.frostfs.info/TrueCloudLab/frostfs-observability v0.0.0-20231101111734-b3ad3335ff65 h1:PaZ8GpnUoXxUoNsc1qp36bT2u7FU+neU4Jn9cl8AWqI= git.frostfs.info/TrueCloudLab/frostfs-observability v0.0.0-20231101111734-b3ad3335ff65/go.mod h1:6aAX80dvJ3r5fjN9CzzPglRptoiPgIC9KFGGsUA+1Hw= -git.frostfs.info/TrueCloudLab/frostfs-s3-gw v0.30.1-0.20240722144417-a4a4573b107d h1:6K1ilJ5LnNVC0dR7i9FhSmyNQd3mIjod7RIhuor6MF4= -git.frostfs.info/TrueCloudLab/frostfs-s3-gw v0.30.1-0.20240722144417-a4a4573b107d/go.mod h1:ZWARi0rzNgCD/RjHEYGg4z3pKaZap8ytU6gOJ+lCD5g= +git.frostfs.info/TrueCloudLab/frostfs-s3-gw v0.30.1-0.20240802133702-0322c0c0b253 h1:X51wg0Kr0yJxb6YJxHTUxqgFj6fNy6ShRcgM0FepOko= +git.frostfs.info/TrueCloudLab/frostfs-s3-gw v0.30.1-0.20240802133702-0322c0c0b253/go.mod h1:ZWARi0rzNgCD/RjHEYGg4z3pKaZap8ytU6gOJ+lCD5g= git.frostfs.info/TrueCloudLab/frostfs-sdk-go v0.0.0-20240722061523-7e94a6adf2ba h1:OP5fCRRQ5ndRmAYyuLr7rBOMz5nKrB+o9B1XZ+mm3XY= git.frostfs.info/TrueCloudLab/frostfs-sdk-go v0.0.0-20240722061523-7e94a6adf2ba/go.mod h1:vluJ/+yQMcq8ZIZZSA7Te+JKClr0lgtRErjICvb8wto= git.frostfs.info/TrueCloudLab/hrw v1.2.1 h1:ccBRK21rFvY5R1WotI6LNoPlizk7qSvdfD8lNIRudVc= diff --git a/internal/lifecycle/dependencies.go b/internal/lifecycle/dependencies.go index 8c3c13a..9b767e5 100644 --- a/internal/lifecycle/dependencies.go +++ b/internal/lifecycle/dependencies.go @@ -23,7 +23,7 @@ type ContainerFetcher interface { } type TreeFetcher interface { - GetBucketLifecycleConfiguration(ctx context.Context, bktInfo *data.BucketInfo) (oid.ID, error) + GetBucketLifecycleConfiguration(ctx context.Context, bktInfo *data.BucketInfo) (oid.Address, error) } type FrostFSFetcher interface { diff --git a/internal/lifecycle/fetcher.go b/internal/lifecycle/fetcher.go index 44e28b8..aa00ebb 100644 --- a/internal/lifecycle/fetcher.go +++ b/internal/lifecycle/fetcher.go @@ -262,15 +262,11 @@ func (p *JobProvider) handleContainer(ctx context.Context, uc *UserContainer, ep } ctx = addBearerToContext(ctx, btoken) - objID, err := p.treeFetcher.GetBucketLifecycleConfiguration(ctx, bktInfo) + addr, err := p.treeFetcher.GetBucketLifecycleConfiguration(ctx, bktInfo) if err != nil { return fmt.Errorf("get lifecycle configuration from tree: %w", err) } - var addr oid.Address - addr.SetContainer(uc.Container) - addr.SetObject(objID) - configuration, err := p.fetchLifecycleConfiguration(ctx, addr) if err != nil { return fmt.Errorf("get lifecycle configuration from storage: %w", err) diff --git a/internal/lifecycle/fetcher_test.go b/internal/lifecycle/fetcher_test.go index c5825b5..4d5b662 100644 --- a/internal/lifecycle/fetcher_test.go +++ b/internal/lifecycle/fetcher_test.go @@ -207,22 +207,22 @@ func (c *credentialSourceMock) Credentials(_ context.Context, pk *keys.PublicKey var _ TreeFetcher = (*treeFetcherMock)(nil) type treeFetcherMock struct { - configurations map[cid.ID]oid.ID + configurations map[cid.ID]oid.Address } -func newTreeFetcherMock(configs map[cid.ID]oid.ID) *treeFetcherMock { +func newTreeFetcherMock(configs map[cid.ID]oid.Address) *treeFetcherMock { if configs == nil { - configs = map[cid.ID]oid.ID{} + configs = map[cid.ID]oid.Address{} } return &treeFetcherMock{ configurations: configs, } } -func (t *treeFetcherMock) GetBucketLifecycleConfiguration(_ context.Context, bktInfo *data.BucketInfo) (oid.ID, error) { +func (t *treeFetcherMock) GetBucketLifecycleConfiguration(_ context.Context, bktInfo *data.BucketInfo) (oid.Address, error) { val, ok := t.configurations[bktInfo.CID] if !ok { - return oid.ID{}, errors.New("treeFetcherMock: hash not found") + return oid.Address{}, errors.New("treeFetcherMock: hash not found") } return val, nil @@ -391,12 +391,12 @@ func initFetcherMocks(users, containers int) (*fetchersMock, error) { ffsFetcher := newFrostFSFetcherMock() cnrsMap := make(map[util.Uint160][]cid.ID) - treeMap := make(map[cid.ID]oid.ID) + treeMap := make(map[cid.ID]oid.Address) for hash := range usersMap { for i := 0; i < containers; i++ { addr := oidtest.Address() cnrsMap[hash] = append(cnrsMap[hash], addr.Container()) - treeMap[addr.Container()] = addr.Object() + treeMap[addr.Container()] = addr lc := &data.LifecycleConfiguration{Rules: []data.LifecycleRule{{ID: addr.EncodeToString()}}} raw, err := xml.Marshal(lc)