Skip to content

build: fix merge break on master in #2416. #2646

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
htuch merged 3 commits into from
Feb 20, 2018
Merged

build: fix merge break on master in #2416. #2646

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6adf8e9
build: fix merge break on master in #2416.
htuch Feb 20, 2018
ceb39f5
Fix tests.
htuch Feb 20, 2018
d00e7aa
Really fix test this time.
htuch Feb 20, 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
2 changes: 1 addition & 1 deletion bazel/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ Envoy compiles and passes tests with the version of clang installed by XCode 8.3
Apple LLVM version 8.1.0 (clang-802.0.42).

3. Install Golang on your machine. This is required as part of building [BoringSSL](https://boringssl.googlesource.com/boringssl/+/HEAD/BUILDING.md)
and also for [Buildifer](https://github.com/bazelbuild/buildtools) which is used for formatting bazel BUILD files.
and also for [Buildifer](https://github.com/bazelbuild/buildtools) which is used for formatting bazel BUILD files.
4. `go get github.com/bazelbuild/buildtools/buildifier` to install buildifier
5. `bazel fetch //source/...` to fetch and build all external dependencies. This may take some time.
6. `bazel build //source/exe:envoy-static` from the Envoy source directory.
Expand Down
2 changes: 1 addition & 1 deletion source/common/filter/ext_authz.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ void Instance::callCheck() {
calling_check_ = false;
}

Network::FilterStatus Instance::onData(Buffer::Instance&) {
Network::FilterStatus Instance::onData(Buffer::Instance&, bool /* end_stream */) {
if (status_ == Status::NotStarted) {
// By waiting to invoke the check at onData() the call to authorization service will have
// sufficient information to fillout the checkRequest_.
Expand Down
2 changes: 1 addition & 1 deletion source/common/filter/ext_authz.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ class Instance : public Network::ReadFilter,
~Instance() {}

// Network::ReadFilter
Network::FilterStatus onData(Buffer::Instance& data) override;
Network::FilterStatus onData(Buffer::Instance& data, bool end_stream) override;
Network::FilterStatus onNewConnection() override;
void initializeReadFilterCallbacks(Network::ReadFilterCallbacks& callbacks) override {
filter_callbacks_ = &callbacks;
Expand Down
22 changes: 11 additions & 11 deletions test/common/filter/ext_authz_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ TEST_F(ExtAuthzFilterTest, OKWithOnData) {
EXPECT_EQ(0U, stats_store_.counter("ext_authz.name.total").value());
EXPECT_EQ(0U, stats_store_.gauge("ext_authz.name.active").value());
Buffer::OwnedImpl data("hello");
EXPECT_EQ(Network::FilterStatus::StopIteration, filter_->onData(data));
EXPECT_EQ(Network::FilterStatus::StopIteration, filter_->onData(data, false));
// Confirm that the invocation of onData does increment the active and total count!
EXPECT_EQ(1U, stats_store_.counter("ext_authz.name.total").value());
EXPECT_EQ(1U, stats_store_.gauge("ext_authz.name.active").value());
Expand Down Expand Up @@ -138,7 +138,7 @@ TEST_F(ExtAuthzFilterTest, DeniedWithOnData) {
EXPECT_EQ(0U, stats_store_.counter("ext_authz.name.total").value());
EXPECT_EQ(0U, stats_store_.gauge("ext_authz.name.active").value());
Buffer::OwnedImpl data("hello");
EXPECT_EQ(Network::FilterStatus::StopIteration, filter_->onData(data));
EXPECT_EQ(Network::FilterStatus::StopIteration, filter_->onData(data, false));
// Confirm that the invocation of onData does increment the active and total count!
EXPECT_EQ(1U, stats_store_.counter("ext_authz.name.total").value());
EXPECT_EQ(1U, stats_store_.gauge("ext_authz.name.active").value());
Expand All @@ -147,7 +147,7 @@ TEST_F(ExtAuthzFilterTest, DeniedWithOnData) {
EXPECT_CALL(*client_, cancel()).Times(0);
request_callbacks_->onComplete(CheckStatus::Denied);

EXPECT_EQ(Network::FilterStatus::Continue, filter_->onData(data));
EXPECT_EQ(Network::FilterStatus::Continue, filter_->onData(data, false));

EXPECT_EQ(1U, stats_store_.counter("ext_authz.name.total").value());
EXPECT_EQ(0U, stats_store_.counter("ext_authz.name.error").value());
Expand All @@ -167,14 +167,14 @@ TEST_F(ExtAuthzFilterTest, FailOpen) {

EXPECT_EQ(Network::FilterStatus::Continue, filter_->onNewConnection());
Buffer::OwnedImpl data("hello");
EXPECT_EQ(Network::FilterStatus::StopIteration, filter_->onData(data));
EXPECT_EQ(Network::FilterStatus::StopIteration, filter_->onData(data, false));

EXPECT_CALL(filter_callbacks_.connection_, close(_)).Times(0);
EXPECT_CALL(*client_, cancel()).Times(0);
EXPECT_CALL(filter_callbacks_, continueReading());
request_callbacks_->onComplete(CheckStatus::Error);

EXPECT_EQ(Network::FilterStatus::Continue, filter_->onData(data));
EXPECT_EQ(Network::FilterStatus::Continue, filter_->onData(data, false));

EXPECT_EQ(1U, stats_store_.counter("ext_authz.name.total").value());
EXPECT_EQ(1U, stats_store_.counter("ext_authz.name.error").value());
Expand All @@ -196,7 +196,7 @@ TEST_F(ExtAuthzFilterTest, FailClose) {

EXPECT_EQ(Network::FilterStatus::Continue, filter_->onNewConnection());
Buffer::OwnedImpl data("hello");
EXPECT_EQ(Network::FilterStatus::StopIteration, filter_->onData(data));
EXPECT_EQ(Network::FilterStatus::StopIteration, filter_->onData(data, false));

EXPECT_CALL(filter_callbacks_.connection_, close(_)).Times(1);
EXPECT_CALL(filter_callbacks_, continueReading()).Times(0);
Expand All @@ -222,12 +222,12 @@ TEST_F(ExtAuthzFilterTest, DoNotCallCancelonRemoteClose) {

EXPECT_EQ(Network::FilterStatus::Continue, filter_->onNewConnection());
Buffer::OwnedImpl data("hello");
EXPECT_EQ(Network::FilterStatus::StopIteration, filter_->onData(data));
EXPECT_EQ(Network::FilterStatus::StopIteration, filter_->onData(data, false));

EXPECT_CALL(filter_callbacks_, continueReading());
request_callbacks_->onComplete(CheckStatus::Error);

EXPECT_EQ(Network::FilterStatus::Continue, filter_->onData(data));
EXPECT_EQ(Network::FilterStatus::Continue, filter_->onData(data, false));

EXPECT_CALL(*client_, cancel()).Times(0);
filter_callbacks_.connection_.raiseEvent(Network::ConnectionEvent::RemoteClose);
Expand All @@ -252,7 +252,7 @@ TEST_F(ExtAuthzFilterTest, VerifyCancelOnRemoteClose) {

EXPECT_EQ(Network::FilterStatus::Continue, filter_->onNewConnection());
Buffer::OwnedImpl data("hello");
EXPECT_EQ(Network::FilterStatus::StopIteration, filter_->onData(data));
EXPECT_EQ(Network::FilterStatus::StopIteration, filter_->onData(data, false));

EXPECT_CALL(*client_, cancel());
filter_callbacks_.connection_.raiseEvent(Network::ConnectionEvent::RemoteClose);
Expand All @@ -278,8 +278,8 @@ TEST_F(ExtAuthzFilterTest, ImmediateOK) {

EXPECT_EQ(Network::FilterStatus::Continue, filter_->onNewConnection());
Buffer::OwnedImpl data("hello");
EXPECT_EQ(Network::FilterStatus::Continue, filter_->onData(data));
EXPECT_EQ(Network::FilterStatus::Continue, filter_->onData(data));
EXPECT_EQ(Network::FilterStatus::Continue, filter_->onData(data, false));
EXPECT_EQ(Network::FilterStatus::Continue, filter_->onData(data, false));

EXPECT_CALL(*client_, cancel()).Times(0);
filter_callbacks_.connection_.raiseEvent(Network::ConnectionEvent::RemoteClose);
Expand Down