NIFI-15525: Ensure that we call onStepConfigured when we restore flow; ensure that we synchronized Parmaeter Providers before Connectors

Author: markap14

nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/components/connector/secrets/ParameterProviderSecretsManager.java

@@ -22,6 +22,8 @@
 import org.apache.nifi.components.validation.ValidationStatus;
 import org.apache.nifi.controller.ParameterProviderNode;
 import org.apache.nifi.controller.flow.FlowManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -35,6 +37,7 @@
 import java.util.stream.Collectors;
 
 public class ParameterProviderSecretsManager implements SecretsManager {
+    private static final Logger logger = LoggerFactory.getLogger(ParameterProviderSecretsManager.class);
     private FlowManager flowManager;
 
     @Override
@@ -61,7 +64,12 @@ public List<Secret> getAllSecrets() {
     public Set<SecretProvider> getSecretProviders() {
         final Set<SecretProvider> providers = new HashSet<>();
         for (final ParameterProviderNode parameterProviderNode : flowManager.getAllParameterProviders()) {
-            if (parameterProviderNode.getValidationStatus() != ValidationStatus.VALID) {
+            ValidationStatus validationStatus = parameterProviderNode.getValidationStatus();
+            if (validationStatus != ValidationStatus.VALID) {
+                validationStatus = parameterProviderNode.performValidation();
+            }
+            if (validationStatus != ValidationStatus.VALID) {
+                logger.debug("Will not use Parameter Provider {} as a Secret Provider because it is not valid", parameterProviderNode.getName());
                 continue;
             }
 
@@ -88,6 +96,10 @@ public Optional<Secret> getSecret(final SecretReference secretReference) {
 
     @Override
     public Map<SecretReference, Secret> getSecrets(final Set<SecretReference> secretReferences) {
+        if (secretReferences.isEmpty()) {
+            return Map.of();
+        }
+
         // Partition secret references by Provider
         final Map<SecretProvider, Set<SecretReference>> referencesByProvider = new HashMap<>();
         for (final SecretReference secretReference : secretReferences) {

nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/components/connector/StandardConnectorNode.java

@@ -195,7 +195,7 @@ public void inheritConfiguration(final List<VersionedConfigurationStep> activeCo
         // Configure the working config but do not apply
         for (final VersionedConfigurationStep step : workingConfig) {
             final StepConfiguration stepConfig = createStepConfiguration(step);
-            setConfiguration(step.getName(), stepConfig);
+            setConfiguration(step.getName(), stepConfig, true);
         }
     }
 
@@ -311,9 +311,13 @@ public void abortUpdate(final Throwable cause) {
 
     @Override
     public void setConfiguration(final String stepName, final StepConfiguration configuration) throws FlowUpdateException {
+        setConfiguration(stepName, configuration, false);
+    }
+
+    private void setConfiguration(final String stepName, final StepConfiguration configuration, final boolean forceOnConfigurationStepConfigured) throws FlowUpdateException {
         // Update properties and check if the configuration changed.
         final ConfigurationUpdateResult updateResult = workingFlowContext.getConfigurationContext().setProperties(stepName, configuration);
-        if (updateResult == ConfigurationUpdateResult.NO_CHANGES) {
+        if (updateResult == ConfigurationUpdateResult.NO_CHANGES && !forceOnConfigurationStepConfigured) {
             return;
         }
 

nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/serialization/VersionedFlowSynchronizer.java

@@ -424,14 +424,15 @@ private void synchronizeFlow(final FlowController controller, final DataFlow exi
                 versionedExternalFlow.setParameterContexts(versionedParameterContextMap);
                 versionedExternalFlow.setFlowContents(versionedFlow.getRootGroup());
 
-                // Inherit Connectors first. Because Connectors are a bit different, in that updates could result in Exceptions being thrown,
+                // Inherit Parameter Providers and Connectors first. Because Connectors are a bit different, in that updates could result in Exceptions being thrown,
                 // due to the fact that they manipulate the flow, and changes can be aborted, we handle them first. This way, if there's any Exception,
                 // we can fail before updating parts of the flow that are not managed by Connectors.
+                // Because Connectors may depend on Parameter Providers, we need to ensure that we inherit Parameter Providers first.
+                inheritParameterProviders(controller, versionedFlow, affectedComponentSet);
                 inheritConnectors(controller, versionedFlow);
 
                 // Inherit controller-level components.
                 inheritControllerServices(controller, versionedFlow, affectedComponentSet);
-                inheritParameterProviders(controller, versionedFlow, affectedComponentSet);
                 inheritParameterContexts(controller, versionedFlow);
                 inheritReportingTasks(controller, versionedFlow, affectedComponentSet);
                 inheritFlowAnalysisRules(controller, versionedFlow, affectedComponentSet);