Apply different revision for rollback deployment lifecycle events

ambareesha · ambareesha · commit f4b4b08629e2 · 2016-12-10T19:37:36.000-08:00
diff --git a/lib/instance_agent/plugins/codedeploy/command_executor.rb b/lib/instance_agent/plugins/codedeploy/command_executor.rb
@@ -97,14 +97,19 @@ def command_method(command_name)
 
           unpack_bundle(cmd, bundle_file, deployment_spec)
 
+          FileUtils.mkdir_p(deployment_instructions_dir)
+          log(:debug, "Instructions directory created at #{deployment_instructions_dir}")
+          update_most_recent_install(deployment_spec)
           nil
         end
 
         command "Install" do |cmd, deployment_spec|
           log(:debug, "Executing Install command for execution #{cmd.deployment_execution_id}")
 
-          FileUtils.mkdir_p(deployment_instructions_dir)
-          log(:debug, "Instructions directory created at #{deployment_instructions_dir}")
+          if !File.directory?(deployment_instructions_dir)
+            FileUtils.mkdir_p(deployment_instructions_dir)
+            log(:debug, "Instructions directory created at #{deployment_instructions_dir}")
+          end
 
           installer = Installer.new(:deployment_instructions_dir => deployment_instructions_dir,
           :deployment_archive_dir => archive_root_dir(deployment_spec))
@@ -127,8 +132,11 @@ def map
                 :deployment_id => deployment_spec.deployment_id,
                 :deployment_group_name => deployment_spec.deployment_group_name,
                 :deployment_group_id => deployment_spec.deployment_group_id,
+                :deployment_creator => deployment_spec.deployment_creator,
+                :deployment_type => deployment_spec.deployment_type,
                 :deployment_root_dir => deployment_root_dir(deployment_spec),
                 :last_successful_deployment_dir => last_successful_deployment_dir(deployment_spec.deployment_group_id),
+                :most_recent_deployment_dir => most_recent_deployment_dir(deployment_spec.deployment_group_id),
                 :app_spec_path => app_spec_path)
                 script_log.concat_log(hook_command.execute)
               end
@@ -154,11 +162,20 @@ def archive_root_dir(deployment_spec)
 
         private
         def last_successful_deployment_dir(deployment_group)
-          last_install_file_location = last_install_file_path(deployment_group)
-          return unless File.exist? last_install_file_location
-          File.open last_install_file_location do |f|
+          last_successful_install_file_location = last_successful_install_file_path(deployment_group)
+          return unless File.exist? last_successful_install_file_location
+          File.open last_successful_install_file_location do |f|
             return f.read.chomp
-          end
+          end 
+        end
+
+        private
+        def most_recent_deployment_dir(deployment_group)
+          most_recent_install_file_location = most_recent_install_file_path(deployment_group)
+          return unless File.exist? most_recent_install_file_location
+          File.open most_recent_install_file_location do |f|
+            return f.read.chomp
+          end 
         end
 
         private
@@ -169,10 +186,15 @@ def default_app_spec(deployment_spec)
         end
 
         private
-        def last_install_file_path(deployment_group)
+        def last_successful_install_file_path(deployment_group)
           File.join(deployment_instructions_dir, "#{deployment_group}_last_successful_install")
         end
 
+        private
+        def most_recent_install_file_path(deployment_group)
+          File.join(deployment_instructions_dir, "#{deployment_group}_most_recent_install")
+        end
+
         private
         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}'")
@@ -330,11 +352,18 @@ def unpack_bundle(cmd, bundle_file, deployment_spec)
 
         private
         def update_last_successful_install(deployment_spec)
-          File.open(last_install_file_path(deployment_spec.deployment_group_id), 'w+') do |f|
+          File.open(last_successful_install_file_path(deployment_spec.deployment_group_id), 'w+') do |f|
             f.write deployment_root_dir(deployment_spec)
           end
         end
 
+        private
+        def update_most_recent_install(deployment_spec)
+          File.open(most_recent_install_file_path(deployment_spec.deployment_group_id), 'w+') do |f|
+            f.write deployment_root_dir(deployment_spec)
+          end
+        end  
+
         private
         def cleanup_old_archives(deployment_spec)
           deployment_group = deployment_spec.deployment_group_id
diff --git a/lib/instance_agent/plugins/codedeploy/deployment_specification.rb b/lib/instance_agent/plugins/codedeploy/deployment_specification.rb
@@ -6,7 +6,7 @@ module InstanceAgent
   module Plugins
     module CodeDeployPlugin
       class DeploymentSpecification
-        attr_accessor :deployment_id, :deployment_group_id, :deployment_group_name, :revision, :revision_source, :application_name
+        attr_accessor :deployment_id, :deployment_group_id, :deployment_group_name, :revision, :revision_source, :application_name, :deployment_type, :deployment_creator
         attr_accessor :bucket, :key, :bundle_type, :version, :etag
         attr_accessor :external_account, :repository, :commit_id, :anonymous, :external_auth_token
         class << self
@@ -40,6 +40,8 @@ def initialize(data)
             @deployment_id = data["DeploymentId"]
           end
           @deployment_group_id = data["DeploymentGroupId"]
+          @deployment_creator = data["DeploymentCreator"] || "user"
+          @deployment_type = data["DeploymentType"] || "IN_PLACE"
 
           raise 'Must specify a revison' unless data["Revision"]
           @revision_source = data["Revision"]["RevisionType"]
diff --git a/lib/instance_agent/plugins/codedeploy/hook_executor.rb b/lib/instance_agent/plugins/codedeploy/hook_executor.rb
@@ -59,7 +59,8 @@ def to_json
 
       class HookExecutor
 
-        LAST_SUCCESSFUL_DEPLOYMENT = "OldOrIgnore"
+        LAST_SUCCESSFUL_DEPLOYMENT = "LastSuccessfulOrIgnore"
+        MOST_RECENT_DEPLOYMENT = "MostRecentOrIgnore"
         CURRENT = "New"
         def initialize(arguments = {})
           #check arguments
@@ -69,13 +70,17 @@ def initialize(arguments = {})
           raise "App Spec Path Required " if arguments[:app_spec_path].nil?
           raise "Application name required" if arguments[:application_name].nil?
           raise "Deployment Group name required" if arguments[:deployment_group_name].nil?
+          raise "Deployment creator required" if arguments[:deployment_creator].nil?
+          raise "Deployment type required" if arguments[:deployment_type].nil?
           @lifecycle_event = arguments[:lifecycle_event]
           @deployment_id = arguments[:deployment_id]
           @application_name = arguments[:application_name]
           @deployment_group_name = arguments[:deployment_group_name]
           @deployment_group_id = arguments[:deployment_group_id]
+          @deployment_creator = arguments[:deployment_creator]
+          @deployment_type = arguments[:deployment_type]
           @current_deployment_root_dir = arguments[:deployment_root_dir]
-          select_correct_deployment_root_dir(arguments[:deployment_root_dir], arguments[:last_successful_deployment_dir])
+          select_correct_deployment_root_dir(arguments[:deployment_root_dir], arguments[:last_successful_deployment_dir], arguments[:most_recent_deployment_dir])
           return if @deployment_root_dir.nil?
           @deployment_archive_dir = File.join(@deployment_root_dir, 'deployment-archive')
           @app_spec_path = arguments[:app_spec_path]
@@ -183,14 +188,25 @@ def parse_app_spec
         end
 
         private
-        def select_correct_deployment_root_dir(current_deployment_root_dir, last_successful_deployment_root_dir)
+        def select_correct_deployment_root_dir(current_deployment_root_dir, last_successful_deployment_root_dir, most_recent_deployment_dir)
           @deployment_root_dir = current_deployment_root_dir
           hook_deployment_mapping = mapping_between_hooks_and_deployments
-          if(hook_deployment_mapping[@lifecycle_event] == LAST_SUCCESSFUL_DEPLOYMENT && !File.exist?(File.join(@deployment_root_dir, 'deployment-archive')))
+          if(select_correct_mapping_for_hooks == LAST_SUCCESSFUL_DEPLOYMENT && !File.exist?(File.join(@deployment_root_dir, 'deployment-archive')))
             @deployment_root_dir = last_successful_deployment_root_dir
+          elsif(select_correct_mapping_for_hooks == MOST_RECENT_DEPLOYMENT && !File.exists?(File.join(@deployment_root_dir, 'deployment-archive')))
+            @deployment_root_dir = most_recent_deployment_dir
           end
         end
 
+        private
+        def select_correct_mapping_for_hooks
+          hook_deployment_mapping = mapping_between_hooks_and_deployments
+          if((@deployment_creator.eql? "codeDeployRollback") && (@deployment_type.eql? "BLUE_GREEN"))
+            hook_deployment_mapping = rollback_deployment_mapping_between_hooks_and_deployments
+          end
+          hook_deployment_mapping[@lifecycle_event]
+        end
+
         private
         def mapping_between_hooks_and_deployments
           { "BeforeBlockTraffic"=>LAST_SUCCESSFUL_DEPLOYMENT,
@@ -204,6 +220,19 @@ def mapping_between_hooks_and_deployments
             "ValidateService"=>CURRENT}
         end
 
+        private 
+        def rollback_deployment_mapping_between_hooks_and_deployments
+          { "BeforeBlockTraffic"=>MOST_RECENT_DEPLOYMENT,
+            "AfterBlockTraffic"=>MOST_RECENT_DEPLOYMENT,
+            "ApplicationStop"=>LAST_SUCCESSFUL_DEPLOYMENT,
+            "BeforeInstall"=>CURRENT,
+            "AfterInstall"=>CURRENT,
+            "ApplicationStart"=>CURRENT,
+            "BeforeAllowTraffic"=>LAST_SUCCESSFUL_DEPLOYMENT,
+            "AfterAllowTraffic"=>LAST_SUCCESSFUL_DEPLOYMENT,
+            "ValidateService"=>CURRENT}
+        end
+
         private
         def description
           self.class.to_s
diff --git a/test/instance_agent/plugins/codedeploy/codedeploy_control_test.rb b/test/instance_agent/plugins/codedeploy/codedeploy_control_test.rb
@@ -12,6 +12,8 @@ class CodeDeployControlTest < InstanceAgentTestCase
         ENV['AWS_SECRET_ACCESS_KEY'] = "Test Secret Access Key"
         ENV['AWS_REGION'] = nil
         ENV['AWSDEPLOY_CONTROL_ENDPOINT'] = "https://tempuri"
+        ENV['DEPLOYMENT_CREATOR'] = "User"
+        ENV['DEPLOYMENT_TYPE'] = "IN_PLACE"
       end
 
       context "with region, endpoint and credentials" do
@@ -25,7 +27,10 @@ class CodeDeployControlTest < InstanceAgentTestCase
         should "raise an exception" do
           assert_raise {
             codedeploy_control_client = CodeDeployControl.new()
-            codedeploy_control_client.get_client
+            codedeploy_control_client.get_client.put_host_command_complete(
+              :command_status => 'Succeeded',
+              :diagnostics => nil,
+              :host_command_identifier => "TestCommand")
           }
         end
       end
diff --git a/test/instance_agent/plugins/codedeploy/command_executor_test.rb b/test/instance_agent/plugins/codedeploy/command_executor_test.rb
@@ -47,6 +47,8 @@ def generate_signed_message_for(map)
         @deployment_group_name = "TestDeploymentGroup"
         @application_name = "TestApplicationName"
         @deployment_group_id = "foo"
+        @deployment_creator = "User"
+        @deployment_type = "IN_PLACE"
         @s3Revision = {
           "Bucket" => "mybucket",
           "Key" => "mykey",
@@ -57,6 +59,8 @@ def generate_signed_message_for(map)
           "DeploymentGroupId" => @deployment_group_id,
           "ApplicationName" => @application_name,
           "DeploymentGroupName" => @deployment_group_name,
+          "DeploymentCreator" => @deployment_creator,
+          "DeploymentType" => @deployment_type,
           "Revision" => {
             "RevisionType" => "S3",
             "S3Revision" => @s3Revision
@@ -73,7 +77,8 @@ def generate_signed_message_for(map)
 
         FileUtils.stubs(:mkdir_p)
         File.stubs(:directory?).with(@deployment_root_dir).returns(true)
-        @previous_install_file_location = File.join(@deployment_instructions_dir, "#{@deployment_group_id}_last_successful_install")
+        @last_successful_install_file_location = File.join(@deployment_instructions_dir, "#{@deployment_group_id}_last_successful_install")
+        @most_recent_install_file_location = File.join(@deployment_instructions_dir, "#{@deployment_group_id}_most_recent_install")
       end
 
       context "when executing an unknown command" do
@@ -130,10 +135,11 @@ def generate_signed_message_for(map)
           InstanceAgent::Plugins::CodeDeployPlugin::ApplicationSpecification::ApplicationSpecification.stubs(:parse).returns(@app_spec)
           @installer = stub("installer", :install => nil)
           Installer.stubs(:new).returns(@installer)
-          File.stubs(:exist?).with(@previous_install_file_location).returns(true)
+          File.stubs(:directory?).with(@deployment_instructions_dir).returns(true)
+          File.stubs(:exist?).with(@last_successful_install_file_location).returns(true)
           File.stubs(:exist?).with(@archive_root_dir).returns(true)
-          File.stubs(:open).with(@previous_install_file_location, 'w+')
-          File.stubs(:open).with(@previous_install_file_location)
+          File.stubs(:open).with(@last_successful_install_file_location, 'w+')
+          File.stubs(:open).with(@last_successful_install_file_location)
 
           @app_spec = mock("parsed application specification")
           File.
@@ -143,12 +149,6 @@ def generate_signed_message_for(map)
           ApplicationSpecification::ApplicationSpecification.stubs(:parse).with("APP SPEC").returns(@app_spec)
         end
 
-        should "idempotently create the instructions directory" do
-          FileUtils.expects(:mkdir_p).with(@deployment_instructions_dir)
-
-          @command_executor.execute_command(@command, @deployment_spec)
-        end
-
         should "create an appropriate Installer" do
           Installer.
           expects(:new).
@@ -167,7 +167,7 @@ def generate_signed_message_for(map)
 
         should "write the archive root dir to the install instructions file" do
           mock_file = mock
-          File.expects(:open).with(@previous_install_file_location, 'w+').yields(mock_file)
+          File.expects(:open).with(@last_successful_install_file_location, 'w+').yields(mock_file)
           mock_file.expects(:write).with(@deployment_root_dir)
 
           @command_executor.execute_command(@command, @deployment_spec)
@@ -355,6 +355,20 @@ def generate_signed_message_for(map)
           InstanceAgent::LinuxUtil.expects(:extract_tar).in_sequence(call_sequence)
           @command_executor.execute_command(@command, @deployment_spec)
         end
+
+        should "idempotently create the instructions directory" do
+          FileUtils.expects(:mkdir_p).with(@deployment_instructions_dir)
+
+          @command_executor.execute_command(@command, @deployment_spec)
+        end
+
+        should "write the archive root dir to the install instructions file" do
+          mock_file = mock
+          File.expects(:open).with(@most_recent_install_file_location, 'w+').yields(mock_file)
+          mock_file.expects(:write).with(@deployment_root_dir)
+
+          @command_executor.execute_command(@command, @deployment_spec)
+        end
       end
 
       context "I have an empty app spec (for script mapping)" do
@@ -366,8 +380,11 @@ def generate_signed_message_for(map)
             :deployment_id => @deployment_id,
             :deployment_group_name => @deployment_group_name,
             :deployment_group_id => @deployment_group_id,
+            :deployment_creator => @deployment_creator,
+            :deployment_type => @deployment_type,
             :deployment_root_dir => @deployment_root_dir, 
             :last_successful_deployment_dir => nil,
+            :most_recent_deployment_dir => nil,
             :app_spec_path => 'appspec.yml'}
           @mock_hook_executor = mock
         end
@@ -505,7 +522,10 @@ def generate_signed_message_for(map)
             :deployment_id => @deployment_id,
             :deployment_group_name => @deployment_group_name,
             :deployment_group_id => @deployment_group_id,
+            :deployment_creator => @deployment_creator,
+            :deployment_type => @deployment_type,
             :last_successful_deployment_dir => nil,
+            :most_recent_deployment_dir => nil,
             :app_spec_path => 'appspec.yml'}
           @hook_executor_constructor_hash_1 = hook_executor_constructor_hash.merge({:lifecycle_event => "lifecycle_event_1"})
           @hook_executor_constructor_hash_2 = hook_executor_constructor_hash.merge({:lifecycle_event => "lifecycle_event_2"})
@@ -522,12 +542,11 @@ def generate_signed_message_for(map)
 
         context "when the first script is forced to fail" do
           setup do
-            HookExecutor.stubs(:new).with(@hook_executor_constructor_hash_1).raises("failed to create hook caommand")
-
+            HookExecutor.stubs(:new).with(@hook_executor_constructor_hash_1).raises("failed to create hook command")
           end
 
-          should "calls lifecycle event 1 and fails but not 2" do
-            assert_raised_with_message('failed to create hook caommand') do
+          should "calls lifecycle event 1 and fails but not lifecycle event 2" do
+            assert_raised_with_message('failed to create hook command') do
               @command_executor.execute_command(@command, @deployment_spec)
             end
             HookExecutor.expects(:new).with(@hook_executor_constructor_hash_2).never
diff --git a/test/instance_agent/plugins/codedeploy/deployment_specification_test.rb b/test/instance_agent/plugins/codedeploy/deployment_specification_test.rb
diff --git a/test/instance_agent/plugins/codedeploy/hook_executor_test.rb b/test/instance_agent/plugins/codedeploy/hook_executor_test.rb
