fix: make IR map comparison deterministic in runner tests by Aditya7880900936 · Pull Request #7852 · envoyproxy/gateway

Aditya7880900936 · 2025-12-31T11:32:27Z

What type of PR is this?
fix(test): make IR map comparison deterministic in runner tests

What this PR does / why we need it:
This PR fixes nondeterministic test behavior caused by using reflect.DeepEqual
on maps returned from watchable.LoadAll() in runner tests.

It introduces deterministic ordering helpers for XdsIR and InfraIR maps and
updates the runner tests to compare sorted results instead of raw maps.
This ensures stable and reliable test outcomes without changing any
production logic.

Which issue(s) this PR fixes:
Fixes #7783

Release Notes: No

Signed-off-by: Aditya7880900936 <adityasanskarsrivastav788@gmail.com>

codecov · 2025-12-31T11:41:50Z

Codecov Report

❌ Patch coverage is 92.00000% with 2 lines in your changes missing coverage. Please review.
✅ Project coverage is 72.79%. Comparing base (dd2861f) to head (ff30b86).

Files with missing lines	Patch %	Lines
internal/message/types.go	92.00%	1 Missing and 1 partial ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #7852      +/-   ##
==========================================
+ Coverage   72.77%   72.79%   +0.02%     
==========================================
  Files         235      235              
  Lines       35165    35190      +25     
==========================================
+ Hits        25592    25618      +26     
+ Misses       7756     7755       -1     
  Partials     1817     1817

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

Signed-off-by: Aditya7880900936 <adityasanskarsrivastav788@gmail.com>

internal/gatewayapi/runner/runner_test.go

internal/message/types_test.go

Signed-off-by: Aditya7880900936 <adityasanskarsrivastav788@gmail.com>

arkodg · 2026-01-01T19:40:11Z

@Aditya7880900936 we want to eliminate maps from the IR and use a list of structs instead to ensure order

Aditya7880900936 · 2026-01-02T17:35:31Z

Hi @arkodg @rudrakhp ,
Thanks for the clarification

That makes sense. This PR focuses on making the existing tests deterministic without changing the IR shape, but I agree the proper fix is to eliminate maps from the IR entirely and replace them with ordered slices of structs.

Happy to follow up with a separate PR that converts the relevant IR maps to slices, if that sounds good.

Aditya7880900936 · 2026-01-05T19:40:40Z

Hi @arkodg @rudrakhp , just a gentle follow-up in case this got buried.
Happy to make any further changes if needed. Thanks!

Signed-off-by: Aditya Sanskar Srivastav <161202916+Aditya7880900936@users.noreply.github.com>

netlify · 2026-01-09T08:55:44Z

✅ Deploy Preview for cerulean-figolla-1f9435 ready!

Name	Link
🔨 Latest commit	`ac8834d`
🔍 Latest deploy log	https://app.netlify.com/projects/cerulean-figolla-1f9435/deploys/6960c28cd0959a0008d58dd0
😎 Deploy Preview	https://deploy-preview-7852--cerulean-figolla-1f9435.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify project configuration.

arkodg · 2026-01-11T03:43:11Z

#7852 (comment)

Aditya7880900936 · 2026-01-12T09:46:02Z

Hi @arkodg ,
Got it, thanks for the clarification. This PR intentionally keeps scope limited to test determinism; happy to follow up with a separate IR refactor PR to replace maps with ordered slices.

…pEqual Addresses issue envoyproxy#7852. Signed-off-by: Junnygram <junnexclusive@gmail.com>

arkodg · 2026-01-17T17:20:39Z

closing in favor of #7953

…pEqual Addresses issue envoyproxy#7852. Signed-off-by: Junnygram <junnexclusive@gmail.com>

#7953) * refactor: convert IR map fields to slices to ensure deterministic DeepEqual Addresses issue #7852. Signed-off-by: Junnygram <junnexclusive@gmail.com>

envoyproxy#7953) * refactor: convert IR map fields to slices to ensure deterministic DeepEqual Addresses issue envoyproxy#7852. Signed-off-by: Junnygram <junnexclusive@gmail.com> Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com>

* e2e: speed tracing tests (#8124) * e2e: speed tracing tests Signed-off-by: zirain <zirain2009@gmail.com> Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> * fix(translator): allow single-label backends in host mode (#8123) Signed-off-by: Adrian Cole <adrian@tetrate.io> Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> * ci: release json report (#8107) Signed-off-by: zirain <zirain2009@gmail.com> Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> * fix oidc flakiness (#8119) * fix oidc flakiness Signed-off-by: Huabing (Robin) Zhao <zhaohuabing@gmail.com> Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> * fix: skip_test_workflow doesn't exist (#8116) This also uses grouped redirects to satisfy shellcheck SC2129. Signed-off-by: Dylan M. Taylor <dylan@dylanmtaylor.com> Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> * fix e2e test panic (#8109) fix e2e test Signed-off-by: Huabing (Robin) Zhao <zhaohuabing@gmail.com> Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> * chore: bump func-e to v1.4.0 (#8105) bump func-e to v1.4.0 Signed-off-by: Adrian Cole <adrian@tetrate.io> Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> * fix: route idle timeout (#8058) * fix: route idle timeout Signed-off-by: Huabing (Robin) Zhao <zhaohuabing@gmail.com> * address comments Signed-off-by: Huabing (Robin) Zhao <zhaohuabing@gmail.com> * add test Signed-off-by: Huabing (Robin) Zhao <zhaohuabing@gmail.com> --------- Signed-off-by: Huabing (Robin) Zhao <zhaohuabing@gmail.com> Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> * docs: add Mirakl to adopters list (#8138) Signed-off-by: Thierry Wandja <thierry.wandja@mirakl.com> Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> * docs: add security warning to control plane extensions (#7967) chore(docs): add warnings about control plane extensions Signed-off-by: Guy Daich <guy.daich@sap.com> Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> * chore: add lint for release notes filenames (#8137) * chore: add lint for release notes filenames Signed-off-by: zirain <zirain2009@gmail.com> * remove 1.7.0 Signed-off-by: zirain <zirain2009@gmail.com> * fix lint Signed-off-by: zirain <zirain2009@gmail.com> --------- Signed-off-by: zirain <zirain2009@gmail.com> Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> * fix: remove global logger in message package (#8131) * fix: remove global logger in message package Signed-off-by: zirain <zirain2009@gmail.com> Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> * docs: fix url result of regex rewrite (#7864) * Update http-urlrewrite.md Signed-off-by: Sadmi Bouhafs <sadmibouhafs@gmail.com> Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> * chore: log skipped xds (#8132) log skipped xds Signed-off-by: Huabing (Robin) Zhao <zhaohuabing@gmail.com> Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> * docs: fixes for OPA sidecar + Unix Domain Socket task (#8142) Signed-off-by: Matt Miller <millermatt@outlook.com> Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> * fix: basic auth validation (#8053) * fix basic auth validation Signed-off-by: Huabing (Robin) Zhao <zhaohuabing@gmail.com> Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> * fix: controller cache-sync readiness check (#7430) Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> * fix: replace context.TODO with timeout context in config dump (#8122) * fix: replace context.TODO with timeout context in config dump Uses context.WithTimeout instead of context.TODO() to enable proper cancellation and prevent indefinite hangs when Kubernetes API is slow or unavailable. Fixes #8121 Signed-off-by: jaffar <keikei.jaffar@mail.utoronto.ca> * Make config dump timeout configurable with 30s default - Add Timeout field to ConfigDump struct - Add DefaultConfigDumpTimeout constant (30s) - Add getTimeout() helper that returns configured timeout or default - Update Collect() to use cd.getTimeout() instead of hardcoded value Signed-off-by: jaffar <keikei.jaffar@mail.utoronto.ca> Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> * refactor: convert IR map fields to slices to ensure deterministic Dee… (#7953) * refactor: convert IR map fields to slices to ensure deterministic DeepEqual Addresses issue #7852. Signed-off-by: Junnygram <junnexclusive@gmail.com> Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> * fix links in releasing and develop docs (#8141) * fix links in releasing and develop docs Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> * update quickstart link Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> --------- Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> * docs: add provider guide for entra (#7977) * docs: add provider guide for entra Signed-off-by: Oliver Bähler <oliverbaehler@hotmail.com> Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> * chore: clean up test output files (#8154) clean up test output files Signed-off-by: Huabing (Robin) Zhao <zhaohuabing@gmail.com> Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> * fix: TCPRoute mTLS didn't work (#8152) * fix: remove auto HTTP config on TCP cluster Signed-off-by: zirain <zirain2009@gmail.com> * fix lint Signed-off-by: zirain <zirain2009@gmail.com> * add e2e Signed-off-by: zirain <zirain2009@gmail.com> * fix e2e Signed-off-by: zirain <zirain2009@gmail.com> * fix comment Signed-off-by: zirain <zirain2009@gmail.com> * fix Signed-off-by: zirain <zirain2009@gmail.com> * fix resource name Signed-off-by: zirain <zirain2009@gmail.com> * address Arko's comment Signed-off-by: zirain <zirain2009@gmail.com> --------- Signed-off-by: zirain <zirain2009@gmail.com> Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> * v1.7.0-rc2 release notes (#8163) * v1.7.0-rc2 release notes Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> * fix the date Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> --------- Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> --------- Signed-off-by: zirain <zirain2009@gmail.com> Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> Signed-off-by: Adrian Cole <adrian@tetrate.io> Signed-off-by: Huabing (Robin) Zhao <zhaohuabing@gmail.com> Signed-off-by: Dylan M. Taylor <dylan@dylanmtaylor.com> Signed-off-by: Thierry Wandja <thierry.wandja@mirakl.com> Signed-off-by: Guy Daich <guy.daich@sap.com> Signed-off-by: Sadmi Bouhafs <sadmibouhafs@gmail.com> Signed-off-by: Matt Miller <millermatt@outlook.com> Signed-off-by: jaffar <keikei.jaffar@mail.utoronto.ca> Signed-off-by: Junnygram <junnexclusive@gmail.com> Signed-off-by: Oliver Bähler <oliverbaehler@hotmail.com> Co-authored-by: zirain <zirain2009@gmail.com> Co-authored-by: Adrian Cole <64215+codefromthecrypt@users.noreply.github.com> Co-authored-by: Huabing (Robin) Zhao <zhaohuabing@gmail.com> Co-authored-by: Dylan M. Taylor <dylan@dylanmtaylor.com> Co-authored-by: Thierry Wandja <thierry.wandja@mirakl.com> Co-authored-by: Guy Daich <guy.daich@sap.com> Co-authored-by: Sadmi Bouhafs <sadmibouhafs@gmail.com> Co-authored-by: Matt Miller <millermatt@outlook.com> Co-authored-by: Isaac Wilson <10012479+jukie@users.noreply.github.com> Co-authored-by: jaffar keikei <keikei.jaffar@mail.utoronto.ca> Co-authored-by: Olaleye <90139191+Junnygram@users.noreply.github.com> Co-authored-by: Oliver Bähler <oliverbaehler@hotmail.com>

envoyproxy#7953) * refactor: convert IR map fields to slices to ensure deterministic DeepEqual Addresses issue envoyproxy#7852. Signed-off-by: Junnygram <junnexclusive@gmail.com>

fix: make IR map comparison deterministic in runner tests

49646f0

Signed-off-by: Aditya7880900936 <adityasanskarsrivastav788@gmail.com>

Aditya7880900936 requested a review from a team as a code owner December 31, 2025 11:32

test(message): add coverage for IR map sorting helpers

60054cc

Signed-off-by: Aditya7880900936 <adityasanskarsrivastav788@gmail.com>

Aditya7880900936 force-pushed the fix-ir-map-to-slice branch from 1598a08 to 60054cc Compare December 31, 2025 11:59

rudrakhp reviewed Dec 31, 2025

View reviewed changes

internal/gatewayapi/runner/runner_test.go Show resolved Hide resolved

cnvergence reviewed Dec 31, 2025

View reviewed changes

internal/message/types_test.go Show resolved Hide resolved

test(message): validate deterministic ordering of sorted IR helpers

866ce0b

Signed-off-by: Aditya7880900936 <adityasanskarsrivastav788@gmail.com>

Merge branch 'main' into fix-ir-map-to-slice

ff30b86

Merge branch 'main' into fix-ir-map-to-slice

ac8834d

Signed-off-by: Aditya Sanskar Srivastav <161202916+Aditya7880900936@users.noreply.github.com>

Junnygram mentioned this pull request Jan 14, 2026

refactor: convert IR map fields to slices to ensure deterministic Dee… #7953

Merged

Junnygram added a commit to Junnygram/gateway that referenced this pull request Jan 14, 2026

refactor: convert IR map fields to slices to ensure deterministic Dee…

e53faad

…pEqual Addresses issue envoyproxy#7852. Signed-off-by: Junnygram <junnexclusive@gmail.com>

arkodg closed this Jan 17, 2026

Aditya7880900936 deleted the fix-ir-map-to-slice branch January 24, 2026 13:43

Junnygram added a commit to Junnygram/gateway that referenced this pull request Jan 25, 2026

refactor: convert IR map fields to slices to ensure deterministic Dee…

0b82a2e

…pEqual Addresses issue envoyproxy#7852. Signed-off-by: Junnygram <junnexclusive@gmail.com>

zirain pushed a commit to Junnygram/gateway that referenced this pull request Jan 28, 2026

refactor: convert IR map fields to slices to ensure deterministic Dee…

4229e65

…pEqual Addresses issue envoyproxy#7852. Signed-off-by: Junnygram <junnexclusive@gmail.com>

Junnygram added a commit to Junnygram/gateway that referenced this pull request Jan 30, 2026

refactor: convert IR map fields to slices to ensure deterministic Dee…

1575ce0

…pEqual Addresses issue envoyproxy#7852. Signed-off-by: Junnygram <junnexclusive@gmail.com>

Junnygram added a commit to Junnygram/gateway that referenced this pull request Jan 30, 2026

refactor: convert IR map fields to slices to ensure deterministic Dee…

5b140cf

…pEqual Addresses issue envoyproxy#7852. Signed-off-by: Junnygram <junnexclusive@gmail.com>

zirain pushed a commit to Junnygram/gateway that referenced this pull request Jan 31, 2026

refactor: convert IR map fields to slices to ensure deterministic Dee…

77f0707

…pEqual Addresses issue envoyproxy#7852. Signed-off-by: Junnygram <junnexclusive@gmail.com>

Junnygram added a commit to Junnygram/gateway that referenced this pull request Jan 31, 2026

refactor: convert IR map fields to slices to ensure deterministic Dee…

51c4c56

…pEqual Addresses issue envoyproxy#7852. Signed-off-by: Junnygram <junnexclusive@gmail.com>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: make IR map comparison deterministic in runner tests#7852

fix: make IR map comparison deterministic in runner tests#7852
Aditya7880900936 wants to merge 5 commits intoenvoyproxy:mainfrom
Aditya7880900936:fix-ir-map-to-slice

Aditya7880900936 commented Dec 31, 2025

Uh oh!

codecov bot commented Dec 31, 2025 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

arkodg commented Jan 1, 2026

Uh oh!

Aditya7880900936 commented Jan 2, 2026 •

edited

Loading

Uh oh!

Aditya7880900936 commented Jan 5, 2026

Uh oh!

netlify bot commented Jan 9, 2026 •

edited

Loading

Uh oh!

arkodg commented Jan 11, 2026

Uh oh!

Aditya7880900936 commented Jan 12, 2026

Uh oh!

arkodg commented Jan 17, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

Aditya7880900936 commented Dec 31, 2025

Uh oh!

codecov bot commented Dec 31, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

Uh oh!

arkodg commented Jan 1, 2026

Uh oh!

Aditya7880900936 commented Jan 2, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Aditya7880900936 commented Jan 5, 2026

Uh oh!

netlify bot commented Jan 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ Deploy Preview for cerulean-figolla-1f9435 ready!

Uh oh!

arkodg commented Jan 11, 2026

Uh oh!

Aditya7880900936 commented Jan 12, 2026

Uh oh!

arkodg commented Jan 17, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

codecov bot commented Dec 31, 2025 •

edited

Loading

Aditya7880900936 commented Jan 2, 2026 •

edited

Loading

netlify bot commented Jan 9, 2026 •

edited

Loading