Update to go 1.14 (#1133)

2025-03-14 10:08:44 +00:00 · 2020-02-26 14:13:37 -08:00
parent af02e4818f
commit 1b63fa53dc
30 changed files with 74 additions and 37 deletions
--- a/Dockerfile.base-build
+++ b/Dockerfile.base-build
@ -13,7 +13,7 @@
 # limitations under the License.

 # When updating Go version, update Dockerfile.ci, Dockerfile.base-build, and go.mod
-FROM golang:1.13.4
+FROM golang:1.14.0
 ENV GO111MODULE=on

 WORKDIR /go/src/open-match.dev/open-match
--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@ -34,13 +34,13 @@ RUN export CLOUD_SDK_REPO="cloud-sdk-stretch" && \
    apt-get update -y && apt-get install google-cloud-sdk google-cloud-sdk-app-engine-go -y -qq

 # Install Golang
-# https://github.com/docker-library/golang/blob/master/1.13/stretch/Dockerfile
+# https://github.com/docker-library/golang/blob/master/1.14/stretch/Dockerfile
 RUN mkdir -p /toolchain/golang
 WORKDIR /toolchain/golang
 RUN sudo rm -rf /usr/local/go/

 # When updating Go version, update Dockerfile.ci, Dockerfile.base-build, and go.mod
-RUN curl -L https://golang.org/dl/go1.13.4.linux-amd64.tar.gz | sudo tar -C /usr/local -xz
+RUN curl -L https://golang.org/dl/go1.14.linux-amd64.tar.gz | sudo tar -C /usr/local -xz

 ENV GOPATH /go
 ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
--- a/go.mod
+++ b/go.mod
@ -15,7 +15,7 @@ module open-match.dev/open-match
 // limitations under the License.

 // When updating Go version, update Dockerfile.ci, Dockerfile.base-build, and go.mod
-go 1.13
+go 1.14

 require (
 	cloud.google.com/go v0.47.0 // indirect
--- a/third_party/google/api/backend.proto
+++ b/third_party/google/api/backend.proto
@ -96,6 +96,25 @@ message BackendRule {
  string selector = 1;

  // The address of the API backend.
+  //
+  // The scheme is used to determine the backend protocol and security.
+  // The following schemes are accepted:
+  //
+  //    SCHEME        PROTOCOL    SECURITY
+  //    http://       HTTP        None
+  //    https://      HTTP        TLS
+  //    grpc://       gRPC        None
+  //    grpcs://      gRPC        TLS
+  //
+  // It is recommended to explicitly include a scheme. Leaving out the scheme
+  // may cause constrasting behaviors across platforms.
+  //
+  // If the port is unspecified, the default is:
+  // - 80 for schemes without TLS
+  // - 443 for schemes with TLS
+  //
+  // For HTTP backends, use [protocol][google.api.BackendRule.protocol]
+  // to specify the protocol version.
  string address = 2;

  // The number of seconds to wait for a response from a request. The default
@ -121,9 +140,8 @@ message BackendRule {
  // For example, specifying `jwt_audience` implies that the backend expects
  // authentication via a JWT.
  //
-  // When authentication is unspecified, a JWT ID token will be generated with
-  // the value from [BackendRule.address][google.api.BackendRule.address] as jwt_audience, overrode to the
-  // HTTP "Authorization" request header and sent to the backend.
+  // When authentication is unspecified, the resulting behavior is the same
+  // as `disable_auth` set to `true`.
  //
  // Refer to https://developers.google.com/identity/protocols/OpenIDConnect for
  // JWT ID token.
@ -133,14 +151,33 @@ message BackendRule {
    // to the backend.
    string jwt_audience = 7;

-    // When disable_auth is false,  a JWT ID token will be generated with the
-    // value from [BackendRule.address][google.api.BackendRule.address] as jwt_audience, overrode to the HTTP
-    // "Authorization" request header and sent to the backend.
-    //
    // When disable_auth is true, a JWT ID token won't be generated and the
    // original "Authorization" HTTP header will be preserved. If the header is
    // used to carry the original token and is expected by the backend, this
    // field must be set to true to preserve the header.
    bool disable_auth = 8;
  }
+
+  // The protocol used for sending a request to the backend.
+  // The supported values are "http/1.1" and "h2".
+  //
+  // The default value is inferred from the scheme in the
+  // [address][google.api.BackendRule.address] field:
+  //
+  //    SCHEME        PROTOCOL
+  //    http://       http/1.1
+  //    https://      http/1.1
+  //    grpc://       h2
+  //    grpcs://      h2
+  //
+  // For secure HTTP backends (https://) that support HTTP/2, set this field
+  // to "h2" for improved performance.
+  //
+  // Configuring this field to non-default values is only supported for secure
+  // HTTP backends. This field will be ignored for all other backends.
+  //
+  // See
+  // https://www.iana.org/assignments/tls-extensiontype-values/tls-extensiontype-values.xhtml#alpn-protocol-ids
+  // for more details on the supported values.
+  string protocol = 9;
 }
--- a/tutorials/custom_evaluator/director/go.mod
+++ b/tutorials/custom_evaluator/director/go.mod
@ -1,6 +1,6 @@
 module open-match.dev/open-match/tutorials/matchmaker101/director

-go 1.13
+go 1.14

 require (
 	google.golang.org/grpc v1.25.0
--- a/tutorials/custom_evaluator/evaluator/go.mod
+++ b/tutorials/custom_evaluator/evaluator/go.mod
@ -1,6 +1,6 @@
 module open-match.dev/open-match/tutorials/matchmaker101/evaluator

-go 1.13
+go 1.14

 require (
 	github.com/sirupsen/logrus v1.4.2
--- a/tutorials/custom_evaluator/frontend/go.mod
+++ b/tutorials/custom_evaluator/frontend/go.mod
@ -1,6 +1,6 @@
 module open-match.dev/open-match/tutorials/matchmaker101/frontend

-go 1.13
+go 1.14

 require (
 	google.golang.org/grpc v1.25.0
--- a/tutorials/custom_evaluator/matchfunction/go.mod
+++ b/tutorials/custom_evaluator/matchfunction/go.mod
@ -1,6 +1,6 @@
 module open-match.dev/open-match/tutorials/matchmaker101/matchfunction

-go 1.13
+go 1.14

 require (
 	google.golang.org/grpc v1.25.0
--- a/tutorials/custom_evaluator/solution/director/go.mod
+++ b/tutorials/custom_evaluator/solution/director/go.mod
@ -1,6 +1,6 @@
 module open-match.dev/open-match/tutorials/matchmaker101/director

-go 1.13
+go 1.14

 require (
 	google.golang.org/grpc v1.25.0
--- a/tutorials/custom_evaluator/solution/evaluator/go.mod
+++ b/tutorials/custom_evaluator/solution/evaluator/go.mod
@ -1,6 +1,6 @@
 module open-match.dev/open-match/tutorials/matchmaker101/evaluator

-go 1.13
+go 1.14

 require (
 	github.com/sirupsen/logrus v1.4.2
--- a/tutorials/custom_evaluator/solution/frontend/go.mod
+++ b/tutorials/custom_evaluator/solution/frontend/go.mod
@ -1,6 +1,6 @@
 module open-match.dev/open-match/tutorials/matchmaker101/frontend

-go 1.13
+go 1.14

 require (
 	google.golang.org/grpc v1.25.0
--- a/tutorials/custom_evaluator/solution/matchfunction/go.mod
+++ b/tutorials/custom_evaluator/solution/matchfunction/go.mod
@ -1,6 +1,6 @@
 module open-match.dev/open-match/tutorials/matchmaker101/matchfunction

-go 1.13
+go 1.14

 require (
 	google.golang.org/grpc v1.25.0
--- a/tutorials/default_evaluator/director/go.mod
+++ b/tutorials/default_evaluator/director/go.mod
@ -1,6 +1,6 @@
 module open-match.dev/open-match/tutorials/matchmaker101/director

-go 1.13
+go 1.14

 require (
 	google.golang.org/grpc v1.25.0
--- a/tutorials/default_evaluator/frontend/go.mod
+++ b/tutorials/default_evaluator/frontend/go.mod
@ -1,6 +1,6 @@
 module open-match.dev/open-match/tutorials/matchmaker101/frontend

-go 1.13
+go 1.14

 require (
 	google.golang.org/grpc v1.25.0
--- a/tutorials/default_evaluator/matchfunction/go.mod
+++ b/tutorials/default_evaluator/matchfunction/go.mod
@ -1,6 +1,6 @@
 module open-match.dev/open-match/tutorials/matchmaker101/matchfunction

-go 1.13
+go 1.14

 require (
 	google.golang.org/grpc v1.25.0
--- a/tutorials/default_evaluator/solution/director/go.mod
+++ b/tutorials/default_evaluator/solution/director/go.mod
@ -1,6 +1,6 @@
 module open-match.dev/open-match/tutorials/matchmaker101/director

-go 1.13
+go 1.14

 require (
 	google.golang.org/grpc v1.25.0
--- a/tutorials/default_evaluator/solution/frontend/go.mod
+++ b/tutorials/default_evaluator/solution/frontend/go.mod
@ -1,6 +1,6 @@
 module open-match.dev/open-match/tutorials/matchmaker101/frontend

-go 1.13
+go 1.14

 require (
 	google.golang.org/grpc v1.25.0
--- a/tutorials/default_evaluator/solution/matchfunction/go.mod
+++ b/tutorials/default_evaluator/solution/matchfunction/go.mod
@ -1,6 +1,6 @@
 module open-match.dev/open-match/tutorials/matchmaker101/matchfunction

-go 1.13
+go 1.14

 require (
 	github.com/golang/protobuf v1.3.2
--- a/tutorials/matchmaker101/director/go.mod
+++ b/tutorials/matchmaker101/director/go.mod
@ -1,6 +1,6 @@
 module open-match.dev/open-match/tutorials/matchmaker101/director

-go 1.13
+go 1.14

 require (
 	google.golang.org/grpc v1.25.0
--- a/tutorials/matchmaker101/frontend/go.mod
+++ b/tutorials/matchmaker101/frontend/go.mod
@ -1,6 +1,6 @@
 module open-match.dev/open-match/tutorials/matchmaker101/frontend

-go 1.13
+go 1.14

 require (
 	google.golang.org/grpc v1.25.0
--- a/tutorials/matchmaker101/matchfunction/go.mod
+++ b/tutorials/matchmaker101/matchfunction/go.mod
@ -1,6 +1,6 @@
 module open-match.dev/open-match/tutorials/matchmaker101/matchfunction

-go 1.13
+go 1.14

 require (
 	google.golang.org/grpc v1.25.0
--- a/tutorials/matchmaker101/solution/director/go.mod
+++ b/tutorials/matchmaker101/solution/director/go.mod
@ -1,6 +1,6 @@
 module open-match.dev/open-match/tutorials/matchmaker101/director

-go 1.13
+go 1.14

 require (
 	google.golang.org/grpc v1.25.0
--- a/tutorials/matchmaker101/solution/frontend/go.mod
+++ b/tutorials/matchmaker101/solution/frontend/go.mod
@ -1,6 +1,6 @@
 module open-match.dev/open-match/tutorials/matchmaker101/frontend

-go 1.13
+go 1.14

 require (
 	google.golang.org/grpc v1.25.0
--- a/tutorials/matchmaker101/solution/matchfunction/go.mod
+++ b/tutorials/matchmaker101/solution/matchfunction/go.mod
@ -1,6 +1,6 @@
 module open-match.dev/open-match/tutorials/matchmaker101/matchfunction

-go 1.13
+go 1.14

 require (
 	google.golang.org/grpc v1.25.0
--- a/tutorials/matchmaker102/director/go.mod
+++ b/tutorials/matchmaker102/director/go.mod
@ -1,6 +1,6 @@
 module open-match.dev/open-match/tutorials/matchmaker101/director

-go 1.13
+go 1.14

 require (
 	google.golang.org/grpc v1.25.0
--- a/tutorials/matchmaker102/frontend/go.mod
+++ b/tutorials/matchmaker102/frontend/go.mod
@ -1,6 +1,6 @@
 module open-match.dev/open-match/tutorials/matchmaker101/frontend

-go 1.13
+go 1.14

 require (
 	google.golang.org/grpc v1.25.0
--- a/tutorials/matchmaker102/matchfunction/go.mod
+++ b/tutorials/matchmaker102/matchfunction/go.mod
@ -1,6 +1,6 @@
 module open-match.dev/open-match/tutorials/matchmaker101/matchfunction

-go 1.13
+go 1.14

 require (
 	google.golang.org/grpc v1.25.0
--- a/tutorials/matchmaker102/solution/director/go.mod
+++ b/tutorials/matchmaker102/solution/director/go.mod
@ -1,6 +1,6 @@
 module open-match.dev/open-match/tutorials/matchmaker101/director

-go 1.13
+go 1.14

 require (
 	google.golang.org/grpc v1.25.0
--- a/tutorials/matchmaker102/solution/frontend/go.mod
+++ b/tutorials/matchmaker102/solution/frontend/go.mod
@ -1,6 +1,6 @@
 module open-match.dev/open-match/tutorials/matchmaker101/frontend

-go 1.13
+go 1.14

 require (
 	google.golang.org/grpc v1.25.0
--- a/tutorials/matchmaker102/solution/matchfunction/go.mod
+++ b/tutorials/matchmaker102/solution/matchfunction/go.mod
@ -1,6 +1,6 @@
 module open-match.dev/open-match/tutorials/matchmaker101/matchfunction

-go 1.13
+go 1.14

 require (
 	google.golang.org/grpc v1.25.0