(MODULES-8193) - Removal of inbuilt deepmerge and dirname functions

Both functions have been removed from the code and their function calls within the manifest's updated as they already exist within puppet itself, in the case of deepmerge and within stdlib in the case of dirname.

Author: david22swan

Diff for: lib/puppet/functions/mysql/deepmerge.rb

@@ -92,7 +92,7 @@
       'password'               => $backuppassword,
     }
   }
-  $options = mysql::deepmerge($default_options, $mysql::server::override_options)
+  $options = $default_options.deep_merge($mysql::server::override_options)
 
   file { 'mysqlbackup-config-file':
     path    => '/etc/mysql/conf.d/meb.cnf',

Diff for: lib/puppet/functions/mysql/dirname.rb

@@ -116,7 +116,7 @@
   }
 
   # Create a merged together set of options.  Rightmost hashes win over left.
-  $options = mysql::deepmerge($mysql::params::default_options, $override_options)
+  $options = $mysql::params::default_options.deep_merge($override_options)
 
   Class['mysql::server::root_password'] -> Mysql::Db <| |>
 

Diff for: lib/puppet/parser/functions/mysql_deepmerge.rb

@@ -11,7 +11,7 @@
   $logbin = pick($options['mysqld']['log-bin'], $options['mysqld']['log_bin'], false)
 
   if $logbin {
-    $logbindir = mysql::dirname($logbin)
+    $logbindir = dirname($logbin)
 
     #Stop puppet from managing directory if just a filename/prefix is specified
     if $logbindir != '.' {

Diff for: lib/puppet/parser/functions/mysql_dirname.rb

@@ -24,7 +24,7 @@
 
     # on some systems this is /etc/my.cnf.d, while Debian has /etc/mysql/conf.d and FreeBSD something in /usr/local. For the latter systems,
     # managing this basedir is also required, to have it available before the package is installed.
-    $includeparentdir = mysql::dirname($includedir)
+    $includeparentdir = dirname($includedir)
     if $includeparentdir != '/' and $includeparentdir != '/etc' {
       file { $includeparentdir:
         ensure => directory,
@@ -43,9 +43,9 @@
 
     # on mariadb systems, $includedir is not defined, but /etc/my.cnf.d has
     # to be managed to place the server.cnf there
-    $configparentdir = mysql::dirname($mysql::server::config_file)
+    $configparentdir = dirname($mysql::server::config_file)
     if $configparentdir != '/' and $configparentdir != '/etc' and $configparentdir
-        != $includedir and $configparentdir != mysql::dirname($includedir) {
+        != $includedir and $configparentdir != dirname($includedir) {
       file { $configparentdir:
         ensure => directory,
         mode   => '0755',