sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix linter

Browse Source
This commit is contained in:
A.Unger
2020-10-14 18:03:52 +02:00
committed by Ilja Neumann
parent fed18db2c6
commit 6373569f72
4 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
accounts/pkg/indexer/index/cs3/non_unique.go
+9 -5
View File
@@ -1,22 +1,22 @@
package cs3
import (
"context"
"fmt"
user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
v1beta11 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1"
provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1"
"github.com/cs3org/reva/pkg/rgrpc/todo/pool"
"github.com/cs3org/reva/pkg/token"
"github.com/cs3org/reva/pkg/token/manager/jwt"
idxerrs "github.com/owncloud/ocis/accounts/pkg/indexer/errors"
"google.golang.org/grpc/metadata"
"io/ioutil"
"net/http"
"os"
"path"
"fmt"
"context"
"path/filepath"
"strings"
"github.com/cs3org/reva/pkg/token/manager/jwt"
)
type NonUnique struct {
@@ -131,7 +131,7 @@ func (idx *NonUnique) Add(id, v string) (string, error) {
if err := idx.createSymlink(id, singleJoiningSlash(idx.cs3conf.DataURL, path.Join(idx.cs3conf.DataPrefix, newName, id))); err != nil {
if os.IsExist(err) {
return "", &idxerrs.AlreadyExistsErr{idx.typeName, idx.indexBy, v}
return "", &idxerrs.AlreadyExistsErr{TypeName: idx.typeName, Key: idx.indexBy, Value: v}
}
return "", err
@@ -158,7 +158,7 @@ func (idx *NonUnique) Remove(id string, v string) error {
}
if resp.Status.Code == v1beta11.Code_CODE_NOT_FOUND {
return &idxerrs.NotFoundErr{idx.typeName, idx.indexBy, v}
return &idxerrs.NotFoundErr{TypeName: idx.typeName, Key: idx.indexBy, Value: v}
}
return nil
@@ -190,6 +190,10 @@ func (idx *NonUnique) Search(pattern string) ([]string, error) {
},
})
if err != nil {
return nil, err
}
for _, i := range res.Infos {
if found, err := filepath.Match(pattern, path.Base(i.Path)); found {
if err != nil {
accounts/pkg/indexer/index/cs3/unique.go
+8 -4
View File
@@ -102,7 +102,7 @@ func (idx *Unique) Add(id, v string) (string, error) {
newName := idx.indexURL(v)
if err := idx.createSymlink(id, newName); err != nil {
if os.IsExist(err) {
return "", &idxerrs.AlreadyExistsErr{idx.typeName, idx.indexBy, v}
return "", &idxerrs.AlreadyExistsErr{TypeName: idx.typeName, Key: idx.indexBy, Value: v}
}
return "", err
@@ -116,7 +116,7 @@ func (idx *Unique) Lookup(v string) ([]string, error) {
oldname, err := idx.resolveSymlink(searchPath)
if err != nil {
if os.IsNotExist(err) {
err = &idxerrs.NotFoundErr{idx.typeName, idx.indexBy, v}
err = &idxerrs.NotFoundErr{TypeName: idx.typeName, Key: idx.indexBy, Value: v}
}
return nil, err
@@ -131,7 +131,7 @@ func (idx *Unique) Remove(id string, v string) error {
_, err := idx.resolveSymlink(searchPath)
if err != nil {
if os.IsNotExist(err) {
err = &idxerrs.NotFoundErr{idx.typeName, idx.indexBy, v}
err = &idxerrs.NotFoundErr{TypeName: idx.typeName, Key: idx.indexBy, Value: v}
}
return err
@@ -189,9 +189,13 @@ func (idx *Unique) Search(pattern string) ([]string, error) {
},
})
if err != nil {
return nil, err
}
searchPath := singleJoiningSlash(idx.cs3conf.DataURL, path.Join(idx.cs3conf.DataPrefix, idx.indexRootDir))
matches := []string{}
matches := make([]string, 0)
for _, i := range res.GetInfos() {
if found, err := filepath.Match(pattern, path.Base(i.Path)); found {
if err != nil {
accounts/pkg/indexer/index/disk/non_unique.go
+5 -5
View File
@@ -56,7 +56,7 @@ func (idx NonUniqueIndex) Lookup(v string) ([]string, error) {
searchPath := path.Join(idx.indexRootDir, v)
fi, err := ioutil.ReadDir(searchPath)
if os.IsNotExist(err) {
return []string{}, &idxerrs.NotFoundErr{idx.typeName, idx.indexBy, v}
return []string{}, &idxerrs.NotFoundErr{TypeName: idx.typeName, Key: idx.indexBy, Value: v}
}
if err != nil {
@@ -69,7 +69,7 @@ func (idx NonUniqueIndex) Lookup(v string) ([]string, error) {
}
if len(ids) == 0 {
return []string{}, &idxerrs.NotFoundErr{idx.typeName, idx.indexBy, v}
return []string{}, &idxerrs.NotFoundErr{TypeName: idx.typeName, Key: idx.indexBy, Value: v}
}
return ids, nil
@@ -85,7 +85,7 @@ func (idx NonUniqueIndex) Add(id, v string) (string, error) {
err := os.Symlink(oldName, newName)
if errors.Is(err, os.ErrExist) {
return "", &idxerrs.AlreadyExistsErr{idx.typeName, idx.indexBy, v}
return "", &idxerrs.AlreadyExistsErr{TypeName: idx.typeName, Key: idx.indexBy, Value: v}
}
return newName, err
@@ -114,7 +114,7 @@ func (idx NonUniqueIndex) Update(id, oldV, newV string) (err error) {
newPath := path.Join(newDir, id)
if _, err = os.Stat(oldPath); os.IsNotExist(err) {
return &idxerrs.NotFoundErr{idx.typeName, idx.indexBy, oldV}
return &idxerrs.NotFoundErr{TypeName: idx.typeName, Key: idx.indexBy, Value: oldV}
}
if err != nil {
@@ -152,7 +152,7 @@ func (idx NonUniqueIndex) Search(pattern string) ([]string, error) {
}
if len(paths) == 0 {
return nil, &idxerrs.NotFoundErr{idx.typeName, idx.indexBy, pattern}
return nil, &idxerrs.NotFoundErr{TypeName: idx.typeName, Key: idx.indexBy, Value: pattern}
}
return paths, nil
accounts/pkg/indexer/index/disk/unique.go
+5 -5
View File
@@ -67,7 +67,7 @@ func (idx Unique) Add(id, v string) (string, error) {
newName := path.Join(idx.indexRootDir, v)
err := os.Symlink(oldName, newName)
if errors.Is(err, os.ErrExist) {
return "", &idxerrs.AlreadyExistsErr{idx.typeName, idx.indexBy, v}
return "", &idxerrs.AlreadyExistsErr{TypeName: idx.typeName, Key: idx.indexBy, Value: v}
}
return newName, err
@@ -88,7 +88,7 @@ func (idx Unique) Lookup(v string) (resultPath []string, err error) {
searchPath := path.Join(idx.indexRootDir, v)
if err = isValidSymlink(searchPath); err != nil {
if os.IsNotExist(err) {
err = &idxerrs.NotFoundErr{idx.typeName, idx.indexBy, v}
err = &idxerrs.NotFoundErr{TypeName: idx.typeName, Key: idx.indexBy, Value: v}
}
return
@@ -107,7 +107,7 @@ func (idx Unique) Update(id, oldV, newV string) (err error) {
oldPath := path.Join(idx.indexRootDir, oldV)
if err = isValidSymlink(oldPath); err != nil {
if os.IsNotExist(err) {
return &idxerrs.NotFoundErr{idx.TypeName(), idx.IndexBy(), oldV}
return &idxerrs.NotFoundErr{TypeName: idx.TypeName(), Key: idx.IndexBy(), Value: oldV}
}
return
@@ -115,7 +115,7 @@ func (idx Unique) Update(id, oldV, newV string) (err error) {
newPath := path.Join(idx.indexRootDir, newV)
if err = isValidSymlink(newPath); err == nil {
return &idxerrs.AlreadyExistsErr{idx.typeName, idx.indexBy, newV}
return &idxerrs.AlreadyExistsErr{TypeName: idx.typeName, Key: idx.indexBy, Value: newV}
}
if os.IsNotExist(err) {
@@ -132,7 +132,7 @@ func (idx Unique) Search(pattern string) ([]string, error) {
}
if len(paths) == 0 {
return nil, &idxerrs.NotFoundErr{idx.typeName, idx.indexBy, pattern}
return nil, &idxerrs.NotFoundErr{TypeName: idx.typeName, Key: idx.indexBy, Value: pattern}
}
res := make([]string, 0, 0)