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

Support HTTPQueryParamMatch as CEL routeRuleConditions #981

Merged
merged 4 commits into from
Nov 7, 2024
Merged

Support HTTPQueryParamMatch as CEL routeRuleConditions #981

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1dabef0
Support HTTPQueryParamMatch as CEL routeRuleConditions
alexsnaps Nov 5, 2024
7293ac1
By default decodeQueryString will now ignore repeated params
alexsnaps Nov 6, 2024
695f15d
By default queryMap will now ignore repeated params
alexsnaps Nov 6, 2024
61661d2
Test for mapping `HTTPRouteMatch` to CEL Predicates
alexsnaps Nov 6, 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
15 changes: 12 additions & 3 deletions pkg/wasm/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,9 +144,14 @@
predicates = append(predicates, predicateFromHeader(headerMatch))
}

// TODO(eguzki): query params. Investigate integration with wasm regarding Envoy params
// from https://www.envoyproxy.io/docs/envoy/latest/intro/arch_overview/advanced/attributes
// request.query -> string : The query portion of the URL in the format of “name1=value1&name2=value2”.
// query param, only consider the first in case of repetition, as per spec
queryParams := make(map[gatewayapiv1.HTTPHeaderName]bool)
Copy link
Member Author

Choose a reason for hiding this comment

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

Dunno if that's idiomatic Go...

Copy link
Collaborator

Choose a reason for hiding this comment

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

its fine, I think you would find most use queryParams := map[gatewaypiv1.HTTPHeaderName]bool{} but I don't think it is that important

for _, queryParamMatch := range match.QueryParams {
if !queryParams[queryParamMatch.Name] {
queryParams[queryParamMatch.Name] = true
predicates = append(predicates, predicateFromQueryParam(queryParamMatch))
}

Check warning on line 153 in pkg/wasm/utils.go

View check run for this annotation

Codecov / codecov/patch

pkg/wasm/utils.go#L150-L153 

Added lines #L150 - L153 were not covered by tests
}

return predicates
}
Expand Down Expand Up @@ -181,3 +186,7 @@
// https://gateway-api.sigs.k8s.io/reference/spec/#gateway.networking.k8s.io/v1.HTTPHeaderMatch
return fmt.Sprintf("request.headers['%s'] == '%s'", headerMatch.Name, headerMatch.Value)
}

func predicateFromQueryParam(queryParam gatewayapiv1.HTTPQueryParamMatch) string {
return fmt.Sprintf("decodeQueryString(request.query, false)['%s'] == '%s'", queryParam.Name, queryParam.Value)

Check warning on line 191 in pkg/wasm/utils.go

View check run for this annotation

Codecov / codecov/patch

pkg/wasm/utils.go#L190-L191 

Added lines #L190 - L191 were not covered by tests
}
Loading