From 1b7c6001ec1142ab1d01ef77da4ee723cc648b8c Mon Sep 17 00:00:00 2001
From: Scott Weiss <sdw35@cornell.edu>
Date: Mon, 30 Apr 2018 15:36:12 -0400
Subject: [PATCH 1/3] code generation for crd clients

Signed-off-by: Scott Weiss <sdw35@cornell.edu>
---
 Makefile                                      |   4 +
 pkg/storage/crd/crd_storage_client.go         |   1 +
 .../crd/solo.io/client_template.go.tmpl       | 171 ++++++++++++++++++
 pkg/storage/crd/solo.io/generate_clients.go   |  69 +++++++
 pkg/storage/crd/upstreams.go                  |  32 ++--
 pkg/storage/crd/virtual_services.go           |  81 ++++-----
 6 files changed, 301 insertions(+), 57 deletions(-)
 create mode 100644 pkg/storage/crd/solo.io/client_template.go.tmpl
 create mode 100644 pkg/storage/crd/solo.io/generate_clients.go

diff --git a/Makefile b/Makefile
index b5ffdd59a97..58b401f222e 100644
--- a/Makefile
+++ b/Makefile
@@ -52,6 +52,10 @@ clientset: $(GENERATED_PROTO_FILES) $(SOURCES)
 		$(PACKAGE_PATH)/pkg/storage/crd \
 		"solo.io:v1"
 
+.PHONY: generated-code
+generated-code:
+	go generate ./...
+
 $(OUTPUT):
 	mkdir -p $(OUTPUT)
 
diff --git a/pkg/storage/crd/crd_storage_client.go b/pkg/storage/crd/crd_storage_client.go
index fe210e270e4..f9fd5cc582d 100644
--- a/pkg/storage/crd/crd_storage_client.go
+++ b/pkg/storage/crd/crd_storage_client.go
@@ -18,6 +18,7 @@ import (
 	crdv1 "github.com/solo-io/gloo/pkg/storage/crd/solo.io/v1"
 )
 
+//go:generate go run ${GOPATH}/src/github.com/solo-io/gloo/pkg/storage/crd/solo.io/generate_clients.go
 type Client struct {
 	v1 *v1client
 }
diff --git a/pkg/storage/crd/solo.io/client_template.go.tmpl b/pkg/storage/crd/solo.io/client_template.go.tmpl
new file mode 100644
index 00000000000..19f9f764ed6
--- /dev/null
+++ b/pkg/storage/crd/solo.io/client_template.go.tmpl
@@ -0,0 +1,171 @@
+package crd
+
+import (
+	"time"
+
+	"github.com/pkg/errors"
+	"github.com/solo-io/gloo/pkg/api/types/v1"
+	"github.com/solo-io/gloo/pkg/storage"
+	crdclientset "github.com/solo-io/gloo/pkg/storage/crd/client/clientset/versioned"
+	crdv1 "github.com/solo-io/gloo/pkg/storage/crd/solo.io/v1"
+	apiexts "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/fields"
+
+	"github.com/solo-io/gloo/pkg/storage/crud"
+	kuberrs "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/client-go/tools/cache"
+)
+
+type {{ .LowercasePluralName }}Client struct {
+	crds    crdclientset.Interface
+	apiexts apiexts.Interface
+	// write and read objects to this namespace if not specified on the GlooObjects
+	namespace     string
+	syncFrequency time.Duration
+}
+
+func (c *{{ .LowercasePluralName }}Client) Create(item *v1.{{ .UppercaseName }}) (*v1.{{ .UppercaseName }}, error) {
+	return c.createOrUpdate{{ .UppercaseName }}Crd(item, crud.OperationCreate)
+}
+
+func (c *{{ .LowercasePluralName }}Client) Update(item *v1.{{ .UppercaseName }}) (*v1.{{ .UppercaseName }}, error) {
+	return c.createOrUpdate{{ .UppercaseName }}Crd(item, crud.OperationUpdate)
+}
+
+func (c *{{ .LowercasePluralName }}Client) Delete(name string) error {
+	return c.crds.GlooV1().{{ .UppercasePluralName }}(c.namespace).Delete(name, nil)
+}
+
+func (c *{{ .LowercasePluralName }}Client) Get(name string) (*v1.{{ .UppercaseName }}, error) {
+	crd{{ .UppercaseName }}, err := c.crds.GlooV1().{{ .UppercasePluralName }}(c.namespace).Get(name, metav1.GetOptions{})
+	if err != nil {
+		return nil, errors.Wrap(err, "failed performing get api request")
+	}
+	returned{{ .UppercaseName }}, err := {{ .UppercaseName }}FromCrd(crd{{ .UppercaseName }})
+	if err != nil {
+		return nil, errors.Wrap(err, "converting returned crd to {{ .LowercaseName }}")
+	}
+	return returned{{ .UppercaseName }}, nil
+}
+
+func (c *{{ .LowercasePluralName }}Client) List() ([]*v1.{{ .UppercaseName }}, error) {
+	crdList, err := c.crds.GlooV1().{{ .UppercasePluralName }}(c.namespace).List(metav1.ListOptions{})
+	if err != nil {
+		return nil, errors.Wrap(err, "failed performing list api request")
+	}
+	var returned{{ .UppercasePluralName }} []*v1.{{ .UppercaseName }}
+	for _, crd{{ .UppercaseName }} := range crdList.Items {
+		{{ .LowercaseName }}, err := {{ .UppercaseName }}FromCrd(&crd{{ .UppercaseName }})
+		if err != nil {
+			return nil, errors.Wrap(err, "converting returned crd to {{ .LowercaseName }}")
+		}
+		returned{{ .UppercasePluralName }} = append(returned{{ .UppercasePluralName }}, {{ .LowercaseName }})
+	}
+	return returned{{ .UppercasePluralName }}, nil
+}
+
+func (u *{{ .LowercasePluralName }}Client) Watch(handlers ...storage.{{ .UppercaseName }}EventHandler) (*storage.Watcher, error) {
+	lw := cache.NewListWatchFromClient(u.crds.GlooV1().RESTClient(), crdv1.{{ .UppercaseName }}CRD.Plural, u.namespace, fields.Everything())
+	sw := cache.NewSharedInformer(lw, new(crdv1.{{ .UppercaseName }}), u.syncFrequency)
+	for _, h := range handlers {
+		sw.AddEventHandler(&{{ .LowercaseName }}EventHandler{handler: h, store: sw.GetStore()})
+	}
+	return storage.NewWatcher(func(stop <-chan struct{}, _ chan error) {
+		sw.Run(stop)
+	}), nil
+}
+
+func (c *{{ .LowercasePluralName }}Client) createOrUpdate{{ .UppercaseName }}Crd({{ .LowercaseName }} *v1.{{ .UppercaseName }}, op crud.Operation) (*v1.{{ .UppercaseName }}, error) {
+	{{ .LowercaseName }}Crd, err := {{ .UppercaseName }}ToCrd(c.namespace, {{ .LowercaseName }})
+	if err != nil {
+		return nil, errors.Wrap(err, "converting gloo object to crd")
+	}
+	{{ .LowercasePluralName }} := c.crds.GlooV1().{{ .UppercasePluralName }}({{ .LowercaseName }}Crd.Namespace)
+	var returnedCrd *crdv1.{{ .UppercaseName }}
+	switch op {
+	case crud.OperationCreate:
+		returnedCrd, err = {{ .LowercasePluralName }}.Create({{ .LowercaseName }}Crd)
+		if err != nil {
+			if kuberrs.IsAlreadyExists(err) {
+				return nil, storage.NewAlreadyExistsErr(err)
+			}
+			return nil, errors.Wrap(err, "kubernetes create api request")
+		}
+	case crud.OperationUpdate:
+		// need to make sure we preserve labels
+		currentCrd, err := {{ .LowercasePluralName }}.Get({{ .LowercaseName }}Crd.Name, metav1.GetOptions{ResourceVersion: {{ .LowercaseName }}Crd.ResourceVersion})
+		if err != nil {
+			return nil, errors.Wrap(err, "kubernetes get api request")
+		}
+		// copy labels
+		{{ .LowercaseName }}Crd.Labels = currentCrd.Labels
+		returnedCrd, err = {{ .LowercasePluralName }}.Update({{ .LowercaseName }}Crd)
+		if err != nil {
+			return nil, errors.Wrap(err, "kubernetes update api request")
+		}
+	}
+	returned{{ .UppercaseName }}, err := {{ .UppercaseName }}FromCrd(returnedCrd)
+	if err != nil {
+		return nil, errors.Wrap(err, "converting returned crd to {{ .LowercaseName }}")
+	}
+	return returned{{ .UppercaseName }}, nil
+}
+
+// implements the kubernetes ResourceEventHandler interface
+type {{ .LowercaseName }}EventHandler struct {
+	handler storage.{{ .UppercaseName }}EventHandler
+	store   cache.Store
+}
+
+func (eh *{{ .LowercaseName }}EventHandler) getUpdatedList() []*v1.{{ .UppercaseName }} {
+	updatedList := eh.store.List()
+	var updated{{ .UppercaseName }}List []*v1.{{ .UppercaseName }}
+	for _, updated := range updatedList {
+		{{ .LowercaseName }}Crd, ok := updated.(*crdv1.{{ .UppercaseName }})
+		if !ok {
+			continue
+		}
+		updated{{ .UppercaseName }}, err := {{ .UppercaseName }}FromCrd({{ .LowercaseName }}Crd)
+		if err != nil {
+			continue
+		}
+		updated{{ .UppercaseName }}List = append(updated{{ .UppercaseName }}List, updated{{ .UppercaseName }})
+	}
+	return updated{{ .UppercaseName }}List
+}
+
+func convert{{ .UppercaseName }}(obj interface{}) (*v1.{{ .UppercaseName }}, bool) {
+	{{ .LowercaseName }}Crd, ok := obj.(*crdv1.{{ .UppercaseName }})
+	if !ok {
+		return nil, ok
+	}
+	{{ .LowercaseName }}, err := {{ .UppercaseName }}FromCrd({{ .LowercaseName }}Crd)
+	if err != nil {
+		return nil, false
+	}
+	return {{ .LowercaseName }}, ok
+}
+
+func (eh *{{ .LowercaseName }}EventHandler) OnAdd(obj interface{}) {
+	{{ .LowercaseName }}, ok := convert{{ .UppercaseName }}(obj)
+	if !ok {
+		return
+	}
+	eh.handler.OnAdd(eh.getUpdatedList(), {{ .LowercaseName }})
+}
+func (eh *{{ .LowercaseName }}EventHandler) OnUpdate(_, newObj interface{}) {
+	new{{ .UppercaseName }}, ok := convert{{ .UppercaseName }}(newObj)
+	if !ok {
+		return
+	}
+	eh.handler.OnUpdate(eh.getUpdatedList(), new{{ .UppercaseName }})
+}
+
+func (eh *{{ .LowercaseName }}EventHandler) OnDelete(obj interface{}) {
+	{{ .LowercaseName }}, ok := convert{{ .UppercaseName }}(obj)
+	if !ok {
+		return
+	}
+	eh.handler.OnDelete(eh.getUpdatedList(), {{ .LowercaseName }})
+}
diff --git a/pkg/storage/crd/solo.io/generate_clients.go b/pkg/storage/crd/solo.io/generate_clients.go
new file mode 100644
index 00000000000..255cc998bef
--- /dev/null
+++ b/pkg/storage/crd/solo.io/generate_clients.go
@@ -0,0 +1,69 @@
+package main
+
+import (
+	"flag"
+	"github.com/solo-io/gloo/test/helpers"
+	"path/filepath"
+	"github.com/solo-io/gloo/pkg/log"
+	"github.com/pkg/errors"
+	"bytes"
+	"io/ioutil"
+	"text/template"
+)
+
+type clientType struct {
+	FilenamePrefix string
+	LowercaseName       string
+	LowercasePluralName string
+	UppercaseName       string
+	UppercasePluralName string
+}
+
+var clients = []clientType{
+	{
+		FilenamePrefix: "upstreams",
+		LowercaseName:       "upstream",
+		LowercasePluralName: "upstreams",
+		UppercaseName:       "Upstream",
+		UppercasePluralName: "Upstreams",
+	},
+	{
+		FilenamePrefix: "virtual_services",
+		LowercaseName:       "virtualService",
+		LowercasePluralName: "virtualServices",
+		UppercaseName:       "VirtualService",
+		UppercasePluralName: "VirtualServices",
+	},
+}
+
+func main() {
+	baseDir := filepath.Join(helpers.GlooSoloDirectory(), "pkg", "storage", "crd")
+	inputFile := flag.String("f", filepath.Join(baseDir, "solo.io", "client_template.go.tmpl"), "input client template")
+	outputDirectory := flag.String("o", baseDir, "output directory for client files")
+	flag.Parse()
+	if err := writeClientTemplates(*inputFile, *outputDirectory); err != nil {
+		log.Fatalf("failed generating client templates: %s", err.Error())
+	}
+	log.Printf("success")
+}
+
+func writeClientTemplates(inputFile, outputDir string) error {
+	fileName := filepath.Base(inputFile)
+	for _, client := range clients {
+		tmpl, err := template.New("Test_Resources").ParseFiles(inputFile)
+		if err != nil {
+			return errors.Wrap(err, "parsing template from "+inputFile)
+		}
+
+		buf := &bytes.Buffer{}
+		if err := tmpl.ExecuteTemplate(buf, fileName, client); err != nil {
+			return errors.Wrap(err, "executing template")
+		}
+
+		err = ioutil.WriteFile(filepath.Join(outputDir, client.FilenamePrefix+".go"), buf.Bytes(), 0644)
+		if err != nil {
+			return errors.Wrap(err, "writing generated client bytes")
+		}
+	}
+	return nil
+}
diff --git a/pkg/storage/crd/upstreams.go b/pkg/storage/crd/upstreams.go
index 6f754f350ce..16afc4e7d64 100644
--- a/pkg/storage/crd/upstreams.go
+++ b/pkg/storage/crd/upstreams.go
@@ -38,11 +38,11 @@ func (c *upstreamsClient) Delete(name string) error {
 }
 
 func (c *upstreamsClient) Get(name string) (*v1.Upstream, error) {
-	crdUs, err := c.crds.GlooV1().Upstreams(c.namespace).Get(name, metav1.GetOptions{})
+	crdUpstream, err := c.crds.GlooV1().Upstreams(c.namespace).Get(name, metav1.GetOptions{})
 	if err != nil {
 		return nil, errors.Wrap(err, "failed performing get api request")
 	}
-	returnedUpstream, err := UpstreamFromCrd(crdUs)
+	returnedUpstream, err := UpstreamFromCrd(crdUpstream)
 	if err != nil {
 		return nil, errors.Wrap(err, "converting returned crd to upstream")
 	}
@@ -55,8 +55,8 @@ func (c *upstreamsClient) List() ([]*v1.Upstream, error) {
 		return nil, errors.Wrap(err, "failed performing list api request")
 	}
 	var returnedUpstreams []*v1.Upstream
-	for _, crdUs := range crdList.Items {
-		upstream, err := UpstreamFromCrd(&crdUs)
+	for _, crdUpstream := range crdList.Items {
+		upstream, err := UpstreamFromCrd(&crdUpstream)
 		if err != nil {
 			return nil, errors.Wrap(err, "converting returned crd to upstream")
 		}
@@ -122,11 +122,11 @@ func (eh *upstreamEventHandler) getUpdatedList() []*v1.Upstream {
 	updatedList := eh.store.List()
 	var updatedUpstreamList []*v1.Upstream
 	for _, updated := range updatedList {
-		usCrd, ok := updated.(*crdv1.Upstream)
+		upstreamCrd, ok := updated.(*crdv1.Upstream)
 		if !ok {
 			continue
 		}
-		updatedUpstream, err := UpstreamFromCrd(usCrd)
+		updatedUpstream, err := UpstreamFromCrd(upstreamCrd)
 		if err != nil {
 			continue
 		}
@@ -135,37 +135,37 @@ func (eh *upstreamEventHandler) getUpdatedList() []*v1.Upstream {
 	return updatedUpstreamList
 }
 
-func convertUs(obj interface{}) (*v1.Upstream, bool) {
-	usCrd, ok := obj.(*crdv1.Upstream)
+func convertUpstream(obj interface{}) (*v1.Upstream, bool) {
+	upstreamCrd, ok := obj.(*crdv1.Upstream)
 	if !ok {
 		return nil, ok
 	}
-	us, err := UpstreamFromCrd(usCrd)
+	upstream, err := UpstreamFromCrd(upstreamCrd)
 	if err != nil {
 		return nil, false
 	}
-	return us, ok
+	return upstream, ok
 }
 
 func (eh *upstreamEventHandler) OnAdd(obj interface{}) {
-	us, ok := convertUs(obj)
+	upstream, ok := convertUpstream(obj)
 	if !ok {
 		return
 	}
-	eh.handler.OnAdd(eh.getUpdatedList(), us)
+	eh.handler.OnAdd(eh.getUpdatedList(), upstream)
 }
 func (eh *upstreamEventHandler) OnUpdate(_, newObj interface{}) {
-	newUs, ok := convertUs(newObj)
+	newUpstream, ok := convertUpstream(newObj)
 	if !ok {
 		return
 	}
-	eh.handler.OnUpdate(eh.getUpdatedList(), newUs)
+	eh.handler.OnUpdate(eh.getUpdatedList(), newUpstream)
 }
 
 func (eh *upstreamEventHandler) OnDelete(obj interface{}) {
-	us, ok := convertUs(obj)
+	upstream, ok := convertUpstream(obj)
 	if !ok {
 		return
 	}
-	eh.handler.OnDelete(eh.getUpdatedList(), us)
+	eh.handler.OnDelete(eh.getUpdatedList(), upstream)
 }
diff --git a/pkg/storage/crd/virtual_services.go b/pkg/storage/crd/virtual_services.go
index 801aec317bd..74829318717 100644
--- a/pkg/storage/crd/virtual_services.go
+++ b/pkg/storage/crd/virtual_services.go
@@ -25,38 +25,38 @@ type virtualServicesClient struct {
 	syncFrequency time.Duration
 }
 
-func (v *virtualServicesClient) Create(item *v1.VirtualService) (*v1.VirtualService, error) {
-	return v.createOrUpdateVirtualServiceCrd(item, crud.OperationCreate)
+func (c *virtualServicesClient) Create(item *v1.VirtualService) (*v1.VirtualService, error) {
+	return c.createOrUpdateVirtualServiceCrd(item, crud.OperationCreate)
 }
 
-func (v *virtualServicesClient) Update(item *v1.VirtualService) (*v1.VirtualService, error) {
-	return v.createOrUpdateVirtualServiceCrd(item, crud.OperationUpdate)
+func (c *virtualServicesClient) Update(item *v1.VirtualService) (*v1.VirtualService, error) {
+	return c.createOrUpdateVirtualServiceCrd(item, crud.OperationUpdate)
 }
 
-func (v *virtualServicesClient) Delete(name string) error {
-	return v.crds.GlooV1().VirtualServices(v.namespace).Delete(name, nil)
+func (c *virtualServicesClient) Delete(name string) error {
+	return c.crds.GlooV1().VirtualServices(c.namespace).Delete(name, nil)
 }
 
-func (v *virtualServicesClient) Get(name string) (*v1.VirtualService, error) {
-	crdVh, err := v.crds.GlooV1().VirtualServices(v.namespace).Get(name, metav1.GetOptions{})
+func (c *virtualServicesClient) Get(name string) (*v1.VirtualService, error) {
+	crdVirtualService, err := c.crds.GlooV1().VirtualServices(c.namespace).Get(name, metav1.GetOptions{})
 	if err != nil {
 		return nil, errors.Wrap(err, "failed performing get api request")
 	}
-	returnedVirtualService, err := VirtualServiceFromCrd(crdVh)
+	returnedVirtualService, err := VirtualServiceFromCrd(crdVirtualService)
 	if err != nil {
 		return nil, errors.Wrap(err, "converting returned crd to virtualService")
 	}
 	return returnedVirtualService, nil
 }
 
-func (v *virtualServicesClient) List() ([]*v1.VirtualService, error) {
-	crdList, err := v.crds.GlooV1().VirtualServices(v.namespace).List(metav1.ListOptions{})
+func (c *virtualServicesClient) List() ([]*v1.VirtualService, error) {
+	crdList, err := c.crds.GlooV1().VirtualServices(c.namespace).List(metav1.ListOptions{})
 	if err != nil {
 		return nil, errors.Wrap(err, "failed performing list api request")
 	}
 	var returnedVirtualServices []*v1.VirtualService
-	for _, crdVh := range crdList.Items {
-		virtualService, err := VirtualServiceFromCrd(&crdVh)
+	for _, crdVirtualService := range crdList.Items {
+		virtualService, err := VirtualServiceFromCrd(&crdVirtualService)
 		if err != nil {
 			return nil, errors.Wrap(err, "converting returned crd to virtualService")
 		}
@@ -65,9 +65,9 @@ func (v *virtualServicesClient) List() ([]*v1.VirtualService, error) {
 	return returnedVirtualServices, nil
 }
 
-func (v *virtualServicesClient) Watch(handlers ...storage.VirtualServiceEventHandler) (*storage.Watcher, error) {
-	lw := cache.NewListWatchFromClient(v.crds.GlooV1().RESTClient(), crdv1.VirtualServiceCRD.Plural, v.namespace, fields.Everything())
-	sw := cache.NewSharedInformer(lw, new(crdv1.VirtualService), v.syncFrequency)
+func (u *virtualServicesClient) Watch(handlers ...storage.VirtualServiceEventHandler) (*storage.Watcher, error) {
+	lw := cache.NewListWatchFromClient(u.crds.GlooV1().RESTClient(), crdv1.VirtualServiceCRD.Plural, u.namespace, fields.Everything())
+	sw := cache.NewSharedInformer(lw, new(crdv1.VirtualService), u.syncFrequency)
 	for _, h := range handlers {
 		sw.AddEventHandler(&virtualServiceEventHandler{handler: h, store: sw.GetStore()})
 	}
@@ -76,41 +76,40 @@ func (v *virtualServicesClient) Watch(handlers ...storage.VirtualServiceEventHan
 	}), nil
 }
 
-func (v *virtualServicesClient) createOrUpdateVirtualServiceCrd(virtualService *v1.VirtualService, op crud.Operation) (*v1.VirtualService, error) {
-	vServiceCrd, err := VirtualServiceToCrd(v.namespace, virtualService)
+func (c *virtualServicesClient) createOrUpdateVirtualServiceCrd(virtualService *v1.VirtualService, op crud.Operation) (*v1.VirtualService, error) {
+	virtualServiceCrd, err := VirtualServiceToCrd(c.namespace, virtualService)
 	if err != nil {
 		return nil, errors.Wrap(err, "converting gloo object to crd")
 	}
-	vServices := v.crds.GlooV1().VirtualServices(vServiceCrd.Namespace)
+	virtualServices := c.crds.GlooV1().VirtualServices(virtualServiceCrd.Namespace)
 	var returnedCrd *crdv1.VirtualService
 	switch op {
 	case crud.OperationCreate:
-		returnedCrd, err = vServices.Create(vServiceCrd)
+		returnedCrd, err = virtualServices.Create(virtualServiceCrd)
 		if err != nil {
 			if kuberrs.IsAlreadyExists(err) {
 				return nil, storage.NewAlreadyExistsErr(err)
 			}
-			err = errors.Wrap(err, "kubernetes create api request")
-			return nil, err
+			return nil, errors.Wrap(err, "kubernetes create api request")
 		}
 	case crud.OperationUpdate:
-		// need to make sure we preserve labels and annotations
-		currentCrd, err := vServices.Get(vServiceCrd.Name, metav1.GetOptions{ResourceVersion: vServiceCrd.ResourceVersion})
+		// need to make sure we preserve labels
+		currentCrd, err := virtualServices.Get(virtualServiceCrd.Name, metav1.GetOptions{ResourceVersion: virtualServiceCrd.ResourceVersion})
 		if err != nil {
 			return nil, errors.Wrap(err, "kubernetes get api request")
 		}
 		// copy labels
-		vServiceCrd.Labels = currentCrd.Labels
-		returnedCrd, err = vServices.Update(vServiceCrd)
+		virtualServiceCrd.Labels = currentCrd.Labels
+		returnedCrd, err = virtualServices.Update(virtualServiceCrd)
 		if err != nil {
 			return nil, errors.Wrap(err, "kubernetes update api request")
 		}
 	}
-	returnedvService, err := VirtualServiceFromCrd(returnedCrd)
+	returnedVirtualService, err := VirtualServiceFromCrd(returnedCrd)
 	if err != nil {
 		return nil, errors.Wrap(err, "converting returned crd to virtualService")
 	}
-	return returnedvService, nil
+	return returnedVirtualService, nil
 }
 
 // implements the kubernetes ResourceEventHandler interface
@@ -123,11 +122,11 @@ func (eh *virtualServiceEventHandler) getUpdatedList() []*v1.VirtualService {
 	updatedList := eh.store.List()
 	var updatedVirtualServiceList []*v1.VirtualService
 	for _, updated := range updatedList {
-		vsCrd, ok := updated.(*crdv1.VirtualService)
+		virtualServiceCrd, ok := updated.(*crdv1.VirtualService)
 		if !ok {
 			continue
 		}
-		updatedVirtualService, err := VirtualServiceFromCrd(vsCrd)
+		updatedVirtualService, err := VirtualServiceFromCrd(virtualServiceCrd)
 		if err != nil {
 			continue
 		}
@@ -136,37 +135,37 @@ func (eh *virtualServiceEventHandler) getUpdatedList() []*v1.VirtualService {
 	return updatedVirtualServiceList
 }
 
-func convertVh(obj interface{}) (*v1.VirtualService, bool) {
-	vsCrd, ok := obj.(*crdv1.VirtualService)
+func convertVirtualService(obj interface{}) (*v1.VirtualService, bool) {
+	virtualServiceCrd, ok := obj.(*crdv1.VirtualService)
 	if !ok {
-		return nil, false
+		return nil, ok
 	}
-	vs, err := VirtualServiceFromCrd(vsCrd)
+	virtualService, err := VirtualServiceFromCrd(virtualServiceCrd)
 	if err != nil {
 		return nil, false
 	}
-	return vs, ok
+	return virtualService, ok
 }
 
 func (eh *virtualServiceEventHandler) OnAdd(obj interface{}) {
-	vs, ok := convertVh(obj)
+	virtualService, ok := convertVirtualService(obj)
 	if !ok {
 		return
 	}
-	eh.handler.OnAdd(eh.getUpdatedList(), vs)
+	eh.handler.OnAdd(eh.getUpdatedList(), virtualService)
 }
 func (eh *virtualServiceEventHandler) OnUpdate(_, newObj interface{}) {
-	newVh, ok := convertVh(newObj)
+	newVirtualService, ok := convertVirtualService(newObj)
 	if !ok {
 		return
 	}
-	eh.handler.OnUpdate(eh.getUpdatedList(), newVh)
+	eh.handler.OnUpdate(eh.getUpdatedList(), newVirtualService)
 }
 
 func (eh *virtualServiceEventHandler) OnDelete(obj interface{}) {
-	vs, ok := convertVh(obj)
+	virtualService, ok := convertVirtualService(obj)
 	if !ok {
 		return
 	}
-	eh.handler.OnDelete(eh.getUpdatedList(), vs)
+	eh.handler.OnDelete(eh.getUpdatedList(), virtualService)
 }

From a13b65eb5aa0c0d161166378bc964d5603498b59 Mon Sep 17 00:00:00 2001
From: Scott Weiss <sdw35@cornell.edu>
Date: Mon, 30 Apr 2018 15:37:50 -0400
Subject: [PATCH 2/3] rerun generated code because why not

Signed-off-by: Scott Weiss <sdw35@cornell.edu>
---
 Makefile                                      |   2 +-
 .../grpc/annotations.google.descriptor.go     |   2 +-
 .../grpc/descriptors.google.descriptor.go     |   2 +-
 pkg/plugins/grpc/http.google.descriptor.go    |   2 +-
 .../bookstore/protos/bookstore.pb.go          |  82 +++++++++---------
 .../grpc-test-service/descriptors/proto.pb    | Bin 70006 -> 71064 bytes
 .../containers/grpc-test-service/main.go      |   2 +-
 .../glootest/protos/glootest.pb.go            |  24 +++--
 .../test_grpc_service/testgrpcservice.go      |   2 +-
 9 files changed, 57 insertions(+), 61 deletions(-)

diff --git a/Makefile b/Makefile
index 58b401f222e..90079973f45 100644
--- a/Makefile
+++ b/Makefile
@@ -58,7 +58,7 @@ generated-code:
 
 $(OUTPUT):
 	mkdir -p $(OUTPUT)
-
+	
 define BINARY_TARGETS
 $(eval VERSION := $(shell cat cmd/$(BINARY)/version))
 $(eval IMAGE_TAG ?= $(VERSION))
diff --git a/pkg/plugins/grpc/annotations.google.descriptor.go b/pkg/plugins/grpc/annotations.google.descriptor.go
index 724d82ad53f..a12f724665c 100644
--- a/pkg/plugins/grpc/annotations.google.descriptor.go
+++ b/pkg/plugins/grpc/annotations.google.descriptor.go
@@ -1,5 +1,5 @@
 // File generated by 2gobytes v0.4.2 (http://github.com/paulvollmer/2gobytes)
-// date: 2018-03-26 17:11:23.759194828 -0400 EDT m=+0.003949926
+// date: 2018-04-30 15:35:58.274663731 -0400 EDT m=+0.004028854
 
 package grpc
 
diff --git a/pkg/plugins/grpc/descriptors.google.descriptor.go b/pkg/plugins/grpc/descriptors.google.descriptor.go
index ea89865f56b..6eb2848454d 100644
--- a/pkg/plugins/grpc/descriptors.google.descriptor.go
+++ b/pkg/plugins/grpc/descriptors.google.descriptor.go
@@ -1,5 +1,5 @@
 // File generated by 2gobytes v0.4.2 (http://github.com/paulvollmer/2gobytes)
-// date: 2018-03-26 17:11:24.473888857 -0400 EDT m=+0.640458305
+// date: 2018-04-30 15:35:59.244912996 -0400 EDT m=+0.887079990
 
 package grpc
 
diff --git a/pkg/plugins/grpc/http.google.descriptor.go b/pkg/plugins/grpc/http.google.descriptor.go
index a974f9fd15f..19f54e91c0c 100644
--- a/pkg/plugins/grpc/http.google.descriptor.go
+++ b/pkg/plugins/grpc/http.google.descriptor.go
@@ -1,5 +1,5 @@
 // File generated by 2gobytes v0.4.2 (http://github.com/paulvollmer/2gobytes)
-// date: 2018-03-26 17:11:23.830848683 -0400 EDT m=+0.070306137
+// date: 2018-04-30 15:35:58.355959251 -0400 EDT m=+0.079986258
 
 package grpc
 
diff --git a/test/kube_e2e/containers/grpc-test-service/bookstore/protos/bookstore.pb.go b/test/kube_e2e/containers/grpc-test-service/bookstore/protos/bookstore.pb.go
index 3964b97d4c6..b6fa8dfc59b 100644
--- a/test/kube_e2e/containers/grpc-test-service/bookstore/protos/bookstore.pb.go
+++ b/test/kube_e2e/containers/grpc-test-service/bookstore/protos/bookstore.pb.go
@@ -1,4 +1,4 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
+// Code generated by protoc-gen-gogo. DO NOT EDIT.
 // source: protos/bookstore.proto
 
 /*
@@ -24,16 +24,14 @@ It has these top-level messages:
 */
 package bookstore
 
-import proto "github.com/golang/protobuf/proto"
+import proto "github.com/gogo/protobuf/proto"
 import fmt "fmt"
 import math "math"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
 import google_protobuf1 "github.com/golang/protobuf/ptypes/empty"
 
-import (
-	context "golang.org/x/net/context"
-	grpc "google.golang.org/grpc"
-)
+import context "golang.org/x/net/context"
+import grpc "google.golang.org/grpc"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -44,7 +42,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
 
 type Author_Gender int32
 
@@ -68,20 +66,20 @@ var Author_Gender_value = map[string]int32{
 func (x Author_Gender) String() string {
 	return proto.EnumName(Author_Gender_name, int32(x))
 }
-func (Author_Gender) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{2, 0} }
+func (Author_Gender) EnumDescriptor() ([]byte, []int) { return fileDescriptorBookstore, []int{2, 0} }
 
 // A shelf resource.
 type Shelf struct {
 	// A unique shelf id.
-	Id int64 `protobuf:"varint,1,opt,name=id" json:"id,omitempty"`
+	Id int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
 	// A theme of the shelf (fiction, poetry, etc).
-	Theme string `protobuf:"bytes,2,opt,name=theme" json:"theme,omitempty"`
+	Theme string `protobuf:"bytes,2,opt,name=theme,proto3" json:"theme,omitempty"`
 }
 
 func (m *Shelf) Reset()                    { *m = Shelf{} }
 func (m *Shelf) String() string            { return proto.CompactTextString(m) }
 func (*Shelf) ProtoMessage()               {}
-func (*Shelf) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (*Shelf) Descriptor() ([]byte, []int) { return fileDescriptorBookstore, []int{0} }
 
 func (m *Shelf) GetId() int64 {
 	if m != nil {
@@ -100,11 +98,11 @@ func (m *Shelf) GetTheme() string {
 // A book resource.
 type Book struct {
 	// A unique book id.
-	Id int64 `protobuf:"varint,1,opt,name=id" json:"id,omitempty"`
+	Id int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
 	// An author of the book.
-	Author string `protobuf:"bytes,2,opt,name=author" json:"author,omitempty"`
+	Author string `protobuf:"bytes,2,opt,name=author,proto3" json:"author,omitempty"`
 	// A book title.
-	Title string `protobuf:"bytes,3,opt,name=title" json:"title,omitempty"`
+	Title string `protobuf:"bytes,3,opt,name=title,proto3" json:"title,omitempty"`
 	// Quotes from the book.
 	Quotes []string `protobuf:"bytes,4,rep,name=quotes" json:"quotes,omitempty"`
 }
@@ -112,7 +110,7 @@ type Book struct {
 func (m *Book) Reset()                    { *m = Book{} }
 func (m *Book) String() string            { return proto.CompactTextString(m) }
 func (*Book) ProtoMessage()               {}
-func (*Book) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (*Book) Descriptor() ([]byte, []int) { return fileDescriptorBookstore, []int{1} }
 
 func (m *Book) GetId() int64 {
 	if m != nil {
@@ -145,16 +143,16 @@ func (m *Book) GetQuotes() []string {
 // An author resource.
 type Author struct {
 	// A unique author id.
-	Id        int64         `protobuf:"varint,1,opt,name=id" json:"id,omitempty"`
-	Gender    Author_Gender `protobuf:"varint,2,opt,name=gender,enum=bookstore.Author_Gender" json:"gender,omitempty"`
-	FirstName string        `protobuf:"bytes,3,opt,name=first_name,json=firstName" json:"first_name,omitempty"`
-	LastName  string        `protobuf:"bytes,4,opt,name=last_name,json=lname" json:"last_name,omitempty"`
+	Id        int64         `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
+	Gender    Author_Gender `protobuf:"varint,2,opt,name=gender,proto3,enum=bookstore.Author_Gender" json:"gender,omitempty"`
+	FirstName string        `protobuf:"bytes,3,opt,name=first_name,json=firstName,proto3" json:"first_name,omitempty"`
+	LastName  string        `protobuf:"bytes,4,opt,name=last_name,json=lname,proto3" json:"last_name,omitempty"`
 }
 
 func (m *Author) Reset()                    { *m = Author{} }
 func (m *Author) String() string            { return proto.CompactTextString(m) }
 func (*Author) ProtoMessage()               {}
-func (*Author) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+func (*Author) Descriptor() ([]byte, []int) { return fileDescriptorBookstore, []int{2} }
 
 func (m *Author) GetId() int64 {
 	if m != nil {
@@ -193,7 +191,7 @@ type ListShelvesResponse struct {
 func (m *ListShelvesResponse) Reset()                    { *m = ListShelvesResponse{} }
 func (m *ListShelvesResponse) String() string            { return proto.CompactTextString(m) }
 func (*ListShelvesResponse) ProtoMessage()               {}
-func (*ListShelvesResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+func (*ListShelvesResponse) Descriptor() ([]byte, []int) { return fileDescriptorBookstore, []int{3} }
 
 func (m *ListShelvesResponse) GetShelves() []*Shelf {
 	if m != nil {
@@ -211,7 +209,7 @@ type CreateShelfRequest struct {
 func (m *CreateShelfRequest) Reset()                    { *m = CreateShelfRequest{} }
 func (m *CreateShelfRequest) String() string            { return proto.CompactTextString(m) }
 func (*CreateShelfRequest) ProtoMessage()               {}
-func (*CreateShelfRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+func (*CreateShelfRequest) Descriptor() ([]byte, []int) { return fileDescriptorBookstore, []int{4} }
 
 func (m *CreateShelfRequest) GetShelf() *Shelf {
 	if m != nil {
@@ -223,13 +221,13 @@ func (m *CreateShelfRequest) GetShelf() *Shelf {
 // Request message for GetShelf method.
 type GetShelfRequest struct {
 	// The ID of the shelf resource to retrieve.
-	Shelf int64 `protobuf:"varint,1,opt,name=shelf" json:"shelf,omitempty"`
+	Shelf int64 `protobuf:"varint,1,opt,name=shelf,proto3" json:"shelf,omitempty"`
 }
 
 func (m *GetShelfRequest) Reset()                    { *m = GetShelfRequest{} }
 func (m *GetShelfRequest) String() string            { return proto.CompactTextString(m) }
 func (*GetShelfRequest) ProtoMessage()               {}
-func (*GetShelfRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+func (*GetShelfRequest) Descriptor() ([]byte, []int) { return fileDescriptorBookstore, []int{5} }
 
 func (m *GetShelfRequest) GetShelf() int64 {
 	if m != nil {
@@ -241,13 +239,13 @@ func (m *GetShelfRequest) GetShelf() int64 {
 // Request message for DeleteShelf method.
 type DeleteShelfRequest struct {
 	// The ID of the shelf to delete.
-	Shelf int64 `protobuf:"varint,1,opt,name=shelf" json:"shelf,omitempty"`
+	Shelf int64 `protobuf:"varint,1,opt,name=shelf,proto3" json:"shelf,omitempty"`
 }
 
 func (m *DeleteShelfRequest) Reset()                    { *m = DeleteShelfRequest{} }
 func (m *DeleteShelfRequest) String() string            { return proto.CompactTextString(m) }
 func (*DeleteShelfRequest) ProtoMessage()               {}
-func (*DeleteShelfRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+func (*DeleteShelfRequest) Descriptor() ([]byte, []int) { return fileDescriptorBookstore, []int{6} }
 
 func (m *DeleteShelfRequest) GetShelf() int64 {
 	if m != nil {
@@ -259,13 +257,13 @@ func (m *DeleteShelfRequest) GetShelf() int64 {
 // Request message for ListBooks method.
 type ListBooksRequest struct {
 	// ID of the shelf which books to list.
-	Shelf int64 `protobuf:"varint,1,opt,name=shelf" json:"shelf,omitempty"`
+	Shelf int64 `protobuf:"varint,1,opt,name=shelf,proto3" json:"shelf,omitempty"`
 }
 
 func (m *ListBooksRequest) Reset()                    { *m = ListBooksRequest{} }
 func (m *ListBooksRequest) String() string            { return proto.CompactTextString(m) }
 func (*ListBooksRequest) ProtoMessage()               {}
-func (*ListBooksRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+func (*ListBooksRequest) Descriptor() ([]byte, []int) { return fileDescriptorBookstore, []int{7} }
 
 func (m *ListBooksRequest) GetShelf() int64 {
 	if m != nil {
@@ -277,7 +275,7 @@ func (m *ListBooksRequest) GetShelf() int64 {
 // Request message for CreateBook method.
 type CreateBookRequest struct {
 	// The ID of the shelf on which to create a book.
-	Shelf int64 `protobuf:"varint,1,opt,name=shelf" json:"shelf,omitempty"`
+	Shelf int64 `protobuf:"varint,1,opt,name=shelf,proto3" json:"shelf,omitempty"`
 	// A book resource to create on the shelf.
 	Book *Book `protobuf:"bytes,2,opt,name=book" json:"book,omitempty"`
 }
@@ -285,7 +283,7 @@ type CreateBookRequest struct {
 func (m *CreateBookRequest) Reset()                    { *m = CreateBookRequest{} }
 func (m *CreateBookRequest) String() string            { return proto.CompactTextString(m) }
 func (*CreateBookRequest) ProtoMessage()               {}
-func (*CreateBookRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
+func (*CreateBookRequest) Descriptor() ([]byte, []int) { return fileDescriptorBookstore, []int{8} }
 
 func (m *CreateBookRequest) GetShelf() int64 {
 	if m != nil {
@@ -304,15 +302,15 @@ func (m *CreateBookRequest) GetBook() *Book {
 // Request message for GetBook method.
 type GetBookRequest struct {
 	// The ID of the shelf from which to retrieve a book.
-	Shelf int64 `protobuf:"varint,1,opt,name=shelf" json:"shelf,omitempty"`
+	Shelf int64 `protobuf:"varint,1,opt,name=shelf,proto3" json:"shelf,omitempty"`
 	// The ID of the book to retrieve.
-	Book int64 `protobuf:"varint,2,opt,name=book" json:"book,omitempty"`
+	Book int64 `protobuf:"varint,2,opt,name=book,proto3" json:"book,omitempty"`
 }
 
 func (m *GetBookRequest) Reset()                    { *m = GetBookRequest{} }
 func (m *GetBookRequest) String() string            { return proto.CompactTextString(m) }
 func (*GetBookRequest) ProtoMessage()               {}
-func (*GetBookRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
+func (*GetBookRequest) Descriptor() ([]byte, []int) { return fileDescriptorBookstore, []int{9} }
 
 func (m *GetBookRequest) GetShelf() int64 {
 	if m != nil {
@@ -331,7 +329,7 @@ func (m *GetBookRequest) GetBook() int64 {
 // Request message for UpdateBook method
 type UpdateBookRequest struct {
 	// The ID of the shelf from which to retrieve a book.
-	Shelf int64 `protobuf:"varint,1,opt,name=shelf" json:"shelf,omitempty"`
+	Shelf int64 `protobuf:"varint,1,opt,name=shelf,proto3" json:"shelf,omitempty"`
 	// A book resource to update on the shelf.
 	Book *Book `protobuf:"bytes,2,opt,name=book" json:"book,omitempty"`
 }
@@ -339,7 +337,7 @@ type UpdateBookRequest struct {
 func (m *UpdateBookRequest) Reset()                    { *m = UpdateBookRequest{} }
 func (m *UpdateBookRequest) String() string            { return proto.CompactTextString(m) }
 func (*UpdateBookRequest) ProtoMessage()               {}
-func (*UpdateBookRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
+func (*UpdateBookRequest) Descriptor() ([]byte, []int) { return fileDescriptorBookstore, []int{10} }
 
 func (m *UpdateBookRequest) GetShelf() int64 {
 	if m != nil {
@@ -358,15 +356,15 @@ func (m *UpdateBookRequest) GetBook() *Book {
 // Request message for DeleteBook method.
 type DeleteBookRequest struct {
 	// The ID of the shelf from which to delete a book.
-	Shelf int64 `protobuf:"varint,1,opt,name=shelf" json:"shelf,omitempty"`
+	Shelf int64 `protobuf:"varint,1,opt,name=shelf,proto3" json:"shelf,omitempty"`
 	// The ID of the book to delete.
-	Book int64 `protobuf:"varint,2,opt,name=book" json:"book,omitempty"`
+	Book int64 `protobuf:"varint,2,opt,name=book,proto3" json:"book,omitempty"`
 }
 
 func (m *DeleteBookRequest) Reset()                    { *m = DeleteBookRequest{} }
 func (m *DeleteBookRequest) String() string            { return proto.CompactTextString(m) }
 func (*DeleteBookRequest) ProtoMessage()               {}
-func (*DeleteBookRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
+func (*DeleteBookRequest) Descriptor() ([]byte, []int) { return fileDescriptorBookstore, []int{11} }
 
 func (m *DeleteBookRequest) GetShelf() int64 {
 	if m != nil {
@@ -385,13 +383,13 @@ func (m *DeleteBookRequest) GetBook() int64 {
 // Request message for GetAuthor method.
 type GetAuthorRequest struct {
 	// The ID of the author resource to retrieve.
-	Author int64 `protobuf:"varint,1,opt,name=author" json:"author,omitempty"`
+	Author int64 `protobuf:"varint,1,opt,name=author,proto3" json:"author,omitempty"`
 }
 
 func (m *GetAuthorRequest) Reset()                    { *m = GetAuthorRequest{} }
 func (m *GetAuthorRequest) String() string            { return proto.CompactTextString(m) }
 func (*GetAuthorRequest) ProtoMessage()               {}
-func (*GetAuthorRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
+func (*GetAuthorRequest) Descriptor() ([]byte, []int) { return fileDescriptorBookstore, []int{12} }
 
 func (m *GetAuthorRequest) GetAuthor() int64 {
 	if m != nil {
@@ -932,9 +930,9 @@ var _Bookstore_serviceDesc = grpc.ServiceDesc{
 	Metadata: "protos/bookstore.proto",
 }
 
-func init() { proto.RegisterFile("protos/bookstore.proto", fileDescriptor0) }
+func init() { proto.RegisterFile("protos/bookstore.proto", fileDescriptorBookstore) }
 
-var fileDescriptor0 = []byte{
+var fileDescriptorBookstore = []byte{
 	// 776 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0xdd, 0x6e, 0xda, 0x4a,
 	0x10, 0x8e, 0x81, 0xf0, 0x33, 0xe8, 0x04, 0x33, 0xc9, 0x41, 0x8e, 0x13, 0x72, 0xd0, 0xe6, 0x9c,
diff --git a/test/kube_e2e/containers/grpc-test-service/descriptors/proto.pb b/test/kube_e2e/containers/grpc-test-service/descriptors/proto.pb
index 186dc3a1c997a120d312f2e28bd28990f93f4156..8501672e80f9fa48d444c84cd8c0213e0d13579a 100644
GIT binary patch
delta 14072
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
ZEA4L>vKyjf(yPAsiKdN7$IsW5{x7a^Wsv{?

delta 12940
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

diff --git a/test/kube_e2e/containers/grpc-test-service/main.go b/test/kube_e2e/containers/grpc-test-service/main.go
index 15a5312f05d..c49344eea8f 100644
--- a/test/kube_e2e/containers/grpc-test-service/main.go
+++ b/test/kube_e2e/containers/grpc-test-service/main.go
@@ -20,7 +20,7 @@ import (
 
 //go:generate mkdir -p bookstore
 //go:generate mkdir -p descriptors
-//go:generate protoc -I${HOME}/workspace/googleapis -I. --include_source_info --go_out=plugins=grpc:bookstore  --include_imports --descriptor_set_out=descriptors/proto.pb protos/bookstore.proto
+//go:generate protoc -I${HOME}/workspace/googleapis -I. --include_source_info --gogo_out=plugins=grpc:bookstore  --include_imports --descriptor_set_out=descriptors/proto.pb protos/bookstore.proto
 
 func main() {
 	port := flag.Int("p", 8080, "port")
diff --git a/test/local_e2e/test_grpc_service/glootest/protos/glootest.pb.go b/test/local_e2e/test_grpc_service/glootest/protos/glootest.pb.go
index b6038d11251..23ac5213b09 100644
--- a/test/local_e2e/test_grpc_service/glootest/protos/glootest.pb.go
+++ b/test/local_e2e/test_grpc_service/glootest/protos/glootest.pb.go
@@ -1,4 +1,4 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
+// Code generated by protoc-gen-gogo. DO NOT EDIT.
 // source: protos/glootest.proto
 
 /*
@@ -13,14 +13,12 @@ It has these top-level messages:
 */
 package glootest
 
-import proto "github.com/golang/protobuf/proto"
+import proto "github.com/gogo/protobuf/proto"
 import fmt "fmt"
 import math "math"
 
-import (
-	context "golang.org/x/net/context"
-	grpc "google.golang.org/grpc"
-)
+import context "golang.org/x/net/context"
+import grpc "google.golang.org/grpc"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -31,16 +29,16 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
 
 type TestRequest struct {
-	Str string `protobuf:"bytes,1,opt,name=str" json:"str,omitempty"`
+	Str string `protobuf:"bytes,1,opt,name=str,proto3" json:"str,omitempty"`
 }
 
 func (m *TestRequest) Reset()                    { *m = TestRequest{} }
 func (m *TestRequest) String() string            { return proto.CompactTextString(m) }
 func (*TestRequest) ProtoMessage()               {}
-func (*TestRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (*TestRequest) Descriptor() ([]byte, []int) { return fileDescriptorGlootest, []int{0} }
 
 func (m *TestRequest) GetStr() string {
 	if m != nil {
@@ -50,13 +48,13 @@ func (m *TestRequest) GetStr() string {
 }
 
 type TestResponse struct {
-	Str string `protobuf:"bytes,1,opt,name=str" json:"str,omitempty"`
+	Str string `protobuf:"bytes,1,opt,name=str,proto3" json:"str,omitempty"`
 }
 
 func (m *TestResponse) Reset()                    { *m = TestResponse{} }
 func (m *TestResponse) String() string            { return proto.CompactTextString(m) }
 func (*TestResponse) ProtoMessage()               {}
-func (*TestResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (*TestResponse) Descriptor() ([]byte, []int) { return fileDescriptorGlootest, []int{1} }
 
 func (m *TestResponse) GetStr() string {
 	if m != nil {
@@ -142,9 +140,9 @@ var _TestService_serviceDesc = grpc.ServiceDesc{
 	Metadata: "protos/glootest.proto",
 }
 
-func init() { proto.RegisterFile("protos/glootest.proto", fileDescriptor0) }
+func init() { proto.RegisterFile("protos/glootest.proto", fileDescriptorGlootest) }
 
-var fileDescriptor0 = []byte{
+var fileDescriptorGlootest = []byte{
 	// 136 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2d, 0x28, 0xca, 0x2f,
 	0xc9, 0x2f, 0xd6, 0x4f, 0xcf, 0xc9, 0xcf, 0x2f, 0x49, 0x2d, 0x2e, 0xd1, 0x03, 0xf3, 0x85, 0x38,
diff --git a/test/local_e2e/test_grpc_service/testgrpcservice.go b/test/local_e2e/test_grpc_service/testgrpcservice.go
index a22239e94b3..e7ae19e89a7 100644
--- a/test/local_e2e/test_grpc_service/testgrpcservice.go
+++ b/test/local_e2e/test_grpc_service/testgrpcservice.go
@@ -13,7 +13,7 @@ import (
 
 //go:generate mkdir -p glootest
 //go:generate mkdir -p descriptors
-//go:generate protoc -I. --go_out=plugins=grpc:glootest  --descriptor_set_out=descriptors/proto.pb protos/glootest.proto
+//go:generate protoc -I. --gogo_out=plugins=grpc:glootest  --descriptor_set_out=descriptors/proto.pb protos/glootest.proto
 
 func RunServer() *TestGRPCServer {
 	lis, err := net.Listen("tcp", ":0")

From 394d2f5fd45249c8afbf614cbec5861a82d56481 Mon Sep 17 00:00:00 2001
From: Scott Weiss <sdw35@cornell.edu>
Date: Mon, 30 Apr 2018 19:53:30 -0400
Subject: [PATCH 3/3] have  to use golang/protobuf to generate

Signed-off-by: Scott Weiss <sdw35@cornell.edu>
---
 .../bookstore/protos/bookstore.pb.go          | 82 ++++++++++---------
 .../containers/grpc-test-service/main.go      |  2 +-
 2 files changed, 43 insertions(+), 41 deletions(-)

diff --git a/test/kube_e2e/containers/grpc-test-service/bookstore/protos/bookstore.pb.go b/test/kube_e2e/containers/grpc-test-service/bookstore/protos/bookstore.pb.go
index b6fa8dfc59b..3964b97d4c6 100644
--- a/test/kube_e2e/containers/grpc-test-service/bookstore/protos/bookstore.pb.go
+++ b/test/kube_e2e/containers/grpc-test-service/bookstore/protos/bookstore.pb.go
@@ -1,4 +1,4 @@
-// Code generated by protoc-gen-gogo. DO NOT EDIT.
+// Code generated by protoc-gen-go. DO NOT EDIT.
 // source: protos/bookstore.proto
 
 /*
@@ -24,14 +24,16 @@ It has these top-level messages:
 */
 package bookstore
 
-import proto "github.com/gogo/protobuf/proto"
+import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
 import google_protobuf1 "github.com/golang/protobuf/ptypes/empty"
 
-import context "golang.org/x/net/context"
-import grpc "google.golang.org/grpc"
+import (
+	context "golang.org/x/net/context"
+	grpc "google.golang.org/grpc"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -42,7 +44,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 
 type Author_Gender int32
 
@@ -66,20 +68,20 @@ var Author_Gender_value = map[string]int32{
 func (x Author_Gender) String() string {
 	return proto.EnumName(Author_Gender_name, int32(x))
 }
-func (Author_Gender) EnumDescriptor() ([]byte, []int) { return fileDescriptorBookstore, []int{2, 0} }
+func (Author_Gender) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{2, 0} }
 
 // A shelf resource.
 type Shelf struct {
 	// A unique shelf id.
-	Id int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
+	Id int64 `protobuf:"varint,1,opt,name=id" json:"id,omitempty"`
 	// A theme of the shelf (fiction, poetry, etc).
-	Theme string `protobuf:"bytes,2,opt,name=theme,proto3" json:"theme,omitempty"`
+	Theme string `protobuf:"bytes,2,opt,name=theme" json:"theme,omitempty"`
 }
 
 func (m *Shelf) Reset()                    { *m = Shelf{} }
 func (m *Shelf) String() string            { return proto.CompactTextString(m) }
 func (*Shelf) ProtoMessage()               {}
-func (*Shelf) Descriptor() ([]byte, []int) { return fileDescriptorBookstore, []int{0} }
+func (*Shelf) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
 
 func (m *Shelf) GetId() int64 {
 	if m != nil {
@@ -98,11 +100,11 @@ func (m *Shelf) GetTheme() string {
 // A book resource.
 type Book struct {
 	// A unique book id.
-	Id int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
+	Id int64 `protobuf:"varint,1,opt,name=id" json:"id,omitempty"`
 	// An author of the book.
-	Author string `protobuf:"bytes,2,opt,name=author,proto3" json:"author,omitempty"`
+	Author string `protobuf:"bytes,2,opt,name=author" json:"author,omitempty"`
 	// A book title.
-	Title string `protobuf:"bytes,3,opt,name=title,proto3" json:"title,omitempty"`
+	Title string `protobuf:"bytes,3,opt,name=title" json:"title,omitempty"`
 	// Quotes from the book.
 	Quotes []string `protobuf:"bytes,4,rep,name=quotes" json:"quotes,omitempty"`
 }
@@ -110,7 +112,7 @@ type Book struct {
 func (m *Book) Reset()                    { *m = Book{} }
 func (m *Book) String() string            { return proto.CompactTextString(m) }
 func (*Book) ProtoMessage()               {}
-func (*Book) Descriptor() ([]byte, []int) { return fileDescriptorBookstore, []int{1} }
+func (*Book) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
 
 func (m *Book) GetId() int64 {
 	if m != nil {
@@ -143,16 +145,16 @@ func (m *Book) GetQuotes() []string {
 // An author resource.
 type Author struct {
 	// A unique author id.
-	Id        int64         `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
-	Gender    Author_Gender `protobuf:"varint,2,opt,name=gender,proto3,enum=bookstore.Author_Gender" json:"gender,omitempty"`
-	FirstName string        `protobuf:"bytes,3,opt,name=first_name,json=firstName,proto3" json:"first_name,omitempty"`
-	LastName  string        `protobuf:"bytes,4,opt,name=last_name,json=lname,proto3" json:"last_name,omitempty"`
+	Id        int64         `protobuf:"varint,1,opt,name=id" json:"id,omitempty"`
+	Gender    Author_Gender `protobuf:"varint,2,opt,name=gender,enum=bookstore.Author_Gender" json:"gender,omitempty"`
+	FirstName string        `protobuf:"bytes,3,opt,name=first_name,json=firstName" json:"first_name,omitempty"`
+	LastName  string        `protobuf:"bytes,4,opt,name=last_name,json=lname" json:"last_name,omitempty"`
 }
 
 func (m *Author) Reset()                    { *m = Author{} }
 func (m *Author) String() string            { return proto.CompactTextString(m) }
 func (*Author) ProtoMessage()               {}
-func (*Author) Descriptor() ([]byte, []int) { return fileDescriptorBookstore, []int{2} }
+func (*Author) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
 
 func (m *Author) GetId() int64 {
 	if m != nil {
@@ -191,7 +193,7 @@ type ListShelvesResponse struct {
 func (m *ListShelvesResponse) Reset()                    { *m = ListShelvesResponse{} }
 func (m *ListShelvesResponse) String() string            { return proto.CompactTextString(m) }
 func (*ListShelvesResponse) ProtoMessage()               {}
-func (*ListShelvesResponse) Descriptor() ([]byte, []int) { return fileDescriptorBookstore, []int{3} }
+func (*ListShelvesResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
 
 func (m *ListShelvesResponse) GetShelves() []*Shelf {
 	if m != nil {
@@ -209,7 +211,7 @@ type CreateShelfRequest struct {
 func (m *CreateShelfRequest) Reset()                    { *m = CreateShelfRequest{} }
 func (m *CreateShelfRequest) String() string            { return proto.CompactTextString(m) }
 func (*CreateShelfRequest) ProtoMessage()               {}
-func (*CreateShelfRequest) Descriptor() ([]byte, []int) { return fileDescriptorBookstore, []int{4} }
+func (*CreateShelfRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
 
 func (m *CreateShelfRequest) GetShelf() *Shelf {
 	if m != nil {
@@ -221,13 +223,13 @@ func (m *CreateShelfRequest) GetShelf() *Shelf {
 // Request message for GetShelf method.
 type GetShelfRequest struct {
 	// The ID of the shelf resource to retrieve.
-	Shelf int64 `protobuf:"varint,1,opt,name=shelf,proto3" json:"shelf,omitempty"`
+	Shelf int64 `protobuf:"varint,1,opt,name=shelf" json:"shelf,omitempty"`
 }
 
 func (m *GetShelfRequest) Reset()                    { *m = GetShelfRequest{} }
 func (m *GetShelfRequest) String() string            { return proto.CompactTextString(m) }
 func (*GetShelfRequest) ProtoMessage()               {}
-func (*GetShelfRequest) Descriptor() ([]byte, []int) { return fileDescriptorBookstore, []int{5} }
+func (*GetShelfRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
 
 func (m *GetShelfRequest) GetShelf() int64 {
 	if m != nil {
@@ -239,13 +241,13 @@ func (m *GetShelfRequest) GetShelf() int64 {
 // Request message for DeleteShelf method.
 type DeleteShelfRequest struct {
 	// The ID of the shelf to delete.
-	Shelf int64 `protobuf:"varint,1,opt,name=shelf,proto3" json:"shelf,omitempty"`
+	Shelf int64 `protobuf:"varint,1,opt,name=shelf" json:"shelf,omitempty"`
 }
 
 func (m *DeleteShelfRequest) Reset()                    { *m = DeleteShelfRequest{} }
 func (m *DeleteShelfRequest) String() string            { return proto.CompactTextString(m) }
 func (*DeleteShelfRequest) ProtoMessage()               {}
-func (*DeleteShelfRequest) Descriptor() ([]byte, []int) { return fileDescriptorBookstore, []int{6} }
+func (*DeleteShelfRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
 
 func (m *DeleteShelfRequest) GetShelf() int64 {
 	if m != nil {
@@ -257,13 +259,13 @@ func (m *DeleteShelfRequest) GetShelf() int64 {
 // Request message for ListBooks method.
 type ListBooksRequest struct {
 	// ID of the shelf which books to list.
-	Shelf int64 `protobuf:"varint,1,opt,name=shelf,proto3" json:"shelf,omitempty"`
+	Shelf int64 `protobuf:"varint,1,opt,name=shelf" json:"shelf,omitempty"`
 }
 
 func (m *ListBooksRequest) Reset()                    { *m = ListBooksRequest{} }
 func (m *ListBooksRequest) String() string            { return proto.CompactTextString(m) }
 func (*ListBooksRequest) ProtoMessage()               {}
-func (*ListBooksRequest) Descriptor() ([]byte, []int) { return fileDescriptorBookstore, []int{7} }
+func (*ListBooksRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
 
 func (m *ListBooksRequest) GetShelf() int64 {
 	if m != nil {
@@ -275,7 +277,7 @@ func (m *ListBooksRequest) GetShelf() int64 {
 // Request message for CreateBook method.
 type CreateBookRequest struct {
 	// The ID of the shelf on which to create a book.
-	Shelf int64 `protobuf:"varint,1,opt,name=shelf,proto3" json:"shelf,omitempty"`
+	Shelf int64 `protobuf:"varint,1,opt,name=shelf" json:"shelf,omitempty"`
 	// A book resource to create on the shelf.
 	Book *Book `protobuf:"bytes,2,opt,name=book" json:"book,omitempty"`
 }
@@ -283,7 +285,7 @@ type CreateBookRequest struct {
 func (m *CreateBookRequest) Reset()                    { *m = CreateBookRequest{} }
 func (m *CreateBookRequest) String() string            { return proto.CompactTextString(m) }
 func (*CreateBookRequest) ProtoMessage()               {}
-func (*CreateBookRequest) Descriptor() ([]byte, []int) { return fileDescriptorBookstore, []int{8} }
+func (*CreateBookRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
 
 func (m *CreateBookRequest) GetShelf() int64 {
 	if m != nil {
@@ -302,15 +304,15 @@ func (m *CreateBookRequest) GetBook() *Book {
 // Request message for GetBook method.
 type GetBookRequest struct {
 	// The ID of the shelf from which to retrieve a book.
-	Shelf int64 `protobuf:"varint,1,opt,name=shelf,proto3" json:"shelf,omitempty"`
+	Shelf int64 `protobuf:"varint,1,opt,name=shelf" json:"shelf,omitempty"`
 	// The ID of the book to retrieve.
-	Book int64 `protobuf:"varint,2,opt,name=book,proto3" json:"book,omitempty"`
+	Book int64 `protobuf:"varint,2,opt,name=book" json:"book,omitempty"`
 }
 
 func (m *GetBookRequest) Reset()                    { *m = GetBookRequest{} }
 func (m *GetBookRequest) String() string            { return proto.CompactTextString(m) }
 func (*GetBookRequest) ProtoMessage()               {}
-func (*GetBookRequest) Descriptor() ([]byte, []int) { return fileDescriptorBookstore, []int{9} }
+func (*GetBookRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
 
 func (m *GetBookRequest) GetShelf() int64 {
 	if m != nil {
@@ -329,7 +331,7 @@ func (m *GetBookRequest) GetBook() int64 {
 // Request message for UpdateBook method
 type UpdateBookRequest struct {
 	// The ID of the shelf from which to retrieve a book.
-	Shelf int64 `protobuf:"varint,1,opt,name=shelf,proto3" json:"shelf,omitempty"`
+	Shelf int64 `protobuf:"varint,1,opt,name=shelf" json:"shelf,omitempty"`
 	// A book resource to update on the shelf.
 	Book *Book `protobuf:"bytes,2,opt,name=book" json:"book,omitempty"`
 }
@@ -337,7 +339,7 @@ type UpdateBookRequest struct {
 func (m *UpdateBookRequest) Reset()                    { *m = UpdateBookRequest{} }
 func (m *UpdateBookRequest) String() string            { return proto.CompactTextString(m) }
 func (*UpdateBookRequest) ProtoMessage()               {}
-func (*UpdateBookRequest) Descriptor() ([]byte, []int) { return fileDescriptorBookstore, []int{10} }
+func (*UpdateBookRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
 
 func (m *UpdateBookRequest) GetShelf() int64 {
 	if m != nil {
@@ -356,15 +358,15 @@ func (m *UpdateBookRequest) GetBook() *Book {
 // Request message for DeleteBook method.
 type DeleteBookRequest struct {
 	// The ID of the shelf from which to delete a book.
-	Shelf int64 `protobuf:"varint,1,opt,name=shelf,proto3" json:"shelf,omitempty"`
+	Shelf int64 `protobuf:"varint,1,opt,name=shelf" json:"shelf,omitempty"`
 	// The ID of the book to delete.
-	Book int64 `protobuf:"varint,2,opt,name=book,proto3" json:"book,omitempty"`
+	Book int64 `protobuf:"varint,2,opt,name=book" json:"book,omitempty"`
 }
 
 func (m *DeleteBookRequest) Reset()                    { *m = DeleteBookRequest{} }
 func (m *DeleteBookRequest) String() string            { return proto.CompactTextString(m) }
 func (*DeleteBookRequest) ProtoMessage()               {}
-func (*DeleteBookRequest) Descriptor() ([]byte, []int) { return fileDescriptorBookstore, []int{11} }
+func (*DeleteBookRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
 
 func (m *DeleteBookRequest) GetShelf() int64 {
 	if m != nil {
@@ -383,13 +385,13 @@ func (m *DeleteBookRequest) GetBook() int64 {
 // Request message for GetAuthor method.
 type GetAuthorRequest struct {
 	// The ID of the author resource to retrieve.
-	Author int64 `protobuf:"varint,1,opt,name=author,proto3" json:"author,omitempty"`
+	Author int64 `protobuf:"varint,1,opt,name=author" json:"author,omitempty"`
 }
 
 func (m *GetAuthorRequest) Reset()                    { *m = GetAuthorRequest{} }
 func (m *GetAuthorRequest) String() string            { return proto.CompactTextString(m) }
 func (*GetAuthorRequest) ProtoMessage()               {}
-func (*GetAuthorRequest) Descriptor() ([]byte, []int) { return fileDescriptorBookstore, []int{12} }
+func (*GetAuthorRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
 
 func (m *GetAuthorRequest) GetAuthor() int64 {
 	if m != nil {
@@ -930,9 +932,9 @@ var _Bookstore_serviceDesc = grpc.ServiceDesc{
 	Metadata: "protos/bookstore.proto",
 }
 
-func init() { proto.RegisterFile("protos/bookstore.proto", fileDescriptorBookstore) }
+func init() { proto.RegisterFile("protos/bookstore.proto", fileDescriptor0) }
 
-var fileDescriptorBookstore = []byte{
+var fileDescriptor0 = []byte{
 	// 776 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0xdd, 0x6e, 0xda, 0x4a,
 	0x10, 0x8e, 0x81, 0xf0, 0x33, 0xe8, 0x04, 0x33, 0xc9, 0x41, 0x8e, 0x13, 0x72, 0xd0, 0xe6, 0x9c,
diff --git a/test/kube_e2e/containers/grpc-test-service/main.go b/test/kube_e2e/containers/grpc-test-service/main.go
index c49344eea8f..15a5312f05d 100644
--- a/test/kube_e2e/containers/grpc-test-service/main.go
+++ b/test/kube_e2e/containers/grpc-test-service/main.go
@@ -20,7 +20,7 @@ import (
 
 //go:generate mkdir -p bookstore
 //go:generate mkdir -p descriptors
-//go:generate protoc -I${HOME}/workspace/googleapis -I. --include_source_info --gogo_out=plugins=grpc:bookstore  --include_imports --descriptor_set_out=descriptors/proto.pb protos/bookstore.proto
+//go:generate protoc -I${HOME}/workspace/googleapis -I. --include_source_info --go_out=plugins=grpc:bookstore  --include_imports --descriptor_set_out=descriptors/proto.pb protos/bookstore.proto
 
 func main() {
 	port := flag.Int("p", 8080, "port")