From 7ea982cedbe6a5bd79780c75060bf7a6dd94eaec Mon Sep 17 00:00:00 2001
From: lnemsick-simp <lnemsick-simp@users.noreply.github.com>
Date: Wed, 20 Mar 2019 17:18:36 -0400
Subject: [PATCH] (SIMP-6119) Use namespaced simplib::validate_uri_list (#36)

- Use simplib::validate_uri_list in lieu of deprecated Puppet 3
  validate_uri_list
- Use simplib::validate_net_list in lieu of deprecated Puppet 3
  validate_net_list

SIMP-6119 #close
---
 CHANGELOG           | 6 ++++++
 manifests/dns.pp    | 2 +-
 manifests/init.pp   | 2 +-
 manifests/ldap.pp   | 4 ++--
 manifests/ntpd.pp   | 2 +-
 manifests/puppet.pp | 4 ++--
 manifests/rsync.pp  | 2 +-
 manifests/syslog.pp | 4 ++--
 metadata.json       | 2 +-
 9 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 63d5be8..4048c64 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+* Tue Mar 19 2019 Liz Nemsick <lnemsick.simp@gmail.com> - 1.2.3-0
+- Use simplib::validate_net_list in lieu of deprecated Puppet 3
+  validate_net_list
+- Use simplib::validate_uri_list in lieu of deprecated Puppet 3
+  validate_uri_list
+
 * Thu Mar 07 2019 Liz Nemsick <lnemsick.simp@gmail.com> - 1.2.2-0
 - Update the upper bound of stdlib to < 6.0.0
 - Update a URL in the README.md
diff --git a/manifests/dns.pp b/manifests/dns.pp
index 5088a3e..31870ad 100644
--- a/manifests/dns.pp
+++ b/manifests/dns.pp
@@ -27,5 +27,5 @@
   Array[Simplib::Host] $servers = []
 ){
   assert_private()
-  validate_net_list($servers)
+  simplib::validate_net_list($servers)
 }
diff --git a/manifests/init.pp b/manifests/init.pp
index c8ebff7..ad869fe 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -96,7 +96,7 @@
   String                        $package_ensure = 'latest',
   Boolean                       $libkv          = false,
 ){
-  validate_net_list($trusted_nets)
+  simplib::validate_net_list($trusted_nets)
 
   include 'simp_options::dns'
   include 'simp_options::ntpd'
diff --git a/manifests/ldap.pp b/manifests/ldap.pp
index 78d9384..efe9a25 100644
--- a/manifests/ldap.pp
+++ b/manifests/ldap.pp
@@ -41,6 +41,6 @@
   Array[Simplib::URI] $uri        = ["ldap://${simp_options::puppet::server}"]
 ){
   assert_private()
-  validate_uri_list($master,['ldap','ldaps'])
-  validate_uri_list($uri,['ldap','ldaps'])
+  simplib::validate_uri_list($master,['ldap','ldaps'])
+  simplib::validate_uri_list($uri,['ldap','ldaps'])
 }
diff --git a/manifests/ntpd.pp b/manifests/ntpd.pp
index 3d1c26e..a751b85 100644
--- a/manifests/ntpd.pp
+++ b/manifests/ntpd.pp
@@ -14,5 +14,5 @@
   Array[Simplib::Host] $servers = []
 ){
   assert_private()
-  validate_net_list($servers)
+  simplib::validate_net_list($servers)
 }
diff --git a/manifests/puppet.pp b/manifests/puppet.pp
index c21dfbe..9e095de 100644
--- a/manifests/puppet.pp
+++ b/manifests/puppet.pp
@@ -20,6 +20,6 @@
   Simplib::Port $ca_port = $server_distribution ? { 'PE' => 8140, default => 8141 }
 ){
   assert_private()
-  validate_net_list($server)
-  validate_net_list($ca)
+  simplib::validate_net_list($server)
+  simplib::validate_net_list($ca)
 }
diff --git a/manifests/rsync.pp b/manifests/rsync.pp
index 59c23f5..c98ebe9 100644
--- a/manifests/rsync.pp
+++ b/manifests/rsync.pp
@@ -19,5 +19,5 @@
   Integer       $timeout = 1
 ){
   assert_private()
-  validate_net_list($server)
+  simplib::validate_net_list($server)
 }
diff --git a/manifests/syslog.pp b/manifests/syslog.pp
index 62595a0..fcd4550 100644
--- a/manifests/syslog.pp
+++ b/manifests/syslog.pp
@@ -14,6 +14,6 @@
   Array[Simplib::Host] $failover_log_servers = []
 ){
   assert_private()
-  validate_net_list($log_servers)
-  validate_net_list($failover_log_servers)
+  simplib::validate_net_list($log_servers)
+  simplib::validate_net_list($failover_log_servers)
 }
diff --git a/metadata.json b/metadata.json
index 0f0888c..5e8a3e9 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "simp-simp_options",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "author": "SIMP Team",
   "summary": "Variables enabling SIMP core capabilities",
   "license": "Apache-2.0",