Use Datatype Sensitive for Secrets

cocker-cc · cocker-cc · commit ecddb2dffa55 · 2022-07-29T17:23:52.000+02:00
diff --git a/manifests/database/postgresql.pp b/manifests/database/postgresql.pp
@@ -5,7 +5,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, Sensitive[String]] $database_password = $puppetdb::params::database_password,
   $database_port               = $puppetdb::params::database_port,
   $manage_database             = $puppetdb::params::manage_database,
   $manage_server               = $puppetdb::params::manage_dbserver,
@@ -16,7 +16,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,
+  Optional[Variant[String, Sensitive[String]]] $read_database_password = $puppetdb::params::read_database_password,
   $read_database_host          = $puppetdb::params::read_database_host
 ) inherits puppetdb::params {
 
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -35,7 +35,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, Sensitive[String]] $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,
@@ -62,7 +62,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,
+  Optional[Variant[String, Sensitive[String]]] $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 --git a/manifests/server.pp b/manifests/server.pp
@@ -26,7 +26,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, Sensitive[String]] $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,
@@ -51,7 +51,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,
+  Optional[Variant[String, Sensitive[String]]] $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 --git a/manifests/server/database.pp b/manifests/server/database.pp
@@ -4,7 +4,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, Sensitive[String]] $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 --git a/manifests/server/read_database.pp b/manifests/server/read_database.pp
@@ -4,7 +4,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,
+  Optional[Variant[String, Sensitive[String]]] $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 --git a/manifests/server/validate_db.pp b/manifests/server/validate_db.pp
@@ -4,7 +4,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, Sensitive[String]] $database_password = $puppetdb::params::database_password,
   $database_name       = $puppetdb::params::database_name,
   $jdbc_ssl_properties = $puppetdb::params::jdbc_ssl_properties,
 ) inherits puppetdb::params {
diff --git a/manifests/server/validate_read_db.pp b/manifests/server/validate_read_db.pp
@@ -4,7 +4,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, Sensitive[String]] $database_password = $puppetdb::params::database_password,
   $database_name       = $puppetdb::params::database_name,
   $jdbc_ssl_properties = $puppetdb::params::jdbc_ssl_properties,
 ) inherits puppetdb::params {
diff --git a/metadata.json b/metadata.json
@@ -10,7 +10,7 @@
   "dependencies": [
     {
       "name": "puppetlabs/inifile",
-      "version_requirement": ">= 1.1.3 < 6.0.0"
+      "version_requirement": ">= 5.1.0 < 6.0.0"
     },
     {
       "name": "puppetlabs/postgresql",

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`"dependencies": [`
`11`	`11`	`{`
`12`	`12`	`"name": "puppetlabs/inifile",`
`13`		`- "version_requirement": ">= 1.1.3 < 6.0.0"`
	`13`	`+ "version_requirement": ">= 5.1.0 < 6.0.0"`
`14`	`14`	`},`
`15`	`15`	`{`
`16`	`16`	`"name": "puppetlabs/postgresql",`