Merge pull request #189 from tskirvin/master

nftables::simplerule::dport - takes port ranges as part of the array

REFERENCE.md

@@ -2377,7 +2377,7 @@ Alias of `Pattern[/^@[-a-zA-Z0-9_]+$/]`
 
 Represents a port expression to be used within a rule.
 
-Alias of `Variant[Array[Stdlib::Port, 1], Stdlib::Port, Nftables::Port::Range]`
+Alias of `Variant[Array[Variant[Nftables::Port::Range, Stdlib::Port], 1], Stdlib::Port, Nftables::Port::Range]`
 
 ### <a name="Nftables--Port--Range"></a>`Nftables::Port::Range`
 

spec/defines/simplerule_spec.rb

@@ -104,6 +104,24 @@
         }
       end
 
+      describe 'port array and range' do
+        let(:params) do
+          {
+            dport: [333, 335, '338-339'],
+            sport: [433, 435, '438-439'],
+            proto: 'tcp',
+          }
+        end
+
+        it { is_expected.to compile }
+
+        it {
+          expect(subject).to contain_nftables__rule('default_in-my_default_rule_name').with(
+            content: 'tcp sport {433, 435, 438-439} tcp dport {333, 335, 338-339} accept'
+          )
+        }
+      end
+
       describe 'only sport TCP traffic' do
         let(:params) do
           {

spec/type_aliases/nftables_port_spec.rb

@@ -5,6 +5,7 @@
 describe 'Nftables::Port' do
   it { is_expected.to allow_value(53) }
   it { is_expected.to allow_value([1, 1985, 65_535]) }
+  it { is_expected.to allow_value([1, '53-55']) }
   it { is_expected.to allow_value('53-55') }
   it { is_expected.not_to allow_value('53') }
   it { is_expected.not_to allow_value([]) }

types/port.pp

@@ -1,7 +1,7 @@
 # @summary
 #   Represents a port expression to be used within a rule.
 type Nftables::Port = Variant[
-  Array[Stdlib::Port, 1],
+  Array[Variant[Nftables::Port::Range, Stdlib::Port], 1],
   Stdlib::Port,
   Nftables::Port::Range,
 ]