Skip to content

postgresql_conf: Fix regex for value param and add tests #1544

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 26, 2023
Merged

postgresql_conf: Fix regex for value param and add tests #1544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9facc5d
update values regex
SimonHoenscheid Oct 25, 2023
e3dabd1
add spec tests for regex validation
SimonHoenscheid Oct 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/puppet/type/postgresql_conf.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

newproperty(:value) do
desc 'The value to set for this parameter.'
newvalues(%r{^\S(.*\S)?$})
newvalues(%r{^(\S.*)?$})

munge do |value|
if value.to_i.to_s == value
Expand Down
6 changes: 6 additions & 0 deletions spec/unit/type/postgresql_conf_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,12 @@
end
# string https://www.postgresql.org/docs/current/datatype-character.html
describe 'validate complex string values with newvalues function' do
it 'validates log_line_prefix with value [%p] %q:%u:%d:%' do
expect { described_class.new(name: 'log_line_prefix', value: '[%p] %q:%u:%d:%x ') }.not_to raise_error
end
it 'validates log_line_prefix with value %t %q%u@%d %p %i' do
expect { described_class.new(name: 'log_line_prefix', value: '%t %q%u@%d %p %i ') }.not_to raise_error
end
it 'validates log_filename with value psql_01-%Y-%m-%d.log' do
expect { described_class.new(name: 'log_filename', value: 'psql_01-%Y-%m-%d.log') }.not_to raise_error
end
Expand Down