From c37800eb7203fa361df65603cd420779d0dec579 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Mon, 6 Dec 2021 10:15:18 +0100 Subject: [PATCH] fix user creation --- accounts/pkg/storage/cs3.go | 10 ++++------ go.sum | 2 ++ ocis-pkg/indexer/index/cs3/autoincrement.go | 3 +-- ocis-pkg/indexer/index/cs3/non_unique.go | 3 +-- ocis-pkg/indexer/index/cs3/unique.go | 3 +-- 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/accounts/pkg/storage/cs3.go b/accounts/pkg/storage/cs3.go index 8ff78241bf..d4d4321d08 100644 --- a/accounts/pkg/storage/cs3.go +++ b/accounts/pkg/storage/cs3.go @@ -126,9 +126,8 @@ func (r CS3Repo) LoadAccounts(ctx context.Context, a *[]*proto.Account) (err err func (r CS3Repo) loadAccount(ctx context.Context, id string, a *proto.Account) error { account, err := r.downloadHelper(ctx, r.accountURL(id)) if err != nil { - switch err.(type) { - case notFoundErr: - return notFoundErr{"account", id} + if IsNotFoundErr(err) { + return ¬FoundErr{"account", id} } return err } @@ -227,9 +226,8 @@ func (r CS3Repo) LoadGroups(ctx context.Context, g *[]*proto.Group) (err error) func (r CS3Repo) loadGroup(ctx context.Context, id string, g *proto.Group) error { group, err := r.downloadHelper(ctx, r.groupURL(id)) if err != nil { - switch err.(type) { - case notFoundErr: - return notFoundErr{"group", id} + if IsNotFoundErr(err) { + return ¬FoundErr{"group", id} } return err } diff --git a/go.sum b/go.sum index ac4436d91d..28a54a77ad 100644 --- a/go.sum +++ b/go.sum @@ -299,6 +299,8 @@ github.com/crewjam/saml v0.4.5/go.mod h1:qCJQpUtZte9R1ZjUBcW8qtCNlinbO363ooNl02S github.com/cs3org/cato v0.0.0-20200828125504-e418fc54dd5e/go.mod h1:XJEZ3/EQuI3BXTp/6DUzFr850vlxq11I6satRtz0YQ4= github.com/cs3org/go-cs3apis v0.0.0-20211104090126-8e972dca8304 h1:e/nIPR518vyvrulo9goAZTtYD6gFfu/2/9MDe6mTGcw= github.com/cs3org/go-cs3apis v0.0.0-20211104090126-8e972dca8304/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= +github.com/cs3org/reva v1.16.1-0.20211203225713-939768a1af06 h1:NP+Zvli7+9USaDss/+Ywk4KJ0H7n82UHZiU4V+x25I0= +github.com/cs3org/reva v1.16.1-0.20211203225713-939768a1af06/go.mod h1:3n/zVKsKTCL10Mwn2Nhtvn50gP5mA+933lQ2IYNAJso= github.com/cubewise-code/go-mime v0.0.0-20200519001935-8c5762b177d8 h1:Z9lwXumT5ACSmJ7WGnFl+OMLLjpz5uR2fyz7dC255FI= github.com/cubewise-code/go-mime v0.0.0-20200519001935-8c5762b177d8/go.mod h1:4abs/jPXcmJzYoYGF91JF9Uq9s/KL5n1jvFDix8KcqY= github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4= diff --git a/ocis-pkg/indexer/index/cs3/autoincrement.go b/ocis-pkg/indexer/index/cs3/autoincrement.go index cd88396ea2..81d3d8ab0d 100644 --- a/ocis-pkg/indexer/index/cs3/autoincrement.go +++ b/ocis-pkg/indexer/index/cs3/autoincrement.go @@ -271,8 +271,7 @@ func (idx *Autoincrement) resolveSymlink(name string) (string, error) { b, err := idx.metadataStorage.downloadHelper(ctx, name) if err != nil { - switch err.(type) { - case notFoundErr: + if IsNotFoundErr(err) { return "", os.ErrNotExist } return "", err diff --git a/ocis-pkg/indexer/index/cs3/non_unique.go b/ocis-pkg/indexer/index/cs3/non_unique.go index 9492886819..e1b49c5a95 100644 --- a/ocis-pkg/indexer/index/cs3/non_unique.go +++ b/ocis-pkg/indexer/index/cs3/non_unique.go @@ -327,8 +327,7 @@ func (idx *NonUnique) resolveSymlink(name string) (string, error) { b, err := idx.metadataStorage.downloadHelper(ctx, name) if err != nil { - switch err.(type) { - case notFoundErr: + if IsNotFoundErr(err) { return "", os.ErrNotExist } return "", err diff --git a/ocis-pkg/indexer/index/cs3/unique.go b/ocis-pkg/indexer/index/cs3/unique.go index cd9b56615d..aca3ff4582 100644 --- a/ocis-pkg/indexer/index/cs3/unique.go +++ b/ocis-pkg/indexer/index/cs3/unique.go @@ -280,8 +280,7 @@ func (idx *Unique) resolveSymlink(name string) (string, error) { b, err := idx.metadataStorage.downloadHelper(ctx, name) if err != nil { - switch err.(type) { - case notFoundErr: + if IsNotFoundErr(err) { return "", os.ErrNotExist } return "", err