From ef376b9c697f6d9e7dde5158aa015e1ac732a94a Mon Sep 17 00:00:00 2001
From: Eric Chiang <eric.chiang@coreos.com>
Date: Thu, 13 Apr 2017 11:32:19 -0700
Subject: [PATCH] *: update grpc and correct protobuf generation

Turns out that manually setting PATH in the Makefile doesn't work
so we've been using the protobuf plugins installed on the host. Fix
this by specifying plugins by path.
---
 Makefile   |  8 ++------
 glide.yaml | 11 ++++++++---
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 851ccfd8..867b9b27 100644
--- a/Makefile
+++ b/Makefile
@@ -16,10 +16,6 @@ user=$(shell id -u -n)
 group=$(shell id -g -n)
 
 export GOBIN=$(PWD)/bin
-# Prefer ./bin instead of system packages for things like protoc, where we want
-# to use the version dex uses, not whatever a developer has installed.
-export PATH=$(GOBIN):$(shell printenv PATH)
-export GO15VENDOREXPERIMENT=1
 
 LD_FLAGS="-w -X $(REPO_PATH)/version.Version=$(VERSION)"
 
@@ -74,10 +70,10 @@ docker-image: clean-release _output/bin/dex
 proto: api/api.pb.go server/internal/types.pb.go
 
 api/api.pb.go: api/api.proto bin/protoc bin/protoc-gen-go
-	@protoc --go_out=plugins=grpc:. api/*.proto
+	@./bin/protoc --go_out=plugins=grpc:. --plugin=protoc-gen-go=./bin/protoc-gen-go api/*.proto
 
 server/internal/types.pb.go: server/internal/types.proto bin/protoc bin/protoc-gen-go
-	@protoc --go_out=. server/internal/*.proto
+	@./bin/protoc --go_out=. --plugin=protoc-gen-go=./bin/protoc-gen-go server/internal/*.proto
 
 bin/protoc: scripts/get-protoc
 	@./scripts/get-protoc bin/protoc
diff --git a/glide.yaml b/glide.yaml
index 2af9964f..6fff9565 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -32,7 +32,7 @@ import:
 
 # Imported directly and by several third party packages.
 - package: golang.org/x/net
-  version: 6a513affb38dc9788b449d59ffed099b8de18fa0
+  version: 5602c733f70afc6dcec6766be0d5034d4c4f14de
   subpackages:
   - context
   - http2
@@ -40,6 +40,8 @@ import:
   - internal/timeseries
   - lex/httplex
   - trace
+- package: golang.org/x/text
+  version: f4b4367115ec2de254587813edaa901bc1c723a8
 
 # Used for parsing configs.
 - package: github.com/ghodss/yaml
@@ -109,7 +111,7 @@ import:
 
 # gRPC and protobuf are use for the API. Also import x/net/http2 stack.
 - package: google.golang.org/grpc
-  version: b1a2821ca5a4fd6b6e48ddfbb7d6d7584d839d21
+  version: 0e8b58d22f34640cb17dbbed1c8aef3b8dcc0e97
   subpackages:
   - codes
   - credentials
@@ -120,10 +122,13 @@ import:
   - peer
   - transport
 - package: github.com/golang/protobuf
-  version: 874264fbbb43f4d91e999fecb4b40143ed611400
+  version: 2bba0603135d7d7f5cb73b2125beeda19c09f4ef
   subpackages:
   - proto
   - protoc-gen-go
+  - protoc-gen-go/grpc
+- package: google.golang.org/genproto
+  version: 411e09b969b1170a9f0c467558eb4c4c110d9c77
 
 # Structured logging
 - package: github.com/Sirupsen/logrus