Skip to content

Changed TestHooks to ListenerHooks#6642

Merged
htuch merged 3 commits intoenvoyproxy:masterfrom
curiouserrandy:ListenerHooks
Apr 23, 2019
Merged

Changed TestHooks to ListenerHooks#6642
htuch merged 3 commits intoenvoyproxy:masterfrom
curiouserrandy:ListenerHooks

Conversation

@curiouserrandy
Copy link
Copy Markdown
Contributor

Signed-off-by: Randy Smith rdsmith@google.com

For an explanation of how to fill out the fields, please see the relevant section
in PULL_REQUESTS.md

Description: Change name of class TestHooks to ListenerHooks
Risk Level: Low; name change only.
Testing: Existing tests
Docs Changes: n/a
Release Notes: n/a
Fixes #6641

Signed-off-by: Randy Smith <rdsmith@google.com>
@curiouserrandy
Copy link
Copy Markdown
Contributor Author

@htuch

Signed-off-by: Randy Smith <rdsmith@google.com>
@htuch htuch requested a review from jmarantz April 18, 2019 18:38
@curiouserrandy
Copy link
Copy Markdown
Contributor Author

/retest

@repokitteh-read-only
Copy link
Copy Markdown

🔨 rebuilding ci/circleci: release (failed build)

🐱

Caused by: a #6642 (comment) was created by @curiouserrandy.

see: more, trace.

jmarantz
jmarantz previously approved these changes Apr 19, 2019
Copy link
Copy Markdown
Contributor

@jmarantz jmarantz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Basically looks fine. Be sure to put this interface change in our import release notes, as this is an exposed C++ API change.

Envoy::OptionsImpl options_;
Event::RealTimeSystem real_time_system_;
DefaultTestHooks default_test_hooks_;
DefaultListenerHooks default_test_hooks_;
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rename this variable?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done (grepped for and renamed all other test_hooks variables as well).

MainCommonBase(const OptionsImpl& options, Event::TimeSystem& time_system, TestHooks& test_hooks,
Server::ComponentFactory& component_factory,
MainCommonBase(const OptionsImpl& options, Event::TimeSystem& time_system,
ListenerHooks& test_hooks, Server::ComponentFactory& component_factory,
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was pre-existing (I don't think I was in the review) but this might be IMO a little smoother to integrate if caller didn't have to specify these in the constructor, but could instead call addHook(...) or something.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't offhand see how to implement that without either moving the server_ construction into the run() method (which I don't like since it means you can't poke at the constructed server before you run it) or completely refactoring how hooks are done through ServerImpl (since Test/ListenerHooks is an argument to the Server::InstanceImpl constructor). Given that I think I'll say I'm not doing this, and if you poke holes in my reasoning I'll do it in a later CL. But I'll respond now to give you as much chance as I can to argue with me :-}.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't feel that strongly about it, now that it's in.

I would've suggested plumbing that addHook() functionality thru to the ServerImpl if I had been reviewing when this was initially added, but it's not the most important thing on our list of priorities at this point.

Signed-off-by: Randy Smith <rdsmith@google.com>
Copy link
Copy Markdown
Contributor

@jmarantz jmarantz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lizan for senior committer and non-googler approval.

@curiouserrandy
Copy link
Copy Markdown
Contributor Author

Ping?

@htuch htuch merged commit 85ae43a into envoyproxy:master Apr 23, 2019
mpuncel added a commit to mpuncel/envoy that referenced this pull request Apr 24, 2019
* master:
  docs: add extension policy (envoyproxy#6678)
  ext_authz: added ability to detect partial request body data (envoyproxy#6583)
  version_history.rst: jwt_authn change missed 1.10.0 (envoyproxy#6684)
  docs: fix link in pull request template (envoyproxy#6679)
  Explicitly convert absl::string_view to std::string. (envoyproxy#6687)
  docs: improving watermark docs/comments (envoyproxy#6683)
  http filter: add CSRF filter (envoyproxy#6470)
  event: reintroduce dispatcher stats (envoyproxy#6659)
  security: postmortem for CVE-2019-990[01] (envoyproxy#6597)
  Improve build rules for (test only) library quic_port_utils. (envoyproxy#6672)
  spell check: skip unsupported extensions when called with a file (envoyproxy#6648)
  Changed TestHooks to ListenerHooks (envoyproxy#6642)
  proto: move extension-specific linking validation into extensions (envoyproxy#6657)
  stats: add/test heterogenous set of StatNameStorage objects. (envoyproxy#6504)
  docs: move xds protocol to rst (envoyproxy#6670)
  fix version history order (envoyproxy#6671)

Signed-off-by: Michael Puncel <mpuncel@squareup.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Production usable mechanism for waiting for listeners ready

4 participants