Merge branch 'main' into fedora37

Author: lweller

.rubocop.yml

@@ -9,7 +9,7 @@ AllCops:
   DisplayCopNames: true
   ExtraDetails: true
   DisplayStyleGuide: true
-  TargetRubyVersion: '2.7'
+  TargetRubyVersion: '2.6'
   Include:
   - "**/*.rb"
   Exclude:

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2023-04-19 16:55:21 UTC using RuboCop version 1.48.1.
+# on 2023-04-25 08:02:29 UTC using RuboCop version 1.48.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -21,6 +21,12 @@ Lint/ConstantDefinitionInBlock:
   Exclude:
     - 'spec/unit/puppet/provider/postgresql_replication_slot/ruby_spec.rb'
 
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Lint/RedundantCopEnableDirective:
+  Exclude:
+    - 'spec/unit/puppet/type/postgresql_psql_spec.rb'
+
 # Offense count: 6
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 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).
 
+## [v9.0.1](https://github.com/puppetlabs/puppetlabs-postgresql/tree/v9.0.1) (2023-04-24)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-postgresql/compare/v9.0.0...v9.0.1)
+
+### Fixed
+
+- Fix wrong data type for `data\_checksums` parameter [\#1420](https://github.com/puppetlabs/puppetlabs-postgresql/pull/1420) ([smortex](https://github.com/smortex))
+
 ## [v9.0.0](https://github.com/puppetlabs/puppetlabs-postgresql/tree/v9.0.0) (2023-04-21)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-postgresql/compare/v8.3.0...v9.0.0)
@@ -323,6 +331,7 @@ All notable changes to this project will be documented in this file. The format
 - Fix incorrectly quoted GRANT cmd on functions [\#1150](https://github.com/puppetlabs/puppetlabs-postgresql/pull/1150) ([olifre](https://github.com/olifre))
 - Correct versioncmp logic in config.pp [\#1137](https://github.com/puppetlabs/puppetlabs-postgresql/pull/1137) ([boydtom](https://github.com/boydtom))
 - Treat $version as an integer for comparison, defaults to string [\#1135](https://github.com/puppetlabs/puppetlabs-postgresql/pull/1135) ([boydtom](https://github.com/boydtom))
+- Allow usage of PUBLIC role [\#1134](https://github.com/puppetlabs/puppetlabs-postgresql/pull/1134) ([Vampouille](https://github.com/Vampouille))
 - fix missing systemd override config for EL8 \(CentOS and RHEL\) [\#1131](https://github.com/puppetlabs/puppetlabs-postgresql/pull/1131) ([david-barbion](https://github.com/david-barbion))
 
 ## [v6.3.0](https://github.com/puppetlabs/puppetlabs-postgresql/tree/v6.3.0) (2019-12-18)
@@ -352,7 +361,6 @@ All notable changes to this project will be documented in this file. The format
 
 ### Fixed
 
-- Allow usage of PUBLIC role [\#1134](https://github.com/puppetlabs/puppetlabs-postgresql/pull/1134) ([Vampouille](https://github.com/Vampouille))
 - \(MODULES-9658\) - custom ports are not labeled correctly [\#1099](https://github.com/puppetlabs/puppetlabs-postgresql/pull/1099) ([blackknight36](https://github.com/blackknight36))
 - Fix: When assigning a tablespace to a database, no equal sign is needed in the query [\#1098](https://github.com/puppetlabs/puppetlabs-postgresql/pull/1098) ([biertie](https://github.com/biertie))
 - Grant all tables in schema fixup [\#1096](https://github.com/puppetlabs/puppetlabs-postgresql/pull/1096) ([georgehansper](https://github.com/georgehansper))
@@ -392,7 +400,6 @@ All notable changes to this project will be documented in this file. The format
 ### Fixed
 
 - \(FM-7811\) - Use postgresql 9.4 for SLES 11 sp4 [\#1057](https://github.com/puppetlabs/puppetlabs-postgresql/pull/1057) ([david22swan](https://github.com/david22swan))
-- \(MODULES-8553\) Further cleanup for package tag issues [\#1055](https://github.com/puppetlabs/puppetlabs-postgresql/pull/1055) ([HelenCampbell](https://github.com/HelenCampbell))
 
 ## [5.12.0](https://github.com/puppetlabs/puppetlabs-postgresql/tree/5.12.0) (2019-02-01)
 
@@ -404,6 +411,7 @@ All notable changes to this project will be documented in this file. The format
 
 ### Fixed
 
+- \(MODULES-8553\) Further cleanup for package tag issues [\#1055](https://github.com/puppetlabs/puppetlabs-postgresql/pull/1055) ([HelenCampbell](https://github.com/HelenCampbell))
 - \(MODULES-8553\) Fix dependency on apt by explicitly using 'puppetlabs-postgresql' as tag [\#1052](https://github.com/puppetlabs/puppetlabs-postgresql/pull/1052) ([HelenCampbell](https://github.com/HelenCampbell))
 - \(MODULES-8352\) Don't use empty encoding string on initdb [\#1043](https://github.com/puppetlabs/puppetlabs-postgresql/pull/1043) ([binford2k](https://github.com/binford2k))
 - pdksync - \(FM-7655\) Fix rubygems-update for ruby \< 2.3 [\#1042](https://github.com/puppetlabs/puppetlabs-postgresql/pull/1042) ([tphoney](https://github.com/tphoney))

REFERENCE.md

@@ -563,7 +563,7 @@ Default value: `undef`
 
 ##### <a name="-postgresql--globals--data_checksums"></a>`data_checksums`
 
-Data type: `Optional[String[1]]`
+Data type: `Optional[Boolean]`
 
 Use checksums on data pages to help detect corruption by the I/O system that would otherwise be silent.
 Warning: This option is used during initialization by initdb, and cannot be changed later.
@@ -1204,9 +1204,9 @@ Default value: `$postgresql::params::locale`
 
 ##### <a name="-postgresql--server--data_checksums"></a>`data_checksums`
 
-Data type: `Optional[String[1]]`
+Data type: `Optional[Boolean]`
 
-Boolean. Use checksums on data pages to help detect corruption by the I/O system that would otherwise be silent.
+Use checksums on data pages to help detect corruption by the I/O system that would otherwise be silent.
 Warning: This option is used during initialization by initdb, and cannot be changed later. If set, checksums are calculated for all objects, in all databases.
 
 Default value: `$postgresql::params::data_checksums`

manifests/globals.pp

@@ -150,7 +150,7 @@
 
   Optional[String[1]] $encoding                    = undef,
   Optional[String[1]] $locale                      = undef,
-  Optional[String[1]] $data_checksums              = undef,
+  Optional[Boolean] $data_checksums                = undef,
   Optional[String[1]] $timezone                    = undef,
 
   Optional[Boolean] $manage_pg_hba_conf            = undef,

manifests/server.pp

@@ -56,7 +56,7 @@
 #
 # @param encoding Sets the default encoding for all databases created with this module. On certain operating systems this is also used during the template1 initialization, so it becomes a default outside of the module as well.
 # @param locale Sets the default database locale for all databases created with this module. On certain operating systems this is used during the template1 initialization as well, so it becomes a default outside of the module.
-# @param data_checksums Boolean. Use checksums on data pages to help detect corruption by the I/O system that would otherwise be silent.
+# @param data_checksums Use checksums on data pages to help detect corruption by the I/O system that would otherwise be silent.
 #   Warning: This option is used during initialization by initdb, and cannot be changed later. If set, checksums are calculated for all objects, in all databases.
 #
 # @param timezone Set timezone for the PostgreSQL instance
@@ -138,7 +138,7 @@
 
   Optional[String[1]]                                $encoding                     = $postgresql::params::encoding,
   Optional[String[1]]                                $locale                       = $postgresql::params::locale,
-  Optional[String[1]]                                $data_checksums               = $postgresql::params::data_checksums,
+  Optional[Boolean]                                  $data_checksums               = $postgresql::params::data_checksums,
   Optional[String[1]]                                $timezone                     = $postgresql::params::timezone,
 
   Boolean                                            $manage_pg_hba_conf           = $postgresql::params::manage_pg_hba_conf,

manifests/server/database.pp

@@ -28,14 +28,14 @@
 
   # If possible use the version of the remote database, otherwise
   # fallback to our local DB version
-  if $connect_settings != undef and has_key( $connect_settings, 'DBVERSION') {
+  if $connect_settings != undef and 'DBVERSION' in $connect_settings {
     $version = $connect_settings['DBVERSION']
   } else {
     $version = $postgresql::server::_version
   }
 
   # If the connection settings do not contain a port, then use the local server port
-  if $connect_settings != undef and has_key( $connect_settings, 'PGPORT') {
+  if $connect_settings != undef and 'PGPORT' in $connect_settings {
     $port = undef
   } else {
     $port = $postgresql::server::port

manifests/server/default_privileges.pp

@@ -37,7 +37,7 @@
 ) {
   # If possible use the version of the remote database, otherwise
   # fallback to our local DB version
-  if $connect_settings != undef and has_key( $connect_settings, 'DBVERSION') {
+  if $connect_settings != undef and 'DBVERSION' in $connect_settings {
     $version = $connect_settings['DBVERSION']
   } else {
     $version = $postgresql::server::_version
@@ -64,7 +64,7 @@
   #
   if $port != undef {
     $port_override = $port
-  } elsif $connect_settings != undef and has_key( $connect_settings, 'PGPORT') {
+  } elsif $connect_settings != undef and 'PGPORT' in $connect_settings {
     $port_override = undef
   } else {
     $port_override = $postgresql::server::port

manifests/server/extension.pp

@@ -74,7 +74,7 @@
   #
   if $port != undef {
     $port_override = $port
-  } elsif $connect_settings != undef and has_key( $connect_settings, 'PGPORT') {
+  } elsif $connect_settings != undef and 'PGPORT' in $connect_settings {
     $port_override = undef
   } else {
     $port_override = $postgresql::server::port

manifests/server/grant.pp

@@ -75,7 +75,7 @@
   #
   if $port != undef {
     $port_override = $port
-  } elsif $connect_settings != undef and has_key( $connect_settings, 'PGPORT') {
+  } elsif $connect_settings != undef and 'PGPORT' in $connect_settings {
     $port_override = undef
   } else {
     $port_override = $postgresql::server::port

manifests/server/reassign_owned_by.pp

@@ -26,7 +26,7 @@
   #
   if $port != undef {
     $port_override = $port
-  } elsif $connect_settings != undef and has_key( $connect_settings, 'PGPORT') {
+  } elsif $connect_settings != undef and 'PGPORT' in $connect_settings {
     $port_override = undef
   } else {
     $port_override = $postgresql::server::port

manifests/server/role.pp

@@ -52,15 +52,15 @@
   #
   if $port != undef {
     $port_override = $port
-  } elsif $connect_settings != undef and has_key( $connect_settings, 'PGPORT') {
+  } elsif $connect_settings != undef and 'PGPORT' in $connect_settings {
     $port_override = undef
   } else {
     $port_override = $postgresql::server::port
   }
 
   # If possible use the version of the remote database, otherwise
   # fallback to our local DB version
-  if $connect_settings != undef and has_key( $connect_settings, 'DBVERSION') {
+  if $connect_settings != undef and 'DBVERSION' in $connect_settings {
     $version = $connect_settings['DBVERSION']
   } else {
     $version = $postgresql::server::_version

manifests/server/schema.pp

@@ -27,7 +27,7 @@
   Postgresql::Server::Db <| dbname == $db |> -> Postgresql::Server::Schema[$name]
 
   # If the connection settings do not contain a port, then use the local server port
-  if $connect_settings != undef and has_key( $connect_settings, 'PGPORT') {
+  if $connect_settings != undef and 'PGPORT' in $connect_settings {
     $port = undef
   } else {
     $port = $postgresql::server::port

manifests/server/tablespace.pp

@@ -18,7 +18,7 @@
   $module_workdir = $postgresql::server::module_workdir
 
   # If the connection settings do not contain a port, then use the local server port
-  if $connect_settings != undef and has_key( $connect_settings, 'PGPORT') {
+  if $connect_settings != undef and 'PGPORT' in $connect_settings {
     $port = undef
   } else {
     $port = $postgresql::server::port

metadata.json

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