From 02c46f3f4325a7a5d56f331cd661da8cc2a45560 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Fri, 9 Jul 2021 10:12:39 +0000 Subject: [PATCH] revert resource comparisons MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- pkg/ocm/share/manager/json/json.go | 6 +++--- pkg/publicshare/manager/json/json.go | 2 +- pkg/publicshare/manager/memory/memory.go | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/ocm/share/manager/json/json.go b/pkg/ocm/share/manager/json/json.go index 3c2462fbdd3..3168f4951ac 100644 --- a/pkg/ocm/share/manager/json/json.go +++ b/pkg/ocm/share/manager/json/json.go @@ -416,7 +416,7 @@ func (m *mgr) getByKey(ctx context.Context, key *ocm.ShareKey) (*ocm.Share, erro continue } if (utils.UserEqual(key.Owner, share.Owner) || utils.UserEqual(key.Owner, share.Creator)) && - utils.ResourceIDEqual(key.ResourceId, share.ResourceId) && utils.GranteeEqual(key.Grantee, share.Grantee) { + utils.ResourceEqual(&provider.Reference{ResourceId: key.ResourceId}, &provider.Reference{ResourceId: share.ResourceId}) && utils.GranteeEqual(key.Grantee, share.Grantee) { return &share, nil } } @@ -492,7 +492,7 @@ func sharesEqual(ref *ocm.ShareReference, s *ocm.Share) bool { } } else if ref.GetKey() != nil { if (utils.UserEqual(ref.GetKey().Owner, s.Owner) || utils.UserEqual(ref.GetKey().Owner, s.Creator)) && - utils.ResourceIDEqual(ref.GetKey().ResourceId, s.ResourceId) && utils.GranteeEqual(ref.GetKey().Grantee, s.Grantee) { + utils.ResourceEqual(&provider.Reference{ResourceId: ref.GetKey().ResourceId}, &provider.Reference{ResourceId: s.ResourceId}) && utils.GranteeEqual(ref.GetKey().Grantee, s.Grantee) { return true } } @@ -563,7 +563,7 @@ func (m *mgr) ListShares(ctx context.Context, filters []*ocm.ListOCMSharesReques // TODO(labkode): add the rest of filters. for _, f := range filters { if f.Type == ocm.ListOCMSharesRequest_Filter_TYPE_RESOURCE_ID { - if utils.ResourceIDEqual(share.ResourceId, f.GetResourceId()) { + if utils.ResourceEqual(&provider.Reference{ResourceId: share.ResourceId}, &provider.Reference{ResourceId: f.GetResourceId()}) { ss = append(ss, &share) } } diff --git a/pkg/publicshare/manager/json/json.go b/pkg/publicshare/manager/json/json.go index 0ae33a02862..0d1750b9c68 100644 --- a/pkg/publicshare/manager/json/json.go +++ b/pkg/publicshare/manager/json/json.go @@ -387,7 +387,7 @@ func (m *manager) ListPublicShares(ctx context.Context, u *user.User, filters [] } else { for i := range filters { if filters[i].Type == link.ListPublicSharesRequest_Filter_TYPE_RESOURCE_ID { - if utils.ResourceIDEqual(local.ResourceId, filters[i].GetResourceId()) { + if utils.ResourceEqual(&provider.Reference{ResourceId: local.ResourceId}, &provider.Reference{ResourceId: filters[i].GetResourceId()}) { if notExpired(&local.PublicShare) { shares = append(shares, &local.PublicShare) } else if err := m.revokeExpiredPublicShare(ctx, &local.PublicShare, u); err != nil { diff --git a/pkg/publicshare/manager/memory/memory.go b/pkg/publicshare/manager/memory/memory.go index c3885227caf..f06aa393580 100644 --- a/pkg/publicshare/manager/memory/memory.go +++ b/pkg/publicshare/manager/memory/memory.go @@ -180,7 +180,7 @@ func (m *manager) ListPublicShares(ctx context.Context, u *user.User, filters [] } else { for _, f := range filters { if f.Type == link.ListPublicSharesRequest_Filter_TYPE_RESOURCE_ID { - if utils.ResourceIDEqual(s.ResourceId, f.GetResourceId()) { + if utils.ResourceEqual(&provider.Reference{ResourceId: s.ResourceId}, &provider.Reference{ResourceId: f.GetResourceId()}) { shares = append(shares, s) } }