Merge pull request #147 from crayfishx/bug/sort_sources

Ensure sources always sorts alphanumerically
voxpupuli · Aug 3, 2017 · 1a48b22 · 1a48b22
2 parents f521fa1 + 46414d7
commit 1a48b22
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/lib/puppet/provider/firewalld_zone/firewall_cmd.rb b/lib/puppet/provider/firewalld_zone/firewall_cmd.rb
@@ -62,7 +62,7 @@ def interfaces=(new_interfaces)
   end
 
   def sources
-    execute_firewall_cmd(['--list-sources']).chomp.split(" ") || []
+    execute_firewall_cmd(['--list-sources']).chomp.split(" ").sort || []
   end
 
   def sources=(new_sources)

diff --git a/spec/unit/puppet/type/firewalld_zone_spec.rb b/spec/unit/puppet/type/firewalld_zone_spec.rb
@@ -105,6 +105,12 @@
         expect(provider.sources).to eq(["val", "val"])
       end
 
+
+      it "sources should always return in alphanumerical order" do
+        provider.expects(:execute_firewall_cmd).with(['--list-sources']).returns("4.4.4.4/32 2.2.2.2/32 3.3.3.3/32")
+        expect(provider.sources).to eq(["2.2.2.2/32", "3.3.3.3/32","4.4.4.4/32"])
+      end
+
       it "should set sources" do
         provider.expects(:sources).returns(["valx"])
         provider.expects(:execute_firewall_cmd).with(['--add-source', 'valy'])