aws-codedeploy-agent 0.0.4 → 0.1.0

data/test/instance_agent/config_test.rb

@@ -27,7 +27,9 @@ 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,
+        :enable_deployments_log => true
       }, InstanceAgent::Config.config)
     end
 

data/test/instance_agent/platform/linux_util_test.rb

@@ -0,0 +1,35 @@
+require 'test_helper'
+
+class LinuxUtilTest < InstanceAgentTestCase
+  context 'Testing building command with sudo' do
+    setup do
+      @script_mock = Struct.new :sudo, :runas
+    end
+
+    should 'return command with sudo with runas user deploy' do
+      mock = @script_mock.new true, "deploy"
+      assert_equal 'sudo su deploy -c my_script.sh',
+                   InstanceAgent::LinuxUtil.prepare_script_command(mock, "my_script.sh")
+    end
+
+    should 'return command without sudo with runas user deploy' do
+      mock = @script_mock.new nil, "deploy"
+      assert_equal 'su deploy -c my_script.sh',
+                   InstanceAgent::LinuxUtil.prepare_script_command(mock, "my_script.sh")
+    end
+
+    should 'return command without sudo or runas user' do
+      mock = @script_mock.new nil, nil
+      assert_equal 'my_script.sh',
+                   InstanceAgent::LinuxUtil.prepare_script_command(mock, "my_script.sh")
+    end
+
+    should 'return command with sudo' do
+      mock = @script_mock.new true, nil
+      assert_equal 'sudo my_script.sh',
+                   InstanceAgent::LinuxUtil.prepare_script_command(mock, "my_script.sh")
+    end
+
+  end
+end
+

data/test/instance_agent/plugins/codedeploy/application_specification_test.rb

@@ -6,7 +6,12 @@ module InstanceAgent
   module Plugins
     module CodeDeployPlugin
       module ApplicationSpecification
+
         class ApplicationSpecificationTest < InstanceAgentTestCase
+          def make_app_spec
+            ApplicationSpecification.new(YAML.load(@app_spec_string), {:revision_id => @test_revision_id})
+          end
+
           context 'The Application Specification' do
             setup do
               @test_revision_id = 'bar'
@@ -14,10 +19,6 @@ module InstanceAgent
 
             private
 
-            def make_app_spec
-              ApplicationSpecification.new(YAML.load(@app_spec_string), {:revision_id => @test_revision_id})
-            end
-
             context "With missing version" do
               setup do
                 @app_spec_string = <<-END
@@ -271,7 +272,7 @@ module InstanceAgent
                 end
 
                 should  "raise and AppSpecValidationException" do
-                  assert_raised_with_message('File needs to have a destination',AppSpecValidationException) do
+                  assert_raised_with_message('File test_source needs to have a destination',AppSpecValidationException) do
                     make_app_spec()
                   end
                 end
@@ -1710,4 +1711,4 @@ module InstanceAgent
       end
     end
   end
-end
+end

data/test/instance_agent/plugins/codedeploy/command_executor_test.rb

@@ -1,11 +1,18 @@
 require 'test_helper'
+require 'certificate_helper'
 require 'stringio'
-require 'com/amazon/codedeploy/command/v20141006/host_command_instance'
 require 'aws-sdk-core/s3'
 
 class CodeDeployPluginCommandExecutorTest < InstanceAgentTestCase
 
   include InstanceAgent::Plugins::CodeDeployPlugin
+      def generate_signed_message_for(map)
+        message = @cert_helper.sign_message(map.to_json)
+        spec = OpenStruct.new({ :payload => message })
+        spec.format = "PKCS7/JSON"
+
+        return spec
+      end
 
   context 'The CodeDeploy Plugin Command Executor' do
     setup do
@@ -33,13 +40,6 @@ class CodeDeployPluginCommandExecutorTest < InstanceAgentTestCase
     end
 
     context "when executing a command" do
-      def generate_signed_message_for(map)
-        message = @cert_helper.sign_message(map.to_json)
-        spec = OpenStruct.new({ :payload => message })
-        spec.format = "PKCS7/JSON"
-
-        return spec
-      end
 
       setup do
         @cert_helper = CertificateHelper.new
@@ -62,7 +62,7 @@ class CodeDeployPluginCommandExecutorTest < InstanceAgentTestCase
             "S3Revision" => @s3Revision
           }
         })
-        @command = Com::Amazon::Codedeploy::Command::V20141006::HostCommandInstance.new(
+        @command = OpenStruct.new(
         :host_command_identifier => "command-1",
         :deployment_execution_id => "test-execution")
         @root_dir = '/tmp/codedeploy/'
@@ -184,6 +184,7 @@ class CodeDeployPluginCommandExecutorTest < InstanceAgentTestCase
           @mock_file = mock
           Net::HTTP.stubs(:start).yields(@http)
           File.stubs(:open).returns @mock_file
+          Dir.stubs(:entries).returns []
           @mock_file.stubs(:close)
           @http.stubs(:request_get)
           @s3 = mock
@@ -364,7 +365,8 @@ class CodeDeployPluginCommandExecutorTest < InstanceAgentTestCase
             :application_name => @application_name,
             :deployment_id => @deployment_id,
             :deployment_group_name => @deployment_group_name,
-            :deployment_root_dir => @deployment_root_dir, 
+            :deployment_group_id => @deployment_group_id,
+            :deployment_root_dir => @deployment_root_dir,
             :last_successful_deployment_dir => nil,
             :app_spec_path => 'appspec.yml'}
           @mock_hook_executor = mock
@@ -502,6 +504,7 @@ class CodeDeployPluginCommandExecutorTest < InstanceAgentTestCase
             :application_name => @application_name,
             :deployment_id => @deployment_id,
             :deployment_group_name => @deployment_group_name,
+            :deployment_group_id => @deployment_group_id,
             :last_successful_deployment_dir => nil,
             :app_spec_path => 'appspec.yml'}
           @hook_executor_constructor_hash_1 = hook_executor_constructor_hash.merge({:lifecycle_event => "lifecycle_event_1"})

data/test/instance_agent/plugins/codedeploy/command_poller_test.rb

@@ -255,34 +255,56 @@ class CommandPollerTest < InstanceAgentTestCase
         @poller.perform
       end
 
-      should 'return when Succeeded command status is given by PollHostCommandAcknowledgement' do
+      should 'call PutHostCommandComplete when Succeeded status is given by PollHostCommandAcknowledgement' do
         @deploy_control_client.expects(:put_host_command_acknowledgement).
           with(:diagnostics => nil,
                :host_command_identifier => @command.host_command_identifier).
           returns(stub(:command_status => "Succeeded"))
 
+        @deploy_control_client.expects(:put_host_command_complete).
+          with(
+              :command_status => 'Succeeded',
+              :diagnostics => {
+                :format => "JSON",
+                :payload => {
+                  'error_code' => InstanceAgent::Plugins::CodeDeployPlugin::ScriptError::SUCCEEDED_CODE,
+                  'script_name' => "",
+                  'message' => 'Succeeded',
+                  'log' => ""}.to_json
+              },
+              :host_command_identifier => @command.host_command_identifier)
+
         @get_deployment_specification_state.become('never')
         @deploy_control_client.expects(:get_deployment_specification).never.
           when(@get_deployment_specification_state.is('never'))
         @put_host_command_complete_state.become('never')
-        @deploy_control_client.expects(:put_host_command_complete).never.
-          when(@put_host_command_complete_state.is('never'))
 
         @poller.perform
       end
 
-      should 'return when Failed command status is given by PollHostCommandAcknowledgement' do
+      should 'call PutHostCommandComplete when Failed status is given by PollHostCommandAcknowledgement' do
         @deploy_control_client.expects(:put_host_command_acknowledgement).
           with(:diagnostics => nil,
                :host_command_identifier => @command.host_command_identifier).
           returns(stub(:command_status => "Failed"))
 
+        @deploy_control_client.expects(:put_host_command_complete).
+          with(
+              :command_status => 'Failed',
+              :diagnostics => {
+                :format => "JSON",
+                :payload => {
+                  'error_code' => InstanceAgent::Plugins::CodeDeployPlugin::ScriptError::UNKNOWN_ERROR_CODE,
+                  'script_name' => "",
+                  'message' => 'Failed',
+                  'log' => ""}.to_json
+              },
+              :host_command_identifier => @command.host_command_identifier)
+
         @get_deployment_specification_state.become('never')
         @deploy_control_client.expects(:get_deployment_specification).never.
           when(@get_deployment_specification_state.is('never'))
         @put_host_command_complete_state.become('never')
-        @deploy_control_client.expects(:put_host_command_complete).never.
-          when(@put_host_command_complete_state.is('never'))
 
         @poller.perform
       end

data/test/instance_agent/plugins/codedeploy/deployment_specification_test.rb

@@ -3,15 +3,15 @@ require 'ostruct'
 require 'certificate_helper'
 
 class DeploymentSpecificationTest < InstanceAgentTestCase
-  context 'The Deployment Specification' do
-    def generate_signed_message_for(map)
-      message = @cert_helper.sign_message(map.to_json)
-      spec = OpenStruct.new({ :payload => message })
-      spec.format = "PKCS7/JSON"
 
-      return spec
-    end
+  def generate_signed_message_for(map)
+    message = @cert_helper.sign_message(map.to_json)
+    spec = OpenStruct.new({ :payload => message })
+    spec.format = "PKCS7/JSON"
+    return spec
+  end
 
+  context 'The Deployment Specification' do
     setup do
       @cert_helper = CertificateHelper.new
       @deployment_id = SecureRandom.uuid.to_s
@@ -37,8 +37,8 @@ class DeploymentSpecificationTest < InstanceAgentTestCase
       
       @packed_message = generate_signed_message_for(@deployment_spec)
       InstanceAgent::Config.init
-    end
-
+    end 
+   
     context "with JSON format" do
       should "populate the deployment id" do
         parsed_deployment_spec = InstanceAgent::Plugins::CodeDeployPlugin::DeploymentSpecification.parse(@packed_message)

data/test/instance_agent/plugins/codedeploy/hook_executor_test.rb

@@ -1,7 +1,6 @@
 require 'test_helper'
 require 'stringio'
 require 'fileutils'
-require 'com/amazon/codedeploy/command/v20141006/host_command_instance'
 
 class HookExecutorTest < InstanceAgentTestCase
 
@@ -12,6 +11,7 @@ class HookExecutorTest < InstanceAgentTestCase
                         :application_name => @application_name,
                         :deployment_id => @deployment_id,
                         :deployment_group_name => @deployment_group_name,
+                        :deployment_group_id => @deployment_group_id,
                         :deployment_root_dir => @deployment_root_dir,
                         :last_successful_deployment_dir => @last_successful_deployment_dir,
                         :app_spec_path => @app_spec_path})
@@ -22,11 +22,16 @@ class HookExecutorTest < InstanceAgentTestCase
       @deployment_id='12345'
       @application_name='TestApplication'
       @deployment_group_name='TestDeploymentGroup'
+      @deployment_group_id='foo'
       @deployment_root_dir = "deployment/root/dir"
       @last_successful_deployment_dir = "last/deployment/root/dir"
       @app_spec_path = "app_spec"
       @app_spec =  { "version" => 0.0, "os" => "linux" }
       YAML.stubs(:load).returns(@app_spec)
+      @root_dir = '/tmp/codedeploy'
+      logger = mock
+      logger.stubs(:log)
+      InstanceAgent::DeploymentLog.stubs(:instance).returns(logger)
     end
 
     context "when creating a hook command" do
@@ -41,6 +46,7 @@ class HookExecutorTest < InstanceAgentTestCase
                                               :application_name => @application_name,
                                               :deployment_id => @deployment_id,
                                               :deployment_group_name => @deployment_group_name,
+                                              :deployment_group_id => @deployment_group_id,
                                               :deployment_root_dir => @deployment_root_dir,
                                               :app_spec_path => @app_spec_path})
         end
@@ -56,7 +62,8 @@ class HookExecutorTest < InstanceAgentTestCase
           assert_raise do
             @hook_executor = HookExecutor.new ({:lifecycle_event => @lifecycle_event,
                                                 :application_name => @application_name,
-                                                :deployment_group_name => @deployment_gtroup_name,
+                                                :deployment_group_name => @deployment_group_name,
+                                                :deployment_group_id => @deployment_group_id,
                                                 :deployment_id => @deployment_id,
                                                 :deployment_root_dir => @deployment_root_dir})
           end
@@ -94,7 +101,8 @@ class HookExecutorTest < InstanceAgentTestCase
         @child_env={'LIFECYCLE_EVENT' => @lifecycle_event.to_s,
                     'DEPLOYMENT_ID'   => @deployment_id.to_s,
                     'APPLICATION_NAME' => @application_name.to_s,
-                    'DEPLOYMENT_GROUP_NAME' => @deployment_group_name.to_s}
+                    'DEPLOYMENT_GROUP_NAME' => @deployment_group_name.to_s,
+                    'DEPLOYMENT_GROUP_ID' => @deployment_group_id.to_s}
       end
 
       context "no scripts to run for a given hook" do
@@ -123,7 +131,7 @@ class HookExecutorTest < InstanceAgentTestCase
           end
 
           should "raise and exception" do
-            assert_raised_with_message('Script does not exist at specified location: test', ScriptError)do
+            assert_raised_with_message("Script does not exist at specified location: #{File.expand_path(@deployment_root_dir)}/deployment-archive/test", ScriptError)do
               @hook_executor.execute
             end
           end

data/test/test_helper.rb

@@ -1,4 +1,9 @@
 # encoding: UTF-8
+$:.unshift "lib"
+Gem.use_paths(nil, Gem.path << "vendor")
+
+require 'coveralls'
+Coveralls.wear!
 require 'thread'
 require 'rubygems'
 require "bundler"
@@ -13,4 +18,4 @@ require 'base64'
 
 # require local test helpers. If you need a helper write,
 # keep this pattern or you'll be punished hard
-require 'helpers/instance_agent_helper'
+require 'instance_agent_helper'

data/vendor/gems/codedeploy-commands/apis/CodeDeployCommand.api.json

@@ -1,4 +1,5 @@
 {
+  "version": "2.0",
   "metadata": {
     "apiVersion": "2014-10-06",
     "endpointPrefix": "codedeploy-commands",

data/vendor/gems/codedeploy-commands/lib/aws/codedeploy_commands.rb

@@ -3,6 +3,7 @@ gem_root = File.dirname(File.dirname(File.dirname(__FILE__)))
 require 'aws-sdk-core'
 require "#{gem_root}/lib/aws/plugins/certificate_authority"
 require "#{gem_root}/lib/aws/plugins/deploy_control_endpoint"
+require "#{gem_root}/lib/aws/plugins/deploy_agent_version"
 
 version = '1.0.0'
 
@@ -15,4 +16,5 @@ bundled_apis.each do |svc_class_name, api_versions|
   svc_class.const_set(:VERSION, version)
   Aws::CodeDeployCommand::Client.add_plugin(Aws::Plugins::CertificateAuthority)
   Aws::CodeDeployCommand::Client.add_plugin(Aws::Plugins::DeployControlEndpoint)
+  Aws::CodeDeployCommand::Client.add_plugin(Aws::Plugins::DeployAgentVersion)
 end

data/vendor/gems/codedeploy-commands/lib/aws/plugins/deploy_agent_version.rb

@@ -0,0 +1,31 @@
+module Aws
+  module Plugins
+    class DeployAgentVersion < Seahorse::Client::Plugin
+      class Handler < Seahorse::Client::Handler
+        def initialize(handler = nil)
+          @handler = handler
+          file_path = File.expand_path(File.join(InstanceAgent::Platform.util.codedeploy_version_file, '.version'))
+          if File.exist?(file_path)
+            @agent_version ||= File.read(file_path).split(': ').last.strip
+          else 
+            @agent_version ||= "UNKNOWN_VERSION"
+            log(:warn, "Version tracking file either does not exist or cannot be read in #{file_path}.")
+          end
+        end
+
+        def call(context)
+          context.http_request.headers['x-amz-codedeploy-agent-version'] = @agent_version
+          @handler.call(context)
+        end
+        
+        private
+        def log(severity, message)
+          raise ArgumentError, "Unknown severity #{severity.inspect}" unless InstanceAgent::Log::SEVERITIES.include?(severity.to_s)
+          InstanceAgent::Log.send(severity.to_sym, "#{message}")
+        end
+      end
+
+      handler(Handler)
+    end
+  end
+end

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

@@ -6,18 +6,7 @@ module Aws
       option(:endpoint) do |cfg|
         url = ENV['AWS_DEPLOY_CONTROL_ENDPOINT']
         if url.nil?
-          case cfg.region
-            when "us-east-1"
-              url = "https://codedeploy-commands.us-east-1.amazonaws.com"
-            when "us-west-2"
-              url = "https://codedeploy-commands.us-west-2.amazonaws.com"
-            when "eu-west-1"
-              url = "https://codedeploy-commands.eu-west-1.amazonaws.com"
-            when "ap-southeast-2"
-              url = "https://codedeploy-commands.ap-southeast-2.amazonaws.com"
-            else
-              raise "Not able to find an endpoint. Unknown region."
-          end
+          url = "https://codedeploy-commands.#{cfg.region}.amazonaws.com"
         end
         url
       end

data/vendor/gems/process_manager/lib/process_manager/master.rb

@@ -163,10 +163,10 @@ module ProcessManager
 
       def handle_pid_file       
         @file_lock ||= File.open(pid_lock_file, File::RDWR|File::CREAT, 0644)
-        lock_aquired = @file_lock.flock(File::LOCK_EX | File::LOCK_NB)
+        lock_acquired = @file_lock.flock(File::LOCK_EX | File::LOCK_NB)
         
-        if lock_aquired == false
-          ProcessManager::Log.info("Could not aquire lock on #{pid_lock_file} - aborting start!")
+        if lock_acquired == false
+          ProcessManager::Log.info("Could not acquire lock on #{pid_lock_file} - aborting start!")
           self.class.abort
         
         elsif File.exists?(pid_file)

data/vendor/specifications/codedeploy-commands-1.0.0.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |s|
   s.authors = ["Amazon Web Services"]
   s.date = "2015-06-30"
   s.description = "Provides client libraries for CodeDeploy Command."
-  s.files = ["lib/aws/plugins/deploy_control_endpoint.rb", "lib/aws/plugins/certificate_authority.rb", "lib/aws/codedeploy_commands.rb", "apis/CodeDeployCommand.api.json"]
-  s.homepage = "https://github.com/aws/aws-codedeploy-agent"
+  s.files = ["lib/aws/codedeploy_commands.rb", "lib/aws/plugins/certificate_authority.rb", "lib/aws/plugins/deploy_control_endpoint.rb", "apis/CodeDeployCommand.api.json"]
+  s.homepage = "https://devcentral.amazon.com/ac/brazil/directory/package/overview/Ruby-codedeploy-commands"
   s.licenses = ["Apache 2.0"]
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.23.2"
@@ -19,11 +19,11 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<aws-sdk-core>, ["= 2.0.42"])
+      s.add_runtime_dependency(%q<aws-sdk-core>, ["~> 2.2.0"])
     else
-      s.add_dependency(%q<aws-sdk-core>, ["= 2.0.42"])
+      s.add_dependency(%q<aws-sdk-core>, ["~> 2.2.0"])
     end
   else
-    s.add_dependency(%q<aws-sdk-core>, ["= 2.0.42"])
+    s.add_dependency(%q<aws-sdk-core>, ["~> 2.2.0"])
   end
 end