lingsamuel commented on code in PR #1426:
URL:
https://github.com/apache/apisix-ingress-controller/pull/1426#discussion_r1012478500
##########
test/e2e/scaffold/k8s.go:
##########
@@ -128,9 +126,7 @@ func (s *Scaffold) CreateResourceFromString(yaml string)
error {
// if the error raised, it may be a &shell.ErrWithCmdOutput, which is
useless in debug
if err != nil {
- log.Errorw("create resource failed",
- zap.Error(err),
- )
+ err = fmt.Errorf(err.Error())
Review Comment:
The above comment can be removed with this change.
##########
pkg/providers/gateway/translation/gateway_httproute.go:
##########
@@ -32,6 +32,77 @@ import (
apisixv1
"github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1"
)
+func (t *translator) generatePluginsFromHTTPRouteFilter(filters
[]gatewayv1alpha2.HTTPRouteFilter) apisixv1.Plugins {
+ plugins := apisixv1.Plugins{}
+ for _, filter := range filters {
+ switch filter.Type {
+ case gatewayv1alpha2.HTTPRouteFilterRequestHeaderModifier:
+ t.fillPluginsFromHTTPRequestHeaderFilter(plugins,
filter.RequestHeaderModifier)
+ case gatewayv1alpha2.HTTPRouteFilterRequestRedirect:
+ t.fillPluginsFromHTTPRequestRedirectFilter(plugins,
filter.RequestRedirect)
+ case gatewayv1alpha2.HTTPRouteFilterRequestMirror:
+ // to do
+ }
+ }
+ return plugins
+}
+
+func (t *translator) fillPluginsFromHTTPRequestHeaderFilter(plugins
apisixv1.Plugins, reqHeaderModifier *gatewayv1alpha2.HTTPRequestHeaderFilter) {
+ if reqHeaderModifier == nil {
+ return
+ }
+ headers := map[string]any{}
+ for _, header := range reqHeaderModifier.Add {
+ headers[string(header.Name)] = header.Value
+ }
+ for _, header := range reqHeaderModifier.Set {
+ headers[string(header.Name)] = header.Value
+ }
+ for _, header := range reqHeaderModifier.Remove {
+ headers[header] = ""
+ }
+ // fill roxy-rewrite plugin
+ plugins["proxy-rewrite"] = map[string]any{
+ "headers": headers,
+ }
+}
+
+func (t *translator) fillPluginsFromHTTPRequestRedirectFilter(plugins
apisixv1.Plugins, reqRedirect *gatewayv1alpha2.HTTPRequestRedirectFilter) {
+ if reqRedirect == nil {
+ return
+ }
+
+ var (
+ code *int
+ uri string
+ )
+
+ if reqRedirect.StatusCode != nil {
+ code = reqRedirect.StatusCode
+ }
+
+ hostname := "$host"
+ if reqRedirect.Hostname != nil {
+ hostname = string(*reqRedirect.Hostname)
+ }
+
+ scheme := "$scheme"
+ if reqRedirect.Scheme != nil {
+ scheme = *reqRedirect.Scheme
+ }
+
+ if reqRedirect.Port != nil {
+ uri = fmt.Sprintf("%s://%s:%d$request_uri", scheme, hostname,
int(*reqRedirect.Port))
+ } else {
+ uri = fmt.Sprintf("%s://%s$request_uri", scheme, hostname)
+ }
+ redirect := map[string]any{
Review Comment:
Same, can we have a RedirectPluginConfig struct?
##########
pkg/providers/gateway/translation/gateway_httproute.go:
##########
@@ -32,6 +32,77 @@ import (
apisixv1
"github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1"
)
+func (t *translator) generatePluginsFromHTTPRouteFilter(filters
[]gatewayv1alpha2.HTTPRouteFilter) apisixv1.Plugins {
+ plugins := apisixv1.Plugins{}
+ for _, filter := range filters {
+ switch filter.Type {
+ case gatewayv1alpha2.HTTPRouteFilterRequestHeaderModifier:
+ t.fillPluginsFromHTTPRequestHeaderFilter(plugins,
filter.RequestHeaderModifier)
+ case gatewayv1alpha2.HTTPRouteFilterRequestRedirect:
+ t.fillPluginsFromHTTPRequestRedirectFilter(plugins,
filter.RequestRedirect)
+ case gatewayv1alpha2.HTTPRouteFilterRequestMirror:
+ // to do
+ }
+ }
+ return plugins
+}
+
+func (t *translator) fillPluginsFromHTTPRequestHeaderFilter(plugins
apisixv1.Plugins, reqHeaderModifier *gatewayv1alpha2.HTTPRequestHeaderFilter) {
+ if reqHeaderModifier == nil {
+ return
+ }
+ headers := map[string]any{}
+ for _, header := range reqHeaderModifier.Add {
+ headers[string(header.Name)] = header.Value
Review Comment:
I think this behavior doesn't match the spec. `Add` is append, not
overwrite.
https://github.com/kubernetes-sigs/gateway-api/blob/release-0.4/apis/v1alpha2/httproute_types.go#L621
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
