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

Cleanup peering files that used error types that were removed (#12892)

Browse source
This commit is contained in:
Chris S. Kim 2022-04-29 14:02:26 -04:00 committed by GitHub
parent d6fdaa608f
commit 33bfaf5671
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
agent/peering_endpoint.go
View file

@ -15,7 +15,7 @@ func (s *HTTPHandlers) PeeringRead(resp http.ResponseWriter, req *http.Request)
return nil, err return nil, err
} }
if name == "" { if name == "" {
return nil, BadRequestError{Reason: "Must specify a name to fetch."} return nil, HTTPError{StatusCode: http.StatusBadRequest, Reason: "Must specify a name to fetch."}
} }
entMeta := s.agent.AgentEnterpriseMeta() entMeta := s.agent.AgentEnterpriseMeta()
@ -34,7 +34,7 @@ func (s *HTTPHandlers) PeeringRead(resp http.ResponseWriter, req *http.Request)
return nil, err return nil, err
} }
if result.Peering == nil { if result.Peering == nil {
return nil, NotFoundError{} return nil, HTTPError{StatusCode: http.StatusNotFound}
} }
// TODO(peering): replace with API types // TODO(peering): replace with API types
@ -68,15 +68,15 @@ func (s *HTTPHandlers) PeeringGenerateToken(resp http.ResponseWriter, req *http.
} }
if req.Body == nil { if req.Body == nil {
return nil, BadRequestError{Reason: "The peering arguments must be provided in the body"} return nil, HTTPError{StatusCode: http.StatusBadRequest, Reason: "The peering arguments must be provided in the body"}
} }
if err := lib.DecodeJSON(req.Body, &args); err != nil { if err := lib.DecodeJSON(req.Body, &args); err != nil {
return nil, BadRequestError{Reason: fmt.Sprintf("Body decoding failed: %v", err)} return nil, HTTPError{StatusCode: http.StatusBadRequest, Reason: fmt.Sprintf("Body decoding failed: %v", err)}
} }
if args.PeerName == "" { if args.PeerName == "" {
return nil, BadRequestError{Reason: "PeerName is required in the payload when generating a new peering token."} return nil, HTTPError{StatusCode: http.StatusBadRequest, Reason: "PeerName is required in the payload when generating a new peering token."}
} }
entMeta := s.agent.AgentEnterpriseMeta() entMeta := s.agent.AgentEnterpriseMeta()
@ -99,19 +99,19 @@ func (s *HTTPHandlers) PeeringInitiate(resp http.ResponseWriter, req *http.Reque
} }
if req.Body == nil { if req.Body == nil {
return nil, BadRequestError{Reason: "The peering arguments must be provided in the body"} return nil, HTTPError{StatusCode: http.StatusBadRequest, Reason: "The peering arguments must be provided in the body"}
} }
if err := lib.DecodeJSON(req.Body, &args); err != nil { if err := lib.DecodeJSON(req.Body, &args); err != nil {
return nil, BadRequestError{Reason: fmt.Sprintf("Body decoding failed: %v", err)} return nil, HTTPError{StatusCode: http.StatusBadRequest, Reason: fmt.Sprintf("Body decoding failed: %v", err)}
} }
if args.PeerName == "" { if args.PeerName == "" {
return nil, BadRequestError{Reason: "PeerName is required in the payload when initiating a peering."} return nil, HTTPError{StatusCode: http.StatusBadRequest, Reason: "PeerName is required in the payload when initiating a peering."}
} }
if args.PeeringToken == "" { if args.PeeringToken == "" {
return nil, BadRequestError{Reason: "PeeringToken is required in the payload when initiating a peering."} return nil, HTTPError{StatusCode: http.StatusBadRequest, Reason: "PeeringToken is required in the payload when initiating a peering."}
} }
return s.agent.rpcClientPeering.Initiate(req.Context(), &args) return s.agent.rpcClientPeering.Initiate(req.Context(), &args)