Fix to allow adcs endpoint to be configured through the config file instead

from an env variable.

Prior to this change, the deploy_control_endpoint was being overridden incorrectly
from environment , which in turn was causing issues when agent was running in a separate
shell from where the env variable was set up.

This change adds :deploy_control_endpoint as a config variable

 * Unit Tests : Y
 * Integration Tests : Y (but will be tested more extensively in pipeline)

cr https://code.amazon.com/reviews/CR-8897225

Author: Katyal

README.md

@@ -7,7 +7,7 @@
 
 ``` ruby
 git clone https://github.com/aws/aws-codedeploy-agent.git
-gem install bundler
+gem install bundler -v 1.3.5
 cd aws-codedeploy-agent
 bundle install
 rake clean && rake

bin/update

@@ -97,7 +97,7 @@ EOF
   end
 
   def supported_ruby_versions
-    ['2.4', '2.3', '2.2', '2.1', '2.0']
+    ['2.5', '2.4', '2.3', '2.2', '2.1', '2.0']
   end
 
   # check ruby version, only version 2.x works

lib/instance_agent/config.rb

@@ -41,7 +41,8 @@ def initialize
         :on_premises_config_file => '/etc/codedeploy-agent/conf/codedeploy.onpremises.yml',
         :proxy_uri => nil,
         :enable_deployments_log => true,
-        :use_fips_mode => false
+        :use_fips_mode => false,
+        :deploy_control_endpoint => nil
       })
     end
 

lib/instance_agent/plugins/codedeploy/command_poller.rb

@@ -38,8 +38,8 @@ def initialize
           region = ENV['AWS_REGION'] || InstanceMetadata.region
           @host_identifier = ENV['AWS_HOST_IDENTIFIER'] || InstanceMetadata.host_identifier
 
-          log(:debug, "Configuring deploy control client: Region = #{region.inspect}")
-          log(:debug, "Deploy control endpoint override = " + ENV['AWS_DEPLOY_CONTROL_ENDPOINT'].inspect)
+          log(:debug, "Configuring deploy control client: Region=#{region.inspect}")
+          log(:debug, "Deploy control endpoint override=#{InstanceAgent::Config.config[:deploy_control_endpoint]}")
 
           @deploy_control = InstanceAgent::Plugins::CodeDeployPlugin::CodeDeployControl.new(:region => region, :logger => InstanceAgent::Log, :ssl_ca_directory => ENV['AWS_SSL_CA_DIRECTORY'])
           @deploy_control_client = @deploy_control.get_client

test/instance_agent/config_test.rb

@@ -32,7 +32,8 @@ class InstanceAgentConfigTest < InstanceAgentTestCase
         :proxy_uri => nil,
         :enable_deployments_log => true,
         :kill_agent_max_wait_time_seconds => 7200,
-        :use_fips_mode => false
+        :use_fips_mode => false,
+        :deploy_control_endpoint => nil
       }, InstanceAgent::Config.config)
     end
 

test/instance_agent/plugins/codedeploy/codedeploy_control_test.rb

@@ -36,7 +36,7 @@ class CodeDeployControlTest < InstanceAgentTestCase
 
       context "without an endpoint" do
         setup do
-          ENV['AWS_DEPLOY_CONTROL_ENDPOINT'] = nil
+          InstanceAgent::Config.config[:deploy_control_endpoint] = nil
         end
 
         should "raise an exception" do
@@ -53,17 +53,17 @@ class CodeDeployControlTest < InstanceAgentTestCase
 
       context "with ADCS endpoint set in an environment variable" do
         setup do
-          ENV['AWS_DEPLOY_CONTROL_ENDPOINT'] = "https://tempuri"
+          InstanceAgent::Config.config[:deploy_control_endpoint] = "https://tempuri"
         end
 
         should "use endpoint from environment variable" do
             codedeploy_control_client = CodeDeployControl.new :region => "us-west-2"
             assert_equal "tempuri", codedeploy_control_client.get_client.config.endpoint.host
         end
 
-       cleanup do
-         ENV['AWS_DEPLOY_CONTROL_ENDPOINT'] = nil
-       end
+        cleanup do
+         InstanceAgent::Config.config[:deploy_control_endpoint] = nil
+        end
       end            
 
       context "with use_fips_mode not set" do

vendor/gems/codedeploy-commands-1.0.0/lib/aws/plugins/deploy_control_endpoint.rb

@@ -4,7 +4,7 @@ module Aws
   module Plugins
     class DeployControlEndpoint < Seahorse::Client::Plugin
       option(:endpoint) do |cfg|
-        url = ENV['AWS_DEPLOY_CONTROL_ENDPOINT']
+        url = InstanceAgent::Config.config[:deploy_control_endpoint]
         if url.nil?
           url = "https://codedeploy-commands"
           if InstanceAgent::Config.config[:use_fips_mode]