From 737534f739a383b3b51fad3a90d148518019ffb5 Mon Sep 17 00:00:00 2001 From: Marc Di Luzio Date: Fri, 10 Jul 2020 19:00:31 +0100 Subject: [PATCH] Move roveapi into the proto dir --- Makefile | 10 +++------- cmd/rove-server/internal/routes.go | 2 +- cmd/rove-server/internal/server.go | 2 +- cmd/rove/main.go | 2 +- pkg/rove/command.go | 2 +- pkg/rove/command_test.go | 2 +- pkg/rove/world.go | 2 +- pkg/rove/world_test.go | 2 +- {pkg => proto}/roveapi/roveapi.pb.go | 6 +++--- proto/roveapi/roveapi.proto | 2 +- 10 files changed, 14 insertions(+), 18 deletions(-) rename {pkg => proto}/roveapi/roveapi.pb.go (99%) diff --git a/Makefile b/Makefile index b36c19a..b73faf0 100644 --- a/Makefile +++ b/Makefile @@ -12,14 +12,10 @@ install: gen: @echo Installing go dependencies - go install \ - github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway \ - github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger \ - github.com/golang/protobuf/protoc-gen-go + go install github.com/golang/protobuf/protoc-gen-go go mod download - @echo Generating rove server gRPC and gateway - protoc --proto_path proto --go_out=plugins=grpc,paths=source_relative:pkg/ proto/roveapi/roveapi.proto - protoc --proto_path proto --grpc-gateway_out=paths=source_relative:pkg/ proto/roveapi/roveapi.proto + @echo Generating rove server gRPC + protoc --proto_path proto --go_out=plugins=grpc,paths=source_relative:proto/ proto/roveapi/roveapi.proto test: @echo Unit tests diff --git a/cmd/rove-server/internal/routes.go b/cmd/rove-server/internal/routes.go index 8e8706c..0fb41d8 100644 --- a/cmd/rove-server/internal/routes.go +++ b/cmd/rove-server/internal/routes.go @@ -6,8 +6,8 @@ import ( "log" "github.com/mdiluz/rove/pkg/rove" - "github.com/mdiluz/rove/pkg/roveapi" "github.com/mdiluz/rove/pkg/version" + "github.com/mdiluz/rove/proto/roveapi" ) // ServerStatus returns the status of the current server to a gRPC request diff --git a/cmd/rove-server/internal/server.go b/cmd/rove-server/internal/server.go index ad0c315..102c30d 100644 --- a/cmd/rove-server/internal/server.go +++ b/cmd/rove-server/internal/server.go @@ -8,7 +8,7 @@ import ( "github.com/mdiluz/rove/pkg/persistence" "github.com/mdiluz/rove/pkg/rove" - "github.com/mdiluz/rove/pkg/roveapi" + "github.com/mdiluz/rove/proto/roveapi" "github.com/robfig/cron" "google.golang.org/grpc" ) diff --git a/cmd/rove/main.go b/cmd/rove/main.go index 1ec0b24..8a19e68 100644 --- a/cmd/rove/main.go +++ b/cmd/rove/main.go @@ -12,8 +12,8 @@ import ( "github.com/mdiluz/rove/pkg/atlas" "github.com/mdiluz/rove/pkg/maths" - "github.com/mdiluz/rove/pkg/roveapi" "github.com/mdiluz/rove/pkg/version" + "github.com/mdiluz/rove/proto/roveapi" "golang.org/x/net/context" "google.golang.org/grpc" ) diff --git a/pkg/rove/command.go b/pkg/rove/command.go index 6016555..86e9cad 100644 --- a/pkg/rove/command.go +++ b/pkg/rove/command.go @@ -1,6 +1,6 @@ package rove -import "github.com/mdiluz/rove/pkg/roveapi" +import "github.com/mdiluz/rove/proto/roveapi" // Command represends a single command to execute type Command struct { diff --git a/pkg/rove/command_test.go b/pkg/rove/command_test.go index e01a487..9150fde 100644 --- a/pkg/rove/command_test.go +++ b/pkg/rove/command_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/mdiluz/rove/pkg/maths" - "github.com/mdiluz/rove/pkg/roveapi" + "github.com/mdiluz/rove/proto/roveapi" "github.com/stretchr/testify/assert" ) diff --git a/pkg/rove/world.go b/pkg/rove/world.go index b0e796f..04cad81 100644 --- a/pkg/rove/world.go +++ b/pkg/rove/world.go @@ -11,7 +11,7 @@ import ( "github.com/google/uuid" "github.com/mdiluz/rove/pkg/atlas" "github.com/mdiluz/rove/pkg/maths" - "github.com/mdiluz/rove/pkg/roveapi" + "github.com/mdiluz/rove/proto/roveapi" ) // World describes a self contained universe and everything in it diff --git a/pkg/rove/world_test.go b/pkg/rove/world_test.go index ceaff43..f3be5c0 100644 --- a/pkg/rove/world_test.go +++ b/pkg/rove/world_test.go @@ -5,7 +5,7 @@ import ( "github.com/mdiluz/rove/pkg/atlas" "github.com/mdiluz/rove/pkg/maths" - "github.com/mdiluz/rove/pkg/roveapi" + "github.com/mdiluz/rove/proto/roveapi" "github.com/stretchr/testify/assert" ) diff --git a/pkg/roveapi/roveapi.pb.go b/proto/roveapi/roveapi.pb.go similarity index 99% rename from pkg/roveapi/roveapi.pb.go rename to proto/roveapi/roveapi.pb.go index 491231d..1eeeabd 100644 --- a/pkg/roveapi/roveapi.pb.go +++ b/proto/roveapi/roveapi.pb.go @@ -1113,10 +1113,10 @@ var file_roveapi_roveapi_proto_rawDesc = []byte{ 0x61, 0x74, 0x75, 0x73, 0x12, 0x16, 0x2e, 0x72, 0x6f, 0x76, 0x65, 0x61, 0x70, 0x69, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x17, 0x2e, 0x72, 0x6f, 0x76, 0x65, 0x61, 0x70, 0x69, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x24, 0x5a, 0x22, 0x67, 0x69, 0x74, 0x68, 0x75, + 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x26, 0x5a, 0x24, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6d, 0x64, 0x69, 0x6c, 0x75, 0x7a, 0x2f, 0x72, 0x6f, 0x76, - 0x65, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x72, 0x6f, 0x76, 0x65, 0x61, 0x70, 0x69, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x72, 0x6f, 0x76, 0x65, 0x61, 0x70, 0x69, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/proto/roveapi/roveapi.proto b/proto/roveapi/roveapi.proto index f39d2a6..9dd2577 100644 --- a/proto/roveapi/roveapi.proto +++ b/proto/roveapi/roveapi.proto @@ -5,7 +5,7 @@ syntax = "proto3"; // Rove is an asychronous nomadic game about exploring a planet as part of a // loose community package roveapi; -option go_package = "github.com/mdiluz/rove/pkg/roveapi"; +option go_package = "github.com/mdiluz/rove/proto/roveapi"; // The Rove server hosts a single game session and world with multiple players service Rove {