From 82eef6937b6af47e8d3246671d1f9b2d00f5be3b Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Wed, 27 Mar 2024 20:46:59 +0100 Subject: [PATCH] make the linter a bit happier --- .../service/v0/api_driveitem_permissions.go | 33 +++++++++---------- .../v0/api_driveitem_permissions_links.go | 4 +-- 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/services/graph/pkg/service/v0/api_driveitem_permissions.go b/services/graph/pkg/service/v0/api_driveitem_permissions.go index 9fb901c24..6bf3e2ebf 100644 --- a/services/graph/pkg/service/v0/api_driveitem_permissions.go +++ b/services/graph/pkg/service/v0/api_driveitem_permissions.go @@ -28,7 +28,10 @@ import ( "github.com/owncloud/ocis/v2/services/graph/pkg/validate" ) -const invalidIdMsg = "invalid driveID or itemID" +const ( + invalidIdMsg = "invalid driveID or itemID" + parseDriveIDErrMsg = "could not parse driveID" +) type DriveItemPermissionsProvider interface { Invite(ctx context.Context, resourceId storageprovider.ResourceId, invite libregraph.DriveItemInvite) (libregraph.Permission, error) @@ -206,7 +209,7 @@ func (s DriveItemPermissionsService) SpaceRootInvite(ctx context.Context, driveI return libregraph.Permission{}, err } - if space.SpaceType != "project" { + if space.SpaceType != _spaceTypeProject { return libregraph.Permission{}, errorcode.New(errorcode.InvalidRequest, "unsupported space type") } @@ -298,7 +301,7 @@ func (s DriveItemPermissionsService) ListSpaceRootPermissions(ctx context.Contex return collectionOfPermissions, err } - if space.SpaceType != "project" { + if space.SpaceType != _spaceTypeProject { return collectionOfPermissions, errorcode.New(errorcode.InvalidRequest, "unsupported space type") } @@ -369,7 +372,7 @@ func (s DriveItemPermissionsService) DeleteSpaceRootPermission(ctx context.Conte return err } - if space.SpaceType != "project" { + if space.SpaceType != _spaceTypeProject { return errorcode.New(errorcode.InvalidRequest, "unsupported space type") } @@ -418,7 +421,7 @@ func (s DriveItemPermissionsService) UpdateSpaceRootPermission(ctx context.Conte return libregraph.Permission{}, err } - if space.SpaceType != "project" { + if space.SpaceType != _spaceTypeProject { return libregraph.Permission{}, errorcode.New(errorcode.InvalidRequest, "unsupported space type") } @@ -477,9 +480,8 @@ func (api DriveItemPermissionsApi) Invite(w http.ResponseWriter, r *http.Request func (api DriveItemPermissionsApi) SpaceRootInvite(w http.ResponseWriter, r *http.Request) { driveID, err := parseIDParam(r, "driveID") if err != nil { - msg := "could not parse driveID" - api.logger.Debug().Err(err).Msg(msg) - errorcode.InvalidRequest.Render(w, r, http.StatusUnprocessableEntity, msg) + api.logger.Debug().Err(err).Msg(parseDriveIDErrMsg) + errorcode.InvalidRequest.Render(w, r, http.StatusUnprocessableEntity, parseDriveIDErrMsg) return } @@ -530,9 +532,8 @@ func (api DriveItemPermissionsApi) ListPermissions(w http.ResponseWriter, r *htt func (api DriveItemPermissionsApi) ListSpaceRootPermissions(w http.ResponseWriter, r *http.Request) { driveID, err := parseIDParam(r, "driveID") if err != nil { - msg := "could not parse driveID" - api.logger.Debug().Err(err).Msg(msg) - errorcode.InvalidRequest.Render(w, r, http.StatusUnprocessableEntity, msg) + api.logger.Debug().Err(err).Msg(parseDriveIDErrMsg) + errorcode.InvalidRequest.Render(w, r, http.StatusUnprocessableEntity, parseDriveIDErrMsg) return } @@ -577,9 +578,8 @@ func (api DriveItemPermissionsApi) DeletePermission(w http.ResponseWriter, r *ht func (api DriveItemPermissionsApi) DeleteSpaceRootPermission(w http.ResponseWriter, r *http.Request) { driveID, err := parseIDParam(r, "driveID") if err != nil { - msg := "could not parse driveID" - api.logger.Debug().Err(err).Msg(msg) - errorcode.InvalidRequest.Render(w, r, http.StatusUnprocessableEntity, msg) + api.logger.Debug().Err(err).Msg(parseDriveIDErrMsg) + errorcode.InvalidRequest.Render(w, r, http.StatusUnprocessableEntity, parseDriveIDErrMsg) return } @@ -642,9 +642,8 @@ func (api DriveItemPermissionsApi) UpdatePermission(w http.ResponseWriter, r *ht func (api DriveItemPermissionsApi) UpdateSpaceRootPermission(w http.ResponseWriter, r *http.Request) { driveID, err := parseIDParam(r, "driveID") if err != nil { - msg := "could not parse driveID" - api.logger.Debug().Err(err).Msg(msg) - errorcode.InvalidRequest.Render(w, r, http.StatusUnprocessableEntity, msg) + api.logger.Debug().Err(err).Msg(parseDriveIDErrMsg) + errorcode.InvalidRequest.Render(w, r, http.StatusUnprocessableEntity, parseDriveIDErrMsg) return } diff --git a/services/graph/pkg/service/v0/api_driveitem_permissions_links.go b/services/graph/pkg/service/v0/api_driveitem_permissions_links.go index 2b2deaf11..c1410d880 100644 --- a/services/graph/pkg/service/v0/api_driveitem_permissions_links.go +++ b/services/graph/pkg/service/v0/api_driveitem_permissions_links.go @@ -105,7 +105,7 @@ func (s DriveItemPermissionsService) CreateSpaceRootLink(ctx context.Context, dr return libregraph.Permission{}, err } - if space.SpaceType != "project" { + if space.SpaceType != _spaceTypeProject { return libregraph.Permission{}, errorcode.New(errorcode.InvalidRequest, "unsupported space type") } @@ -143,7 +143,7 @@ func (s DriveItemPermissionsService) SetPublicLinkPasswordOnSpaceRoot(ctx contex return libregraph.Permission{}, err } - if space.SpaceType != "project" { + if space.SpaceType != _spaceTypeProject { return libregraph.Permission{}, errorcode.New(errorcode.InvalidRequest, "unsupported space type") } rootResourceID := space.GetRoot()