Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

auth: fix "unconvert" warnings

Browse Source 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
This commit is contained in:
Gyuho Lee 2018-04-30 13:55:44 -07:00
parent 42147ae0a0
commit ae71076579
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
auth/store.go
View File

@ -683,7 +683,7 @@ func (as *authStore) RoleRevokePermission(r *pb.AuthRoleRevokePermissionRequest)
} }
for _, perm := range role.KeyPermission { for _, perm := range role.KeyPermission {
if !bytes.Equal(perm.Key, []byte(r.Key)) || !bytes.Equal(perm.RangeEnd, []byte(r.RangeEnd)) { if !bytes.Equal(perm.Key, r.Key) || !bytes.Equal(perm.RangeEnd, r.RangeEnd) {
updatedRole.KeyPermission = append(updatedRole.KeyPermission, perm) updatedRole.KeyPermission = append(updatedRole.KeyPermission, perm)
} }
} }
@ -821,7 +821,7 @@ func (as *authStore) RoleGrantPermission(r *pb.AuthRoleGrantPermissionRequest) (
} }
idx := sort.Search(len(role.KeyPermission), func(i int) bool { idx := sort.Search(len(role.KeyPermission), func(i int) bool {
return bytes.Compare(role.KeyPermission[i].Key, []byte(r.Perm.Key)) >= 0 return bytes.Compare(role.KeyPermission[i].Key, r.Perm.Key) >= 0
}) })
if idx < len(role.KeyPermission) && bytes.Equal(role.KeyPermission[idx].Key, r.Perm.Key) && bytes.Equal(role.KeyPermission[idx].RangeEnd, r.Perm.RangeEnd) { if idx < len(role.KeyPermission) && bytes.Equal(role.KeyPermission[idx].Key, r.Perm.Key) && bytes.Equal(role.KeyPermission[idx].RangeEnd, r.Perm.RangeEnd) {
@ -830,8 +830,8 @@ func (as *authStore) RoleGrantPermission(r *pb.AuthRoleGrantPermissionRequest) (
} else { } else {
// append new permission to the role // append new permission to the role
newPerm := &authpb.Permission{ newPerm := &authpb.Permission{
Key: []byte(r.Perm.Key), Key: r.Perm.Key,
RangeEnd: []byte(r.Perm.RangeEnd), RangeEnd: r.Perm.RangeEnd,
PermType: r.Perm.PermType, PermType: r.Perm.PermType,
} }
@ -1046,7 +1046,7 @@ func putRole(lg *zap.Logger, tx backend.BatchTx, role *authpb.Role) {
} }
} }
tx.UnsafePut(authRolesBucketName, []byte(role.Name), b) tx.UnsafePut(authRolesBucketName, role.Name, b)
} }
func delRole(tx backend.BatchTx, rolename string) { func delRole(tx backend.BatchTx, rolename string) {
@ -1113,7 +1113,7 @@ func (as *authStore) commitRevision(tx backend.BatchTx) {
} }
func getRevision(tx backend.BatchTx) uint64 { func getRevision(tx backend.BatchTx) uint64 {
_, vs := tx.UnsafeRange(authBucketName, []byte(revisionKey), nil, 0) _, vs := tx.UnsafeRange(authBucketName, revisionKey, nil, 0)
if len(vs) != 1 { if len(vs) != 1 {
// this can happen in the initialization phase // this can happen in the initialization phase
return 0 return 0