commit 32c7d856c8fd591ce85fff21c47ec7dec0a12a63
author Lehel Boér <Lehel44@hotmail.com> Thu Oct 14 16:46:15 2021 +0200
committer GitHub <noreply@github.com> Thu Oct 14 10:46:15 2021 -0400
tree 190c7c90b5908594657ea045fef3a511ca5e2af5
parent 507a8f5bc3ca8ad05b08c43c278ca407220a3cd6

NIFI-9300: Fix AWSCredentialsService EL attribute evaluation. (#5456)

nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/credentials/provider/service/AWSCredentialsProviderControllerService.java

diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/credentials/provider/service/AWSCredentialsProviderControllerService.java b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/credentials/provider/service/AWSCredentialsProviderControllerService.java
index fcb9dc7..1323f9c 100644
--- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/credentials/provider/service/AWSCredentialsProviderControllerService.java
+++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/credentials/provider/service/AWSCredentialsProviderControllerService.java
@@ -19,6 +19,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -33,7 +34,6 @@
 import org.apache.nifi.processor.exception.ProcessException;
 import org.apache.nifi.processors.aws.credentials.provider.factory.CredentialPropertyDescriptors;
 import org.apache.nifi.processors.aws.credentials.provider.factory.CredentialsProviderFactory;
-import org.apache.nifi.reporting.InitializationException;
 
 import com.amazonaws.auth.AWSCredentialsProvider;
 
@@ -99,21 +99,19 @@
 
     @Override
     protected Collection<ValidationResult> customValidate(final ValidationContext validationContext) {
-        final Collection<ValidationResult> validationFailureResults =
-                credentialsProviderFactory.validate(validationContext);
-        return validationFailureResults;
+        return credentialsProviderFactory.validate(validationContext);
     }
 
     @OnEnabled
-    public void onConfigured(final ConfigurationContext context) throws InitializationException {
-        final Map<PropertyDescriptor, String> properties = context.getProperties();
-        properties.keySet().forEach(propertyDescriptor -> {
+    public void onConfigured(final ConfigurationContext context) {
+        final Map<PropertyDescriptor, String> evaluatedProperties = new HashMap<>(context.getProperties());
+        evaluatedProperties.keySet().forEach(propertyDescriptor -> {
             if (propertyDescriptor.isExpressionLanguageSupported()) {
-                properties.put(propertyDescriptor,
+                evaluatedProperties.put(propertyDescriptor,
                         context.getProperty(propertyDescriptor).evaluateAttributeExpressions().getValue());
             }
         });
-        credentialsProvider = credentialsProviderFactory.getCredentialsProvider(properties);
+        credentialsProvider = credentialsProviderFactory.getCredentialsProvider(evaluatedProperties);
         getLogger().debug("Using credentials provider: " + credentialsProvider.getClass());
     }