Merge pull request #62 from elyscape/remove_prompt

(MODULES-1638) Remove prompt parameter

Author: cyberious

README.md

@@ -88,7 +88,6 @@ The main type of the module, responsible for all its functionality.
 
 ####Features
 
-* `supports_reboot_prompting`: Notifies the node's user that a reboot is pending, and let them cancel the pending reboot process. (Available with the `windows` provider. Linux terminal users get a shutdown notice regardless of this parameter, but they can't cancel the reboot.)
 * `manages_reboot_pending`: Detects whether a reboot is pending due to a prior change. If so, reboot the node. (Available with the `windows` provider.)
 
 ####Parameters
@@ -111,14 +110,6 @@ The main type of the module, responsible for all its functionality.
 
 *Required.* Sets the name of the reboot resource. Valid options: a string.
 
-#####`prompt`
-
-*Optional.* Specifies whether to prompt the user to continue the reboot. Only for use in a masterless configuration. Valid options: 'true' and 'false'. Default value: 'false'.
-
-**Note:** If this parameter is set to 'true', you must prompt Puppet agent runs manually using `puppet apply`. Otherwise, the prompt is never displayed to the user, and the agent run waits indefinitely.
-
-Prompts are only available in Windows. Linux terminal users get a shutdown notice regardless of this parameter, but they can't cancel the reboot.
-
 #####`timeout`
 
 *Optional.* Sets the number of seconds to wait after the Puppet run completes for the reboot to happen. If the timeout is exceeded, the provider cancels the reboot. Valid options: any positive integer. Default value: '60'.
@@ -139,4 +130,4 @@ For more information, see our [module contribution guide.](https://docs.puppetla
 
 ###Contributors
 
-To see who's already involved, see the [list of contributors.](https://github.com/puppetlabs/puppetlabs-reboot/graphs/contributors)
+To see who's already involved, see the [list of contributors.](https://github.com/puppetlabs/puppetlabs-reboot/graphs/contributors)

lib/puppet/provider/reboot/windows.rb

@@ -5,7 +5,7 @@
   confine :kernel => :windows
   defaultfor :kernel => :windows
 
-  has_features :manages_reboot_pending, :supports_reboot_prompting
+  has_features :manages_reboot_pending
 
   def self.shutdown_command
     if File.exists?("#{ENV['SYSTEMROOT']}\\sysnative\\shutdown.exe")
@@ -51,17 +51,14 @@ def reboot
       cancel_transaction
     end
 
-    # for demo/testing
-    interactive = @resource[:prompt] ? '/i' : nil
-
     shutdown_path = command(:shutdown)
     unless shutdown_path
       raise ArgumentError, "The shutdown.exe command was not found. On Windows 2003 x64 hotfix 942589 must be installed to access the 64-bit version of shutdown.exe from 32-bit version of ruby.exe."
     end
 
     # Reason code
     # E P     4       1       Application: Maintenance (Planned)
-    shutdown_cmd = [shutdown_path, interactive, '/r', '/t', @resource[:timeout], '/d', 'p:4:1', '/c', "\"#{@resource[:message]}\""].join(' ')
+    shutdown_cmd = [shutdown_path, '/r', '/t', @resource[:timeout], '/d', 'p:4:1', '/c', "\"#{@resource[:message]}\""].join(' ')
     async_shutdown(shutdown_cmd)
   end
 

lib/puppet/type/reboot.rb

@@ -55,7 +55,6 @@
   EOT
 
   feature :manages_reboot_pending, "The provider can detect if a reboot is pending, and reboot as needed."
-  feature :supports_reboot_prompting, "The provider can prompt the user to continue the reboot."
 
   newparam(:name) do
     desc "The name of the reboot resource.  Used for uniqueness."
@@ -110,13 +109,6 @@ def insync?(is)
     defaultto "Puppet is rebooting the computer"
   end
 
-  newparam(:prompt, {:boolean => true, :required_features => :supports_reboot_prompting}) do
-    desc "Whether to prompt the user to continue the reboot.  By default, the
-      user will not be prompted."
-    newvalues(:true, :false)
-    defaultto(false)
-  end
-
   newparam(:catalog_apply_timeout) do
     desc "The maximum amount of time in seconds to wait for puppet to finish
       applying the catalog.  If puppet is still running when the timeout is

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-reboot",
-  "version": "0.1.10-SNAPSHOT",
+  "version": "0.2.0-SNAPSHOT",
   "author": "puppetlabs",
   "summary": "Adds a type and provider for managing system reboots.",
   "license": "Apache-2.0",

spec/unit/provider/reboot/windows_spec.rb

@@ -99,17 +99,11 @@
       provider.reboot
     end
 
-    it "does not include the interactive flag by default" do
+    it "does not include the interactive flag" do
       provider.expects(:async_shutdown).with(Not(includes('/i')))
       provider.reboot
     end
 
-    it "includes the interactive flag if specified" do
-      resource[:prompt] = true
-      provider.expects(:async_shutdown).with(includes('/i'))
-      provider.reboot
-    end
-
     it "includes the restart flag" do
       provider.expects(:async_shutdown).with(includes('/r'))
       provider.reboot

spec/unit/type/reboot_spec.rb

@@ -92,24 +92,6 @@
     end
   end
 
-  context "parameter :prompt" do
-    it "should default to nil" do
-      resource[:prompt].must be_nil
-    end
-
-    it "should accept true on platforms that support prompting" do
-      reboot = Puppet::Type.type(:reboot).new(:name => 'reboot', :provider => :windows)
-      reboot[:prompt] = true
-    end
-
-    it "should reject non-boolean values on platforms that support prompting" do
-      reboot = Puppet::Type.type(:reboot).new(:name => 'reboot', :provider => :windows)
-      expect {
-        reboot[:prompt] = "I'm not sure"
-      }.to raise_error(Puppet::ResourceError, /Invalid value "I'm not sure"/)
-    end
-  end
-
   context "parameter :catalog_apply_timeout" do
     it "should default to 7200 seconds" do
       resource[:catalog_apply_timeout].must == 7200

tests/sample.pp

@@ -4,7 +4,6 @@
 }
 
 reboot { 'now':
-  prompt    => true,
   subscribe => File['c:/before.txt']
 }