Browse Source

Use validate_legacy

This changes all the puppet 3 validate_* functions
to use the validate_legacy function.

The validate_legacy function has been available since
about three years but require Puppet >= 4.4.0 and since
there is Puppet 4.10.12 as latest we should assume people
are running a fairly new Puppet 4 version.

This is the first step to then remove all validate function
calls and use proper types for parameter as described in spec [1].

[1] https://review.openstack.org/#/c/568929/

Change-Id: I041af9f00d9463e35a53d1979cf03697cdf41376
changes/64/638864/1
Tobias Urdin 3 years ago
parent
commit
39bd0df71e
  1. 4
      manifests/db.pp
  2. 2
      manifests/log.pp
  3. 4
      spec/defines/oslo_db_spec.rb

4
manifests/db.pp

@ -136,8 +136,8 @@ define oslo::db(
if !is_service_default($connection) {
validate_re($connection,
'^(sqlite|mysql(\+pymysql)?|postgresql(\+psycopg2)?|mongodb):\/\/(\S+:\S+@\S+\/\S+)?')
validate_legacy(Oslo::Dbconn, 'validate_re', $connection,
['^(sqlite|mysql(\+pymysql)?|postgresql(\+psycopg2)?|mongodb):\/\/(\S+:\S+@\S+\/\S+)?'])
if $manage_backend_package {
case $connection {

2
manifests/log.pp

@ -137,7 +137,7 @@ define oslo::log(
if is_service_default($default_log_levels) {
$default_log_levels_real = $default_log_levels
} else {
validate_hash($default_log_levels)
validate_legacy(Hash, 'validate_hash', $default_log_levels)
$default_log_levels_real = join(sort(join_keys_to_values($default_log_levels, '=')), ',')
}

4
spec/defines/oslo_db_spec.rb

@ -157,7 +157,7 @@ describe 'oslo::db' do
{ :connection => 'foo://db:db@localhost/db', }
end
it_raises 'a Puppet::Error', /validate_re/
it { should raise_error(Puppet::Error) }
end
context 'with incorrect pymysql database_connection string' do
@ -165,7 +165,7 @@ describe 'oslo::db' do
{ :connection => 'foo+pymysql://db:db@localhost/db', }
end
it_raises 'a Puppet::Error', /validate_re/
it { should raise_error(Puppet::Error) }
end
end

Loading…
Cancel
Save