[JENKINS-37684] proxy configuration is supported

jenkinsci · Aug 26, 2016 · 834e011 · 834e011
1 parent 3beda06
commit 834e011
Showing 1 changed file with 24 additions and 2 deletions.
diff --git a/src/main/java/com/xti/jenkins/plugin/awslambda/util/LambdaClientConfig.java b/src/main/java/com/xti/jenkins/plugin/awslambda/util/LambdaClientConfig.java
@@ -1,10 +1,13 @@
 package com.xti.jenkins.plugin.awslambda.util;
 
+import com.amazonaws.ClientConfiguration;
 import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.auth.DefaultAWSCredentialsProviderChain;
 import com.amazonaws.regions.Region;
 import com.amazonaws.regions.Regions;
 import com.amazonaws.services.lambda.AWSLambdaClient;
+import hudson.ProxyConfiguration;
+import jenkins.model.Jenkins;
 
 import java.io.Serializable;
 
@@ -28,11 +31,30 @@ public LambdaClientConfig(String accessKeyId, String secretKey, String region) {
 
     public AWSLambdaClient getClient() {
         if(useDefaultAWSCredentials){
-            return new AWSLambdaClient(new DefaultAWSCredentialsProviderChain())
+            return new AWSLambdaClient(new DefaultAWSCredentialsProviderChain(), getClientConfiguration())
                     .withRegion(Region.getRegion(Regions.fromName(region)));
         } else {
-            return new AWSLambdaClient(new BasicAWSCredentials(accessKeyId, secretKey))
+            return new AWSLambdaClient(new BasicAWSCredentials(accessKeyId, secretKey), getClientConfiguration())
                     .withRegion(Region.getRegion(Regions.fromName(region)));
         }
     }
+
+    private ClientConfiguration getClientConfiguration() {
+        ClientConfiguration config = new ClientConfiguration();
+        Jenkins instance = Jenkins.getInstance();
+
+        if (instance != null) {
+            ProxyConfiguration proxy = instance.proxy;
+
+            if (proxy != null) {
+                config.setProxyHost(proxy.name);
+                config.setProxyPort(proxy.port);
+                if (proxy.getUserName() != null) {
+                    config.setProxyUsername(proxy.getUserName());
+                    config.setProxyPassword(proxy.getPassword());
+                }
+            }
+        }
+        return config;
+    }
 }