mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-05-03 21:53:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix staticchecks

Browse Source
This commit is contained in:
Benedikt Kulmann
2020-10-15 23:59:53 +02:00
parent 2dc659ac56
commit 16a190857f
4 changed files with 34 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
accounts/pkg/indexer/index/disk/autoincrement.go
View File

@@ -109,7 +109,7 @@ func (idx Autoincrement) Add(id, v string) (string, error) {
return "", err
}
oldName := filepath.Join(idx.filesDir, id)
newName := filepath.Join(idx.indexRootDir, strconv.Itoa(nextID))
var newName string
if v == "" {
newName = filepath.Join(idx.indexRootDir, strconv.Itoa(nextID))
} else {

130
accounts/pkg/indexer/indexer_test.go
View File

@@ -5,8 +5,6 @@ import (
"path"
"testing"
"github.com/owncloud/ocis/accounts/pkg/proto/v0"
"github.com/owncloud/ocis/accounts/pkg/indexer/option"
"github.com/owncloud/ocis/accounts/pkg/config"
@@ -21,16 +19,7 @@ const cs3RootFolder = "/var/tmp/ocis/storage/users/data"
func TestIndexer_CS3_AddWithUniqueIndex(t *testing.T) {
dataDir, err := WriteIndexTestData(Data, "ID", cs3RootFolder)
assert.NoError(t, err)
indexer := CreateIndexer(&config.Config{
Repo: config.Repo{
CS3: config.CS3{
ProviderAddr: "0.0.0.0:9215",
DataURL: "http://localhost:9216",
DataPrefix: "data",
JWTSecret: "Pive-Fumkiu4",
},
},
})
indexer := createCs3Indexer()
err = indexer.AddIndex(&User{}, "UserName", "ID", "users", "unique", nil)
assert.NoError(t, err)
@@ -45,16 +34,7 @@ func TestIndexer_CS3_AddWithUniqueIndex(t *testing.T) {
func TestIndexer_CS3_AddWithNonUniqueIndex(t *testing.T) {
dataDir, err := WriteIndexTestData(Data, "ID", cs3RootFolder)
assert.NoError(t, err)
indexer := CreateIndexer(&config.Config{
Repo: config.Repo{
CS3: config.CS3{
ProviderAddr: "0.0.0.0:9215",
DataURL: "http://localhost:9216",
DataPrefix: "data",
JWTSecret: "Pive-Fumkiu4",
},
},
})
indexer := createCs3Indexer()
err = indexer.AddIndex(&User{}, "UserName", "ID", "users", "non_unique", nil)
assert.NoError(t, err)
@@ -69,13 +49,7 @@ func TestIndexer_CS3_AddWithNonUniqueIndex(t *testing.T) {
func TestIndexer_Disk_FindByWithUniqueIndex(t *testing.T) {
dataDir, err := WriteIndexTestData(Data, "ID", "")
assert.NoError(t, err)
indexer := CreateIndexer(&config.Config{
Repo: config.Repo{
Disk: config.Disk{
Path: dataDir,
},
},
})
indexer := createDiskIndexer(dataDir)
err = indexer.AddIndex(&User{}, "UserName", "ID", "users", "unique", nil)
assert.NoError(t, err)
@@ -94,13 +68,7 @@ func TestIndexer_Disk_FindByWithUniqueIndex(t *testing.T) {
func TestIndexer_Disk_AddWithUniqueIndex(t *testing.T) {
dataDir, err := WriteIndexTestData(Data, "ID", "")
assert.NoError(t, err)
indexer := CreateIndexer(&config.Config{
Repo: config.Repo{
Disk: config.Disk{
Path: dataDir,
},
},
})
indexer := createDiskIndexer(dataDir)
err = indexer.AddIndex(&User{}, "UserName", "ID", "users", "unique", nil)
assert.NoError(t, err)
@@ -115,13 +83,7 @@ func TestIndexer_Disk_AddWithUniqueIndex(t *testing.T) {
func TestIndexer_Disk_AddWithNonUniqueIndex(t *testing.T) {
dataDir, err := WriteIndexTestData(Data, "ID", "")
assert.NoError(t, err)
indexer := CreateIndexer(&config.Config{
Repo: config.Repo{
Disk: config.Disk{
Path: dataDir,
},
},
})
indexer := createDiskIndexer(dataDir)
err = indexer.AddIndex(&Pet{}, "Kind", "ID", "pets", "non_unique", nil)
assert.NoError(t, err)
@@ -146,13 +108,7 @@ func TestIndexer_Disk_AddWithNonUniqueIndex(t *testing.T) {
func TestIndexer_Disk_AddWithAutoincrementIndex(t *testing.T) {
dataDir, err := WriteIndexTestData(Data, "ID", "")
assert.NoError(t, err)
indexer := CreateIndexer(&config.Config{
Repo: config.Repo{
Disk: config.Disk{
Path: dataDir,
},
},
})
indexer := createDiskIndexer(dataDir)
err = indexer.AddIndex(&User{}, "UID", "ID", "users", "autoincrement", &option.Bound{Lower: 5})
assert.NoError(t, err)
@@ -178,13 +134,7 @@ func TestIndexer_Disk_AddWithAutoincrementIndex(t *testing.T) {
func TestIndexer_Disk_DeleteWithNonUniqueIndex(t *testing.T) {
dataDir, err := WriteIndexTestData(Data, "ID", "")
assert.NoError(t, err)
indexer := CreateIndexer(&config.Config{
Repo: config.Repo{
Disk: config.Disk{
Path: dataDir,
},
},
})
indexer := createDiskIndexer(dataDir)
err = indexer.AddIndex(&Pet{}, "Kind", "ID", "pets", "non_unique", nil)
assert.NoError(t, err)
@@ -207,13 +157,7 @@ func TestIndexer_Disk_DeleteWithNonUniqueIndex(t *testing.T) {
func TestIndexer_Disk_SearchWithNonUniqueIndex(t *testing.T) {
dataDir, err := WriteIndexTestData(Data, "ID", "")
assert.NoError(t, err)
indexer := CreateIndexer(&config.Config{
Repo: config.Repo{
Disk: config.Disk{
Path: dataDir,
},
},
})
indexer := createDiskIndexer(dataDir)
err = indexer.AddIndex(&Pet{}, "Name", "ID", "pets", "non_unique", nil)
assert.NoError(t, err)
@@ -237,13 +181,7 @@ func TestIndexer_Disk_SearchWithNonUniqueIndex(t *testing.T) {
func TestIndexer_Disk_UpdateWithUniqueIndex(t *testing.T) {
dataDir, err := WriteIndexTestData(Data, "ID", "")
assert.NoError(t, err)
indexer := CreateIndexer(&config.Config{
Repo: config.Repo{
Disk: config.Disk{
Path: dataDir,
},
},
})
indexer := createDiskIndexer(dataDir)
err = indexer.AddIndex(&User{}, "UserName", "ID", "users", "unique", nil)
assert.NoError(t, err)
@@ -296,13 +234,7 @@ func TestIndexer_Disk_UpdateWithUniqueIndex(t *testing.T) {
func TestIndexer_Disk_UpdateWithNonUniqueIndex(t *testing.T) {
dataDir, err := WriteIndexTestData(Data, "ID", "")
assert.NoError(t, err)
indexer := CreateIndexer(&config.Config{
Repo: config.Repo{
Disk: config.Disk{
Path: dataDir,
},
},
})
indexer := createDiskIndexer(dataDir)
err = indexer.AddIndex(&Pet{}, "Name", "ID", "pets", "non_unique", nil)
assert.NoError(t, err)
@@ -319,31 +251,25 @@ func TestIndexer_Disk_UpdateWithNonUniqueIndex(t *testing.T) {
_ = os.RemoveAll(dataDir)
}
func TestIndexer_Disk_AutoIncrementIndex(t *testing.T) {
scenarios := []struct {
name string
indexOn string
entity *proto.Account
}{
{
name: "create an index on a valid autoincrement field",
indexOn: "Number",
entity: &proto.Account{},
func createCs3Indexer() *Indexer {
return CreateIndexer(&config.Config{
Repo: config.Repo{
CS3: config.CS3{
ProviderAddr: "0.0.0.0:9215",
DataURL: "http://localhost:9216",
DataPrefix: "data",
JWTSecret: "Pive-Fumkiu4",
},
},
}
for i := range scenarios {
t.Run(scenarios[i].name, func(t *testing.T) {
})
}
})
}
func setup() error {
//dataDir := WriteIndexTestData(t, Data, "ID")
return nil
}
func teardown() error {
return nil
func createDiskIndexer(dataDir string) *Indexer {
return CreateIndexer(&config.Config{
Repo: config.Repo{
Disk: config.Disk{
Path: dataDir,
},
},
})
}

9
accounts/pkg/proto/v0/accounts.pb.micro_test.go
View File

@@ -414,12 +414,11 @@ func TestCreateAccount(t *testing.T) {
// https://github.com/owncloud/ocis-accounts/issues/62
func TestCreateExistingUser(t *testing.T) {
r, err := createAccount(t, "user1")
var err error
_, err = createAccount(t, "user1")
assert.NoError(t, err)
r, err = createAccount(t, "user1")
t.Log(r)
_, err = createAccount(t, "user1")
assert.Error(t, err)
assertUserExists(t, getAccount("user1"))
@@ -427,7 +426,7 @@ func TestCreateExistingUser(t *testing.T) {
}
// All tests fail after running this
// https://github.com/owncloud/ocis/accounts/issues/62
// https://github.com/owncloud/ocis/accounts-issues/62
func TestCreateAccountInvalidUserName(t *testing.T) {
resp, err := listAccounts(t)

2
accounts/pkg/service/v0/groups.go
View File

@@ -155,7 +155,7 @@ func (s Service) CreateGroup(c context.Context, in *proto.CreateGroupRequest, ou
}
}
out = in.Group
*out = *in.Group
return
}