From 987568c65ce8a9bb9d09abb3141100e4d9dd3f0f Mon Sep 17 00:00:00 2001 From: Hitoshi Mitake Date: Tue, 29 Mar 2016 14:32:19 +0900 Subject: [PATCH] *: add Auth prefix to auth related requests and responses --- auth/store.go | 8 +- clientv3/auth.go | 12 +- etcdserver/api/v3rpc/auth.go | 22 +- etcdserver/apply.go | 8 +- etcdserver/etcdserverpb/etcdserver.pb.go | 44 +- etcdserver/etcdserverpb/raft_internal.pb.go | 20 +- etcdserver/etcdserverpb/raft_internal.proto | 2 +- etcdserver/etcdserverpb/rpc.pb.go | 616 ++++++++++---------- etcdserver/etcdserverpb/rpc.proto | 66 +-- etcdserver/v3demo_server.go | 8 +- 10 files changed, 403 insertions(+), 403 deletions(-) diff --git a/auth/store.go b/auth/store.go index 8663c8b1a..cdd1f9973 100644 --- a/auth/store.go +++ b/auth/store.go @@ -39,7 +39,7 @@ type AuthStore interface { Recover(b backend.Backend) // UserAdd adds a new user - UserAdd(r *pb.UserAddRequest) (*pb.UserAddResponse, error) + UserAdd(r *pb.AuthUserAddRequest) (*pb.AuthUserAddResponse, error) } type authStore struct { @@ -64,7 +64,7 @@ func (as *authStore) Recover(be backend.Backend) { // TODO(mitake): recovery process } -func (as *authStore) UserAdd(r *pb.UserAddRequest) (*pb.UserAddResponse, error) { +func (as *authStore) UserAdd(r *pb.AuthUserAddRequest) (*pb.AuthUserAddResponse, error) { plog.Noticef("adding a new user: %s", r.Name) hashed, err := bcrypt.GenerateFromPassword([]byte(r.Password), bcrypt.DefaultCost) @@ -79,7 +79,7 @@ func (as *authStore) UserAdd(r *pb.UserAddRequest) (*pb.UserAddResponse, error) _, vs := tx.UnsafeRange(authUsersBucketName, []byte(r.Name), nil, 0) if len(vs) != 0 { - return &pb.UserAddResponse{}, rpctypes.ErrUserAlreadyExist + return &pb.AuthUserAddResponse{}, rpctypes.ErrUserAlreadyExist } newUser := authpb.User{ @@ -97,7 +97,7 @@ func (as *authStore) UserAdd(r *pb.UserAddRequest) (*pb.UserAddResponse, error) plog.Noticef("added a new user: %s", r.Name) - return &pb.UserAddResponse{}, nil + return &pb.AuthUserAddResponse{}, nil } func NewAuthStore(be backend.Backend) *authStore { diff --git a/clientv3/auth.go b/clientv3/auth.go index 352ebf63e..9ae3c8be8 100644 --- a/clientv3/auth.go +++ b/clientv3/auth.go @@ -21,8 +21,8 @@ import ( ) type ( - AuthEnableResponse pb.AuthEnableResponse - UserAddResponse pb.UserAddResponse + AuthEnableResponse pb.AuthEnableResponse + AuthUserAddResponse pb.AuthUserAddResponse ) type Auth interface { @@ -30,7 +30,7 @@ type Auth interface { AuthEnable(ctx context.Context) (*AuthEnableResponse, error) // UserAdd adds a new user to an etcd cluster. - UserAdd(ctx context.Context, name string, password string) (*UserAddResponse, error) + UserAdd(ctx context.Context, name string, password string) (*AuthUserAddResponse, error) } type auth struct { @@ -54,7 +54,7 @@ func (auth *auth) AuthEnable(ctx context.Context) (*AuthEnableResponse, error) { return (*AuthEnableResponse)(resp), err } -func (auth *auth) UserAdd(ctx context.Context, name string, password string) (*UserAddResponse, error) { - resp, err := auth.remote.UserAdd(ctx, &pb.UserAddRequest{Name: name, Password: password}) - return (*UserAddResponse)(resp), err +func (auth *auth) UserAdd(ctx context.Context, name string, password string) (*AuthUserAddResponse, error) { + resp, err := auth.remote.UserAdd(ctx, &pb.AuthUserAddRequest{Name: name, Password: password}) + return (*AuthUserAddResponse)(resp), err } diff --git a/etcdserver/api/v3rpc/auth.go b/etcdserver/api/v3rpc/auth.go index 567ab72f9..170740e5d 100644 --- a/etcdserver/api/v3rpc/auth.go +++ b/etcdserver/api/v3rpc/auth.go @@ -42,56 +42,56 @@ func (as *AuthServer) Authenticate(ctx context.Context, r *pb.AuthenticateReques return nil, nil } -func (as *AuthServer) RoleAdd(ctx context.Context, r *pb.RoleAddRequest) (*pb.RoleAddResponse, error) { +func (as *AuthServer) RoleAdd(ctx context.Context, r *pb.AuthRoleAddRequest) (*pb.AuthRoleAddResponse, error) { plog.Info("not implemented yet") return nil, nil } -func (as *AuthServer) RoleDelete(ctx context.Context, r *pb.RoleDeleteRequest) (*pb.RoleDeleteResponse, error) { +func (as *AuthServer) RoleDelete(ctx context.Context, r *pb.AuthRoleDeleteRequest) (*pb.AuthRoleDeleteResponse, error) { plog.Info("not implemented yet") return nil, nil } -func (as *AuthServer) RoleGet(ctx context.Context, r *pb.RoleGetRequest) (*pb.RoleGetResponse, error) { +func (as *AuthServer) RoleGet(ctx context.Context, r *pb.AuthRoleGetRequest) (*pb.AuthRoleGetResponse, error) { plog.Info("not implemented yet") return nil, nil } -func (as *AuthServer) RoleRevoke(ctx context.Context, r *pb.RoleRevokeRequest) (*pb.RoleRevokeResponse, error) { +func (as *AuthServer) RoleRevoke(ctx context.Context, r *pb.AuthRoleRevokeRequest) (*pb.AuthRoleRevokeResponse, error) { plog.Info("not implemented yet") return nil, nil } -func (as *AuthServer) RoleGrant(ctx context.Context, r *pb.RoleGrantRequest) (*pb.RoleGrantResponse, error) { +func (as *AuthServer) RoleGrant(ctx context.Context, r *pb.AuthRoleGrantRequest) (*pb.AuthRoleGrantResponse, error) { plog.Info("not implemented yet") return nil, nil } -func (as *AuthServer) UserAdd(ctx context.Context, r *pb.UserAddRequest) (*pb.UserAddResponse, error) { +func (as *AuthServer) UserAdd(ctx context.Context, r *pb.AuthUserAddRequest) (*pb.AuthUserAddResponse, error) { return as.authenticator.UserAdd(ctx, r) } -func (as *AuthServer) UserDelete(ctx context.Context, r *pb.UserDeleteRequest) (*pb.UserDeleteResponse, error) { +func (as *AuthServer) UserDelete(ctx context.Context, r *pb.AuthUserDeleteRequest) (*pb.AuthUserDeleteResponse, error) { plog.Info("not implemented yet") return nil, nil } -func (as *AuthServer) UserGet(ctx context.Context, r *pb.UserGetRequest) (*pb.UserGetResponse, error) { +func (as *AuthServer) UserGet(ctx context.Context, r *pb.AuthUserGetRequest) (*pb.AuthUserGetResponse, error) { plog.Info("not implemented yet") return nil, nil } -func (as *AuthServer) UserGrant(ctx context.Context, r *pb.UserGrantRequest) (*pb.UserGrantResponse, error) { +func (as *AuthServer) UserGrant(ctx context.Context, r *pb.AuthUserGrantRequest) (*pb.AuthUserGrantResponse, error) { plog.Info("not implemented yet") return nil, nil } -func (as *AuthServer) UserRevoke(ctx context.Context, r *pb.UserRevokeRequest) (*pb.UserRevokeResponse, error) { +func (as *AuthServer) UserRevoke(ctx context.Context, r *pb.AuthUserRevokeRequest) (*pb.AuthUserRevokeResponse, error) { plog.Info("not implemented yet") return nil, nil } -func (as *AuthServer) UserChangePassword(ctx context.Context, r *pb.UserChangePasswordRequest) (*pb.UserChangePasswordResponse, error) { +func (as *AuthServer) UserChangePassword(ctx context.Context, r *pb.AuthUserChangePasswordRequest) (*pb.AuthUserChangePasswordResponse, error) { plog.Info("not implemented yet") return nil, nil } diff --git a/etcdserver/apply.go b/etcdserver/apply.go index 827288f76..5455b23a7 100644 --- a/etcdserver/apply.go +++ b/etcdserver/apply.go @@ -50,7 +50,7 @@ type applierV3 interface { LeaseRevoke(lc *pb.LeaseRevokeRequest) (*pb.LeaseRevokeResponse, error) Alarm(*pb.AlarmRequest) (*pb.AlarmResponse, error) AuthEnable() (*pb.AuthEnableResponse, error) - UserAdd(ua *pb.UserAddRequest) (*pb.UserAddResponse, error) + UserAdd(ua *pb.AuthUserAddRequest) (*pb.AuthUserAddResponse, error) } type applierV3backend struct { @@ -78,8 +78,8 @@ func (s *EtcdServer) applyV3Request(r *pb.InternalRaftRequest) *applyResult { ar.resp, ar.err = s.applyV3.Alarm(r.Alarm) case r.AuthEnable != nil: ar.resp, ar.err = s.applyV3.AuthEnable() - case r.UserAdd != nil: - ar.resp, ar.err = s.applyV3.UserAdd(r.UserAdd) + case r.AuthUserAdd != nil: + ar.resp, ar.err = s.applyV3.UserAdd(r.AuthUserAdd) default: panic("not implemented") } @@ -452,7 +452,7 @@ func (a *applierV3backend) AuthEnable() (*pb.AuthEnableResponse, error) { return &pb.AuthEnableResponse{}, nil } -func (a *applierV3backend) UserAdd(r *pb.UserAddRequest) (*pb.UserAddResponse, error) { +func (a *applierV3backend) UserAdd(r *pb.AuthUserAddRequest) (*pb.AuthUserAddResponse, error) { return a.s.AuthStore().UserAdd(r) } diff --git a/etcdserver/etcdserverpb/etcdserver.pb.go b/etcdserver/etcdserverpb/etcdserver.pb.go index e5519e944..ca5194643 100644 --- a/etcdserver/etcdserverpb/etcdserver.pb.go +++ b/etcdserver/etcdserverpb/etcdserver.pb.go @@ -58,31 +58,31 @@ AuthEnableRequest AuthDisableRequest AuthenticateRequest - UserAddRequest - UserGetRequest - UserDeleteRequest - UserChangePasswordRequest - UserGrantRequest - UserRevokeRequest - RoleAddRequest - RoleGetRequest - RoleDeleteRequest - RoleGrantRequest - RoleRevokeRequest + AuthUserAddRequest + AuthUserGetRequest + AuthUserDeleteRequest + AuthUserChangePasswordRequest + AuthUserGrantRequest + AuthUserRevokeRequest + AuthRoleAddRequest + AuthRoleGetRequest + AuthRoleDeleteRequest + AuthRoleGrantRequest + AuthRoleRevokeRequest AuthEnableResponse AuthDisableResponse AuthenticateResponse - UserAddResponse - UserGetResponse - UserDeleteResponse - UserChangePasswordResponse - UserGrantResponse - UserRevokeResponse - RoleAddResponse - RoleGetResponse - RoleDeleteResponse - RoleGrantResponse - RoleRevokeResponse + AuthUserAddResponse + AuthUserGetResponse + AuthUserDeleteResponse + AuthUserChangePasswordResponse + AuthUserGrantResponse + AuthUserRevokeResponse + AuthRoleAddResponse + AuthRoleGetResponse + AuthRoleDeleteResponse + AuthRoleGrantResponse + AuthRoleRevokeResponse */ package etcdserverpb diff --git a/etcdserver/etcdserverpb/raft_internal.pb.go b/etcdserver/etcdserverpb/raft_internal.pb.go index 83a6ef89c..d249e59e5 100644 --- a/etcdserver/etcdserverpb/raft_internal.pb.go +++ b/etcdserver/etcdserverpb/raft_internal.pb.go @@ -32,7 +32,7 @@ type InternalRaftRequest struct { LeaseCreate *LeaseCreateRequest `protobuf:"bytes,8,opt,name=lease_create" json:"lease_create,omitempty"` LeaseRevoke *LeaseRevokeRequest `protobuf:"bytes,9,opt,name=lease_revoke" json:"lease_revoke,omitempty"` AuthEnable *AuthEnableRequest `protobuf:"bytes,10,opt,name=auth_enable" json:"auth_enable,omitempty"` - UserAdd *UserAddRequest `protobuf:"bytes,11,opt,name=user_add" json:"user_add,omitempty"` + AuthUserAdd *AuthUserAddRequest `protobuf:"bytes,11,opt,name=auth_user_add" json:"auth_user_add,omitempty"` Alarm *AlarmRequest `protobuf:"bytes,12,opt,name=alarm" json:"alarm,omitempty"` } @@ -161,11 +161,11 @@ func (m *InternalRaftRequest) MarshalTo(data []byte) (int, error) { } i += n9 } - if m.UserAdd != nil { + if m.AuthUserAdd != nil { data[i] = 0x5a i++ - i = encodeVarintRaftInternal(data, i, uint64(m.UserAdd.Size())) - n10, err := m.UserAdd.MarshalTo(data[i:]) + i = encodeVarintRaftInternal(data, i, uint64(m.AuthUserAdd.Size())) + n10, err := m.AuthUserAdd.MarshalTo(data[i:]) if err != nil { return 0, err } @@ -271,8 +271,8 @@ func (m *InternalRaftRequest) Size() (n int) { l = m.AuthEnable.Size() n += 1 + l + sovRaftInternal(uint64(l)) } - if m.UserAdd != nil { - l = m.UserAdd.Size() + if m.AuthUserAdd != nil { + l = m.AuthUserAdd.Size() n += 1 + l + sovRaftInternal(uint64(l)) } if m.Alarm != nil { @@ -648,7 +648,7 @@ func (m *InternalRaftRequest) Unmarshal(data []byte) error { iNdEx = postIndex case 11: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field UserAdd", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field AuthUserAdd", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -672,10 +672,10 @@ func (m *InternalRaftRequest) Unmarshal(data []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.UserAdd == nil { - m.UserAdd = &UserAddRequest{} + if m.AuthUserAdd == nil { + m.AuthUserAdd = &AuthUserAddRequest{} } - if err := m.UserAdd.Unmarshal(data[iNdEx:postIndex]); err != nil { + if err := m.AuthUserAdd.Unmarshal(data[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/etcdserver/etcdserverpb/raft_internal.proto b/etcdserver/etcdserverpb/raft_internal.proto index dd7ac0586..f0a589979 100644 --- a/etcdserver/etcdserverpb/raft_internal.proto +++ b/etcdserver/etcdserverpb/raft_internal.proto @@ -26,7 +26,7 @@ message InternalRaftRequest { LeaseRevokeRequest lease_revoke = 9; AuthEnableRequest auth_enable = 10; - UserAddRequest user_add = 11; + AuthUserAddRequest auth_user_add = 11; AlarmRequest alarm = 12; } diff --git a/etcdserver/etcdserverpb/rpc.pb.go b/etcdserver/etcdserverpb/rpc.pb.go index a52f7a2ba..0f5b47851 100644 --- a/etcdserver/etcdserverpb/rpc.pb.go +++ b/etcdserver/etcdserverpb/rpc.pb.go @@ -1266,84 +1266,84 @@ func (m *AuthenticateRequest) Reset() { *m = AuthenticateRequest{} } func (m *AuthenticateRequest) String() string { return proto.CompactTextString(m) } func (*AuthenticateRequest) ProtoMessage() {} -type UserAddRequest struct { +type AuthUserAddRequest struct { Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` Password string `protobuf:"bytes,2,opt,name=password,proto3" json:"password,omitempty"` } -func (m *UserAddRequest) Reset() { *m = UserAddRequest{} } -func (m *UserAddRequest) String() string { return proto.CompactTextString(m) } -func (*UserAddRequest) ProtoMessage() {} +func (m *AuthUserAddRequest) Reset() { *m = AuthUserAddRequest{} } +func (m *AuthUserAddRequest) String() string { return proto.CompactTextString(m) } +func (*AuthUserAddRequest) ProtoMessage() {} -type UserGetRequest struct { +type AuthUserGetRequest struct { } -func (m *UserGetRequest) Reset() { *m = UserGetRequest{} } -func (m *UserGetRequest) String() string { return proto.CompactTextString(m) } -func (*UserGetRequest) ProtoMessage() {} +func (m *AuthUserGetRequest) Reset() { *m = AuthUserGetRequest{} } +func (m *AuthUserGetRequest) String() string { return proto.CompactTextString(m) } +func (*AuthUserGetRequest) ProtoMessage() {} -type UserDeleteRequest struct { +type AuthUserDeleteRequest struct { } -func (m *UserDeleteRequest) Reset() { *m = UserDeleteRequest{} } -func (m *UserDeleteRequest) String() string { return proto.CompactTextString(m) } -func (*UserDeleteRequest) ProtoMessage() {} +func (m *AuthUserDeleteRequest) Reset() { *m = AuthUserDeleteRequest{} } +func (m *AuthUserDeleteRequest) String() string { return proto.CompactTextString(m) } +func (*AuthUserDeleteRequest) ProtoMessage() {} -type UserChangePasswordRequest struct { +type AuthUserChangePasswordRequest struct { } -func (m *UserChangePasswordRequest) Reset() { *m = UserChangePasswordRequest{} } -func (m *UserChangePasswordRequest) String() string { return proto.CompactTextString(m) } -func (*UserChangePasswordRequest) ProtoMessage() {} +func (m *AuthUserChangePasswordRequest) Reset() { *m = AuthUserChangePasswordRequest{} } +func (m *AuthUserChangePasswordRequest) String() string { return proto.CompactTextString(m) } +func (*AuthUserChangePasswordRequest) ProtoMessage() {} -type UserGrantRequest struct { +type AuthUserGrantRequest struct { } -func (m *UserGrantRequest) Reset() { *m = UserGrantRequest{} } -func (m *UserGrantRequest) String() string { return proto.CompactTextString(m) } -func (*UserGrantRequest) ProtoMessage() {} +func (m *AuthUserGrantRequest) Reset() { *m = AuthUserGrantRequest{} } +func (m *AuthUserGrantRequest) String() string { return proto.CompactTextString(m) } +func (*AuthUserGrantRequest) ProtoMessage() {} -type UserRevokeRequest struct { +type AuthUserRevokeRequest struct { } -func (m *UserRevokeRequest) Reset() { *m = UserRevokeRequest{} } -func (m *UserRevokeRequest) String() string { return proto.CompactTextString(m) } -func (*UserRevokeRequest) ProtoMessage() {} +func (m *AuthUserRevokeRequest) Reset() { *m = AuthUserRevokeRequest{} } +func (m *AuthUserRevokeRequest) String() string { return proto.CompactTextString(m) } +func (*AuthUserRevokeRequest) ProtoMessage() {} -type RoleAddRequest struct { +type AuthRoleAddRequest struct { } -func (m *RoleAddRequest) Reset() { *m = RoleAddRequest{} } -func (m *RoleAddRequest) String() string { return proto.CompactTextString(m) } -func (*RoleAddRequest) ProtoMessage() {} +func (m *AuthRoleAddRequest) Reset() { *m = AuthRoleAddRequest{} } +func (m *AuthRoleAddRequest) String() string { return proto.CompactTextString(m) } +func (*AuthRoleAddRequest) ProtoMessage() {} -type RoleGetRequest struct { +type AuthRoleGetRequest struct { } -func (m *RoleGetRequest) Reset() { *m = RoleGetRequest{} } -func (m *RoleGetRequest) String() string { return proto.CompactTextString(m) } -func (*RoleGetRequest) ProtoMessage() {} +func (m *AuthRoleGetRequest) Reset() { *m = AuthRoleGetRequest{} } +func (m *AuthRoleGetRequest) String() string { return proto.CompactTextString(m) } +func (*AuthRoleGetRequest) ProtoMessage() {} -type RoleDeleteRequest struct { +type AuthRoleDeleteRequest struct { } -func (m *RoleDeleteRequest) Reset() { *m = RoleDeleteRequest{} } -func (m *RoleDeleteRequest) String() string { return proto.CompactTextString(m) } -func (*RoleDeleteRequest) ProtoMessage() {} +func (m *AuthRoleDeleteRequest) Reset() { *m = AuthRoleDeleteRequest{} } +func (m *AuthRoleDeleteRequest) String() string { return proto.CompactTextString(m) } +func (*AuthRoleDeleteRequest) ProtoMessage() {} -type RoleGrantRequest struct { +type AuthRoleGrantRequest struct { } -func (m *RoleGrantRequest) Reset() { *m = RoleGrantRequest{} } -func (m *RoleGrantRequest) String() string { return proto.CompactTextString(m) } -func (*RoleGrantRequest) ProtoMessage() {} +func (m *AuthRoleGrantRequest) Reset() { *m = AuthRoleGrantRequest{} } +func (m *AuthRoleGrantRequest) String() string { return proto.CompactTextString(m) } +func (*AuthRoleGrantRequest) ProtoMessage() {} -type RoleRevokeRequest struct { +type AuthRoleRevokeRequest struct { } -func (m *RoleRevokeRequest) Reset() { *m = RoleRevokeRequest{} } -func (m *RoleRevokeRequest) String() string { return proto.CompactTextString(m) } -func (*RoleRevokeRequest) ProtoMessage() {} +func (m *AuthRoleRevokeRequest) Reset() { *m = AuthRoleRevokeRequest{} } +func (m *AuthRoleRevokeRequest) String() string { return proto.CompactTextString(m) } +func (*AuthRoleRevokeRequest) ProtoMessage() {} type AuthEnableResponse struct { Header *ResponseHeader `protobuf:"bytes,1,opt,name=header" json:"header,omitempty"` @@ -1390,165 +1390,165 @@ func (m *AuthenticateResponse) GetHeader() *ResponseHeader { return nil } -type UserAddResponse struct { +type AuthUserAddResponse struct { Header *ResponseHeader `protobuf:"bytes,1,opt,name=header" json:"header,omitempty"` } -func (m *UserAddResponse) Reset() { *m = UserAddResponse{} } -func (m *UserAddResponse) String() string { return proto.CompactTextString(m) } -func (*UserAddResponse) ProtoMessage() {} +func (m *AuthUserAddResponse) Reset() { *m = AuthUserAddResponse{} } +func (m *AuthUserAddResponse) String() string { return proto.CompactTextString(m) } +func (*AuthUserAddResponse) ProtoMessage() {} -func (m *UserAddResponse) GetHeader() *ResponseHeader { +func (m *AuthUserAddResponse) GetHeader() *ResponseHeader { if m != nil { return m.Header } return nil } -type UserGetResponse struct { +type AuthUserGetResponse struct { Header *ResponseHeader `protobuf:"bytes,1,opt,name=header" json:"header,omitempty"` } -func (m *UserGetResponse) Reset() { *m = UserGetResponse{} } -func (m *UserGetResponse) String() string { return proto.CompactTextString(m) } -func (*UserGetResponse) ProtoMessage() {} +func (m *AuthUserGetResponse) Reset() { *m = AuthUserGetResponse{} } +func (m *AuthUserGetResponse) String() string { return proto.CompactTextString(m) } +func (*AuthUserGetResponse) ProtoMessage() {} -func (m *UserGetResponse) GetHeader() *ResponseHeader { +func (m *AuthUserGetResponse) GetHeader() *ResponseHeader { if m != nil { return m.Header } return nil } -type UserDeleteResponse struct { +type AuthUserDeleteResponse struct { Header *ResponseHeader `protobuf:"bytes,1,opt,name=header" json:"header,omitempty"` } -func (m *UserDeleteResponse) Reset() { *m = UserDeleteResponse{} } -func (m *UserDeleteResponse) String() string { return proto.CompactTextString(m) } -func (*UserDeleteResponse) ProtoMessage() {} +func (m *AuthUserDeleteResponse) Reset() { *m = AuthUserDeleteResponse{} } +func (m *AuthUserDeleteResponse) String() string { return proto.CompactTextString(m) } +func (*AuthUserDeleteResponse) ProtoMessage() {} -func (m *UserDeleteResponse) GetHeader() *ResponseHeader { +func (m *AuthUserDeleteResponse) GetHeader() *ResponseHeader { if m != nil { return m.Header } return nil } -type UserChangePasswordResponse struct { +type AuthUserChangePasswordResponse struct { Header *ResponseHeader `protobuf:"bytes,1,opt,name=header" json:"header,omitempty"` } -func (m *UserChangePasswordResponse) Reset() { *m = UserChangePasswordResponse{} } -func (m *UserChangePasswordResponse) String() string { return proto.CompactTextString(m) } -func (*UserChangePasswordResponse) ProtoMessage() {} +func (m *AuthUserChangePasswordResponse) Reset() { *m = AuthUserChangePasswordResponse{} } +func (m *AuthUserChangePasswordResponse) String() string { return proto.CompactTextString(m) } +func (*AuthUserChangePasswordResponse) ProtoMessage() {} -func (m *UserChangePasswordResponse) GetHeader() *ResponseHeader { +func (m *AuthUserChangePasswordResponse) GetHeader() *ResponseHeader { if m != nil { return m.Header } return nil } -type UserGrantResponse struct { +type AuthUserGrantResponse struct { Header *ResponseHeader `protobuf:"bytes,1,opt,name=header" json:"header,omitempty"` } -func (m *UserGrantResponse) Reset() { *m = UserGrantResponse{} } -func (m *UserGrantResponse) String() string { return proto.CompactTextString(m) } -func (*UserGrantResponse) ProtoMessage() {} +func (m *AuthUserGrantResponse) Reset() { *m = AuthUserGrantResponse{} } +func (m *AuthUserGrantResponse) String() string { return proto.CompactTextString(m) } +func (*AuthUserGrantResponse) ProtoMessage() {} -func (m *UserGrantResponse) GetHeader() *ResponseHeader { +func (m *AuthUserGrantResponse) GetHeader() *ResponseHeader { if m != nil { return m.Header } return nil } -type UserRevokeResponse struct { +type AuthUserRevokeResponse struct { Header *ResponseHeader `protobuf:"bytes,1,opt,name=header" json:"header,omitempty"` } -func (m *UserRevokeResponse) Reset() { *m = UserRevokeResponse{} } -func (m *UserRevokeResponse) String() string { return proto.CompactTextString(m) } -func (*UserRevokeResponse) ProtoMessage() {} +func (m *AuthUserRevokeResponse) Reset() { *m = AuthUserRevokeResponse{} } +func (m *AuthUserRevokeResponse) String() string { return proto.CompactTextString(m) } +func (*AuthUserRevokeResponse) ProtoMessage() {} -func (m *UserRevokeResponse) GetHeader() *ResponseHeader { +func (m *AuthUserRevokeResponse) GetHeader() *ResponseHeader { if m != nil { return m.Header } return nil } -type RoleAddResponse struct { +type AuthRoleAddResponse struct { Header *ResponseHeader `protobuf:"bytes,1,opt,name=header" json:"header,omitempty"` } -func (m *RoleAddResponse) Reset() { *m = RoleAddResponse{} } -func (m *RoleAddResponse) String() string { return proto.CompactTextString(m) } -func (*RoleAddResponse) ProtoMessage() {} +func (m *AuthRoleAddResponse) Reset() { *m = AuthRoleAddResponse{} } +func (m *AuthRoleAddResponse) String() string { return proto.CompactTextString(m) } +func (*AuthRoleAddResponse) ProtoMessage() {} -func (m *RoleAddResponse) GetHeader() *ResponseHeader { +func (m *AuthRoleAddResponse) GetHeader() *ResponseHeader { if m != nil { return m.Header } return nil } -type RoleGetResponse struct { +type AuthRoleGetResponse struct { Header *ResponseHeader `protobuf:"bytes,1,opt,name=header" json:"header,omitempty"` } -func (m *RoleGetResponse) Reset() { *m = RoleGetResponse{} } -func (m *RoleGetResponse) String() string { return proto.CompactTextString(m) } -func (*RoleGetResponse) ProtoMessage() {} +func (m *AuthRoleGetResponse) Reset() { *m = AuthRoleGetResponse{} } +func (m *AuthRoleGetResponse) String() string { return proto.CompactTextString(m) } +func (*AuthRoleGetResponse) ProtoMessage() {} -func (m *RoleGetResponse) GetHeader() *ResponseHeader { +func (m *AuthRoleGetResponse) GetHeader() *ResponseHeader { if m != nil { return m.Header } return nil } -type RoleDeleteResponse struct { +type AuthRoleDeleteResponse struct { Header *ResponseHeader `protobuf:"bytes,1,opt,name=header" json:"header,omitempty"` } -func (m *RoleDeleteResponse) Reset() { *m = RoleDeleteResponse{} } -func (m *RoleDeleteResponse) String() string { return proto.CompactTextString(m) } -func (*RoleDeleteResponse) ProtoMessage() {} +func (m *AuthRoleDeleteResponse) Reset() { *m = AuthRoleDeleteResponse{} } +func (m *AuthRoleDeleteResponse) String() string { return proto.CompactTextString(m) } +func (*AuthRoleDeleteResponse) ProtoMessage() {} -func (m *RoleDeleteResponse) GetHeader() *ResponseHeader { +func (m *AuthRoleDeleteResponse) GetHeader() *ResponseHeader { if m != nil { return m.Header } return nil } -type RoleGrantResponse struct { +type AuthRoleGrantResponse struct { Header *ResponseHeader `protobuf:"bytes,1,opt,name=header" json:"header,omitempty"` } -func (m *RoleGrantResponse) Reset() { *m = RoleGrantResponse{} } -func (m *RoleGrantResponse) String() string { return proto.CompactTextString(m) } -func (*RoleGrantResponse) ProtoMessage() {} +func (m *AuthRoleGrantResponse) Reset() { *m = AuthRoleGrantResponse{} } +func (m *AuthRoleGrantResponse) String() string { return proto.CompactTextString(m) } +func (*AuthRoleGrantResponse) ProtoMessage() {} -func (m *RoleGrantResponse) GetHeader() *ResponseHeader { +func (m *AuthRoleGrantResponse) GetHeader() *ResponseHeader { if m != nil { return m.Header } return nil } -type RoleRevokeResponse struct { +type AuthRoleRevokeResponse struct { Header *ResponseHeader `protobuf:"bytes,1,opt,name=header" json:"header,omitempty"` } -func (m *RoleRevokeResponse) Reset() { *m = RoleRevokeResponse{} } -func (m *RoleRevokeResponse) String() string { return proto.CompactTextString(m) } -func (*RoleRevokeResponse) ProtoMessage() {} +func (m *AuthRoleRevokeResponse) Reset() { *m = AuthRoleRevokeResponse{} } +func (m *AuthRoleRevokeResponse) String() string { return proto.CompactTextString(m) } +func (*AuthRoleRevokeResponse) ProtoMessage() {} -func (m *RoleRevokeResponse) GetHeader() *ResponseHeader { +func (m *AuthRoleRevokeResponse) GetHeader() *ResponseHeader { if m != nil { return m.Header } @@ -1599,31 +1599,31 @@ func init() { proto.RegisterType((*AuthEnableRequest)(nil), "etcdserverpb.AuthEnableRequest") proto.RegisterType((*AuthDisableRequest)(nil), "etcdserverpb.AuthDisableRequest") proto.RegisterType((*AuthenticateRequest)(nil), "etcdserverpb.AuthenticateRequest") - proto.RegisterType((*UserAddRequest)(nil), "etcdserverpb.UserAddRequest") - proto.RegisterType((*UserGetRequest)(nil), "etcdserverpb.UserGetRequest") - proto.RegisterType((*UserDeleteRequest)(nil), "etcdserverpb.UserDeleteRequest") - proto.RegisterType((*UserChangePasswordRequest)(nil), "etcdserverpb.UserChangePasswordRequest") - proto.RegisterType((*UserGrantRequest)(nil), "etcdserverpb.UserGrantRequest") - proto.RegisterType((*UserRevokeRequest)(nil), "etcdserverpb.UserRevokeRequest") - proto.RegisterType((*RoleAddRequest)(nil), "etcdserverpb.RoleAddRequest") - proto.RegisterType((*RoleGetRequest)(nil), "etcdserverpb.RoleGetRequest") - proto.RegisterType((*RoleDeleteRequest)(nil), "etcdserverpb.RoleDeleteRequest") - proto.RegisterType((*RoleGrantRequest)(nil), "etcdserverpb.RoleGrantRequest") - proto.RegisterType((*RoleRevokeRequest)(nil), "etcdserverpb.RoleRevokeRequest") + proto.RegisterType((*AuthUserAddRequest)(nil), "etcdserverpb.AuthUserAddRequest") + proto.RegisterType((*AuthUserGetRequest)(nil), "etcdserverpb.AuthUserGetRequest") + proto.RegisterType((*AuthUserDeleteRequest)(nil), "etcdserverpb.AuthUserDeleteRequest") + proto.RegisterType((*AuthUserChangePasswordRequest)(nil), "etcdserverpb.AuthUserChangePasswordRequest") + proto.RegisterType((*AuthUserGrantRequest)(nil), "etcdserverpb.AuthUserGrantRequest") + proto.RegisterType((*AuthUserRevokeRequest)(nil), "etcdserverpb.AuthUserRevokeRequest") + proto.RegisterType((*AuthRoleAddRequest)(nil), "etcdserverpb.AuthRoleAddRequest") + proto.RegisterType((*AuthRoleGetRequest)(nil), "etcdserverpb.AuthRoleGetRequest") + proto.RegisterType((*AuthRoleDeleteRequest)(nil), "etcdserverpb.AuthRoleDeleteRequest") + proto.RegisterType((*AuthRoleGrantRequest)(nil), "etcdserverpb.AuthRoleGrantRequest") + proto.RegisterType((*AuthRoleRevokeRequest)(nil), "etcdserverpb.AuthRoleRevokeRequest") proto.RegisterType((*AuthEnableResponse)(nil), "etcdserverpb.AuthEnableResponse") proto.RegisterType((*AuthDisableResponse)(nil), "etcdserverpb.AuthDisableResponse") proto.RegisterType((*AuthenticateResponse)(nil), "etcdserverpb.AuthenticateResponse") - proto.RegisterType((*UserAddResponse)(nil), "etcdserverpb.UserAddResponse") - proto.RegisterType((*UserGetResponse)(nil), "etcdserverpb.UserGetResponse") - proto.RegisterType((*UserDeleteResponse)(nil), "etcdserverpb.UserDeleteResponse") - proto.RegisterType((*UserChangePasswordResponse)(nil), "etcdserverpb.UserChangePasswordResponse") - proto.RegisterType((*UserGrantResponse)(nil), "etcdserverpb.UserGrantResponse") - proto.RegisterType((*UserRevokeResponse)(nil), "etcdserverpb.UserRevokeResponse") - proto.RegisterType((*RoleAddResponse)(nil), "etcdserverpb.RoleAddResponse") - proto.RegisterType((*RoleGetResponse)(nil), "etcdserverpb.RoleGetResponse") - proto.RegisterType((*RoleDeleteResponse)(nil), "etcdserverpb.RoleDeleteResponse") - proto.RegisterType((*RoleGrantResponse)(nil), "etcdserverpb.RoleGrantResponse") - proto.RegisterType((*RoleRevokeResponse)(nil), "etcdserverpb.RoleRevokeResponse") + proto.RegisterType((*AuthUserAddResponse)(nil), "etcdserverpb.AuthUserAddResponse") + proto.RegisterType((*AuthUserGetResponse)(nil), "etcdserverpb.AuthUserGetResponse") + proto.RegisterType((*AuthUserDeleteResponse)(nil), "etcdserverpb.AuthUserDeleteResponse") + proto.RegisterType((*AuthUserChangePasswordResponse)(nil), "etcdserverpb.AuthUserChangePasswordResponse") + proto.RegisterType((*AuthUserGrantResponse)(nil), "etcdserverpb.AuthUserGrantResponse") + proto.RegisterType((*AuthUserRevokeResponse)(nil), "etcdserverpb.AuthUserRevokeResponse") + proto.RegisterType((*AuthRoleAddResponse)(nil), "etcdserverpb.AuthRoleAddResponse") + proto.RegisterType((*AuthRoleGetResponse)(nil), "etcdserverpb.AuthRoleGetResponse") + proto.RegisterType((*AuthRoleDeleteResponse)(nil), "etcdserverpb.AuthRoleDeleteResponse") + proto.RegisterType((*AuthRoleGrantResponse)(nil), "etcdserverpb.AuthRoleGrantResponse") + proto.RegisterType((*AuthRoleRevokeResponse)(nil), "etcdserverpb.AuthRoleRevokeResponse") proto.RegisterEnum("etcdserverpb.AlarmType", AlarmType_name, AlarmType_value) proto.RegisterEnum("etcdserverpb.RangeRequest_SortOrder", RangeRequest_SortOrder_name, RangeRequest_SortOrder_value) proto.RegisterEnum("etcdserverpb.RangeRequest_SortTarget", RangeRequest_SortTarget_name, RangeRequest_SortTarget_value) @@ -2367,27 +2367,27 @@ type AuthClient interface { // Authenticate processes authenticate request. Authenticate(ctx context.Context, in *AuthenticateRequest, opts ...grpc.CallOption) (*AuthenticateResponse, error) // UserAdd adds a new user. - UserAdd(ctx context.Context, in *UserAddRequest, opts ...grpc.CallOption) (*UserAddResponse, error) + UserAdd(ctx context.Context, in *AuthUserAddRequest, opts ...grpc.CallOption) (*AuthUserAddResponse, error) // UserGet gets a detailed information of a user or lists entire users. - UserGet(ctx context.Context, in *UserGetRequest, opts ...grpc.CallOption) (*UserGetResponse, error) + UserGet(ctx context.Context, in *AuthUserGetRequest, opts ...grpc.CallOption) (*AuthUserGetResponse, error) // UserDelete deletes a specified user. - UserDelete(ctx context.Context, in *UserDeleteRequest, opts ...grpc.CallOption) (*UserDeleteResponse, error) + UserDelete(ctx context.Context, in *AuthUserDeleteRequest, opts ...grpc.CallOption) (*AuthUserDeleteResponse, error) // UserChangePassword changes password of a specified user. - UserChangePassword(ctx context.Context, in *UserChangePasswordRequest, opts ...grpc.CallOption) (*UserChangePasswordResponse, error) + UserChangePassword(ctx context.Context, in *AuthUserChangePasswordRequest, opts ...grpc.CallOption) (*AuthUserChangePasswordResponse, error) // UserGrant grants a role to a specified user. - UserGrant(ctx context.Context, in *UserGrantRequest, opts ...grpc.CallOption) (*UserGrantResponse, error) + UserGrant(ctx context.Context, in *AuthUserGrantRequest, opts ...grpc.CallOption) (*AuthUserGrantResponse, error) // UserRevoke revokes a role of specified user. - UserRevoke(ctx context.Context, in *UserRevokeRequest, opts ...grpc.CallOption) (*UserRevokeResponse, error) + UserRevoke(ctx context.Context, in *AuthUserRevokeRequest, opts ...grpc.CallOption) (*AuthUserRevokeResponse, error) // RoleAdd adds a new role. - RoleAdd(ctx context.Context, in *RoleAddRequest, opts ...grpc.CallOption) (*RoleAddResponse, error) + RoleAdd(ctx context.Context, in *AuthRoleAddRequest, opts ...grpc.CallOption) (*AuthRoleAddResponse, error) // RoleGet gets a detailed information of a role or lists entire roles. - RoleGet(ctx context.Context, in *RoleGetRequest, opts ...grpc.CallOption) (*RoleGetResponse, error) + RoleGet(ctx context.Context, in *AuthRoleGetRequest, opts ...grpc.CallOption) (*AuthRoleGetResponse, error) // RoleDelete deletes a specified role. - RoleDelete(ctx context.Context, in *RoleDeleteRequest, opts ...grpc.CallOption) (*RoleDeleteResponse, error) + RoleDelete(ctx context.Context, in *AuthRoleDeleteRequest, opts ...grpc.CallOption) (*AuthRoleDeleteResponse, error) // RoleGrant grants a permission of a specified key or range to a specified role. - RoleGrant(ctx context.Context, in *RoleGrantRequest, opts ...grpc.CallOption) (*RoleGrantResponse, error) + RoleGrant(ctx context.Context, in *AuthRoleGrantRequest, opts ...grpc.CallOption) (*AuthRoleGrantResponse, error) // RoleRevoke revokes a key or range permission of a specified role. - RoleRevoke(ctx context.Context, in *RoleRevokeRequest, opts ...grpc.CallOption) (*RoleRevokeResponse, error) + RoleRevoke(ctx context.Context, in *AuthRoleRevokeRequest, opts ...grpc.CallOption) (*AuthRoleRevokeResponse, error) } type authClient struct { @@ -2425,8 +2425,8 @@ func (c *authClient) Authenticate(ctx context.Context, in *AuthenticateRequest, return out, nil } -func (c *authClient) UserAdd(ctx context.Context, in *UserAddRequest, opts ...grpc.CallOption) (*UserAddResponse, error) { - out := new(UserAddResponse) +func (c *authClient) UserAdd(ctx context.Context, in *AuthUserAddRequest, opts ...grpc.CallOption) (*AuthUserAddResponse, error) { + out := new(AuthUserAddResponse) err := grpc.Invoke(ctx, "/etcdserverpb.Auth/UserAdd", in, out, c.cc, opts...) if err != nil { return nil, err @@ -2434,8 +2434,8 @@ func (c *authClient) UserAdd(ctx context.Context, in *UserAddRequest, opts ...gr return out, nil } -func (c *authClient) UserGet(ctx context.Context, in *UserGetRequest, opts ...grpc.CallOption) (*UserGetResponse, error) { - out := new(UserGetResponse) +func (c *authClient) UserGet(ctx context.Context, in *AuthUserGetRequest, opts ...grpc.CallOption) (*AuthUserGetResponse, error) { + out := new(AuthUserGetResponse) err := grpc.Invoke(ctx, "/etcdserverpb.Auth/UserGet", in, out, c.cc, opts...) if err != nil { return nil, err @@ -2443,8 +2443,8 @@ func (c *authClient) UserGet(ctx context.Context, in *UserGetRequest, opts ...gr return out, nil } -func (c *authClient) UserDelete(ctx context.Context, in *UserDeleteRequest, opts ...grpc.CallOption) (*UserDeleteResponse, error) { - out := new(UserDeleteResponse) +func (c *authClient) UserDelete(ctx context.Context, in *AuthUserDeleteRequest, opts ...grpc.CallOption) (*AuthUserDeleteResponse, error) { + out := new(AuthUserDeleteResponse) err := grpc.Invoke(ctx, "/etcdserverpb.Auth/UserDelete", in, out, c.cc, opts...) if err != nil { return nil, err @@ -2452,8 +2452,8 @@ func (c *authClient) UserDelete(ctx context.Context, in *UserDeleteRequest, opts return out, nil } -func (c *authClient) UserChangePassword(ctx context.Context, in *UserChangePasswordRequest, opts ...grpc.CallOption) (*UserChangePasswordResponse, error) { - out := new(UserChangePasswordResponse) +func (c *authClient) UserChangePassword(ctx context.Context, in *AuthUserChangePasswordRequest, opts ...grpc.CallOption) (*AuthUserChangePasswordResponse, error) { + out := new(AuthUserChangePasswordResponse) err := grpc.Invoke(ctx, "/etcdserverpb.Auth/UserChangePassword", in, out, c.cc, opts...) if err != nil { return nil, err @@ -2461,8 +2461,8 @@ func (c *authClient) UserChangePassword(ctx context.Context, in *UserChangePassw return out, nil } -func (c *authClient) UserGrant(ctx context.Context, in *UserGrantRequest, opts ...grpc.CallOption) (*UserGrantResponse, error) { - out := new(UserGrantResponse) +func (c *authClient) UserGrant(ctx context.Context, in *AuthUserGrantRequest, opts ...grpc.CallOption) (*AuthUserGrantResponse, error) { + out := new(AuthUserGrantResponse) err := grpc.Invoke(ctx, "/etcdserverpb.Auth/UserGrant", in, out, c.cc, opts...) if err != nil { return nil, err @@ -2470,8 +2470,8 @@ func (c *authClient) UserGrant(ctx context.Context, in *UserGrantRequest, opts . return out, nil } -func (c *authClient) UserRevoke(ctx context.Context, in *UserRevokeRequest, opts ...grpc.CallOption) (*UserRevokeResponse, error) { - out := new(UserRevokeResponse) +func (c *authClient) UserRevoke(ctx context.Context, in *AuthUserRevokeRequest, opts ...grpc.CallOption) (*AuthUserRevokeResponse, error) { + out := new(AuthUserRevokeResponse) err := grpc.Invoke(ctx, "/etcdserverpb.Auth/UserRevoke", in, out, c.cc, opts...) if err != nil { return nil, err @@ -2479,8 +2479,8 @@ func (c *authClient) UserRevoke(ctx context.Context, in *UserRevokeRequest, opts return out, nil } -func (c *authClient) RoleAdd(ctx context.Context, in *RoleAddRequest, opts ...grpc.CallOption) (*RoleAddResponse, error) { - out := new(RoleAddResponse) +func (c *authClient) RoleAdd(ctx context.Context, in *AuthRoleAddRequest, opts ...grpc.CallOption) (*AuthRoleAddResponse, error) { + out := new(AuthRoleAddResponse) err := grpc.Invoke(ctx, "/etcdserverpb.Auth/RoleAdd", in, out, c.cc, opts...) if err != nil { return nil, err @@ -2488,8 +2488,8 @@ func (c *authClient) RoleAdd(ctx context.Context, in *RoleAddRequest, opts ...gr return out, nil } -func (c *authClient) RoleGet(ctx context.Context, in *RoleGetRequest, opts ...grpc.CallOption) (*RoleGetResponse, error) { - out := new(RoleGetResponse) +func (c *authClient) RoleGet(ctx context.Context, in *AuthRoleGetRequest, opts ...grpc.CallOption) (*AuthRoleGetResponse, error) { + out := new(AuthRoleGetResponse) err := grpc.Invoke(ctx, "/etcdserverpb.Auth/RoleGet", in, out, c.cc, opts...) if err != nil { return nil, err @@ -2497,8 +2497,8 @@ func (c *authClient) RoleGet(ctx context.Context, in *RoleGetRequest, opts ...gr return out, nil } -func (c *authClient) RoleDelete(ctx context.Context, in *RoleDeleteRequest, opts ...grpc.CallOption) (*RoleDeleteResponse, error) { - out := new(RoleDeleteResponse) +func (c *authClient) RoleDelete(ctx context.Context, in *AuthRoleDeleteRequest, opts ...grpc.CallOption) (*AuthRoleDeleteResponse, error) { + out := new(AuthRoleDeleteResponse) err := grpc.Invoke(ctx, "/etcdserverpb.Auth/RoleDelete", in, out, c.cc, opts...) if err != nil { return nil, err @@ -2506,8 +2506,8 @@ func (c *authClient) RoleDelete(ctx context.Context, in *RoleDeleteRequest, opts return out, nil } -func (c *authClient) RoleGrant(ctx context.Context, in *RoleGrantRequest, opts ...grpc.CallOption) (*RoleGrantResponse, error) { - out := new(RoleGrantResponse) +func (c *authClient) RoleGrant(ctx context.Context, in *AuthRoleGrantRequest, opts ...grpc.CallOption) (*AuthRoleGrantResponse, error) { + out := new(AuthRoleGrantResponse) err := grpc.Invoke(ctx, "/etcdserverpb.Auth/RoleGrant", in, out, c.cc, opts...) if err != nil { return nil, err @@ -2515,8 +2515,8 @@ func (c *authClient) RoleGrant(ctx context.Context, in *RoleGrantRequest, opts . return out, nil } -func (c *authClient) RoleRevoke(ctx context.Context, in *RoleRevokeRequest, opts ...grpc.CallOption) (*RoleRevokeResponse, error) { - out := new(RoleRevokeResponse) +func (c *authClient) RoleRevoke(ctx context.Context, in *AuthRoleRevokeRequest, opts ...grpc.CallOption) (*AuthRoleRevokeResponse, error) { + out := new(AuthRoleRevokeResponse) err := grpc.Invoke(ctx, "/etcdserverpb.Auth/RoleRevoke", in, out, c.cc, opts...) if err != nil { return nil, err @@ -2534,27 +2534,27 @@ type AuthServer interface { // Authenticate processes authenticate request. Authenticate(context.Context, *AuthenticateRequest) (*AuthenticateResponse, error) // UserAdd adds a new user. - UserAdd(context.Context, *UserAddRequest) (*UserAddResponse, error) + UserAdd(context.Context, *AuthUserAddRequest) (*AuthUserAddResponse, error) // UserGet gets a detailed information of a user or lists entire users. - UserGet(context.Context, *UserGetRequest) (*UserGetResponse, error) + UserGet(context.Context, *AuthUserGetRequest) (*AuthUserGetResponse, error) // UserDelete deletes a specified user. - UserDelete(context.Context, *UserDeleteRequest) (*UserDeleteResponse, error) + UserDelete(context.Context, *AuthUserDeleteRequest) (*AuthUserDeleteResponse, error) // UserChangePassword changes password of a specified user. - UserChangePassword(context.Context, *UserChangePasswordRequest) (*UserChangePasswordResponse, error) + UserChangePassword(context.Context, *AuthUserChangePasswordRequest) (*AuthUserChangePasswordResponse, error) // UserGrant grants a role to a specified user. - UserGrant(context.Context, *UserGrantRequest) (*UserGrantResponse, error) + UserGrant(context.Context, *AuthUserGrantRequest) (*AuthUserGrantResponse, error) // UserRevoke revokes a role of specified user. - UserRevoke(context.Context, *UserRevokeRequest) (*UserRevokeResponse, error) + UserRevoke(context.Context, *AuthUserRevokeRequest) (*AuthUserRevokeResponse, error) // RoleAdd adds a new role. - RoleAdd(context.Context, *RoleAddRequest) (*RoleAddResponse, error) + RoleAdd(context.Context, *AuthRoleAddRequest) (*AuthRoleAddResponse, error) // RoleGet gets a detailed information of a role or lists entire roles. - RoleGet(context.Context, *RoleGetRequest) (*RoleGetResponse, error) + RoleGet(context.Context, *AuthRoleGetRequest) (*AuthRoleGetResponse, error) // RoleDelete deletes a specified role. - RoleDelete(context.Context, *RoleDeleteRequest) (*RoleDeleteResponse, error) + RoleDelete(context.Context, *AuthRoleDeleteRequest) (*AuthRoleDeleteResponse, error) // RoleGrant grants a permission of a specified key or range to a specified role. - RoleGrant(context.Context, *RoleGrantRequest) (*RoleGrantResponse, error) + RoleGrant(context.Context, *AuthRoleGrantRequest) (*AuthRoleGrantResponse, error) // RoleRevoke revokes a key or range permission of a specified role. - RoleRevoke(context.Context, *RoleRevokeRequest) (*RoleRevokeResponse, error) + RoleRevoke(context.Context, *AuthRoleRevokeRequest) (*AuthRoleRevokeResponse, error) } func RegisterAuthServer(s *grpc.Server, srv AuthServer) { @@ -2598,7 +2598,7 @@ func _Auth_Authenticate_Handler(srv interface{}, ctx context.Context, dec func(i } func _Auth_UserAdd_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error) (interface{}, error) { - in := new(UserAddRequest) + in := new(AuthUserAddRequest) if err := dec(in); err != nil { return nil, err } @@ -2610,7 +2610,7 @@ func _Auth_UserAdd_Handler(srv interface{}, ctx context.Context, dec func(interf } func _Auth_UserGet_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error) (interface{}, error) { - in := new(UserGetRequest) + in := new(AuthUserGetRequest) if err := dec(in); err != nil { return nil, err } @@ -2622,7 +2622,7 @@ func _Auth_UserGet_Handler(srv interface{}, ctx context.Context, dec func(interf } func _Auth_UserDelete_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error) (interface{}, error) { - in := new(UserDeleteRequest) + in := new(AuthUserDeleteRequest) if err := dec(in); err != nil { return nil, err } @@ -2634,7 +2634,7 @@ func _Auth_UserDelete_Handler(srv interface{}, ctx context.Context, dec func(int } func _Auth_UserChangePassword_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error) (interface{}, error) { - in := new(UserChangePasswordRequest) + in := new(AuthUserChangePasswordRequest) if err := dec(in); err != nil { return nil, err } @@ -2646,7 +2646,7 @@ func _Auth_UserChangePassword_Handler(srv interface{}, ctx context.Context, dec } func _Auth_UserGrant_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error) (interface{}, error) { - in := new(UserGrantRequest) + in := new(AuthUserGrantRequest) if err := dec(in); err != nil { return nil, err } @@ -2658,7 +2658,7 @@ func _Auth_UserGrant_Handler(srv interface{}, ctx context.Context, dec func(inte } func _Auth_UserRevoke_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error) (interface{}, error) { - in := new(UserRevokeRequest) + in := new(AuthUserRevokeRequest) if err := dec(in); err != nil { return nil, err } @@ -2670,7 +2670,7 @@ func _Auth_UserRevoke_Handler(srv interface{}, ctx context.Context, dec func(int } func _Auth_RoleAdd_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error) (interface{}, error) { - in := new(RoleAddRequest) + in := new(AuthRoleAddRequest) if err := dec(in); err != nil { return nil, err } @@ -2682,7 +2682,7 @@ func _Auth_RoleAdd_Handler(srv interface{}, ctx context.Context, dec func(interf } func _Auth_RoleGet_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error) (interface{}, error) { - in := new(RoleGetRequest) + in := new(AuthRoleGetRequest) if err := dec(in); err != nil { return nil, err } @@ -2694,7 +2694,7 @@ func _Auth_RoleGet_Handler(srv interface{}, ctx context.Context, dec func(interf } func _Auth_RoleDelete_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error) (interface{}, error) { - in := new(RoleDeleteRequest) + in := new(AuthRoleDeleteRequest) if err := dec(in); err != nil { return nil, err } @@ -2706,7 +2706,7 @@ func _Auth_RoleDelete_Handler(srv interface{}, ctx context.Context, dec func(int } func _Auth_RoleGrant_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error) (interface{}, error) { - in := new(RoleGrantRequest) + in := new(AuthRoleGrantRequest) if err := dec(in); err != nil { return nil, err } @@ -2718,7 +2718,7 @@ func _Auth_RoleGrant_Handler(srv interface{}, ctx context.Context, dec func(inte } func _Auth_RoleRevoke_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error) (interface{}, error) { - in := new(RoleRevokeRequest) + in := new(AuthRoleRevokeRequest) if err := dec(in); err != nil { return nil, err } @@ -4388,7 +4388,7 @@ func (m *AuthenticateRequest) MarshalTo(data []byte) (int, error) { return i, nil } -func (m *UserAddRequest) Marshal() (data []byte, err error) { +func (m *AuthUserAddRequest) Marshal() (data []byte, err error) { size := m.Size() data = make([]byte, size) n, err := m.MarshalTo(data) @@ -4398,7 +4398,7 @@ func (m *UserAddRequest) Marshal() (data []byte, err error) { return data[:n], nil } -func (m *UserAddRequest) MarshalTo(data []byte) (int, error) { +func (m *AuthUserAddRequest) MarshalTo(data []byte) (int, error) { var i int _ = i var l int @@ -4418,7 +4418,7 @@ func (m *UserAddRequest) MarshalTo(data []byte) (int, error) { return i, nil } -func (m *UserGetRequest) Marshal() (data []byte, err error) { +func (m *AuthUserGetRequest) Marshal() (data []byte, err error) { size := m.Size() data = make([]byte, size) n, err := m.MarshalTo(data) @@ -4428,7 +4428,7 @@ func (m *UserGetRequest) Marshal() (data []byte, err error) { return data[:n], nil } -func (m *UserGetRequest) MarshalTo(data []byte) (int, error) { +func (m *AuthUserGetRequest) MarshalTo(data []byte) (int, error) { var i int _ = i var l int @@ -4436,7 +4436,7 @@ func (m *UserGetRequest) MarshalTo(data []byte) (int, error) { return i, nil } -func (m *UserDeleteRequest) Marshal() (data []byte, err error) { +func (m *AuthUserDeleteRequest) Marshal() (data []byte, err error) { size := m.Size() data = make([]byte, size) n, err := m.MarshalTo(data) @@ -4446,7 +4446,7 @@ func (m *UserDeleteRequest) Marshal() (data []byte, err error) { return data[:n], nil } -func (m *UserDeleteRequest) MarshalTo(data []byte) (int, error) { +func (m *AuthUserDeleteRequest) MarshalTo(data []byte) (int, error) { var i int _ = i var l int @@ -4454,7 +4454,7 @@ func (m *UserDeleteRequest) MarshalTo(data []byte) (int, error) { return i, nil } -func (m *UserChangePasswordRequest) Marshal() (data []byte, err error) { +func (m *AuthUserChangePasswordRequest) Marshal() (data []byte, err error) { size := m.Size() data = make([]byte, size) n, err := m.MarshalTo(data) @@ -4464,7 +4464,7 @@ func (m *UserChangePasswordRequest) Marshal() (data []byte, err error) { return data[:n], nil } -func (m *UserChangePasswordRequest) MarshalTo(data []byte) (int, error) { +func (m *AuthUserChangePasswordRequest) MarshalTo(data []byte) (int, error) { var i int _ = i var l int @@ -4472,7 +4472,7 @@ func (m *UserChangePasswordRequest) MarshalTo(data []byte) (int, error) { return i, nil } -func (m *UserGrantRequest) Marshal() (data []byte, err error) { +func (m *AuthUserGrantRequest) Marshal() (data []byte, err error) { size := m.Size() data = make([]byte, size) n, err := m.MarshalTo(data) @@ -4482,7 +4482,7 @@ func (m *UserGrantRequest) Marshal() (data []byte, err error) { return data[:n], nil } -func (m *UserGrantRequest) MarshalTo(data []byte) (int, error) { +func (m *AuthUserGrantRequest) MarshalTo(data []byte) (int, error) { var i int _ = i var l int @@ -4490,7 +4490,7 @@ func (m *UserGrantRequest) MarshalTo(data []byte) (int, error) { return i, nil } -func (m *UserRevokeRequest) Marshal() (data []byte, err error) { +func (m *AuthUserRevokeRequest) Marshal() (data []byte, err error) { size := m.Size() data = make([]byte, size) n, err := m.MarshalTo(data) @@ -4500,7 +4500,7 @@ func (m *UserRevokeRequest) Marshal() (data []byte, err error) { return data[:n], nil } -func (m *UserRevokeRequest) MarshalTo(data []byte) (int, error) { +func (m *AuthUserRevokeRequest) MarshalTo(data []byte) (int, error) { var i int _ = i var l int @@ -4508,7 +4508,7 @@ func (m *UserRevokeRequest) MarshalTo(data []byte) (int, error) { return i, nil } -func (m *RoleAddRequest) Marshal() (data []byte, err error) { +func (m *AuthRoleAddRequest) Marshal() (data []byte, err error) { size := m.Size() data = make([]byte, size) n, err := m.MarshalTo(data) @@ -4518,7 +4518,7 @@ func (m *RoleAddRequest) Marshal() (data []byte, err error) { return data[:n], nil } -func (m *RoleAddRequest) MarshalTo(data []byte) (int, error) { +func (m *AuthRoleAddRequest) MarshalTo(data []byte) (int, error) { var i int _ = i var l int @@ -4526,7 +4526,7 @@ func (m *RoleAddRequest) MarshalTo(data []byte) (int, error) { return i, nil } -func (m *RoleGetRequest) Marshal() (data []byte, err error) { +func (m *AuthRoleGetRequest) Marshal() (data []byte, err error) { size := m.Size() data = make([]byte, size) n, err := m.MarshalTo(data) @@ -4536,7 +4536,7 @@ func (m *RoleGetRequest) Marshal() (data []byte, err error) { return data[:n], nil } -func (m *RoleGetRequest) MarshalTo(data []byte) (int, error) { +func (m *AuthRoleGetRequest) MarshalTo(data []byte) (int, error) { var i int _ = i var l int @@ -4544,7 +4544,7 @@ func (m *RoleGetRequest) MarshalTo(data []byte) (int, error) { return i, nil } -func (m *RoleDeleteRequest) Marshal() (data []byte, err error) { +func (m *AuthRoleDeleteRequest) Marshal() (data []byte, err error) { size := m.Size() data = make([]byte, size) n, err := m.MarshalTo(data) @@ -4554,7 +4554,7 @@ func (m *RoleDeleteRequest) Marshal() (data []byte, err error) { return data[:n], nil } -func (m *RoleDeleteRequest) MarshalTo(data []byte) (int, error) { +func (m *AuthRoleDeleteRequest) MarshalTo(data []byte) (int, error) { var i int _ = i var l int @@ -4562,7 +4562,7 @@ func (m *RoleDeleteRequest) MarshalTo(data []byte) (int, error) { return i, nil } -func (m *RoleGrantRequest) Marshal() (data []byte, err error) { +func (m *AuthRoleGrantRequest) Marshal() (data []byte, err error) { size := m.Size() data = make([]byte, size) n, err := m.MarshalTo(data) @@ -4572,7 +4572,7 @@ func (m *RoleGrantRequest) Marshal() (data []byte, err error) { return data[:n], nil } -func (m *RoleGrantRequest) MarshalTo(data []byte) (int, error) { +func (m *AuthRoleGrantRequest) MarshalTo(data []byte) (int, error) { var i int _ = i var l int @@ -4580,7 +4580,7 @@ func (m *RoleGrantRequest) MarshalTo(data []byte) (int, error) { return i, nil } -func (m *RoleRevokeRequest) Marshal() (data []byte, err error) { +func (m *AuthRoleRevokeRequest) Marshal() (data []byte, err error) { size := m.Size() data = make([]byte, size) n, err := m.MarshalTo(data) @@ -4590,7 +4590,7 @@ func (m *RoleRevokeRequest) Marshal() (data []byte, err error) { return data[:n], nil } -func (m *RoleRevokeRequest) MarshalTo(data []byte) (int, error) { +func (m *AuthRoleRevokeRequest) MarshalTo(data []byte) (int, error) { var i int _ = i var l int @@ -4682,7 +4682,7 @@ func (m *AuthenticateResponse) MarshalTo(data []byte) (int, error) { return i, nil } -func (m *UserAddResponse) Marshal() (data []byte, err error) { +func (m *AuthUserAddResponse) Marshal() (data []byte, err error) { size := m.Size() data = make([]byte, size) n, err := m.MarshalTo(data) @@ -4692,7 +4692,7 @@ func (m *UserAddResponse) Marshal() (data []byte, err error) { return data[:n], nil } -func (m *UserAddResponse) MarshalTo(data []byte) (int, error) { +func (m *AuthUserAddResponse) MarshalTo(data []byte) (int, error) { var i int _ = i var l int @@ -4710,7 +4710,7 @@ func (m *UserAddResponse) MarshalTo(data []byte) (int, error) { return i, nil } -func (m *UserGetResponse) Marshal() (data []byte, err error) { +func (m *AuthUserGetResponse) Marshal() (data []byte, err error) { size := m.Size() data = make([]byte, size) n, err := m.MarshalTo(data) @@ -4720,7 +4720,7 @@ func (m *UserGetResponse) Marshal() (data []byte, err error) { return data[:n], nil } -func (m *UserGetResponse) MarshalTo(data []byte) (int, error) { +func (m *AuthUserGetResponse) MarshalTo(data []byte) (int, error) { var i int _ = i var l int @@ -4738,7 +4738,7 @@ func (m *UserGetResponse) MarshalTo(data []byte) (int, error) { return i, nil } -func (m *UserDeleteResponse) Marshal() (data []byte, err error) { +func (m *AuthUserDeleteResponse) Marshal() (data []byte, err error) { size := m.Size() data = make([]byte, size) n, err := m.MarshalTo(data) @@ -4748,7 +4748,7 @@ func (m *UserDeleteResponse) Marshal() (data []byte, err error) { return data[:n], nil } -func (m *UserDeleteResponse) MarshalTo(data []byte) (int, error) { +func (m *AuthUserDeleteResponse) MarshalTo(data []byte) (int, error) { var i int _ = i var l int @@ -4766,7 +4766,7 @@ func (m *UserDeleteResponse) MarshalTo(data []byte) (int, error) { return i, nil } -func (m *UserChangePasswordResponse) Marshal() (data []byte, err error) { +func (m *AuthUserChangePasswordResponse) Marshal() (data []byte, err error) { size := m.Size() data = make([]byte, size) n, err := m.MarshalTo(data) @@ -4776,7 +4776,7 @@ func (m *UserChangePasswordResponse) Marshal() (data []byte, err error) { return data[:n], nil } -func (m *UserChangePasswordResponse) MarshalTo(data []byte) (int, error) { +func (m *AuthUserChangePasswordResponse) MarshalTo(data []byte) (int, error) { var i int _ = i var l int @@ -4794,7 +4794,7 @@ func (m *UserChangePasswordResponse) MarshalTo(data []byte) (int, error) { return i, nil } -func (m *UserGrantResponse) Marshal() (data []byte, err error) { +func (m *AuthUserGrantResponse) Marshal() (data []byte, err error) { size := m.Size() data = make([]byte, size) n, err := m.MarshalTo(data) @@ -4804,7 +4804,7 @@ func (m *UserGrantResponse) Marshal() (data []byte, err error) { return data[:n], nil } -func (m *UserGrantResponse) MarshalTo(data []byte) (int, error) { +func (m *AuthUserGrantResponse) MarshalTo(data []byte) (int, error) { var i int _ = i var l int @@ -4822,7 +4822,7 @@ func (m *UserGrantResponse) MarshalTo(data []byte) (int, error) { return i, nil } -func (m *UserRevokeResponse) Marshal() (data []byte, err error) { +func (m *AuthUserRevokeResponse) Marshal() (data []byte, err error) { size := m.Size() data = make([]byte, size) n, err := m.MarshalTo(data) @@ -4832,7 +4832,7 @@ func (m *UserRevokeResponse) Marshal() (data []byte, err error) { return data[:n], nil } -func (m *UserRevokeResponse) MarshalTo(data []byte) (int, error) { +func (m *AuthUserRevokeResponse) MarshalTo(data []byte) (int, error) { var i int _ = i var l int @@ -4850,7 +4850,7 @@ func (m *UserRevokeResponse) MarshalTo(data []byte) (int, error) { return i, nil } -func (m *RoleAddResponse) Marshal() (data []byte, err error) { +func (m *AuthRoleAddResponse) Marshal() (data []byte, err error) { size := m.Size() data = make([]byte, size) n, err := m.MarshalTo(data) @@ -4860,7 +4860,7 @@ func (m *RoleAddResponse) Marshal() (data []byte, err error) { return data[:n], nil } -func (m *RoleAddResponse) MarshalTo(data []byte) (int, error) { +func (m *AuthRoleAddResponse) MarshalTo(data []byte) (int, error) { var i int _ = i var l int @@ -4878,7 +4878,7 @@ func (m *RoleAddResponse) MarshalTo(data []byte) (int, error) { return i, nil } -func (m *RoleGetResponse) Marshal() (data []byte, err error) { +func (m *AuthRoleGetResponse) Marshal() (data []byte, err error) { size := m.Size() data = make([]byte, size) n, err := m.MarshalTo(data) @@ -4888,7 +4888,7 @@ func (m *RoleGetResponse) Marshal() (data []byte, err error) { return data[:n], nil } -func (m *RoleGetResponse) MarshalTo(data []byte) (int, error) { +func (m *AuthRoleGetResponse) MarshalTo(data []byte) (int, error) { var i int _ = i var l int @@ -4906,7 +4906,7 @@ func (m *RoleGetResponse) MarshalTo(data []byte) (int, error) { return i, nil } -func (m *RoleDeleteResponse) Marshal() (data []byte, err error) { +func (m *AuthRoleDeleteResponse) Marshal() (data []byte, err error) { size := m.Size() data = make([]byte, size) n, err := m.MarshalTo(data) @@ -4916,7 +4916,7 @@ func (m *RoleDeleteResponse) Marshal() (data []byte, err error) { return data[:n], nil } -func (m *RoleDeleteResponse) MarshalTo(data []byte) (int, error) { +func (m *AuthRoleDeleteResponse) MarshalTo(data []byte) (int, error) { var i int _ = i var l int @@ -4934,7 +4934,7 @@ func (m *RoleDeleteResponse) MarshalTo(data []byte) (int, error) { return i, nil } -func (m *RoleGrantResponse) Marshal() (data []byte, err error) { +func (m *AuthRoleGrantResponse) Marshal() (data []byte, err error) { size := m.Size() data = make([]byte, size) n, err := m.MarshalTo(data) @@ -4944,7 +4944,7 @@ func (m *RoleGrantResponse) Marshal() (data []byte, err error) { return data[:n], nil } -func (m *RoleGrantResponse) MarshalTo(data []byte) (int, error) { +func (m *AuthRoleGrantResponse) MarshalTo(data []byte) (int, error) { var i int _ = i var l int @@ -4962,7 +4962,7 @@ func (m *RoleGrantResponse) MarshalTo(data []byte) (int, error) { return i, nil } -func (m *RoleRevokeResponse) Marshal() (data []byte, err error) { +func (m *AuthRoleRevokeResponse) Marshal() (data []byte, err error) { size := m.Size() data = make([]byte, size) n, err := m.MarshalTo(data) @@ -4972,7 +4972,7 @@ func (m *RoleRevokeResponse) Marshal() (data []byte, err error) { return data[:n], nil } -func (m *RoleRevokeResponse) MarshalTo(data []byte) (int, error) { +func (m *AuthRoleRevokeResponse) MarshalTo(data []byte) (int, error) { var i int _ = i var l int @@ -5711,7 +5711,7 @@ func (m *AuthenticateRequest) Size() (n int) { return n } -func (m *UserAddRequest) Size() (n int) { +func (m *AuthUserAddRequest) Size() (n int) { var l int _ = l l = len(m.Name) @@ -5725,61 +5725,61 @@ func (m *UserAddRequest) Size() (n int) { return n } -func (m *UserGetRequest) Size() (n int) { +func (m *AuthUserGetRequest) Size() (n int) { var l int _ = l return n } -func (m *UserDeleteRequest) Size() (n int) { +func (m *AuthUserDeleteRequest) Size() (n int) { var l int _ = l return n } -func (m *UserChangePasswordRequest) Size() (n int) { +func (m *AuthUserChangePasswordRequest) Size() (n int) { var l int _ = l return n } -func (m *UserGrantRequest) Size() (n int) { +func (m *AuthUserGrantRequest) Size() (n int) { var l int _ = l return n } -func (m *UserRevokeRequest) Size() (n int) { +func (m *AuthUserRevokeRequest) Size() (n int) { var l int _ = l return n } -func (m *RoleAddRequest) Size() (n int) { +func (m *AuthRoleAddRequest) Size() (n int) { var l int _ = l return n } -func (m *RoleGetRequest) Size() (n int) { +func (m *AuthRoleGetRequest) Size() (n int) { var l int _ = l return n } -func (m *RoleDeleteRequest) Size() (n int) { +func (m *AuthRoleDeleteRequest) Size() (n int) { var l int _ = l return n } -func (m *RoleGrantRequest) Size() (n int) { +func (m *AuthRoleGrantRequest) Size() (n int) { var l int _ = l return n } -func (m *RoleRevokeRequest) Size() (n int) { +func (m *AuthRoleRevokeRequest) Size() (n int) { var l int _ = l return n @@ -5815,7 +5815,7 @@ func (m *AuthenticateResponse) Size() (n int) { return n } -func (m *UserAddResponse) Size() (n int) { +func (m *AuthUserAddResponse) Size() (n int) { var l int _ = l if m.Header != nil { @@ -5825,7 +5825,7 @@ func (m *UserAddResponse) Size() (n int) { return n } -func (m *UserGetResponse) Size() (n int) { +func (m *AuthUserGetResponse) Size() (n int) { var l int _ = l if m.Header != nil { @@ -5835,7 +5835,7 @@ func (m *UserGetResponse) Size() (n int) { return n } -func (m *UserDeleteResponse) Size() (n int) { +func (m *AuthUserDeleteResponse) Size() (n int) { var l int _ = l if m.Header != nil { @@ -5845,7 +5845,7 @@ func (m *UserDeleteResponse) Size() (n int) { return n } -func (m *UserChangePasswordResponse) Size() (n int) { +func (m *AuthUserChangePasswordResponse) Size() (n int) { var l int _ = l if m.Header != nil { @@ -5855,7 +5855,7 @@ func (m *UserChangePasswordResponse) Size() (n int) { return n } -func (m *UserGrantResponse) Size() (n int) { +func (m *AuthUserGrantResponse) Size() (n int) { var l int _ = l if m.Header != nil { @@ -5865,7 +5865,7 @@ func (m *UserGrantResponse) Size() (n int) { return n } -func (m *UserRevokeResponse) Size() (n int) { +func (m *AuthUserRevokeResponse) Size() (n int) { var l int _ = l if m.Header != nil { @@ -5875,7 +5875,7 @@ func (m *UserRevokeResponse) Size() (n int) { return n } -func (m *RoleAddResponse) Size() (n int) { +func (m *AuthRoleAddResponse) Size() (n int) { var l int _ = l if m.Header != nil { @@ -5885,7 +5885,7 @@ func (m *RoleAddResponse) Size() (n int) { return n } -func (m *RoleGetResponse) Size() (n int) { +func (m *AuthRoleGetResponse) Size() (n int) { var l int _ = l if m.Header != nil { @@ -5895,7 +5895,7 @@ func (m *RoleGetResponse) Size() (n int) { return n } -func (m *RoleDeleteResponse) Size() (n int) { +func (m *AuthRoleDeleteResponse) Size() (n int) { var l int _ = l if m.Header != nil { @@ -5905,7 +5905,7 @@ func (m *RoleDeleteResponse) Size() (n int) { return n } -func (m *RoleGrantResponse) Size() (n int) { +func (m *AuthRoleGrantResponse) Size() (n int) { var l int _ = l if m.Header != nil { @@ -5915,7 +5915,7 @@ func (m *RoleGrantResponse) Size() (n int) { return n } -func (m *RoleRevokeResponse) Size() (n int) { +func (m *AuthRoleRevokeResponse) Size() (n int) { var l int _ = l if m.Header != nil { @@ -10482,7 +10482,7 @@ func (m *AuthenticateRequest) Unmarshal(data []byte) error { } return nil } -func (m *UserAddRequest) Unmarshal(data []byte) error { +func (m *AuthUserAddRequest) Unmarshal(data []byte) error { l := len(data) iNdEx := 0 for iNdEx < l { @@ -10505,10 +10505,10 @@ func (m *UserAddRequest) Unmarshal(data []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: UserAddRequest: wiretype end group for non-group") + return fmt.Errorf("proto: AuthUserAddRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: UserAddRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: AuthUserAddRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -10590,7 +10590,7 @@ func (m *UserAddRequest) Unmarshal(data []byte) error { } return nil } -func (m *UserGetRequest) Unmarshal(data []byte) error { +func (m *AuthUserGetRequest) Unmarshal(data []byte) error { l := len(data) iNdEx := 0 for iNdEx < l { @@ -10613,10 +10613,10 @@ func (m *UserGetRequest) Unmarshal(data []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: UserGetRequest: wiretype end group for non-group") + return fmt.Errorf("proto: AuthUserGetRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: UserGetRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: AuthUserGetRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { default: @@ -10640,7 +10640,7 @@ func (m *UserGetRequest) Unmarshal(data []byte) error { } return nil } -func (m *UserDeleteRequest) Unmarshal(data []byte) error { +func (m *AuthUserDeleteRequest) Unmarshal(data []byte) error { l := len(data) iNdEx := 0 for iNdEx < l { @@ -10663,10 +10663,10 @@ func (m *UserDeleteRequest) Unmarshal(data []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: UserDeleteRequest: wiretype end group for non-group") + return fmt.Errorf("proto: AuthUserDeleteRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: UserDeleteRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: AuthUserDeleteRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { default: @@ -10690,7 +10690,7 @@ func (m *UserDeleteRequest) Unmarshal(data []byte) error { } return nil } -func (m *UserChangePasswordRequest) Unmarshal(data []byte) error { +func (m *AuthUserChangePasswordRequest) Unmarshal(data []byte) error { l := len(data) iNdEx := 0 for iNdEx < l { @@ -10713,10 +10713,10 @@ func (m *UserChangePasswordRequest) Unmarshal(data []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: UserChangePasswordRequest: wiretype end group for non-group") + return fmt.Errorf("proto: AuthUserChangePasswordRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: UserChangePasswordRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: AuthUserChangePasswordRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { default: @@ -10740,7 +10740,7 @@ func (m *UserChangePasswordRequest) Unmarshal(data []byte) error { } return nil } -func (m *UserGrantRequest) Unmarshal(data []byte) error { +func (m *AuthUserGrantRequest) Unmarshal(data []byte) error { l := len(data) iNdEx := 0 for iNdEx < l { @@ -10763,10 +10763,10 @@ func (m *UserGrantRequest) Unmarshal(data []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: UserGrantRequest: wiretype end group for non-group") + return fmt.Errorf("proto: AuthUserGrantRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: UserGrantRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: AuthUserGrantRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { default: @@ -10790,7 +10790,7 @@ func (m *UserGrantRequest) Unmarshal(data []byte) error { } return nil } -func (m *UserRevokeRequest) Unmarshal(data []byte) error { +func (m *AuthUserRevokeRequest) Unmarshal(data []byte) error { l := len(data) iNdEx := 0 for iNdEx < l { @@ -10813,10 +10813,10 @@ func (m *UserRevokeRequest) Unmarshal(data []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: UserRevokeRequest: wiretype end group for non-group") + return fmt.Errorf("proto: AuthUserRevokeRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: UserRevokeRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: AuthUserRevokeRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { default: @@ -10840,7 +10840,7 @@ func (m *UserRevokeRequest) Unmarshal(data []byte) error { } return nil } -func (m *RoleAddRequest) Unmarshal(data []byte) error { +func (m *AuthRoleAddRequest) Unmarshal(data []byte) error { l := len(data) iNdEx := 0 for iNdEx < l { @@ -10863,10 +10863,10 @@ func (m *RoleAddRequest) Unmarshal(data []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: RoleAddRequest: wiretype end group for non-group") + return fmt.Errorf("proto: AuthRoleAddRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: RoleAddRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: AuthRoleAddRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { default: @@ -10890,7 +10890,7 @@ func (m *RoleAddRequest) Unmarshal(data []byte) error { } return nil } -func (m *RoleGetRequest) Unmarshal(data []byte) error { +func (m *AuthRoleGetRequest) Unmarshal(data []byte) error { l := len(data) iNdEx := 0 for iNdEx < l { @@ -10913,10 +10913,10 @@ func (m *RoleGetRequest) Unmarshal(data []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: RoleGetRequest: wiretype end group for non-group") + return fmt.Errorf("proto: AuthRoleGetRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: RoleGetRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: AuthRoleGetRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { default: @@ -10940,7 +10940,7 @@ func (m *RoleGetRequest) Unmarshal(data []byte) error { } return nil } -func (m *RoleDeleteRequest) Unmarshal(data []byte) error { +func (m *AuthRoleDeleteRequest) Unmarshal(data []byte) error { l := len(data) iNdEx := 0 for iNdEx < l { @@ -10963,10 +10963,10 @@ func (m *RoleDeleteRequest) Unmarshal(data []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: RoleDeleteRequest: wiretype end group for non-group") + return fmt.Errorf("proto: AuthRoleDeleteRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: RoleDeleteRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: AuthRoleDeleteRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { default: @@ -10990,7 +10990,7 @@ func (m *RoleDeleteRequest) Unmarshal(data []byte) error { } return nil } -func (m *RoleGrantRequest) Unmarshal(data []byte) error { +func (m *AuthRoleGrantRequest) Unmarshal(data []byte) error { l := len(data) iNdEx := 0 for iNdEx < l { @@ -11013,10 +11013,10 @@ func (m *RoleGrantRequest) Unmarshal(data []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: RoleGrantRequest: wiretype end group for non-group") + return fmt.Errorf("proto: AuthRoleGrantRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: RoleGrantRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: AuthRoleGrantRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { default: @@ -11040,7 +11040,7 @@ func (m *RoleGrantRequest) Unmarshal(data []byte) error { } return nil } -func (m *RoleRevokeRequest) Unmarshal(data []byte) error { +func (m *AuthRoleRevokeRequest) Unmarshal(data []byte) error { l := len(data) iNdEx := 0 for iNdEx < l { @@ -11063,10 +11063,10 @@ func (m *RoleRevokeRequest) Unmarshal(data []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: RoleRevokeRequest: wiretype end group for non-group") + return fmt.Errorf("proto: AuthRoleRevokeRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: RoleRevokeRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: AuthRoleRevokeRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { default: @@ -11339,7 +11339,7 @@ func (m *AuthenticateResponse) Unmarshal(data []byte) error { } return nil } -func (m *UserAddResponse) Unmarshal(data []byte) error { +func (m *AuthUserAddResponse) Unmarshal(data []byte) error { l := len(data) iNdEx := 0 for iNdEx < l { @@ -11362,10 +11362,10 @@ func (m *UserAddResponse) Unmarshal(data []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: UserAddResponse: wiretype end group for non-group") + return fmt.Errorf("proto: AuthUserAddResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: UserAddResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: AuthUserAddResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -11422,7 +11422,7 @@ func (m *UserAddResponse) Unmarshal(data []byte) error { } return nil } -func (m *UserGetResponse) Unmarshal(data []byte) error { +func (m *AuthUserGetResponse) Unmarshal(data []byte) error { l := len(data) iNdEx := 0 for iNdEx < l { @@ -11445,10 +11445,10 @@ func (m *UserGetResponse) Unmarshal(data []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: UserGetResponse: wiretype end group for non-group") + return fmt.Errorf("proto: AuthUserGetResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: UserGetResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: AuthUserGetResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -11505,7 +11505,7 @@ func (m *UserGetResponse) Unmarshal(data []byte) error { } return nil } -func (m *UserDeleteResponse) Unmarshal(data []byte) error { +func (m *AuthUserDeleteResponse) Unmarshal(data []byte) error { l := len(data) iNdEx := 0 for iNdEx < l { @@ -11528,10 +11528,10 @@ func (m *UserDeleteResponse) Unmarshal(data []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: UserDeleteResponse: wiretype end group for non-group") + return fmt.Errorf("proto: AuthUserDeleteResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: UserDeleteResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: AuthUserDeleteResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -11588,7 +11588,7 @@ func (m *UserDeleteResponse) Unmarshal(data []byte) error { } return nil } -func (m *UserChangePasswordResponse) Unmarshal(data []byte) error { +func (m *AuthUserChangePasswordResponse) Unmarshal(data []byte) error { l := len(data) iNdEx := 0 for iNdEx < l { @@ -11611,10 +11611,10 @@ func (m *UserChangePasswordResponse) Unmarshal(data []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: UserChangePasswordResponse: wiretype end group for non-group") + return fmt.Errorf("proto: AuthUserChangePasswordResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: UserChangePasswordResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: AuthUserChangePasswordResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -11671,7 +11671,7 @@ func (m *UserChangePasswordResponse) Unmarshal(data []byte) error { } return nil } -func (m *UserGrantResponse) Unmarshal(data []byte) error { +func (m *AuthUserGrantResponse) Unmarshal(data []byte) error { l := len(data) iNdEx := 0 for iNdEx < l { @@ -11694,10 +11694,10 @@ func (m *UserGrantResponse) Unmarshal(data []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: UserGrantResponse: wiretype end group for non-group") + return fmt.Errorf("proto: AuthUserGrantResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: UserGrantResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: AuthUserGrantResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -11754,7 +11754,7 @@ func (m *UserGrantResponse) Unmarshal(data []byte) error { } return nil } -func (m *UserRevokeResponse) Unmarshal(data []byte) error { +func (m *AuthUserRevokeResponse) Unmarshal(data []byte) error { l := len(data) iNdEx := 0 for iNdEx < l { @@ -11777,10 +11777,10 @@ func (m *UserRevokeResponse) Unmarshal(data []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: UserRevokeResponse: wiretype end group for non-group") + return fmt.Errorf("proto: AuthUserRevokeResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: UserRevokeResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: AuthUserRevokeResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -11837,7 +11837,7 @@ func (m *UserRevokeResponse) Unmarshal(data []byte) error { } return nil } -func (m *RoleAddResponse) Unmarshal(data []byte) error { +func (m *AuthRoleAddResponse) Unmarshal(data []byte) error { l := len(data) iNdEx := 0 for iNdEx < l { @@ -11860,10 +11860,10 @@ func (m *RoleAddResponse) Unmarshal(data []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: RoleAddResponse: wiretype end group for non-group") + return fmt.Errorf("proto: AuthRoleAddResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: RoleAddResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: AuthRoleAddResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -11920,7 +11920,7 @@ func (m *RoleAddResponse) Unmarshal(data []byte) error { } return nil } -func (m *RoleGetResponse) Unmarshal(data []byte) error { +func (m *AuthRoleGetResponse) Unmarshal(data []byte) error { l := len(data) iNdEx := 0 for iNdEx < l { @@ -11943,10 +11943,10 @@ func (m *RoleGetResponse) Unmarshal(data []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: RoleGetResponse: wiretype end group for non-group") + return fmt.Errorf("proto: AuthRoleGetResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: RoleGetResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: AuthRoleGetResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -12003,7 +12003,7 @@ func (m *RoleGetResponse) Unmarshal(data []byte) error { } return nil } -func (m *RoleDeleteResponse) Unmarshal(data []byte) error { +func (m *AuthRoleDeleteResponse) Unmarshal(data []byte) error { l := len(data) iNdEx := 0 for iNdEx < l { @@ -12026,10 +12026,10 @@ func (m *RoleDeleteResponse) Unmarshal(data []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: RoleDeleteResponse: wiretype end group for non-group") + return fmt.Errorf("proto: AuthRoleDeleteResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: RoleDeleteResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: AuthRoleDeleteResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -12086,7 +12086,7 @@ func (m *RoleDeleteResponse) Unmarshal(data []byte) error { } return nil } -func (m *RoleGrantResponse) Unmarshal(data []byte) error { +func (m *AuthRoleGrantResponse) Unmarshal(data []byte) error { l := len(data) iNdEx := 0 for iNdEx < l { @@ -12109,10 +12109,10 @@ func (m *RoleGrantResponse) Unmarshal(data []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: RoleGrantResponse: wiretype end group for non-group") + return fmt.Errorf("proto: AuthRoleGrantResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: RoleGrantResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: AuthRoleGrantResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -12169,7 +12169,7 @@ func (m *RoleGrantResponse) Unmarshal(data []byte) error { } return nil } -func (m *RoleRevokeResponse) Unmarshal(data []byte) error { +func (m *AuthRoleRevokeResponse) Unmarshal(data []byte) error { l := len(data) iNdEx := 0 for iNdEx < l { @@ -12192,10 +12192,10 @@ func (m *RoleRevokeResponse) Unmarshal(data []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: RoleRevokeResponse: wiretype end group for non-group") + return fmt.Errorf("proto: AuthRoleRevokeResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: RoleRevokeResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: AuthRoleRevokeResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: diff --git a/etcdserver/etcdserverpb/rpc.proto b/etcdserver/etcdserverpb/rpc.proto index aa0d01d5f..bd5ad7fe5 100644 --- a/etcdserver/etcdserverpb/rpc.proto +++ b/etcdserver/etcdserverpb/rpc.proto @@ -94,37 +94,37 @@ service Auth { rpc Authenticate(AuthenticateRequest) returns (AuthenticateResponse) {} // UserAdd adds a new user. - rpc UserAdd(UserAddRequest) returns (UserAddResponse) {} + rpc UserAdd(AuthUserAddRequest) returns (AuthUserAddResponse) {} // UserGet gets a detailed information of a user or lists entire users. - rpc UserGet(UserGetRequest) returns (UserGetResponse) {} + rpc UserGet(AuthUserGetRequest) returns (AuthUserGetResponse) {} // UserDelete deletes a specified user. - rpc UserDelete(UserDeleteRequest) returns (UserDeleteResponse) {} + rpc UserDelete(AuthUserDeleteRequest) returns (AuthUserDeleteResponse) {} // UserChangePassword changes password of a specified user. - rpc UserChangePassword(UserChangePasswordRequest) returns (UserChangePasswordResponse) {} + rpc UserChangePassword(AuthUserChangePasswordRequest) returns (AuthUserChangePasswordResponse) {} // UserGrant grants a role to a specified user. - rpc UserGrant(UserGrantRequest) returns (UserGrantResponse) {} + rpc UserGrant(AuthUserGrantRequest) returns (AuthUserGrantResponse) {} // UserRevoke revokes a role of specified user. - rpc UserRevoke(UserRevokeRequest) returns (UserRevokeResponse) {} + rpc UserRevoke(AuthUserRevokeRequest) returns (AuthUserRevokeResponse) {} // RoleAdd adds a new role. - rpc RoleAdd(RoleAddRequest) returns (RoleAddResponse) {} + rpc RoleAdd(AuthRoleAddRequest) returns (AuthRoleAddResponse) {} // RoleGet gets a detailed information of a role or lists entire roles. - rpc RoleGet(RoleGetRequest) returns (RoleGetResponse) {} + rpc RoleGet(AuthRoleGetRequest) returns (AuthRoleGetResponse) {} // RoleDelete deletes a specified role. - rpc RoleDelete(RoleDeleteRequest) returns (RoleDeleteResponse) {} + rpc RoleDelete(AuthRoleDeleteRequest) returns (AuthRoleDeleteResponse) {} // RoleGrant grants a permission of a specified key or range to a specified role. - rpc RoleGrant(RoleGrantRequest) returns (RoleGrantResponse) {} + rpc RoleGrant(AuthRoleGrantRequest) returns (AuthRoleGrantResponse) {} // RoleRevoke revokes a key or range permission of a specified role. - rpc RoleRevoke(RoleRevokeRequest) returns (RoleRevokeResponse) {} + rpc RoleRevoke(AuthRoleRevokeRequest) returns (AuthRoleRevokeResponse) {} } message ResponseHeader { @@ -476,39 +476,39 @@ message AuthDisableRequest { message AuthenticateRequest { } -message UserAddRequest { +message AuthUserAddRequest { string name = 1; string password = 2; } -message UserGetRequest { +message AuthUserGetRequest { } -message UserDeleteRequest { +message AuthUserDeleteRequest { } -message UserChangePasswordRequest { +message AuthUserChangePasswordRequest { } -message UserGrantRequest { +message AuthUserGrantRequest { } -message UserRevokeRequest { +message AuthUserRevokeRequest { } -message RoleAddRequest { +message AuthRoleAddRequest { } -message RoleGetRequest { +message AuthRoleGetRequest { } -message RoleDeleteRequest { +message AuthRoleDeleteRequest { } -message RoleGrantRequest { +message AuthRoleGrantRequest { } -message RoleRevokeRequest { +message AuthRoleRevokeRequest { } message AuthEnableResponse { @@ -523,46 +523,46 @@ message AuthenticateResponse { ResponseHeader header = 1; } -message UserAddResponse { +message AuthUserAddResponse { ResponseHeader header = 1; } -message UserGetResponse { +message AuthUserGetResponse { ResponseHeader header = 1; } -message UserDeleteResponse { +message AuthUserDeleteResponse { ResponseHeader header = 1; } -message UserChangePasswordResponse { +message AuthUserChangePasswordResponse { ResponseHeader header = 1; } -message UserGrantResponse { +message AuthUserGrantResponse { ResponseHeader header = 1; } -message UserRevokeResponse { +message AuthUserRevokeResponse { ResponseHeader header = 1; } -message RoleAddResponse { +message AuthRoleAddResponse { ResponseHeader header = 1; } -message RoleGetResponse { +message AuthRoleGetResponse { ResponseHeader header = 1; } -message RoleDeleteResponse { +message AuthRoleDeleteResponse { ResponseHeader header = 1; } -message RoleGrantResponse { +message AuthRoleGrantResponse { ResponseHeader header = 1; } -message RoleRevokeResponse { +message AuthRoleRevokeResponse { ResponseHeader header = 1; } diff --git a/etcdserver/v3demo_server.go b/etcdserver/v3demo_server.go index 95509a99d..0d4da0149 100644 --- a/etcdserver/v3demo_server.go +++ b/etcdserver/v3demo_server.go @@ -53,7 +53,7 @@ type Lessor interface { type Authenticator interface { AuthEnable(ctx context.Context, r *pb.AuthEnableRequest) (*pb.AuthEnableResponse, error) - UserAdd(ctx context.Context, r *pb.UserAddRequest) (*pb.UserAddResponse, error) + UserAdd(ctx context.Context, r *pb.AuthUserAddRequest) (*pb.AuthUserAddResponse, error) } func (s *EtcdServer) Range(ctx context.Context, r *pb.RangeRequest) (*pb.RangeResponse, error) { @@ -180,12 +180,12 @@ func (s *EtcdServer) AuthEnable(ctx context.Context, r *pb.AuthEnableRequest) (* return result.resp.(*pb.AuthEnableResponse), result.err } -func (s *EtcdServer) UserAdd(ctx context.Context, r *pb.UserAddRequest) (*pb.UserAddResponse, error) { - result, err := s.processInternalRaftRequest(ctx, pb.InternalRaftRequest{UserAdd: r}) +func (s *EtcdServer) UserAdd(ctx context.Context, r *pb.AuthUserAddRequest) (*pb.AuthUserAddResponse, error) { + result, err := s.processInternalRaftRequest(ctx, pb.InternalRaftRequest{AuthUserAdd: r}) if err != nil { return nil, err } - return result.resp.(*pb.UserAddResponse), result.err + return result.resp.(*pb.AuthUserAddResponse), result.err } func (s *EtcdServer) processInternalRaftRequest(ctx context.Context, r pb.InternalRaftRequest) (*applyResult, error) {