From 880b5e0c1cc48134e16d02eaac2e8db28e7e7104 Mon Sep 17 00:00:00 2001
From: Tobias Urdin <tobias.urdin@binero.se>
Date: Sat, 23 Feb 2019 23:12:52 +0100
Subject: [PATCH] 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: I5d1ebaf9a3b7f6637973ea846d3571c7364feb54
---
 manifests/config.pp        | 11 +++++------
 manifests/db.pp            |  4 ++--
 manifests/db/mysql.pp      |  2 +-
 manifests/db/postgresql.pp |  2 +-
 manifests/policy.pp        |  2 +-
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/manifests/config.pp b/manifests/config.pp
index afbb15ee..e5df4edb 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -71,16 +71,15 @@ class trove::config (
 
   include ::trove::deps
 
-  validate_hash($trove_config)
-  validate_hash($trove_taskmanager_config)
-  validate_hash($trove_conductor_config)
-  validate_hash($trove_guestagent_config)
-  validate_hash($trove_api_paste_ini)
+  validate_legacy(Hash, 'validate_hash', $trove_config)
+  validate_legacy(Hash, 'validate_hash', $trove_taskmanager_config)
+  validate_legacy(Hash, 'validate_hash', $trove_conductor_config)
+  validate_legacy(Hash, 'validate_hash', $trove_guestagent_config)
+  validate_legacy(Hash, 'validate_hash', $trove_api_paste_ini)
 
   create_resources('trove_config', $trove_config)
   create_resources('trove_taskmanager_config', $trove_taskmanager_config)
   create_resources('trove_conductor_config', $trove_conductor_config)
   create_resources('trove_guestagent_config', $trove_guestagent_config)
   create_resources('trove_api_paste_ini', $trove_api_paste_ini)
-
 }
diff --git a/manifests/db.pp b/manifests/db.pp
index cf6c6b43..9fe429c1 100644
--- a/manifests/db.pp
+++ b/manifests/db.pp
@@ -60,8 +60,8 @@ class trove::db (
   $database_retry_interval_real = pick($::trove::database_retry_interval, $database_retry_interval)
   $database_max_overflow_real   = pick($::trove::database_max_overflow, $database_max_overflow)
 
-  validate_re($database_connection_real,
-    '^(sqlite|mysql(\+pymysql)?|postgresql):\/\/(\S+:\S+@\S+\/\S+)?')
+  validate_legacy(Oslo::Dbconn, 'validate_re', $database_connection_real,
+    ['^(sqlite|mysql(\+pymysql)?|postgresql):\/\/(\S+:\S+@\S+\/\S+)?'])
 
   oslo::db { 'trove_config':
     connection     => $database_connection_real,
diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp
index e7debafb..01735569 100644
--- a/manifests/db/mysql.pp
+++ b/manifests/db/mysql.pp
@@ -61,7 +61,7 @@ class trove::db::mysql(
 
   include ::trove::deps
 
-  validate_string($password)
+  validate_legacy(String, 'validate_string', $password)
 
   ::openstacklib::db::mysql { 'trove':
     user          => $user,
diff --git a/manifests/db/postgresql.pp b/manifests/db/postgresql.pp
index 73f6a43d..0709fdc6 100644
--- a/manifests/db/postgresql.pp
+++ b/manifests/db/postgresql.pp
@@ -34,7 +34,7 @@ class trove::db::postgresql(
 
   include ::trove::deps
 
-  validate_string($password)
+  validate_legacy(String, 'validate_string', $password)
 
   ::openstacklib::db::postgresql { 'trove':
     password_hash => postgresql_password($user, $password),
diff --git a/manifests/policy.pp b/manifests/policy.pp
index 279923e9..0e4033d7 100644
--- a/manifests/policy.pp
+++ b/manifests/policy.pp
@@ -31,7 +31,7 @@ class trove::policy (
   include ::trove::deps
   include ::trove::params
 
-  validate_hash($policies)
+  validate_legacy(Hash, 'validate_hash', $policies)
 
   Openstacklib::Policy::Base {
     file_path  => $policy_path,