Skip to content

Commit 17c83e2

Browse files
h0tw1r3h0tw1r3
authored
Merge pull request #331 from cocker-cc/Use_Datatype_Sensitive
Allow `Sensitive` data type for secrets
2 parents 0a934de + 3eb3849 commit 17c83e2

File tree

9 files changed

+17
-17
lines changed

9 files changed

+17
-17
lines changed

‎REFERENCE.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ Default value: `$puppetdb::params::database_username`
344344

345345
##### <a name="-puppetdb--database_password"></a>`database_password`
346346

347-
Data type: `Any`
347+
Data type: `Variant[String[1], Sensitive[String[1]]]`
348348

349349
The password for the database user. Defaults to `puppetdb`.
350350

@@ -615,7 +615,7 @@ Default value: `$puppetdb::params::read_database_username`
615615

616616
##### <a name="-puppetdb--read_database_password"></a>`read_database_password`
617617

618-
Data type: `Any`
618+
Data type: `Variant[String[1], Sensitive[String[1]]]`
619619

620620
The password for the read database user. Defaults to `puppetdb-read`. This option is
621621
supported in PuppetDB >= 1.6.
@@ -973,7 +973,7 @@ Default value: `$puppetdb::params::database_username`
973973

974974
##### <a name="-puppetdb--database--postgresql--database_password"></a>`database_password`
975975

976-
Data type: `Any`
976+
Data type: `Variant[String[1], Sensitive[String[1]]]`
977977

978978
Sets the password for the database user above. Defaults to `puppetdb`.
979979

@@ -1067,7 +1067,7 @@ Default value: `$puppetdb::params::read_database_username`
10671067

10681068
##### <a name="-puppetdb--database--postgresql--read_database_password"></a>`read_database_password`
10691069

1070-
Data type: `Any`
1070+
Data type: `Variant[String[1], Sensitive[String[1]]]`
10711071

10721072
The password for the read database user. Defaults to `puppetdb-read`. This option is
10731073
supported in PuppetDB >= 1.6.
@@ -1583,7 +1583,7 @@ Default value: `$puppetdb::params::database_username`
15831583

15841584
##### <a name="-puppetdb--server--database_password"></a>`database_password`
15851585

1586-
Data type: `Any`
1586+
Data type: `Variant[String[1], Sensitive[String[1]]]`
15871587

15881588
The password for the database user. Defaults to `puppetdb`.
15891589

@@ -1835,7 +1835,7 @@ Default value: `$puppetdb::params::read_database_username`
18351835

18361836
##### <a name="-puppetdb--server--read_database_password"></a>`read_database_password`
18371837

1838-
Data type: `Any`
1838+
Data type: `Variant[String[1], Sensitive[String[1]]]`
18391839

18401840
The password for the read database user. Defaults to `puppetdb-read`. This option is
18411841
supported in PuppetDB >= 1.6.

‎manifests/database/postgresql.pp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
$puppetdb_server = $puppetdb::params::puppetdb_server,
7676
$database_name = $puppetdb::params::database_name,
7777
$database_username = $puppetdb::params::database_username,
78-
$database_password = $puppetdb::params::database_password,
78+
Variant[String[1], Sensitive[String[1]]] $database_password = $puppetdb::params::database_password,
7979
$database_port = $puppetdb::params::database_port,
8080
$manage_database = $puppetdb::params::manage_database,
8181
$manage_server = $puppetdb::params::manage_dbserver,
@@ -86,7 +86,7 @@
8686
$postgresql_ssl_cert_path = $puppetdb::params::postgresql_ssl_cert_path,
8787
$postgresql_ssl_ca_cert_path = $puppetdb::params::postgresql_ssl_ca_cert_path,
8888
$read_database_username = $puppetdb::params::read_database_username,
89-
$read_database_password = $puppetdb::params::read_database_password,
89+
Variant[String[1], Sensitive[String[1]]] $read_database_password = $puppetdb::params::read_database_password,
9090
$read_database_host = $puppetdb::params::read_database_host,
9191
Boolean $password_sensitive = false,
9292
Postgresql::Pg_password_encryption $password_encryption = $puppetdb::params::password_encryption,

‎manifests/database/read_only_user.pp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
String $read_database_username,
2222
String $database_name,
2323
String $database_owner,
24-
Variant[String, Boolean, Sensitive[String]] $password_hash = false,
24+
Variant[String[1], Boolean, Sensitive[String[1]]] $password_hash = false,
2525
Optional[Stdlib::Port] $database_port = undef,
2626
Optional[Postgresql::Pg_password_encryption] $password_encryption = undef,
2727
) {

‎manifests/init.pp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@
379379
$database_host = $puppetdb::params::database_host,
380380
$database_port = $puppetdb::params::database_port,
381381
$database_username = $puppetdb::params::database_username,
382-
$database_password = $puppetdb::params::database_password,
382+
Variant[String[1], Sensitive[String[1]]] $database_password = $puppetdb::params::database_password,
383383
$database_name = $puppetdb::params::database_name,
384384
$manage_db_password = $puppetdb::params::manage_db_password,
385385
$jdbc_ssl_properties = $puppetdb::params::jdbc_ssl_properties,
@@ -402,7 +402,7 @@
402402
$read_database_host = $puppetdb::params::read_database_host,
403403
$read_database_port = $puppetdb::params::read_database_port,
404404
$read_database_username = $puppetdb::params::read_database_username,
405-
$read_database_password = $puppetdb::params::read_database_password,
405+
Variant[String[1], Sensitive[String[1]]] $read_database_password = $puppetdb::params::read_database_password,
406406
$read_database_name = $puppetdb::params::read_database_name,
407407
$manage_read_db_password = $puppetdb::params::manage_read_db_password,
408408
$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
@@ -336,7 +336,7 @@
336336
$database_host = $puppetdb::params::database_host,
337337
$database_port = $puppetdb::params::database_port,
338338
$database_username = $puppetdb::params::database_username,
339-
$database_password = $puppetdb::params::database_password,
339+
Variant[String[1], Sensitive[String[1]]] $database_password = $puppetdb::params::database_password,
340340
$database_name = $puppetdb::params::database_name,
341341
$manage_db_password = $puppetdb::params::manage_db_password,
342342
$jdbc_ssl_properties = $puppetdb::params::jdbc_ssl_properties,
@@ -357,7 +357,7 @@
357357
$read_database_host = $puppetdb::params::read_database_host,
358358
$read_database_port = $puppetdb::params::read_database_port,
359359
$read_database_username = $puppetdb::params::read_database_username,
360-
$read_database_password = $puppetdb::params::read_database_password,
360+
Variant[String[1], Sensitive[String[1]]] $read_database_password = $puppetdb::params::read_database_password,
361361
$read_database_name = $puppetdb::params::read_database_name,
362362
$manage_read_db_password = $puppetdb::params::manage_read_db_password,
363363
$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[1], Sensitive[String[1]]] $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[1], Sensitive[String[1]]] $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[1], Sensitive[String[1]]] $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[1], Sensitive[String[1]]] $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)