Update protoc commands to match documentation. (GoogleCloudPlatform#1188)

- Use long flags for better readability.
 - Change API descriptor file from `out.pb` to `api_descriptor.pb`.
 - Use same protoc command everywhere for consistency and simplicity.

Author: kryzthov

endpoints/bookstore-grpc/README.md

@@ -46,8 +46,14 @@ code in the sample distribution.  To modify the sample or create your own gRPC
 API definition, you'll need to update the generated code. To do this, once the
 gRPC libraries and tools are installed, run:
 
-    python -m grpc.tools.protoc --python_out=generated_pb2 \
-        --grpc_python_out=generated_pb2 --proto_path=. bookstore.proto
+    python -m grpc.tools.protoc \
+        --include_imports \
+        --include_source_info \
+        --proto_path=. \
+        --python_out=generated_pb2 \
+        --grpc_python_out=generated_pb2 \
+        --descriptor_set_out=api_descriptor.pb \
+        bookstore.proto
 
 ## Running the server with gRPC <-> HTTP/JSON Transcoding
 

endpoints/getting-started-grpc/README.md

@@ -28,21 +28,22 @@ Cloud account and [SDK](https://cloud.google.com/sdk/) configured.
    just wish to regenerate these files, run:
 
     ```bash
-    python -m grpc_tools.protoc -I protos --python_out=. --grpc_python_out=. protos/helloworld.proto
-    ```
-
-1. Generate the `out.pb` from the proto file:
-
-    ```bash
-    python -m grpc_tools.protoc --include_imports --include_source_info -I protos protos/helloworld.proto --descriptor_set_out out.pb
+    python -m grpc.tools.protoc \
+        --include_imports \
+        --include_source_info \
+        --proto_path=protos \
+        --python_out=. \
+        --grpc_python_out=. \
+        --descriptor_set_out=api_descriptor.pb \
+        helloworld.proto
     ```
 
 1. Edit, `api_config.yaml`. Replace `MY_PROJECT_ID` with your project id.
 
 1. Deploy your service config to Service Management:
 
     ```bash
-    gcloud endpoints services deploy out.pb api_config.yaml
+    gcloud endpoints services deploy api_descriptor.pb api_config.yaml
     # The Config ID should be printed out, looks like: 2017-02-01r0, remember this
 
     # Set your project ID as a variable to make commands easier:
@@ -97,20 +98,20 @@ Cloud account and [SDK](https://cloud.google.com/sdk/) configured.
 
     ```bash
     /usr/share/google/dockercfg_update.sh
-    docker run -d --name=grpc-hello gcr.io/${GCLOUD_PROJECT}/python-grpc-hello:1.0
+    docker run --detach --name=grpc-hello gcr.io/${GCLOUD_PROJECT}/python-grpc-hello:1.0
     ```
 
 1. Run the Endpoints proxy:
 
     ```bash
     docker run --detach --name=esp \
-        -p 80:9000 \
+        --publish=80:9000 \
         --link=grpc-hello:grpc-hello \
         gcr.io/endpoints-release/endpoints-runtime:1 \
-        -s ${SERVICE_NAME} \
-        -v ${SERVICE_CONFIG_ID} \
-        -P 9000 \
-        -a grpc://grpc-hello:50051
+        --service=${SERVICE_NAME} \
+        --version=${SERVICE_CONFIG_ID} \
+        --http2_port=9000 \
+        --backend=grpc://grpc-hello:50051
     ```
 
 1. Back on your local machine, get the external IP of your GCE instance:

endpoints/getting-started-grpc/container-engine.yaml

@@ -41,10 +41,10 @@ spec:
       - name: esp
         image: gcr.io/endpoints-release/endpoints-runtime:1
         args: [
-          "-P", "9000",
-          "-a", "grpc://127.0.0.1:50051",
-          "-s", "SERVICE_NAME",
-          "-v", "SERVICE_CONFIG_ID",
+          "--http2_port=9000",
+          "--backend=grpc://127.0.0.1:50051",
+          "--service=SERVICE_NAME",
+          "--version=SERVICE_CONFIG_ID",
         ]
         ports:
           - containerPort: 9000

endpoints/getting-started-grpc/helloworld_pb2.py

@@ -1,7 +1,5 @@
 # Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
 import grpc
-from grpc.framework.common import cardinality
-from grpc.framework.interfaces.face import utilities as face_utilities
 
 import helloworld_pb2 as helloworld__pb2
 

endpoints/getting-started-grpc/helloworld_pb2_grpc.py

@@ -42,10 +42,10 @@ spec:
       - name: esp
         image: gcr.io/endpoints-release/endpoints-runtime:1
         args: [
-          "-p", "8081",
-          "-a", "127.0.0.1:8080",
-          "-s", "SERVICE_NAME",
-          "-v", "SERVICE_CONFIG_ID",
+          "--http_port=8081",
+          "--backend=127.0.0.1:8080",
+          "--service=SERVICE_NAME",
+          "--version=SERVICE_CONFIG_ID",
         ]
       # [END esp]
         ports:

endpoints/getting-started/container-engine.yaml

@@ -42,10 +42,10 @@ spec:
       - name: esp
         image: gcr.io/endpoints-release/endpoints-runtime:1
         args: [
-          "-P", "9000",
-          "-s", "SERVICE_NAME",
-          "-v", "SERVICE_CONFIG_ID",
-          "-a", "grpc://127.0.0.1:8000"
+          "--http2_port=9000",
+          "--service=SERVICE_NAME",
+          "--version=SERVICE_CONFIG_ID",
+          "--backend=grpc://127.0.0.1:8000"
         ]
         ports:
           - containerPort: 9000