(nifi) branch NIFI-15258 updated: NIFI-15558: Sensitive Parameter References should resolve to value. (#10863)

[markap14]

This is an automated email from the ASF dual-hosted git repository.

markap14 pushed a commit to branch NIFI-15258
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/NIFI-15258 by this push:
     new 073ad66a1c NIFI-15558: Sensitive Parameter References should resolve 
to value. (#10863)
073ad66a1c is described below

commit 073ad66a1c6dc464e374686da62c80c3597f4b44
Author: Bob Paulin <b...@bobpaulin.com>
AuthorDate: Fri Feb 6 08:41:46 2026 -0600

    NIFI-15558: Sensitive Parameter References should resolve to value. (#10863)
---
 .../java/org/apache/nifi/groups/StandardProcessGroup.java  | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git 
a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java
 
b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java
index cb62602085..1373841d4a 100644
--- 
a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java
+++ 
b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java
@@ -3870,16 +3870,22 @@ public final class StandardProcessGroup implements 
ProcessGroup {
         final ComponentScheduler defaultComponentScheduler = new 
DefaultComponentScheduler(controllerServiceProvider, stateLookup);
         final ComponentScheduler retainExistingStateScheduler = new 
RetainExistingStateComponentScheduler(this, defaultComponentScheduler);
 
-        final FlowSynchronizationOptions synchronizationOptions = new 
FlowSynchronizationOptions.Builder()
+        final FlowSynchronizationOptions.Builder flowSynchronizationBuilder = 
new FlowSynchronizationOptions.Builder()
             .componentIdGenerator(idGenerator)
             .componentComparisonIdLookup(VersionedComponent::getIdentifier)
             .componentScheduler(retainExistingStateScheduler)
             .ignoreLocalModifications(!verifyNotDirty)
             .updateDescendantVersionedFlows(updateDescendantVersionedFlows)
             .updateGroupSettings(updateSettings)
-            .updateRpgUrls(false)
-            .propertyDecryptor(value -> null)
-            .build();
+            .updateRpgUrls(false);
+        // Connectors should not have encrypted values copied from versioned 
flow. However we do need to decrypt parameter references.
+        if (getConnectorIdentifier().isPresent()) {
+            flowSynchronizationBuilder.propertyDecryptor(value -> value);
+        } else {
+            flowSynchronizationBuilder.propertyDecryptor(value -> null);
+        }
+
+        final FlowSynchronizationOptions synchronizationOptions = 
flowSynchronizationBuilder.build();
 
         final FlowMappingOptions flowMappingOptions = new 
FlowMappingOptions.Builder()
             .mapSensitiveConfiguration(false)