Update loggregator-api with generated protos

[#142098227]

Signed-off-by: Brady Love <blove@pivotal.io>

.envrc

@@ -1,2 +1,4 @@
 export GOPATH=$PWD
 export PATH=$GOPATH/bin:$PATH
+
+unset GOBIN

src/doppler/component_tests/helheim_test.go → src/doppler/component_tests/helheim_fixed_test.go

@@ -1,8 +1,3 @@
-// This file was generated by github.com/nelsam/hel.  Do not
-// edit this code by hand unless you *really* know what you're
-// doing.  Expect any changes made manually to be overwritten
-// the next time hel regenerates this file.
-
 package component_test
 
 import (
@@ -20,6 +15,13 @@ type mockIngressServer struct {
 	SenderOutput struct {
 		Ret0 chan error
 	}
+	BatchSenderCalled chan bool
+	BatchSenderInput  struct {
+		Arg0 chan v2.Ingress_BatchSenderServer
+	}
+	BatchSenderOutput struct {
+		Ret0 chan error
+	}
 }
 
 func newMockIngressServer() *mockIngressServer {
@@ -34,6 +36,11 @@ func (m *mockIngressServer) Sender(arg0 v2.Ingress_SenderServer) error {
 	m.SenderInput.Arg0 <- arg0
 	return <-m.SenderOutput.Ret0
 }
+func (m *mockIngressServer) BatchSender(arg0 v2.Ingress_BatchSenderServer) error {
+	m.BatchSenderCalled <- true
+	m.BatchSenderInput.Arg0 <- arg0
+	return <-m.BatchSenderOutput.Ret0
+}
 
 type mockIngress_SenderServer struct {
 	SendAndCloseCalled chan bool

src/doppler/internal/grpcmanager/v2/helheim_test.go

@@ -6,66 +6,26 @@
 package v2_test
 
 import (
-	plumbing "plumbing/v2"
+	"golang.org/x/net/context"
+
+	v2 "plumbing/v2"
 
 	"github.com/cloudfoundry/dropsonde/metricbatcher"
 	"github.com/cloudfoundry/sonde-go/events"
-	"golang.org/x/net/context"
 	"google.golang.org/grpc/metadata"
 )
 
-type mockBatcher struct {
-	BatchCounterCalled chan bool
-	BatchCounterInput  struct {
-		Name chan string
-	}
-	BatchCounterOutput struct {
-		Ret0 chan metricbatcher.BatchCounterChainer
-	}
-}
-
-func newMockBatcher() *mockBatcher {
-	m := &mockBatcher{}
-	m.BatchCounterCalled = make(chan bool, 100)
-	m.BatchCounterInput.Name = make(chan string, 100)
-	m.BatchCounterOutput.Ret0 = make(chan metricbatcher.BatchCounterChainer, 100)
-	return m
-}
-func (m *mockBatcher) BatchCounter(name string) metricbatcher.BatchCounterChainer {
-	m.BatchCounterCalled <- true
-	m.BatchCounterInput.Name <- name
-	return <-m.BatchCounterOutput.Ret0
-}
-
-type mockDataSetter struct {
-	SetCalled chan bool
-	SetInput  struct {
-		Data chan *events.Envelope
-	}
-}
-
-func newMockDataSetter() *mockDataSetter {
-	m := &mockDataSetter{}
-	m.SetCalled = make(chan bool, 100)
-	m.SetInput.Data = make(chan *events.Envelope, 100)
-	return m
-}
-func (m *mockDataSetter) Set(data *events.Envelope) {
-	m.SetCalled <- true
-	m.SetInput.Data <- data
-}
-
 type mockDopplerIngress_SenderServer struct {
 	SendAndCloseCalled chan bool
 	SendAndCloseInput  struct {
-		Arg0 chan *plumbing.SenderResponse
+		Arg0 chan *v2.SenderResponse
 	}
 	SendAndCloseOutput struct {
 		Ret0 chan error
 	}
 	RecvCalled chan bool
 	RecvOutput struct {
-		Ret0 chan *plumbing.Envelope
+		Ret0 chan *v2.Envelope
 		Ret1 chan error
 	}
 	SetHeaderCalled chan bool
@@ -109,10 +69,10 @@ type mockDopplerIngress_SenderServer struct {
 func newMockDopplerIngress_SenderServer() *mockDopplerIngress_SenderServer {
 	m := &mockDopplerIngress_SenderServer{}
 	m.SendAndCloseCalled = make(chan bool, 100)
-	m.SendAndCloseInput.Arg0 = make(chan *plumbing.SenderResponse, 100)
+	m.SendAndCloseInput.Arg0 = make(chan *v2.SenderResponse, 100)
 	m.SendAndCloseOutput.Ret0 = make(chan error, 100)
 	m.RecvCalled = make(chan bool, 100)
-	m.RecvOutput.Ret0 = make(chan *plumbing.Envelope, 100)
+	m.RecvOutput.Ret0 = make(chan *v2.Envelope, 100)
 	m.RecvOutput.Ret1 = make(chan error, 100)
 	m.SetHeaderCalled = make(chan bool, 100)
 	m.SetHeaderInput.Arg0 = make(chan metadata.MD, 100)
@@ -132,12 +92,12 @@ func newMockDopplerIngress_SenderServer() *mockDopplerIngress_SenderServer {
 	m.RecvMsgOutput.Ret0 = make(chan error, 100)
 	return m
 }
-func (m *mockDopplerIngress_SenderServer) SendAndClose(arg0 *plumbing.SenderResponse) error {
+func (m *mockDopplerIngress_SenderServer) SendAndClose(arg0 *v2.SenderResponse) error {
 	m.SendAndCloseCalled <- true
 	m.SendAndCloseInput.Arg0 <- arg0
 	return <-m.SendAndCloseOutput.Ret0
 }
-func (m *mockDopplerIngress_SenderServer) Recv() (*plumbing.Envelope, error) {
+func (m *mockDopplerIngress_SenderServer) Recv() (*v2.Envelope, error) {
 	m.RecvCalled <- true
 	return <-m.RecvOutput.Ret0, <-m.RecvOutput.Ret1
 }
@@ -170,17 +130,58 @@ func (m *mockDopplerIngress_SenderServer) RecvMsg(m_ interface{}) error {
 	return <-m.RecvMsgOutput.Ret0
 }
 
+type mockBatcher struct {
+	BatchCounterCalled chan bool
+	BatchCounterInput  struct {
+		Name chan string
+	}
+	BatchCounterOutput struct {
+		Ret0 chan metricbatcher.BatchCounterChainer
+	}
+}
+
+func newMockBatcher() *mockBatcher {
+	m := &mockBatcher{}
+	m.BatchCounterCalled = make(chan bool, 100)
+	m.BatchCounterInput.Name = make(chan string, 100)
+	m.BatchCounterOutput.Ret0 = make(chan metricbatcher.BatchCounterChainer, 100)
+	return m
+}
+func (m *mockBatcher) BatchCounter(name string) metricbatcher.BatchCounterChainer {
+	m.BatchCounterCalled <- true
+	m.BatchCounterInput.Name <- name
+	return <-m.BatchCounterOutput.Ret0
+}
+
+type mockDataSetter struct {
+	SetCalled chan bool
+	SetInput  struct {
+		Data chan *events.Envelope
+	}
+}
+
+func newMockDataSetter() *mockDataSetter {
+	m := &mockDataSetter{}
+	m.SetCalled = make(chan bool, 100)
+	m.SetInput.Data = make(chan *events.Envelope, 100)
+	return m
+}
+func (m *mockDataSetter) Set(data *events.Envelope) {
+	m.SetCalled <- true
+	m.SetInput.Data <- data
+}
+
 type mockBatcherSenderServer struct {
 	SendAndCloseCalled chan bool
 	SendAndCloseInput  struct {
-		Arg0 chan *plumbing.BatchSenderResponse
+		Arg0 chan *v2.BatchSenderResponse
 	}
 	SendAndCloseOutput struct {
 		Ret0 chan error
 	}
 	RecvCalled chan bool
 	RecvOutput struct {
-		Ret0 chan *plumbing.EnvelopeBatch
+		Ret0 chan *v2.EnvelopeBatch
 		Ret1 chan error
 	}
 	SetHeaderCalled chan bool
@@ -224,10 +225,10 @@ type mockBatcherSenderServer struct {
 func newMockBatcherSenderServer() *mockBatcherSenderServer {
 	m := &mockBatcherSenderServer{}
 	m.SendAndCloseCalled = make(chan bool, 100)
-	m.SendAndCloseInput.Arg0 = make(chan *plumbing.BatchSenderResponse, 100)
+	m.SendAndCloseInput.Arg0 = make(chan *v2.BatchSenderResponse, 100)
 	m.SendAndCloseOutput.Ret0 = make(chan error, 100)
 	m.RecvCalled = make(chan bool, 100)
-	m.RecvOutput.Ret0 = make(chan *plumbing.EnvelopeBatch, 100)
+	m.RecvOutput.Ret0 = make(chan *v2.EnvelopeBatch, 100)
 	m.RecvOutput.Ret1 = make(chan error, 100)
 	m.SetHeaderCalled = make(chan bool, 100)
 	m.SetHeaderInput.Arg0 = make(chan metadata.MD, 100)
@@ -247,12 +248,12 @@ func newMockBatcherSenderServer() *mockBatcherSenderServer {
 	m.RecvMsgOutput.Ret0 = make(chan error, 100)
 	return m
 }
-func (m *mockBatcherSenderServer) SendAndClose(arg0 *plumbing.BatchSenderResponse) error {
+func (m *mockBatcherSenderServer) SendAndClose(arg0 *v2.BatchSenderResponse) error {
 	m.SendAndCloseCalled <- true
 	m.SendAndCloseInput.Arg0 <- arg0
 	return <-m.SendAndCloseOutput.Ret0
 }
-func (m *mockBatcherSenderServer) Recv() (*plumbing.EnvelopeBatch, error) {
+func (m *mockBatcherSenderServer) Recv() (*v2.EnvelopeBatch, error) {
 	m.RecvCalled <- true
 	return <-m.RecvOutput.Ret0, <-m.RecvOutput.Ret1
 }

src/metric/metric_suite_test.go

@@ -70,3 +70,7 @@ func fetchReceiver(spyIngressServer *SpyIngressServer) (rx v2.Ingress_SenderServ
 	Eventually(spyIngressServer.senders, 3).Should(Receive(&rx))
 	return rx
 }
+
+func (s *SpyIngressServer) BatchSender(sender v2.Ingress_BatchSenderServer) error {
+	return nil
+}

src/metricemitter/client_test.go

@@ -214,6 +214,10 @@ func (s *SpyIngressServer) Sender(sender v2.Ingress_SenderServer) error {
 	return nil
 }
 
+func (s *SpyIngressServer) BatchSender(sender v2.Ingress_BatchSenderServer) error {
+	return nil
+}
+
 func (s *SpyIngressServer) stop() {
 	s.server.Stop()
 }

src/metron/internal/ingress/v2/receiver.go

@@ -49,3 +49,7 @@ func (s *Receiver) Sender(sender v2.Ingress_SenderServer) error {
 
 	return nil
 }
+
+func (s *Receiver) BatchSender(sender v2.Ingress_BatchSenderServer) error {
+	return nil
+}

src/plumbing/v2/doppler.proto

@@ -3,16 +3,12 @@ syntax = "proto3";
 package loggregator.v2;
 
 import "envelope.proto";
+import "ingress.proto";
 
 service DopplerIngress {
     rpc Sender(stream loggregator.v2.Envelope) returns (SenderResponse) {}
     rpc BatchSender(stream EnvelopeBatch) returns (BatchSenderResponse) {}
 }
 
-message EnvelopeBatch {
-    repeated loggregator.v2.Envelope batch = 1;
-}
 
 message SenderResponse {}
-
-message BatchSenderResponse {}