From b85c0709ccceadb0d20309b0359991cfe90a0671 Mon Sep 17 00:00:00 2001
From: Tim Reardon <tequalsme@gmail.com>
Date: Tue, 9 May 2017 12:05:46 -0400
Subject: [PATCH] NIFI-3851 Add expression language support to AWS Endpoint
 Override URL property

---
 .../nifi/processors/aws/AbstractAWSProcessor.java      | 10 ++++++----
 .../nifi/processors/aws/s3/AbstractS3Processor.java    |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/AbstractAWSProcessor.java b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/AbstractAWSProcessor.java
index d34447d9860f..8a0d9845b966 100644
--- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/AbstractAWSProcessor.java
+++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/AbstractAWSProcessor.java
@@ -117,6 +117,7 @@ public abstract class AbstractAWSProcessor<ClientType extends AmazonWebServiceCl
             .description("Endpoint URL to use instead of the AWS default including scheme, host, port, and path. " +
                     "The AWS libraries select an endpoint URL based on the AWS region, but this property overrides " +
                     "the selected endpoint URL, allowing use with other S3-compatible endpoints.")
+            .expressionLanguageSupported(true)
             .required(false)
             .addValidator(StandardValidators.URL_VALIDATOR)
             .build();
@@ -220,11 +221,12 @@ protected void initializeRegionAndEndpoint(ProcessContext context) {
 
         // if the endpoint override has been configured, set the endpoint.
         // (per Amazon docs this should only be configured at client creation)
-        final String urlstr = StringUtils.trimToEmpty(context.getProperty(ENDPOINT_OVERRIDE).getValue());
-        if (!urlstr.isEmpty()) {
-            this.client.setEndpoint(urlstr);
+        if (getSupportedPropertyDescriptors().contains(ENDPOINT_OVERRIDE)) {
+            final String urlstr = StringUtils.trimToEmpty(context.getProperty(ENDPOINT_OVERRIDE).evaluateAttributeExpressions().getValue());
+            if (!urlstr.isEmpty()) {
+                this.client.setEndpoint(urlstr);
+            }
         }
-
     }
 
     /**
diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/AbstractS3Processor.java b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/AbstractS3Processor.java
index b96c05e0c7cb..d3725324ae26 100644
--- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/AbstractS3Processor.java
+++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/AbstractS3Processor.java
@@ -143,7 +143,7 @@ protected AmazonS3Client createClient(final ProcessContext context, final AWSCre
 
     private void initalizeEndpointOverride(final ProcessContext context, final AmazonS3Client s3) {
         // if ENDPOINT_OVERRIDE is set, use PathStyleAccess
-        if(StringUtils.trimToEmpty(context.getProperty(ENDPOINT_OVERRIDE).getValue()).isEmpty() == false){
+        if(StringUtils.trimToEmpty(context.getProperty(ENDPOINT_OVERRIDE).evaluateAttributeExpressions().getValue()).isEmpty() == false){
             final S3ClientOptions s3Options = new S3ClientOptions();
             s3Options.setPathStyleAccess(true);
             s3.setS3ClientOptions(s3Options);