diff --git a/WORKSPACE b/WORKSPACE index ba7bd45cec5..eca75ad9295 100644 --- 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 = "23e8e12fd77b08b87007a819b5683a5289883b46" +ENVOY_SHA = "15cfc5ad1a4d622126f642fa70699af753a2d310" http_archive( name = "envoy", diff --git a/istio.deps b/istio.deps index bfed023fac9..0187de51023 100644 --- a/istio.deps +++ b/istio.deps @@ -11,6 +11,6 @@ "name": "ENVOY_SHA", "repoName": "envoyproxy/envoy", "file": "WORKSPACE", - "lastStableSHA": "23e8e12fd77b08b87007a819b5683a5289883b46" + "lastStableSHA": "15cfc5ad1a4d622126f642fa70699af753a2d310" } ] diff --git a/src/envoy/http/authn/http_filter_test.cc b/src/envoy/http/authn/http_filter_test.cc index 1e864646da6..5ee4ddc8aca 100644 --- a/src/envoy/http/authn/http_filter_test.cc +++ b/src/envoy/http/authn/http_filter_test.cc @@ -24,6 +24,7 @@ #include "src/envoy/http/authn/test_utils.h" #include "src/envoy/utils/authn.h" #include "test/mocks/http/mocks.h" +#include "test/test_common/test_time.h" #include "test/test_common/utility.h" using Envoy::Http::Istio::AuthN::AuthenticatorBase; @@ -120,7 +121,9 @@ TEST_F(AuthenticationFilterTest, PeerFail) { EXPECT_CALL(filter_, createPeerAuthenticator(_)) .Times(1) .WillOnce(Invoke(createAlwaysFailAuthenticator)); - RequestInfo::RequestInfoImpl request_info(Http::Protocol::Http2); + DangerousDeprecatedTestTime test_time; + RequestInfo::RequestInfoImpl request_info(Http::Protocol::Http2, + test_time.timeSystem()); EXPECT_CALL(decoder_callbacks_, requestInfo()) .Times(AtLeast(1)) .WillRepeatedly(ReturnRef(request_info)); @@ -144,7 +147,9 @@ TEST_F(AuthenticationFilterTest, PeerPassOriginFail) { EXPECT_CALL(filter_, createOriginAuthenticator(_)) .Times(1) .WillOnce(Invoke(createAlwaysFailAuthenticator)); - RequestInfo::RequestInfoImpl request_info(Http::Protocol::Http2); + DangerousDeprecatedTestTime test_time; + RequestInfo::RequestInfoImpl request_info(Http::Protocol::Http2, + test_time.timeSystem()); EXPECT_CALL(decoder_callbacks_, requestInfo()) .Times(AtLeast(1)) .WillRepeatedly(ReturnRef(request_info)); @@ -166,7 +171,9 @@ TEST_F(AuthenticationFilterTest, AllPass) { EXPECT_CALL(filter_, createOriginAuthenticator(_)) .Times(1) .WillOnce(Invoke(createAlwaysPassAuthenticator)); - RequestInfo::RequestInfoImpl request_info(Http::Protocol::Http2); + DangerousDeprecatedTestTime test_time; + RequestInfo::RequestInfoImpl request_info(Http::Protocol::Http2, + test_time.timeSystem()); EXPECT_CALL(decoder_callbacks_, requestInfo()) .Times(AtLeast(1)) .WillRepeatedly(ReturnRef(request_info)); @@ -235,7 +242,9 @@ TEST_F(AuthenticationFilterTest, IgnoreBothPass) { EXPECT_CALL(filter, createOriginAuthenticator(_)) .Times(1) .WillOnce(Invoke(createAlwaysPassAuthenticator)); - RequestInfo::RequestInfoImpl request_info(Http::Protocol::Http2); + DangerousDeprecatedTestTime test_time; + RequestInfo::RequestInfoImpl request_info(Http::Protocol::Http2, + test_time.timeSystem()); EXPECT_CALL(decoder_callbacks_, requestInfo()) .Times(AtLeast(1)) .WillRepeatedly(ReturnRef(request_info));