aws-codedeploy-agent 0.0.2 → 0.0.3

data/test/instance_agent/{codedeploy_plugin → plugins/codedeploy}/codedeploy_control_test.rb

@@ -2,7 +2,7 @@ require 'instance_metadata'
 
 class CodeDeployControlTest < InstanceAgentTestCase
 
-  include InstanceAgent::CodeDeployPlugin
+  include InstanceAgent::Plugins::CodeDeployPlugin
 
   context "The CodeDeploy interface client" do
 

data/test/instance_agent/{codedeploy_plugin → plugins/codedeploy}/command_executor_test.rb

@@ -1,12 +1,11 @@
 require 'test_helper'
 require 'stringio'
-require 'instance_agent/codedeploy_plugin/installer'
 require 'com/amazon/codedeploy/command/v20141006/host_command_instance'
 require 'aws-sdk-core/s3'
 
 class CodeDeployPluginCommandExecutorTest < InstanceAgentTestCase
 
-  include InstanceAgent::CodeDeployPlugin
+  include InstanceAgent::Plugins::CodeDeployPlugin
 
   context 'The CodeDeploy Plugin Command Executor' do
     setup do
@@ -20,7 +19,7 @@ class CodeDeployPluginCommandExecutorTest < InstanceAgentTestCase
         "AfterELBAdd"=>["AfterELBAdd"],
         "ValidateService"=>["ValidateService"]}
       @deploy_control_client = mock
-      @command_executor = InstanceAgent::CodeDeployPlugin::CommandExecutor.new({
+      @command_executor = InstanceAgent::Plugins::CodeDeployPlugin::CommandExecutor.new({
         :deploy_control_client => @deploy_control_client,
         :hook_mapping => @test_hook_mapping})
       @aws_region = 'us-east-1'
@@ -45,6 +44,8 @@ class CodeDeployPluginCommandExecutorTest < InstanceAgentTestCase
       setup do
         @cert_helper = CertificateHelper.new
         @deployment_id = SecureRandom.uuid
+        @deployment_group_name = "TestDeploymentGroup"
+        @application_name = "TestApplicationName"
         @deployment_group_id = "foo"
         @s3Revision = {
           "Bucket" => "mybucket",
@@ -54,6 +55,8 @@ class CodeDeployPluginCommandExecutorTest < InstanceAgentTestCase
         @deployment_spec = generate_signed_message_for({
           "DeploymentId" => @deployment_id.to_s,
           "DeploymentGroupId" => @deployment_group_id,
+          "ApplicationName" => @application_name,
+          "DeploymentGroupName" => @deployment_group_name,
           "Revision" => {
             "RevisionType" => "S3",
             "S3Revision" => @s3Revision
@@ -83,13 +86,13 @@ class CodeDeployPluginCommandExecutorTest < InstanceAgentTestCase
           FileUtils.unstub(:mkdir_p)
           FileUtils.expects(:mkdir_p).never
 
-          assert_raised_with_message('Unsupported command type: unknown-command.', InstanceAgent::CodeDeployPlugin::CommandExecutor::InvalidCommandNameFailure) do
+          assert_raised_with_message('Unsupported command type: unknown-command.', InstanceAgent::Plugins::CodeDeployPlugin::CommandExecutor::InvalidCommandNameFailure) do
             @command_executor.execute_command(@command, @deployment_spec)
           end
         end
 
         should "throw an exception" do
-          assert_raised_with_message('Unsupported command type: unknown-command.', InstanceAgent::CodeDeployPlugin::CommandExecutor::InvalidCommandNameFailure) do
+          assert_raised_with_message('Unsupported command type: unknown-command.', InstanceAgent::Plugins::CodeDeployPlugin::CommandExecutor::InvalidCommandNameFailure) do
             @command_executor.execute_command(@command, @deployment_spec)
           end
         end
@@ -124,7 +127,7 @@ class CodeDeployPluginCommandExecutorTest < InstanceAgentTestCase
 
         setup do
           @command.command_name = "Install"
-          InstanceAgent::CodeDeployPlugin::ApplicationSpecification::ApplicationSpecification.stubs(:parse).returns(@app_spec)
+          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)
@@ -197,6 +200,8 @@ class CodeDeployPluginCommandExecutorTest < InstanceAgentTestCase
             @deployment_spec = generate_signed_message_for({
               "DeploymentId" => @deployment_id.to_s,
               "DeploymentGroupId" => @deployment_group_id.to_s,
+              "ApplicationName" => @application_name,
+              "DeploymentGroupName" => @deployment_group_name,
               "Revision" => {
                 "RevisionType" => "S3",
                 "S3Revision" => {
@@ -224,6 +229,8 @@ class CodeDeployPluginCommandExecutorTest < InstanceAgentTestCase
             @deployment_spec = generate_signed_message_for({
               "DeploymentId" => @deployment_id.to_s,
               "DeploymentGroupId" => @deployment_group_id.to_s,
+              "ApplicationName" => @application_name,
+              "DeploymentGroupName" => @deployment_group_name,
               "Revision" => {
                 "RevisionType" => "S3",
                 "S3Revision" => {
@@ -242,6 +249,8 @@ class CodeDeployPluginCommandExecutorTest < InstanceAgentTestCase
             @deployment_spec = generate_signed_message_for({
               "DeploymentId" => @deployment_id.to_s,
               "DeploymentGroupId" => @deployment_group_id.to_s,
+              "ApplicationName" => @application_name,
+              "DeploymentGroupName" => @deployment_group_name,
               "Revision" => {
                 "RevisionType" => "S3",
                 "S3Revision" => {
@@ -260,6 +269,8 @@ class CodeDeployPluginCommandExecutorTest < InstanceAgentTestCase
             @deployment_spec = generate_signed_message_for({
               "DeploymentId" => @deployment_id.to_s,
               "DeploymentGroupId" => @deployment_group_id.to_s,
+              "ApplicationName" => @application_name,
+              "DeploymentGroupName" => @deployment_group_name,
               "Revision" => {
                 "RevisionType" => "S3",
                 "S3Revision" => {
@@ -277,6 +288,8 @@ class CodeDeployPluginCommandExecutorTest < InstanceAgentTestCase
             @deployment_spec = generate_signed_message_for({
               "DeploymentId" => @deployment_id.to_s,
               "DeploymentGroupId" => @deployment_group_id.to_s,
+              "ApplicationName" => @application_name,
+              "DeploymentGroupName" => @deployment_group_name,
               "Revision" => {
                 "RevisionType" => "S3",
                 "S3Revision" => {
@@ -294,6 +307,8 @@ class CodeDeployPluginCommandExecutorTest < InstanceAgentTestCase
             @deployment_spec = generate_signed_message_for({
               "DeploymentId" => @deployment_id.to_s,
               "DeploymentGroupId" => @deployment_group_id.to_s,
+              "ApplicationName" => @application_name,
+              "DeploymentGroupName" => @deployment_group_name,
               "Revision" => {
                 "RevisionType" => "S3",
                 "S3Revision" => {
@@ -311,6 +326,8 @@ class CodeDeployPluginCommandExecutorTest < InstanceAgentTestCase
             @deployment_spec = generate_signed_message_for({
               "DeploymentId" => @deployment_id.to_s,
               "DeploymentGroupId" => @deployment_group_id.to_s,
+              "ApplicationName" => @application_name,
+              "DeploymentGroupName" => @deployment_group_name,
               "Revision" => {
                 "RevisionType" => "S3",
                 "S3Revision" => {
@@ -342,9 +359,12 @@ class CodeDeployPluginCommandExecutorTest < InstanceAgentTestCase
       context "I have an empty app spec (for script mapping)" do
         setup do
           File.stubs(:read).with(File.join(@archive_root_dir, 'appspec.yml')).returns(nil)
-          InstanceAgent::CodeDeployPlugin::ApplicationSpecification::ApplicationSpecification.stubs(:parse).returns(nil)
+          InstanceAgent::Plugins::CodeDeployPlugin::ApplicationSpecification::ApplicationSpecification.stubs(:parse).returns(nil)
           @hook_executor_constructor_hash = {
-            :deployment_root_dir => @deployment_root_dir,
+            :application_name => @application_name,
+            :deployment_id => @deployment_id,
+            :deployment_group_name => @deployment_group_name,
+            :deployment_root_dir => @deployment_root_dir, 
             :last_successful_deployment_dir => nil,
             :app_spec_path => 'appspec.yml'}
           @mock_hook_executor = mock
@@ -474,11 +494,14 @@ class CodeDeployPluginCommandExecutorTest < InstanceAgentTestCase
           @command.command_name = "test_command"
           @test_hook_mapping = { "test_command" => ["lifecycle_event_1","lifecycle_event_2"]}
           @deploy_control_client = mock
-          @command_executor = InstanceAgent::CodeDeployPlugin::CommandExecutor.new({
+          @command_executor = InstanceAgent::Plugins::CodeDeployPlugin::CommandExecutor.new({
             :deploy_control_client => @deploy_control_client,
             :hook_mapping => @test_hook_mapping})
           hook_executor_constructor_hash = {
             :deployment_root_dir => @deployment_root_dir,
+            :application_name => @application_name,
+            :deployment_id => @deployment_id,
+            :deployment_group_name => @deployment_group_name,
             :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/{codedeploy_plugin → plugins/codedeploy}/command_poller_test.rb

@@ -4,12 +4,12 @@ require 'json'
 class CommandPollerTest < InstanceAgentTestCase
 
   def gather_diagnostics_from_error(error)
-    {'error_code' => InstanceAgent::CodeDeployPlugin::ScriptError::UNKNOWN_ERROR_CODE, 'script_name' => "", 'message' => error.message, 'log' => ""}.to_json
+    {'error_code' => InstanceAgent::Plugins::CodeDeployPlugin::ScriptError::UNKNOWN_ERROR_CODE, 'script_name' => "", 'message' => error.message, 'log' => ""}.to_json
   end
 
   def gather_diagnostics(script_output)
     script_output ||= ""
-    {'error_code' => InstanceAgent::CodeDeployPlugin::ScriptError::SUCCEEDED_CODE, 'script_name' => "", 'message' => "Succeeded", 'log' => script_output}.to_json
+    {'error_code' => InstanceAgent::Plugins::CodeDeployPlugin::ScriptError::SUCCEEDED_CODE, 'script_name' => "", 'message' => "Succeeded", 'log' => script_output}.to_json
   end
 
   context 'The command poller' do
@@ -27,25 +27,25 @@ class CommandPollerTest < InstanceAgentTestCase
       InstanceMetadata.stubs(:region).returns(@aws_region)
       InstanceMetadata.stubs(:host_identifier).returns(@host_identifier)
 
-      InstanceAgent::CodeDeployPlugin::CodeDeployControl.stubs(:new).
+      InstanceAgent::Plugins::CodeDeployPlugin::CodeDeployControl.stubs(:new).
         returns(@deploy_control_api)
       @deploy_control_api.stubs(:get_client).
         returns(@deploy_control_client)
 
-      InstanceAgent::CodeDeployPlugin::CommandExecutor.stubs(:new).
+      InstanceAgent::Plugins::CodeDeployPlugin::CommandExecutor.stubs(:new).
         returns(@executor)
 
-      @poller = InstanceAgent::CodeDeployPlugin::CommandPoller.new
+      @poller = InstanceAgent::Plugins::CodeDeployPlugin::CommandPoller.new
     end
 
     context 'on initializing' do
 
       should 'construct a client using the configured region' do
-        InstanceAgent::CodeDeployPlugin::CodeDeployControl.expects(:new).
+        InstanceAgent::Plugins::CodeDeployPlugin::CodeDeployControl.expects(:new).
           with(has_entries(:region => @aws_region)).
           returns(@deploy_control_api)
 
-        InstanceAgent::CodeDeployPlugin::CommandPoller.new
+        InstanceAgent::Plugins::CodeDeployPlugin::CommandPoller.new
       end
 
       should 'construct an CodeDeploy command executor' do
@@ -58,12 +58,11 @@ class CommandPollerTest < InstanceAgentTestCase
           "BeforeELBAdd"=>["BeforeELBAdd"],
           "AfterELBAdd"=>["AfterELBAdd"],
           "ValidateService"=>["ValidateService"]}
-        InstanceAgent::CodeDeployPlugin::CommandExecutor.expects(:new).
-          with(:deploy_control_client => @deploy_control_client,
-               :hook_mapping => test_hook_mapping).
+        InstanceAgent::Plugins::CodeDeployPlugin::CommandExecutor.expects(:new).
+          with(:hook_mapping => test_hook_mapping).
           returns(@executor)
 
-        InstanceAgent::CodeDeployPlugin::CommandPoller.new
+        InstanceAgent::Plugins::CodeDeployPlugin::CommandPoller.new
       end
 
     end
@@ -420,10 +419,10 @@ class CommandPollerTest < InstanceAgentTestCase
 
       should 'allow script errors from execute_command to propagate diagnostic information to caller' do
         begin
-          script_log = InstanceAgent::CodeDeployPlugin::ScriptLog.new
+          script_log = InstanceAgent::Plugins::CodeDeployPlugin::ScriptLog.new
           script_log.append_to_log("log entries")
-          raise InstanceAgent::CodeDeployPlugin::ScriptError.new(InstanceAgent::CodeDeployPlugin::ScriptError::SCRIPT_FAILED_CODE, "file_location", script_log), 'message'
-        rescue InstanceAgent::CodeDeployPlugin::ScriptError => e
+          raise InstanceAgent::Plugins::CodeDeployPlugin::ScriptError.new(InstanceAgent::Plugins::CodeDeployPlugin::ScriptError::SCRIPT_FAILED_CODE, "file_location", script_log), 'message'
+        rescue InstanceAgent::Plugins::CodeDeployPlugin::ScriptError => e
           script_error = e
         end
 

data/test/instance_agent/{codedeploy_plugin → plugins/codedeploy}/deployment_specification_test.rb

@@ -16,6 +16,8 @@ class DeploymentSpecificationTest < InstanceAgentTestCase
       @cert_helper = CertificateHelper.new
       @deployment_id = SecureRandom.uuid.to_s
       @deployment_group_id = SecureRandom.uuid.to_s
+      @deployment_group_name = "TestDeploymentGroup"
+      @application_name = "TestApplication"
       @s3Revision = {
         "Bucket" => "mybucket",
         "Key" => "mykey",
@@ -26,37 +28,46 @@ class DeploymentSpecificationTest < InstanceAgentTestCase
         "S3Revision" => @s3Revision
       }
       @deployment_spec = {
+        "ApplicationName" => @application_name,
         "DeploymentId" => @deployment_id,
+        "DeploymentGroupName" => @deployment_group_name,
         "DeploymentGroupId" => @deployment_group_id,
         "Revision" => @revision
       }
+      
       @packed_message = generate_signed_message_for(@deployment_spec)
       InstanceAgent::Config.init
     end
 
     context "with JSON format" do
       should "populate the deployment id" do
-        parsed_deployment_spec = InstanceAgent::CodeDeployPlugin::DeploymentSpecification.parse(@packed_message)
+        parsed_deployment_spec = InstanceAgent::Plugins::CodeDeployPlugin::DeploymentSpecification.parse(@packed_message)
         assert_equal @deployment_id, parsed_deployment_spec.deployment_id
         assert_equal @s3Revision, parsed_deployment_spec.revision
+        assert_equal @deployment_group_name, parsed_deployment_spec.deployment_group_name
+        assert_equal @application_name, parsed_deployment_spec.application_name
       end
     end
 
     context "with arn deployment id" do
       setup do
         @deployment_spec = {
+          "ApplicationName" => @application_name,
           "DeploymentId" => "arn:aws:codedeploy:region:account:deployment/#{@deployment_id}",
           "DeploymentGroupId" => @deployment_group_id,
+          "DeploymentGroupName" => @deployment_group_name,
           "Revision" => @revision
         }
         @packed_message = generate_signed_message_for(@deployment_spec)
       end
 
       should "populate the Bundle" do
-        parsed_deployment_spec = InstanceAgent::CodeDeployPlugin::DeploymentSpecification.parse(@packed_message)
+        parsed_deployment_spec = InstanceAgent::Plugins::CodeDeployPlugin::DeploymentSpecification.parse(@packed_message)
         assert_equal @deployment_id, parsed_deployment_spec.deployment_id
         assert_equal @deployment_group_id, parsed_deployment_spec.deployment_group_id
         assert_equal @s3Revision, parsed_deployment_spec.revision
+        assert_equal @deployment_group_name, parsed_deployment_spec.deployment_group_name
+        assert_equal @application_name, parsed_deployment_spec.application_name
       end
     end
 
@@ -67,7 +78,7 @@ class DeploymentSpecificationTest < InstanceAgentTestCase
 
       should "raise an exception" do
         assert_raised_with_message("Unsupported DeploymentSpecification format: XML") do
-          parsed_deployment_spec = InstanceAgent::CodeDeployPlugin::DeploymentSpecification.parse(@packed_message)
+          parsed_deployment_spec = InstanceAgent::Plugins::CodeDeployPlugin::DeploymentSpecification.parse(@packed_message)
         end
       end
     end
@@ -79,10 +90,12 @@ class DeploymentSpecificationTest < InstanceAgentTestCase
       end
 
       should "populate the Bundle" do
-        parsed_deployment_spec = InstanceAgent::CodeDeployPlugin::DeploymentSpecification.parse(@packed_message)
+        parsed_deployment_spec = InstanceAgent::Plugins::CodeDeployPlugin::DeploymentSpecification.parse(@packed_message)
         assert_equal @deployment_id, parsed_deployment_spec.deployment_id
         assert_equal @deployment_group_id, parsed_deployment_spec.deployment_group_id
         assert_equal @s3Revision, parsed_deployment_spec.revision
+        assert_equal @deployment_group_name, parsed_deployment_spec.deployment_group_name
+        assert_equal @application_name, parsed_deployment_spec.application_name
       end
     end
 
@@ -93,7 +106,7 @@ class DeploymentSpecificationTest < InstanceAgentTestCase
 
       should "raise an exception" do
         assert_raised_with_message("Unsupported DeploymentSpecification format: ") do
-          InstanceAgent::CodeDeployPlugin::DeploymentSpecification.parse(@packed_message)
+          InstanceAgent::Plugins::CodeDeployPlugin::DeploymentSpecification.parse(@packed_message)
         end
       end
     end
@@ -105,7 +118,7 @@ class DeploymentSpecificationTest < InstanceAgentTestCase
 
       should "raise a runtime exception" do
         assert_raised_with_message("Provided deployment spec was nil") do
-          InstanceAgent::CodeDeployPlugin::DeploymentSpecification.parse(@packed_message)
+          InstanceAgent::Plugins::CodeDeployPlugin::DeploymentSpecification.parse(@packed_message)
         end
       end
     end
@@ -118,7 +131,7 @@ class DeploymentSpecificationTest < InstanceAgentTestCase
 
       should "raise a runtime exception" do
         assert_raised_with_message("Deployment Spec has no DeploymentId") do
-          InstanceAgent::CodeDeployPlugin::DeploymentSpecification.parse(@packed_message)
+          InstanceAgent::Plugins::CodeDeployPlugin::DeploymentSpecification.parse(@packed_message)
         end
       end
     end
@@ -131,7 +144,7 @@ class DeploymentSpecificationTest < InstanceAgentTestCase
 
       should "raise a runtime exception" do
         assert_raised_with_message("Deployment Spec has no DeploymentId") do
-          InstanceAgent::CodeDeployPlugin::DeploymentSpecification.parse(@packed_message)
+          InstanceAgent::Plugins::CodeDeployPlugin::DeploymentSpecification.parse(@packed_message)
         end
       end
     end
@@ -144,7 +157,7 @@ class DeploymentSpecificationTest < InstanceAgentTestCase
 
       should "raise a runtime exception" do
         assert_raised_with_message("Deployment Spec has no DeploymentId") do
-          InstanceAgent::CodeDeployPlugin::DeploymentSpecification.parse(@packed_message)
+          InstanceAgent::Plugins::CodeDeployPlugin::DeploymentSpecification.parse(@packed_message)
         end
       end
     end
@@ -157,7 +170,7 @@ class DeploymentSpecificationTest < InstanceAgentTestCase
 
       should "raise a runtime exception" do
         assert_raised_with_message("Deployment Spec has no DeploymentGroupId") do
-          InstanceAgent::CodeDeployPlugin::DeploymentSpecification.parse(@packed_message)
+          InstanceAgent::Plugins::CodeDeployPlugin::DeploymentSpecification.parse(@packed_message)
         end
       end
     end
@@ -170,7 +183,59 @@ class DeploymentSpecificationTest < InstanceAgentTestCase
 
       should "raise a runtime exception" do
         assert_raised_with_message("Deployment Spec has no DeploymentGroupId") do
-          InstanceAgent::CodeDeployPlugin::DeploymentSpecification.parse(@packed_message)
+          InstanceAgent::Plugins::CodeDeployPlugin::DeploymentSpecification.parse(@packed_message)
+        end
+      end
+    end
+
+    context "with no deployment group name" do
+      setup do
+        @deployment_spec.delete("DeploymentGroupName")
+        @packed_message = generate_signed_message_for(@deployment_spec)
+      end
+
+      should "raise a runtime exception" do
+        assert_raised_with_message("Deployment Spec has no DeploymentGroupName") do
+          InstanceAgent::Plugins::CodeDeployPlugin::DeploymentSpecification.parse(@packed_message)
+        end
+      end
+    end
+
+    context "with null deployment group name" do
+      setup do
+        @deployment_spec["DeploymentGroupName"] = nil
+        @packed_message = generate_signed_message_for(@deployment_spec)
+      end
+
+      should "raise a runtime exception" do
+        assert_raised_with_message("Deployment Spec has no DeploymentGroupName") do
+          InstanceAgent::Plugins::CodeDeployPlugin::DeploymentSpecification.parse(@packed_message)
+        end
+      end
+    end
+
+    context "with no application name" do
+      setup do
+        @deployment_spec.delete("ApplicationName")
+        @packed_message = generate_signed_message_for(@deployment_spec)
+      end
+
+      should "raise a runtime exception" do
+        assert_raised_with_message("Deployment Spec has no ApplicationName") do
+          InstanceAgent::Plugins::CodeDeployPlugin::DeploymentSpecification.parse(@packed_message)
+        end
+      end
+    end
+
+    context "with null application name" do
+      setup do
+        @deployment_spec["ApplicationName"] = nil
+        @packed_message = generate_signed_message_for(@deployment_spec)
+      end
+
+      should "raise a runtime exception" do
+        assert_raised_with_message("Deployment Spec has no ApplicationName") do
+          InstanceAgent::Plugins::CodeDeployPlugin::DeploymentSpecification.parse(@packed_message)
         end
       end
     end
@@ -183,7 +248,7 @@ class DeploymentSpecificationTest < InstanceAgentTestCase
 
       should "raise a runtime exception" do
         assert_raised_with_message("Deployment Spec has no DeploymentGroupId") do
-          InstanceAgent::CodeDeployPlugin::DeploymentSpecification.parse(@packed_message)
+          InstanceAgent::Plugins::CodeDeployPlugin::DeploymentSpecification.parse(@packed_message)
         end
       end
     end
@@ -196,7 +261,7 @@ class DeploymentSpecificationTest < InstanceAgentTestCase
 
       should "raise a runtime exception" do
         assert_raised_with_message('Must specify a revison') do
-          InstanceAgent::CodeDeployPlugin::DeploymentSpecification.parse(@packed_message)
+          InstanceAgent::Plugins::CodeDeployPlugin::DeploymentSpecification.parse(@packed_message)
         end
       end
     end
@@ -209,7 +274,7 @@ class DeploymentSpecificationTest < InstanceAgentTestCase
 
       should "raise a runtime exception" do
         assert_raised_with_message('Must specify a revison') do
-          InstanceAgent::CodeDeployPlugin::DeploymentSpecification.parse(@packed_message)
+          InstanceAgent::Plugins::CodeDeployPlugin::DeploymentSpecification.parse(@packed_message)
         end
       end
     end
@@ -222,14 +287,14 @@ class DeploymentSpecificationTest < InstanceAgentTestCase
 
       should "raise a runtime exception" do
         assert_raised_with_message("Must specify a revision source") do
-          InstanceAgent::CodeDeployPlugin::DeploymentSpecification.parse(@packed_message)
+          InstanceAgent::Plugins::CodeDeployPlugin::DeploymentSpecification.parse(@packed_message)
         end
       end
     end
 
     context "with S3 Revision" do
       should "parse correctly" do
-        parsed_deployment_spec = InstanceAgent::CodeDeployPlugin::DeploymentSpecification.parse(@packed_message)
+        parsed_deployment_spec = InstanceAgent::Plugins::CodeDeployPlugin::DeploymentSpecification.parse(@packed_message)
         assert_equal @s3Revision, parsed_deployment_spec.revision
       end
 
@@ -245,12 +310,14 @@ class DeploymentSpecificationTest < InstanceAgentTestCase
         @deployment_spec = {
           "DeploymentId" => @deployment_id,
           "DeploymentGroupId" => @deployment_group_id,
-          "Revision" => @revision
+          "Revision" => @revision,
+          "DeploymentGroupName" => @deployment_group_name,
+          "ApplicationName" => @application_name
         }
         @packed_message = generate_signed_message_for(@deployment_spec)
 
         assert_raised_with_message("S3Revision in Deployment Spec must specify Bucket, Key and BundleType") do
-          InstanceAgent::CodeDeployPlugin::DeploymentSpecification.parse(@packed_message)
+          InstanceAgent::Plugins::CodeDeployPlugin::DeploymentSpecification.parse(@packed_message)
         end
       end
 
@@ -266,12 +333,14 @@ class DeploymentSpecificationTest < InstanceAgentTestCase
         @deployment_spec = {
           "DeploymentId" => @deployment_id,
           "DeploymentGroupId" => @deployment_group_id,
-          "Revision" => @revision
+          "Revision" => @revision,
+          "DeploymentGroupName" => @deployment_group_name,
+          "ApplicationName" => @application_name
         }
         @packed_message = generate_signed_message_for(@deployment_spec)
 
         assert_raised_with_message("S3Revision in Deployment Spec must specify Bucket, Key and BundleType") do
-          InstanceAgent::CodeDeployPlugin::DeploymentSpecification.parse(@packed_message)
+          InstanceAgent::Plugins::CodeDeployPlugin::DeploymentSpecification.parse(@packed_message)
         end
       end
 
@@ -287,12 +356,14 @@ class DeploymentSpecificationTest < InstanceAgentTestCase
         @deployment_spec = {
           "DeploymentId" => @deployment_id,
           "DeploymentGroupId" => @deployment_group_id,
-          "Revision" => @revision
+          "Revision" => @revision,
+          "DeploymentGroupName" => @deployment_group_name,
+          "ApplicationName" => @application_name
         }
         @packed_message = generate_signed_message_for(@deployment_spec)
 
         assert_raised_with_message("S3Revision in Deployment Spec must specify Bucket, Key and BundleType") do
-          InstanceAgent::CodeDeployPlugin::DeploymentSpecification.parse(@packed_message)
+          InstanceAgent::Plugins::CodeDeployPlugin::DeploymentSpecification.parse(@packed_message)
         end
       end
 
@@ -309,12 +380,14 @@ class DeploymentSpecificationTest < InstanceAgentTestCase
         @deployment_spec = {
           "DeploymentId" => @deployment_id,
           "DeploymentGroupId" => @deployment_group_id,
-          "Revision" => @revision
+          "Revision" => @revision,
+          "DeploymentGroupName" => @deployment_group_name,
+          "ApplicationName" => @application_name
         }
         @packed_message = generate_signed_message_for(@deployment_spec)
 
         assert_raised_with_message("BundleType in S3Revision must be tar, tgz or zip") do
-          InstanceAgent::CodeDeployPlugin::DeploymentSpecification.parse(@packed_message)
+          InstanceAgent::Plugins::CodeDeployPlugin::DeploymentSpecification.parse(@packed_message)
         end
       end
 
@@ -323,7 +396,7 @@ class DeploymentSpecificationTest < InstanceAgentTestCase
 
         assert_raised_with_message("Could not parse the PKCS7: nested asn1 error") do
           begin
-            InstanceAgent::CodeDeployPlugin::DeploymentSpecification.parse(@packed_message)
+            InstanceAgent::Plugins::CodeDeployPlugin::DeploymentSpecification.parse(@packed_message)
           rescue ArgumentError => e
             raise e.message
           end