From a6088acdeb0bb79b564c07cd9c8240a9f6c84cf6 Mon Sep 17 00:00:00 2001 From: Sep Ebrahimzadeh Date: Tue, 16 Aug 2016 17:45:25 -0700 Subject: [PATCH 1/3] Make the Endpoints sample work end to end. --- managed_vms/endpoints/README.md | 8 ++++++++ managed_vms/endpoints/pom.xml | 5 ++++- managed_vms/endpoints/src/main/appengine/Dockerfile | 2 ++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/managed_vms/endpoints/README.md b/managed_vms/endpoints/README.md index 429f50d9691..4a8698aaedd 100644 --- a/managed_vms/endpoints/README.md +++ b/managed_vms/endpoints/README.md @@ -1,8 +1,16 @@ # Google Cloud Endpoints on App Engine flexible environment This sample demonstrates how to use Google Cloud Endpoints on Google App Engine Flexible Environment using Java. +## Edit the Swagger API specification + + Open the src/main/appengine/swagger.yaml file in your favorite editor, and replace the YOUR-PROJECT-ID host line with your actual Google Cloud Platform project Id. + ## Running locally $ mvn jetty:run ## Deploying $ mvn gcloud:deploy + +## Calling your API + + Please refer to the Google Cloud Endpoints [documentation](https://cloud.google.com/endpoints/docs/app-engine/) for App Engine Flexible Environment to learn about creating an API Key and calling your API. diff --git a/managed_vms/endpoints/pom.xml b/managed_vms/endpoints/pom.xml index 2e43b6307ef..fefb3acde20 100644 --- a/managed_vms/endpoints/pom.xml +++ b/managed_vms/endpoints/pom.xml @@ -39,7 +39,10 @@ com.google.appengine gcloud-maven-plugin - 2.0.9.111.v20160527 + 2.0.9.121.v20160815 + + beta + org.apache.maven.plugins diff --git a/managed_vms/endpoints/src/main/appengine/Dockerfile b/managed_vms/endpoints/src/main/appengine/Dockerfile index 62ccde6e3f4..766f2c38581 100644 --- a/managed_vms/endpoints/src/main/appengine/Dockerfile +++ b/managed_vms/endpoints/src/main/appengine/Dockerfile @@ -1,3 +1,5 @@ FROM gcr.io/google_appengine/jetty9 ADD . /app + +ADD managed-vms-endpoints-1.0-SNAPSHOT.war $JETTY_BASE/webapps/root.war From e462ba960f4c956a231f62a596b00b89fc333302 Mon Sep 17 00:00:00 2001 From: Sep Ebrahimzadeh Date: Tue, 16 Aug 2016 17:57:35 -0700 Subject: [PATCH 2/3] Update README --- managed_vms/endpoints/README.md | 4 ++-- managed_vms/endpoints/src/main/appengine/Dockerfile | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/managed_vms/endpoints/README.md b/managed_vms/endpoints/README.md index 4a8698aaedd..382db54701e 100644 --- a/managed_vms/endpoints/README.md +++ b/managed_vms/endpoints/README.md @@ -3,7 +3,7 @@ This sample demonstrates how to use Google Cloud Endpoints on Google App Engine ## Edit the Swagger API specification - Open the src/main/appengine/swagger.yaml file in your favorite editor, and replace the YOUR-PROJECT-ID host line with your actual Google Cloud Platform project Id. +Open the src/main/appengine/swagger.yaml file in your favorite editor, and replace the YOUR-PROJECT-ID host line with your actual Google Cloud Platform project Id. ## Running locally $ mvn jetty:run @@ -13,4 +13,4 @@ This sample demonstrates how to use Google Cloud Endpoints on Google App Engine ## Calling your API - Please refer to the Google Cloud Endpoints [documentation](https://cloud.google.com/endpoints/docs/app-engine/) for App Engine Flexible Environment to learn about creating an API Key and calling your API. +Please refer to the Google Cloud Endpoints [documentation](https://cloud.google.com/endpoints/docs/app-engine/) for App Engine Flexible Environment to learn about creating an API Key and calling your API. diff --git a/managed_vms/endpoints/src/main/appengine/Dockerfile b/managed_vms/endpoints/src/main/appengine/Dockerfile index 766f2c38581..49864ba44c8 100644 --- a/managed_vms/endpoints/src/main/appengine/Dockerfile +++ b/managed_vms/endpoints/src/main/appengine/Dockerfile @@ -1,5 +1,4 @@ FROM gcr.io/google_appengine/jetty9 -ADD . /app - ADD managed-vms-endpoints-1.0-SNAPSHOT.war $JETTY_BASE/webapps/root.war +ADD . /app From 068e773d9f7a842c357f1e2b492cc60a627bdb1d Mon Sep 17 00:00:00 2001 From: Sep Ebrahimzadeh Date: Tue, 16 Aug 2016 18:05:32 -0700 Subject: [PATCH 3/3] Update README --- managed_vms/endpoints/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/managed_vms/endpoints/README.md b/managed_vms/endpoints/README.md index 382db54701e..8ff97e71bde 100644 --- a/managed_vms/endpoints/README.md +++ b/managed_vms/endpoints/README.md @@ -3,7 +3,7 @@ This sample demonstrates how to use Google Cloud Endpoints on Google App Engine ## Edit the Swagger API specification -Open the src/main/appengine/swagger.yaml file in your favorite editor, and replace the YOUR-PROJECT-ID host line with your actual Google Cloud Platform project Id. +Open the [src/main/appengine/swagger.yaml](src/main/appengine/swagger.yaml) file in your favorite editor, and replace the YOUR-PROJECT-ID `host` line with your actual Google Cloud Platform project Id. ## Running locally $ mvn jetty:run