Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NIFI-11213 Showing version change in older (pre 1.18.0) contained version flows properly #7017

Merged
merged 1 commit into from
Mar 20, 2023

Conversation

simonbence
Copy link
Contributor

@simonbence simonbence commented Mar 6, 2023

Summary

Contained versioned flows using registryUri to localize flows vere not handled properly when checking for local changes in the flow. This PR aims to solve this issue.

NIFI-11213

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 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 mvn clean install -P contrib-check
    • JDK 11
    • JDK 17

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

Comment on lines +200 to +201
return !FlowDifferenceUtil.areRegistryStrictlyEqual(coordinatesA, coordinatesB)
&& FlowDifferenceUtil.areRegistryUrlsEqual(coordinatesA, coordinatesB)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this logic is accurate. We're saying here "If the registry URLs are different but logically the same" - and the version is the same. Shouldn't the !FlowDifferenceUtil.areRegistryStrictlyEqual(coordinatesA, coordinatesB) be removed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My first approach and assumption was that, but with that, test TestFlowDifferenceFilter#testFilterIgnorableVersionCoordinateDifferenceWithNonIgnorableDifferencehas broken and after careful check, it turned out this distinction in the original code is deliberate. Our considerations might changed since but removing that would bring in a potential regression

@markap14 markap14 merged commit 7954ff3 into apache:main Mar 20, 2023
@markap14
Copy link
Contributor

Thanks @simonbence +1 merged to main.

asfgit pushed a commit that referenced this pull request Mar 20, 2023
r-vandenbos pushed a commit to r-vandenbos/nifi that referenced this pull request Apr 11, 2023
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.

2 participants