Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
270 commits
Select commit Hold shift + click to select a range
e14d4d6
Adding TypedExtensionConfig
silverstar194 Jul 15, 2022
4846099
Incremental Change
silverstar194 Jul 18, 2022
e8c5a9c
Merge remote-tracking branch 'origin/rewrite-extention-lib' into rout…
silverstar194 Jul 18, 2022
1405a3c
Merge branch 'main' into rewrite-extention-lib
silverstar194 Jul 18, 2022
e3cb859
Added import
silverstar194 Jul 18, 2022
9314a34
Merge remote-tracking branch 'origin/rewrite-extention-lib' into rewr…
silverstar194 Jul 18, 2022
db9aa98
Style and formatting
silverstar194 Jul 18, 2022
03fc99b
Spelling
silverstar194 Jul 18, 2022
b4a840b
Added import
silverstar194 Jul 18, 2022
cf26d41
Style
silverstar194 Jul 18, 2022
f493c54
Style
silverstar194 Jul 18, 2022
3543c89
Added string words
silverstar194 Jul 18, 2022
910f0a1
Change extension name
silverstar194 Jul 18, 2022
75a8e66
Change import
silverstar194 Jul 18, 2022
be8991e
Changed extension name
silverstar194 Jul 18, 2022
c6b511d
Added import
silverstar194 Jul 18, 2022
7c4ec0a
Changed title
silverstar194 Jul 18, 2022
5ee9933
Separate extension into two
silverstar194 Jul 20, 2022
2466c3d
Merge remote-tracking branch 'origin/rewrite-extention-duel' into rou…
silverstar194 Jul 20, 2022
75beba0
Cleaned up code
silverstar194 Jul 20, 2022
dc8bae1
Proto changes for pattern template
silverstar194 Jul 20, 2022
2dadf3d
Proto changes for pattern template
silverstar194 Jul 20, 2022
cb86b2c
Proto changes for pattern template
silverstar194 Jul 20, 2022
ed0b7e9
Merge branch 'main' into pattern-template-extention-proto
silverstar194 Jul 20, 2022
1990651
docs: Cleanup more literals in API docs (#22174)
silverstar194 Jul 20, 2022
403349a
Add space
silverstar194 Jul 20, 2022
e7d3877
Spelling
silverstar194 Jul 20, 2022
37c854a
Small style and grammar changes
silverstar194 Jul 21, 2022
41658a0
Change spacing
silverstar194 Jul 21, 2022
66d25b2
Remove proto
silverstar194 Jul 21, 2022
97d5b48
Removed old test
silverstar194 Jul 21, 2022
fb5e3ce
Merge branch 'pattern-template-extention-proto' into rewrite-extentio…
silverstar194 Jul 21, 2022
a85f7ba
Merge branch 'rewrite-extention-lib' into router-filter-matching-lib-…
silverstar194 Jul 21, 2022
239ef6a
Moved proto inside extension
silverstar194 Jul 21, 2022
f1ea5bf
Merge branch 'rewrite-extention-lib' into router-filter-matching-lib-…
silverstar194 Jul 21, 2022
662047a
Start towards generalizing pattern_match -> path_match
silverstar194 Jul 21, 2022
93fe32d
Add code coverage
silverstar194 Jul 21, 2022
53560e3
Add code coverage
silverstar194 Jul 21, 2022
32a5222
Revert test
silverstar194 Jul 21, 2022
40e84b4
Reformat
silverstar194 Jul 21, 2022
94aa0e7
Reformat
silverstar194 Jul 21, 2022
c943a59
Progress towards two extensions
silverstar194 Jul 21, 2022
b999215
Progress towards two extensions
silverstar194 Jul 21, 2022
12045ae
Remove old test
silverstar194 Jul 21, 2022
ec3c28b
Changes towards two extensions
silverstar194 Jul 21, 2022
0eff418
Format
silverstar194 Jul 21, 2022
38b9220
Added comments
silverstar194 Jul 22, 2022
2865e4b
Small changes
silverstar194 Jul 22, 2022
a4d9124
Small changes
silverstar194 Jul 22, 2022
cbb117d
Change extension format
silverstar194 Jul 25, 2022
9714c7a
Change extension format BUILDS
silverstar194 Jul 25, 2022
ebd39a3
Fix package name
silverstar194 Jul 25, 2022
1967be1
Fix build paths
silverstar194 Jul 25, 2022
b9f6c70
Fix build paths
silverstar194 Jul 25, 2022
fb72d96
Fix build paths
silverstar194 Jul 25, 2022
d9bf653
Merge branch 'pattern-template-extention-proto' into router-filter-ma…
silverstar194 Jul 25, 2022
6277e91
Change extension paths
silverstar194 Jul 25, 2022
a728038
Work to merge
silverstar194 Jul 25, 2022
6d1611d
Work to merge
silverstar194 Jul 25, 2022
eda37b8
Work to merge
silverstar194 Jul 25, 2022
f4c353a
Add progress
silverstar194 Jul 26, 2022
659898d
Add comments
silverstar194 Jul 26, 2022
989642f
Changed path
silverstar194 Jul 26, 2022
c66c650
Merge branch 'pattern-template-extention-proto' into router-filter-ma…
silverstar194 Jul 27, 2022
b149526
Merge in main
silverstar194 Jul 27, 2022
ae227c6
Merge branch 'main' into router-filter-matching-lib-control-plane
silverstar194 Jul 27, 2022
f25cbc0
Simple changes
silverstar194 Jul 27, 2022
c1baccc
Add and pass tests
silverstar194 Jul 28, 2022
6ac59da
Small change to test
silverstar194 Jul 28, 2022
6d3160b
Small change to test
silverstar194 Jul 28, 2022
3a18905
Format and clean up code
silverstar194 Jul 28, 2022
fbeca1a
Clean up
silverstar194 Jul 28, 2022
fa7d61b
Clean up
silverstar194 Jul 28, 2022
82b85bd
Merge remote-tracking branch 'upstream/main' into url-pattern-rewrite…
silverstar194 Jul 28, 2022
dea34c2
Clean up
silverstar194 Jul 28, 2022
854b14a
Clean up
silverstar194 Jul 28, 2022
d157327
Clean up
silverstar194 Jul 28, 2022
437eae7
Clean up
silverstar194 Jul 28, 2022
7cad22b
To string_view
silverstar194 Jul 29, 2022
386d5d2
To string_view
silverstar194 Jul 29, 2022
abbadb0
Small changes
silverstar194 Jul 29, 2022
93a0a2c
Small changes
silverstar194 Jul 29, 2022
b6504c7
Small changes
silverstar194 Jul 29, 2022
1366abd
Add pattern lib
silverstar194 Jul 29, 2022
792a8a6
Add pattern lib tests
silverstar194 Jul 29, 2022
34764c0
Small formatting issues
silverstar194 Aug 1, 2022
aea5007
Small formatting issues
silverstar194 Aug 1, 2022
0e78b03
Remove proto title
silverstar194 Aug 1, 2022
75b3a0c
Add owners
silverstar194 Aug 1, 2022
bd7081c
Add owners
silverstar194 Aug 1, 2022
94d146c
Changed owner to alyssawilk
silverstar194 Aug 1, 2022
42fb15c
Grammer changes
silverstar194 Aug 1, 2022
c280b13
Grammer changes
silverstar194 Aug 1, 2022
989959a
Grammer changes
silverstar194 Aug 1, 2022
0dae2f1
Grammer changes
silverstar194 Aug 1, 2022
5bcebeb
Grammar changes
silverstar194 Aug 1, 2022
306271a
Merge in rewrite-match-extension-lib
silverstar194 Aug 3, 2022
8c141c9
Merge remote-tracking branch 'origin/url-pattern-rewrite-add-extensio…
silverstar194 Aug 4, 2022
0825db3
Checkpoint changes
silverstar194 Aug 4, 2022
00848b1
Checkpoint changes
silverstar194 Aug 4, 2022
fc9f2ea
Checkpoint changes
silverstar194 Aug 4, 2022
3d8cc7b
Remove unused tests
silverstar194 Aug 4, 2022
a974d09
Casing changes
silverstar194 Aug 4, 2022
985538d
Merge remote-tracking branch 'upstream/main' into router-filter-match…
silverstar194 Aug 4, 2022
1f57b54
Run format
silverstar194 Aug 4, 2022
1e6ca9d
Changed extensions_metadata.yaml
silverstar194 Aug 4, 2022
6eacf89
Format and refactor
silverstar194 Aug 4, 2022
f101cbf
Format and refactor
silverstar194 Aug 4, 2022
598e5c9
Added to exclude
silverstar194 Aug 4, 2022
4c00b52
Added to exclude
silverstar194 Aug 4, 2022
561d696
Added to exclude
silverstar194 Aug 4, 2022
9226da3
Add extension label
silverstar194 Aug 4, 2022
63e8be8
Changed doc strings and name
silverstar194 Aug 4, 2022
655d054
Changed doc strings and name
silverstar194 Aug 5, 2022
35f452d
Spacing
silverstar194 Aug 5, 2022
d993ae4
Ordering
silverstar194 Aug 5, 2022
b0cd6b2
Add output
silverstar194 Aug 5, 2022
d897f24
Edit script
silverstar194 Aug 5, 2022
bb2c540
Remove unneeded files
silverstar194 Aug 5, 2022
f37852d
Add stubs
silverstar194 Aug 5, 2022
d44dbb8
Addressed some comments
silverstar194 Aug 8, 2022
1020d4a
Handled error path
silverstar194 Aug 8, 2022
5821840
Format
silverstar194 Aug 8, 2022
662fa35
Format
silverstar194 Aug 8, 2022
697c145
Format
silverstar194 Aug 8, 2022
54473ad
Format
silverstar194 Aug 9, 2022
0320a5e
Reformat validations
silverstar194 Aug 9, 2022
433b9b6
Remove unneeded factory class member
silverstar194 Aug 9, 2022
16d88c2
Add config tests
silverstar194 Aug 10, 2022
7e5a785
Add library tests
silverstar194 Aug 10, 2022
c35f599
Format tests
silverstar194 Aug 10, 2022
9fae620
Address some comments
silverstar194 Aug 11, 2022
5d1b98e
Adding more tests
silverstar194 Aug 11, 2022
c98799a
Refactor internal method and add tests
silverstar194 Aug 12, 2022
c65868c
Small changes for comments
silverstar194 Aug 12, 2022
60121ec
Merge remote-tracking branch 'upstream/main' into router-filter-match…
silverstar194 Aug 12, 2022
8d9f034
Small reorder
silverstar194 Aug 12, 2022
081cf8e
Added comment
silverstar194 Aug 12, 2022
8ff74df
Added commit
silverstar194 Aug 12, 2022
b11c7e3
Added commit
silverstar194 Aug 12, 2022
da94ae2
Rename path_match_policy and path_rewrite_policy
silverstar194 Aug 12, 2022
5314441
Formating
silverstar194 Aug 12, 2022
606932d
added config_test
silverstar194 Aug 15, 2022
7770a35
Match and Rewrite Library
silverstar194 Aug 15, 2022
cb56566
Add formatting
silverstar194 Aug 15, 2022
70c4852
Merge remote-tracking branch 'upstream/main' into rewrite-match-lib
silverstar194 Aug 15, 2022
2b84780
Add formatting
silverstar194 Aug 15, 2022
3ac78ba
Add code owners
silverstar194 Aug 15, 2022
1574273
Changes for comments
silverstar194 Aug 15, 2022
d2cf6f7
Add some tests
silverstar194 Aug 15, 2022
5525bc8
Add coverage threshold
silverstar194 Aug 15, 2022
e930ee9
Add coverage threshold
silverstar194 Aug 15, 2022
200fc40
Add coverage threshold
silverstar194 Aug 15, 2022
7be7de6
Spelling
silverstar194 Aug 15, 2022
af6402c
Formating
silverstar194 Aug 15, 2022
a036811
Formating
silverstar194 Aug 15, 2022
796d861
Format
silverstar194 Aug 15, 2022
1133f8f
Coverage
silverstar194 Aug 15, 2022
ef6ab4f
Addresses comments
silverstar194 Aug 16, 2022
5438e13
Added more tests
silverstar194 Aug 16, 2022
fa27801
Change casing
silverstar194 Aug 16, 2022
68d22dc
Merge master
silverstar194 Aug 16, 2022
516a086
Unformat
silverstar194 Aug 16, 2022
73cf215
Change over to string_view
silverstar194 Aug 16, 2022
a658592
Move to string_view
silverstar194 Aug 16, 2022
d09feca
Change factory
silverstar194 Aug 16, 2022
4824c30
Various comments
silverstar194 Aug 16, 2022
776b32d
Add exclude fix
silverstar194 Aug 16, 2022
cecbeba
Remove doc
silverstar194 Aug 16, 2022
3bc293e
Moved over some tests
silverstar194 Aug 16, 2022
0f39b1c
Renamed
silverstar194 Aug 17, 2022
4e9dea0
Renamed
silverstar194 Aug 17, 2022
33552d1
Formating
silverstar194 Aug 17, 2022
5186ad6
Updates from comments
silverstar194 Aug 18, 2022
b6ecdca
Rename extensions
silverstar194 Aug 18, 2022
e046dd0
Merge branch 'rewrite-match-lib' into router-filter-matching-lib-cont…
silverstar194 Aug 18, 2022
fa594ff
Merge branch 'envoyproxy:main' into rewrite-match-lib
silverstar194 Aug 18, 2022
613f15a
from main check_format
silverstar194 Aug 18, 2022
225c1f0
Changes per comments
silverstar194 Aug 19, 2022
849751e
Formatting clang
silverstar194 Aug 19, 2022
e83815b
Changed names
silverstar194 Aug 22, 2022
595726f
Fix small bug
silverstar194 Aug 22, 2022
f146a0a
Changes for comments
silverstar194 Aug 23, 2022
1f7417e
Format
silverstar194 Aug 23, 2022
06bcb92
Merge remote-tracking branch 'origin/main' into rewrite-match-lib
silverstar194 Aug 23, 2022
b7d8910
Remove optional string
silverstar194 Aug 23, 2022
c386a92
Format
silverstar194 Aug 23, 2022
3515982
Small nits
silverstar194 Aug 24, 2022
686e016
Changed comment
silverstar194 Aug 24, 2022
e8d515c
Merge branch 'rewrite-match-lib' into router-filter-matching-lib-cont…
silverstar194 Aug 29, 2022
86fd526
Merge in branch
silverstar194 Aug 29, 2022
d9e4d91
Revert check_format to main
silverstar194 Aug 29, 2022
bbddb4d
Format
silverstar194 Aug 29, 2022
522048a
Format
silverstar194 Aug 29, 2022
d96998a
Format
silverstar194 Aug 29, 2022
b87b213
Format
silverstar194 Aug 29, 2022
cb45a60
nits
silverstar194 Aug 30, 2022
0d42c56
Change coverage
silverstar194 Aug 30, 2022
ea5ad5a
Rename instances left behind
silverstar194 Aug 31, 2022
d121c9c
Format
silverstar194 Aug 31, 2022
bb70740
Grammer
silverstar194 Aug 31, 2022
a800753
Add todo
silverstar194 Aug 31, 2022
f1528ba
Add work for proto refactor todo
silverstar194 Aug 31, 2022
eb9711b
Merge remote-tracking branch 'origin/main' into rewrite-match-lib-proto
silverstar194 Aug 31, 2022
c2b2448
Rename types
silverstar194 Sep 1, 2022
b8482e6
Format
silverstar194 Sep 1, 2022
d718a3a
Merge branch 'rewrite-match-lib' into router-filter-matching-lib-cont…
silverstar194 Sep 1, 2022
5666a9d
Merge branch 'rewrite-match-lib-proto' into router-filter-matching-li…
silverstar194 Sep 1, 2022
257702d
Clean up merge issues
silverstar194 Sep 1, 2022
6e03162
Change comment
silverstar194 Sep 1, 2022
6173aaf
Remove unused method rewritePathTemplatePattern
silverstar194 Sep 1, 2022
b56cad5
Format
silverstar194 Sep 1, 2022
f36f6b9
Merge remote-tracking branch 'origin/main' into router-filter-matchin…
silverstar194 Sep 1, 2022
ce23b02
Merge remote-tracking branch 'origin/main' into router-filter-matchin…
silverstar194 Sep 1, 2022
69c7c25
Add link to docs
silverstar194 Sep 1, 2022
443cdcf
Add link to docs
silverstar194 Sep 2, 2022
a3f450d
Partly moved code
silverstar194 Sep 2, 2022
10b3b6a
Roll about some changes
silverstar194 Sep 2, 2022
43e02ef
Progress towards renaming
silverstar194 Sep 2, 2022
d9e1293
Progress towards renaming
silverstar194 Sep 2, 2022
a0ae407
Format
silverstar194 Sep 6, 2022
bad506f
Format
silverstar194 Sep 6, 2022
1ba7fe7
Format
silverstar194 Sep 6, 2022
5da0dbb
Spelling
silverstar194 Sep 6, 2022
016b047
Fix tests
silverstar194 Sep 6, 2022
cad3d1c
Format and rename
silverstar194 Sep 6, 2022
23d11a1
Format and rename
silverstar194 Sep 6, 2022
83d9498
Format and rename
silverstar194 Sep 6, 2022
3166bd4
Format and rename
silverstar194 Sep 6, 2022
06ff4ae
Remove policy classes
silverstar194 Sep 7, 2022
7721644
Remove policy classes
silverstar194 Sep 7, 2022
9a67cf6
Merge remote-tracking branch 'origin/main' into router-filter-matchin…
silverstar194 Sep 7, 2022
149756b
Merge remote-tracking branch 'origin/main' into router-filter-matchin…
silverstar194 Sep 8, 2022
09b63b4
Remove old policy classes and address comments
silverstar194 Sep 8, 2022
bbf017a
Revert extensions_build_config.bzl
silverstar194 Sep 8, 2022
a9c59e4
Change names for small nit
silverstar194 Sep 9, 2022
7d1c8d8
Change name
silverstar194 Sep 9, 2022
a28f4dd
Format
silverstar194 Sep 9, 2022
e90c05f
Format
silverstar194 Sep 9, 2022
2abde45
Changed dictionary
silverstar194 Sep 9, 2022
c7c0cf3
Added tests
silverstar194 Sep 9, 2022
3d14860
Format
silverstar194 Sep 9, 2022
7250108
Removed reduced coverage
silverstar194 Sep 12, 2022
df35c90
Add fuzzing
silverstar194 Sep 15, 2022
97f3666
Tests
silverstar194 Sep 15, 2022
485fc23
Merge remote-tracking branch 'origin/main' into pattern-match-rewrite…
silverstar194 Sep 15, 2022
34504f2
Tests
silverstar194 Sep 15, 2022
aefed6e
Nit grammer
silverstar194 Sep 16, 2022
39ed01b
Add validation
silverstar194 Sep 19, 2022
4dcf1f5
Remove fuzz
silverstar194 Sep 19, 2022
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
4 changes: 4 additions & 0 deletions source/common/router/config_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -669,6 +669,10 @@ RouteEntryImplBase::RouteEntryImplBase(const VirtualHostImpl& vhost,
"Specify only one of prefix_rewrite, regex_rewrite or path_rewrite_policy");
}

if (!route.route().prefix_rewrite().empty() && path_matcher_ != nullptr) {
Copy link
Copy Markdown
Member

@tyxia tyxia Sep 21, 2022

Choose a reason for hiding this comment

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

nit: We should be able to directly use prefix_rewrite_ that has already been initialized, right? This avoids redundant function call to route() and prefix_rewrite().

We can even merge this into the if block in line 659. But I think merging will be a bit micro-optimization and keep the separate two checks here helps readability.

Changing to prefix_rewrite_ is good enough IMO.

throw EnvoyException("Cannot use prefix_rewrite with matcher extension");
}

if (route.route().has_regex_rewrite()) {
auto rewrite_spec = route.route().regex_rewrite();
regex_rewrite_ = Regex::Utility::parseRegex(rewrite_spec.pattern());
Expand Down
24 changes: 24 additions & 0 deletions test/common/router/config_impl_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -8840,6 +8840,30 @@ TEST_F(RouteConfigurationV2, TemplatePatternIsDisabledWhenNotSpecifiedInRouteAct
EXPECT_TRUE(pattern_template_policy == nullptr);
}

TEST_F(RouteConfigurationV2, RouteMatcherExtensionAndPrefixRewrite) {
const std::string yaml = R"EOF(
virtual_hosts:
- name: path_pattern
domains: ["*"]
routes:
- match:
path_match_policy:
name: envoy.path.match.uri_template.uri_template_matcher
typed_config:
"@type": type.googleapis.com/envoy.extensions.path.match.uri_template.v3.UriTemplateMatchConfig
path_template: "/bar/{country}/{hang}"
route:
cluster: some-cluster
prefix_rewrite: "!"

)EOF";

factory_context_.cluster_manager_.initializeClusters({"some-cluster"}, {});
EXPECT_THROW_WITH_MESSAGE(
TestConfigImpl config(parseRouteConfigurationFromYaml(yaml), factory_context_, true),
EnvoyException, "Cannot use prefix_rewrite with matcher extension");
}

TEST_F(RouteConfigurationV2, TemplatePatternIsFilledFromConfigInRouteAction) {
const std::string yaml = R"EOF(
virtual_hosts:
Expand Down