pvillard31 opened a new pull request, #10286:
URL: https://github.com/apache/nifi/pull/10286

   # Summary
   
   NIFI-14944 - Fix flow upgrade when CS reference goes from external to scoped 
controller service
   
   Current situation:
   
   - Considering a versioned flow PG1 containing GenerateFlowFile -> 
ConvertRecord -> UpdateAttribute.
   - Where, in v1, ConvertRecord references a JSON Reader and JSON Writer 
defined at root level (external controller services in the versioned flow 
definition).
   - Where, in v2, ConvertRecord references newly created JSON Reader and JSON 
Writer defined at PG1 level.
   
   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
   
   - [ ] [Apache NiFi Jira](https://issues.apache.org/jira/browse/NIFI) issue 
created
   
   ### 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 `./mvnw clean install -P contrib-check`
     - [ ] JDK 21
   
   ### Licensing
   
   - [ ] New dependencies are compatible with the [Apache License 
2.0](https://apache.org/licenses/LICENSE-2.0) according to the [License 
Policy](https://www.apache.org/legal/resolved.html)
   - [ ] New dependencies are documented in applicable `LICENSE` and `NOTICE` 
files
   
   ### Documentation
   
   - [ ] Documentation formatting appears as expected in rendered files
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]

Reply via email to