(PUP-10597) Remove deprecated held

Author: Dorin-Pleava

acceptance/tests/provider/package/dpkg_ensure_held_package_is_latest.rb

@@ -1,5 +1,5 @@
-test_name "dpkg ensure held package is latest installed" do
-  confine :to, :platform => /debian-8-amd64/
+test_name "dpkg ensure hold package is latest installed" do
+  confine :to, :platform => /debian-9-amd64/
   tag 'audit:high'
 
   require 'puppet/acceptance/common_utils'

acceptance/tests/provider/package/dpkg_ensure_held_package_should_preserve_version.rb

@@ -1,5 +1,5 @@
-test_name "dpkg ensure held package should preserve version if package is already installed" do
-  confine :to, :platform => /debian-8-amd64/
+test_name "dpkg ensure hold package should preserve version if package is already installed" do
+  confine :to, :platform => /debian-9-amd64/
   tag 'audit:high'
 
   require 'puppet/acceptance/common_utils'
@@ -8,12 +8,12 @@
 
   package = "openssl"
 
-  step "Ensure held should lock to specific installed version" do
+  step "Ensure hold should lock to specific installed version" do
     existing_installed_version = on(agent.name, "dpkg -s #{package} | sed -n -e 's/Version: //p'").stdout
     existing_installed_version.delete!(' ')
 
-    package_manifest_held = resource_manifest('package', package, mark: "hold")
-    apply_manifest_on(agent, package_manifest_held) do
+    package_manifest_hold = resource_manifest('package', package, mark: "hold")
+    apply_manifest_on(agent, package_manifest_hold) do
       installed_version = on(agent.name, "apt-cache policy #{package} | sed -n -e 's/Installed: //p'").stdout
       installed_version.delete!(' ')
       assert_match(existing_installed_version, installed_version)

acceptance/tests/provider/package/dpkg_hold_true_package_is_latest.rb

@@ -53,8 +53,8 @@
     assert_match( /[email protected]/, result.stdout, "err: #{agent}")
   end
 
-  step "IPS: it should not upgrade current and dependent package if dependent package is held"
-  apply_manifest_on(agent, 'package {mypkg : ensure=>"held", provider=>"pkg"}') do
+  step "IPS: it should not upgrade current and dependent package if dependent package is hold"
+  apply_manifest_on(agent, 'package {mypkg : ensure=>"present", mark=>"hold", provider=>"pkg"}') do
     assert_match( //, result.stdout, "err: #{agent}")
   end
   setup_fakeroot agent

acceptance/tests/provider/package/dpkg_hold_true_should_preserve_version.rb

@@ -173,14 +173,10 @@ def purge
     dpkg "--purge", @resource[:name]
   end
 
-  def deprecated_hold
+  def hold
     if package_not_installed?
       self.install
     end
-    hold
-  end
-
-  def hold
     Tempfile.open('puppet_dpkg_set_selection') do |tmpfile|
       tmpfile.write("#{@resource[:name]} hold\n")
       tmpfile.flush

acceptance/tests/resource/package/ips/should_be_holdable.rb

@@ -114,10 +114,6 @@ def self.parse_line(line)
     end).merge({:provider => self.name})
   end
 
-  def deprecated_hold
-    hold
-  end
-
   def hold
     pkg(:freeze, @resource[:name])
   end

lib/puppet/provider/package/dpkg.rb

@@ -112,7 +112,7 @@ def qatom
       # do the search
       should = @resource[:ensure]
       case should
-      # The terms present, absent, purged, held, installed, latest in :ensure 
+      # The terms present, absent, purged, installed, latest in :ensure
       # resolve as Symbols, and we do not need specific package version in this case
       when true, false, Symbol
         search = @resource[:name]

lib/puppet/provider/package/pkg.rb

@@ -106,10 +106,6 @@ module Puppet
         provider.purge
       end
 
-      newvalue(:held, :event => :package_held, :required_features => :holdable) do
-        provider.deprecated_hold
-      end
-
       newvalue(:disabled, :required_features => :disableable) do
         provider.disable
       end
@@ -161,7 +157,7 @@ def insync?(is)
         @should.each { |should|
           case should
           when :present
-            return true unless [:absent, :purged, :held, :disabled].include?(is)
+            return true unless [:absent, :purged, :disabled].include?(is)
           when :latest
             # Short-circuit packages that are not present
             return false if is == :absent || is == :purged
@@ -657,8 +653,7 @@ def refresh
       if provider.reinstallable? &&
         @parameters[:reinstall_on_refresh].value == :true &&
         @parameters[:ensure].value != :purged &&
-        @parameters[:ensure].value != :absent &&
-        @parameters[:ensure].value != :held
+        @parameters[:ensure].value != :absent
 
         provider.reinstall
       end
@@ -673,7 +668,7 @@ def refresh
         Default is "none". Mark can be specified with or without `ensure`,
         if `ensure` is missing will default to "present".
 
-        Mark cannot be specified together with "purged", "absent" or "held"
+        Mark cannot be specified together with "purged", or "absent"
         values for `ensure`.
       EOT
       newvalues(:hold, :none)
@@ -710,11 +705,8 @@ def sync
     end
 
     validate do
-      if :held == @parameters[:ensure].should
-        warning '"ensure=>held" has been deprecated and will be removed in a future version, use "mark=hold" instead'
-      end
-      if @parameters[:mark] && [:absent, :purged, :held].include?(@parameters[:ensure].should)
-        raise ArgumentError, _('You cannot use "mark" property while "ensure" is one of ["absent", "purged", "held"]')
+      if @parameters[:mark] && [:absent, :purged].include?(@parameters[:ensure].should)
+        raise ArgumentError, _('You cannot use "mark" property while "ensure" is one of ["absent", "purged"]')
       end
     end
   end

lib/puppet/provider/package/portage.rb

@@ -381,24 +381,21 @@ def parser_test(dpkg_output_string, gold_hash, number_of_debug_logs = 0)
       allow(provider).to receive(:execute)
       allow(provider).to receive(:package_not_installed?).and_return(true)
       expect(provider).to receive(:install).once
-      expect(provider).to receive(:hold)
-      provider.deprecated_hold
+      provider.hold
     end
 
-    it "skips install new package if hold is true" do
+    it "install new package if hold is true and package not installed" do
       allow(provider).to receive(:execute)
       allow(provider).to receive(:package_not_installed?).and_return(true)
       expect(provider).to receive(:install).once
-      expect(provider).to receive(:hold)
-      provider.deprecated_hold
+      provider.hold
     end
 
     it "skips install new package if package is allready installed" do
       allow(provider).to receive(:execute)
       allow(provider).to receive(:package_not_installed?).and_return(false)
       expect(provider).not_to receive(:install)
-      expect(provider).to receive(:hold)
-      provider.deprecated_hold
+      provider.hold
     end
 
     it "executes dpkg --set-selections when holding" do