Improve deprecation warning, add module name to it

diff --git a/lib/puppet/type/firewall.rb b/lib/puppet/type/firewall.rb
index 250565544f23e4843e5061d1136fe49792b2616c..72a67f9718f0546d1348eb8893f182a4b10f4ad7 100644 (file)
--- a/lib/puppet/type/firewall.rb
+++ b/lib/puppet/type/firewall.rb
@@ -289,7 +289,7 @@ Puppet::Type.newtype(:firewall) do
     EOS
 
     validate do |value|
-      Puppet.warning("port is deprecated and will be removed. Use dport and/or sport instead.")
+      Puppet.warning('Passing port to firewall is deprecated and will be removed. Use dport and/or sport instead.')
     end
 
     munge do |value|

diff --git a/spec/unit/puppet/type/firewall_spec.rb b/spec/unit/puppet/type/firewall_spec.rb
index ce0b4a2d191b23e3b3022ba163696611b147d229..38859f6a271154f8d0661b71111ded46be307897 100755 (executable)
--- a/spec/unit/puppet/type/firewall_spec.rb
+++ b/spec/unit/puppet/type/firewall_spec.rb
@@ -183,7 +183,7 @@ describe firewall do
 
   describe 'port deprecated' do
     it "raises a warning" do
-      expect(Puppet).to receive(:warning).with /port is deprecated/
+      expect(Puppet).to receive(:warning).with /port to firewall is deprecated/
       @resource[:port] = "22"
     end
   end