Skip to content

Commit 530cf93

Browse files
cocker-cccocker-cc
committed
Use Datatype Sensitive for Secrets
1 parent a0602d1 commit 530cf93

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
@@ -70,7 +70,7 @@
7070
$puppetdb_server = $puppetdb::params::puppetdb_server,
7171
$database_name = $puppetdb::params::database_name,
7272
$database_username = $puppetdb::params::database_username,
73-
$database_password = $puppetdb::params::database_password,
73+
Variant[String, Sensitive[String]] $database_password = $puppetdb::params::database_password,
7474
$database_port = $puppetdb::params::database_port,
7575
$manage_database = $puppetdb::params::manage_database,
7676
$manage_server = $puppetdb::params::manage_dbserver,
@@ -81,7 +81,7 @@
8181
$postgresql_ssl_cert_path = $puppetdb::params::postgresql_ssl_cert_path,
8282
$postgresql_ssl_ca_cert_path = $puppetdb::params::postgresql_ssl_ca_cert_path,
8383
$read_database_username = $puppetdb::params::read_database_username,
84-
$read_database_password = $puppetdb::params::read_database_password,
84+
Variant[String, Sensitive[String]] $read_database_password = $puppetdb::params::read_database_password,
8585
$read_database_host = $puppetdb::params::read_database_host
8686
) inherits puppetdb::params {
8787
$port = scanf($database_port, '%i')[0]

‎manifests/init.pp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@
408408
$database_host = $puppetdb::params::database_host,
409409
$database_port = $puppetdb::params::database_port,
410410
$database_username = $puppetdb::params::database_username,
411-
$database_password = $puppetdb::params::database_password,
411+
Variant[String, Sensitive[String]] $database_password = $puppetdb::params::database_password,
412412
$database_name = $puppetdb::params::database_name,
413413
$manage_db_password = $puppetdb::params::manage_db_password,
414414
$jdbc_ssl_properties = $puppetdb::params::jdbc_ssl_properties,
@@ -433,7 +433,7 @@
433433
$read_database_host = $puppetdb::params::read_database_host,
434434
$read_database_port = $puppetdb::params::read_database_port,
435435
$read_database_username = $puppetdb::params::read_database_username,
436-
$read_database_password = $puppetdb::params::read_database_password,
436+
Variant[String, Sensitive[String]] $read_database_password = $puppetdb::params::read_database_password,
437437
$read_database_name = $puppetdb::params::read_database_name,
438438
$manage_read_db_password = $puppetdb::params::manage_read_db_password,
439439
$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
@@ -368,7 +368,7 @@
368368
$database_host = $puppetdb::params::database_host,
369369
$database_port = $puppetdb::params::database_port,
370370
$database_username = $puppetdb::params::database_username,
371-
$database_password = $puppetdb::params::database_password,
371+
Variant[String, Sensitive[String]] $database_password = $puppetdb::params::database_password,
372372
$database_name = $puppetdb::params::database_name,
373373
$manage_db_password = $puppetdb::params::manage_db_password,
374374
$jdbc_ssl_properties = $puppetdb::params::jdbc_ssl_properties,
@@ -391,7 +391,7 @@
391391
$read_database_host = $puppetdb::params::read_database_host,
392392
$read_database_port = $puppetdb::params::read_database_port,
393393
$read_database_username = $puppetdb::params::read_database_username,
394-
$read_database_password = $puppetdb::params::read_database_password,
394+
Variant[String, Sensitive[String]] $read_database_password = $puppetdb::params::read_database_password,
395395
$read_database_name = $puppetdb::params::read_database_name,
396396
$manage_read_db_password = $puppetdb::params::manage_read_db_password,
397397
$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
@@ -5,7 +5,7 @@
55
$database_host = $puppetdb::params::database_host,
66
$database_port = $puppetdb::params::database_port,
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_name = $puppetdb::params::database_name,
1010
$manage_db_password = $puppetdb::params::manage_db_password,
1111
$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
@@ -5,7 +5,7 @@
55
$read_database_host = $puppetdb::params::read_database_host,
66
$read_database_port = $puppetdb::params::read_database_port,
77
$read_database_username = $puppetdb::params::read_database_username,
8-
$read_database_password = $puppetdb::params::read_database_password,
8+
Variant[String, Sensitive[String]] $read_database_password = $puppetdb::params::read_database_password,
99
$read_database_name = $puppetdb::params::read_database_name,
1010
$manage_db_password = $puppetdb::params::manage_read_db_password,
1111
$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
@@ -5,7 +5,7 @@
55
$database_host = $puppetdb::params::database_host,
66
$database_port = $puppetdb::params::database_port,
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_name = $puppetdb::params::database_name,
1010
$jdbc_ssl_properties = $puppetdb::params::jdbc_ssl_properties,
1111
) inherits puppetdb::params {

‎manifests/server/validate_read_db.pp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
$database_host = $puppetdb::params::database_host,
66
$database_port = $puppetdb::params::database_port,
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_name = $puppetdb::params::database_name,
1010
$jdbc_ssl_properties = $puppetdb::params::jdbc_ssl_properties,
1111
) inherits puppetdb::params {

0 commit comments

Comments
 (0)