Skip to content
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

Jump to bottom

ratelimit: add route entry metadata to ratelimit actions #13269

Merged
merged 21 commits into from
Oct 16, 2020
Merged

ratelimit: add route entry metadata to ratelimit actions #13269

merged 21 commits into from
Oct 16, 2020

Conversation

andrascz
Copy link
Contributor

@andrascz andrascz commented Sep 25, 2020 •
edited
Loading

Commit Message: Modifies ratelimit filter to be able to use information
from the route's filter metadata as one of its actions with a route_entry_metadata action
configurable the same way as dynamic_metadata

Signed-off-by: András Czigány andras.czigany@strivacity.com
Additional Description:
Risk Level: Low
Testing: unit tests
Docs Changes: proto files and current version changelog
Release Notes: N/A see docs changes
Fixes #12556

edit: filter_metadata -> route_entry_metadata

@andrascz
ratelimit: add filter metadata to ratelimit actions
737219a 
Modifies ratelimit filter to be able to use information
from the route's filter metadata as one of its actions

Signed-off-by: András Czigány <andras.czigany@strivacity.com>
@repokitteh-read-only
Copy link

CC @envoyproxy/api-shepherds: Your approval is needed for changes made to api/envoy/.
CC @envoyproxy/api-watchers: FYI only for changes made to api/envoy/.

🐱

Caused by: #13269 was opened by andrascz.

see: more, trace.

@andrascz
fixup! ratelimit: add filter metadata to ratelimit actions
95da873 
Signed-off-by: András Czigány <andras.czigany@strivacity.com>
htuch
htuch suggested changes Sep 27, 2020
View reviewed changes
Copy link
Member

@htuch htuch left a comment

Choose a reason for hiding this comment

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

/wait

api/envoy/config/route/v3/route_components.proto Outdated Show resolved Hide resolved
@andrascz andrascz requested a review from htuch September 28, 2020 08:09
@andrascz andrascz changed the title ratelimit: add filter metadata to ratelimit actions ratelimit: add route entry metadata to ratelimit actions Sep 28, 2020
@andrascz
rename filter_metadata to route_entry_metadata
3c90d40 
Signed-off-by: András Czigány <andras.czigany@strivacity.com>
@andrascz
Merge branch 'master' of github.com:envoyproxy/envoy into filter-meta…
ac7023c 
…data-ratelimit-action

Signed-off-by: András Czigány <andras.czigany@strivacity.com>
@andrascz
route_components.proto: min_bytes -> min_len
2550c95 
Signed-off-by: András Czigány <andras.czigany@strivacity.com>
htuch
htuch previously approved these changes Sep 29, 2020
View reviewed changes
Copy link
Member

@htuch htuch left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

junr03
junr03 reviewed Sep 29, 2020
View reviewed changes
Copy link
Member

@junr03 junr03 left a comment

Choose a reason for hiding this comment

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

Thanks, a few comments

api/envoy/config/route/v3/route_components.proto Outdated Show resolved Hide resolved
source/common/router/router_ratelimit.cc Outdated Show resolved Hide resolved
api/envoy/config/route/v3/route_components.proto Outdated Show resolved Hide resolved
test/common/router/router_ratelimit_test.cc Outdated Show resolved Hide resolved
@junr03
Copy link
Member

junr03 commented Sep 29, 2020

/wait

@andrascz
fixup! rename filter_metadata to route_entry_metadata
5f8ddb9 
Signed-off-by: András Czigány <andras.czigany@strivacity.com>
@andrascz
Merge branch 'master' of github.com:envoyproxy/envoy into filter-meta…
2c84d8c 
…data-ratelimit-action

Signed-off-by: András Czigány <andras.czigany@strivacity.com>
@andrascz
router_ratelimit_test: fix test names
87d6b06 
Signed-off-by: András Czigány <andras.czigany@strivacity.com>
@andrascz
route_components.proto: link to metadata docs
07e96d7 
Signed-off-by: András Czigány <andras.czigany@strivacity.com>
@andrascz andrascz requested a review from junr03 October 8, 2020 12:41
@andrascz
Merge branch 'master' of github.com:envoyproxy/envoy into filter-meta…
1c96988 
…data-ratelimit-action

Signed-off-by: András Czigány <andras.czigany@strivacity.com>
@andrascz
current.rst: fix after 1.16.0 release
cebfd19 
Signed-off-by: András Czigány <andras.czigany@strivacity.com>
@andrascz
fixup! current.rst: fix after 1.16.0 release
e09c921 
Signed-off-by: András Czigány <andras.czigany@strivacity.com>
@andrascz
fixup! rename filter_metadata to route_entry_metadata
122dd12 
Signed-off-by: András Czigány <andras.czigany@strivacity.com>
@andrascz
current.rst: fix after pull
e1ed2f7 
Signed-off-by: András Czigány <andras.czigany@strivacity.com>
junr03
junr03 previously approved these changes Oct 13, 2020
View reviewed changes
mattklein123
mattklein123 reviewed Oct 14, 2020
View reviewed changes
Copy link
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.

One API question. Thank you!

/wait-any

api/envoy/config/route/v3/route_components.proto Outdated Show resolved Hide resolved
@mattklein123 mattklein123 self-assigned this Oct 14, 2020
@andrascz
Merge branch 'master' of github.com:envoyproxy/envoy into filter-meta…
15a22d3 
…data-ratelimit-action

Signed-off-by: András Czigány <andras.czigany@strivacity.com>
@andrascz
Merge branch 'master' of github.com:envoyproxy/envoy into filter-meta…
82b42da 
…data-ratelimit-action

Signed-off-by: András Czigány <andras.czigany@strivacity.com>
@andrascz
ratelimit: generic metadata action
de6857b 
Signed-off-by: András Czigány <andras.czigany@strivacity.com>
mattklein123
mattklein123 requested changes Oct 15, 2020
View reviewed changes
Copy link
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.

Thanks looks great. Just one small comment.

/wait

api/envoy/config/route/v3/route_components.proto Outdated Show resolved Hide resolved
@andrascz
ratelimit: deprecate dynamic_metadata action
e2f7016 
Signed-off-by: András Czigány <andras.czigany@strivacity.com>
@andrascz
router_ratelimit_test.cc: fix metadata action tests
edb9511 
Signed-off-by: András Czigány <andras.czigany@strivacity.com>
@andrascz
fixup! router_ratelimit_test.cc: fix metadata action tests
4f28c09 
Signed-off-by: András Czigány <andras.czigany@strivacity.com>
mattklein123
mattklein123 approved these changes Oct 16, 2020
View reviewed changes
Copy link
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.

Nice, thanks!

@mattklein123 mattklein123 merged commit 06813b2 into envoyproxy:master Oct 16, 2020
@andrascz andrascz deleted the filter-metadata-ratelimit-action branch October 16, 2020 15:37
mpuncel added a commit to mpuncel/envoy that referenced this pull request Oct 17, 2020
@mpuncel
Merge branch 'master' into mpuncel/http2-hc-goaway
b76c46e 
* master: (22 commits)
  delay health checks until transport socket secrets are ready. (envoyproxy#13516)
  test, oauth2: Make sure config test runs field validation (envoyproxy#13496)
  [http] swap codec implementations to default new (envoyproxy#13579)
  wasm: update proxy-wasm-cpp-host (envoyproxy#13606)
  postgres: do not copy and linearize received data when it is not going to be used (envoyproxy#13393)
  configs: Update configs v2 -> v3 (envoyproxy#13562)
  http2: Remove RELEASE_ASSERTs in sendPendingFrames() error handling (envoyproxy#13546)
  dependencies: track untracked implied dependencies, wrapup dashboard. (envoyproxy#13571)
  listener: add match all filter chain (envoyproxy#13449)
  fix mistakes in docstrings (envoyproxy#13603)
  ratelimit: add route entry metadata to ratelimit actions (envoyproxy#13269)
  cluster manager: avoid immediate activation for dynamic inserted cluster when initialize (envoyproxy#12783)
  ext_authz: Avoid calling check multiple times (envoyproxy#13288)
  docs: Unexclude remaining configs from validation (envoyproxy#13534)
  build: update rules_rust to allow Rustc in RBE (envoyproxy#13595)
  docs: Update sphinxext.rediraffe (envoyproxy#13589)
  Deprecate moonjit support on Windows before beta (envoyproxy#13541)
  dependencies: bump LuaJIT to 2.1 branch HEAD @ e9af1ab. (envoyproxy#13474)
  docs: add TLS stats to cluster stats doc (envoyproxy#13561)
  ci: stop building alpine-debug images in favor of ubuntu-based debug image (envoyproxy#13598)
  ...

Signed-off-by: Michael Puncel <mpuncel@squareup.com>
@RiverPhillips RiverPhillips mentioned this pull request Jan 24, 2023
Closed
@henrymwang henrymwang mentioned this pull request Jun 25, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mattklein123 mattklein123 mattklein123 approved these changes

@junr03 junr03 junr03 left review comments

@htuch htuch htuch left review comments

Assignees

@junr03 junr03

@mattklein123 mattklein123

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Question] - (route) metadata vs dynamic metadata
4 participants
@andrascz @junr03 @mattklein123 @htuch