(nifi) branch main updated: NIFI-13840 Fixed proxy setup in AWS v2 components

[pvillard]

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

pvillard pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/main by this push:
     new 17c8a6bed8 NIFI-13840 Fixed proxy setup in AWS v2 components
17c8a6bed8 is described below

commit 17c8a6bed890dcbbe2c2e94541e4f9d36e155199
Author: Peter Turcsanyi <turcsa...@apache.org>
AuthorDate: Thu Oct 3 23:36:57 2024 +0200

    NIFI-13840 Fixed proxy setup in AWS v2 components
    
    Signed-off-by: Pierre Villard <pierre.villard...@gmail.com>
    
    This closes #9345.
---
 .../org/apache/nifi/processors/aws/v2/AbstractAwsSyncProcessor.java     | 2 +-
 .../provider/factory/strategies/AssumeRoleCredentialsStrategy.java      | 2 +-
 .../org/apache/nifi/aws/schemaregistry/AmazonGlueSchemaRegistry.java    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/v2/AbstractAwsSyncProcessor.java
 
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/v2/AbstractAwsSyncProcessor.java
index 0298e671c8..e228bb88ec 100644
--- 
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/v2/AbstractAwsSyncProcessor.java
+++ 
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/v2/AbstractAwsSyncProcessor.java
@@ -91,7 +91,7 @@ public abstract class AbstractAwsSyncProcessor<
             @Override
             public void configureProxy(final ProxyConfiguration 
proxyConfiguration) {
                 final 
software.amazon.awssdk.http.apache.ProxyConfiguration.Builder 
proxyConfigBuilder = 
software.amazon.awssdk.http.apache.ProxyConfiguration.builder()
-                        .endpoint(URI.create(String.format("%s:%s", 
proxyConfiguration.getProxyServerHost(), 
proxyConfiguration.getProxyServerPort())));
+                        .endpoint(URI.create(String.format("http://%s:%s";, 
proxyConfiguration.getProxyServerHost(), 
proxyConfiguration.getProxyServerPort())));
 
                 if (proxyConfiguration.hasCredential()) {
                     
proxyConfigBuilder.username(proxyConfiguration.getProxyUserName());
diff --git 
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/credentials/provider/factory/strategies/AssumeRoleCredentialsStrategy.java
 
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/credentials/provider/factory/strategies/AssumeRoleCredentialsStrategy.java
index 4fa8a76478..e89168eb90 100644
--- 
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/credentials/provider/factory/strategies/AssumeRoleCredentialsStrategy.java
+++ 
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/credentials/provider/factory/strategies/AssumeRoleCredentialsStrategy.java
@@ -228,7 +228,7 @@ public class AssumeRoleCredentialsStrategy extends 
AbstractCredentialsStrategy {
             final String assumeRoleProxyHost = 
propertyContext.getProperty(ASSUME_ROLE_PROXY_HOST).getValue();
             final int assumeRoleProxyPort = 
propertyContext.getProperty(ASSUME_ROLE_PROXY_PORT).asInteger();
             final software.amazon.awssdk.http.apache.ProxyConfiguration 
proxyConfig = software.amazon.awssdk.http.apache.ProxyConfiguration.builder()
-                    .endpoint(URI.create(String.format("%s:%s", 
assumeRoleProxyHost, assumeRoleProxyPort)))
+                    .endpoint(URI.create(String.format("http://%s:%s";, 
assumeRoleProxyHost, assumeRoleProxyPort)))
                     .build();
             httpClientBuilder.proxyConfiguration(proxyConfig);
         }
diff --git 
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-schema-registry-service/src/main/java/org/apache/nifi/aws/schemaregistry/AmazonGlueSchemaRegistry.java
 
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-schema-registry-service/src/main/java/org/apache/nifi/aws/schemaregistry/AmazonGlueSchemaRegistry.java
index 0114abb561..d54c36c5b8 100644
--- 
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-schema-registry-service/src/main/java/org/apache/nifi/aws/schemaregistry/AmazonGlueSchemaRegistry.java
+++ 
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-schema-registry-service/src/main/java/org/apache/nifi/aws/schemaregistry/AmazonGlueSchemaRegistry.java
@@ -242,7 +242,7 @@ public class AmazonGlueSchemaRegistry extends 
AbstractControllerService implemen
 
         if (Proxy.Type.HTTP.equals(proxyConfig.getProxyType())) {
             final 
software.amazon.awssdk.http.apache.ProxyConfiguration.Builder 
proxyConfigBuilder = 
software.amazon.awssdk.http.apache.ProxyConfiguration.builder()
-                    .endpoint(URI.create(String.format("%s:%s", 
proxyConfig.getProxyServerHost(), proxyConfig.getProxyServerPort())));
+                    .endpoint(URI.create(String.format("http://%s:%s";, 
proxyConfig.getProxyServerHost(), proxyConfig.getProxyServerPort())));
 
             if (proxyConfig.hasCredential()) {
                 proxyConfigBuilder.username(proxyConfig.getProxyUserName());