Skip to content

Commit 83f29bd

Browse files
cocker-cccocker-cc
committed
Use Datatype Sensitive for Secrets
1 parent 4a02618 commit 83f29bd

File tree

7 files changed

+10
-10
lines changed

7 files changed

+10
-10
lines changed

‎manifests/database/postgresql.pp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
$puppetdb_server = $puppetdb::params::puppetdb_server,
66
$database_name = $puppetdb::params::database_name,
77
$database_username = $puppetdb::params::database_username,
8-
$database_password = $puppetdb::params::database_password,
8+
Variant[String, Sensitive[String]] $database_password = $puppetdb::params::database_password,
99
$database_port = $puppetdb::params::database_port,
1010
$manage_database = $puppetdb::params::manage_database,
1111
$manage_server = $puppetdb::params::manage_dbserver,
@@ -16,7 +16,7 @@
1616
$postgresql_ssl_cert_path = $puppetdb::params::postgresql_ssl_cert_path,
1717
$postgresql_ssl_ca_cert_path = $puppetdb::params::postgresql_ssl_ca_cert_path,
1818
$read_database_username = $puppetdb::params::read_database_username,
19-
$read_database_password = $puppetdb::params::read_database_password,
19+
Variant[String, Sensitive[String]] $read_database_password = $puppetdb::params::read_database_password,
2020
$read_database_host = $puppetdb::params::read_database_host
2121
) inherits puppetdb::params {
2222

‎manifests/init.pp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
$database_host = $puppetdb::params::database_host,
3636
$database_port = $puppetdb::params::database_port,
3737
$database_username = $puppetdb::params::database_username,
38-
$database_password = $puppetdb::params::database_password,
38+
Variant[String, Sensitive[String]] $database_password = $puppetdb::params::database_password,
3939
$database_name = $puppetdb::params::database_name,
4040
$manage_db_password = $puppetdb::params::manage_db_password,
4141
$jdbc_ssl_properties = $puppetdb::params::jdbc_ssl_properties,
@@ -62,7 +62,7 @@
6262
$read_database_host = $puppetdb::params::read_database_host,
6363
$read_database_port = $puppetdb::params::read_database_port,
6464
$read_database_username = $puppetdb::params::read_database_username,
65-
$read_database_password = $puppetdb::params::read_database_password,
65+
Variant[String, Sensitive[String]] $read_database_password = $puppetdb::params::read_database_password,
6666
$read_database_name = $puppetdb::params::read_database_name,
6767
$manage_read_db_password = $puppetdb::params::manage_read_db_password,
6868
$read_database_jdbc_ssl_properties = $puppetdb::params::read_database_jdbc_ssl_properties,

‎manifests/server.pp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
$database_host = $puppetdb::params::database_host,
2727
$database_port = $puppetdb::params::database_port,
2828
$database_username = $puppetdb::params::database_username,
29-
$database_password = $puppetdb::params::database_password,
29+
Variant[String, Sensitive[String]] $database_password = $puppetdb::params::database_password,
3030
$database_name = $puppetdb::params::database_name,
3131
$manage_db_password = $puppetdb::params::manage_db_password,
3232
$jdbc_ssl_properties = $puppetdb::params::jdbc_ssl_properties,
@@ -51,7 +51,7 @@
5151
$read_database_host = $puppetdb::params::read_database_host,
5252
$read_database_port = $puppetdb::params::read_database_port,
5353
$read_database_username = $puppetdb::params::read_database_username,
54-
$read_database_password = $puppetdb::params::read_database_password,
54+
Variant[String, Sensitive[String]] $read_database_password = $puppetdb::params::read_database_password,
5555
$read_database_name = $puppetdb::params::read_database_name,
5656
$manage_read_db_password = $puppetdb::params::manage_read_db_password,
5757
$read_database_jdbc_ssl_properties = $puppetdb::params::read_database_jdbc_ssl_properties,

‎manifests/server/database.pp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
$database_host = $puppetdb::params::database_host,
55
$database_port = $puppetdb::params::database_port,
66
$database_username = $puppetdb::params::database_username,
7-
$database_password = $puppetdb::params::database_password,
7+
Variant[String, Sensitive[String]] $database_password = $puppetdb::params::database_password,
88
$database_name = $puppetdb::params::database_name,
99
$manage_db_password = $puppetdb::params::manage_db_password,
1010
$jdbc_ssl_properties = $puppetdb::params::jdbc_ssl_properties,

‎manifests/server/read_database.pp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
$read_database_host = $puppetdb::params::read_database_host,
55
$read_database_port = $puppetdb::params::read_database_port,
66
$read_database_username = $puppetdb::params::read_database_username,
7-
$read_database_password = $puppetdb::params::read_database_password,
7+
Variant[String, Sensitive[String]] $read_database_password = $puppetdb::params::read_database_password,
88
$read_database_name = $puppetdb::params::read_database_name,
99
$manage_db_password = $puppetdb::params::manage_read_db_password,
1010
$jdbc_ssl_properties = $puppetdb::params::read_database_jdbc_ssl_properties,

‎manifests/server/validate_db.pp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
$database_host = $puppetdb::params::database_host,
55
$database_port = $puppetdb::params::database_port,
66
$database_username = $puppetdb::params::database_username,
7-
$database_password = $puppetdb::params::database_password,
7+
Variant[String, Sensitive[String]] $database_password = $puppetdb::params::database_password,
88
$database_name = $puppetdb::params::database_name,
99
$jdbc_ssl_properties = $puppetdb::params::jdbc_ssl_properties,
1010
) inherits puppetdb::params {

‎manifests/server/validate_read_db.pp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
$database_host = $puppetdb::params::database_host,
55
$database_port = $puppetdb::params::database_port,
66
$database_username = $puppetdb::params::database_username,
7-
$database_password = $puppetdb::params::database_password,
7+
Variant[String, Sensitive[String]] $database_password = $puppetdb::params::database_password,
88
$database_name = $puppetdb::params::database_name,
99
$jdbc_ssl_properties = $puppetdb::params::jdbc_ssl_properties,
1010
) inherits puppetdb::params {

0 commit comments

Comments
 (0)