rules::out:dns: refactor for better readability

voxpupuli · Dec 19, 2023 · 195af59 · 195af59
1 parent ee2d38a
commit 195af59
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 27 deletions.
diff --git a/REFERENCE.md b/REFERENCE.md
@@ -913,11 +913,11 @@ The following parameters are available in the `nftables::rules::out::dns` class:
 
 ##### <a name="-nftables--rules--out--dns--dns_server"></a>`dns_server`
 
-Data type: `Optional[Variant[String,Array[String,1]]]`
+Data type: `Array[Stdlib::IP::Address]`
 
 specify dns_server name
 
-Default value: `undef`
+Default value: `[]`
 
 ### <a name="nftables--rules--out--hkp"></a>`nftables::rules::out::hkp`
 

diff --git a/manifests/rules/out/dns.pp b/manifests/rules/out/dns.pp
@@ -1,34 +1,19 @@
 # @summary manage out dns
 # @param dns_server specify dns_server name
 class nftables::rules::out::dns (
-  Optional[Variant[String,Array[String,1]]] $dns_server = undef,
+  Array[Stdlib::IP::Address] $dns_server = [],
 ) {
-  if $dns_server {
-    any2array($dns_server).each |$index,$dns| {
-      nftables::rule {
-        "default_out-dnsudp-${index}":
+  unless emtpy($dns_servers) {
+    $dns_servers.each |$index,$dns| {
+      $content = $dns ? {
+        Stdlib::IP::Address::V6 => "ip6 daddr ${dns}",
+        Stdlib::IP::Address::V4 => "ip daddr ${dns}",
       }
-      if $dns =~ /:/ {
-        Nftables::Rule["default_out-dnsudp-${index}"] {
-          content => "ip6 daddr ${dns} udp dport 53 accept",
-        }
-      } else {
-        Nftables::Rule["default_out-dnsudp-${index}"] {
-          content => "ip daddr ${dns} udp dport 53 accept",
-        }
+      nftables::rule { "default_out-dnstcp-${index}":
+        content => "${content} tcp dport 53 accept",
       }
-
-      nftables::rule {
-        "default_out-dnstcp-${index}":
-      }
-      if $dns =~ /:/ {
-        Nftables::Rule["default_out-dnstcp-${index}"] {
-          content => "ip6 daddr ${dns} tcp dport 53 accept",
-        }
-      } else {
-        Nftables::Rule["default_out-dnstcp-${index}"] {
-          content => "ip daddr ${dns} tcp dport 53 accept",
-        }
+      nftables::rule { "default_out-dnsudp-${index}":
+        content => "${content} udp dport 53 accept",
       }
     }
   } else {

diff --git a/spec/classes/rules_out_dns_spec.rb → spec/classes/rules/out/dns_spec.rb b/spec/classes/rules_out_dns_spec.rb → spec/classes/rules/out/dns_spec.rb