Merge pull request #331 from cocker-cc/Use_Datatype_Sensitive

Allow `Sensitive` data type for secrets

Author: h0tw1r3

Diff for: REFERENCE.md

@@ -344,7 +344,7 @@ Default value: `$puppetdb::params::database_username`
 
 ##### <a name="-puppetdb--database_password"></a>`database_password`
 
-Data type: `Any`
+Data type: `Variant[String[1], Sensitive[String[1]]]`
 
 The password for the database user. Defaults to `puppetdb`.
 
@@ -615,7 +615,7 @@ Default value: `$puppetdb::params::read_database_username`
 
 ##### <a name="-puppetdb--read_database_password"></a>`read_database_password`
 
-Data type: `Any`
+Data type: `Variant[String[1], Sensitive[String[1]]]`
 
 The password for the read database user. Defaults to `puppetdb-read`. This option is
 supported in PuppetDB >= 1.6.
@@ -973,7 +973,7 @@ Default value: `$puppetdb::params::database_username`
 
 ##### <a name="-puppetdb--database--postgresql--database_password"></a>`database_password`
 
-Data type: `Any`
+Data type: `Variant[String[1], Sensitive[String[1]]]`
 
 Sets the password for the database user above. Defaults to `puppetdb`.
 
@@ -1067,7 +1067,7 @@ Default value: `$puppetdb::params::read_database_username`
 
 ##### <a name="-puppetdb--database--postgresql--read_database_password"></a>`read_database_password`
 
-Data type: `Any`
+Data type: `Variant[String[1], Sensitive[String[1]]]`
 
 The password for the read database user. Defaults to `puppetdb-read`. This option is
 supported in PuppetDB >= 1.6.
@@ -1583,7 +1583,7 @@ Default value: `$puppetdb::params::database_username`
 
 ##### <a name="-puppetdb--server--database_password"></a>`database_password`
 
-Data type: `Any`
+Data type: `Variant[String[1], Sensitive[String[1]]]`
 
 The password for the database user. Defaults to `puppetdb`.
 
@@ -1835,7 +1835,7 @@ Default value: `$puppetdb::params::read_database_username`
 
 ##### <a name="-puppetdb--server--read_database_password"></a>`read_database_password`
 
-Data type: `Any`
+Data type: `Variant[String[1], Sensitive[String[1]]]`
 
 The password for the read database user. Defaults to `puppetdb-read`. This option is
 supported in PuppetDB >= 1.6.

Diff for: manifests/database/postgresql.pp

@@ -75,7 +75,7 @@
   $puppetdb_server             = $puppetdb::params::puppetdb_server,
   $database_name               = $puppetdb::params::database_name,
   $database_username           = $puppetdb::params::database_username,
-  $database_password           = $puppetdb::params::database_password,
+  Variant[String[1], Sensitive[String[1]]] $database_password = $puppetdb::params::database_password,
   $database_port               = $puppetdb::params::database_port,
   $manage_database             = $puppetdb::params::manage_database,
   $manage_server               = $puppetdb::params::manage_dbserver,
@@ -86,7 +86,7 @@
   $postgresql_ssl_cert_path    = $puppetdb::params::postgresql_ssl_cert_path,
   $postgresql_ssl_ca_cert_path = $puppetdb::params::postgresql_ssl_ca_cert_path,
   $read_database_username      = $puppetdb::params::read_database_username,
-  $read_database_password      = $puppetdb::params::read_database_password,
+  Variant[String[1], Sensitive[String[1]]] $read_database_password = $puppetdb::params::read_database_password,
   $read_database_host          = $puppetdb::params::read_database_host,
   Boolean $password_sensitive  = false,
   Postgresql::Pg_password_encryption $password_encryption = $puppetdb::params::password_encryption,

Diff for: manifests/database/read_only_user.pp

@@ -21,7 +21,7 @@
   String $read_database_username,
   String $database_name,
   String $database_owner,
-  Variant[String, Boolean, Sensitive[String]] $password_hash = false,
+  Variant[String[1], Boolean, Sensitive[String[1]]] $password_hash = false,
   Optional[Stdlib::Port] $database_port = undef,
   Optional[Postgresql::Pg_password_encryption] $password_encryption = undef,
 ) {

Diff for: manifests/init.pp

@@ -379,7 +379,7 @@
   $database_host                           = $puppetdb::params::database_host,
   $database_port                           = $puppetdb::params::database_port,
   $database_username                       = $puppetdb::params::database_username,
-  $database_password                       = $puppetdb::params::database_password,
+  Variant[String[1], Sensitive[String[1]]] $database_password = $puppetdb::params::database_password,
   $database_name                           = $puppetdb::params::database_name,
   $manage_db_password                      = $puppetdb::params::manage_db_password,
   $jdbc_ssl_properties                     = $puppetdb::params::jdbc_ssl_properties,
@@ -402,7 +402,7 @@
   $read_database_host                      = $puppetdb::params::read_database_host,
   $read_database_port                      = $puppetdb::params::read_database_port,
   $read_database_username                  = $puppetdb::params::read_database_username,
-  $read_database_password                  = $puppetdb::params::read_database_password,
+  Variant[String[1], Sensitive[String[1]]] $read_database_password = $puppetdb::params::read_database_password,
   $read_database_name                      = $puppetdb::params::read_database_name,
   $manage_read_db_password                 = $puppetdb::params::manage_read_db_password,
   $read_database_jdbc_ssl_properties       = $puppetdb::params::read_database_jdbc_ssl_properties,

Diff for: manifests/server.pp

@@ -336,7 +336,7 @@
   $database_host                           = $puppetdb::params::database_host,
   $database_port                           = $puppetdb::params::database_port,
   $database_username                       = $puppetdb::params::database_username,
-  $database_password                       = $puppetdb::params::database_password,
+  Variant[String[1], Sensitive[String[1]]] $database_password = $puppetdb::params::database_password,
   $database_name                           = $puppetdb::params::database_name,
   $manage_db_password                      = $puppetdb::params::manage_db_password,
   $jdbc_ssl_properties                     = $puppetdb::params::jdbc_ssl_properties,
@@ -357,7 +357,7 @@
   $read_database_host                      = $puppetdb::params::read_database_host,
   $read_database_port                      = $puppetdb::params::read_database_port,
   $read_database_username                  = $puppetdb::params::read_database_username,
-  $read_database_password                  = $puppetdb::params::read_database_password,
+  Variant[String[1], Sensitive[String[1]]] $read_database_password = $puppetdb::params::read_database_password,
   $read_database_name                      = $puppetdb::params::read_database_name,
   $manage_read_db_password                 = $puppetdb::params::manage_read_db_password,
   $read_database_jdbc_ssl_properties       = $puppetdb::params::read_database_jdbc_ssl_properties,

Diff for: manifests/server/database.pp

@@ -5,7 +5,7 @@
   $database_host             = $puppetdb::params::database_host,
   $database_port             = $puppetdb::params::database_port,
   $database_username         = $puppetdb::params::database_username,
-  $database_password         = $puppetdb::params::database_password,
+  Variant[String[1], Sensitive[String[1]]] $database_password = $puppetdb::params::database_password,
   $database_name             = $puppetdb::params::database_name,
   $manage_db_password        = $puppetdb::params::manage_db_password,
   $jdbc_ssl_properties       = $puppetdb::params::jdbc_ssl_properties,

Diff for: manifests/server/read_database.pp

@@ -5,7 +5,7 @@
   $read_database_host     = $puppetdb::params::read_database_host,
   $read_database_port     = $puppetdb::params::read_database_port,
   $read_database_username = $puppetdb::params::read_database_username,
-  $read_database_password = $puppetdb::params::read_database_password,
+  Variant[String[1], Sensitive[String[1]]] $read_database_password = $puppetdb::params::read_database_password,
   $read_database_name     = $puppetdb::params::read_database_name,
   $manage_db_password     = $puppetdb::params::manage_read_db_password,
   $jdbc_ssl_properties    = $puppetdb::params::read_database_jdbc_ssl_properties,

Diff for: manifests/server/validate_db.pp

@@ -5,7 +5,7 @@
   $database_host       = $puppetdb::params::database_host,
   $database_port       = $puppetdb::params::database_port,
   $database_username   = $puppetdb::params::database_username,
-  $database_password   = $puppetdb::params::database_password,
+  Variant[String[1], Sensitive[String[1]]] $database_password = $puppetdb::params::database_password,
   $database_name       = $puppetdb::params::database_name,
   $jdbc_ssl_properties = $puppetdb::params::jdbc_ssl_properties,
 ) inherits puppetdb::params {

Diff for: manifests/server/validate_read_db.pp

@@ -5,7 +5,7 @@
   $database_host       = $puppetdb::params::database_host,
   $database_port       = $puppetdb::params::database_port,
   $database_username   = $puppetdb::params::database_username,
-  $database_password   = $puppetdb::params::database_password,
+  Variant[String[1], Sensitive[String[1]]] $database_password = $puppetdb::params::database_password,
   $database_name       = $puppetdb::params::database_name,
   $jdbc_ssl_properties = $puppetdb::params::jdbc_ssl_properties,
 ) inherits puppetdb::params {