Merge pull request #21 from kylemcmullen/master

support for proxy_uri configuration option

Author: surybala

conf/codedeployagent.yml

@@ -6,3 +6,4 @@
 :root_dir: '/opt/codedeploy-agent/deployment-root'
 :verbose: false
 :wait_between_runs: 1
+:proxy_uri:

lib/instance_agent/config.rb

@@ -31,7 +31,8 @@ def initialize
         :wait_between_runs => 30,
         :wait_after_error => 30,
         :codedeploy_test_profile => 'prod',
-        :on_premises_config_file => '/etc/codedeploy-agent/conf/codedeploy.onpremises.yml'
+        :on_premises_config_file => '/etc/codedeploy-agent/conf/codedeploy.onpremises.yml',
+        :proxy_uri => nil
       })
     end
 

lib/instance_agent/plugins/codedeploy/codedeploy_control.rb

@@ -22,6 +22,11 @@ def initialize(options = {})
               64 * 1024 * 1024),
               :http_wire_trace => true})
           end
+
+          if InstanceAgent::Config.config[:proxy_uri]
+            @options = options.update({
+              :http_proxy => URI(InstanceAgent::Config.config[:proxy_uri]) })
+          end
         end
 
         def validate_ssl_config
@@ -66,6 +71,15 @@ def verify_cert
           client.verify_mode = OpenSSL::SSL::VERIFY_PEER
           client.ca_file = ENV['SSL_CERT_FILE']
 
+          if InstanceAgent::Config.config[:proxy_uri]
+            proxy_uri = URI(InstanceAgent::Config.config[:proxy_uri])
+            client.proxy_from_env = false # make sure proxy settings can be overridden
+            client.proxy_address = proxy_uri.host
+            client.proxy_port = proxy_uri.port
+            client.proxy_user = proxy_uri.user if proxy_uri.user
+            client.proxy_pass = proxy_uri.password if proxy_uri.password 
+          end
+
           client.verify_callback = lambda do |preverify_ok, cert_store|
             return false unless preverify_ok
             @cert = cert_store.chain[0]

lib/instance_agent/plugins/codedeploy/command_executor.rb

@@ -165,6 +165,11 @@ def last_install_file_path(deployment_group)
         def download_from_s3(deployment_spec, bucket, key, version, etag)
           log(:debug, "Downloading artifact bundle from bucket '#{bucket}' and key '#{key}', version '#{version}', etag '#{etag}'")
           region = ENV['AWS_REGION'] || InstanceMetadata.region
+          
+          proxy_uri = nil
+          if InstanceAgent::Config.config[:proxy_uri]
+            proxy_uri = URI(InstanceAgent::Config.config[:proxy_uri])
+          end
 
           if InstanceAgent::Config.config[:log_aws_wire]
             s3 = Aws::S3::Client.new(
@@ -177,12 +182,14 @@ def download_from_s3(deployment_spec, bucket, key, version, etag)
             16,
             64 * 1024 * 1024),
             :http_wire_trace => true,
-            :signature_version => 'v4')
+            :signature_version => 'v4',
+            :http_proxy => proxy_uri)
           else
             s3 = Aws::S3::Client.new(
             :region => region,
             :ssl_ca_directory => ENV['AWS_SSL_CA_DIRECTORY'],
-            :signature_version => 'v4')
+            :signature_version => 'v4',
+            :http_proxy => proxy_uri)
           end
 
           File.open(artifact_bundle(deployment_spec), 'wb') do |file|

test/instance_agent/config_test.rb

@@ -27,7 +27,8 @@ class InstanceAgentConfigTest < InstanceAgentTestCase
         :wait_between_runs => 30,
         :wait_after_error => 30,
         :codedeploy_test_profile => 'prod',
-        :on_premises_config_file => '/etc/codedeploy-agent/conf/codedeploy.onpremises.yml'
+        :on_premises_config_file => '/etc/codedeploy-agent/conf/codedeploy.onpremises.yml',
+        :proxy_uri => nil
       }, InstanceAgent::Config.config)
     end