This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new c41f71fe59 NIFI-13840 Fixed Proxy URL Configuration in AWS v2
components (#9353)
c41f71fe59 is described below
commit c41f71fe59217a7a8d510dd9cbb6667357e81261
Author: Peter Turcsanyi <[email protected]>
AuthorDate: Thu Oct 10 15:09:52 2024 +0200
NIFI-13840 Fixed Proxy URL Configuration in AWS v2 components (#9353)
Signed-off-by: David Handermann <[email protected]>
---
.../java/org/apache/nifi/processors/aws/v2/AbstractAwsProcessor.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-nar-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/v2/AbstractAwsProcessor.java
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/v2/AbstractAwsProcessor.java
index 476acd97f9..af11372aad 100644
---
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/v2/AbstractAwsProcessor.java
+++
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/v2/AbstractAwsProcessor.java
@@ -426,7 +426,7 @@ public abstract class AbstractAwsProcessor<T extends
SdkClient, U extends AwsSyn
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());
diff --git
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/credentials/provider/factory/strategies/AssumeRoleCredentialsStrategy.java
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/credentials/provider/factory/strategies/AssumeRoleCredentialsStrategy.java
index 82fa7022b5..eb6567500d 100644
---
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/credentials/provider/factory/strategies/AssumeRoleCredentialsStrategy.java
+++
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/credentials/provider/factory/strategies/AssumeRoleCredentialsStrategy.java
@@ -231,7 +231,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-nar-bundles/nifi-aws-bundle/nifi-aws-schema-registry-service/src/main/java/org/apache/nifi/aws/schemaregistry/AmazonGlueSchemaRegistry.java
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-schema-registry-service/src/main/java/org/apache/nifi/aws/schemaregistry/AmazonGlueSchemaRegistry.java
index 2769c24117..0075b809c6 100644
---
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-schema-registry-service/src/main/java/org/apache/nifi/aws/schemaregistry/AmazonGlueSchemaRegistry.java
+++
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-schema-registry-service/src/main/java/org/apache/nifi/aws/schemaregistry/AmazonGlueSchemaRegistry.java
@@ -238,7 +238,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());