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

Commit 7365cb2

Browse files
committed
gddo: update gae-service-proxy for go111 GAE runtime
+ 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]>
1 parent 87df31a commit 7365cb2

File tree

387 files changed

+137572
-26686
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

387 files changed

+137572
-26686
lines changed

gae-service-proxy/.gcloudignore

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# This file specifies files that are *not* uploaded to Google Cloud Platform
2+
# using gcloud. It follows the same syntax as .gitignore, with the addition of
3+
# "#!include" directives (which insert the entries of the given .gitignore-style
4+
# file at that point).
5+
#
6+
# For more information, run:
7+
# $ gcloud topic gcloudignore
8+
#
9+
.gcloudignore
10+
# If you would like to upload your .git directory, .gitignore file or files
11+
# from your .gitignore file, remove the corresponding line
12+
# below:
13+
.git
14+
.gitignore
15+
16+
# Binaries for programs and plugins
17+
*.exe
18+
*.exe~
19+
*.dll
20+
*.so
21+
*.dylib
22+
# Test binary, build with `go test -c`
23+
*.test
24+
# Output of the go coverage tool, specifically when used with LiteIDE
25+
*.out

gae-service-proxy/app.yaml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
runtime: go
2-
api_version: go1
1+
runtime: go111
32
service: serviceproxy
43

54
handlers:
6-
- url: /.*
7-
script: _go_app
8-
- url: /_ah/remote_api
9-
script: _go_app
10-
5+
- url: /.*
6+
script: auto
7+
- url: /_ah/remote_api
8+
script: auto

gae-service-proxy/main.go

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
// Copyright 2020 The Go Authors. All rights reserved.
2+
//
3+
// Use of this source code is governed by a BSD-style
4+
// license that can be found in the LICENSE file or at
5+
// https://developers.google.com/open-source/licenses/bsd.
6+
7+
// Command gae-service-proxy serves as a proxy for requests to App Engine’s
8+
// remote API endpoints.
19
package main
210

3-
import _ "google.golang.org/appengine/remote_api"
11+
import (
12+
"google.golang.org/appengine"
13+
_ "google.golang.org/appengine/remote_api"
14+
)
15+
16+
func main() {
17+
appengine.Main()
18+
}

go.mod

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ require (
1111
github.com/garyburd/redigo v1.1.1-0.20170914051019-70e1b1943d4f
1212
github.com/go-stack/stack v1.6.0 // indirect
1313
github.com/golang/lint v0.0.0-20170918230701-e5d664eb928e
14-
github.com/golang/protobuf v0.0.0-20170920220647-130e6b02ab05 // indirect
1514
github.com/golang/snappy v0.0.0-20170215233205-553a64147049
1615
github.com/google/go-cmp v0.1.1-0.20171103154506-982329095285
1716
github.com/googleapis/gax-go v2.0.0+incompatible // indirect
@@ -30,15 +29,12 @@ require (
3029
github.com/spf13/pflag v1.0.1-0.20170901120850-7aff26db30c1
3130
github.com/spf13/viper v1.0.0
3231
github.com/stretchr/testify v1.4.0 // indirect
33-
golang.org/x/net v0.0.0-20170920234330-b60f3a92103d // indirect
3432
golang.org/x/oauth2 v0.0.0-20170912212905-13449ad91cb2
3533
golang.org/x/sync v0.0.0-20170517211232-f52d1811a629 // indirect
36-
golang.org/x/sys v0.0.0-20170921191643-2320a9c15898 // indirect
37-
golang.org/x/text v0.1.1-0.20170915090833-1cbadb444a80 // indirect
3834
golang.org/x/time v0.0.0-20170424234030-8be79e1e0910 // indirect
39-
golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b
35+
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e
4036
google.golang.org/api v0.0.0-20170921000349-586095a6e407 // indirect
41-
google.golang.org/appengine v1.0.1-0.20170921170648-24e4144ec923
37+
google.golang.org/appengine v1.6.5
4238
google.golang.org/genproto v0.0.0-20170918111702-1e559d0a00ee // indirect
4339
google.golang.org/grpc v1.2.1-0.20170921194603-d4b75ebd4f9f // indirect
4440
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect

go.sum

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ github.com/go-stack/stack v1.6.0 h1:MmJCxYVKTJ0SplGKqFVX3SBnmaUhODHZrrFF6jMbpZk=
1515
github.com/go-stack/stack v1.6.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
1616
github.com/golang/lint v0.0.0-20170918230701-e5d664eb928e h1:ior8LN6127GsA53E9mD9nH/oP/LVbJplmLH5V8o+/Uk=
1717
github.com/golang/lint v0.0.0-20170918230701-e5d664eb928e/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E=
18-
github.com/golang/protobuf v0.0.0-20170920220647-130e6b02ab05 h1:Kesru7U6Mhpf/x7rthxAKnr586VFmoE2NdEvkOKvfjg=
19-
github.com/golang/protobuf v0.0.0-20170920220647-130e6b02ab05/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
18+
github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg=
19+
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
2020
github.com/golang/snappy v0.0.0-20170215233205-553a64147049 h1:K9KHZbXKpGydfDN0aZrsoHpLJlZsBrGMFWbgLDGnPZk=
2121
github.com/golang/snappy v0.0.0-20170215233205-553a64147049/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
2222
github.com/google/go-cmp v0.1.1-0.20171103154506-982329095285 h1:voz4XQjiyYyhlp7CjBDaTejOZGKv3R9+5PM5QrDgegQ=
@@ -59,24 +59,26 @@ github.com/spf13/viper v1.0.0/go.mod h1:A8kyI5cUJhb8N+3pkfONlcEcZbueH6nhAm0Fq7Sr
5959
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
6060
github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
6161
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
62-
golang.org/x/net v0.0.0-20170920234330-b60f3a92103d h1:K9o8BfisjWniWwUHm6DgSZYEppexdfyMHYEFO21a74k=
63-
golang.org/x/net v0.0.0-20170920234330-b60f3a92103d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
62+
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
63+
golang.org/x/net v0.0.0-20190603091049-60506f45cf65 h1:+rhAzEzT3f4JtomfC371qB+0Ola2caSKcY69NUBZrRQ=
64+
golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
6465
golang.org/x/oauth2 v0.0.0-20170912212905-13449ad91cb2 h1:NMHa8RdjXuWXQSB0fW0PAKkX9lHZCRu5FsmPI/IZuS4=
6566
golang.org/x/oauth2 v0.0.0-20170912212905-13449ad91cb2/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
6667
golang.org/x/sync v0.0.0-20170517211232-f52d1811a629 h1:wqoYUzeICxRnvJCvfHTh0OY0VQ6xern7nYq+ccc19e4=
6768
golang.org/x/sync v0.0.0-20170517211232-f52d1811a629/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
68-
golang.org/x/sys v0.0.0-20170921191643-2320a9c15898 h1:yqQPo1SaCTRTQnr1TJHQg5LtSwefdpkfnQ1qWRPDMm8=
69-
golang.org/x/sys v0.0.0-20170921191643-2320a9c15898/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
70-
golang.org/x/text v0.1.1-0.20170915090833-1cbadb444a80 h1:QfbDb2RQkRI2wdkeI7RuwRRLtivUM+917wtHZln6uCk=
71-
golang.org/x/text v0.1.1-0.20170915090833-1cbadb444a80/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
69+
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU=
70+
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
71+
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
72+
golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
73+
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
7274
golang.org/x/time v0.0.0-20170424234030-8be79e1e0910 h1:bCMaBn7ph495H+x72gEvgcv+mDRd9dElbzo/mVCMxX4=
7375
golang.org/x/time v0.0.0-20170424234030-8be79e1e0910/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
74-
golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b h1:7tibmaEqrQYA+q6ri7NQjuxqSwechjtDHKq6/e85S38=
75-
golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
76+
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e h1:FDhOuMEY4JVRztM/gsbk+IKUQ8kj74bxZrgw87eMMVc=
77+
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
7678
google.golang.org/api v0.0.0-20170921000349-586095a6e407 h1:PnusOQTCkaANR0CzYA+GpnwoTLc1uPzg10GAWxnrfyI=
7779
google.golang.org/api v0.0.0-20170921000349-586095a6e407/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
78-
google.golang.org/appengine v1.0.1-0.20170921170648-24e4144ec923 h1:sXzVxSVUWDC2+tQ5wAVVcujHO68ows/f06EUD/Wt6L4=
79-
google.golang.org/appengine v1.0.1-0.20170921170648-24e4144ec923/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
80+
google.golang.org/appengine v1.6.5 h1:tycE03LOZYQNhDpS27tcQdAzLCVMaj7QT2SXxebnpCM=
81+
google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
8082
google.golang.org/genproto v0.0.0-20170918111702-1e559d0a00ee h1:kgfN7j3GYevqPqse0VojTFu/nJjf/Sv9T0TwRC5Vw08=
8183
google.golang.org/genproto v0.0.0-20170918111702-1e559d0a00ee/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
8284
google.golang.org/grpc v1.2.1-0.20170921194603-d4b75ebd4f9f h1:kqLSgihd0A3Ou96/5dilYgsFqfzv6wp68EAp+s4/Qg4=

vendor/github.com/golang/protobuf/LICENSE

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/golang/protobuf/proto/Makefile

Lines changed: 0 additions & 43 deletions
This file was deleted.

vendor/github.com/golang/protobuf/proto/clone.go

Lines changed: 35 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)