Add jsonrpc go-kit boilerplate

pkg/service/check_health.go

@@ -3,6 +3,7 @@ package service
 import (
 	"context"
 	"encoding/json"
+	"fmt"
 	"time"
 
 	"github.com/go-kit/kit/endpoint"
@@ -23,6 +24,10 @@ func decodeGRPCHealthCheckRequest(_ context.Context, grpcReq interface{}) (inter
 	return healthcheckRequest{}, nil
 }
 
+func decodeJSONRPCHealthCheckRequest(_ context.Context, msg json.RawMessage) (interface{}, error) {
+	return healthcheckRequest{}, nil
+}
+
 func encodeGRPCHealcheckRequest(_ context.Context, request interface{}) (interface{}, error) {
 	return &pb.AgentApiRequest{}, nil
 }
@@ -41,6 +46,22 @@ func encodeGRPCHealthcheckResponse(_ context.Context, request interface{}) (inte
 	}, nil
 }
 
+func encodeJSONRPCHealthcheckResponse(_ context.Context, obj interface{}) (json.RawMessage, error) {
+	res, ok := obj.(healthcheckResponse)
+	if !ok {
+		return nil, &jsonrpc.Error{
+			Code:    -32000,
+			Message: fmt.Sprintf("Asserting result to *healthcheckResponse failed. Got %T, %+v", obj, obj),
+		}
+	}
+
+	b, err := json.Marshal(res)
+	if err != nil {
+		return nil, fmt.Errorf("couldn't marshal response: %s", err)
+	}
+	return b, nil
+}
+
 func decodeJSONRPCHealthCheckResponse(_ context.Context, res jsonrpc.Response) (interface{}, error) {
 	if res.Error != nil {
 		return nil, *res.Error

pkg/service/middleware.go

@@ -4,7 +4,9 @@ import (
 	"github.com/go-kit/kit/log"
 )
 
-func LoggingMiddleware(logger log.Logger) func(KolideService) KolideService {
+type Middleware func(KolideService) KolideService
+
+func LoggingMiddleware(logger log.Logger) Middleware {
 	return func(next KolideService) KolideService {
 		return logmw{logger, next}
 	}

pkg/service/publish_logs.go

@@ -57,6 +57,18 @@ func decodeGRPCLogCollection(_ context.Context, grpcReq interface{}) (interface{
 	}, nil
 }
 
+func decodeJSONRPCLogCollection(_ context.Context, msg json.RawMessage) (interface{}, error) {
+	var req logCollection
+
+	if err := json.Unmarshal(msg, &req); err != nil {
+		return nil, &jsonrpc.Error{
+			Code:    -32000,
+			Message: fmt.Sprintf("couldn't unmarshal body to logCollection: %s", err),
+		}
+	}
+	return req, nil
+}
+
 func encodeGRPCLogCollection(_ context.Context, request interface{}) (interface{}, error) {
 	req := request.(logCollection)
 	logs := make([]*pb.LogCollection_Log, 0, len(req.Logs))
@@ -100,6 +112,22 @@ func encodeGRPCPublishLogsResponse(_ context.Context, request interface{}) (inte
 	return encodeResponse(resp, req.Err)
 }
 
+func encodeJSONRPCPublishLogsResponse(_ context.Context, obj interface{}) (json.RawMessage, error) {
+	res, ok := obj.(publishLogsResponse)
+	if !ok {
+		return nil, &jsonrpc.Error{
+			Code:    -32000,
+			Message: fmt.Sprintf("Asserting result to *publishLogsResponse failed. Got %T, %+v", obj, obj),
+		}
+	}
+
+	b, err := json.Marshal(res)
+	if err != nil {
+		return nil, fmt.Errorf("couldn't marshal response: %s", err)
+	}
+	return b, nil
+}
+
 func decodeJSONRPCPublishLogsResponse(_ context.Context, res jsonrpc.Response) (interface{}, error) {
 	if res.Error != nil {
 		return nil, *res.Error

pkg/service/publish_results.go

@@ -3,6 +3,7 @@ package service
 import (
 	"context"
 	"encoding/json"
+	"fmt"
 	"time"
 
 	"github.com/go-kit/kit/endpoint"
@@ -57,6 +58,18 @@ func decodeGRPCResultCollection(_ context.Context, grpcReq interface{}) (interfa
 	}, nil
 }
 
+func decodeJSONRPCResultCollection(_ context.Context, msg json.RawMessage) (interface{}, error) {
+	var req resultCollection
+
+	if err := json.Unmarshal(msg, &req); err != nil {
+		return nil, &jsonrpc.Error{
+			Code:    -32000,
+			Message: fmt.Sprintf("couldn't unmarshal body to resultCollection: %s", err),
+		}
+	}
+	return req, nil
+}
+
 func decodeJSONRPCPublishResultsResponse(_ context.Context, res jsonrpc.Response) (interface{}, error) {
 	if res.Error != nil {
 		return nil, *res.Error
@@ -122,6 +135,23 @@ func encodeGRPCPublishResultsResponse(_ context.Context, request interface{}) (i
 	return encodeResponse(resp, req.Err)
 }
 
+func encodeJSONRPCPublishResultsResponse(_ context.Context, obj interface{}) (json.RawMessage, error) {
+	res, ok := obj.(publishResultsResponse)
+	if !ok {
+		return nil, &jsonrpc.Error{
+			Code:    -32000,
+			Message: fmt.Sprintf("Asserting result to *enrollmentResponse failed. Got %T, %+v", obj, obj),
+		}
+	}
+
+	b, err := json.Marshal(res)
+	if err != nil {
+		return nil, fmt.Errorf("couldn't marshal response: %s", err)
+	}
+	return b, nil
+
+}
+
 func MakePublishResultsEndpoint(svc KolideService) endpoint.Endpoint {
 	return func(ctx context.Context, request interface{}) (response interface{}, err error) {
 		req := request.(resultCollection)

pkg/service/request_config.go

@@ -3,6 +3,7 @@ package service
 import (
 	"context"
 	"encoding/json"
+	"fmt"
 	"time"
 
 	"github.com/go-kit/kit/endpoint"
@@ -31,6 +32,18 @@ func decodeGRPCConfigRequest(_ context.Context, grpcReq interface{}) (interface{
 	}, nil
 }
 
+func decodeJSONRPCConfigRequest(_ context.Context, msg json.RawMessage) (interface{}, error) {
+	var req configRequest
+
+	if err := json.Unmarshal(msg, &req); err != nil {
+		return nil, &jsonrpc.Error{
+			Code:    -32000,
+			Message: fmt.Sprintf("couldn't unmarshal body to configRequest: %s", err),
+		}
+	}
+	return req, nil
+}
+
 func encodeGRPCConfigRequest(_ context.Context, request interface{}) (interface{}, error) {
 	req := request.(configRequest)
 	return &pb.AgentApiRequest{
@@ -55,6 +68,22 @@ func encodeGRPCConfigResponse(_ context.Context, request interface{}) (interface
 	return encodeResponse(resp, req.Err)
 }
 
+func encodeJSONRPCConfigResponse(_ context.Context, obj interface{}) (json.RawMessage, error) {
+	res, ok := obj.(configResponse)
+	if !ok {
+		return nil, &jsonrpc.Error{
+			Code:    -32000,
+			Message: fmt.Sprintf("Asserting result to *configResponse failed. Got %T, %+v", obj, obj),
+		}
+	}
+
+	b, err := json.Marshal(res)
+	if err != nil {
+		return nil, fmt.Errorf("couldn't marshal response: %s", err)
+	}
+	return b, nil
+}
+
 func decodeJSONRPCConfigResponse(_ context.Context, res jsonrpc.Response) (interface{}, error) {
 	if res.Error != nil {
 		return nil, *res.Error // I'm undecided if we should errors.Wrap this or not.

pkg/service/request_enrollment.go

@@ -3,6 +3,7 @@ package service
 import (
 	"context"
 	"encoding/json"
+	"fmt"
 	"time"
 
 	"github.com/go-kit/kit/endpoint"
@@ -69,6 +70,18 @@ func decodeGRPCEnrollmentRequest(_ context.Context, grpcReq interface{}) (interf
 	}, nil
 }
 
+func decodeJSONRPCEnrollmentRequest(_ context.Context, msg json.RawMessage) (interface{}, error) {
+	var req enrollmentRequest
+
+	if err := json.Unmarshal(msg, &req); err != nil {
+		return nil, &jsonrpc.Error{
+			Code:    -32000,
+			Message: fmt.Sprintf("couldn't unmarshal body to enrollment request: %s", err),
+		}
+	}
+	return req, nil
+}
+
 func decodeJSONRPCEnrollmentResponse(_ context.Context, res jsonrpc.Response) (interface{}, error) {
 	if res.Error != nil {
 		return nil, *res.Error
@@ -82,6 +95,22 @@ func decodeJSONRPCEnrollmentResponse(_ context.Context, res jsonrpc.Response) (i
 	return result, nil
 }
 
+func encodeJSONRPCEnrollmentResponse(_ context.Context, obj interface{}) (json.RawMessage, error) {
+	res, ok := obj.(enrollmentResponse)
+	if !ok {
+		return nil, &jsonrpc.Error{
+			Code:    -32000,
+			Message: fmt.Sprintf("Asserting result to *enrollmentResponse failed. Got %T, %+v", obj, obj),
+		}
+	}
+
+	b, err := json.Marshal(res)
+	if err != nil {
+		return nil, fmt.Errorf("couldn't marshal response: %s", err)
+	}
+	return b, nil
+}
+
 func encodeGRPCEnrollmentRequest(_ context.Context, request interface{}) (interface{}, error) {
 	req := request.(enrollmentRequest)
 	enrollDetails := &pb.EnrollmentDetails{

pkg/service/request_queries.go

@@ -3,6 +3,7 @@ package service
 import (
 	"context"
 	"encoding/json"
+	"fmt"
 	"time"
 
 	"github.com/go-kit/kit/endpoint"
@@ -46,6 +47,18 @@ func decodeGRPCQueriesRequest(_ context.Context, grpcReq interface{}) (interface
 	}, nil
 }
 
+func decodeJSONRPCQueriesRequest(_ context.Context, msg json.RawMessage) (interface{}, error) {
+	var req queriesRequest
+
+	if err := json.Unmarshal(msg, &req); err != nil {
+		return nil, &jsonrpc.Error{
+			Code:    -32000,
+			Message: fmt.Sprintf("couldn't unmarshal body to queriesRequest: %s", err),
+		}
+	}
+	return req, nil
+}
+
 func encodeGRPCQueriesRequest(_ context.Context, request interface{}) (interface{}, error) {
 	req := request.(queriesRequest)
 	return &pb.AgentApiRequest{
@@ -86,6 +99,22 @@ func encodeGRPCQueryCollection(_ context.Context, request interface{}) (interfac
 	return encodeResponse(resp, req.Err)
 }
 
+func encodeJSONRPCQueryCollection(_ context.Context, obj interface{}) (json.RawMessage, error) {
+	res, ok := obj.(queryCollectionResponse)
+	if !ok {
+		return nil, &jsonrpc.Error{
+			Code:    -32000,
+			Message: fmt.Sprintf("Asserting result to *queryCollectionResponse failed. Got %T, %+v", obj, obj),
+		}
+	}
+
+	b, err := json.Marshal(res)
+	if err != nil {
+		return nil, fmt.Errorf("couldn't marshal response: %s", err)
+	}
+	return b, nil
+}
+
 func MakeRequestQueriesEndpoint(svc KolideService) endpoint.Endpoint {
 	return func(ctx context.Context, request interface{}) (response interface{}, err error) {
 		req := request.(queriesRequest)

pkg/service/server_jsonrpc.go

@@ -0,0 +1,51 @@
+package service
+
+import (
+	"github.com/go-kit/kit/log"
+	"github.com/go-kit/kit/transport/http/jsonrpc"
+)
+
+func NewJSONRPCServer(endpoints Endpoints, logger log.Logger) *jsonrpc.Server {
+	handler := jsonrpc.NewServer(
+		makeEndpointCodecMap(endpoints),
+		jsonrpc.ServerErrorLogger(logger),
+	)
+	return handler
+}
+
+// makeEndpointCodecMap returns a codec map configured.
+func makeEndpointCodecMap(endpoints Endpoints) jsonrpc.EndpointCodecMap {
+	return jsonrpc.EndpointCodecMap{
+		"RequestEnrollment": jsonrpc.EndpointCodec{
+			Endpoint: endpoints.RequestEnrollmentEndpoint,
+			Decode:   decodeJSONRPCEnrollmentRequest,
+			Encode:   encodeJSONRPCEnrollmentResponse,
+		},
+		"RequestConfig": jsonrpc.EndpointCodec{
+			Endpoint: endpoints.RequestConfigEndpoint,
+			Decode:   decodeJSONRPCConfigRequest,
+			Encode:   encodeJSONRPCConfigResponse,
+		},
+		"RequestQueries": jsonrpc.EndpointCodec{
+			Endpoint: endpoints.RequestQueriesEndpoint,
+			Decode:   decodeJSONRPCQueriesRequest,
+			Encode:   encodeJSONRPCQueryCollection,
+		},
+		"PublishLogs": jsonrpc.EndpointCodec{
+			Endpoint: endpoints.PublishLogsEndpoint,
+			Decode:   decodeJSONRPCLogCollection,
+			Encode:   encodeJSONRPCPublishLogsResponse,
+		},
+		"PublishResults": jsonrpc.EndpointCodec{
+			Endpoint: endpoints.PublishResultsEndpoint,
+			Decode:   decodeJSONRPCResultCollection,
+			Encode:   encodeJSONRPCPublishResultsResponse,
+		},
+		"CheckHealth": jsonrpc.EndpointCodec{
+			Endpoint: endpoints.CheckHealthEndpoint,
+			Decode:   decodeJSONRPCHealthCheckRequest,
+			Encode:   encodeJSONRPCHealthcheckResponse,
+		},
+	}
+
+}