finish grpc structure

Gopkg.toml

@@ -37,17 +37,9 @@
   name = "github.com/grpc-ecosystem/go-grpc-middleware"
   version = "1.2.0"
 
-[[constraint]]
-  name = "github.com/grpc-ecosystem/go-grpc-prometheus"
-  version = "1.2.0"
-
 [[constraint]]
   name = "github.com/grpc-ecosystem/grpc-gateway"
-  version = "1.14.3"
-
-[[constraint]]
-  name = "github.com/mailru/easyjson"
-  version = "0.7.1"
+  version = "1.14.4"
 
 [[constraint]]
   name = "github.com/mitchellh/go-homedir"
@@ -77,17 +69,13 @@
   branch = "master"
   name = "github.com/yalp/jsonpath"
 
-[[constraint]]
-  name = "gitlab.com/pharmpixel/pharmpixel"
-  version = "202004.22.0"
-
 [[constraint]]
   branch = "master"
   name = "google.golang.org/genproto"
 
 [[constraint]]
   name = "google.golang.org/grpc"
-  version = "1.28.1"
+  version = "1.29.0"
 
 [[constraint]]
   branch = "v2"

Makefile

@@ -1,11 +1,4 @@
 build:
-	protoc -I.  \
-	-I$(GOPATH)/src   \
-	-I$(GOPATH)/src/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis   \
-	--plugin=protoc-gen-mongo=$(GOPATH)/bin/protoc-gen-bom \
-	--mongo_out="generateCrud=true,gateway:." \
- 	proto/gol.proto
-
 	protoc -I. \
 	-I$(GOPATH)/src \
 	-I$(GOPATH)/src/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis \

cmd/handler.go

@@ -49,12 +49,11 @@ func (h *Handler) CustomHTTPError(ctx context.Context, _ *runtime.ServeMux, mars
 }
 
 func (h *Handler) Execute(c context.Context, request *pb.ExecuteRequest) (*pb.ExecuteResponse, error) {
-	var response *pb.ExecuteResponse
-	var jobs map[string]interface{}
+	var response pb.ExecuteResponse
 	var j []floc.Job
 
 	ctx := floc.NewContext()
-	jobs = make(map[string]interface{})
+	jobs := make(map[string]string)
 	for _, sequence := range request.Sequence {
 		switch sequence.Type {
 		case pb.SequenceType_parallel:
@@ -83,5 +82,6 @@ func (h *Handler) Execute(c context.Context, request *pb.ExecuteRequest) (*pb.Ex
 			}
 		}
 	}
-	return response, nil
+	response.Jobs = jobs
+	return &response, nil
 }

cmd/request.go

@@ -77,11 +77,19 @@ func (r *RequestTranslator) Execute(ctx floc.Context) (*resty.Response, error) {
 	req.EnableTrace()
 
 	if r.Job.Body != nil {
-		req.SetBody(r.Job.Body)
+		ub, err := r.Job.GetUnmarshalBody()
+		if err != nil {
+			return nil, err
+		}
+		req.SetBody(ub)
+	}
+	if r.Job.Header != nil {
+		ub, err := r.Job.GetUnmarshalHeader()
+		if err != nil {
+			return nil, err
+		}
+		req.SetHeaders(ub)
 	}
-	/*	if r.Job.Header != nil {
-		req.SetHeaders(r.Job.GetHeaders(ctx))
-	}*/
 	switch r.Job.Method {
 	case pb.Methods_get:
 		response, err = req.Get(r.Job.GetUrl())

core/helper.go

@@ -0,0 +1,70 @@
+package core
+
+import (
+	"fmt"
+	"github.com/golang/protobuf/ptypes"
+	"github.com/golang/protobuf/ptypes/any"
+	"github.com/golang/protobuf/ptypes/wrappers"
+	"strings"
+)
+
+func GetAnyType(a *any.Any) (interface{}, error) {
+	switch strings.ToLower(a.TypeUrl) {
+	case strings.ToLower("google.protobuf.StringValue"):
+		var md wrappers.StringValue
+		if err := ptypes.UnmarshalAny(a, &md); err != nil {
+			return nil, err
+		}
+		return md.Value, nil
+	case strings.ToLower("google.protobuf.BytesValue"):
+		var md wrappers.BytesValue
+		if err := ptypes.UnmarshalAny(a, &md); err != nil {
+			return nil, err
+		}
+		return md.Value, nil
+	case strings.ToLower("google.protobuf.BoolValue"):
+		var md wrappers.BoolValue
+		if err := ptypes.UnmarshalAny(a, &md); err != nil {
+			return nil, err
+		}
+		return &md.Value, nil
+	case strings.ToLower("google.protobuf.UInt32Value"):
+		var md wrappers.UInt32Value
+		if err := ptypes.UnmarshalAny(a, &md); err != nil {
+			return nil, err
+		}
+		return md.Value, nil
+	case strings.ToLower("google.protobuf.Int32Value"):
+		var md wrappers.Int32Value
+		if err := ptypes.UnmarshalAny(a, &md); err != nil {
+			return nil, err
+		}
+		return md.Value, nil
+	case strings.ToLower("google.protobuf.UInt64Value"):
+		var md wrappers.UInt64Value
+		if err := ptypes.UnmarshalAny(a, &md); err != nil {
+			return nil, err
+		}
+		return md.Value, nil
+	case strings.ToLower("google.protobuf.Int64Value"):
+		var md wrappers.Int64Value
+		if err := ptypes.UnmarshalAny(a, &md); err != nil {
+			return nil, err
+		}
+		return md.Value, nil
+	case strings.ToLower("google.protobuf.FloatValue"):
+		var md wrappers.FloatValue
+		if err := ptypes.UnmarshalAny(a, &md); err != nil {
+			return nil, err
+		}
+		return md.Value, nil
+	case strings.ToLower("google.protobuf.DoubleValue"):
+		var md wrappers.DoubleValue
+		if err := ptypes.UnmarshalAny(a, &md); err != nil {
+			return nil, err
+		}
+		return md.Value, nil
+	}
+
+	return nil, fmt.Errorf("use google.protobuf types list")
+}

proto/gol.proto

@@ -15,7 +15,7 @@ service Gol {
 }
 
 message ExecuteResponse {
-
+    map<string, string> jobs = 1;
 }
 
 message ExecuteRequest {
@@ -24,7 +24,7 @@ message ExecuteRequest {
 
 message Sequence {
     SequenceType type = 1;
-    repeated Job Jobs = 2;
+    repeated Job jobs = 2;
 }
 
 enum Methods {
@@ -43,8 +43,8 @@ message Job {
     string id = 1;
     string url = 2;
     Methods method = 3;
-    google.protobuf.Any body = 4;
-    google.protobuf.Any header = 5;
+    map<string, google.protobuf.Any> body = 4;
+    map<string, google.protobuf.Any> header = 5;
     repeated Var var = 6;
 }