Skip to content

NIFI-16058 - Treat external controller service reference changes in versioned flows as environment-specific#11383

Open
pvillard31 wants to merge 1 commit into
apache:mainfrom
pvillard31:NIFI-16058
Open

NIFI-16058 - Treat external controller service reference changes in versioned flows as environment-specific#11383
pvillard31 wants to merge 1 commit into
apache:mainfrom
pvillard31:NIFI-16058

Conversation

@pvillard31

Copy link
Copy Markdown
Contributor

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; StandardFlowComparator is unchanged.

Tracking

Please complete the following tracking steps prior to pull request creation.

Issue Tracking

Pull Request Tracking

  • Pull Request title starts with Apache NiFi Jira issue number, such as NIFI-00000
  • Pull Request commit message starts with Apache NiFi Jira issue number, as such NIFI-00000
  • Pull request contains commits signed with a registered key indicating Verified status

Pull Request Formatting

  • Pull Request based on current revision of the main branch
  • Pull Request refers to a feature branch with one commit containing changes

Verification

Please indicate the verification steps performed prior to pull request creation.

Build

  • Build completed using ./mvnw clean install -P contrib-check
    • JDK 21
    • JDK 25

Licensing

  • New dependencies are compatible with the Apache License 2.0 according to the License Policy
  • New dependencies are documented in applicable LICENSE and NOTICE files

Documentation

  • Documentation formatting appears as expected in rendered files

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.

1 participant