Skip to content

Apply configuration of SnippetsFilters to NGINX #2604

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

Merged
merged 16 commits into from
Sep 30, 2024
Merged

Apply configuration of SnippetsFilters to NGINX #2604

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
ced8d6b
Finish implementing SnippetsFilter
Sep 19, 2024
ad68493
Fix auto formatting issues
Sep 25, 2024
64b7932
Fix backend refs test
Sep 25, 2024
b40f965
Update include path in nginx-plus.conf
Sep 25, 2024
8b716e4
Remove unnecessary len check
Sep 25, 2024
0759700
Add comments to includes.go
Sep 25, 2024
f5b3c08
Move convert func to convert.go
Sep 25, 2024
283318d
Fix typos
Sep 25, 2024
9743f11
Fix parallel placement
Sep 25, 2024
081b89e
Add comment about validation
Sep 25, 2024
17993ce
More formatting changes
Sep 25, 2024
2adb90e
Some more formatting reverts
Sep 25, 2024
45c86b2
One more formatting revert
Sep 25, 2024
8979e48
More typo fixes
Sep 26, 2024
1cfbac5
Code review
Sep 26, 2024
9fa6127
Swap actual/expected in server test
Sep 30, 2024
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
Prev Previous commit
Next Next commit
Remove unnecessary len check
  • Loading branch information
Kate Osborn committed Sep 25, 2024
commit 8b716e4cd5a1df288643fe6eab7d4eff4ffda9d1
8 changes: 3 additions & 5 deletions internal/mode/static/nginx/config/includes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,9 @@ func createIncludesFromServerSnippetsFilters(server dataplane.VirtualServer) []s

for _, pr := range server.PathRules {
for _, mr := range pr.MatchRules {
if len(mr.Filters.SnippetsFilters) > 0 {
for _, sf := range mr.Filters.SnippetsFilters {
if sf.ServerSnippet != nil {
includes = append(includes, createIncludeFromSnippet(*sf.ServerSnippet))
}
for _, sf := range mr.Filters.SnippetsFilters {
if sf.ServerSnippet != nil {
includes = append(includes, createIncludeFromSnippet(*sf.ServerSnippet))
}
}
}
Expand Down