Replace create_resources for acls with iteration

Author: alexjfisher

REFERENCE.md

@@ -846,15 +846,15 @@ Default value: $postgresql::params::ip_mask_allow_all_users
 
 ##### `ipv4acls`
 
-Data type: `Any`
+Data type: `Array[String[1]]`
 
 Lists strings for access control for connection method, users, databases, IPv4 addresses;
 
 Default value: $postgresql::params::ipv4acls
 
 ##### `ipv6acls`
 
-Data type: `Any`
+Data type: `Array[String[1]]`
 
 Lists strings for access control for connection method, users, databases, IPv6 addresses.
 

manifests/server.pp

@@ -100,8 +100,8 @@
   $port                       = $postgresql::params::port,
   $ip_mask_deny_postgres_user = $postgresql::params::ip_mask_deny_postgres_user,
   $ip_mask_allow_all_users    = $postgresql::params::ip_mask_allow_all_users,
-  $ipv4acls                   = $postgresql::params::ipv4acls,
-  $ipv6acls                   = $postgresql::params::ipv6acls,
+  Array[String[1]] $ipv4acls  = $postgresql::params::ipv4acls,
+  Array[String[1]] $ipv6acls  = $postgresql::params::ipv6acls,
 
   $initdb_path                = $postgresql::params::initdb_path,
   $createdb_path              = $postgresql::params::createdb_path,

manifests/server/config.pp

@@ -88,18 +88,16 @@
       }
     }
 
-    # ipv4acls are passed as an array of rule strings, here we transform
-    # them into a resources hash, and pass the result to create_resources
-    $ipv4acl_resources = postgresql::postgresql_acls_to_resources_hash($ipv4acls,
-    'ipv4acls', 10)
-    create_resources('postgresql::server::pg_hba_rule', $ipv4acl_resources)
-
-
-    # ipv6acls are passed as an array of rule strings, here we transform
-    # them into a resources hash, and pass the result to create_resources
-    $ipv6acl_resources = postgresql::postgresql_acls_to_resources_hash($ipv6acls,
-    'ipv6acls', 102)
-    create_resources('postgresql::server::pg_hba_rule', $ipv6acl_resources)
+    # $ipv4acls and $ipv6acls are arrays of rule strings
+    # They are converted into hashes we can iterate over to create postgresql::server::pg_hba_rule resources.
+    (
+      postgresql::postgresql_acls_to_resources_hash($ipv4acls, 'ipv4acls', 10) +
+      postgresql::postgresql_acls_to_resources_hash($ipv6acls, 'ipv6acls', 102)
+    ).each | String $key, Hash $attrs| {
+      postgresql::server::pg_hba_rule { $key:
+        * => $attrs,
+      }
+    }
   }
 
   if $listen_addresses {