NIFI-1358 Enable expression language support for AWS processor SECRET_KEY and ACCESS_KEY properties
Signed-off-by: Aldrin Piri <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/7d73ae77 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/7d73ae77 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/7d73ae77 Branch: refs/heads/NIFI-259 Commit: 7d73ae77f824f8c0860f6c31818813d978a6f155 Parents: bc75dd3 Author: Jeremy Dyer <[email protected]> Authored: Thu Jan 21 00:28:42 2016 -0800 Committer: Aldrin Piri <[email protected]> Committed: Thu Jan 21 00:28:42 2016 -0800 ---------------------------------------------------------------------- .../org/apache/nifi/processors/aws/AbstractAWSProcessor.java | 8 ++++---- .../service/AWSCredentialsProviderControllerService.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/7d73ae77/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/AbstractAWSProcessor.java ---------------------------------------------------------------------- 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 46771e6..398a39f 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 @@ -79,14 +79,14 @@ public abstract class AbstractAWSProcessor<ClientType extends AmazonWebServiceCl .build(); public static final PropertyDescriptor ACCESS_KEY = new PropertyDescriptor.Builder() .name("Access Key") - .expressionLanguageSupported(false) + .expressionLanguageSupported(true) .required(false) .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) .sensitive(true) .build(); public static final PropertyDescriptor SECRET_KEY = new PropertyDescriptor.Builder() .name("Secret Key") - .expressionLanguageSupported(false) + .expressionLanguageSupported(true) .required(false) .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) .sensitive(true) @@ -234,8 +234,8 @@ public abstract class AbstractAWSProcessor<ClientType extends AmazonWebServiceCl } protected AWSCredentials getCredentials(final ProcessContext context) { - final String accessKey = context.getProperty(ACCESS_KEY).getValue(); - final String secretKey = context.getProperty(SECRET_KEY).getValue(); + final String accessKey = context.getProperty(ACCESS_KEY).evaluateAttributeExpressions().getValue(); + final String secretKey = context.getProperty(SECRET_KEY).evaluateAttributeExpressions().getValue(); final String credentialsFile = context.getProperty(CREDENTIALS_FILE).getValue(); http://git-wip-us.apache.org/repos/asf/nifi/blob/7d73ae77/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 ce7e04b..ecc64e2 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 @@ -149,8 +149,8 @@ public class AWSCredentialsProviderControllerService extends AbstractControllerS @OnEnabled public void onConfigured(final ConfigurationContext context) throws InitializationException { - final String accessKey = context.getProperty(ACCESS_KEY).getValue(); - final String secretKey = context.getProperty(SECRET_KEY).getValue(); + final String accessKey = context.getProperty(ACCESS_KEY).evaluateAttributeExpressions().getValue(); + final String secretKey = context.getProperty(SECRET_KEY).evaluateAttributeExpressions().getValue(); final String assumeRoleArn = context.getProperty(ASSUME_ROLE_ARN).getValue(); final Integer maxSessionTime = context.getProperty(MAX_SESSION_TIME).asInteger(); final String assumeRoleName = context.getProperty(ASSUME_ROLE_NAME).getValue();
