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

Jump to bottom

rm gateway-api translation error message from direct response #3878

Merged
merged 4 commits into from
Jul 18, 2024
Merged

rm gateway-api translation error message from direct response #3878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f99ace6
rm gateway-api translation error message from direct response
arkodg Jul 17, 2024
0bdc1e6
Merge branch 'main' into rm-err-body
zirain Jul 17, 2024
2f573d7
Merge branch 'main' into rm-err-body
Xunzhuo Jul 17, 2024
97012cc
Merge branch 'main' into rm-err-body
arkodg Jul 17, 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
3 changes: 0 additions & 3 deletions internal/gatewayapi/filters.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -825,7 +825,6 @@ func (t *Translator) processUnresolvedHTTPFilter(errMsg string, filterContext *H
errMsg,
)
filterContext.DirectResponse = &ir.DirectResponse{
Body: &errMsg,
StatusCode: 500,
}
}
Expand All @@ -842,7 +841,6 @@ func (t *Translator) processUnsupportedHTTPFilter(filterType string, filterConte
errMsg,
)
filterContext.DirectResponse = &ir.DirectResponse{
Body: &errMsg,
StatusCode: 500,
}
}
Expand All @@ -859,7 +857,6 @@ func (t *Translator) processInvalidHTTPFilter(filterType string, filterContext *
errMsg,
)
filterContext.DirectResponse = &ir.DirectResponse{
Body: &errMsg,
StatusCode: 500,
}
}
3 changes: 0 additions & 3 deletions internal/ir/xds.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1196,9 +1196,6 @@ func (h AddHeader) Validate() error {
// DirectResponse holds the details for returning a body and status code for a route.
// +k8s:deepcopy-gen=true
type DirectResponse struct {
// Body configures the body of the direct response. Currently only a string response
// is supported, but in the future a config.core.v3.DataSource may replace it.
Body *string `json:"body,omitempty" yaml:"body,omitempty"`
// StatusCode will be used for the direct response's status code.
StatusCode uint32 `json:"statusCode" yaml:"statusCode"`
}
Expand Down
2 changes: 0 additions & 2 deletions internal/ir/xds_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,6 @@ var (
Exact: ptr.To("filter-error"),
},
DirectResponse: &DirectResponse{
Body: ptr.To("invalid filter type"),
StatusCode: uint32(500),
},
}
Expand Down Expand Up @@ -297,7 +296,6 @@ var (
Exact: ptr.To("redirect"),
},
DirectResponse: &DirectResponse{
Body: ptr.To("invalid filter type"),
StatusCode: uint32(799),
},
}
Expand Down
7 changes: 1 addition & 6 deletions internal/ir/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 0 additions & 9 deletions internal/xds/translator/route.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,15 +419,6 @@ func buildXdsURLRewriteAction(destName string, urlRewrite *ir.URLRewrite, pathMa

func buildXdsDirectResponseAction(res *ir.DirectResponse) *routev3.DirectResponseAction {
routeAction := &routev3.DirectResponseAction{Status: res.StatusCode}

if res.Body != nil {
routeAction.Body = &corev3.DataSource{
Specifier: &corev3.DataSource_InlineString{
InlineString: *res.Body,
},
}
}

return routeAction
}

Expand Down
2 changes: 0 additions & 2 deletions internal/xds/translator/testdata/out/xds-ir/accesslog-cel.routes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
name: first-listener/*
routes:
- directResponse:
body:
inlineString: 'Unknown custom filter type: UnsupportedType'
status: 500
match:
prefix: /
Expand Down
2 changes: 0 additions & 2 deletions internal/xds/translator/testdata/out/xds-ir/accesslog-endpoint-stats.routes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
name: first-listener/*
routes:
- directResponse:
body:
inlineString: 'Unknown custom filter type: UnsupportedType'
status: 500
match:
prefix: /
Expand Down
2 changes: 0 additions & 2 deletions internal/xds/translator/testdata/out/xds-ir/accesslog-formatters.routes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
name: first-listener/*
routes:
- directResponse:
body:
inlineString: 'Unknown custom filter type: UnsupportedType'
status: 500
match:
prefix: /
Expand Down
2 changes: 0 additions & 2 deletions internal/xds/translator/testdata/out/xds-ir/accesslog-multi-cel.routes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
name: first-listener/*
routes:
- directResponse:
body:
inlineString: 'Unknown custom filter type: UnsupportedType'
status: 500
match:
prefix: /
Expand Down
2 changes: 0 additions & 2 deletions internal/xds/translator/testdata/out/xds-ir/accesslog-without-format.routes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
name: first-listener/*
routes:
- directResponse:
body:
inlineString: 'Unknown custom filter type: UnsupportedType'
status: 500
match:
prefix: /
Expand Down
2 changes: 0 additions & 2 deletions internal/xds/translator/testdata/out/xds-ir/accesslog.routes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
name: first-listener/*
routes:
- directResponse:
body:
inlineString: 'Unknown custom filter type: UnsupportedType'
status: 500
match:
prefix: /
Expand Down
2 changes: 0 additions & 2 deletions internal/xds/translator/testdata/out/xds-ir/http-route-direct-response.routes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
name: first-listener/*
routes:
- directResponse:
body:
inlineString: 'Unknown custom filter type: UnsupportedType'
status: 500
match:
prefix: /
Expand Down
2 changes: 0 additions & 2 deletions internal/xds/translator/testdata/out/xds-ir/tracing-endpoint-stats.routes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
name: first-listener/*
routes:
- directResponse:
body:
inlineString: 'Unknown custom filter type: UnsupportedType'
status: 500
match:
prefix: /
Expand Down
2 changes: 0 additions & 2 deletions internal/xds/translator/testdata/out/xds-ir/tracing-zipkin.routes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
name: first-listener/*
routes:
- directResponse:
body:
inlineString: 'Unknown custom filter type: UnsupportedType'
status: 500
match:
prefix: /
Expand Down
2 changes: 0 additions & 2 deletions internal/xds/translator/testdata/out/xds-ir/tracing.routes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
name: first-listener/*
routes:
- directResponse:
body:
inlineString: 'Unknown custom filter type: UnsupportedType'
status: 500
match:
prefix: /
Expand Down