From 59dd9b3f19973f0bfd0ba07f9b3dcad41038751f Mon Sep 17 00:00:00 2001
From: Menghan Li <menghanl@google.com>
Date: Mon, 27 Aug 2018 13:31:20 -0700
Subject: [PATCH] test: add go 1.11 to travis and remove go 1.7 (#2278)

---
 .travis.yml                                      | 16 ++++++++--------
 .../alts/core/proto/grpc_gcp/handshaker.pb.go    |  8 ++++----
 server.go                                        | 10 +++++-----
 vet.sh                                           |  2 ++
 4 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5b5bfb13..f79f728e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,18 +2,18 @@ language: go
 
 matrix:
   include:
-  - go: 1.10.x
+  - go: 1.11.x
     env: VET=1 RACE=1
-  - go: 1.6.x
-  - go: 1.7.x
-  - go: 1.8.x
+  - go: 1.11.x
+    env: RUN386=1
+  - go: 1.11.x
+    env: GRPC_GO_RETRY=on
+  - go: 1.10.x
   - go: 1.9.x
   - go: 1.9.x
     env: GAE=1
-  - go: 1.10.x
-    env: RUN386=1
-  - go: 1.10.x
-    env: GRPC_GO_RETRY=on
+  - go: 1.8.x
+  - go: 1.6.x
 
 go_import_path: google.golang.org/grpc
 
diff --git a/credentials/alts/core/proto/grpc_gcp/handshaker.pb.go b/credentials/alts/core/proto/grpc_gcp/handshaker.pb.go
index 99a1cc42..e03e0fed 100644
--- a/credentials/alts/core/proto/grpc_gcp/handshaker.pb.go
+++ b/credentials/alts/core/proto/grpc_gcp/handshaker.pb.go
@@ -41,8 +41,8 @@ var HandshakeProtocol_name = map[int32]string{
 }
 var HandshakeProtocol_value = map[string]int32{
 	"HANDSHAKE_PROTOCOL_UNSPECIFIED": 0,
-	"TLS":  1,
-	"ALTS": 2,
+	"TLS":                            1,
+	"ALTS":                           2,
 }
 
 func (x HandshakeProtocol) String() string {
@@ -67,8 +67,8 @@ var NetworkProtocol_name = map[int32]string{
 }
 var NetworkProtocol_value = map[string]int32{
 	"NETWORK_PROTOCOL_UNSPECIFIED": 0,
-	"TCP": 1,
-	"UDP": 2,
+	"TCP":                          1,
+	"UDP":                          2,
 }
 
 func (x NetworkProtocol) String() string {
diff --git a/server.go b/server.go
index 127f8d79..5c7d5b63 100644
--- a/server.go
+++ b/server.go
@@ -1063,11 +1063,11 @@ func (s *Server) processStreamingRPC(t transport.ServerTransport, stream *transp
 	}
 	ctx := NewContextWithServerTransportStream(stream.Context(), stream)
 	ss := &serverStream{
-		ctx:   ctx,
-		t:     t,
-		s:     stream,
-		p:     &parser{r: stream},
-		codec: s.getCodec(stream.ContentSubtype()),
+		ctx:                   ctx,
+		t:                     t,
+		s:                     stream,
+		p:                     &parser{r: stream},
+		codec:                 s.getCodec(stream.ContentSubtype()),
 		maxReceiveMessageSize: s.opts.maxReceiveMessageSize,
 		maxSendMessageSize:    s.opts.maxSendMessageSize,
 		trInfo:                trInfo,
diff --git a/vet.sh b/vet.sh
index 44a310e5..83be7a96 100755
--- a/vet.sh
+++ b/vet.sh
@@ -85,5 +85,7 @@ google.golang.org/grpc/test/end2end_test.go:SA1019
 google.golang.org/grpc/balancer_test.go:SA1019
 google.golang.org/grpc/balancer.go:SA1019
 google.golang.org/grpc/clientconn_test.go:SA1019
+google.golang.org/grpc/internal/transport/handler_server_test.go:SA1019
+google.golang.org/grpc/internal/transport/handler_server.go:SA1019
 ' ./...
 misspell -error .