NIFI-16058 - Treat external controller service reference changes in versioned flows as environment-specific#11383
Merged
Merged
Conversation
exceptionfactory
requested changes
Jul 22, 2026
exceptionfactory
left a comment
exceptionfactory
left a comment
Contributor
There was a problem hiding this comment.
Thanks @pvillard31, the general approach looks good. I noted one minor recommendation regarding test assertion comments
Comment on lines
+432
to
+447
| // !accessibleA && accessibleB -> environmental: snapshot points at a service that does not exist locally | ||
| // (e.g. a dev-environment id), local points at an existing ancestor service. | ||
| assertExternalServiceChange(localGroup, flowManager, parentGroupId, propertyName, foreignServiceId, ancestorServiceX, true, | ||
| "Switching from an unavailable external service to a local ancestor service must be treated as environmental"); | ||
|
|
||
| // accessibleA && accessibleB -> NOT environmental: a genuine switch between two services that both exist locally. | ||
| assertExternalServiceChange(localGroup, flowManager, parentGroupId, propertyName, ancestorServiceY, ancestorServiceX, false, | ||
| "Switching between two locally-accessible ancestor services must remain a reported change"); | ||
|
|
||
| // accessibleA && !accessibleB -> NOT environmental: local points at a service that is not an accessible ancestor (e.g. one defined | ||
| // inside the versioned Process Group), so the change must surface. | ||
| assertExternalServiceChange(localGroup, flowManager, parentGroupId, propertyName, ancestorServiceX, internalServiceId, false, | ||
| "Switching to a service that is not an accessible ancestor (e.g. internal to the group) must remain a reported change"); | ||
|
|
||
| // !accessibleA && !accessibleB -> NOT environmental. | ||
| assertExternalServiceChange(localGroup, flowManager, parentGroupId, propertyName, "foreign-1", "foreign-2", false, |
Contributor
There was a problem hiding this comment.
The comments above these assertions are duplicative of the messages and should be removed.
…ersioned flows as environment-specific
exceptionfactory
approved these changes
Jul 23, 2026
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
2 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
NIFI-16058 - Treat external controller service reference changes in versioned flows as environment-specific
NIFI-15697 (PR #11006) fixed a badge/dialog inconsistency for external controller service references via three changes: (1) removed the comparator suppression of external CS reference diffs, (2) added name-based reconciliation of the snapshot, (3) added cache invalidation when an ancestor CS is removed. (3) was the real fix; (1)+(2) changed prior behavior and caused NIFI-16058: external CS references (e.g. a root SSL Context Service) now show as phantom local changes when the service differs by id, and name-based reconciliation can't help when the name differs across envs.
This keeps (3) and restores environment-specific treatment of external CS references, but in the flow-difference filter (
FlowDifferenceFilters.isEnvironmentalChange) rather than the framework-agnostic comparator: a CS-reference change is environmental when the snapshot value isn't a locally-accessible ancestor service while the local value is. The filter runs on both the state and "Show Local Changes" paths, so they agree by construction. Name-based reconciliation is removed;StandardFlowComparatoris unchanged.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