Merge pull request #1530 from puppetlabs/fix-postgresql_default

Ramesh7 · web-flow · commit e1c3a242d4f6 · 2023-10-12T16:59:10.000+05:30
Fix `postgresql::default()` return value for unknown parameters
diff --git a/functions/default.pp b/functions/default.pp
@@ -8,8 +8,7 @@ function postgresql::default(
 ) {
   include postgresql::params
 
-  #search for the variable name in params first
-  #then fall back to globals if not found
-  pick( getvar("postgresql::params::${parameter_name}"),
-  "postgresql::globals::${parameter_name}")
+  # Search for the variable name in params.
+  # params inherits from globals, so it will also catch these variables.
+  pick(getvar("postgresql::params::${parameter_name}"))
 }
diff --git a/spec/functions/postgresql_default_spec.rb b/spec/functions/postgresql_default_spec.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'postgresql::default' do
+  let(:facts) do
+    {
+      'os' => {
+        'family' => 'Debian',
+        'name'   => 'Debian',
+        'release' => {
+          'full'  => '11.7',
+          'major' => '11',
+          'minor' => '7',
+        }
+      }
+    }
+  end
+
+  let(:pre_condition) do
+    <<~PP
+    class { 'postgresql::server':
+    }
+    PP
+  end
+
+  # parameter in params.pp only
+  it { is_expected.to run.with_params('port').and_return(5432) }
+
+  # parameter in globals.pp only
+  it { is_expected.to run.with_params('default_connect_settings').and_return({}) }
+
+  it { is_expected.to run.with_params('a_parameter_that_does_not_exist').and_raise_error(Puppet::ParseError, %r{pick\(\): must receive at least one non empty value}) }
+end
