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

Small refactoring to move meta parsing into the switch statement (#7170)

Browse source
This commit is contained in:
Matt Keeler 2020-01-29 19:12:48 -05:00 committed by GitHub
parent 25568626f7
commit 78ad3428c4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
agent/config_endpoint.go
View file

@ -32,16 +32,11 @@ func (s *HTTPServer) configGet(resp http.ResponseWriter, req *http.Request) (int
} }
pathArgs := strings.SplitN(strings.TrimPrefix(req.URL.Path, "/v1/config/"), "/", 2) pathArgs := strings.SplitN(strings.TrimPrefix(req.URL.Path, "/v1/config/"), "/", 2)
if len(pathArgs) == 2 { switch len(pathArgs) {
case 2:
if err := s.parseEntMetaNoWildcard(req, &args.EnterpriseMeta); err != nil { if err := s.parseEntMetaNoWildcard(req, &args.EnterpriseMeta); err != nil {
return nil, err return nil, err
} }
} else if err := s.parseEntMeta(req, &args.EnterpriseMeta); err != nil {
return nil, err
}
switch len(pathArgs) {
case 2:
// Both kind/name provided. // Both kind/name provided.
args.Kind = pathArgs[0] args.Kind = pathArgs[0]
args.Name = pathArgs[1] args.Name = pathArgs[1]
@ -58,6 +53,9 @@ func (s *HTTPServer) configGet(resp http.ResponseWriter, req *http.Request) (int
return reply.Entry, nil return reply.Entry, nil
case 1: case 1:
if err := s.parseEntMeta(req, &args.EnterpriseMeta); err != nil {
return nil, err
}
// Only kind provided, list entries. // Only kind provided, list entries.
args.Kind = pathArgs[0] args.Kind = pathArgs[0]