pvillard31 opened a new pull request, #10342: URL: https://github.com/apache/nifi/pull/10342
# Summary NIFI-15012 - FlowDifferenceFilters - fix handling of createControllerService() In [NIFI-14995](https://issues.apache.org/jira/browse/NIFI-14995), we tried to properly handle the case where a property is added to hold a newly created controller service but the logic was not correct in terms of how migrateProperties is called and the sequence of objects creation. We only looked up the new property through the live `ComponentNode` to confirm it identified a controller service. In the real migration sequence, the property is added to the versioned component before there’s a live node (the component is a freshly imported controller service), so `getComponent(...)` returned `null`, the property was ignored, and the context never saw the controller-service ID. Without that linkage, the corresponding `COMPONENT_ADDED` diff wasn’t marked as environmental, leaving both the property addition and the service creation visible as local changes. We are improving the logic to properly handle this scenario. - Captures the versioned property descriptors and property values from diffs themselves (`getPropertyValue`, `getVersionedPropertyDescriptor`, `isControllerServiceProperty`), so we can recognize when a `PROPERTY_ADDED` points at a controller service even if the live component node is not present. - Tracks controller-service IDs referenced by those new properties (`controllerServicePropertyAddsByValue`) and matches them against the IDs reported in accompanying `COMPONENT_ADDED` diffs, using both instance and versioned identifiers. - Updates the environmental-change context to record just the pairings we can actually confirm (`serviceIdsCreatedForNewProperties`), and reuses that context in `isControllerServiceCreatedForNewProperty`. - Adds unit coverage for the no component node scenario to ensure we don’t regress. # 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 - [ ] JDK 25 ### 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]
