Merge pull request #103 from Icinga/enhancement/remove-duplicate-unwr…

…ap-function

Replace duplicate function icinga::unwrap with built-in unwrap function

REFERENCE.md

@@ -56,7 +56,6 @@ PHP and a Webserver.
 with or without TLS information.
 * [`icinga::newline`](#icinga--newline): Replace newlines for Windows systems.
 * [`icinga::prepare_web`](#icinga--prepare_web): This funktion checks for web preparation and display a warning if fails
-* [`icinga::unwrap`](#icinga--unwrap): This function returns an unwrap string if necessary.
 
 ### Data types
 
@@ -2035,24 +2034,6 @@ Data type: `String`
 
 
 
-### <a name="icinga--unwrap"></a>`icinga::unwrap`
-
-Type: Puppet Language
-
-This function returns an unwrap string if necessary.
-
-#### `icinga::unwrap(Optional[Variant[String, Sensitive[String]]] $arg = undef)`
-
-The icinga::unwrap function.
-
-Returns: `Any` The unwraped string.
-
-##### `arg`
-
-Data type: `Optional[Variant[String, Sensitive[String]]]`
-
-
-
 ## Data types
 
 ### <a name="Icinga--Certificate"></a>`Icinga::Certificate`

functions/db/connect.pp

@@ -72,7 +72,7 @@ function icinga::db::connect(
               'dbname='      => $db['database'],
     })), ' '), '= ', '=', 'G')
   } else {
-    $_password = icinga::unwrap($db['password'])
+    $_password = unwrap($db['password'])
     $options = join(any2array(delete_undef_values({
             '-h'               => $db['host'] ? {
               /localhost/  => undef,

manifests/cert.pp

@@ -30,7 +30,7 @@
   if $args[key] {
     file { $args['key_file']:
       ensure    => file,
-      content   => icinga::newline(icinga::unwrap($args['key'])),
+      content   => icinga::newline(unwrap($args['key'])),
       mode      => $key_mode,
       show_diff => false,
     }

manifests/database.pp

@@ -31,7 +31,7 @@
     }
 
     if versioncmp($facts['puppetversion'], '6.0.0') < 0  or ($facts['os']['family'] == 'redhat' and Integer($facts['os']['release']['major']) < 8) {
-      $_pass = icinga::unwrap($db_pass)
+      $_pass = unwrap($db_pass)
     } else {
       $_pass = postgresql::postgresql_password($db_user, $db_pass, false, $postgresql::server::password_encryption)
     }

manifests/init.pp

@@ -213,7 +213,7 @@
           "${icinga_home}/.ssh/id_${ssh_key_type}":
             mode      => '0600',
             show_diff => false,
-            content   => icinga::unwrap($ssh_private_key);
+            content   => unwrap($ssh_private_key);
           "${icinga_home}/.ssh/config":
             content => "Host *\n  StrictHostKeyChecking no\n  ControlPath ${icinga_home}/.ssh/controlmasters/%r@%h:%p.socket\n  ControlMaster auto\n  ControlPersist 5m";
         }