From 59b3372783b0cc9f49b5bca8919dfa3b36c03cc2 Mon Sep 17 00:00:00 2001 From: Gianmaria Del Monte Date: Thu, 9 Mar 2023 18:09:32 +0100 Subject: [PATCH 1/4] skip computing groups --- pkg/cbox/group/rest/rest.go | 8 +++++++- tests/ocis | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pkg/cbox/group/rest/rest.go b/pkg/cbox/group/rest/rest.go index 60dbac622b..06fdcd93b5 100644 --- a/pkg/cbox/group/rest/rest.go +++ b/pkg/cbox/group/rest/rest.go @@ -148,7 +148,7 @@ func (m *manager) fetchAllGroups() { func (m *manager) fetchAllGroupAccounts() error { ctx := context.Background() - url := fmt.Sprintf("%s/api/v1.0/Group?field=groupIdentifier&field=displayName&field=gid", m.conf.APIBaseURL) + url := fmt.Sprintf("%s/api/v1.0/Group?field=groupIdentifier&field=displayName&field=gid&field=isComputingGroup", m.conf.APIBaseURL) for url != "" { result, err := m.apiTokenManager.SendAPIGetRequest(ctx, url, false) @@ -166,6 +166,12 @@ func (m *manager) fetchAllGroupAccounts() error { continue } + // filter computing groups + is, ok := groupData["isComputingGroup"].(bool) + if ok && is { + continue + } + _, err = m.parseAndCacheGroup(ctx, groupData) if err != nil { continue diff --git a/tests/ocis b/tests/ocis index 804d177705..6357a70318 160000 --- a/tests/ocis +++ b/tests/ocis @@ -1 +1 @@ -Subproject commit 804d1777051c3583dfeebae467466f1316fa3583 +Subproject commit 6357a703181b368e2109f720e0785a11222eed88 From 403e0a97bd7ed02fa6bd8b7e9fe217c86ff532d6 Mon Sep 17 00:00:00 2001 From: Gianmaria Del Monte Date: Thu, 9 Mar 2023 18:11:28 +0100 Subject: [PATCH 2/4] add changelog --- changelog/unreleased/filter-computing-groups-grappa.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 changelog/unreleased/filter-computing-groups-grappa.md diff --git a/changelog/unreleased/filter-computing-groups-grappa.md b/changelog/unreleased/filter-computing-groups-grappa.md new file mode 100644 index 0000000000..3273ec700a --- /dev/null +++ b/changelog/unreleased/filter-computing-groups-grappa.md @@ -0,0 +1,3 @@ +Enhancement: Skip computing groups when fetching all groups from grappa + +https://github.com/cs3org/reva/pull/3719 \ No newline at end of file From 30dab51a8829bedbee1f5c7d2fd998f1cafa3321 Mon Sep 17 00:00:00 2001 From: Gianmaria Del Monte Date: Thu, 9 Mar 2023 18:12:48 +0100 Subject: [PATCH 3/4] fix --- pkg/cbox/group/rest/rest.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkg/cbox/group/rest/rest.go b/pkg/cbox/group/rest/rest.go index 06fdcd93b5..f2501677f1 100644 --- a/pkg/cbox/group/rest/rest.go +++ b/pkg/cbox/group/rest/rest.go @@ -167,8 +167,7 @@ func (m *manager) fetchAllGroupAccounts() error { } // filter computing groups - is, ok := groupData["isComputingGroup"].(bool) - if ok && is { + if is, ok := groupData["isComputingGroup"].(bool); ok && is { continue } From 582cae7efb59e0344650a4560217e551f04cbf23 Mon Sep 17 00:00:00 2001 From: Gianmaria Del Monte Date: Fri, 10 Mar 2023 09:31:48 +0100 Subject: [PATCH 4/4] use 804d1777051c3583dfeebae467466f1316fa3583 commit --- tests/ocis | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/ocis b/tests/ocis index 6357a70318..804d177705 160000 --- a/tests/ocis +++ b/tests/ocis @@ -1 +1 @@ -Subproject commit 6357a703181b368e2109f720e0785a11222eed88 +Subproject commit 804d1777051c3583dfeebae467466f1316fa3583