Skip to content
This repository has been archived by the owner on Jan 16, 2021. It is now read-only.

Commit

Permalink
gddo: update gae-service-proxy for go111 GAE runtime
Browse files Browse the repository at this point in the history
+ The go111 runtime requires google.golang.org/appengine to be
  updated to v1.6.5 in order for legacy APIs to continue to work
+ Small changes need to be made to the main package so that there
  is a proper main function

Steps run to update vendored dependencies:

  go get -d google.golang.org/[email protected]
  go mod tidy
  go mod vendor

Change-Id: Ibfec53f00e8ba4874c36478607f68b0e652e09f6
Reviewed-on: https://go-review.googlesource.com/c/gddo/+/216298
Reviewed-by: Bryan C. Mills <[email protected]>
  • Loading branch information
andybons committed Jan 27, 2020
1 parent 87df31a commit 7365cb2
Show file tree
Hide file tree
Showing 387 changed files with 137,572 additions and 26,686 deletions.
25 changes: 25 additions & 0 deletions gae-service-proxy/.gcloudignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# This file specifies files that are *not* uploaded to Google Cloud Platform
# using gcloud. It follows the same syntax as .gitignore, with the addition of
# "#!include" directives (which insert the entries of the given .gitignore-style
# file at that point).
#
# For more information, run:
# $ gcloud topic gcloudignore
#
.gcloudignore
# If you would like to upload your .git directory, .gitignore file or files
# from your .gitignore file, remove the corresponding line
# below:
.git
.gitignore

# Binaries for programs and plugins
*.exe
*.exe~
*.dll
*.so
*.dylib
# Test binary, build with `go test -c`
*.test
# Output of the go coverage tool, specifically when used with LiteIDE
*.out
12 changes: 5 additions & 7 deletions gae-service-proxy/app.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
runtime: go
api_version: go1
runtime: go111
service: serviceproxy

handlers:
- url: /.*
script: _go_app
- url: /_ah/remote_api
script: _go_app

- url: /.*
script: auto
- url: /_ah/remote_api
script: auto
17 changes: 16 additions & 1 deletion gae-service-proxy/main.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
// Copyright 2020 The Go Authors. All rights reserved.
//
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file or at
// https://developers.google.com/open-source/licenses/bsd.

// Command gae-service-proxy serves as a proxy for requests to App Engine’s
// remote API endpoints.
package main

import _ "google.golang.org/appengine/remote_api"
import (
"google.golang.org/appengine"
_ "google.golang.org/appengine/remote_api"
)

func main() {
appengine.Main()
}
8 changes: 2 additions & 6 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ require (
github.com/garyburd/redigo v1.1.1-0.20170914051019-70e1b1943d4f
github.com/go-stack/stack v1.6.0 // indirect
github.com/golang/lint v0.0.0-20170918230701-e5d664eb928e
github.com/golang/protobuf v0.0.0-20170920220647-130e6b02ab05 // indirect
github.com/golang/snappy v0.0.0-20170215233205-553a64147049
github.com/google/go-cmp v0.1.1-0.20171103154506-982329095285
github.com/googleapis/gax-go v2.0.0+incompatible // indirect
Expand All @@ -30,15 +29,12 @@ require (
github.com/spf13/pflag v1.0.1-0.20170901120850-7aff26db30c1
github.com/spf13/viper v1.0.0
github.com/stretchr/testify v1.4.0 // indirect
golang.org/x/net v0.0.0-20170920234330-b60f3a92103d // indirect
golang.org/x/oauth2 v0.0.0-20170912212905-13449ad91cb2
golang.org/x/sync v0.0.0-20170517211232-f52d1811a629 // indirect
golang.org/x/sys v0.0.0-20170921191643-2320a9c15898 // indirect
golang.org/x/text v0.1.1-0.20170915090833-1cbadb444a80 // indirect
golang.org/x/time v0.0.0-20170424234030-8be79e1e0910 // indirect
golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e
google.golang.org/api v0.0.0-20170921000349-586095a6e407 // indirect
google.golang.org/appengine v1.0.1-0.20170921170648-24e4144ec923
google.golang.org/appengine v1.6.5
google.golang.org/genproto v0.0.0-20170918111702-1e559d0a00ee // indirect
google.golang.org/grpc v1.2.1-0.20170921194603-d4b75ebd4f9f // indirect
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
Expand Down
26 changes: 14 additions & 12 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ github.com/go-stack/stack v1.6.0 h1:MmJCxYVKTJ0SplGKqFVX3SBnmaUhODHZrrFF6jMbpZk=
github.com/go-stack/stack v1.6.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
github.com/golang/lint v0.0.0-20170918230701-e5d664eb928e h1:ior8LN6127GsA53E9mD9nH/oP/LVbJplmLH5V8o+/Uk=
github.com/golang/lint v0.0.0-20170918230701-e5d664eb928e/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E=
github.com/golang/protobuf v0.0.0-20170920220647-130e6b02ab05 h1:Kesru7U6Mhpf/x7rthxAKnr586VFmoE2NdEvkOKvfjg=
github.com/golang/protobuf v0.0.0-20170920220647-130e6b02ab05/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg=
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/snappy v0.0.0-20170215233205-553a64147049 h1:K9KHZbXKpGydfDN0aZrsoHpLJlZsBrGMFWbgLDGnPZk=
github.com/golang/snappy v0.0.0-20170215233205-553a64147049/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
github.com/google/go-cmp v0.1.1-0.20171103154506-982329095285 h1:voz4XQjiyYyhlp7CjBDaTejOZGKv3R9+5PM5QrDgegQ=
Expand Down Expand Up @@ -59,24 +59,26 @@ github.com/spf13/viper v1.0.0/go.mod h1:A8kyI5cUJhb8N+3pkfONlcEcZbueH6nhAm0Fq7Sr
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
golang.org/x/net v0.0.0-20170920234330-b60f3a92103d h1:K9o8BfisjWniWwUHm6DgSZYEppexdfyMHYEFO21a74k=
golang.org/x/net v0.0.0-20170920234330-b60f3a92103d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/net v0.0.0-20190603091049-60506f45cf65 h1:+rhAzEzT3f4JtomfC371qB+0Ola2caSKcY69NUBZrRQ=
golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
golang.org/x/oauth2 v0.0.0-20170912212905-13449ad91cb2 h1:NMHa8RdjXuWXQSB0fW0PAKkX9lHZCRu5FsmPI/IZuS4=
golang.org/x/oauth2 v0.0.0-20170912212905-13449ad91cb2/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/sync v0.0.0-20170517211232-f52d1811a629 h1:wqoYUzeICxRnvJCvfHTh0OY0VQ6xern7nYq+ccc19e4=
golang.org/x/sync v0.0.0-20170517211232-f52d1811a629/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20170921191643-2320a9c15898 h1:yqQPo1SaCTRTQnr1TJHQg5LtSwefdpkfnQ1qWRPDMm8=
golang.org/x/sys v0.0.0-20170921191643-2320a9c15898/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/text v0.1.1-0.20170915090833-1cbadb444a80 h1:QfbDb2RQkRI2wdkeI7RuwRRLtivUM+917wtHZln6uCk=
golang.org/x/text v0.1.1-0.20170915090833-1cbadb444a80/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/time v0.0.0-20170424234030-8be79e1e0910 h1:bCMaBn7ph495H+x72gEvgcv+mDRd9dElbzo/mVCMxX4=
golang.org/x/time v0.0.0-20170424234030-8be79e1e0910/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b h1:7tibmaEqrQYA+q6ri7NQjuxqSwechjtDHKq6/e85S38=
golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e h1:FDhOuMEY4JVRztM/gsbk+IKUQ8kj74bxZrgw87eMMVc=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
google.golang.org/api v0.0.0-20170921000349-586095a6e407 h1:PnusOQTCkaANR0CzYA+GpnwoTLc1uPzg10GAWxnrfyI=
google.golang.org/api v0.0.0-20170921000349-586095a6e407/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
google.golang.org/appengine v1.0.1-0.20170921170648-24e4144ec923 h1:sXzVxSVUWDC2+tQ5wAVVcujHO68ows/f06EUD/Wt6L4=
google.golang.org/appengine v1.0.1-0.20170921170648-24e4144ec923/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
google.golang.org/appengine v1.6.5 h1:tycE03LOZYQNhDpS27tcQdAzLCVMaj7QT2SXxebnpCM=
google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
google.golang.org/genproto v0.0.0-20170918111702-1e559d0a00ee h1:kgfN7j3GYevqPqse0VojTFu/nJjf/Sv9T0TwRC5Vw08=
google.golang.org/genproto v0.0.0-20170918111702-1e559d0a00ee/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
google.golang.org/grpc v1.2.1-0.20170921194603-d4b75ebd4f9f h1:kqLSgihd0A3Ou96/5dilYgsFqfzv6wp68EAp+s4/Qg4=
Expand Down
3 changes: 0 additions & 3 deletions vendor/github.com/golang/protobuf/LICENSE

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

43 changes: 0 additions & 43 deletions vendor/github.com/golang/protobuf/proto/Makefile

This file was deleted.

46 changes: 35 additions & 11 deletions vendor/github.com/golang/protobuf/proto/clone.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 7365cb2

Please sign in to comment.