[nifi] 11/22: NIFI-10882 Set credentials for ElasticSearchClientService based on AuthorizationScheme

[joewitt]

This is an automated email from the ASF dual-hosted git repository.

joewitt pushed a commit to branch support/nifi-1.19
in repository https://gitbox.apache.org/repos/asf/nifi.git

commit d5028315592028b91f793ab5d1d48fee2754075b
Author: Chris Sampson <chris.sampso...@gmail.com>
AuthorDate: Mon Nov 28 10:25:19 2022 +0000

    NIFI-10882 Set credentials for ElasticSearchClientService based on 
AuthorizationScheme
    
    This closes #6722
    
    Signed-off-by: David Handermann <exceptionfact...@apache.org>
---
 .../nifi/elasticsearch/ElasticSearchClientServiceImpl.java     | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/main/java/org/apache/nifi/elasticsearch/ElasticSearchClientServiceImpl.java
 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/main/java/org/apache/nifi/elasticsearch/ElasticSearchClientServiceImpl.java
index 4809b85fd2..ca7c2d306f 100644
--- 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/main/java/org/apache/nifi/elasticsearch/ElasticSearchClientServiceImpl.java
+++ 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/main/java/org/apache/nifi/elasticsearch/ElasticSearchClientServiceImpl.java
@@ -249,6 +249,8 @@ public class ElasticSearchClientServiceImpl extends 
AbstractControllerService im
     }
 
     private RestClient setupClient(final ConfigurationContext context) throws 
MalformedURLException, InitializationException {
+        final AuthorizationScheme authorizationScheme = 
AuthorizationScheme.valueOf(context.getProperty(AUTHORIZATION_SCHEME).getValue());
+
         final String hosts = 
context.getProperty(HTTP_HOSTS).evaluateAttributeExpressions().getValue();
         final String[] hostsSplit = hosts.split(",\\s*");
         this.url = hostsSplit[0];
@@ -261,7 +263,7 @@ public class ElasticSearchClientServiceImpl extends 
AbstractControllerService im
         final String apiKey = context.getProperty(API_KEY).getValue();
 
         final Integer connectTimeout = 
context.getProperty(CONNECT_TIMEOUT).asInteger();
-        final Integer readTimeout    = 
context.getProperty(SOCKET_TIMEOUT).asInteger();
+        final Integer socketTimeout = 
context.getProperty(SOCKET_TIMEOUT).asInteger();
 
         final ProxyConfigurationService proxyConfigurationService = 
context.getProperty(PROXY_CONFIGURATION_SERVICE).asControllerService(ProxyConfigurationService.class);
 
@@ -287,11 +289,11 @@ public class ElasticSearchClientServiceImpl extends 
AbstractControllerService im
                     }
 
                     CredentialsProvider credentialsProvider = null;
-                    if (username != null && password != null) {
+                    if (AuthorizationScheme.BASIC == authorizationScheme && 
username != null && password != null) {
                         credentialsProvider = addCredentials(null, 
AuthScope.ANY, username, password);
                     }
 
-                    if (apiKeyId != null && apiKey != null) {
+                    if (AuthorizationScheme.API_KEY == authorizationScheme && 
apiKeyId != null && apiKey != null) {
                         
httpClientBuilder.setDefaultHeaders(Collections.singletonList(createApiKeyAuthorizationHeader(apiKeyId,
 apiKey)));
                     }
 
@@ -313,7 +315,7 @@ public class ElasticSearchClientServiceImpl extends 
AbstractControllerService im
                 })
                 .setRequestConfigCallback(requestConfigBuilder -> {
                     requestConfigBuilder.setConnectTimeout(connectTimeout);
-                    requestConfigBuilder.setSocketTimeout(readTimeout);
+                    requestConfigBuilder.setSocketTimeout(socketTimeout);
                     return requestConfigBuilder;
                 });