Skip to content

fix(response_at_path): non-greedy application of errors when current_dir wildcarded#8962

Merged
aaronArinder merged 7 commits intodevfrom
aaron/non-greedy-path-application-for-errors
Mar 6, 2026
Merged

fix(response_at_path): non-greedy application of errors when current_dir wildcarded#8962
aaronArinder merged 7 commits intodevfrom
aaron/non-greedy-path-application-for-errors

Conversation

@aaronArinder
Copy link
Copy Markdown
Contributor

@aaronArinder aaronArinder commented Mar 4, 2026


Checklist

Complete the checklist (and note appropriate exceptions) before the PR is marked ready-for-review.

  • PR description explains the motivation for the change and relevant context for reviewing
  • PR description links appropriate GitHub/Jira tickets (creating when necessary)
  • Changeset is included for user-facing changes
  • Changes are compatible1
  • Documentation2 completed
  • Performance impact assessed and acceptable
  • Metrics and logs are added3 and documented
  • Tests added and passing4
    • Unit tests
    • Integration tests
    • Manual tests, as necessary

Exceptions

Note any exceptions here

Notes

Footnotes

  1. It may be appropriate to bring upcoming changes to the attention of other (impacted) groups. Please endeavour to do this before seeking PR approval. The mechanism for doing this will vary considerably, so use your judgement as to how and when to do this.

  2. Configuration is an important part of many changes. Where applicable please try to document configuration examples.

  3. A lot of (if not most) features benefit from built-in observability and debug-level logs. Please read this guidance on metrics best-practices.

  4. Tick whichever testing boxes are applicable. If you are adding Manual Tests, please document the manual testing (extensively) in the Exceptions.

@aaronArinder aaronArinder requested a review from a team as a code owner March 4, 2026 17:36
@github-actions

This comment has been minimized.

@aaronArinder aaronArinder changed the title Aaron/non greedy path application for errors fix(response_at_path): non-greedy application of errors when current_dir wildcarded Mar 4, 2026
@aaronArinder aaronArinder force-pushed the aaron/non-greedy-path-application-for-errors branch 2 times, most recently from 49349a0 to 15cd3d6 Compare March 4, 2026 20:55
@aaronArinder aaronArinder force-pushed the aaron/non-greedy-path-application-for-errors branch from ae78a32 to d675101 Compare March 4, 2026 21:17
@aaronArinder aaronArinder merged commit 04d42e2 into dev Mar 6, 2026
13 checks passed
@aaronArinder aaronArinder deleted the aaron/non-greedy-path-application-for-errors branch March 6, 2026 15:45
@aaronArinder
Copy link
Copy Markdown
Contributor Author

@mergify backport dev-v2.10.x

@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Mar 6, 2026

backport dev-v2.10.x

✅ Backports have been created

Details

Cherry-pick of 04d42e2 has failed:

On branch mergify/bp/dev-v2.10.x/pr-8962
Your branch is up to date with 'origin/dev-v2.10.x'.

You are currently cherry-picking commit 04d42e2e.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   .changesets/fix_aaron_non_greedy_path_application_for_errors.md
	modified:   apollo-router/src/query_planner/fetch.rs
	modified:   apollo-router/src/services/execution/service.rs
	modified:   apollo-router/src/services/supergraph/snapshots/apollo_router__services__supergraph__tests__deferred_fragment_bounds_nullability-2.snap
	modified:   apollo-router/tests/integration/query_planner/snapshots/integration_tests__integration__query_planner__error_paths__multi_level_response_failure.snap
	modified:   apollo-router/tests/integration/query_planner/snapshots/integration_tests__integration__query_planner__error_paths__nested_response_failure_404.snap
	modified:   apollo-router/tests/integration/query_planner/snapshots/integration_tests__integration__query_planner__error_paths__nested_response_failure_malformed.snap
	modified:   apollo-router/tests/integration/query_planner/snapshots/integration_tests__integration__query_planner__error_paths__second_level_response_failure_empty_path.snap
	modified:   apollo-router/tests/integration/query_planner/snapshots/integration_tests__integration__query_planner__error_paths__second_level_response_failure_malformed.snap
	modified:   apollo-router/tests/integration/snapshots/integration_tests__integration__coprocessor__on_graphql_error_selector__nested_response_failure.snap

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   apollo-router/tests/integration/snapshots/integration_tests__integration__demand_control__requests_exceeding_one_subgraph_cost_are_accepted@federated_ships_required.snap

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

aaronArinder added a commit that referenced this pull request Mar 6, 2026
…dir wildcarded (#8962)

(cherry picked from commit 04d42e2)

# Conflicts:
#	apollo-router/tests/integration/snapshots/integration_tests__integration__demand_control__requests_exceeding_one_subgraph_cost_are_accepted@federated_ships_required.snap
aaronArinder added a commit that referenced this pull request Mar 6, 2026
…dir wildcarded (#8962)

(cherry picked from commit 04d42e2)

# Conflicts:
#	apollo-router/tests/integration/snapshots/integration_tests__integration__demand_control__requests_exceeding_one_subgraph_cost_are_accepted@federated_ships_required.snap
aaronArinder added a commit that referenced this pull request Mar 6, 2026
}

fn dummy_field_type() -> FieldType {
FieldType(schema::Type::Named(Name::new_unchecked("String")))
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Bit late but you can use the ty!() macro to do this with compile-time validation:

Suggested change
FieldType(schema::Type::Named(Name::new_unchecked("String")))
FieldType(apollo_compiler::ty!(String))

smyrick pushed a commit that referenced this pull request Mar 17, 2026
smyrick pushed a commit that referenced this pull request Mar 20, 2026
@abernix abernix mentioned this pull request Mar 31, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants