Repository navigation
[scd] Create attached subscription after checking for conflicts - #1797
Merged
Merged
Conversation
mickmis
approved these changes
Oct 19, 2026
mickmis
left a comment
mickmis
left a comment
Contributor
There was a problem hiding this comment.
The change in itself LGTM, but this complexifies a bit further the control flow of this function which is already in a bad state. Maybe there is something to be done by factoring away figuring out attachedSub. E.g. extracting a function:
func resolveSubscription(ctx, repo, previousSub, manager, validParams) (attachedSub, upsertAttachedSub, removePreviousImplicitSubscription, error)WDYT? Can be done in follow-up PR if you agree.
MariemBaccari
force-pushed
the
fix_implicit_sub
branch
from
October 20, 2026 09:11
93d14ae to
fefef1f
Compare
Contributor
Author
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
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.
This PR aims to address #1792 by fixing the bug introduced in #1690.
Currently, implicit subscriptions can be persisted despite there being an airspace conflict response. This is due to the fact that these are no longer returned as errors and, therefore, do not trigger a transaction rollback.
This PR fixes this by writing the attached subscription after finishing the conflict checks.