From a9fa4c674b4a3406a3562f42873588aa3c49b5ee Mon Sep 17 00:00:00 2001
From: zpencer <spencerfang@google.com>
Date: Tue, 24 Jul 2018 15:50:56 -0700
Subject: [PATCH] grpc-zpages: gen_channelz_pb.sh should accept a git sha param
 (#307)

If no param is specified, we pull from the latest grpc/grpc-protos
---
 grpc-zpages/README.md                                     | 5 +++++
 grpc-zpages/buildscripts/channelz_codgen.sh               | 8 +++++++-
 .../docker/codegen/shared_dir/scripts/gen_channelz_pb.sh  | 6 +++++-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/grpc-zpages/README.md b/grpc-zpages/README.md
index 79f823f..e24de17 100644
--- a/grpc-zpages/README.md
+++ b/grpc-zpages/README.md
@@ -72,5 +72,10 @@ work with version `5.8.0` of `npm`.
 To rebuild and copy the distributable files:
 
 ```bash
+# Pull the latest proto definitions from
+# https://github.com/grpc/grpc-proto
+$ buildscripts/channelz_codegen.sh
+
+# Rebuild the angular app
 $ buildscripts/update_angular.sh
 ```
diff --git a/grpc-zpages/buildscripts/channelz_codgen.sh b/grpc-zpages/buildscripts/channelz_codgen.sh
index e37c56e..0b2ee0e 100755
--- a/grpc-zpages/buildscripts/channelz_codgen.sh
+++ b/grpc-zpages/buildscripts/channelz_codgen.sh
@@ -1,8 +1,14 @@
 #!/bin/bash
 set -eu -o pipefail
 
+if [ "$#" -gt  1 ]; then
+    echo "Usage: $0 [GRPC_PROTO_REPO_SHA]"
+    echo "GRPC_PROTO_SHA defaults to 'origin/master'"
+fi
+
 # Check out a known good SHA for reproducibility
 readonly GRPC_WEB_SHA=6357fa78f36d2e08636612f281250b31f28ae6ec
+readonly GRPC_PROTO_SHA="${1:-origin/master}"
 
 readonly GRPC_ZPAGES_DIR="$(cd "$(dirname "$0")"/.. && pwd)"
 readonly GITHUB_DIR="$GRPC_ZPAGES_DIR"/buildscripts/github/
@@ -21,6 +27,6 @@ docker build -t channelz_grpc_web_prereqs ./prereqs/
 cd "$GRPC_ZPAGES_DIR"/docker
 docker build -t channelz_codegen codegen
 
-exec docker run --rm -v "$GRPC_ZPAGES_DIR"/docker/codegen/shared_dir:/shared_dir/ channelz_codegen bash -c "function fixFiles() { chown -R $(id -u):$(id -g) /shared_dir; }; trap fixFiles EXIT; /shared_dir/scripts/gen_channelz_pb.sh"
+exec docker run --rm -v "$GRPC_ZPAGES_DIR"/docker/codegen/shared_dir:/shared_dir/ channelz_codegen bash -c "function fixFiles() { chown -R $(id -u):$(id -g) /shared_dir; }; trap fixFiles EXIT; /shared_dir/scripts/gen_channelz_pb.sh $GRPC_PROTO_SHA"
 
 mv "$GRPC_ZPAGES_DIR"/docker/codegen/shared_dir/gen_out/channelz.js "$GRPC_ZPAGES_DIR"/web/channelzui/src/assets/channelz.js
diff --git a/grpc-zpages/docker/codegen/shared_dir/scripts/gen_channelz_pb.sh b/grpc-zpages/docker/codegen/shared_dir/scripts/gen_channelz_pb.sh
index cd3a9fe..84d7ba2 100755
--- a/grpc-zpages/docker/codegen/shared_dir/scripts/gen_channelz_pb.sh
+++ b/grpc-zpages/docker/codegen/shared_dir/scripts/gen_channelz_pb.sh
@@ -1,7 +1,11 @@
 #!/bin/bash
 set -eu -o pipefail
 
-readonly GRPC_PROTO_SHA=91d19ac45f696816df5f1547cacaa201280cdc68
+if [ "$#" -ne  1 ]; then
+    echo "Usage: $0 GRPC_PROTO_SHA"
+fi
+
+readonly GRPC_PROTO_SHA="$1"
 readonly SHARED_DIR="$(cd "$(dirname "$0")"/.. && pwd)"
 
 mkdir -p /github