Merge tag 'v10.6.1' into feature/create-extension-version

Author: aba-malu

CHANGELOG.md

@@ -5,6 +5,15 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [v10.6.1](https://github.com/puppetlabs/puppetlabs-postgresql/tree/v10.6.1) - 2025-12-26
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-postgresql/compare/v10.6.0...v10.6.1)
+
+### Fixed
+
+- Replace systemctl `status` with systemctl `is-active` [#1652](https://github.com/puppetlabs/puppetlabs-postgresql/pull/1652) ([bastelfreak](https://github.com/bastelfreak))
+- Don't use type alias in `postgresql_password` parameter [#1611](https://github.com/puppetlabs/puppetlabs-postgresql/pull/1611) ([figless](https://github.com/figless))
+
 ## [v10.6.0](https://github.com/puppetlabs/puppetlabs-postgresql/tree/v10.6.0) - 2025-10-13
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-postgresql/compare/v10.5.0...v10.6.0)

REFERENCE.md

@@ -1006,7 +1006,7 @@ Default value: `$postgresql::params::service_reload`
 
 ##### <a name="-postgresql--server--service_status"></a>`service_status`
 
-Data type: `Optional[String[1]]`
+Data type: `Optional[Variant[Array[String[1]],String[1]]]`
 
 Overrides the default status check command for your PostgreSQL service.
 
@@ -4742,7 +4742,7 @@ Type: Ruby 4.x API
 
 This function returns the postgresql password hash from the clear text username / password
 
-#### `postgresql::postgresql_password(Variant[String[1], Integer] $username, Variant[String[1], Sensitive[String[1]], Integer] $password, Optional[Boolean] $sensitive, Optional[Optional[Postgresql::Pg_password_encryption]] $hash, Optional[Optional[Variant[String[1], Integer]]] $salt)`
+#### `postgresql::postgresql_password(Variant[String[1], Integer] $username, Variant[String[1], Sensitive[String[1]], Integer] $password, Optional[Boolean] $sensitive, Optional[Optional[Enum["md5", "scram-sha-256"]]] $hash, Optional[Optional[Variant[String[1], Integer]]] $salt)`
 
 The postgresql::postgresql_password function.
 
@@ -4768,7 +4768,7 @@ If the Postgresql-Passwordhash should be of Datatype Sensitive[String]
 
 ##### `hash`
 
-Data type: `Optional[Optional[Postgresql::Pg_password_encryption]]`
+Data type: `Optional[Optional[Enum["md5", "scram-sha-256"]]]`
 
 Set type for password hash
 
@@ -4889,7 +4889,8 @@ Alias of `Hash[String[1], Postgresql::Pg_hba_rule]`
 
 ### <a name="Postgresql--Pg_password_encryption"></a>`Postgresql::Pg_password_encryption`
 
-the supported password_encryption
+Note that this Enum is also defined in:
+lib/puppet/functions/postgresql/postgresql_password.rb
 
 Alias of `Enum['md5', 'scram-sha-256']`
 

manifests/params.pp

@@ -86,7 +86,7 @@
       }
 
       $service_reload = "systemctl reload ${service_name}"
-      $service_status = pick($service_status, "systemctl status ${service_name}")
+      $service_status = pick($service_status, "systemctl is-active --quiet ${service_name}")
 
       $psql_path           = pick($psql_path, "${bindir}/psql")
 
@@ -130,7 +130,7 @@
       $confdir                = pick($confdir, $datadir)
       $psql_path              = pick($psql_path, "${bindir}/psql")
 
-      $service_status         = pick($service_status, "systemctl status ${service_name}")
+      $service_status         = pick($service_status, "systemctl is-active --quiet ${service_name}")
       $service_reload         = "systemctl reload ${service_name}"
       $python_package_name    = pick($python_package_name, 'python-psycopg2')
       # Archlinux does not have a perl::DBD::Pg package
@@ -173,7 +173,7 @@
       $datadir                = pick($datadir, "/var/lib/postgresql/${version}/main")
       $confdir                = pick($confdir, "/etc/postgresql/${version}/main")
       $service_reload         = "systemctl reload ${service_name}"
-      $service_status         = pick($service_status, "systemctl status ${service_name}")
+      $service_status         = pick($service_status, "systemctl is-active --quiet ${service_name}")
       $psql_path              = pick($psql_path, '/usr/bin/psql')
       $postgresql_conf_mode   = pick($postgresql_conf_mode, '0644')
     }
@@ -194,7 +194,7 @@
       $bindir               = pick($bindir, "/usr/lib/postgresql-${version}/bin")
       $datadir              = pick($datadir, "/var/lib/postgresql/${version}_data")
       $confdir              = pick($confdir, "/etc/postgresql-${version}")
-      $service_status       = pick($service_status, "systemctl status ${service_name}")
+      $service_status       = pick($service_status, "systemctl is-active --quiet ${service_name}")
       $service_reload       = "systemctl reload ${service_name}"
       $psql_path            = pick($psql_path, "${bindir}/psql")
 
@@ -267,7 +267,7 @@
       $bindir               = pick($bindir, "/usr/lib/postgresql${version}/bin")
       $datadir              = pick($datadir, '/var/lib/pgsql/data')
       $confdir              = pick($confdir, $datadir)
-      $service_status       = pick($service_status, "systemctl status ${service_name}")
+      $service_status       = pick($service_status, "systemctl is-active --quiet ${service_name}")
       $service_reload       = "systemctl reload ${service_name}"
       $psql_path            = pick($psql_path, "${bindir}/psql")
 

manifests/server.pp

@@ -130,7 +130,7 @@
   Boolean                                            $service_restart_on_change    = $postgresql::params::service_restart_on_change,
   Optional[String[1]]                                $service_provider             = $postgresql::params::service_provider,
   String[1]                                          $service_reload               = $postgresql::params::service_reload,
-  Optional[String[1]]                                $service_status               = $postgresql::params::service_status,
+  Optional[Variant[Array[String[1]],String[1]]]      $service_status               = $postgresql::params::service_status,
   String[1]                                          $default_database             = $postgresql::params::default_database,
   Hash                                               $default_connect_settings     = $postgresql::globals::default_connect_settings,
   Optional[Variant[String[1], Array[String[1]]]]     $listen_addresses             = $postgresql::params::listen_addresses,

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-postgresql",
-  "version": "10.6.0",
+  "version": "10.6.1",
   "author": "puppetlabs",
   "summary": "Offers support for basic management of PostgreSQL databases.",
   "license": "Apache-2.0",

spec/acceptance/server_instance_spec.rb

@@ -46,7 +46,7 @@ class { 'postgresql::server':
     },
     service_settings     => {
       'service_name'   => 'postgresql@13-test1',
-      'service_status' => 'systemctl status postgresql@13-test1.service',
+      'service_status' => 'systemctl is-active --quiet postgresql@13-test1.service',
       'service_ensure' => 'running',
       'service_enable' => true,
     },

spec/classes/server/service_spec.rb

@@ -10,5 +10,5 @@
   end
 
   it { is_expected.to contain_class('postgresql::server::service') }
-  it { is_expected.to contain_service('postgresqld_instance_main').with_name('postgresql').with_status('systemctl status postgresql') }
+  it { is_expected.to contain_service('postgresqld_instance_main').with_name('postgresql').with_status('systemctl is-active --quiet postgresql') }
 end

spec/defines/server_instance_spec.rb

@@ -42,7 +42,7 @@ class { 'postgresql::server':
                            'port' => 5433,
                            'pg_hba_conf_defaults' => false },
       'service_settings': { 'service_name' => 'postgresql@13-test1',
-                            'service_status' => 'systemctl status postgresql@13-test1.service',
+                            'service_status' => 'systemctl is-active --quiet postgresql@13-test1.service',
                             'service_ensure' => 'running',
                             'service_enable' => true },
       'initdb_settings': { 'auth_local' => 'peer',
@@ -120,7 +120,7 @@ class { 'postgresql::server':
     it { is_expected.to contain_postgresql__server_instance('test1') }
     it { is_expected.to contain_user('ins_test1') }
     it { is_expected.to contain_group('ins_test1') }
-    it { is_expected.to contain_service('postgresqld_instance_test1').with_name('postgresql@13-test1').with_status('systemctl status postgresql@13-test1.service') }
+    it { is_expected.to contain_service('postgresqld_instance_test1').with_name('postgresql@13-test1').with_status('systemctl is-active --quiet postgresql@13-test1.service') }
     it { is_expected.to contain_systemd__dropin_file('postgresql@13-test1.conf') }
     it { is_expected.to contain_postgresql_conn_validator('validate_service_is_running_instance_test1') }
     it { is_expected.to contain_postgresql_conf('port_for_instance_test1') }