Merge pull request #295 from bojand/bin_data_template_action_fix

do not attempt template actions with binary data. fixes #284
bojand · Aug 6, 2021 · a73afa9 · a73afa9
2 parents b3e3f4d + 9ea55ad
commit a73afa9
Show file tree

Hide file tree

Showing 8 changed files with 259 additions and 106 deletions.
diff --git a/internal/wrapped/server.go b/internal/wrapped/server.go
@@ -11,3 +11,9 @@ type WrappedService struct{}
 func (s *WrappedService) GetMessage(ctx context.Context, req *wrappers.StringValue) (*wrappers.StringValue, error) {
 	return &wrappers.StringValue{Value: "Hello: " + req.GetValue()}, nil
 }
+
+func (s *WrappedService) GetBytesMessage(ctx context.Context, req *wrappers.BytesValue) (*wrappers.BytesValue, error) {
+	return &wrappers.BytesValue{Value: req.GetValue()}, nil
+}
+
+func (s *WrappedService) mustEmbedUnimplementedWrappedServiceServer() {}
diff --git a/internal/wrapped/wrapped.pb.go b/internal/wrapped/wrapped.pb.go
diff --git a/internal/wrapped/wrapped_grpc.pb.go b/internal/wrapped/wrapped_grpc.pb.go
diff --git a/runner/data.go b/runner/data.go
@@ -99,9 +99,12 @@ func newDataProvider(mtd *desc.MethodDescriptor,
 
 	// Test if we can preseed data
 	ctd := newCallData(mtd, funcs, "", 0)
-	ha, err := ctd.hasAction(string(dp.data))
-	if err != nil {
-		return nil, err
+	ha := false
+	if !dp.binary {
+		ha, err = ctd.hasAction(string(dp.data))
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	dp.hasActions = ha

diff --git a/runner/options.go b/runner/options.go
@@ -185,6 +185,10 @@ func NewConfig(call, host string, options ...Option) (*RunConfig, error) {
 		return nil, errors.New("host required")
 	}
 
+	if c.binary && c.streamDynamicMessages {
+		return nil, errors.New("cannot use dynamic messages with binary data")
+	}
+
 	if c.loadSchedule != ScheduleConst &&
 		c.loadSchedule != ScheduleStep &&
 		c.loadSchedule != ScheduleLine {

diff --git a/runner/options_test.go b/runner/options_test.go
@@ -275,6 +275,17 @@ func TestRunConfig_newRunConfig(t *testing.T) {
 		assert.Equal(t, c.enableCompression, false)
 	})
 
+	t.Run("with binary data from file and dynamic message", func(t *testing.T) {
+		c, err := NewConfig("call", "localhost:50050",
+			WithProtoFile("testdata/data.proto", []string{}),
+			WithBinaryDataFromFile("../testdata/hello_request_data.bin"),
+			WithStreamDynamicMessages(true),
+		)
+
+		assert.Error(t, err)
+		assert.Nil(t, c)
+	})
+
 	t.Run("with data from file", func(t *testing.T) {
 		c, err := NewConfig("call", "localhost:50050",
 			WithProtoFile("testdata/data.proto", []string{}),