eventmaster -> proto

wish · Aug 17, 2017 · 40323b8 · 40323b8
1 parent 470f376
commit 40323b8
Show file tree

Hide file tree

Showing 10 changed files with 60 additions and 70 deletions.
diff --git a/makefile b/makefile
@@ -1,7 +1,7 @@
 SHELL:=/bin/bash -O extglob
 
 protobuf:
-	protoc --plugin=$(GOPATH)/bin/protoc-gen-go -I eventmaster/ eventmaster/eventmaster.proto --go_out=plugins=grpc:eventmaster
+	protoc --plugin=$(GOPATH)/bin/protoc-gen-go -I proto/ proto/eventmaster.proto --go_out=plugins=grpc:proto
 
 run:
 	go run src/eventmaster/!(*_test).go -p -r -m

diff --git a/eventmaster/eventmaster.pb.go → proto/eventmaster.pb.go b/eventmaster/eventmaster.pb.go → proto/eventmaster.pb.go
diff --git a/eventmaster/eventmaster.proto → proto/eventmaster.proto b/eventmaster/eventmaster.proto → proto/eventmaster.proto
@@ -46,7 +46,6 @@ message Query {
     repeated bool sort_ascending = 14;
     int32 start = 15;
     int32 limit = 16;
-    string event_id = 17;
     bool tag_and_operator = 18;
     bool target_host_and_operator = 19;
     repeated string exclude_tag_set = 20;

diff --git a/src/eventmaster/api_handlers.go b/src/eventmaster/api_handlers.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/ContextLogic/eventmaster/eventmaster"
+	eventmaster "github.com/ContextLogic/eventmaster/proto"
 	"github.com/julienschmidt/httprouter"
 	"github.com/pkg/errors"
 )

diff --git a/src/eventmaster/data_store.go b/src/eventmaster/data_store.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/ContextLogic/eventmaster/eventmaster"
+	eventmaster "github.com/ContextLogic/eventmaster/proto"
 	cass "github.com/ContextLogic/eventmaster/src/cassandra_client"
 	servicelookup "github.com/ContextLogic/goServiceLookup/servicelookup"
 	"github.com/gocql/gocql"

diff --git a/src/eventmaster/event_store.go b/src/eventmaster/event_store.go
@@ -8,7 +8,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ContextLogic/eventmaster/eventmaster"
+	eventmaster "github.com/ContextLogic/eventmaster/proto"
 	"github.com/pkg/errors"
 	"github.com/satori/go.uuid"
 	"github.com/segmentio/ksuid"

diff --git a/src/eventmaster/eventmaster b/src/eventmaster/eventmaster
diff --git a/src/eventmaster/eventmaster.go b/src/eventmaster/eventmaster.go
@@ -13,7 +13,7 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/ContextLogic/eventmaster/eventmaster"
+	eventmaster "github.com/ContextLogic/eventmaster/proto"
 	log "github.com/Sirupsen/logrus"
 	"github.com/jessevdk/go-flags"
 	"github.com/soheilhy/cmux"

diff --git a/src/eventmaster/grpc_server.go b/src/eventmaster/grpc_server.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/ContextLogic/eventmaster/eventmaster"
+	eventmaster "github.com/ContextLogic/eventmaster/proto"
 	context "golang.org/x/net/context"
 )
 

diff --git a/src/eventmaster/ui_handlers.go b/src/eventmaster/ui_handlers.go
@@ -6,7 +6,7 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/ContextLogic/eventmaster/eventmaster"
+	eventmaster "github.com/ContextLogic/eventmaster/proto"
 	"github.com/julienschmidt/httprouter"
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ import ( @@
     	"fmt"
     	"time"
-    	"github.com/ContextLogic/eventmaster/eventmaster"
+    	eventmaster "github.com/ContextLogic/eventmaster/proto"
     	context "golang.org/x/net/context"
     )
@@ Expand Down @@