From fdae1f4fd45214b7083b8a129daab8148424b6f1 Mon Sep 17 00:00:00 2001 From: Venil Noronha Date: Tue, 25 Sep 2018 16:08:41 -0700 Subject: [PATCH 1/4] Update Envoy SHA to a637506d Signed-off-by: Venil Noronha --- WORKSPACE | 2 +- istio.deps | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index eca75ad9295..f214681c725 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 = "15cfc5ad1a4d622126f642fa70699af753a2d310" +ENVOY_SHA = "a637506da5f55f0bec37701d9e0a04f1179a6bfb" http_archive( name = "envoy", diff --git a/istio.deps b/istio.deps index 0187de51023..f48e3b6294b 100644 --- a/istio.deps +++ b/istio.deps @@ -11,6 +11,6 @@ "name": "ENVOY_SHA", "repoName": "envoyproxy/envoy", "file": "WORKSPACE", - "lastStableSHA": "15cfc5ad1a4d622126f642fa70699af753a2d310" + "lastStableSHA": "a637506da5f55f0bec37701d9e0a04f1179a6bfb" } ] From 1b4b75cbfe76d2fc2f2cc76f6c8bbafcac8a56cd Mon Sep 17 00:00:00 2001 From: Venil Noronha Date: Wed, 26 Sep 2018 09:31:34 -0700 Subject: [PATCH 2/4] Fix tests based on envoyproxy/envoy#4512 Signed-off-by: Venil Noronha --- .../integration_test/http_filter_integration_test.cc | 6 +++--- test/integration/istio_http_integration_test.cc | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) 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 55bd663b95c..949a536b2cb 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 @@ -36,18 +36,18 @@ class JwtVerificationFilterIntegrationTest public testing::TestWithParam { public: JwtVerificationFilterIntegrationTest() - : HttpIntegrationTest(Http::CodecClient::Type::HTTP1, GetParam()) {} + : HttpIntegrationTest(Http::CodecClient::Type::HTTP1, GetParam(), realTime()) {} virtual ~JwtVerificationFilterIntegrationTest() {} /** * Initializer for an individual integration test. */ void SetUp() override { fake_upstreams_.emplace_back( - new FakeUpstream(0, FakeHttpConnection::Type::HTTP1, version_)); + new FakeUpstream(0, FakeHttpConnection::Type::HTTP1, version_, timeSystem())); registerPort("upstream_0", fake_upstreams_.back()->localAddress()->ip()->port()); fake_upstreams_.emplace_back( - new FakeUpstream(0, FakeHttpConnection::Type::HTTP1, version_)); + new FakeUpstream(0, FakeHttpConnection::Type::HTTP1, version_, timeSystem())); registerPort("upstream_1", fake_upstreams_.back()->localAddress()->ip()->port()); createTestServer(ConfigPath(), {"http"}); diff --git a/test/integration/istio_http_integration_test.cc b/test/integration/istio_http_integration_test.cc index 22a9e729c0d..777f40691dc 100644 --- a/test/integration/istio_http_integration_test.cc +++ b/test/integration/istio_http_integration_test.cc @@ -222,11 +222,11 @@ class IstioHttpIntegrationTest : public HttpProtocolIntegrationTest { void createUpstreams() override { HttpProtocolIntegrationTest::createUpstreams(); fake_upstreams_.emplace_back( - new FakeUpstream(0, FakeHttpConnection::Type::HTTP2, version_)); + new FakeUpstream(0, FakeHttpConnection::Type::HTTP2, version_, timeSystem())); telemetry_upstream_ = fake_upstreams_.back().get(); fake_upstreams_.emplace_back( - new FakeUpstream(0, FakeHttpConnection::Type::HTTP2, version_)); + new FakeUpstream(0, FakeHttpConnection::Type::HTTP2, version_, timeSystem())); policy_upstream_ = fake_upstreams_.back().get(); } From fdc71153505281c4bc449bea5418c5de4fc1612d Mon Sep 17 00:00:00 2001 From: Venil Noronha Date: Wed, 26 Sep 2018 09:46:12 -0700 Subject: [PATCH 3/4] Fix formatting errors Signed-off-by: Venil Noronha --- .../integration_test/http_filter_integration_test.cc | 11 ++++++----- test/integration/istio_http_integration_test.cc | 8 ++++---- 2 files changed, 10 insertions(+), 9 deletions(-) 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 949a536b2cb..ad7c26b2555 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 @@ -36,18 +36,19 @@ class JwtVerificationFilterIntegrationTest public testing::TestWithParam { public: JwtVerificationFilterIntegrationTest() - : HttpIntegrationTest(Http::CodecClient::Type::HTTP1, GetParam(), realTime()) {} + : HttpIntegrationTest(Http::CodecClient::Type::HTTP1, GetParam(), + realTime()) {} virtual ~JwtVerificationFilterIntegrationTest() {} /** * Initializer for an individual integration test. */ void SetUp() override { - fake_upstreams_.emplace_back( - new FakeUpstream(0, FakeHttpConnection::Type::HTTP1, version_, timeSystem())); + fake_upstreams_.emplace_back(new FakeUpstream( + 0, FakeHttpConnection::Type::HTTP1, version_, timeSystem())); registerPort("upstream_0", fake_upstreams_.back()->localAddress()->ip()->port()); - fake_upstreams_.emplace_back( - new FakeUpstream(0, FakeHttpConnection::Type::HTTP1, version_, timeSystem())); + fake_upstreams_.emplace_back(new FakeUpstream( + 0, FakeHttpConnection::Type::HTTP1, version_, timeSystem())); registerPort("upstream_1", fake_upstreams_.back()->localAddress()->ip()->port()); createTestServer(ConfigPath(), {"http"}); diff --git a/test/integration/istio_http_integration_test.cc b/test/integration/istio_http_integration_test.cc index 777f40691dc..5e169493ecb 100644 --- a/test/integration/istio_http_integration_test.cc +++ b/test/integration/istio_http_integration_test.cc @@ -221,12 +221,12 @@ class IstioHttpIntegrationTest : public HttpProtocolIntegrationTest { public: void createUpstreams() override { HttpProtocolIntegrationTest::createUpstreams(); - fake_upstreams_.emplace_back( - new FakeUpstream(0, FakeHttpConnection::Type::HTTP2, version_, timeSystem())); + fake_upstreams_.emplace_back(new FakeUpstream( + 0, FakeHttpConnection::Type::HTTP2, version_, timeSystem())); telemetry_upstream_ = fake_upstreams_.back().get(); - fake_upstreams_.emplace_back( - new FakeUpstream(0, FakeHttpConnection::Type::HTTP2, version_, timeSystem())); + fake_upstreams_.emplace_back(new FakeUpstream( + 0, FakeHttpConnection::Type::HTTP2, version_, timeSystem())); policy_upstream_ = fake_upstreams_.back().get(); } From cd6cdec5f701c3f4f108b15097f3e0302029970b Mon Sep 17 00:00:00 2001 From: Venil Noronha Date: Thu, 27 Sep 2018 09:57:39 -0700 Subject: [PATCH 4/4] Fix CircleCI config Signed-off-by: Venil Noronha --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index db59eae9322..29d1bcf2a92 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -77,6 +77,7 @@ jobs: steps: - run: sudo ntpdate -vu time.apple.com - run: brew install bazel cmake coreutils go libtool ninja wget + - run: sudo ln -s /usr/local/bin/gsha256sum /usr/local/bin/sha256sum - checkout - restore_cache: keys: