Skip to content

Update Envoy SHA to a637506d #1982

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rshriram merged 4 commits into from
Sep 28, 2018
Merged

Update Envoy SHA to a637506d #1982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fdae1f4
Update Envoy SHA to a637506d
venilnoronha Sep 25, 2018
1b4b75c
Fix tests based on envoyproxy/envoy#4512
venilnoronha Sep 26, 2018
fdc7115
Fix formatting errors
venilnoronha Sep 26, 2018
cd6cdec
Fix CircleCI config
venilnoronha Sep 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion istio.deps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
"name": "ENVOY_SHA",
"repoName": "envoyproxy/envoy",
"file": "WORKSPACE",
"lastStableSHA": "15cfc5ad1a4d622126f642fa70699af753a2d310"
"lastStableSHA": "a637506da5f55f0bec37701d9e0a04f1179a6bfb"
}
]
11 changes: 6 additions & 5 deletions src/envoy/http/jwt_auth/integration_test/http_filter_integration_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,19 @@ class JwtVerificationFilterIntegrationTest
public testing::TestWithParam<Network::Address::IpVersion> {
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_));
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_));
fake_upstreams_.emplace_back(new FakeUpstream(
0, FakeHttpConnection::Type::HTTP1, version_, timeSystem()));
registerPort("upstream_1",
fake_upstreams_.back()->localAddress()->ip()->port());
createTestServer(ConfigPath(), {"http"});
Expand Down
8 changes: 4 additions & 4 deletions test/integration/istio_http_integration_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_));
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_));
fake_upstreams_.emplace_back(new FakeUpstream(
0, FakeHttpConnection::Type::HTTP2, version_, timeSystem()));
policy_upstream_ = fake_upstreams_.back().get();
}

Expand Down