NIFI-15661 - Flow Comparison should not report child components for nested versioned PGs with version-only changes#10955
Open
pvillard31 wants to merge 1 commit intoapache:mainfrom
Open
NIFI-15661 - Flow Comparison should not report child components for nested versioned PGs with version-only changes#10955pvillard31 wants to merge 1 commit intoapache:mainfrom
pvillard31 wants to merge 1 commit intoapache:mainfrom
Conversation
…ested versioned PGs with version-only changes
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.
Summary
NIFI-15661 - Flow Comparison should not report child components for nested versioned PGs with version-only changes
When a separately version-controlled nested Process Group has only its version number changed (same registry, bucket, and flow), the parent's "Show Local Changes" incorrectly reports every individual component inside the child PG as added/removed. This is because the
hasProcessGroupContentscheck in thecompareGroupContentscondition overrides the version-only skip logic, causing a full content comparison even whenshouldCompareVersionedis correctlyfalse.The fix removes the
hasProcessGroupContentscheck from the condition. This is safe because the remaining conditions already cover all cases:!bothGroupsVersionedhandles regular (non-versioned) nested PGs — their contents are always comparedshouldCompareVersionedhandles versioned PGs where registry/bucket/flow coordinates changed, or when DEEP strategy is requestedThe
hasProcessGroupContentsmethod was only needed to fill a gap that doesn't actually exist: when both groups are versioned and only the version number differs, there is no reason to compare contents. The version coordinate change itself is the meaningful difference to report.Tracking
Please complete the following tracking steps prior to pull request creation.
Issue Tracking
Pull Request Tracking
NIFI-00000NIFI-00000VerifiedstatusPull Request Formatting
mainbranchVerification
Please indicate the verification steps performed prior to pull request creation.
Build
./mvnw clean install -P contrib-checkLicensing
LICENSEandNOTICEfilesDocumentation