From dc166513562871c50c6302ad4fbefa4668052d00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Mon, 22 Aug 2022 14:18:21 +0000 Subject: [PATCH] lint fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- pkg/share/manager/jsoncs3/jsoncs3.go | 16 ++++++++++++---- pkg/share/manager/jsoncs3/jsoncs3_test.go | 11 ++++++----- .../providercache/providercache_test.go | 18 +++++++++--------- pkg/utils/utils.go | 2 +- 4 files changed, 28 insertions(+), 19 deletions(-) diff --git a/pkg/share/manager/jsoncs3/jsoncs3.go b/pkg/share/manager/jsoncs3/jsoncs3.go index 821b7baf7bb..9a6ad72d37d 100644 --- a/pkg/share/manager/jsoncs3/jsoncs3.go +++ b/pkg/share/manager/jsoncs3/jsoncs3.go @@ -506,7 +506,9 @@ func (m *Manager) listSharesByIDs(ctx context.Context, user *userv1beta1.User, f func (m *Manager) listCreatedShares(ctx context.Context, user *userv1beta1.User, filters []*collaboration.Filter) ([]*collaboration.Share, error) { var ss []*collaboration.Share - m.CreatedCache.Sync(ctx, user.Id.OpaqueId) + if err := m.CreatedCache.Sync(ctx, user.Id.OpaqueId); err != nil { + return ss, err + } for ssid, spaceShareIDs := range m.CreatedCache.List(user.Id.OpaqueId) { storageID, spaceID, _ := shareid.Decode(ssid) err := m.Cache.Sync(ctx, storageID, spaceID) @@ -546,7 +548,9 @@ func (m *Manager) ListReceivedShares(ctx context.Context, filters []*collaborati // first collect all spaceids the user has access to as a group member for _, group := range user.Groups { - m.GroupReceivedCache.Sync(ctx, group) + if err := m.GroupReceivedCache.Sync(ctx, group); err != nil { + continue // ignore error, cache will be updated on next read + } for ssid, spaceShareIDs := range m.GroupReceivedCache.List(group) { // add a pending entry, the state will be updated // when reading the received shares below if they have already been accepted or denied @@ -565,7 +569,8 @@ func (m *Manager) ListReceivedShares(ctx context.Context, filters []*collaborati } // add all spaces the user has receved shares for, this includes mount points and share state for groups - m.UserReceivedStates.Sync(ctx, user.Id.OpaqueId) + _ = m.UserReceivedStates.Sync(ctx, user.Id.OpaqueId) // ignore error, cache will be updated on next read + if m.UserReceivedStates.ReceivedSpaces[user.Id.OpaqueId] != nil { for ssid, rspace := range m.UserReceivedStates.ReceivedSpaces[user.Id.OpaqueId].Spaces { if rs, ok := ssids[ssid]; ok { @@ -616,7 +621,7 @@ func (m *Manager) convert(ctx context.Context, userID string, s *collaboration.S storageID, spaceID, _ := shareid.Decode(s.Id.OpaqueId) - m.UserReceivedStates.Sync(ctx, userID) + _ = m.UserReceivedStates.Sync(ctx, userID) // ignore error, cache will be updated on next read state := m.UserReceivedStates.Get(userID, storageID+"^"+spaceID, s.Id.GetOpaqueId()) if state != nil { rs.State = state.State @@ -686,6 +691,9 @@ func (m *Manager) UpdateReceivedShare(ctx context.Context, receivedShare *collab err = m.UserReceivedStates.Add(ctx, userID.GetId().GetOpaqueId(), rs.Share.ResourceId.StorageId+"^"+rs.Share.ResourceId.SpaceId, rs) // TODO try more often? } + if err != nil { + return nil, err + } return rs, nil } diff --git a/pkg/share/manager/jsoncs3/jsoncs3_test.go b/pkg/share/manager/jsoncs3/jsoncs3_test.go index c48892d1093..ba65b960371 100644 --- a/pkg/share/manager/jsoncs3/jsoncs3_test.go +++ b/pkg/share/manager/jsoncs3/jsoncs3_test.go @@ -227,6 +227,7 @@ var _ = Describe("Jsoncs3", func() { Permissions: conversions.NewManagerRole().CS3ResourcePermissions(), }, }) + Expect(err).ToNot(HaveOccurred()) }) Describe("ListShares", func() { @@ -338,7 +339,7 @@ var _ = Describe("Jsoncs3", func() { cache.Shares[share.Id.OpaqueId].Permissions.Permissions.InitiateFileUpload = true bytes, err := json.Marshal(cache) Expect(err).ToNot(HaveOccurred()) - storage.SimpleUpload(context.Background(), "storages/storageid/spaceid.json", bytes) + Expect(storage.SimpleUpload(context.Background(), "storages/storageid/spaceid.json", bytes)).To(Succeed()) Expect(err).ToNot(HaveOccurred()) // Reset providercache in memory @@ -559,7 +560,7 @@ var _ = Describe("Jsoncs3", func() { cache.Shares[share.Id.OpaqueId].Permissions.Permissions.InitiateFileUpload = true bytes, err := json.Marshal(cache) Expect(err).ToNot(HaveOccurred()) - storage.SimpleUpload(context.Background(), "storages/storageid/spaceid.json", bytes) + Expect(storage.SimpleUpload(context.Background(), "storages/storageid/spaceid.json", bytes)).To(Succeed()) Expect(err).ToNot(HaveOccurred()) // Reset providercache in memory @@ -579,9 +580,9 @@ var _ = Describe("Jsoncs3", func() { Expect(len(shares)).To(Equal(1)) // Add a second cache to the provider cache so it can be referenced - m.Cache.Add(ctx, "storageid", "spaceid", "storageid^spaceid°secondshare", &collaboration.Share{ + Expect(m.Cache.Add(ctx, "storageid", "spaceid", "storageid^spaceid°secondshare", &collaboration.Share{ Creator: user1.Id, - }) + })).To(Succeed()) cache := sharecache.UserShareCache{ Mtime: time.Now(), @@ -644,7 +645,7 @@ var _ = Describe("Jsoncs3", func() { cache.Shares[share.Id.OpaqueId].Permissions.Permissions.InitiateFileUpload = true bytes, err := json.Marshal(cache) Expect(err).ToNot(HaveOccurred()) - storage.SimpleUpload(context.Background(), "storages/storageid/spaceid.json", bytes) + Expect(storage.SimpleUpload(context.Background(), "storages/storageid/spaceid.json", bytes)).To(Succeed()) Expect(err).ToNot(HaveOccurred()) // Reset providercache in memory diff --git a/pkg/share/manager/jsoncs3/providercache/providercache_test.go b/pkg/share/manager/jsoncs3/providercache/providercache_test.go index d12a2e865de..9fdfdbc8f94 100644 --- a/pkg/share/manager/jsoncs3/providercache/providercache_test.go +++ b/pkg/share/manager/jsoncs3/providercache/providercache_test.go @@ -77,7 +77,7 @@ var _ = Describe("Cache", func() { s := c.Get(storageID, spaceID, shareID) Expect(s).To(BeNil()) - c.Add(ctx, storageID, spaceID, shareID, share1) + Expect(c.Add(ctx, storageID, spaceID, shareID, share1)).To(Succeed()) s = c.Get(storageID, spaceID, shareID) Expect(s).ToNot(BeNil()) @@ -85,14 +85,14 @@ var _ = Describe("Cache", func() { }) It("sets the mtime", func() { - c.Add(ctx, storageID, spaceID, shareID, share1) + Expect(c.Add(ctx, storageID, spaceID, shareID, share1)).To(Succeed()) Expect(c.Providers[storageID].Spaces[spaceID].Mtime).ToNot(Equal(time.Time{})) }) It("updates the mtime", func() { - c.Add(ctx, storageID, spaceID, shareID, share1) + Expect(c.Add(ctx, storageID, spaceID, shareID, share1)).To(Succeed()) old := c.Providers[storageID].Spaces[spaceID].Mtime - c.Add(ctx, storageID, spaceID, shareID, share1) + Expect(c.Add(ctx, storageID, spaceID, shareID, share1)).To(Succeed()) Expect(c.Providers[storageID].Spaces[spaceID].Mtime).ToNot(Equal(old)) }) }) @@ -115,16 +115,16 @@ var _ = Describe("Cache", func() { Expect(s).ToNot(BeNil()) Expect(s).To(Equal(share1)) - c.Remove(ctx, storageID, spaceID, shareID) + Expect(c.Remove(ctx, storageID, spaceID, shareID)).To(Succeed()) s = c.Get(storageID, spaceID, shareID) Expect(s).To(BeNil()) }) It("updates the mtime", func() { - c.Add(ctx, storageID, spaceID, shareID, share1) + Expect(c.Add(ctx, storageID, spaceID, shareID, share1)).To(Succeed()) old := c.Providers[storageID].Spaces[spaceID].Mtime - c.Remove(ctx, storageID, spaceID, shareID) + Expect(c.Remove(ctx, storageID, spaceID, shareID)).To(Succeed()) Expect(c.Providers[storageID].Spaces[spaceID].Mtime).ToNot(Equal(old)) }) }) @@ -167,7 +167,7 @@ var _ = Describe("Cache", func() { s := c.Get(storageID, spaceID, shareID) Expect(s).To(BeNil()) - c.Sync(ctx, storageID, spaceID) + Expect(c.Sync(ctx, storageID, spaceID)).To(Succeed()) s = c.Get(storageID, spaceID, shareID) Expect(s).ToNot(BeNil()) @@ -184,7 +184,7 @@ var _ = Describe("Cache", func() { }, }, } - c.Sync(ctx, storageID, spaceID) // Sync from disk won't happen because in-memory mtime is later than on disk + Expect(c.Sync(ctx, storageID, spaceID)).To(Succeed()) // Sync from disk won't happen because in-memory mtime is later than on disk s = c.Get(storageID, spaceID, shareID) Expect(s).To(BeNil()) diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go index 3e53660d6d0..0d99af4939e 100644 --- a/pkg/utils/utils.go +++ b/pkg/utils/utils.go @@ -146,7 +146,7 @@ func TSToTime(ts *types.Timestamp) time.Time { // TimeToTS converts Go's time.Time to a protobuf Timestamp. func TimeToTS(t time.Time) *types.Timestamp { return &types.Timestamp{ - Seconds: uint64(t.Unix()), // implicity returns UTC + Seconds: uint64(t.Unix()), // implicitly returns UTC Nanos: uint32(t.Nanosecond()), } }