feat(router): enable `net.src.` and `net.dst.` in http expression #11950

chronolaw · 2023-11-08T08:27:20Z

Summary

KAG-2963
KAG-3032

Checklist

The Pull Request has tests
A changelog file has been created under changelog/unreleased/kong or skip-changelog label added on PR if changelog is unnecessary. README.md
There is a user-facing docs PR against https://github.com/Kong/docs.konghq.com - PUT DOCS PR HERE

Full changelog

[Implement ...]

Issue reference

Fix #[issue number]

kong/router/atc.lua

StarlightIbuki

I feel this deprecation is more properly done from the ATC router side. What do you think?

kong/router/expressions.lua

spec/01-unit/01-db/01-schema/06-routes_spec.lua

kong/router/atc.lua

StarlightIbuki · 2023-11-20T03:18:18Z

Also, we should split this into 2 PRs, to let the title be precise.

chronolaw · 2023-11-20T03:29:02Z

I feel this deprecation is more properly done from the ATC router side. What do you think?

No, atc-router library has no schema definition, we only define schema here.

chronolaw · 2023-11-20T03:30:29Z

Also, we should split this into 2 PRs, to let the title be precise.

Perhaps we can not do this, adding net.src.* and net.dst.* will cause the change of cache key at the same time.

spec/01-unit/01-db/01-schema/06-routes_spec.lua

dndx · 2023-11-27T06:21:44Z

@StarlightIbuki Please review again.

We need a temporary solution for deprecation. Considering the limited use case of expressions, I doubt we need to make the migration that fancy. I'm okay with a solution that doesn't understand the syntax.

StarlightIbuki

A minor suggestion on performance. Otherwise good enough.

kong/router/expressions.lua

changelog/unreleased/kong/support_net_src_dst_field_in_expression.yml

convert net.port basic hash match src_ip/port cache key remove net.port verify_expression verify expression more verify_expression verify_expression change basic fields stream exec() http select() test net.dst.port expression work with net.port deprecate_net_port_and_rework_cache_algo.yml tune tests fix stream tests lint fix net.src.ip & net.dst.ip schema validation tests more tests spy.on for log warning finally restore spy.on gsub net.port == fix lint error verify_expression ngx.re.gsub NET_PORT_REPLACE changelog regex optimization changelog revert some code

…ion.yml

flrgh · 2024-01-11T17:50:18Z

Is this ready to merge, or are we waiting for any reason?

team-gateway-bot · 2024-01-12T07:43:21Z

Successfully created cherry-pick PR for master:

https://github.com/kong/kong-ee/pull/7815

…expression routes (#11950) These fields are available in stream (L4) routes, making them also available in HTTP to reduce discrepancy between HTTP and stream routes. KAG-2963 KAG-3032

chronolaw added the skip-changelog label Nov 8, 2023

pull-request-size bot added the size/M label Nov 8, 2023

github-actions bot added core/db schema-change-noteworthy labels Nov 8, 2023

github-actions bot assigned chronolaw Nov 8, 2023

pull-request-size bot added size/L and removed size/M labels Nov 9, 2023

chronolaw added size/M and removed skip-changelog size/L labels Nov 9, 2023

pull-request-size bot added size/L and removed size/M labels Nov 9, 2023

chronolaw marked this pull request as ready for review November 9, 2023 02:20

chronolaw requested a review from dndx November 9, 2023 03:14

chronolaw force-pushed the feat/remove_net_port_in_expression branch from dc8625a to f26801a Compare November 9, 2023 04:13

mikefero reviewed Nov 9, 2023

View reviewed changes

kong/router/atc.lua Show resolved Hide resolved

chronolaw force-pushed the feat/remove_net_port_in_expression branch from 2b2741d to 9357315 Compare November 17, 2023 14:15

StarlightIbuki requested changes Nov 20, 2023

View reviewed changes

kong/router/expressions.lua Outdated Show resolved Hide resolved

kong/router/expressions.lua Outdated Show resolved Hide resolved

spec/01-unit/01-db/01-schema/06-routes_spec.lua Show resolved Hide resolved

kong/router/atc.lua Outdated Show resolved Hide resolved

StarlightIbuki reviewed Nov 20, 2023

View reviewed changes

spec/01-unit/01-db/01-schema/06-routes_spec.lua Show resolved Hide resolved

StarlightIbuki reviewed Nov 20, 2023

View reviewed changes

spec/01-unit/01-db/01-schema/06-routes_spec.lua Outdated Show resolved Hide resolved

spec/01-unit/01-db/01-schema/06-routes_spec.lua Outdated Show resolved Hide resolved

dndx requested a review from StarlightIbuki November 27, 2023 06:20

dndx force-pushed the feat/remove_net_port_in_expression branch from 105f1e9 to 2ed23bc Compare November 27, 2023 06:21

StarlightIbuki approved these changes Nov 27, 2023

View reviewed changes

kong/router/expressions.lua Outdated Show resolved Hide resolved

kong/router/expressions.lua Show resolved Hide resolved

chronolaw force-pushed the feat/remove_net_port_in_expression branch from 2ed23bc to 9a354b7 Compare November 27, 2023 09:07

chronolaw added the pr/discussion This PR is being debated. Probably just a few details. label Nov 29, 2023

chronolaw marked this pull request as draft November 29, 2023 08:38

chronolaw changed the title ~~feat(router): enable net.src.* and net.dst.* in expression~~ feat(router): enable net.src.* and net.dst.* in http expression Jan 9, 2024

dndx approved these changes Jan 11, 2024

View reviewed changes

changelog/unreleased/kong/support_net_src_dst_field_in_expression.yml Outdated Show resolved Hide resolved

chronolaw and others added 10 commits January 11, 2024 17:43

remove net.port in fields.lua

ef3fb40

fix test

f297023

cache hit tests

2a6a854

rename to transform_expression()

c417ffa

change warning msg

24dd374

tonumber

3d9d5d3

rename yaml

6daabb5

support_net_src_dst_field_in_expression.yml

63c6fc7

Update changelog/unreleased/kong/support_net_src_dst_field_in_express…

609c59c

…ion.yml

dndx force-pushed the feat/remove_net_port_in_expression branch from f0699ac to 609c59c Compare January 11, 2024 09:43

dndx merged commit 560fdfb into master Jan 12, 2024
23 checks passed

dndx deleted the feat/remove_net_port_in_expression branch January 12, 2024 07:42

This was referenced Jan 15, 2024

docs(router): support net.src.* and net.dst.* in http route expression Kong/docs.konghq.com#6756

Closed

docs(router): support net.src.* and net.dst.* in http route expression Kong/docs.konghq.com#6765

Merged

chronolaw mentioned this pull request Jan 23, 2024

[backport 3.5]feat(router/atc): http segments matching and other improvements #12397

Merged

3 tasks

chronolaw mentioned this pull request Jan 23, 2024

[backport 3.4]feat(router/atc): http segments matching and other improvements #12400

Merged

3 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(router): enable `net.src.` and `net.dst.` in http expression #11950

feat(router): enable `net.src.` and `net.dst.` in http expression #11950

chronolaw commented Nov 8, 2023 •

edited

Loading

StarlightIbuki left a comment

StarlightIbuki commented Nov 20, 2023

chronolaw commented Nov 20, 2023

chronolaw commented Nov 20, 2023 •

edited

Loading

dndx commented Nov 27, 2023

StarlightIbuki left a comment

flrgh commented Jan 11, 2024

team-gateway-bot commented Jan 12, 2024

feat(router): enable net.src.* and net.dst.* in http expression #11950

feat(router): enable net.src.* and net.dst.* in http expression #11950

Conversation

chronolaw commented Nov 8, 2023 • edited Loading

Summary

Checklist

Full changelog

Issue reference

StarlightIbuki left a comment

Choose a reason for hiding this comment

StarlightIbuki commented Nov 20, 2023

chronolaw commented Nov 20, 2023

chronolaw commented Nov 20, 2023 • edited Loading

dndx commented Nov 27, 2023

StarlightIbuki left a comment

Choose a reason for hiding this comment

flrgh commented Jan 11, 2024

team-gateway-bot commented Jan 12, 2024

feat(router): enable `net.src.` and `net.dst.` in http expression #11950

feat(router): enable `net.src.` and `net.dst.` in http expression #11950

chronolaw commented Nov 8, 2023 •

edited

Loading

chronolaw commented Nov 20, 2023 •

edited

Loading