grpc · dfawley · Jul 30, 2020 · Jul 29, 2020 · Jul 29, 2020 · Jul 30, 2020
diff --git a/.travis.yml b/.travis.yml
@@ -16,8 +16,6 @@ matrix:
     env: GO111MODULE=on
   - go: 1.12.x
     env: GO111MODULE=on
-  - go: 1.9.x
-    env: GAE=1
 
 go_import_path: google.golang.org/grpc
 
@@ -30,13 +28,11 @@ before_install:
 install:
   - try3() { eval "$*" || eval "$*" || eval "$*"; }
   - try3 'if [[ "${GO111MODULE}" = "on" ]]; then go mod download; else make testdeps; fi'
-  - if [[ -n "${GAE}" ]]; then source ./install_gae.sh; make testappenginedeps; fi
   - if [[ -n "${VET}" ]]; then ./vet.sh -install; fi
 
 script:
   - set -e
   - if [[ -n "${TESTEXTRAS}" ]]; then examples/examples_test.sh; interop/interop_test.sh; make testsubmodule; exit 0; fi
   - if [[ -n "${VET}" ]]; then ./vet.sh; fi
-  - if [[ -n "${GAE}" ]]; then make testappengine; exit 0; fi
   - if [[ -n "${RACE}" ]]; then make testrace; exit 0; fi
   - make test
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -57,6 +57,5 @@ How to get your contributions merged smoothly and quickly.
   - `make vet` to catch vet errors
   - `make test` to run the tests
   - `make testrace` to run tests in race mode
-  - optional `make testappengine` to run tests with appengine
 
 - Exceptions to the rules can be made if there's a compelling reason for doing so.
diff --git a/Makefile b/Makefile
@@ -22,12 +22,6 @@ test: testdeps
 testsubmodule: testdeps
 	cd security/advancedtls && go test -cpu 1,4 -timeout 7m google.golang.org/grpc/security/advancedtls/...
 
-testappengine: testappenginedeps
-	goapp test -cpu 1,4 -timeout 7m google.golang.org/grpc/...
-
-testappenginedeps:
-	goapp get -d -v -t -tags 'appengine appenginevm' google.golang.org/grpc/...
-
 testdeps:
 	go get -d -v -t google.golang.org/grpc/...
 
@@ -53,8 +47,6 @@ vetdeps:
 	deps \
 	proto \
 	test \
-	testappengine \
-	testappenginedeps \
 	testdeps \
 	testrace \
 	updatedeps \

diff --git a/balancer/rls/internal/balancer.go b/balancer/rls/internal/balancer.go
@@ -1,5 +1,3 @@
-// +build go1.10
-
 /*
  *
  * Copyright 2020 gRPC authors.

diff --git a/balancer/rls/internal/balancer_test.go b/balancer/rls/internal/balancer_test.go
@@ -1,5 +1,3 @@
-// +build go1.10
-
 /*
  *
  * Copyright 2020 gRPC authors.

diff --git a/balancer/rls/internal/builder.go b/balancer/rls/internal/builder.go
@@ -1,5 +1,3 @@
-// +build go1.10
-
 /*
  *
  * Copyright 2020 gRPC authors.

diff --git a/balancer/rls/internal/client_test.go b/balancer/rls/internal/client_test.go
@@ -1,5 +1,3 @@
-// +build go1.10
-
 /*
  *
  * Copyright 2020 gRPC authors.

diff --git a/balancer/rls/internal/config.go b/balancer/rls/internal/config.go
@@ -1,5 +1,3 @@
-// +build go1.10
-
 /*
  *
  * Copyright 2020 gRPC authors.

diff --git a/balancer/rls/internal/config_test.go b/balancer/rls/internal/config_test.go
@@ -1,5 +1,3 @@
-// +build go1.10
-
 /*
  *
  * Copyright 2020 gRPC authors.

diff --git a/balancer/rls/internal/keys/builder.go b/balancer/rls/internal/keys/builder.go
@@ -1,5 +1,3 @@
-// +build go1.10
-
 /*
  *
  * Copyright 2020 gRPC authors.

diff --git a/balancer/rls/internal/keys/builder_test.go b/balancer/rls/internal/keys/builder_test.go
@@ -1,5 +1,3 @@
-// +build go1.10
-
 /*
  *
  * Copyright 2020 gRPC authors.

diff --git a/balancer/rls/internal/picker.go b/balancer/rls/internal/picker.go
@@ -1,5 +1,3 @@
-// +build go1.10
-
 /*
  *
  * Copyright 2020 gRPC authors.

diff --git a/balancer/rls/internal/picker_test.go b/balancer/rls/internal/picker_test.go
@@ -1,5 +1,3 @@
-// +build go1.10
-
 /*
  *
  * Copyright 2020 gRPC authors.

diff --git a/channelz/service/func_linux.go b/channelz/service/func_linux.go
@@ -1,5 +1,3 @@
-// +build !appengine
-
 /*
  *
  * Copyright 2018 gRPC authors.

diff --git a/channelz/service/func_nonlinux.go b/channelz/service/func_nonlinux.go
@@ -1,4 +1,4 @@
-// +build !linux appengine
+// +build !linux
 
 /*
  *

diff --git a/channelz/service/service_sktopt_test.go b/channelz/service/service_sktopt_test.go
@@ -1,4 +1,4 @@
-// +build linux,!appengine
+// +build linux
 // +build 386 amd64
 
 /*

diff --git a/channelz/service/service_test.go b/channelz/service/service_test.go
@@ -58,7 +58,7 @@ type protoToSocketOptFunc func([]*channelzpb.SocketOption) *channelz.SocketOptio
 
 // protoToSocketOpt is used in function socketProtoToStruct to extract socket option
 // data from unmarshaled proto message.
-// It is only defined under linux, non-appengine environment on x86 architecture.
+// It is only defined under linux environment on x86 architecture.
 var protoToSocketOpt protoToSocketOptFunc
 
 // emptyTime is used for detecting unset value of time.Time type.

diff --git a/channelz/service/util_sktopt_386_test.go b/channelz/service/util_sktopt_386_test.go
@@ -1,4 +1,4 @@
-// +build 386,linux,!appengine
+// +build 386,linux
 
 /*
  *

diff --git a/channelz/service/util_sktopt_amd64_test.go b/channelz/service/util_sktopt_amd64_test.go
@@ -1,4 +1,4 @@
-// +build amd64,linux,!appengine
+// +build amd64,linux
 
 /*
  *

diff --git a/credentials/go12.go b/credentials/go12.go
diff --git a/credentials/internal/syscallconn.go b/credentials/internal/syscallconn.go
@@ -1,5 +1,3 @@
-// +build !appengine
-
 /*
  *
  * Copyright 2018 gRPC authors.

diff --git a/credentials/internal/syscallconn_appengine.go b/credentials/internal/syscallconn_appengine.go
diff --git a/credentials/internal/syscallconn_test.go b/credentials/internal/syscallconn_test.go
@@ -1,5 +1,3 @@
-// +build !appengine
-
 /*
  *
  * Copyright 2018 gRPC authors.

diff --git a/credentials/tls.go b/credentials/tls.go
@@ -241,6 +241,10 @@ var cipherSuiteLookup = map[uint16]string{
 	tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256:   "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256",
 	tls.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305:    "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305",
 	tls.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305:  "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305",
+	// Go 1.12
+	tls.TLS_AES_128_GCM_SHA256:       "TLS_AES_128_GCM_SHA256",
+	tls.TLS_AES_256_GCM_SHA384:       "TLS_AES_256_GCM_SHA384",
+	tls.TLS_CHACHA20_POLY1305_SHA256: "TLS_CHACHA20_POLY1305_SHA256",
 }
 
 // cloneTLSConfig returns a shallow clone of the exported

diff --git a/examples/features/xds/client/main.go b/examples/features/xds/client/main.go
@@ -1,5 +1,3 @@
-// +build go1.11
-
 /*
  *
  * Copyright 2020 gRPC authors.

diff --git a/examples/features/xds/server/main.go b/examples/features/xds/server/main.go
@@ -1,5 +1,3 @@
-// +build go1.11
-
 /*
  *
  * Copyright 2020 gRPC authors.

diff --git a/install_gae.sh b/install_gae.sh
diff --git a/internal/channelz/types_linux.go b/internal/channelz/types_linux.go
@@ -1,5 +1,3 @@
-// +build !appengine
-
 /*
  *
  * Copyright 2018 gRPC authors.

diff --git a/internal/channelz/types_nonlinux.go b/internal/channelz/types_nonlinux.go
@@ -1,4 +1,4 @@
-// +build !linux appengine
+// +build !linux
 
 /*
  *
@@ -37,6 +37,6 @@ type SocketOptionData struct {
 // Windows OS doesn't support Socket Option
 func (s *SocketOptionData) Getsockopt(fd uintptr) {
 	once.Do(func() {
-		logger.Warning("Channelz: socket options are not supported on non-linux os and appengine.")
+		logger.Warning("Channelz: socket options are not supported on non-linux os.")
 	})
 }
diff --git a/internal/channelz/util_linux.go b/internal/channelz/util_linux.go
@@ -1,4 +1,4 @@
-// +build linux,!appengine
+// +build linux
 
 /*
  *

diff --git a/internal/channelz/util_nonlinux.go b/internal/channelz/util_nonlinux.go
@@ -1,4 +1,4 @@
-// +build !linux appengine
+// +build !linux
 
 /*
  *

diff --git a/internal/channelz/util_test.go b/internal/channelz/util_test.go
@@ -1,4 +1,4 @@
-// +build linux,go1.10,!appengine
+// +build linux
 
 /*
  *

diff --git a/internal/credentials/go110.go b/internal/credentials/go110.go
@@ -1,5 +1,3 @@
-// +build go1.10
-
 /*
  *
  * Copyright 2020 gRPC authors.

diff --git a/internal/credentials/go110_test.go b/internal/credentials/go110_test.go
@@ -1,5 +1,3 @@
-// +build go1.10
-
 /*
  *
  * Copyright 2020 gRPC authors.

diff --git a/internal/credentials/gobefore110.go b/internal/credentials/gobefore110.go
diff --git a/internal/profiling/buffer/buffer.go b/internal/profiling/buffer/buffer.go
@@ -1,5 +1,3 @@
-// +build !appengine
-
 /*
  *
  * Copyright 2019 gRPC authors.

diff --git a/internal/profiling/buffer/buffer_appengine.go b/internal/profiling/buffer/buffer_appengine.go
diff --git a/internal/profiling/buffer/buffer_test.go b/internal/profiling/buffer/buffer_test.go
@@ -1,5 +1,3 @@
-// +build !appengine
-
 /*
  *
  * Copyright 2019 gRPC authors.

diff --git a/internal/profiling/profiling_test.go b/internal/profiling/profiling_test.go
@@ -1,5 +1,3 @@
-// +build !appengine
-
 /*
  *
  * Copyright 2019 gRPC authors.