server::database_grant: Always set default user/group/port

This enables us to make it configureable. When a user doesn't specify
it, the defaults will be passed, without breaking existing behaviour.

Author: bastelfreak

REFERENCE.md

@@ -1543,11 +1543,11 @@ Default value: `undef`
 
 ##### <a name="-postgresql--server--config_entry--path"></a>`path`
 
-Data type: `Variant[Boolean, String[1]]`
+Data type: `Stdlib::Absolutepath`
 
 Path for postgresql.conf
 
-Default value: `false`
+Default value: `$postgresql::server::postgresql_conf_path`
 
 ### <a name="postgresql--server--database"></a>`postgresql::server::database`
 
@@ -1653,7 +1653,9 @@ The following parameters are available in the `postgresql::server::database_gran
 * [`ensure`](#-postgresql--server--database_grant--ensure)
 * [`psql_db`](#-postgresql--server--database_grant--psql_db)
 * [`psql_user`](#-postgresql--server--database_grant--psql_user)
+* [`psql_group`](#-postgresql--server--database_grant--psql_group)
 * [`connect_settings`](#-postgresql--server--database_grant--connect_settings)
+* [`port`](#-postgresql--server--database_grant--port)
 
 ##### <a name="-postgresql--server--database_grant--privilege"></a>`privilege`
 
@@ -1695,7 +1697,15 @@ Data type: `Optional[String[1]]`
 
 Specifies the OS user for running psql. Default value: The default user for the module, usually 'postgres'.
 
-Default value: `undef`
+Default value: `$postgresql::server::user`
+
+##### <a name="-postgresql--server--database_grant--psql_group"></a>`psql_group`
+
+Data type: `Optional[String[1]]`
+
+Overrides the default postgres user group to be used for related files in the file system.
+
+Default value: `$postgresql::params::group`
 
 ##### <a name="-postgresql--server--database_grant--connect_settings"></a>`connect_settings`
 
@@ -1705,6 +1715,14 @@ Specifies a hash of environment variables used when connecting to a remote serve
 
 Default value: `undef`
 
+##### <a name="-postgresql--server--database_grant--port"></a>`port`
+
+Data type: `Stdlib::Port`
+
+Port to use when connecting.
+
+Default value: `$postgresql::server::port`
+
 ### <a name="postgresql--server--db"></a>`postgresql::server::db`
 
 Define for conveniently creating a role, database and assigning the correctpermissions.

manifests/server/database_grant.pp

@@ -6,15 +6,19 @@
 # @param ensure Specifies whether to grant or revoke the privilege. Revoke or 'absent' works only in PostgreSQL version 9.1.24 or later.
 # @param psql_db Defines the database to execute the grant against. This should not ordinarily be changed from the default
 # @param psql_user Specifies the OS user for running psql. Default value: The default user for the module, usually 'postgres'.
+# @param psql_group Overrides the default postgres user group to be used for related files in the file system.
 # @param connect_settings Specifies a hash of environment variables used when connecting to a remote server.
+# @param port Port to use when connecting.
 define postgresql::server::database_grant (
   Enum['ALL', 'CREATE', 'CONNECT', 'TEMPORARY', 'TEMP', 'all', 'create', 'connect', 'temporary', 'temp'] $privilege,
   String[1]                           $db,
   String[1]                           $role,
   Optional[Enum['present', 'absent']] $ensure           = undef,
   Optional[String[1]]                 $psql_db          = undef,
-  Optional[String[1]]                 $psql_user        = undef,
+  String[1]                           $psql_user        = $postgresql::server::user,
+  String[1]                           $psql_group       = $postgresql::server::group,
   Optional[Hash]                      $connect_settings = undef,
+  Stdlib::Port                        $port             = $postgresql::server::port,
 ) {
   postgresql::server::grant { "database:${name}":
     ensure           => $ensure,
@@ -25,6 +29,8 @@
     object_name      => $db,
     psql_db          => $psql_db,
     psql_user        => $psql_user,
+    group            => $psql_group,
+    port             => $port,
     connect_settings => $connect_settings,
   }
 }

spec/defines/server/database_grant_spec.rb

@@ -9,18 +9,37 @@
     'test'
   end
 
-  let :params do
-    {
-      privilege: 'ALL',
-      db: 'test',
-      role: 'test'
-    }
-  end
-
   let :pre_condition do
     "class {'postgresql::server':}"
   end
 
-  it { is_expected.to contain_postgresql__server__database_grant('test') }
-  it { is_expected.to contain_postgresql__server__grant('database:test') }
+  context 'with minimal settings' do
+    let :params do
+      {
+        privilege: 'ALL',
+        db: 'test',
+        role: 'test'
+      }
+    end
+
+    it { is_expected.to compile.with_all_deps }
+    it { is_expected.to contain_postgresql__server__database_grant('test') }
+    it { is_expected.to contain_postgresql__server__grant('database:test').with_psql_user('postgres').with_port(5432).with_group('postgres') }
+  end
+
+  context 'with different user/group/port' do
+    let :params do
+      {
+        privilege: 'ALL',
+        db: 'test',
+        role: 'test',
+        psql_user: 'foo',
+        psql_group: 'bar',
+        port: 1337
+      }
+    end
+
+    it { is_expected.to compile.with_all_deps }
+    it { is_expected.to contain_postgresql__server__grant('database:test').with_psql_user('foo').with_port(1337).with_group('bar') }
+  end
 end