NIFI-14944 - Fix flow upgrade when CS reference goes from external to scoped controller service #10286
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-14944 - Fix flow upgrade when CS reference goes from external to scoped controller service
Current situation:
Then, when upgrading from v1 to v2, ConvertRecord would still reference the external controller services, which is not expected.
This PR fixes the logic to identify the controller service that should be referenced. A unit test has been added to reproduce the above scenario with versioned flow definitions. I also added another unit test to show that if the processor ConvertRecord is in a nested PG2 process group, then we would still update the referenced controller services to the ones defined in PG1. We basically do a lookup starting in the current process group and then go up to the parent, and so on.
Tracking
Please complete the following tracking steps prior to pull request creation.
Issue Tracking
Pull Request Tracking
NIFI-00000NIFI-00000Pull Request Formatting
mainbranchVerification
Please indicate the verification steps performed prior to pull request creation.
Build
./mvnw clean install -P contrib-checkLicensing
LICENSEandNOTICEfilesDocumentation