kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-07 19:05:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

nomad: renambe PublicID to AccessorID for consistency

Browse Source
This commit is contained in:
Armon Dadgar
2017-08-12 15:46:19 -07:00
parent 14f7e8166f
commit e9efe603dd
5 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nomad/acl_endpoint.go
View File

@@ -218,7 +218,7 @@ func (a *ACL) ListTokens(args *structs.ACLTokenListRequest, reply *structs.ACLTo
var err error
var iter memdb.ResultIterator
if prefix := args.QueryOptions.Prefix; prefix != "" {
iter, err = state.ACLTokenByPublicIDPrefix(ws, prefix)
iter, err = state.ACLTokenByAccessorIDPrefix(ws, prefix)
} else {
iter, err = state.ACLTokens(ws)
}
@@ -261,7 +261,7 @@ func (a *ACL) GetToken(args *structs.ACLTokenSpecificRequest, reply *structs.Sin
queryMeta: &reply.QueryMeta,
run: func(ws memdb.WatchSet, state *state.StateStore) error {
// Look for the token
out, err := state.ACLTokenByPublicID(ws, args.AccessorID)
out, err := state.ACLTokenByAccessorID(ws, args.AccessorID)
if err != nil {
return err
}

2
nomad/acl_endpoint_test.go
View File

@@ -551,7 +551,7 @@ func TestACLEndpoint_UpsertTokens(t *testing.T) {
assert.NotEqual(t, uint64(0), resp.Index)
// Check we created the token
out, err := s1.fsm.State().ACLTokenByPublicID(nil, p1.AccessorID)
out, err := s1.fsm.State().ACLTokenByAccessorID(nil, p1.AccessorID)
assert.Nil(t, err)
assert.NotNil(t, out)
}

8
nomad/fsm_test.go
View File

@@ -1591,7 +1591,7 @@ func TestFSM_UpsertACLTokens(t *testing.T) {
// Verify we are registered
ws := memdb.NewWatchSet()
out, err := fsm.State().ACLTokenByPublicID(ws, token.AccessorID)
out, err := fsm.State().ACLTokenByAccessorID(ws, token.AccessorID)
assert.Nil(t, err)
assert.NotNil(t, out)
}
@@ -1619,7 +1619,7 @@ func TestFSM_DeleteACLTokens(t *testing.T) {
// Verify we are NOT registered
ws := memdb.NewWatchSet()
out, err := fsm.State().ACLTokenByPublicID(ws, token.AccessorID)
out, err := fsm.State().ACLTokenByAccessorID(ws, token.AccessorID)
assert.Nil(t, err)
assert.Nil(t, out)
}
@@ -1997,8 +1997,8 @@ func TestFSM_SnapshotRestore_ACLTokens(t *testing.T) {
fsm2 := testSnapshotRestore(t, fsm)
state2 := fsm2.State()
ws := memdb.NewWatchSet()
out1, _ := state2.ACLTokenByPublicID(ws, tk1.AccessorID)
out2, _ := state2.ACLTokenByPublicID(ws, tk2.AccessorID)
out1, _ := state2.ACLTokenByAccessorID(ws, tk1.AccessorID)
out2, _ := state2.ACLTokenByAccessorID(ws, tk2.AccessorID)
assert.Equal(t, tk1, out1)
assert.Equal(t, tk2, out2)
}

8
nomad/state/state_store.go
View File

@@ -2937,8 +2937,8 @@ func (s *StateStore) DeleteACLTokens(index uint64, ids []string) error {
return nil
}
// ACLTokenByPublicID is used to lookup a token by accessor ID
func (s *StateStore) ACLTokenByPublicID(ws memdb.WatchSet, id string) (*structs.ACLToken, error) {
// ACLTokenByAccessorID is used to lookup a token by accessor ID
func (s *StateStore) ACLTokenByAccessorID(ws memdb.WatchSet, id string) (*structs.ACLToken, error) {
txn := s.db.Txn(false)
watchCh, existing, err := txn.FirstWatch("acl_token", "id", id)
@@ -2969,8 +2969,8 @@ func (s *StateStore) ACLTokenBySecretID(ws memdb.WatchSet, secretID string) (*st
return nil, nil
}
// ACLTokenByPublicIDPrefix is used to lookup tokens by prefix
func (s *StateStore) ACLTokenByPublicIDPrefix(ws memdb.WatchSet, prefix string) (memdb.ResultIterator, error) {
// ACLTokenByAccessorIDPrefix is used to lookup tokens by prefix
func (s *StateStore) ACLTokenByAccessorIDPrefix(ws memdb.WatchSet, prefix string) (memdb.ResultIterator, error) {
txn := s.db.Txn(false)
iter, err := txn.Get("acl_token", "id_prefix", prefix)

18
nomad/state/state_store_test.go
View File

@@ -6006,10 +6006,10 @@ func TestStateStore_UpsertACLTokens(t *testing.T) {
tk2 := mock.ACLToken()
ws := memdb.NewWatchSet()
if _, err := state.ACLTokenByPublicID(ws, tk1.AccessorID); err != nil {
if _, err := state.ACLTokenByAccessorID(ws, tk1.AccessorID); err != nil {
t.Fatalf("err: %v", err)
}
if _, err := state.ACLTokenByPublicID(ws, tk2.AccessorID); err != nil {
if _, err := state.ACLTokenByAccessorID(ws, tk2.AccessorID); err != nil {
t.Fatalf("err: %v", err)
}
@@ -6022,11 +6022,11 @@ func TestStateStore_UpsertACLTokens(t *testing.T) {
}
ws = memdb.NewWatchSet()
out, err := state.ACLTokenByPublicID(ws, tk1.AccessorID)
out, err := state.ACLTokenByAccessorID(ws, tk1.AccessorID)
assert.Equal(t, nil, err)
assert.Equal(t, tk1, out)
out, err = state.ACLTokenByPublicID(ws, tk2.AccessorID)
out, err = state.ACLTokenByAccessorID(ws, tk2.AccessorID)
assert.Equal(t, nil, err)
assert.Equal(t, tk2, out)
@@ -6082,7 +6082,7 @@ func TestStateStore_DeleteACLTokens(t *testing.T) {
// Create a watcher
ws := memdb.NewWatchSet()
if _, err := state.ACLTokenByPublicID(ws, tk1.AccessorID); err != nil {
if _, err := state.ACLTokenByAccessorID(ws, tk1.AccessorID); err != nil {
t.Fatalf("err: %v", err)
}
@@ -6099,7 +6099,7 @@ func TestStateStore_DeleteACLTokens(t *testing.T) {
// Ensure we don't get the object back
ws = memdb.NewWatchSet()
out, err := state.ACLTokenByPublicID(ws, tk1.AccessorID)
out, err := state.ACLTokenByAccessorID(ws, tk1.AccessorID)
assert.Equal(t, nil, err)
if out != nil {
t.Fatalf("bad: %#v", out)
@@ -6136,7 +6136,7 @@ func TestStateStore_DeleteACLTokens(t *testing.T) {
}
}
func TestStateStore_ACLTokenByPublicIDPrefix(t *testing.T) {
func TestStateStore_ACLTokenByAccessorIDPrefix(t *testing.T) {
state := testStateStore(t)
prefixes := []string{
"aaaa",
@@ -6158,7 +6158,7 @@ func TestStateStore_ACLTokenByPublicIDPrefix(t *testing.T) {
}
// Scan by prefix
iter, err := state.ACLTokenByPublicIDPrefix(nil, "aa")
iter, err := state.ACLTokenByAccessorIDPrefix(nil, "aa")
if err != nil {
t.Fatalf("err: %v", err)
}
@@ -6222,7 +6222,7 @@ func TestStateStore_RestoreACLToken(t *testing.T) {
restore.Commit()
ws := memdb.NewWatchSet()
out, err := state.ACLTokenByPublicID(ws, token.AccessorID)
out, err := state.ACLTokenByAccessorID(ws, token.AccessorID)
if err != nil {
t.Fatalf("err: %v", err)
}