diff --git a/WORKSPACE b/WORKSPACE index 74054250ec6..367c8fa1c88 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 = "14baa40ea6e3727406a11320d90aa1e435c34925" +ENVOY_SHA = "73bd3d95cd0b6a23de0b6357f1b3065b9014651a" http_archive( name = "envoy", diff --git a/istio.deps b/istio.deps index e1cac9338e5..1bb301b3986 100644 --- a/istio.deps +++ b/istio.deps @@ -11,6 +11,6 @@ "name": "ENVOY_SHA", "repoName": "envoyproxy/envoy", "file": "WORKSPACE", - "lastStableSHA": "14baa40ea6e3727406a11320d90aa1e435c34925" + "lastStableSHA": "73bd3d95cd0b6a23de0b6357f1b3065b9014651a" } ] diff --git a/src/envoy/http/jwt_auth/integration_test/http_filter_integration_test.cc b/src/envoy/http/jwt_auth/integration_test/http_filter_integration_test.cc index 09064144ddd..55bd663b95c 100644 --- a/src/envoy/http/jwt_auth/integration_test/http_filter_integration_test.cc +++ b/src/envoy/http/jwt_auth/integration_test/http_filter_integration_test.cc @@ -142,7 +142,8 @@ class JwtVerificationFilterIntegrationTest *dispatcher_, request_stream_issuer)); ASSERT_TRUE(request_stream_issuer->waitForEndStream(*dispatcher_)); - request_stream_issuer->encodeHeaders(issuer_response_headers, false); + request_stream_issuer->encodeHeaders( + Http::HeaderMapImpl(issuer_response_headers), false); Buffer::OwnedImpl body(issuer_response_body); request_stream_issuer->encodeData(body, true); } diff --git a/test/integration/istio_http_integration_test.cc b/test/integration/istio_http_integration_test.cc index b30a6656382..059ada91897 100644 --- a/test/integration/istio_http_integration_test.cc +++ b/test/integration/istio_http_integration_test.cc @@ -126,11 +126,10 @@ std::string MakeJwtFilterConfig() { - issuer: "testing@secure.istio.io" local_jwks: inline_string: "%s" - allow_missing_or_failed: true - issuer: "testing-rbac@secure.istio.io" local_jwks: inline_string: "%s" - allow_missing_or_failed: true + allow_missing_or_failed: true )"; // From // https://github.com/istio/istio/blob/master/security/tools/jwt/samples/jwks.json