Skip to content

listener: rename "sni_domains" to "server_names".#3454

Merged
mattklein123 merged 5 commits into
envoyproxy:masterfrom
PiotrSikora:server_names
May 22, 2018
Merged

listener: rename "sni_domains" to "server_names".#3454
mattklein123 merged 5 commits into
envoyproxy:masterfrom
PiotrSikora:server_names

Conversation

@PiotrSikora
Copy link
Copy Markdown
Contributor

Risk Level: Low
Testing: bazel test //test/...
Docs Changes: Added
Release Notes: Added

Signed-off-by: Piotr Sikora piotrsikora@google.com

*Risk Level*: Low
*Testing*: bazel test //test/...
*Docs Changes*: Added
*Release Notes*: Added

Signed-off-by: Piotr Sikora <piotrsikora@google.com>
@PiotrSikora
Copy link
Copy Markdown
Contributor Author

As mentioned by @ggreenway in #3217.

cc @mattklein123 @htuch

Signed-off-by: Piotr Sikora <piotrsikora@google.com>
Copy link
Copy Markdown
Member

@ggreenway ggreenway left a comment

Choose a reason for hiding this comment

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

I'm very much in favor of this change.


std::vector<std::string> server_names(filter_chain_match.sni_domains().begin(),
filter_chain_match.sni_domains().end());
std::vector<std::string> server_names;
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I think we should throw an exception if both sni_domains and server_names are non-empty (and document the behavior).

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.

Signed-off-by: Piotr Sikora <piotrsikora@google.com>
ggreenway
ggreenway previously approved these changes May 22, 2018
Copy link
Copy Markdown
Member

@mattklein123 mattklein123 left a comment

Choose a reason for hiding this comment

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

LGTM, just small doc ask.

// .. attention::
//
// Deprecated. Use :ref:`server_names <envoy_api_field_listener.FilterChainMatch.server_names>` instead.
repeated string sni_domains = 1 [deprecated = true];
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

@PiotrSikora
Copy link
Copy Markdown
Contributor Author

This is ready to be merged.

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.

3 participants