Cleanup of grpc go generation code

I'd previously generated this in two places, and looking
at it through Godoc, it seemed like a code smell.

Having the generated code in a single place seems like the cleaner
option.

Author: markmandel

build/build-image/Dockerfile

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# ForceUpdate 1 -- change here if you need to force a rebuild
+# ForceUpdate 2 -- change here if you need to force a rebuild
 
 # compiling proto + grpc takes an exceptionally long time
 # so we'll use that as the base.

build/build-image/gen-grpc-go.sh

@@ -15,8 +15,7 @@
 # limitations under the License.
 
 cd /go/src/agones.dev/agones
-protoc -I . sdk.proto --go_out=plugins=grpc:sdks/go
-cat ./build/boilerplate.go.txt ./sdks/go/sdk.pb.go >> ./sdk.pb.go
+protoc -I . sdk.proto --go_out=plugins=grpc:pkg/sdk
+cat ./build/boilerplate.go.txt ./pkg/sdk/sdk.pb.go >> ./sdk.pb.go
 goimports -w ./sdk.pb.go
-cp ./sdk.pb.go ./pkg/sdk
-mv ./sdk.pb.go ./sdks/go
+mv ./sdk.pb.go ./pkg/sdk

sdks/go/sdk.go

@@ -12,13 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// Package sdk is the Go game server sdk
 package sdk
 
 import (
 	"fmt"
-
 	"time"
 
+	"agones.dev/agones/pkg/sdk"
 	"github.com/pkg/errors"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
@@ -28,9 +29,9 @@ const port = 59357
 
 // SDK is an instance of the Agones SDK
 type SDK struct {
-	client SDKClient
+	client sdk.SDKClient
 	ctx    context.Context
-	health SDK_HealthClient
+	health sdk.SDK_HealthClient
 }
 
 // NewSDK starts a new SDK instance, and connects to
@@ -46,27 +47,27 @@ func NewSDK() (*SDK, error) {
 	if err != nil {
 		return s, errors.Wrapf(err, "could not connect to %s", addr)
 	}
-	s.client = NewSDKClient(conn)
+	s.client = sdk.NewSDKClient(conn)
 	s.health, err = s.client.Health(s.ctx)
 	return s, errors.Wrap(err, "could not set up health check")
 }
 
 // Ready marks the Game Server as ready to
 // receive connections
 func (s *SDK) Ready() error {
-	_, err := s.client.Ready(s.ctx, &Empty{})
+	_, err := s.client.Ready(s.ctx, &sdk.Empty{})
 	return errors.Wrap(err, "could not send Ready message")
 }
 
 // Shutdown marks the Game Server as ready to
 // shutdown
 func (s *SDK) Shutdown() error {
-	_, err := s.client.Shutdown(s.ctx, &Empty{})
+	_, err := s.client.Shutdown(s.ctx, &sdk.Empty{})
 	return errors.Wrapf(err, "could not send Shutdown message")
 }
 
 // Health sends a ping to the health
 // check to indicate that this server is healthy
 func (s *SDK) Health() error {
-	return errors.Wrap(s.health.Send(&Empty{}), "could not send Health ping")
+	return errors.Wrap(s.health.Send(&sdk.Empty{}), "could not send Health ping")
 }

sdks/go/sdk.pb.go

@@ -17,6 +17,7 @@ package sdk
 import (
 	"testing"
 
+	"agones.dev/agones/pkg/sdk"
 	"github.com/stretchr/testify/assert"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
@@ -50,39 +51,39 @@ func TestSDK(t *testing.T) {
 	assert.True(t, sm.shutdown)
 }
 
-var _ SDKClient = &sdkMock{}
-var _ SDK_HealthClient = &healthMock{}
+var _ sdk.SDKClient = &sdkMock{}
+var _ sdk.SDK_HealthClient = &healthMock{}
 
 type sdkMock struct {
 	ready    bool
 	shutdown bool
 	hm       *healthMock
 }
 
-func (m *sdkMock) Ready(ctx context.Context, e *Empty, opts ...grpc.CallOption) (*Empty, error) {
+func (m *sdkMock) Ready(ctx context.Context, e *sdk.Empty, opts ...grpc.CallOption) (*sdk.Empty, error) {
 	m.ready = true
 	return e, nil
 }
 
-func (m *sdkMock) Shutdown(ctx context.Context, e *Empty, opts ...grpc.CallOption) (*Empty, error) {
+func (m *sdkMock) Shutdown(ctx context.Context, e *sdk.Empty, opts ...grpc.CallOption) (*sdk.Empty, error) {
 	m.shutdown = true
 	return e, nil
 }
 
-func (m *sdkMock) Health(ctx context.Context, opts ...grpc.CallOption) (SDK_HealthClient, error) {
+func (m *sdkMock) Health(ctx context.Context, opts ...grpc.CallOption) (sdk.SDK_HealthClient, error) {
 	return m.hm, nil
 }
 
 type healthMock struct {
 	healthy bool
 }
 
-func (h *healthMock) Send(*Empty) error {
+func (h *healthMock) Send(*sdk.Empty) error {
 	h.healthy = true
 	return nil
 }
 
-func (h *healthMock) CloseAndRecv() (*Empty, error) {
+func (h *healthMock) CloseAndRecv() (*sdk.Empty, error) {
 	panic("implement me")
 }