Skip to content

[DISCO-4064] Resolve naming conflict and update suggest options#7322

Merged
misaniwere merged 3 commits intomainfrom
DISCO-4064
Apr 17, 2026
Merged

[DISCO-4064] Resolve naming conflict and update suggest options#7322
misaniwere merged 3 commits intomainfrom
DISCO-4064

Conversation

@misaniwere
Copy link
Copy Markdown
Contributor

[DISCO-4064]

  • Renamed SuggestApiErrorMerinoSuggestApiError to avoid a naming conflict with the existing suggest component, which was breaking the Swift docs CI pipeline.
  • For SuggestOptions, providers and client_variants now expect a list of strings as it's easier for the consumers. These values are joined as comma-separated values when sent to Merino.

Pull Request checklist

  • Breaking changes: This PR follows our breaking change policy
    • This PR follows the breaking change policy:
      • This PR has no breaking API changes, or
      • There are corresponding PRs for our consumer applications that resolve the breaking changes and have been approved
  • Quality: This PR builds and tests run cleanly
    • Note:
      • For changes that need extra cross-platform testing, consider adding [ci full] to the PR title.
      • If this pull request includes a breaking change, consider cutting a new release after merging.
  • Tests: This PR includes thorough tests or an explanation of why it does not
  • Changelog: This PR includes a changelog entry in CHANGELOG.md or an explanation of why it does not need one
    • Any breaking changes to Swift or Kotlin binding APIs are noted explicitly
  • Dependencies: This PR follows our dependency management guidelines
    • Any new dependencies are accompanied by a summary of the due diligence applied in selecting them.

@misaniwere misaniwere requested a review from a team April 16, 2026 17:51
Comment thread components/merino/src/suggest/mod.rs Outdated
Copy link
Copy Markdown
Contributor

@tiftran tiftran left a comment

Choose a reason for hiding this comment

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

lgtm, not sure if you want someone with more rust experience to give you the green light though 😅

@misaniwere misaniwere added this pull request to the merge queue Apr 17, 2026
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Apr 17, 2026
@misaniwere misaniwere added this pull request to the merge queue Apr 17, 2026
@misaniwere misaniwere removed this pull request from the merge queue due to a manual request Apr 17, 2026
@misaniwere misaniwere added this pull request to the merge queue Apr 17, 2026
Merged via the queue into main with commit ed72a63 Apr 17, 2026
14 checks passed
@misaniwere misaniwere deleted the DISCO-4064 branch April 17, 2026 14:02
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.

2 participants