Skip to content

fix: return early from buildwasms #6169

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
arkodg merged 1 commit into from
May 23, 2025
Merged

fix: return early from buildwasms #6169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 3 deletions internal/cmd/egctl/testdata/translate/out/backend-endpoint.all.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,7 @@ envoyExtensionPolicies:
namespace: envoy-gateway-system
conditions:
- lastTransitionTime: null
message: |-
Wasm: wasm cache is not initialized
ExtProc: service envoy-gateway-system/grpc-ext-proc not found.
message: 'ExtProc: service envoy-gateway-system/grpc-ext-proc not found.'
reason: Invalid
status: "False"
type: Accepted
Expand Down
8 changes: 6 additions & 2 deletions internal/gatewayapi/envoyextensionpolicy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,12 +614,16 @@ func (t *Translator) buildWasms(
policy *egv1a1.EnvoyExtensionPolicy,
resources *resource.Resources,
) ([]ir.Wasm, error) {
var wasmIRList []ir.Wasm

if len(policy.Spec.Wasm) == 0 {
return wasmIRList, nil
Copy link
Contributor

@arkodg arkodg May 22, 2025

Choose a reason for hiding this comment

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

does the caller expect nil or empty list ?

Copy link
Contributor Author

@guydc guydc May 23, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

nil slice wasmIRList was previously returned if range policy.Spec.Wasm was empty. So, should be safe.

}

if t.WasmCache == nil {
return nil, fmt.Errorf("wasm cache is not initialized")
}

var wasmIRList []ir.Wasm

if policy == nil {
return nil, nil
}
Expand Down
1 change: 1 addition & 0 deletions release-notes/current.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ new features: |
Added XDS metadata for clusters and endpoints from xRoutes and referenced backend resources (Backend, Service, ServiceImport).

bug fixes: |
Fixed issue where WASM cache init failure caused routes with WASM-less EnvoyExtensionPolicies to have 500 direct responses.

# Enhancements that improve performance.
performance improvements: |
Expand Down