[tor-commits] [meek/master] Update appengine for Google Cloud SDK (gcloud not goapp).

[dcf at torproject.org]

commit cc12b92e9b03f05cbce82f33d042883d6ffdceab
Author: David Fifield <david at bamsoftware.com>
Date:   Sat Jul 15 12:51:33 2017 -0700

    Update appengine for Google Cloud SDK (gcloud not goapp).
---
 appengine/README   | 32 +++++++++++++++++++-------------
 appengine/app.yaml |  1 -
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/appengine/README b/appengine/README
index f819d24..d71277a 100644
--- a/appengine/README
+++ b/appengine/README
@@ -4,22 +4,28 @@ client and forwards them to the server, then receives responses from the
 server and forwards them to the client.
 
 You need the Go App Engine SDK in order to deploy the app.
-	https://cloud.google.com/appengine/downloads#Google_App_Engine_SDK_for_Go
+	https://cloud.google.com/sdk/docs/#linux
+After unpacking, install the app-engine-go component:
+	google-cloud-sdk/bin/gcloud components install app-engine-go
 
 To test locally, run
-	go_appengine/goapp serve
-The app will be running at http://127.0.0.1:8080/. To configure
-meek-client to talk to the locally running app, put this in torrc:
-	UseBridges 1
-	Bridge meek 0.0.2.0:1 url=http://127.0.0.1:8080/
-	ClientTransportPlugin meek exec ./meek-client --log meek-client.log
+	google-cloud-sdk/bin/dev_appserver.py app.yaml
+The app will be running at http://127.0.0.1:8080/. You can test broker
+forwarding function by browsing to http://127.0.0.1:8000/ip.
+
+To deploy to App Engine, first create a new project and app. You have to
+think of a unique name (marked as "<appname>" in the commands). You only
+have to do the "create" step once; subsequent times you can go straight
+to the "deploy" step. This command will open a browser window so you can
+log in to a Google account.
+	google-cloud-sdk/bin/gcloud projects create <appname>
+	google-cloud-sdk/bin/gcloud app create --project=<appname>
+Then to deploy the project, run:
+	google-cloud-sdk/bin/gcloud app deploy --project=<appname>
 
-To deploy to App Engine, create a Google Account and use it to create a
-new app with a unique name. Let's say your app is called "example". Then
-to deploy it you run
-	go_appengine/goapp deploy -application example
-To configure meek-client to talk to the App Engine app, give the app's
-name as the url and "www.google.com" as the front domain.
+To configure meek-client to talk to the App Engine app, provide
+"https://<appname>.appspot.com/" as the url and "www.google.com" as the
+front domain.
 	UseBridges 1
 	Bridge meek 0.0.2.0:1 url=https://example.appspot.com/ front=www.google.com
 	ClientTransportPlugin meek exec ./meek-client --log meek-client.log
diff --git a/appengine/app.yaml b/appengine/app.yaml
index 184eb35..ff6efc1 100644
--- a/appengine/app.yaml
+++ b/appengine/app.yaml
@@ -1,4 +1,3 @@
-version: 1
 runtime: go
 api_version: go1
 automatic_scaling: