Update Envoy SHA to latest. (#1857)

* Update Envoy SHA to latest. Signed-off-by: Piotr Sikora <[email protected]> * review: install pkg-config on CircleCI. Signed-off-by: Piotr Sikora <[email protected]> * review: install pkg-config on build image. Signed-off-by: Piotr Sikora <[email protected]>
istio · Jul 18, 2018 · d259ac4 · d259ac4
1 parent 6eb534e
commit d259ac4
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/.circleci/Dockerfile b/.circleci/Dockerfile
@@ -14,7 +14,7 @@ RUN sudo sh -c 'echo "deb http://apt.llvm.org/stretch/ llvm-toolchain-stretch-5.
 
 RUN sudo apt-get update && \
     sudo apt-get -y install \
-    wget software-properties-common make cmake python python-pip \
+    wget software-properties-common make cmake python python-pip pkg-config \
     zlib1g-dev bash-completion bc libtool automake zip time g++-6 gcc-6 \
     clang-5.0 rsync
 

diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -8,6 +8,7 @@ jobs:
       - BAZEL_TEST_ARGS: "--test_env=ENVOY_IP_TEST_VERSIONS=v4only --test_output=all"
     resource_class: xlarge
     steps:
+      - run: sudo apt-get update && sudo apt-get install -y pkg-config
       - checkout
       - restore_cache:
           keys:

diff --git a/WORKSPACE b/WORKSPACE
@@ -30,7 +30,7 @@ bind(
 )
 
 # When updating envoy sha manually please update the sha in istio.deps file also
-ENVOY_SHA = "3b05bffcbaedaf6d112ba38ad58121ba5aa5af51"
+ENVOY_SHA = "a0b22efd0750a1f503d605b22e0c041e279a08b3"
 
 http_archive(
     name = "envoy",

diff --git a/istio.deps b/istio.deps
@@ -11,6 +11,6 @@
 		"name": "ENVOY_SHA",
 		"repoName": "envoyproxy/envoy",
 		"file": "WORKSPACE",
-		"lastStableSHA": "3b05bffcbaedaf6d112ba38ad58121ba5aa5af51"
+		"lastStableSHA": "a0b22efd0750a1f503d605b22e0c041e279a08b3"
 	}
 ]
diff --git a/src/envoy/http/mixer/report_data.h b/src/envoy/http/mixer/report_data.h
@@ -100,7 +100,7 @@ class ReportData : public ::istio::control::http::ReportData {
 
   bool GetDestinationUID(std::string *uid) const override {
     if (info_.upstreamHost()) {
-      return Utils::GetDestinationUID(info_.upstreamHost()->metadata(), uid);
+      return Utils::GetDestinationUID(*info_.upstreamHost()->metadata(), uid);
     }
     return false;
   }

diff --git a/src/envoy/tcp/mixer/filter.cc b/src/envoy/tcp/mixer/filter.cc
@@ -173,7 +173,7 @@ bool Filter::GetDestinationIpPort(std::string* str_ip, int* port) const {
 bool Filter::GetDestinationUID(std::string* uid) const {
   if (filter_callbacks_->upstreamHost()) {
     return Utils::GetDestinationUID(
-        filter_callbacks_->upstreamHost()->metadata(), uid);
+        *filter_callbacks_->upstreamHost()->metadata(), uid);
   }
   return false;
 }