luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

clarify the ACL.PolicyDelete endpoint (#5337) 

There was an errant early-return in PolicyDelete() that bypassed the
rest of the function.  This was ok because the only caller of this
function ignores the results.

This removes the early-return making it structurally behave like
TokenDelete() and for both PolicyDelete and TokenDelete clarify the lone
callers to indicate that the return values are ignored.

We may wish to avoid the entire return value as well, but this patch
doesn't go that far.
This commit is contained in:
R.B. Boyer 2019-02-13 09:16:30 -06:00 committed by GitHub
parent 09b9f03969
commit 77d28fe9ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
agent/acl_endpoint.go
View File

@ -328,8 +328,8 @@ func (s *HTTPServer) ACLPolicyDelete(resp http.ResponseWriter, req *http.Request
} }
s.parseToken(req, &args.Token) s.parseToken(req, &args.Token)
var out string var ignored string
if err := s.agent.RPC("ACL.PolicyDelete", args, &out); err != nil { if err := s.agent.RPC("ACL.PolicyDelete", args, &ignored); err != nil {
return nil, err return nil, err
} }
@ -497,8 +497,8 @@ func (s *HTTPServer) ACLTokenDelete(resp http.ResponseWriter, req *http.Request,
} }
s.parseToken(req, &args.Token) s.parseToken(req, &args.Token)
var out string var ignored string
if err := s.agent.RPC("ACL.TokenDelete", args, &out); err != nil { if err := s.agent.RPC("ACL.TokenDelete", args, &ignored); err != nil {
return nil, err return nil, err
} }
return true, nil return true, nil

4
agent/consul/acl_endpoint.go
View File

@ -811,10 +811,6 @@ func (a *ACL) PolicyDelete(args *structs.ACLPolicyDeleteRequest, reply *string)
a.srv.acls.cache.RemovePolicy(policy.ID) a.srv.acls.cache.RemovePolicy(policy.ID)
if resp == nil {
return nil
}
if respErr, ok := resp.(error); ok { if respErr, ok := resp.(error); ok {
return respErr return respErr
} }