fixes for new proxy work

Author: ottobackwards

nifi-nar-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/AbstractAWSProcessor.java

@@ -190,6 +190,14 @@ protected Collection<ValidationResult> customValidate(final ValidationContext va
 
         final boolean proxyHostSet = validationContext.getProperty(PROXY_HOST).isSet();
         final boolean proxyHostPortSet = validationContext.getProperty(PROXY_HOST_PORT).isSet();
+
+        final boolean proxyUserSet = validationContext.getProperty(PROXY_USERNAME).isSet();
+        final boolean proxyPwdSet = validationContext.getProperty(PROXY_PASSWORD).isSet();
+
+        if ((proxyUserSet && !proxyPwdSet) || (!proxyUserSet && proxyPwdSet)) {
+            problems.add(new ValidationResult.Builder().subject("Proxy User and Password").valid(false).explanation("If Proxy Username or Proxy Password is set, both must be set").build());
+        }
+
         if ( ((!proxyHostSet) && proxyHostPortSet) || (proxyHostSet && (!proxyHostPortSet)) ) {
             problems.add(new ValidationResult.Builder().input("Proxy Host Port").valid(false).explanation("Both proxy host and port must be set").build());
         }

nifi-nar-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/wag/AbstractAWSGatewayApiProcessor.java

@@ -117,7 +117,8 @@ public AbstractAWSGatewayApiProcessor(AmazonHttpClient client) {
                 "HTTP request method (GET, POST, PUT, PATCH, DELETE, HEAD, OPTIONS)."
                     + "Methods other than POST, PUT and PATCH will be sent without a message body.")
             .required(true)
-            .defaultValue("GET").expressionLanguageSupported(true)
+            .defaultValue("GET")
+            .expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
             .addValidator(StandardValidators
                     .createAttributeExpressionLanguageValidator(AttributeExpression.ResultType.STRING))
             .build();
@@ -127,7 +128,7 @@ public AbstractAWSGatewayApiProcessor(AmazonHttpClient client) {
             .displayName("Amazon Gateway Api Key")
             .description("The API Key")
             .required(false)
-            .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
+            .expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
             .sensitive(true)
             .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
             .build();
@@ -163,7 +164,8 @@ public AbstractAWSGatewayApiProcessor(AmazonHttpClient client) {
             .description(
                 "The query parameters for this request in the form of Name=Value separated by &")
             .displayName("Query Parameters")
-            .required(false).expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
+            .required(false)
+            .expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
             .addValidator(StandardValidators
                     .createAttributeExpressionLanguageValidator(AttributeExpression.ResultType.STRING))
             .build();
@@ -187,7 +189,8 @@ public AbstractAWSGatewayApiProcessor(AmazonHttpClient client) {
                 "If set, the response body received back will be put into an attribute of the original FlowFile instead of a separate "
                     + "FlowFile. The attribute key to put to is determined by evaluating value of this property. ")
             .addValidator(StandardValidators.createAttributeExpressionLanguageValidator(
-                AttributeExpression.ResultType.STRING)).expressionLanguageSupported(true)
+                AttributeExpression.ResultType.STRING))
+            .expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
             .build();
 
     public static final PropertyDescriptor PROP_OUTPUT_RESPONSE_REGARDLESS = new PropertyDescriptor.Builder()
@@ -212,23 +215,6 @@ public AbstractAWSGatewayApiProcessor(AmazonHttpClient client) {
             .allowableValues("true", "false")
             .build();
 
-    //  THIS SHOULD BE IN BASE
-    //  Should remove when https://github.com/apache/nifi/pull/2016 hits
-    public static final PropertyDescriptor PROP_PROXY_USER = new PropertyDescriptor.Builder()
-            .name("aws-proxy-user")
-            .displayName("Proxy Username")
-            .description("Username to set when authenticating against proxy").required(false)
-            .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
-            .build();
-
-    public static final PropertyDescriptor PROP_PROXY_PASSWORD = new PropertyDescriptor.Builder()
-            .name("aws-proxy-password")
-            .displayName("Proxy Password")
-            .description("Password to set when authenticating against proxy")
-            .required(false)
-            .sensitive(true).addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
-            .build();
-
     public static final PropertyDescriptor PROP_PUT_ATTRIBUTE_MAX_LENGTH = new PropertyDescriptor.Builder()
             .name("aws-gateway-max-attribute-length")
             .displayName("Max Length To Put In Attribute")
@@ -335,37 +321,15 @@ public void onPropertyModified(final PropertyDescriptor descriptor, final String
     protected Collection<ValidationResult> customValidate(
         final ValidationContext validationContext) {
         final List<ValidationResult> results = new ArrayList<>(3);
-        final boolean proxyHostSet = validationContext.getProperty(PROXY_HOST).isSet();
-        final boolean proxyPortSet = validationContext.getProperty(PROXY_HOST_PORT).isSet();
+        results.addAll(super.customValidate(validationContext));
         final boolean querySet = validationContext.getProperty(PROP_QUERY_PARAMS).isSet();
 
-        if ((proxyHostSet && !proxyPortSet) || (!proxyHostSet && proxyPortSet)) {
-            results.add(new ValidationResult.Builder().subject("Proxy Host and Port").valid(false)
-                                                      .explanation(
-                                                          "If Proxy Host or Proxy Port is set, both must be set")
-                                                      .build());
-        }
-
-        final boolean proxyUserSet = validationContext.getProperty(PROP_PROXY_USER).isSet();
-        final boolean proxyPwdSet = validationContext.getProperty(PROP_PROXY_PASSWORD).isSet();
-
-        if ((proxyUserSet && !proxyPwdSet) || (!proxyUserSet && proxyPwdSet)) {
-            results.add(
-                new ValidationResult.Builder().subject("Proxy User and Password").valid(false)
-                                              .explanation(
-                                                  "If Proxy Username or Proxy Password is set, both must be set")
-                                              .build());
-        }
-        if (proxyUserSet && !proxyHostSet) {
-            results.add(new ValidationResult.Builder().subject("Proxy").valid(false).explanation(
-                "If Proxy username is set, proxy host must be set").build());
-        }
-
         if (querySet) {
             String input = validationContext.getProperty(PROP_QUERY_PARAMS).getValue();
             // if we have expressions, we don't do further validation
             if (!(validationContext.isExpressionLanguageSupported(PROP_QUERY_PARAMS.getName())
                 && validationContext.isExpressionLanguagePresent(input))) {
+
                 try {
                     final String evaluatedInput = validationContext.newPropertyValue(input)
                                                                    .evaluateAttributeExpressions()
@@ -388,12 +352,17 @@ protected Collection<ValidationResult> customValidate(
         }
         String method = trimToEmpty(validationContext.getProperty(PROP_METHOD).getValue())
             .toUpperCase();
-        try {
-            HttpMethodName methodName = HttpMethodName.fromValue(method);
-        } catch (IllegalArgumentException e) {
-            results.add(new ValidationResult.Builder().subject(PROP_METHOD.getName()).input(method)
-                                                      .explanation("Unsupported METHOD")
-                                                      .valid(false).build());
+
+        // if there are expressions do not validate
+        if (!(validationContext.isExpressionLanguageSupported(PROP_METHOD.getName())
+                && validationContext.isExpressionLanguagePresent(method))) {
+            try {
+                HttpMethodName methodName = HttpMethodName.fromValue(method);
+            } catch (IllegalArgumentException e) {
+                results.add(new ValidationResult.Builder().subject(PROP_METHOD.getName()).input(method)
+                        .explanation("Unsupported METHOD")
+                        .valid(false).build());
+            }
         }
 
         return results;
@@ -404,24 +373,13 @@ protected GenericApiGatewayClient createClient(ProcessContext context,
                                                    AWSCredentialsProvider awsCredentialsProvider,
                                                    ClientConfiguration clientConfiguration) {
 
-        // although the base builds the configuration with support for host and port,
-        // check for name and password
-        if (context.getProperty(PROP_PROXY_USER).isSet()) {
-            String proxyUser = context.getProperty(PROP_PROXY_USER).evaluateAttributeExpressions()
-                                      .getValue();
-            clientConfiguration.setProxyUsername(proxyUser);
-            String proxyPassword = context.getProperty(PROP_PROXY_PASSWORD)
-                                          .evaluateAttributeExpressions().getValue();
-            clientConfiguration.setProxyPassword(proxyPassword);
-        }
-
         GenericApiGatewayClientBuilder builder = new GenericApiGatewayClientBuilder()
             .withCredentials(awsCredentialsProvider).withClientConfiguration(clientConfiguration)
             .withEndpoint(context.getProperty(PROP_AWS_GATEWAY_API_ENDPOINT).getValue()).withRegion(
                 Region.getRegion(
                     Regions.fromName(context.getProperty(PROP_AWS_GATEWAY_API_REGION).getValue())));
         if (context.getProperty(PROP_AWS_API_KEY).isSet()) {
-            builder = builder.withApiKey(context.getProperty(PROP_AWS_API_KEY).getValue());
+            builder = builder.withApiKey(context.getProperty(PROP_AWS_API_KEY).evaluateAttributeExpressions().getValue());
         }
         if (providedClient != null) {
             builder = builder.withHttpClient(providedClient);

nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/wag/InvokeAWSGatewayApi.java

@@ -74,6 +74,7 @@ public class InvokeAWSGatewayApi extends AbstractAWSGatewayApiProcessor {
 
     public static final List<PropertyDescriptor> properties = Collections.unmodifiableList(Arrays
             .asList(
+                    PROP_METHOD,
                     PROP_AWS_GATEWAY_API_REGION,
                     ACCESS_KEY,
                     SECRET_KEY,
@@ -91,12 +92,12 @@ public class InvokeAWSGatewayApi extends AbstractAWSGatewayApiProcessor {
                     PROP_PENALIZE_NO_RETRY,
                     PROXY_HOST,
                     PROXY_HOST_PORT,
-                    PROP_METHOD,
-                    PROP_PROXY_USER,
-                    PROP_PROXY_PASSWORD,
+                    PROXY_USERNAME,
+                    PROXY_PASSWORD,
                     PROP_QUERY_PARAMS,
                     PROP_PUT_ATTRIBUTE_MAX_LENGTH,
-                    PROP_ADD_HEADERS_TO_REQUEST));
+                    PROP_ADD_HEADERS_TO_REQUEST,
+                    PROXY_CONFIGURATION_SERVICE));
 
 
     public static final Relationship REL_SUCCESS_REQ = new Relationship.Builder()

nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/wag/TestInvokeAWSGatewayApiCommon.java

@@ -1307,15 +1307,15 @@ public void testProxy() throws Exception {
         }
         runner.setProperty(InvokeAWSGatewayApi.PROXY_HOST_PORT, "${proxy.port}");
 
-        runner.setProperty(InvokeAWSGatewayApi.PROP_PROXY_USER, "${proxy.username}");
+        runner.setProperty(InvokeAWSGatewayApi.PROXY_USERNAME, "${proxy.username}");
 
         try {
             runner.run();
             Assert.fail();
         } catch (AssertionError e) {
             // Expect assertion error when proxy password isn't set but host is.
         }
-        runner.setProperty(InvokeAWSGatewayApi.PROP_PROXY_PASSWORD, "${proxy.password}");
+        runner.setProperty(InvokeAWSGatewayApi.PROXY_PASSWORD, "${proxy.password}");
 
         createFlowFiles(runner);