From 5dc607e6fdf3675b4fe31352946a2df3d1e1f845 Mon Sep 17 00:00:00 2001
From: Cynthia Coan <ccoan@instructure.com>
Date: Fri, 26 Jul 2019 14:04:01 -0600
Subject: [PATCH 1/3] update filter example with what we use for tests

this forces the same workspace file we use for tests:
  - https://github.com/envoyproxy/envoy/blob/14c5371/ci/build_setup.sh#L75

to be pushed to the envoy-filter-example. this will allow not having
to file a manual PR to fix the build, such as:

- https://github.com/envoyproxy/envoy-filter-example/pull/95

Signed-off-by: Cynthia Coan <ccoan@instructure.com>
---
 ci/filter_example_mirror.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/ci/filter_example_mirror.sh b/ci/filter_example_mirror.sh
index 43949f592121e..0fe23e66ea96a 100755
--- a/ci/filter_example_mirror.sh
+++ b/ci/filter_example_mirror.sh
@@ -2,6 +2,7 @@
 
 set -e
 
+ENVOY_SRCDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")/../" && pwd)
 CHECKOUT_DIR=../envoy-filter-example
 
 if [ -z "$CIRCLE_PULL_REQUEST" ] && [ "$CIRCLE_BRANCH" == "master" ]
@@ -14,13 +15,17 @@ then
   git -C "$CHECKOUT_DIR" fetch
   git -C "$CHECKOUT_DIR" checkout -B master origin/master
 
+  echo "Updating Submodule..."
   # Update submodule to latest Envoy SHA
   ENVOY_SHA=$(git rev-parse HEAD)
   git -C "$CHECKOUT_DIR" submodule update --init
   git -C "$CHECKOUT_DIR/envoy" checkout "$ENVOY_SHA"
-  git -C "$CHECKOUT_DIR" commit -a -m "Update Envoy submodule to $ENVOY_SHA"
 
-  echo "Pushing..."
+  echo "Updating Workspace file."
+  sed -e "s|{ENVOY_SRCDIR}|${ENVOY_SRCDIR}|" "${ENVOY_SRCDIR}"/ci/WORKSPACE.filter.example > "${CHECKOUT_DIR}"/WORKSPACE
+
+  echo "Commiting, and Pushing..."
+  git -C "$CHECKOUT_DIR" commit -a -m "Update Envoy submodule to $ENVOY_SHA"
   git -C "$CHECKOUT_DIR" push origin master
   echo "Done"
 fi

From 780d4625c23e3f670f0a6acbbaa0f5e23cb1fc52 Mon Sep 17 00:00:00 2001
From: Cynthia Coan <ccoan@instructure.com>
Date: Fri, 26 Jul 2019 14:12:24 -0600
Subject: [PATCH 2/3] fix spelling of committing

Signed-off-by: Cynthia Coan <ccoan@instructure.com>
---
 ci/filter_example_mirror.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/filter_example_mirror.sh b/ci/filter_example_mirror.sh
index 0fe23e66ea96a..77514919f5ebd 100755
--- a/ci/filter_example_mirror.sh
+++ b/ci/filter_example_mirror.sh
@@ -24,7 +24,7 @@ then
   echo "Updating Workspace file."
   sed -e "s|{ENVOY_SRCDIR}|${ENVOY_SRCDIR}|" "${ENVOY_SRCDIR}"/ci/WORKSPACE.filter.example > "${CHECKOUT_DIR}"/WORKSPACE
 
-  echo "Commiting, and Pushing..."
+  echo "Committing, and Pushing..."
   git -C "$CHECKOUT_DIR" commit -a -m "Update Envoy submodule to $ENVOY_SHA"
   git -C "$CHECKOUT_DIR" push origin master
   echo "Done"

From f7b67f33009838e56484da7d667aacc13e8218a4 Mon Sep 17 00:00:00 2001
From: Cynthia Coan <ccoan@instructure.com>
Date: Fri, 26 Jul 2019 14:14:54 -0600
Subject: [PATCH 3/3] envoy-filter-example uses submodules

Signed-off-by: Cynthia Coan <ccoan@instructure.com>
---
 ci/filter_example_mirror.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/filter_example_mirror.sh b/ci/filter_example_mirror.sh
index 77514919f5ebd..1d6d5ae05b238 100755
--- a/ci/filter_example_mirror.sh
+++ b/ci/filter_example_mirror.sh
@@ -22,7 +22,7 @@ then
   git -C "$CHECKOUT_DIR/envoy" checkout "$ENVOY_SHA"
 
   echo "Updating Workspace file."
-  sed -e "s|{ENVOY_SRCDIR}|${ENVOY_SRCDIR}|" "${ENVOY_SRCDIR}"/ci/WORKSPACE.filter.example > "${CHECKOUT_DIR}"/WORKSPACE
+  sed -e "s|{ENVOY_SRCDIR}|envoy|" "${ENVOY_SRCDIR}"/ci/WORKSPACE.filter.example > "${CHECKOUT_DIR}"/WORKSPACE
 
   echo "Committing, and Pushing..."
   git -C "$CHECKOUT_DIR" commit -a -m "Update Envoy submodule to $ENVOY_SHA"