etcdserver/v2auth: remove unused parameters

Signed-off-by: Gyuho Lee <gyuhox@gmail.com>

etcdserver/v2auth/auth.go

@@ -171,7 +171,7 @@ func (_ passwordStore) HashPassword(password string) (string, error) {
 }
 
 func (s *store) AllUsers() ([]string, error) {
-	resp, err := s.requestResource("/users/", false, false)
+	resp, err := s.requestResource("/users/", false)
 	if err != nil {
 		if e, ok := err.(*v2error.Error); ok {
 			if e.ErrorCode == v2error.EcodeKeyNotFound {
@@ -245,7 +245,7 @@ func (s *store) DeleteUser(name string) error {
 	if s.AuthEnabled() && name == "root" {
 		return authErr(http.StatusForbidden, "Cannot delete root user while auth is enabled.")
 	}
-	_, err := s.deleteResource("/users/" + name)
+	err := s.deleteResource("/users/" + name)
 	if err != nil {
 		if e, ok := err.(*v2error.Error); ok {
 			if e.ErrorCode == v2error.EcodeKeyNotFound {
@@ -293,7 +293,7 @@ func (s *store) UpdateUser(user User) (User, error) {
 
 func (s *store) AllRoles() ([]string, error) {
 	nodes := []string{RootRoleName}
-	resp, err := s.requestResource("/roles/", false, false)
+	resp, err := s.requestResource("/roles/", false)
 	if err != nil {
 		if e, ok := err.(*v2error.Error); ok {
 			if e.ErrorCode == v2error.EcodeKeyNotFound {
@@ -338,7 +338,7 @@ func (s *store) DeleteRole(name string) error {
 	if name == RootRoleName {
 		return authErr(http.StatusForbidden, "Cannot modify role %s: is root role.", name)
 	}
-	_, err := s.deleteResource("/roles/" + name)
+	err := s.deleteResource("/roles/" + name)
 	if err != nil {
 		if e, ok := err.(*v2error.Error); ok {
 			if e.ErrorCode == v2error.EcodeKeyNotFound {
@@ -696,7 +696,7 @@ func attachRootRole(u User) User {
 }
 
 func (s *store) getUser(name string, quorum bool) (User, error) {
-	resp, err := s.requestResource("/users/"+name, false, quorum)
+	resp, err := s.requestResource("/users/"+name, quorum)
 	if err != nil {
 		if e, ok := err.(*v2error.Error); ok {
 			if e.ErrorCode == v2error.EcodeKeyNotFound {
@@ -721,7 +721,7 @@ func (s *store) getRole(name string, quorum bool) (Role, error) {
 	if name == RootRoleName {
 		return rootRole, nil
 	}
-	resp, err := s.requestResource("/roles/"+name, false, quorum)
+	resp, err := s.requestResource("/roles/"+name, quorum)
 	if err != nil {
 		if e, ok := err.(*v2error.Error); ok {
 			if e.ErrorCode == v2error.EcodeKeyNotFound {

etcdserver/v2auth/auth_requests.go

@@ -94,7 +94,7 @@ func (s *store) detectAuth() bool {
 	if s.server == nil {
 		return false
 	}
-	value, err := s.requestResource("/enabled", false, false)
+	value, err := s.requestResource("/enabled", false)
 	if err != nil {
 		if e, ok := err.(*v2error.Error); ok {
 			if e.ErrorCode == v2error.EcodeKeyNotFound {
@@ -128,7 +128,7 @@ func (s *store) detectAuth() bool {
 	return u
 }
 
-func (s *store) requestResource(res string, dir, quorum bool) (etcdserver.Response, error) {
+func (s *store) requestResource(res string, quorum bool) (etcdserver.Response, error) {
 	ctx, cancel := context.WithTimeout(context.Background(), s.timeout)
 	defer cancel()
 	p := path.Join(StorePermsPrefix, res)
@@ -139,7 +139,7 @@ func (s *store) requestResource(res string, dir, quorum bool) (etcdserver.Respon
 	rr := etcdserverpb.Request{
 		Method: method,
 		Path:   p,
-		Dir:    dir,
+		Dir:    false, // TODO: always false?
 	}
 	return s.server.Do(ctx, rr)
 }
@@ -171,19 +171,19 @@ func (s *store) setResource(res string, value interface{}, prevexist bool) (etcd
 	return s.server.Do(ctx, rr)
 }
 
-func (s *store) deleteResource(res string) (etcdserver.Response, error) {
+func (s *store) deleteResource(res string) error {
 	err := s.ensureAuthDirectories()
 	if err != nil {
-		return etcdserver.Response{}, err
+		return err
 	}
 	ctx, cancel := context.WithTimeout(context.Background(), s.timeout)
 	defer cancel()
 	pex := true
 	p := path.Join(StorePermsPrefix, res)
-	rr := etcdserverpb.Request{
+	_, err = s.server.Do(ctx, etcdserverpb.Request{
 		Method:    "DELETE",
 		Path:      p,
 		PrevExist: &pex,
-	}
-	return s.server.Do(ctx, rr)
+	})
+	return err
 }