From 74ba68ffd1c5158e347257b05badf6c9c6c0d9c9 Mon Sep 17 00:00:00 2001 From: Christian Richter Date: Mon, 7 Jul 2025 15:50:58 +0200 Subject: [PATCH 1/2] fix typo for trashbin Signed-off-by: Christian Richter --- services/graph/pkg/service/v0/drives.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/graph/pkg/service/v0/drives.go b/services/graph/pkg/service/v0/drives.go index 5344f4b41..d340a2e7e 100644 --- a/services/graph/pkg/service/v0/drives.go +++ b/services/graph/pkg/service/v0/drives.go @@ -799,7 +799,7 @@ func (g Graph) cs3StorageSpaceToDrive(ctx context.Context, baseURL *url.URL, spa drive.Root.Permissions, _ = g.cs3SpacePermissionsToLibreGraph(ctx, space, false, apiVersion) } - if _, ok := fieldMask["hasTrashedItems"]; ok { + if _, ok := fieldMask["@libre.graph.hasTrashedItems"]; ok { drive.LibreGraphHasTrashedItems = &space.HasTrashedItems } From 979b93806ef4e7ee83308823b9d3ea7ec6b38699 Mon Sep 17 00:00:00 2001 From: Christian Richter Date: Mon, 7 Jul 2025 16:45:12 +0200 Subject: [PATCH 2/2] bump libre-graph-api-go Signed-off-by: Christian Richter --- go.mod | 2 +- go.sum | 4 ++-- .../opencloud-eu/libre-graph-api-go/api_drives.go | 10 ++++++++++ .../libre-graph-api-go/api_drives_get_drives.go | 10 ++++++++++ .../opencloud-eu/libre-graph-api-go/api_me_drives.go | 10 ++++++++++ vendor/modules.txt | 2 +- 6 files changed, 34 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 6986f6e41..77b8c749c 100644 --- a/go.mod +++ b/go.mod @@ -63,7 +63,7 @@ require ( github.com/onsi/ginkgo/v2 v2.23.4 github.com/onsi/gomega v1.37.0 github.com/open-policy-agent/opa v1.6.0 - github.com/opencloud-eu/libre-graph-api-go v1.0.8-0.20250703062332-6dc201fd7bf1 + github.com/opencloud-eu/libre-graph-api-go v1.0.8-0.20250707143759-32eaae12b2ce github.com/opencloud-eu/reva/v2 v2.34.1-0.20250704134423-74abc5f04717 github.com/orcaman/concurrent-map v1.0.0 github.com/pkg/errors v0.9.1 diff --git a/go.sum b/go.sum index 25b216f6a..522aefd97 100644 --- a/go.sum +++ b/go.sum @@ -866,8 +866,8 @@ github.com/open-policy-agent/opa v1.6.0 h1:/S/cnNQJ2MUMNzizHPbisTWBHowmLkPrugY5j github.com/open-policy-agent/opa v1.6.0/go.mod h1:zFmw4P+W62+CWGYRDDswfVYSCnPo6oYaktQnfIaRFC4= github.com/opencloud-eu/go-micro-plugins/v4/store/nats-js-kv v0.0.0-20250512152754-23325793059a h1:Sakl76blJAaM6NxylVkgSzktjo2dS504iDotEFJsh3M= github.com/opencloud-eu/go-micro-plugins/v4/store/nats-js-kv v0.0.0-20250512152754-23325793059a/go.mod h1:pjcozWijkNPbEtX5SIQaxEW/h8VAVZYTLx+70bmB3LY= -github.com/opencloud-eu/libre-graph-api-go v1.0.8-0.20250703062332-6dc201fd7bf1 h1:DNJ5mJdEKguSXSTeSBRG5yBZO8FnmWibAc6MlXbRxfc= -github.com/opencloud-eu/libre-graph-api-go v1.0.8-0.20250703062332-6dc201fd7bf1/go.mod h1:pzatilMEHZFT3qV7C/X3MqOa3NlRQuYhlRhZTL+hN6Q= +github.com/opencloud-eu/libre-graph-api-go v1.0.8-0.20250707143759-32eaae12b2ce h1:tjbIYsW5CFsEbCf5B/KN0Mo1oKU/K+oipgFm2B6wzG4= +github.com/opencloud-eu/libre-graph-api-go v1.0.8-0.20250707143759-32eaae12b2ce/go.mod h1:pzatilMEHZFT3qV7C/X3MqOa3NlRQuYhlRhZTL+hN6Q= github.com/opencloud-eu/reva/v2 v2.34.1-0.20250704134423-74abc5f04717 h1:khqL0AenfN0vt6oXgvbqH4UIuJk+2+oxWSJKcal4GYQ= github.com/opencloud-eu/reva/v2 v2.34.1-0.20250704134423-74abc5f04717/go.mod h1:hSIUWU8JUaX+y0cVjbh6VaW6Mh0uJ/azFPx5cSVhQfc= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= diff --git a/vendor/github.com/opencloud-eu/libre-graph-api-go/api_drives.go b/vendor/github.com/opencloud-eu/libre-graph-api-go/api_drives.go index c96363839..c74a94020 100644 --- a/vendor/github.com/opencloud-eu/libre-graph-api-go/api_drives.go +++ b/vendor/github.com/opencloud-eu/libre-graph-api-go/api_drives.go @@ -252,6 +252,13 @@ type ApiGetDriveRequest struct { ctx context.Context ApiService *DrivesApiService driveId string + select_ *[]string +} + +// Select properties to be returned. By default all properties are returned. +func (r ApiGetDriveRequest) Select_(select_ []string) ApiGetDriveRequest { + r.select_ = &select_ + return r } func (r ApiGetDriveRequest) Execute() (*Drive, *http.Response, error) { @@ -295,6 +302,9 @@ func (a *DrivesApiService) GetDriveExecute(r ApiGetDriveRequest) (*Drive, *http. localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + if r.select_ != nil { + parameterAddToHeaderOrQuery(localVarQueryParams, "$select", r.select_, "form", "csv") + } // to determine the Content-Type header localVarHTTPContentTypes := []string{} diff --git a/vendor/github.com/opencloud-eu/libre-graph-api-go/api_drives_get_drives.go b/vendor/github.com/opencloud-eu/libre-graph-api-go/api_drives_get_drives.go index eed103f64..6769ecb6b 100644 --- a/vendor/github.com/opencloud-eu/libre-graph-api-go/api_drives_get_drives.go +++ b/vendor/github.com/opencloud-eu/libre-graph-api-go/api_drives_get_drives.go @@ -153,6 +153,7 @@ type ApiListAllDrivesBetaRequest struct { orderby *string filter *string expand *string + select_ *[]string } // The $orderby system query option allows clients to request resources in either ascending order using asc or descending order using desc. @@ -173,6 +174,12 @@ func (r ApiListAllDrivesBetaRequest) Expand(expand string) ApiListAllDrivesBetaR return r } +// Select properties to be returned. By default all properties are returned. +func (r ApiListAllDrivesBetaRequest) Select_(select_ []string) ApiListAllDrivesBetaRequest { + r.select_ = &select_ + return r +} + func (r ApiListAllDrivesBetaRequest) Execute() (*CollectionOfDrives1, *http.Response, error) { return r.ApiService.ListAllDrivesBetaExecute(r) } @@ -220,6 +227,9 @@ func (a *DrivesGetDrivesApiService) ListAllDrivesBetaExecute(r ApiListAllDrivesB if r.expand != nil { parameterAddToHeaderOrQuery(localVarQueryParams, "$expand", r.expand, "form", "") } + if r.select_ != nil { + parameterAddToHeaderOrQuery(localVarQueryParams, "$select", r.select_, "form", "csv") + } // to determine the Content-Type header localVarHTTPContentTypes := []string{} diff --git a/vendor/github.com/opencloud-eu/libre-graph-api-go/api_me_drives.go b/vendor/github.com/opencloud-eu/libre-graph-api-go/api_me_drives.go index c452318ea..7a02c11d8 100644 --- a/vendor/github.com/opencloud-eu/libre-graph-api-go/api_me_drives.go +++ b/vendor/github.com/opencloud-eu/libre-graph-api-go/api_me_drives.go @@ -153,6 +153,7 @@ type ApiListMyDrivesBetaRequest struct { orderby *string filter *string expand *string + select_ *[]string } // The $orderby system query option allows clients to request resources in either ascending order using asc or descending order using desc. @@ -173,6 +174,12 @@ func (r ApiListMyDrivesBetaRequest) Expand(expand string) ApiListMyDrivesBetaReq return r } +// Select properties to be returned. By default all properties are returned. +func (r ApiListMyDrivesBetaRequest) Select_(select_ []string) ApiListMyDrivesBetaRequest { + r.select_ = &select_ + return r +} + func (r ApiListMyDrivesBetaRequest) Execute() (*CollectionOfDrives, *http.Response, error) { return r.ApiService.ListMyDrivesBetaExecute(r) } @@ -220,6 +227,9 @@ func (a *MeDrivesApiService) ListMyDrivesBetaExecute(r ApiListMyDrivesBetaReques if r.expand != nil { parameterAddToHeaderOrQuery(localVarQueryParams, "$expand", r.expand, "form", "") } + if r.select_ != nil { + parameterAddToHeaderOrQuery(localVarQueryParams, "$select", r.select_, "form", "csv") + } // to determine the Content-Type header localVarHTTPContentTypes := []string{} diff --git a/vendor/modules.txt b/vendor/modules.txt index 39a7a1582..18387c73b 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1207,7 +1207,7 @@ github.com/open-policy-agent/opa/v1/types github.com/open-policy-agent/opa/v1/util github.com/open-policy-agent/opa/v1/util/decoding github.com/open-policy-agent/opa/v1/version -# github.com/opencloud-eu/libre-graph-api-go v1.0.8-0.20250703062332-6dc201fd7bf1 +# github.com/opencloud-eu/libre-graph-api-go v1.0.8-0.20250707143759-32eaae12b2ce ## explicit; go 1.18 github.com/opencloud-eu/libre-graph-api-go # github.com/opencloud-eu/reva/v2 v2.34.1-0.20250704134423-74abc5f04717