Update Envoy SHA to latest. (#1852)

PiotrSikora · rshriram · commit f85f49c1144f · 2018-07-13T17:41:10.000-04:00
Signed-off-by: Piotr Sikora &lt;piotrsikora@google.com&gt;
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 = "01d2e16e973a76cc05f5e9e5c7a74f73498bc6c2"
 
 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": "01d2e16e973a76cc05f5e9e5c7a74f73498bc6c2"
 	}
 ]
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;
 }

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ bind(`
`30`	`30`	`)`
`31`	`31`
`32`	`32`	`# When updating envoy sha manually please update the sha in istio.deps file also`
`33`		`-ENVOY_SHA = "3b05bffcbaedaf6d112ba38ad58121ba5aa5af51"`
	`33`	`+ENVOY_SHA = "01d2e16e973a76cc05f5e9e5c7a74f73498bc6c2"`
`34`	`34`
`35`	`35`	`http_archive(`
`36`	`36`	`name = "envoy",`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,6 @@`
`11`	`11`	`"name": "ENVOY_SHA",`
`12`	`12`	`"repoName": "envoyproxy/envoy",`
`13`	`13`	`"file": "WORKSPACE",`
`14`		`- "lastStableSHA": "3b05bffcbaedaf6d112ba38ad58121ba5aa5af51"`
	`14`	`+ "lastStableSHA": "01d2e16e973a76cc05f5e9e5c7a74f73498bc6c2"`
`15`	`15`	`}`
`16`	`16`	`]`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ class ReportData : public ::istio::control::http::ReportData {`
`100`	`100`
`101`	`101`	`bool GetDestinationUID(std::string *uid) const override {`
`102`	`102`	`if (info_.upstreamHost()) {`
`103`		`- return Utils::GetDestinationUID(info_.upstreamHost()->metadata(), uid);`
	`103`	`+ return Utils::GetDestinationUID(*info_.upstreamHost()->metadata(), uid);`
`104`	`104`	`}`
`105`	`105`	`return false;`
`106`	`106`	`}`
Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ bool Filter::GetDestinationIpPort(std::string* str_ip, int* port) const {`
`173`	`173`	`bool Filter::GetDestinationUID(std::string* uid) const {`
`174`	`174`	`if (filter_callbacks_->upstreamHost()) {`
`175`	`175`	`return Utils::GetDestinationUID(`
`176`		`- filter_callbacks_->upstreamHost()->metadata(), uid);`
	`176`	`+ *filter_callbacks_->upstreamHost()->metadata(), uid);`
`177`	`177`	`}`
`178`	`178`	`return false;`
`179`	`179`	`}`