update protobuf (#1264)

Author: wbrowne

backend/convert_from_protobuf.go

@@ -248,10 +248,14 @@ func (f ConvertFromProtobuf) CollectMetricsResponse(protoResp *pluginv2.CollectM
 
 // SubscribeStreamRequest ...
 func (f ConvertFromProtobuf) SubscribeStreamRequest(protoReq *pluginv2.SubscribeStreamRequest) *SubscribeStreamRequest {
+	if protoReq.Headers == nil {
+		protoReq.Headers = map[string]string{}
+	}
 	return &SubscribeStreamRequest{
 		PluginContext: f.PluginContext(protoReq.PluginContext),
 		Path:          protoReq.GetPath(),
 		Data:          protoReq.GetData(),
+		Headers:       protoReq.Headers,
 	}
 }
 
@@ -267,10 +271,14 @@ func (f ConvertFromProtobuf) SubscribeStreamResponse(protoReq *pluginv2.Subscrib
 
 // PublishStreamRequest ...
 func (f ConvertFromProtobuf) PublishStreamRequest(protoReq *pluginv2.PublishStreamRequest) *PublishStreamRequest {
+	if protoReq.Headers == nil {
+		protoReq.Headers = map[string]string{}
+	}
 	return &PublishStreamRequest{
 		PluginContext: f.PluginContext(protoReq.PluginContext),
 		Path:          protoReq.GetPath(),
 		Data:          protoReq.GetData(),
+		Headers:       protoReq.Headers,
 	}
 }
 
@@ -284,10 +292,14 @@ func (f ConvertFromProtobuf) PublishStreamResponse(protoReq *pluginv2.PublishStr
 
 // RunStreamRequest ...
 func (f ConvertFromProtobuf) RunStreamRequest(protoReq *pluginv2.RunStreamRequest) *RunStreamRequest {
+	if protoReq.Headers == nil {
+		protoReq.Headers = map[string]string{}
+	}
 	return &RunStreamRequest{
 		PluginContext: f.PluginContext(protoReq.PluginContext),
 		Path:          protoReq.GetPath(),
 		Data:          protoReq.GetData(),
+		Headers:       protoReq.Headers,
 	}
 }
 

backend/convert_from_protobuf_test.go

@@ -481,6 +481,90 @@ func TestConvertFromProtobufCheckHealthRequest(t *testing.T) {
 	})
 }
 
+func TestConvertFromProtobufSubscribeStreamRequest(t *testing.T) {
+	t.Run("Should convert provided headers", func(t *testing.T) {
+		protoReq := &pluginv2.SubscribeStreamRequest{
+			PluginContext: protoPluginContext,
+			Headers: map[string]string{
+				"foo": "fooVal",
+				"bar": "barVal",
+			},
+		}
+
+		req := FromProto().SubscribeStreamRequest(protoReq)
+		require.NotNil(t, req)
+		require.NotNil(t, req.PluginContext)
+		require.Equal(t, protoPluginContext.OrgId, req.PluginContext.OrgID)
+		require.Equal(t, protoReq.Headers, req.Headers)
+	})
+
+	t.Run("Should handle nil-provided headers", func(t *testing.T) {
+		protoReq := &pluginv2.SubscribeStreamRequest{
+			PluginContext: protoPluginContext,
+		}
+
+		req := FromProto().SubscribeStreamRequest(protoReq)
+		require.NotNil(t, req)
+		require.Equal(t, map[string]string{}, req.Headers)
+	})
+}
+
+func TestConvertFromProtobufPublishStreamRequest(t *testing.T) {
+	t.Run("Should convert provided headers", func(t *testing.T) {
+		protoReq := &pluginv2.PublishStreamRequest{
+			PluginContext: protoPluginContext,
+			Headers: map[string]string{
+				"foo": "fooVal",
+				"bar": "barVal",
+			},
+		}
+
+		req := FromProto().PublishStreamRequest(protoReq)
+		require.NotNil(t, req)
+		require.NotNil(t, req.PluginContext)
+		require.Equal(t, protoPluginContext.OrgId, req.PluginContext.OrgID)
+		require.Equal(t, protoReq.Headers, req.Headers)
+	})
+
+	t.Run("Should handle nil-provided headers", func(t *testing.T) {
+		protoReq := &pluginv2.PublishStreamRequest{
+			PluginContext: protoPluginContext,
+		}
+
+		req := FromProto().PublishStreamRequest(protoReq)
+		require.NotNil(t, req)
+		require.Equal(t, map[string]string{}, req.Headers)
+	})
+}
+
+func TestConvertFromProtobufRunStreamRequest(t *testing.T) {
+	t.Run("Should convert provided headers", func(t *testing.T) {
+		protoReq := &pluginv2.RunStreamRequest{
+			PluginContext: protoPluginContext,
+			Headers: map[string]string{
+				"foo": "fooVal",
+				"bar": "barVal",
+			},
+		}
+
+		req := FromProto().RunStreamRequest(protoReq)
+		require.NotNil(t, req)
+		require.NotNil(t, req.PluginContext)
+		require.Equal(t, protoPluginContext.OrgId, req.PluginContext.OrgID)
+		require.Equal(t, protoReq.Headers, req.Headers)
+	})
+
+	t.Run("Should handle nil-provided headers", func(t *testing.T) {
+		protoReq := &pluginv2.RunStreamRequest{
+			PluginContext: protoPluginContext,
+		}
+
+		req := FromProto().RunStreamRequest(protoReq)
+		require.NotNil(t, req)
+		require.Equal(t, map[string]string{}, req.Headers)
+	})
+}
+
 func TestConvertFromProtobufDataResponse(t *testing.T) {
 	t.Run("Should convert data query response", func(t *testing.T) {
 		tcs := []struct {

backend/convert_to_protobuf.go

@@ -272,6 +272,7 @@ func (t ConvertToProtobuf) RunStreamRequest(req *RunStreamRequest) *pluginv2.Run
 		PluginContext: t.PluginContext(req.PluginContext),
 		Path:          req.Path,
 		Data:          req.Data,
+		Headers:       req.Headers,
 	}
 	return protoReq
 }
@@ -282,6 +283,7 @@ func (t ConvertToProtobuf) SubscribeStreamRequest(req *SubscribeStreamRequest) *
 		PluginContext: t.PluginContext(req.PluginContext),
 		Path:          req.Path,
 		Data:          req.Data,
+		Headers:       req.Headers,
 	}
 }
 
@@ -302,6 +304,7 @@ func (t ConvertToProtobuf) PublishStreamRequest(req *PublishStreamRequest) *plug
 		PluginContext: t.PluginContext(req.PluginContext),
 		Path:          req.Path,
 		Data:          req.Data,
+		Headers:       req.Headers,
 	}
 }