Update Envoy SHA to latest with TCP proxy fixes. (envoyproxy#1964)

Pulling the following changes from github.com/envoyproxy/envoy:

f936fc6 ssl: serialize accesses to SSL socket factory contexts (envoyproxy#4345)
e34dcd6 Fix crash in tcp_proxy (envoyproxy#4323)
ae6a252 router: fix matching when all domains have wildcards (envoyproxy#4326)
aa06142 test: Stop fake_upstream methods from accidentally succeeding (envoyproxy#4232)
5d73187 rbac: update the authenticated.user to a StringMatcher. (envoyproxy#4250)
c6bfc7d time: Event::TimeSystem abstraction to make it feasible to inject time with simulated timers (envoyproxy#4257)
752483e Fixing the fix (envoyproxy#4333)
83487f6 tls: update BoringSSL to ab36a84b (3497). (envoyproxy#4338)
7bc210e test: fixing interactions between waitFor and ignore_spurious_events (envoyproxy#4309)
69474b3 admin: order stats in clusters json admin (envoyproxy#4306)
2d155f9 ppc64le build (envoyproxy#4183)
07efc6d fix static initialization fiasco problem (envoyproxy#4314)
0b7e3b5 test: Remove declared but undefined class methods (envoyproxy#4297)
1485a13 lua: make sure resetting dynamic metadata wrapper when request info is marked dead
d243cd6 test: set to zero when start_time exceeds limit (envoyproxy#4328)
0a1e92a test: fix heap use-after-free in ~IntegrationTestServer. (envoyproxy#4319)
cddc732 CONTRIBUTING: Document 'kick-ci' trick. (envoyproxy#4335)
f13ef24 docs: remove reference to deprecated value field (envoyproxy#4322)
e947a27 router: minor doc fixes in stream idle timeout (envoyproxy#4329)
0c2e998 tcp-proxy: fixing a TCP proxy bug where we attempted to readDisable a closed connection (envoyproxy#4296)
00ffe44 utility: fix strftime overflow handling. (envoyproxy#4321)
af1183c Re-enable TcpProxySslIntegrationTest and make the tests pass again. (envoyproxy#4318)
3553461 fuzz: fix H2 codec fuzzer post envoyproxy#4262. (envoyproxy#4311)
42f6048 Proto string issue fix (envoyproxy#4320)
9c492a0 Support Envoy to fetch secrets using SDS service. (envoyproxy#4256)
a857219 ratelimit: revert `revert rate limit failure mode config` and add tests (envoyproxy#4303)
1d34172 dns: fix exception unsafe behavior in c-ares callbacks. (envoyproxy#4307)
1212423 alts: add gRPC TSI socket (envoyproxy#4153)
f0363ae fuzz: detect client-side resets in H2 codec fuzzer. (envoyproxy#4300)
01aa3f8 test: hopefully deflaking echo integration test (envoyproxy#4304)
1fc0f4b ratelimit: link legacy proto when message is being used (envoyproxy#4308)
aa4481e fix rare List::remove(&target) segfault (envoyproxy#4244)
89e0f23 headers: fixing fast fail of size-validation (envoyproxy#4269)
97eba59 build: bump googletest version. (envoyproxy#4293)
0057e22 fuzz: avoid false positives in HCM fuzzer. (envoyproxy#4262)
9d094e5 Revert ac0bd74 (envoyproxy#4295)
ddb28a4 Add validation context provider (envoyproxy#4264)
3b47cba added histogram latency information to Hystrix dashboard stream (envoyproxy#3986)
cf87d50 docs: update SNI FAQ. (envoyproxy#4285)
f952033 config: fix update empty stat for eds (envoyproxy#4276)
329e591 router: Add ability of custom headers to rely on per-request data (envoyproxy#4219)
68d20b4  thrift: refactor build files and imports (envoyproxy#4271)
5fa8192 access_log: log requested_server_name in tcp proxy (envoyproxy#4144)
fa45bb4 fuzz: libc++ clocks don't like nanos. (envoyproxy#4282)
53f8944 stats: add symbol table for future stat name encoding (envoyproxy#3927)
c987b42 test infra: Remove timeSource() from the ClusterManager api (envoyproxy#4247)
cd171d9 websocket: tunneling websockets (and upgrades in general) over H2 (envoyproxy#4188)
b9dc5d9 router: disallow :path/host rewriting in request_headers_to_add. (envoyproxy#4220)
0c91011 network: skip socket options and source address for UDS client connections (envoyproxy#4252)
da1857d build: fixing a downstream compile error by noting explicit fallthrough (envoyproxy#4265)
9857cfe fuzz: cleanup per-test environment after each fuzz case. (envoyproxy#4253)
52beb06 test: Wrap proto string in std::string before comparison (envoyproxy#4238)
f5e219e extensions/thrift_proxy: Add header matching to thrift router (envoyproxy#4239)
c9ce5d2 fuzz: track read_disable_count bidirectionally in codec_impl_fuzz_test. (envoyproxy#4260)
35103b3 fuzz: use nanoseconds for SystemTime in RequestInfo. (envoyproxy#4255)
ba6ba98 fuzz: make runtime root hermetic in server_fuzz_test. (envoyproxy#4258)
b0a9014 time: Add 'format' test to ensure no one directly instantiates Prod*Time from source. (envoyproxy#4248)
8567460 access_log: support beginning of epoch in START_TIME. (envoyproxy#4254)
28d5f41 proto: unify envoy_proto_library/api_proto_library. (envoyproxy#4233)
f7d3cb6 http: fix allocation bug introduced in envoyproxy#4211. (envoyproxy#4245)

Fixes istio/istio#8310 (once pulled into istio/istio).

Signed-off-by: Piotr Sikora <piotrsikora@google.com>

Author: PiotrSikora

WORKSPACE

@@ -30,7 +30,7 @@ bind(
 )
 
 # When updating envoy sha manually please update the sha in istio.deps file also
-ENVOY_SHA = "cb892b4855bc9e8516ca5eece8098f56f77fe522"
+ENVOY_SHA = "f936fc60f488cfae07f5e5d20d7381f0f23482fe"
 
 http_archive(
     name = "envoy",

include/istio/control/http/BUILD

@@ -23,5 +23,5 @@ cc_library(
         "request_handler.h",
     ],
     visibility = ["//visibility:public"],
-    deps = ["//src/istio/authn:context_proto"],
+    deps = ["//src/istio/authn:context_proto_cc"],
 )

istio.deps

@@ -11,6 +11,6 @@
 		"name": "ENVOY_SHA",
 		"repoName": "envoyproxy/envoy",
 		"file": "WORKSPACE",
-		"lastStableSHA": "cb892b4855bc9e8516ca5eece8098f56f77fe522"
+		"lastStableSHA": "f936fc60f488cfae07f5e5d20d7381f0f23482fe"
 	}
 ]

src/envoy/http/authn/BUILD

@@ -45,7 +45,7 @@ envoy_cc_library(
         "//external:authentication_policy_config_cc_proto",
         "//src/envoy/http/jwt_auth:jwt_lib",
         "//src/envoy/utils:utils_lib",
-        "//src/istio/authn:context_proto",
+        "//src/istio/authn:context_proto_cc",
         "//src/envoy/utils:filter_names_lib",
     ],
 )
@@ -65,7 +65,7 @@ envoy_cc_library(
         "//external:authentication_policy_config_cc_proto",
         "//src/envoy/utils:authn_lib",
         "//src/envoy/utils:utils_lib",
-        "//src/istio/authn:context_proto",
+        "//src/istio/authn:context_proto_cc",
         "@envoy//source/exe:envoy_common_lib",
         "//src/envoy/utils:filter_names_lib",
     ],
@@ -76,7 +76,7 @@ envoy_cc_test_library(
     hdrs = ["test_utils.h"],
     repository = "@envoy",
     deps = [
-        "//src/istio/authn:context_proto",
+        "//src/istio/authn:context_proto_cc",
     ],
 )
 

src/envoy/http/mixer/control.cc

@@ -30,9 +30,9 @@ Control::Control(const Config& config, Upstream::ClusterManager& cm,
                  const LocalInfo::LocalInfo& local_info)
     : config_(config),
       check_client_factory_(Utils::GrpcClientFactoryForCluster(
-          config_.check_cluster(), cm, scope)),
+          config_.check_cluster(), cm, scope, dispatcher.timeSource())),
       report_client_factory_(Utils::GrpcClientFactoryForCluster(
-          config_.report_cluster(), cm, scope)),
+          config_.report_cluster(), cm, scope, dispatcher.timeSource())),
       stats_obj_(dispatcher, stats,
                  config_.config_pb().transport().stats_update_interval(),
                  [this](::istio::mixerclient::Statistics* stat) -> bool {

src/envoy/tcp/mixer/control.cc

@@ -29,9 +29,9 @@ Control::Control(const Config& config, Upstream::ClusterManager& cm,
     : config_(config),
       dispatcher_(dispatcher),
       check_client_factory_(Utils::GrpcClientFactoryForCluster(
-          config_.check_cluster(), cm, scope)),
+          config_.check_cluster(), cm, scope, dispatcher.timeSource())),
       report_client_factory_(Utils::GrpcClientFactoryForCluster(
-          config_.report_cluster(), cm, scope)),
+          config_.report_cluster(), cm, scope, dispatcher.timeSource())),
       stats_obj_(dispatcher, stats,
                  config_.config_pb().transport().stats_update_interval(),
                  [this](Statistics* stat) -> bool { return GetStats(stat); }),

src/envoy/utils/BUILD

@@ -34,7 +34,7 @@ envoy_cc_library(
     deps = [
         ":utils_lib",
         "//include/istio/utils:attribute_names_header",
-        "//src/istio/authn:context_proto",
+        "//src/istio/authn:context_proto_cc",
         "//src/istio/utils:attribute_names_lib",
         "//src/istio/utils:utils_lib",
         ":filter_names_lib",

src/envoy/utils/mixer_control.cc

@@ -48,16 +48,18 @@ class EnvoyTimer : public ::istio::mixerclient::Timer {
 class EnvoyGrpcAsyncClientFactory : public Grpc::AsyncClientFactory {
  public:
   EnvoyGrpcAsyncClientFactory(Upstream::ClusterManager &cm,
-                              envoy::api::v2::core::GrpcService config)
-      : cm_(cm), config_(config) {}
+                              envoy::api::v2::core::GrpcService config,
+                              TimeSource &time_source)
+      : cm_(cm), config_(config), time_source_(time_source) {}
 
   Grpc::AsyncClientPtr create() override {
-    return std::make_unique<Grpc::AsyncClientImpl>(cm_, config_);
+    return std::make_unique<Grpc::AsyncClientImpl>(cm_, config_, time_source_);
   }
 
  private:
   Upstream::ClusterManager &cm_;
   envoy::api::v2::core::GrpcService config_;
+  TimeSource &time_source_;
 };
 
 inline bool ReadProtoMap(
@@ -110,13 +112,14 @@ void SerializeForwardedAttributes(
 
 Grpc::AsyncClientFactoryPtr GrpcClientFactoryForCluster(
     const std::string &cluster_name, Upstream::ClusterManager &cm,
-    Stats::Scope &scope) {
+    Stats::Scope &scope, TimeSource &time_source) {
   envoy::api::v2::core::GrpcService service;
   service.mutable_envoy_grpc()->set_cluster_name(cluster_name);
 
   // Workaround for https://github.com/envoyproxy/envoy/issues/2762
   UNREFERENCED_PARAMETER(scope);
-  return std::make_unique<EnvoyGrpcAsyncClientFactory>(cm, service);
+  return std::make_unique<EnvoyGrpcAsyncClientFactory>(cm, service,
+                                                       time_source);
 }
 
 // This function is for compatibility with existing node ids.

src/envoy/utils/mixer_control.h

@@ -41,7 +41,7 @@ void SerializeForwardedAttributes(
 
 Grpc::AsyncClientFactoryPtr GrpcClientFactoryForCluster(
     const std::string &cluster_name, Upstream::ClusterManager &cm,
-    Stats::Scope &scope);
+    Stats::Scope &scope, TimeSource &time_source);
 
 bool ExtractNodeInfo(const envoy::api::v2::core::Node &node,
                      ::istio::utils::LocalNode *args);

src/istio/control/http/BUILD

@@ -33,7 +33,7 @@ cc_library(
         "//include/istio/control/http:headers_lib",
         "//include/istio/utils:attribute_names_header",
         "//src/istio/api_spec:api_spec_lib",
-        "//src/istio/authn:context_proto",
+        "//src/istio/authn:context_proto_cc",
         "//src/istio/control:common_lib",
         "//src/istio/utils:attribute_names_lib",
         "//src/istio/utils:utils_lib",