Merge branch 'develop' into core-categories-expansion

Signed-off-by: Joshua Rubin <jrubin@zvelo.com>

Gopkg.toml

@@ -34,8 +34,8 @@
 
 [[constraint]]
   name = "google.golang.org/grpc"
-  version = "1.9.2"
+  version = "1.10.0"
 
 [[constraint]]
   name = "zvelo.io/zmage"
-  version = "3.0.1"
+  version = "3.2.0"

graphql_relay.go

@@ -79,6 +79,7 @@ var incomingHeaders = map[string]string{
 
 var outgoingHeaders = map[string]string{
 	"zvelo-trace-id": "zvelo-trace-id",
+	"server-timing":  "server-timing",
 	"content-type":   "",
 	"trailer":        "",
 }

magefile.go

@@ -36,6 +36,12 @@ func ProtoGRPCGateway(ctx context.Context) error {
 	return err
 }
 
+// Protoset generates .protoset files from .proto files
+func Protoset(ctx context.Context) error {
+	_, err := zmage.Protoset("apiv1.proto")
+	return err
+}
+
 // Swagger generates .swagger.json files from .proto files
 func ProtoSwagger(ctx context.Context) error {
 	files, err := zmage.ProtoSwagger()
@@ -79,7 +85,7 @@ func Static(ctx context.Context) error {
 
 // Generate all necessary files
 func Generate(ctx context.Context) error {
-	mg.CtxDeps(ctx, CheckImports, ProtoGo, ProtoPython, ProtoGRPCGateway, ProtoSwagger, Static)
+	mg.CtxDeps(ctx, CheckImports, ProtoGo, ProtoPython, ProtoGRPCGateway, ProtoSwagger, Protoset, Static)
 	return nil
 }
 

mock/request.go

@@ -185,7 +185,7 @@ func parseOpts(ctx context.Context, url string, content bool, ds []msg.DataSetTy
 	}
 
 	for _, t := range ds {
-		switch msg.DataSetType(t) {
+		switch t {
 		case msg.CATEGORIZATION:
 			if r.ResponseDataset == nil {
 				r.ResponseDataset = &msg.DataSet{}

status/status.go

@@ -87,3 +87,10 @@ func FromError(err error) (s *Status, ok bool) {
 
 	return New(st.Code(), st.Message()), true
 }
+
+// Convert is a convenience function which removes the need to handle the
+// boolean return value from FromError.
+func Convert(err error) *Status {
+	s, _ := FromError(err)
+	return s
+}