Update Endpoints samples: (#706)

1. Change default service names to the new cloud.goog format.
2. Change app.yaml beta_settings to endpoints_api_service.

Author: sepehre

appengine/standard/endpoints-frameworks-v2/echo/README.md

@@ -13,13 +13,19 @@ Install the Endpoints Frameworks v2 library:
 
 ## Deploying to Google App Engine
 
-Generate a swagger file by running: `python lib/endpoints/endpointscfg.py get_swagger_spec main.EchoApi --hostname your-service.appspot.com`
+Generate a swagger file by running: `python lib/endpoints/endpointscfg.py get_swagger_spec main.EchoApi --hostname echo-api.endpoints.[YOUR-PROJECT-ID].cloud.goog`
+
+Remember to replace [YOUR-PROJECT-ID] with your project ID.
 
 To set up OAuth2, replace `your-oauth-client-id.com` under `audiences` in the annotation for `get_user_email` with your OAuth2 client ID. If you want to use Google OAuth2 Playground, use `407408718192.apps.googleusercontent.com` as your audience. To generate a JWT, go to the following address: `https://developers.google.com/oauthplayground`.
 
 Deploy the generated swagger spec to Google Cloud Service Management: `gcloud alpha service-management deploy echo-v1_swagger.json`
 
-Open the `app.yaml` file and in the `env_variables` section, replace `your-service.appspot.com` with your service name, and `2016-08-01r0` with your uploaded service management configuration.
+The command returns several lines of information, including a line similar to the following:
+
+   Service Configuration [2016-08-01r0] uploaded for service "echo-api.endpoints.[YOUR-PROJECT-ID].cloud.goog"
+
+Open the `app.yaml` file and in the `env_variables` section, replace [YOUR-PROJECT-ID] in `echo-api.endpoints.[YOUR-PROJECT-ID].cloud.goog` with your project ID. This is your Endpoints service name. Then replace `2016-08-01r0` with your uploaded service management configuration.
 
 Then, deploy the sample using `gcloud`:
 

appengine/standard/endpoints-frameworks-v2/echo/app.yaml

@@ -26,7 +26,7 @@ libraries:
   version: 2.7.11
 
 env_variables:
-  # Replace with your endpoints service name.
-  ENDPOINTS_SERVICE_NAME: your-service.appspot.com
-  # Replace with the version Id of your uploaded Endpoints service.
+  # The following values are to be replaced by information from the output of
+  # 'gcloud service-management deploy swagger.json' command.
+  ENDPOINTS_SERVICE_NAME: echo-api.endpoints.[YOUR-PROJECT-ID].cloud.goog
   ENDPOINTS_SERVICE_VERSION: 2016-08-01r0

appengine/standard/endpoints-frameworks-v2/quickstart/app.yaml

@@ -22,7 +22,7 @@ libraries:
   version: 2.7.11
 
 env_variables:
-  # Replace with your Endpoints service name.
-  ENDPOINTS_SERVICE_NAME: your-service.appspot.com
-  # Replace with the version ID of your uploaded Endpoints service.
+  # The following values are to be replaced by information from the output of
+  # 'gcloud service-management deploy swagger.json' command.
+  ENDPOINTS_SERVICE_NAME: greeting-api.endpoints.[YOUR-PROJECT-ID].cloud.goog
   ENDPOINTS_SERVICE_VERSION: 2016-08-01r0

endpoints/bookstore-grpc/api_config.yaml

@@ -26,7 +26,7 @@ config_version: 3
 #
 # Name of the service configuration.
 #
-name: bookstore.<MY_PROJECT_ID>.appspot.com
+name: bookstore.endpoints.<MY_PROJECT_ID>.cloud.goog
 
 #
 # API title to appear in the user interface (Google Cloud Console).

endpoints/getting-started/app.yaml

@@ -5,8 +5,8 @@ entrypoint: gunicorn -b :$PORT main:app
 runtime_config:
   python_version: 3
 
-beta_settings:
-  # Enable Google Cloud Endpoints API management.
-  use_endpoints_api_management: true
-  # Specify the Open API specification.
-  endpoints_swagger_spec_file: openapi.yaml
+endpoints_api_service:
+  # The following values are to be replaced by information from the output of
+  # 'gcloud service-management deploy openapi.yaml' command.
+  name: ENDPOINTS SERVICE-NAME
+  config_id: ENDPOINTS CONFIG-ID

endpoints/getting-started/openapi.yaml

@@ -4,7 +4,7 @@ info:
   description: "A simple Google Cloud Endpoints API example."
   title: "Endpoints Example"
   version: "1.0.0"
-host: "YOUR-PROJECT-ID.appspot.com"
+host: "echo-api.endpoints.YOUR-PROJECT-ID.cloud.goog"
 # [END swagger]
 basePath: "/"
 consumes: