Merge pull request #6835 from nathwill/sd-moar-actions

add additional systemd_unit actions

4 files changed, 74 insertions, 7 deletions

diff --git a/lib/chef/provider/systemd_unit.rb b/lib/chef/provider/systemd_unit.rb
index dcef93bfde..420438775c 100644
--- a/lib/chef/provider/systemd_unit.rb
+++ b/lib/chef/provider/systemd_unit.rb
@@ -1,6 +1,6 @@
 #
 # Author:: Nathan Williams (<nath.e.will@gmail.com>)
-# Copyright:: Copyright 2016, Nathan Williams
+# Copyright:: Copyright 2016-2018, Nathan Williams
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -74,6 +74,18 @@ class Chef
         end
       end
 
+      def action_preset
+        converge_by("restoring enable/disable preset configuration for unit: #{new_resource.unit_name}") do
+          systemctl_execute!(:preset, new_resource.unit_name)
+        end
+      end
+
+      def action_revert
+        converge_by("reverting to vendor version of unit: #{new_resource.unit_name}") do
+          systemctl_execute!(:revert, new_resource.unit_name)
+        end
+      end
+
       def action_enable
         if current_resource.static
           Chef::Log.debug("#{new_resource.unit_name} is a static unit, enabling is a NOP.")
@@ -98,6 +110,12 @@ class Chef
         end
       end
 
+      def action_reenable
+        converge_by("reenabling unit: #{new_resource.unit_name}") do
+          systemctl_execute!(:reenable, new_resource.unit_name)
+        end
+      end
+
       def action_mask
         unless current_resource.masked
           converge_by("masking unit: #{new_resource.unit_name}") do
diff --git a/lib/chef/resource/systemd_unit.rb b/lib/chef/resource/systemd_unit.rb
index b08b26efa7..baf7e4cfa8 100644
--- a/lib/chef/resource/systemd_unit.rb
+++ b/lib/chef/resource/systemd_unit.rb
@@ -1,6 +1,6 @@
 #
 # Author:: Nathan Williams (<nath.e.will@gmail.com>)
-# Copyright:: Copyright 2016, Nathan Williams
+# Copyright:: Copyright 2016-2018, Nathan Williams
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -29,7 +29,8 @@ class Chef
 
       default_action :nothing
       allowed_actions :create, :delete,
-                      :enable, :disable,
+                      :preset, :revert,
+                      :enable, :disable, :reenable,
                       :mask, :unmask,
                       :start, :stop,
                       :restart, :reload,
diff --git a/spec/unit/provider/systemd_unit_spec.rb b/spec/unit/provider/systemd_unit_spec.rb
index 8e19503814..15d5944992 100644
--- a/spec/unit/provider/systemd_unit_spec.rb
+++ b/spec/unit/provider/systemd_unit_spec.rb
@@ -1,6 +1,6 @@
 #
 # Author:: Nathan Williams (<nath.e.will@gmail.com>)
-# Copyright:: Copyright (c), Nathan Williams
+# Copyright:: Copyright 2016-2018, Nathan Williams
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -250,7 +250,7 @@ describe Chef::Provider::SystemdUnit do
                              .and_return(systemctl_path)
       end
 
-      describe "creates/deletes the unit" do
+      describe "creates/deletes/presets/reverts the unit" do
         it "creates the unit file when it does not exist" do
           allow(provider).to receive(:manage_unit_file)
                                .with(:create)
@@ -345,6 +345,22 @@ describe Chef::Provider::SystemdUnit do
             expect(provider).to_not receive(:manage_unit_file)
             provider.action_delete
           end
+
+          it "presets the unit" do
+            new_resource.user("joe")
+            expect(provider).to receive(:shell_out_with_systems_locale!)
+                                  .with("#{systemctl_path} --user preset #{unit_name_escaped}", user_cmd_opts)
+                                  .and_return(shell_out_success)
+            provider.action_preset
+          end
+
+          it "reverts the unit" do
+            new_resource.user("joe")
+            expect(provider).to receive(:shell_out_with_systems_locale!)
+                                  .with("#{systemctl_path} --user revert #{unit_name_escaped}", user_cmd_opts)
+                                  .and_return(shell_out_success)
+            provider.action_revert
+          end
         end
 
         context "when no user is specified" do
@@ -368,11 +384,33 @@ describe Chef::Provider::SystemdUnit do
             expect(provider).to_not receive(:manage_unit_file)
             provider.action_delete
           end
+
+          it "presets the unit" do
+            expect(provider).to receive(:shell_out_with_systems_locale!)
+                                  .with("#{systemctl_path} --system preset #{unit_name_escaped}", {})
+                                  .and_return(shell_out_success)
+            provider.action_preset
+          end
+
+          it "reverts the unit" do
+            expect(provider).to receive(:shell_out_with_systems_locale!)
+                                  .with("#{systemctl_path} --system revert #{unit_name_escaped}", {})
+                                  .and_return(shell_out_success)
+            provider.action_revert
+          end
         end
       end
 
-      describe "enables/disables the unit" do
+      describe "enables/disables/reenables the unit" do
         context "when a user is specified" do
+          it "reenables the unit" do
+            current_resource.user(user_name)
+            expect(provider).to receive(:shell_out_with_systems_locale!)
+                                  .with("#{systemctl_path} --user reenable #{unit_name_escaped}", user_cmd_opts)
+                                  .and_return(shell_out_success)
+            provider.action_reenable
+          end
+
           it "enables the unit when it is disabled" do
             current_resource.user(user_name)
             current_resource.enabled(false)
@@ -421,6 +459,13 @@ describe Chef::Provider::SystemdUnit do
         end
 
         context "when no user is specified" do
+          it "reenables the unit" do
+            expect(provider).to receive(:shell_out_with_systems_locale!)
+                                  .with("#{systemctl_path} --system reenable #{unit_name_escaped}", {})
+                                  .and_return(shell_out_success)
+            provider.action_reenable
+          end
+
           it "enables the unit when it is disabled" do
             current_resource.enabled(false)
             expect(provider).to receive(:shell_out_with_systems_locale!)
diff --git a/spec/unit/resource/systemd_unit_spec.rb b/spec/unit/resource/systemd_unit_spec.rb
index 15b792e6bf..9d156402a1 100644
--- a/spec/unit/resource/systemd_unit_spec.rb
+++ b/spec/unit/resource/systemd_unit_spec.rb
@@ -1,6 +1,6 @@
 #
 # Author:: Nathan Williams (<nath.e.will@gmail.com>)
-# Copyright:: Copyright 2016, Nathan Williams
+# Copyright:: Copyright 2016-2018, Nathan Williams
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -46,8 +46,11 @@ describe Chef::Resource::SystemdUnit do
   it "supports appropriate unit actions" do
     expect { resource.action :create }.not_to raise_error
     expect { resource.action :delete }.not_to raise_error
+    expect { resource.action :preset }.not_to raise_error
+    expect { resource.action :revert }.not_to raise_error
     expect { resource.action :enable }.not_to raise_error
     expect { resource.action :disable }.not_to raise_error
+    expect { resource.action :reenable }.not_to raise_error
     expect { resource.action :mask }.not_to raise_error
     expect { resource.action :unmask }.not_to raise_error
     expect { resource.action :start }.not_to raise_error