fix(gateway): align land strategy mapping with contract - #663
Open
sbalabanov wants to merge 1 commit into
Open
Conversation
|
|
sbalabanov
commented
Sep 2, 2026
| case mergestrategypb.Strategy_DEFAULT: | ||
| // TODO: resolve default strategy based on queue configuration | ||
| return mergestrategy.MergeStrategyRebase, nil | ||
| return mergestrategy.MergeStrategyUnknown, nil |
Contributor
Author
There was a problem hiding this comment.
do not change that, restore Rebase and TODO
Contributor
Author
There was a problem hiding this comment.
Restored the existing DEFAULT-to-Rebase behavior and TODO in 7ec7230; PROMOTE remains the only mapping change.
This preserves the current queue default behavior while adding support for the explicit PROMOTE contract value. The mapper test now covers PROMOTE without changing DEFAULT semantics.
[addressed by agent]
Summary: Support the PROMOTE strategy in the gateway land request mapper while preserving the existing DEFAULT-to-rebase behavior. Intent: - Handle every explicit merge strategy exposed by the shared API contract. - Keep the current default strategy behavior until queue configuration resolves it. Changes: - Map PROMOTE to MergeStrategyPromote. - Add mapper coverage for PROMOTE. Test Plan: - ./tool/bazel test //service/submitqueue/gateway/server/mapper:go_default_test --test_output=errors Revert Plan: - Revert this commit. Issues: - None.
sbalabanov
force-pushed
the
sergeyb/fix-gateway-land-strategy
branch
from
September 2, 2026 20:38
fbb81d1 to
7ec7230
Compare
sbalabanov
marked this pull request as ready for review
September 2, 2026 20:39
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Intent:
Changes:
Generated by the 🪄 pr-create skill.
Test Plan
Issues