Merge pull request #318 from sentryinsurance/FixProxyConfig

[#317] Pass noproxy list to the client
jenkinsci · Jan 24, 2024 · 8ce3134 · 8ce3134
2 parents 35e5a6d + 478e785
commit 8ce3134
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/main/java/com/cloudbees/jenkins/plugins/amazonecs/aws/BaseAWSService.java b/src/main/java/com/cloudbees/jenkins/plugins/amazonecs/aws/BaseAWSService.java
@@ -7,6 +7,7 @@
 import com.amazonaws.retry.RetryPolicy;
 import com.cloudbees.jenkins.plugins.awscredentials.AWSCredentialsHelper;
 import com.cloudbees.jenkins.plugins.awscredentials.AmazonWebServicesCredentials;
+import com.google.common.base.Joiner;
 import hudson.ProxyConfiguration;
 import jenkins.model.Jenkins;
 import org.apache.commons.lang.StringUtils;
@@ -38,6 +39,10 @@ protected ClientConfiguration createClientConfiguration() {
             clientConfiguration.setProxyPort(proxy.port);
             clientConfiguration.setProxyUsername(proxy.getUserName());
             clientConfiguration.setProxyPassword(proxy.getPassword());
+            if (proxy.getNoProxyHost() != null) {
+                String[] noProxyParts = proxy.getNoProxyHost().split("[ \t\n,|]+");
+                clientConfiguration.setNonProxyHosts(Joiner.on(',').join(noProxyParts));
+            }
         }
 
         clientConfiguration.setRetryPolicy(ecsRetryPolicy());