Discharge7443/fleet
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

small fixes in endpoint error handling (#117)

Browse Source 
* space in ,omitempty does not omit the field
https://play.golang.org/p/TF_itLk50g

* return service errors as part of the response struct
This commit is contained in:
Victor Vrantchan
2016-09-06 11:02:11 -04:00
committed by GitHub
parent b5b4796a5d
commit 0a3f29ade5
3 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/endpoint_packs.go
+12 -12
View File
@@ -18,7 +18,7 @@ type getPackResponse struct {
ID uint `json:"id"`
Name string `json:"name"`
Platform string `json:"platform"`
Err error `json:"error, omitempty"`
Err error `json:"error,omitempty"`
}
func (r getPackResponse) error() error { return r.Err }
@@ -44,7 +44,7 @@ func makeGetPackEndpoint(svc kolide.Service) endpoint.Endpoint {
type getAllPacksResponse struct {
Packs []getPackResponse `json:"packs"`
Err error `json:"error, omitempty"`
Err error `json:"error,omitempty"`
}
func (r getAllPacksResponse) error() error { return r.Err }
@@ -53,7 +53,7 @@ func makeGetAllPacksEndpoint(svc kolide.Service) endpoint.Endpoint {
return func(ctx context.Context, request interface{}) (interface{}, error) {
packs, err := svc.GetAllPacks(ctx)
if err != nil {
return nil, err
return getPackResponse{Err: err}, nil
}
var resp getAllPacksResponse
for _, pack := range packs {
@@ -79,7 +79,7 @@ type createPackResponse struct {
ID uint `json:"id"`
Name string `json:"name"`
Platform string `json:"platform"`
Err error `json:"error, omitempty"`
Err error `json:"error,omitempty"`
}
func (r createPackResponse) error() error { return r.Err }
@@ -112,7 +112,7 @@ type modifyPackResponse struct {
ID uint `json:"id"`
Name string `json:"name"`
Platform string `json:"platform"`
Err error `json:"error, omitempty"`
Err error `json:"error,omitempty"`
}
func (r modifyPackResponse) error() error { return r.Err }
@@ -141,7 +141,7 @@ type deletePackRequest struct {
}
type deletePackResponse struct {
Err error `json:"error, omitempty"`
Err error `json:"error,omitempty"`
}
func (r deletePackResponse) error() error { return r.Err }
@@ -167,7 +167,7 @@ type addQueryToPackRequest struct {
}
type addQueryToPackResponse struct {
Err error `json:"error, omitempty"`
Err error `json:"error,omitempty"`
}
func (r addQueryToPackResponse) error() error { return r.Err }
@@ -177,7 +177,7 @@ func makeAddQueryToPackEndpoint(svc kolide.Service) endpoint.Endpoint {
req := request.(addQueryToPackRequest)
err := svc.AddQueryToPack(ctx, req.QueryID, req.PackID)
if err != nil {
return nil, err
return addQueryToPackResponse{Err: err}, nil
}
return addQueryToPackResponse{}, nil
}
@@ -193,7 +193,7 @@ type getQueriesInPackRequest struct {
type getQueriesInPackResponse struct {
Queries []getQueryResponse
Err error `json:"error, omitempty"`
Err error `json:"error,omitempty"`
}
func (r getQueriesInPackResponse) error() error { return r.Err }
@@ -203,7 +203,7 @@ func makeGetQueriesInPackEndpoint(svc kolide.Service) endpoint.Endpoint {
req := request.(getQueriesInPackRequest)
queries, err := svc.GetQueriesInPack(ctx, req.ID)
if err != nil {
return nil, err
return getQueriesInPackResponse{Err: err}, nil
}
var resp getQueriesInPackResponse
@@ -233,7 +233,7 @@ type deleteQueryFromPackRequest struct {
}
type deleteQueryFromPackResponse struct {
Err error `json:"error, omitempty"`
Err error `json:"error,omitempty"`
}
func (r deleteQueryFromPackResponse) error() error { return r.Err }
@@ -243,7 +243,7 @@ func makeDeleteQueryFromPackEndpoint(svc kolide.Service) endpoint.Endpoint {
req := request.(deleteQueryFromPackRequest)
err := svc.RemoveQueryFromPack(ctx, req.QueryID, req.PackID)
if err != nil {
return nil, err
return deleteQueryFromPackResponse{Err: err}, nil
}
return deleteQueryFromPackResponse{}, nil
}
server/endpoint_queries.go
+6 -6
View File
@@ -23,7 +23,7 @@ type getQueryResponse struct {
Differential bool `json:"differential"`
Platform string `json:"platform"`
Version string `json:"version"`
Err error `json:"error, omitempty"`
Err error `json:"error,omitempty"`
}
func (r getQueryResponse) error() error { return r.Err }
@@ -54,7 +54,7 @@ func makeGetQueryEndpoint(svc kolide.Service) endpoint.Endpoint {
type getAllQueriesResponse struct {
Queries []getQueryResponse `json:"queries"`
Err error `json:"error, omitempty"`
Err error `json:"error,omitempty"`
}
func (r getAllQueriesResponse) error() error { return r.Err }
@@ -63,7 +63,7 @@ func makeGetAllQueriesEndpoint(svc kolide.Service) endpoint.Endpoint {
return func(ctx context.Context, request interface{}) (interface{}, error) {
queries, err := svc.GetAllQueries(ctx)
if err != nil {
return nil, err
return getAllQueriesResponse{Err: err}, nil
}
var resp getAllQueriesResponse
for _, query := range queries {
@@ -99,7 +99,7 @@ type createQueryResponse struct {
Differential bool `json:"differential"`
Platform string `json:"platform"`
Version string `json:"version"`
Err error `json:"error, omitempty"`
Err error `json:"error,omitempty"`
}
func (r createQueryResponse) error() error { return r.Err }
@@ -142,7 +142,7 @@ type modifyQueryResponse struct {
Differential bool `json:"differential"`
Platform string `json:"platform"`
Version string `json:"version"`
Err error `json:"error, omitempty"`
Err error `json:"error,omitempty"`
}
func (r modifyQueryResponse) error() error { return r.Err }
@@ -176,7 +176,7 @@ type deleteQueryRequest struct {
}
type deleteQueryResponse struct {
Err error `json:"error, omitempty"`
Err error `json:"error,omitempty"`
}
func (r deleteQueryResponse) error() error { return r.Err }
server/endpoint_sessions.go
+4 -4
View File
@@ -20,7 +20,7 @@ type getInfoAboutSessionResponse struct {
SessionID uint `json:"session_id"`
UserID uint `json:"user_id"`
CreatedAt time.Time `json:"created_at"`
Err error `json:"error, omitempty"`
Err error `json:"error,omitempty"`
}
func (r getInfoAboutSessionResponse) error() error { return r.Err }
@@ -51,7 +51,7 @@ type getInfoAboutSessionsForUserRequest struct {
type getInfoAboutSessionsForUserResponse struct {
Sessions []getInfoAboutSessionResponse `json:"sessions"`
Err error `json:"error, omitempty"`
Err error `json:"error,omitempty"`
}
func (r getInfoAboutSessionsForUserResponse) error() error { return r.Err }
@@ -84,7 +84,7 @@ type deleteSessionRequest struct {
}
type deleteSessionResponse struct {
Err error `json:"error, omitempty"`
Err error `json:"error,omitempty"`
}
func (r deleteSessionResponse) error() error { return r.Err }
@@ -109,7 +109,7 @@ type deleteSessionsForUserRequest struct {
}
type deleteSessionsForUserResponse struct {
Err error `json:"error, omitempty"`
Err error `json:"error,omitempty"`
}
func (r deleteSessionsForUserResponse) error() error { return r.Err }