From e2e0e4762d066f6b7b3de3435bee9b3e90263bf7 Mon Sep 17 00:00:00 2001 From: Eimhin Laverty Date: Wed, 12 Dec 2018 14:15:59 +0000 Subject: [PATCH] Modifed error message to be more clear --- lib/puppet/provider/firewall/iptables.rb | 2 +- spec/acceptance/firewall_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/puppet/provider/firewall/iptables.rb b/lib/puppet/provider/firewall/iptables.rb index 280ff32..a70d7af 100644 --- a/lib/puppet/provider/firewall/iptables.rb +++ b/lib/puppet/provider/firewall/iptables.rb @@ -877,7 +877,7 @@ Puppet::Type.type(:firewall).provide :iptables, parent: Puppet::Provider::Firewa # Insert our new or updated rule in the correct order of named rules, but # offset for unnamed rules. sorted_rules = rules.reject { |r| r.match(unmanaged_rule_regex) }.sort - raise 'Invalid ordering value in resource name. The range 9000-9999 is reserved for unmanaged rules.' if sorted_rules.index(my_rule).nil? + raise 'Rule sorting error. Make sure that the title of your rule does not start with 9000-9999, as this range is reserved.' if sorted_rules.index(my_rule).nil? sorted_rules.index(my_rule) + 1 + unnamed_offset end end diff --git a/spec/acceptance/firewall_spec.rb b/spec/acceptance/firewall_spec.rb index 46eb7f4..9e9c481 100644 --- a/spec/acceptance/firewall_spec.rb +++ b/spec/acceptance/firewall_spec.rb @@ -36,7 +36,7 @@ describe 'firewall basics', docker: true do PUPPETCODE it 'fails' do apply_manifest(pp, expect_failures: true) do |r| - expect(r.stderr).to match(%r{Invalid ordering value}) + expect(r.stderr).to match(%r{Ordering error detected}) end end end -- 2.45.2