aws-codedeploy-agent 0.0.4 → 0.1.0

data/init.d/codedeploy-agent

@@ -17,24 +17,30 @@
 #                    the deployment artifacts on to this instance.
 ### END INIT INFO
 
-RETVAL=0
+[ -f /etc/profile ] && [ "`stat --format '%U %G' /etc/profile`" == "root root" ] && source /etc/profile
 
 BIN="codedeploy-agent"
 
 start() {
         echo -n $"Starting $BIN:"
-        nohup $BIN start >/dev/null </dev/null 2>&1  # Try to start the server
+        nohup $BIN start >/dev/null </dev/null 2>&1
         exit $?
 }
 
 stop() {
         echo -n $"Stopping $BIN:"
-        nohup $BIN stop >/dev/null </dev/null 2>&1  # Try to stop the server
+        nohup $BIN stop >/dev/null </dev/null 2>&1
+        exit $?
+}
+
+restart() {
+        echo -n $"Restarting $BIN:"
+        nohup $BIN restart >/dev/null </dev/null 2>&1
         exit $?
 }
 
 status() {
-        $BIN status # Status of the server
+        $BIN status
         exit $?
 }
 
@@ -46,8 +52,7 @@ case "$1" in
                 stop
                 ;;
         restart)
-                stop
-                start
+                restart
                 ;;
         force-reload)
                 stop

data/lib/instance_agent.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require 'core_ext'
+require_relative 'core_ext'
 require 'process_manager'
 
 unless defined?(InstanceAgent)

data/lib/instance_agent/config.rb

@@ -31,7 +31,9 @@ module InstanceAgent
         :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,
+        :enable_deployments_log => true
       })
     end
 

data/lib/instance_agent/log.rb

@@ -1,3 +1,21 @@
 require 'process_manager/log'
+require 'singleton'
 
 InstanceAgent::Log = ProcessManager::Log
+
+class InstanceAgent::DeploymentLog
+  include Singleton
+
+  def initialize
+    deployment_logs_dir = File.join(InstanceAgent::Config.config[:root_dir], 'deployment-logs')
+    FileUtils.mkdir_p(deployment_logs_dir) unless File.exists? deployment_logs_dir
+    @deployment_log ||= Logger.new(File.join(deployment_logs_dir, "#{InstanceAgent::Config.config[:program_name]}-deployments.log"), 8, 64 * 1024 * 1024)
+    @deployment_log.formatter = proc do |severity, datetime, progname, msg|
+      "[#{datetime.strftime('%Y-%m-%d %H:%M:%S.%L')}] #{msg}\n"
+    end
+  end
+
+  def log(message)
+    @deployment_log.info(message)
+  end  
+end

data/lib/instance_agent/platform/linux_util.rb

@@ -8,12 +8,30 @@ module InstanceAgent
       ['linux']
     end
 
-    def self.prepare_script_command(script, absolute_path)
-      script_command = absolute_path
-      if(!script.runas.nil?)
-        script_command = 'su ' + script.runas + ' -c ' + absolute_path
+    def self.prepare_script_command(script, absolute_cmd_path)
+      runas = !!script.runas
+      sudo = !!script.sudo
+
+      if runas && sudo
+        return 'sudo su ' + script.runas + ' -c ' + absolute_cmd_path
+      end
+
+      if runas && !sudo
+        return 'su ' + script.runas + ' -c ' + absolute_cmd_path
+      end
+
+      if !runas && sudo
+        return 'sudo ' + absolute_cmd_path
       end
-      script_command
+
+      # If neither sudo or runas is specified, execute the
+      # command as the code deploy agent user 
+      absolute_cmd_path
+    end
+    
+    def self.quit()
+      # Send kill signal to parent and exit
+      Process.kill('TERM', Process.ppid)
     end
 
     def self.script_executable?(path)
@@ -33,6 +51,10 @@ module InstanceAgent
     def self.supports_process_groups?()
       true
     end
+
+    def self.codedeploy_version_file
+      File.join(ProcessManager::Config.config[:root_dir], '..')
+    end
     
     private
     def self.execute_tar_command(cmd)

data/lib/instance_agent/plugins/codedeploy/application_specification/application_specification.rb

@@ -60,6 +60,7 @@ module InstanceAgent
                   current_hook_scripts << InstanceAgent::Plugins::CodeDeployPlugin::ApplicationSpecification::ScriptInfo.new(script['location'].to_s.strip,
                   {
                     :runas => script.has_key?('runas') && !script['runas'].nil? ? script['runas'].to_s.strip : nil,
+                    :sudo => script['sudo'],
                     :timeout => script['timeout']
                   })
                 else
@@ -140,4 +141,4 @@ module InstanceAgent
       end
     end
   end
-end
+end

data/lib/instance_agent/plugins/codedeploy/application_specification/file_info.rb

@@ -10,7 +10,7 @@ module InstanceAgent
             if(source.nil?)
               raise AppSpecValidationException, 'File needs to have a source'
             elsif (destination.nil?)
-              raise AppSpecValidationException, 'File needs to have a destination'
+              raise AppSpecValidationException, "File #{source} needs to have a destination"
             end
             @source = source
             @destination = destination
@@ -20,4 +20,4 @@ module InstanceAgent
       end
     end
   end
-end
+end

data/lib/instance_agent/plugins/codedeploy/application_specification/script_info.rb

@@ -5,7 +5,7 @@ module InstanceAgent
         #Helper Class for storing data parsed from hook script maps
         class ScriptInfo
 
-          attr_reader :location, :runas, :timeout
+          attr_reader :location, :runas, :sudo, :timeout
           def initialize(location, opts = {})
             location = location.to_s
             if(location.empty?)
@@ -13,6 +13,7 @@ module InstanceAgent
             end
             @location = location
             @runas = opts[:runas]
+            @sudo = opts[:sudo]
             @timeout = opts[:timeout] || 3600
             @timeout = @timeout.to_i
             if(@timeout <= 0)
@@ -24,4 +25,4 @@ module InstanceAgent
       end
     end
   end
-end
+end

data/lib/instance_agent/plugins/codedeploy/codedeploy_control.rb

@@ -22,6 +22,11 @@ module InstanceAgent
               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 @@ module InstanceAgent
           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]
@@ -78,20 +92,7 @@ module InstanceAgent
         # Do minimal cert pinning
         def verify_subject
           InstanceAgent::Log.debug("#{self.class.to_s}: Actual certificate subject is '#{@cert.subject.to_s}'")
-
-          case @region
-          when 'us-east-1'
-            @cert.subject.to_s == "/C=US/ST=Washington/L=Seattle/O=Amazon.com, Inc./CN=codedeploy-commands.us-east-1.amazonaws.com"
-          when 'us-west-2'
-            @cert.subject.to_s == "/C=US/ST=Washington/L=Seattle/O=Amazon.com, Inc./CN=codedeploy-commands.us-west-2.amazonaws.com"
-          when 'eu-west-1'
-            @cert.subject.to_s == "/C=US/ST=Washington/L=Seattle/O=Amazon.com, Inc./CN=codedeploy-commands.eu-west-1.amazonaws.com"
-          when 'ap-southeast-2'
-            @cert.subject.to_s == "/C=US/ST=Washington/L=Seattle/O=Amazon.com, Inc./CN=codedeploy-commands.ap-southeast-2.amazonaws.com"
-          else
-            InstanceAgent::Log.debug("#{self.class.to_s}: Unsupported region '#{@region}'")
-            false
-          end
+          @cert.subject.to_s == "/C=US/ST=Washington/L=Seattle/O=Amazon.com, Inc./CN=codedeploy-commands."+@region+".amazonaws.com"
         end
 
       end

data/lib/instance_agent/plugins/codedeploy/command_executor.rb

@@ -11,6 +11,7 @@ module InstanceAgent
   module Plugins
     module CodeDeployPlugin
       ARCHIVES_TO_RETAIN = 5
+
       class CommandExecutor
         class << self
           attr_reader :command_methods
@@ -26,6 +27,17 @@ module InstanceAgent
           if(!@hook_mapping.nil?)
             map
           end
+          begin
+            max_revisions = ProcessManager::Config.config[:max_revisions]
+            @archives_to_retain = max_revisions.nil?? ARCHIVES_TO_RETAIN : Integer(max_revisions)
+            if @archives_to_retain < 0
+              raise ArgumentError
+            end
+          rescue ArgumentError
+            log(:error, "Invalid configuration :max_revision=#{max_revisions}")
+            Platform.util.quit()
+          end
+          log(:info, "Archives to retain is: #{@archives_to_retain}}")
         end
 
         def self.command(name, &blk)
@@ -115,6 +127,7 @@ module InstanceAgent
                 :application_name => deployment_spec.application_name,
                 :deployment_id => deployment_spec.deployment_id,
                 :deployment_group_name => deployment_spec.deployment_group_name,
+                :deployment_group_id => deployment_spec.deployment_group_id,
                 :deployment_root_dir => deployment_root_dir(deployment_spec),
                 :last_successful_deployment_dir => last_successful_deployment_dir(deployment_spec.deployment_group_id),
                 :app_spec_path => app_spec_path)
@@ -165,6 +178,11 @@ module InstanceAgent
         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(
@@ -176,11 +194,15 @@ module InstanceAgent
             File.join(InstanceAgent::Config.config[:log_dir], "#{InstanceAgent::Config.config[:program_name]}.aws_wire.log"),
             16,
             64 * 1024 * 1024),
-            :http_wire_trace => true)
+            :http_wire_trace => true,
+            :signature_version => 'v4',
+            :http_proxy => proxy_uri)
           else
             s3 = Aws::S3::Client.new(
             :region => region,
-            :ssl_ca_directory => ENV['AWS_SSL_CA_DIRECTORY'])
+            :ssl_ca_directory => ENV['AWS_SSL_CA_DIRECTORY'],
+            :signature_version => 'v4',
+            :http_proxy => proxy_uri)
           end
 
           File.open(artifact_bundle(deployment_spec), 'wb') do |file|
@@ -316,16 +338,22 @@ module InstanceAgent
 
         private
         def cleanup_old_archives(deployment_group)
-          deployment_archives = Dir[File.join(ProcessManager::Config.config[:root_dir], deployment_group, '*')]
-          extra = deployment_archives.size - ARCHIVES_TO_RETAIN
+          deployment_archives = Dir.entries(File.join(ProcessManager::Config.config[:root_dir], deployment_group))
+          # remove . and ..
+          deployment_archives.delete(".")
+          deployment_archives.delete("..")
+
+          full_path_deployment_archives = deployment_archives.map{ |f| File.join(ProcessManager::Config.config[:root_dir], deployment_group, f)}
+          
+          extra = full_path_deployment_archives.size - @archives_to_retain
           return unless extra > 0
 
           # Never remove the last successful deployment
           last_success = last_successful_deployment_dir(deployment_group)
-          deployment_archives.delete(last_success)
+          full_path_deployment_archives.delete(last_success)
 
           # Sort oldest -> newest, take first `extra` elements
-          oldest_extra = deployment_archives.sort_by{ |f| File.mtime(f) }.take(extra)
+          oldest_extra = full_path_deployment_archives.sort_by{ |f| File.mtime(f) }.take(extra)
 
           # Absolute path takes care of relative root directories
           directories = oldest_extra.map{ |f| File.absolute_path(f) }

data/lib/instance_agent/plugins/codedeploy/command_poller.rb

@@ -8,6 +8,15 @@ module InstanceAgent
 
         VERSION = "2013-04-23"
         def initialize
+          test_profile = InstanceAgent::Config.config[:codedeploy_test_profile]
+          unless ["beta", "gamma"].include?(test_profile.downcase)
+            # Remove any user overrides set in the environment.
+            # The agent should always pull credentials from the EC2 instance
+            # profile or the credentials in the OnPremises config file.
+            ENV['AWS_ACCESS_KEY_ID'] = nil
+            ENV['AWS_SECRET_ACCESS_KEY'] = nil
+            ENV['AWS_CREDENTIAL_FILE'] = nil
+          end
           CodeDeployPlugin::OnPremisesConfig.configure
           region = ENV['AWS_REGION'] || InstanceMetadata.region
           @host_identifier = ENV['AWS_HOST_IDENTIFIER'] || InstanceMetadata.host_identifier
@@ -135,7 +144,9 @@ module InstanceAgent
 
         private
         def gather_diagnostics_from_script_error(script_error)
-          script_error.to_json
+          return script_error.to_json
+          rescue Exception => e
+            return {'error_code' => "Unknown", 'script_name' => script_error.script_name, 'message' => "Attempting minimal diagnostics", 'log' => "Exception #{e.class} occured"}.to_json
         end
 
         private

data/lib/instance_agent/plugins/codedeploy/deployment_specification.rb

@@ -1,5 +1,6 @@
 require 'openssl'
 require 'instance_metadata'
+require 'open-uri'
 
 module InstanceAgent
   module Plugins
@@ -132,18 +133,7 @@ module InstanceAgent
           when 'beta', 'gamma'
             cert.subject.to_s == "/C=US/ST=Washington/L=Seattle/O=Amazon.com, Inc./CN=codedeploy-signer-integ.amazonaws.com"
           when 'prod'
-            case @@region
-            when 'us-east-1'
-              cert.subject.to_s == "/C=US/ST=Washington/L=Seattle/O=Amazon.com, Inc./CN=codedeploy-signer-us-east-1.amazonaws.com"
-            when 'us-west-2'
-              cert.subject.to_s == "/C=US/ST=Washington/L=Seattle/O=Amazon.com, Inc./CN=codedeploy-signer-us-west-2.amazonaws.com"
-            when 'eu-west-1'
-              cert.subject.to_s == "/C=US/ST=Washington/L=Seattle/O=Amazon.com, Inc./CN=codedeploy-signer-eu-west-1.amazonaws.com"
-            when 'ap-southeast-2'
-              cert.subject.to_s == "/C=US/ST=Washington/L=Seattle/O=Amazon.com, Inc./CN=codedeploy-signer-ap-southeast-2.amazonaws.com"
-            else
-              raise "Unknown region '#{@region}'"
-            end
+            cert.subject.to_s == "/C=US/ST=Washington/L=Seattle/O=Amazon.com, Inc./CN=codedeploy-signer-"+@@region+".amazonaws.com"
           else
             raise "Unknown profile '#{Config.config()[:codedeploy_test_profile]}'"
           end

data/lib/instance_agent/plugins/codedeploy/hook_executor.rb

@@ -52,6 +52,7 @@ module InstanceAgent
         def to_json
           log = @log.log || []
           log = log.join("")
+          log.force_encoding("utf-8")
           {'error_code' => @error_code, 'script_name' => @script_name, 'message' => message, 'log' => log}.to_json
         end
       end
@@ -72,6 +73,8 @@ module InstanceAgent
           @deployment_id = arguments[:deployment_id]
           @application_name = arguments[:application_name]
           @deployment_group_name = arguments[:deployment_group_name]
+          @deployment_group_id = arguments[:deployment_group_id]
+          @current_deployment_root_dir = arguments[:deployment_root_dir]
           select_correct_deployment_root_dir(arguments[:deployment_root_dir], arguments[:last_successful_deployment_dir])
           return if @deployment_root_dir.nil?
           @deployment_archive_dir = File.join(@deployment_root_dir, 'deployment-archive')
@@ -82,8 +85,8 @@ module InstanceAgent
           @child_envs={'LIFECYCLE_EVENT' => @lifecycle_event.to_s,
                       'DEPLOYMENT_ID'   => @deployment_id.to_s,
                       'APPLICATION_NAME' => @application_name,
-                      'DEPLOYMENT_GROUP_NAME' => @deployment_group_name}
-
+                      'DEPLOYMENT_GROUP_NAME' => @deployment_group_name,
+                      'DEPLOYMENT_GROUP_ID' => @deployment_group_id}
         end
 
         def execute
@@ -94,7 +97,7 @@ module InstanceAgent
               log_script("LifecycleEvent - " + @lifecycle_event + "\n", script_log_file)
               hooks.each do |script|
                 if(!File.exist?(script_absolute_path(script)))
-                  raise ScriptError.new(ScriptError::SCRIPT_MISSING_CODE, script.location, @script_log), 'Script does not exist at specified location: ' + script.location
+                  raise ScriptError.new(ScriptError::SCRIPT_MISSING_CODE, script.location, @script_log), 'Script does not exist at specified location: ' + File.expand_path(script_absolute_path(script))
                 elsif(!InstanceAgent::Platform.util.script_executable?(script_absolute_path(script)))
                   log :warn, 'Script at specified location: ' + script.location + ' is not executable.  Trying to make it executable.'
                   begin
@@ -153,7 +156,7 @@ module InstanceAgent
 
         private
         def create_script_log_file_if_needed
-          script_log_file_location = File.join(@deployment_root_dir, 'logs/scripts.log')
+          script_log_file_location = File.join(@current_deployment_root_dir, 'logs/scripts.log')
           if(!File.exists?(script_log_file_location))
             unless File.directory?(File.dirname(script_log_file_location))
               FileUtils.mkdir_p(File.dirname(script_log_file_location))
@@ -217,6 +220,7 @@ module InstanceAgent
           @hook_logging_mutex.synchronize do
             @script_log.append_to_log(message)
             script_log_file.write(Time.now.to_s[0..-7] + ' ' + message)
+            InstanceAgent::DeploymentLog.instance.log("[#{@deployment_id}]#{message.strip}") if InstanceAgent::Config.config[:enable_deployments_log]
             script_log_file.flush
           end
         end

data/lib/instance_agent/plugins/codedeploy/install_instruction.rb

@@ -205,7 +205,9 @@ module InstanceAgent
 
         def execute
           #If the file doesn't exist the command is ignored
-          if File.exist?(@file_path)
+          if File.symlink?(@file_path)
+            FileUtils.rm(@file_path)
+          elsif File.exist?(@file_path)
             if File.directory?(@file_path)
               # TODO (AWSGLUE-713): handle the exception if the directory is non-empty;
               # this might mean the customer has put files in this directory and we should

data/lib/instance_metadata.rb

@@ -6,7 +6,7 @@ class InstanceMetadata
 
   IP_ADDRESS = '169.254.169.254'
   PORT = 80
-
+  
   def self.host_identifier
     doc = JSON.parse(http_get('/latest/dynamic/instance-identity/document').strip)
     "arn:aws:ec2:#{doc['region']}:#{doc['accountId']}:instance/#{doc['instanceId']}"