Merge pull request sous-chefs#1114 from chef-cookbooks/Kapil/Github-1…

…081_docker_exec_does_not_check_the_return_code_of_the_command_it_runs

Fix for docker_exec does not check the return code of the command it runs

libraries/docker_exec.rb

@@ -7,13 +7,20 @@ class DockerExec < DockerBase
     property :container, String
     property :timeout, Numeric, default: 60, desired_state: false
     property :container_obj, Docker::Container, desired_state: false
+    property :returns, [ Integer, Array ], coerce: proc { |v| Array(v) }, default: [0],
+      description: 'The return value for a command. This may be an array of accepted values. An exception is raised when the return value(s) do not match.'
 
     alias_method :cmd, :command
 
     action :run do
       converge_by "executing #{new_resource.command} on #{new_resource.container}" do
         with_retries { new_resource.container_obj Docker::Container.get(new_resource.container, {}, connection) }
-        new_resource.container_obj.exec(new_resource.command, wait: new_resource.timeout)
+        stdout, stderr, exit_code = new_resource.container_obj.exec(new_resource.command, wait: new_resource.timeout)
+        Chef::Log.trace(stdout)
+        Chef::Log.trace(stderr)
+        unless new_resource.returns.include?(exit_code)
+          raise "Expected process to exit with 0, but received #{exit_code}"
+        end
       end
     end
   end

spec/docker_test/exec_spec.rb

@@ -14,6 +14,19 @@
     )
   end
 
+  context 'testing default properties' do
+    it 'docker_exec[default]' do
+      expect(chef_run).to run_docker_exec('default').with(
+        host: nil,
+        command: nil,
+        container: nil,
+        timeout: 60,
+        container_obj: nil,
+        returns: [0]
+      )
+    end
+  end
+
   context 'testing run action' do
     it 'run docker_exec[touch_it]' do
       expect(chef_run).to run_docker_exec('touch_it').with(

spec/docker_test/installation_package_spec.rb

@@ -9,7 +9,7 @@
 
   context 'testing default action, default properties' do
     it 'installs docker' do
-      expect(chef_run).to create_docker_installation_package('default').with(version: '19.03.5')
+      expect(chef_run).to create_docker_installation_package('default').with(version: '19.03.8')
     end
   end
 

test/cookbooks/docker_test/recipes/exec.rb

@@ -23,3 +23,5 @@
 end
 
 file '/marker_busybox_exec_twofile'
+
+docker_exec 'default'