Merge pull request #749 from Icinga/enhancement/replace-cert-function

Replace icinga2::cert function wirh icinga::cert::files
voxpupuli · Dec 22, 2023 · 083d738 · 083d738
2 parents 50f3a59 + 0291686
commit 083d738
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 209 deletions.
diff --git a/REFERENCE.md b/REFERENCE.md
@@ -74,7 +74,6 @@ start on boot and will be restarted if stopped.
 
 ### Functions
 
-* [`icinga2::cert`](#icinga2--cert): Choose the path of tls key, cert and ca file.
 * [`icinga2::icinga2_attributes`](#icinga2--icinga2_attributes): Calls the simple parser  to decide what to quote.
 For more information, see lib/puppet_x/icinga2/utils.rb.
 * [`icinga2::icinga2_ticket_id`](#icinga2--icinga2_ticket_id): Summarise what the function does here
@@ -5531,60 +5530,6 @@ Default value: `[]`
 
 ## Functions
 
-### <a name="icinga2--cert"></a>`icinga2::cert`
-
-Type: Puppet Language
-
-Choose the path of tls key, cert and ca file.
-
-#### `icinga2::cert(String $name, Optional[Stdlib::Absolutepath] $key_file = undef, Optional[Stdlib::Absolutepath] $cert_file = undef, Optional[Stdlib::Absolutepath] $cacert_file = undef, Optional[Variant[String, Sensitive[String]]] $key = undef, Optional[String] $cert = undef, Optional[String] $cacert = undef)`
-
-The icinga2::cert function.
-
-Returns: `Hash` Returned hash includes all paths and the key, cert and cacert.
-
-##### `name`
-
-Data type: `String`
-
-
-
-##### `key_file`
-
-Data type: `Optional[Stdlib::Absolutepath]`
-
-
-
-##### `cert_file`
-
-Data type: `Optional[Stdlib::Absolutepath]`
-
-
-
-##### `cacert_file`
-
-Data type: `Optional[Stdlib::Absolutepath]`
-
-
-
-##### `key`
-
-Data type: `Optional[Variant[String, Sensitive[String]]]`
-
-
-
-##### `cert`
-
-Data type: `Optional[String]`
-
-
-
-##### `cacert`
-
-Data type: `Optional[String]`
-
-
-
 ### <a name="icinga2--icinga2_attributes"></a>`icinga2::icinga2_attributes`
 
 Type: Ruby 4.x API

diff --git a/functions/cert.pp b/functions/cert.pp
diff --git a/manifests/feature/elasticsearch.pp b/manifests/feature/elasticsearch.pp
@@ -109,8 +109,9 @@
   }
 
   if $enable_ssl {
-    $cert = icinga2::cert(
+    $cert = icinga::cert::files(
       'ElasticsearchWriter_elasticsearch',
+      $ssl_dir,
       $ssl_key_path,
       $ssl_cert_path,
       $ssl_cacert_path,

diff --git a/manifests/feature/gelf.pp b/manifests/feature/gelf.pp
@@ -79,8 +79,9 @@
   }
 
   if $enable_ssl {
-    $cert = icinga2::cert(
+    $cert = icinga::cert::files(
       'GelfWriter_gelf',
+      $ssl_dir,
       $ssl_key_path,
       $ssl_cert_path,
       $ssl_cacert_path,

diff --git a/manifests/feature/icingadb.pp b/manifests/feature/icingadb.pp
@@ -124,8 +124,9 @@
   }
 
   if $enable_tls {
-    $cert = icinga2::cert(
+    $cert = icinga::cert::files(
       'IcingaDB-icingadb',
+      $ssl_dir,
       $tls_key_file,
       $tls_cert_file,
       $tls_cacert_file,

diff --git a/manifests/feature/idomysql.pp b/manifests/feature/idomysql.pp
@@ -148,8 +148,9 @@
   }
 
   if $enable_ssl {
-    $cert = icinga2::cert(
+    $cert = icinga::cert::files(
       'IdoMysqlConnection_ido-mysql',
+      $ssl_dir,
       $ssl_key_path,
       $ssl_cert_path,
       $ssl_cacert_path,

diff --git a/manifests/feature/idopgsql.pp b/manifests/feature/idopgsql.pp
@@ -134,8 +134,9 @@
   }
 
   if $enable_ssl {
-    $cert = icinga2::cert(
+    $cert = icinga::cert::files(
       'IdoPgsqlConnection_ido-pgsql',
+      $ssl_dir,
       $ssl_key_path,
       $ssl_cert_path,
       $ssl_cacert_path,

diff --git a/manifests/feature/influxdb.pp b/manifests/feature/influxdb.pp
@@ -148,8 +148,9 @@
   $service_template = { measurement => $service_measurement, tags => $service_tags }
 
   if $enable_ssl {
-    $cert = icinga2::cert(
+    $cert = icinga::cert::files(
       'InfluxdbWriter_influxdb',
+      $ssl_dir,
       $ssl_key_path,
       $ssl_cert_path,
       $ssl_cacert_path,

diff --git a/manifests/feature/influxdb2.pp b/manifests/feature/influxdb2.pp
@@ -126,8 +126,9 @@
   $service_template = { measurement => $service_measurement, tags => $service_tags }
 
   if $enable_ssl {
-    $cert = icinga2::cert(
+    $cert = icinga::cert::files(
       'Influxdb2Writer_influxdb2',
+      $ssl_dir,
       $ssl_key_path,
       $ssl_cert_path,
       $ssl_cacert_path,

diff --git a/spec/functions/cert_spec.rb b/spec/functions/cert_spec.rb