Skip to content

Commit 62ae1ef

Browse files
chambersmpchambersmp
committed
set lower bounds for string and integer to negate empty or negative values
1 parent 4b76eb7 commit 62ae1ef

File tree

12 files changed

+215
-215
lines changed

12 files changed

+215
-215
lines changed

‎manifests/database/default_read_grant.pp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# @api private
44
define puppetdb::database::default_read_grant (
55
String[1] $database_name,
6-
String $schema,
6+
String[1] $schema,
77
String[1] $database_username,
88
String[1] $database_read_only_username,
99
Optional[Stdlib::Port] $database_port = undef,

‎manifests/database/postgresql_ssl_rules.pp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
#
33
# @api private
44
define puppetdb::database::postgresql_ssl_rules (
5-
String $database_name,
6-
String $database_username,
5+
String[1] $database_name,
6+
String[1] $database_username,
77
String[2,3] $postgres_version,
8-
String $puppetdb_server,
8+
String[1] $puppetdb_server,
99
) {
1010
$identity_map_key = "${database_name}-${database_username}-map"
1111

‎manifests/database/read_grant.pp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
#
33
# @api private
44
define puppetdb::database::read_grant (
5-
String $database_name,
6-
String $schema,
7-
String $database_read_only_username,
5+
String[1] $database_name,
6+
String[1] $schema,
7+
String[1] $database_read_only_username,
88
Optional[Stdlib::Port] $database_port = undef,
99
) {
1010
postgresql_psql { "grant select permission for ${database_read_only_username}":

‎manifests/init.pp‎

Lines changed: 83 additions & 83 deletions
Large diffs are not rendered by default.

‎manifests/master/config.pp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
#
7878
# @param puppetdb_startup_timeout
7979
# The maximum amount of time that the module should wait for PuppetDB to start up.
80-
# This is most important during the initial install of PuppetDB (defaults to 15
80+
# This is most important during the initial install of PuppetDB (defaults to 120
8181
# seconds).
8282
#
8383
# @param test_url
@@ -116,7 +116,7 @@
116116
Stdlib::Absolutepath $puppet_conf = $puppetdb::params::puppet_conf,
117117
String[1] $terminus_package = $puppetdb::params::terminus_package,
118118
String[1] $puppet_service_name = $puppetdb::params::puppet_service_name,
119-
Integer $puppetdb_startup_timeout = $puppetdb::params::puppetdb_startup_timeout,
119+
Integer[0] $puppetdb_startup_timeout = $puppetdb::params::puppetdb_startup_timeout,
120120
String[1] $test_url = $puppetdb::params::test_url,
121121
Boolean $restart_puppet = true,
122122
) inherits puppetdb::params {

‎manifests/server.pp‎

Lines changed: 73 additions & 73 deletions
Large diffs are not rendered by default.

‎manifests/server/command_processing.pp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
# @api private
44
class puppetdb::server::command_processing (
55
Stdlib::Absolutepath $confdir = $puppetdb::params::confdir,
6-
Optional[Integer] $command_threads = $puppetdb::params::command_threads,
7-
Optional[Integer] $concurrent_writes = $puppetdb::params::concurrent_writes,
8-
Optional[Integer] $store_usage = $puppetdb::params::store_usage,
9-
Optional[Integer] $temp_usage = $puppetdb::params::temp_usage,
6+
Optional[Integer[0]] $command_threads = $puppetdb::params::command_threads,
7+
Optional[Integer[0]] $concurrent_writes = $puppetdb::params::concurrent_writes,
8+
Optional[Integer[0]] $store_usage = $puppetdb::params::store_usage,
9+
Optional[Integer[0]] $temp_usage = $puppetdb::params::temp_usage,
1010
) inherits puppetdb::params {
1111
$config_ini = "${confdir}/config.ini"
1212

‎manifests/server/database.pp‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,30 @@
22
#
33
# @api private
44
class puppetdb::server::database (
5-
Stdlib::Host $database_host = $puppetdb::params::database_host,
6-
Variant[Stdlib::Port::User, Pattern[/\A[0-9]+\Z/]] $database_port = $puppetdb::params::database_port,
7-
String[1] $database_username = $puppetdb::params::database_username,
8-
Variant[String[1], Sensitive[String[1]]] $database_password = $puppetdb::params::database_password,
9-
String[1] $database_name = $puppetdb::params::database_name,
10-
Boolean $manage_db_password = $puppetdb::params::manage_db_password,
11-
Variant[String, Boolean] $jdbc_ssl_properties = $puppetdb::params::jdbc_ssl_properties,
12-
Boolean $database_validate = $puppetdb::params::database_validate,
13-
Pattern[/\A[0-9dhms]+\Z/] $node_ttl = $puppetdb::params::node_ttl,
14-
Pattern[/\A[0-9dhms]+\Z/] $node_purge_ttl = $puppetdb::params::node_purge_ttl,
15-
Pattern[/\A[0-9dhms]+\Z/] $report_ttl = $puppetdb::params::report_ttl,
16-
Optional[Array] $facts_blacklist = $puppetdb::params::facts_blacklist,
17-
Variant[Integer, Pattern[/\A[0-9]+\Z/]] $gc_interval = $puppetdb::params::gc_interval,
18-
Variant[Integer, Pattern[/\A[0-9]+\Z/]] $node_purge_gc_batch_limit = $puppetdb::params::node_purge_gc_batch_limit,
19-
Variant[Integer, Pattern[/\A[0-9]+\Z/]] $conn_max_age = $puppetdb::params::conn_max_age,
20-
Variant[Integer, Pattern[/\A[0-9]+\Z/]] $conn_lifetime = $puppetdb::params::conn_lifetime,
21-
Stdlib::Absolutepath $confdir = $puppetdb::params::confdir,
22-
String[1] $puppetdb_group = $puppetdb::params::puppetdb_group,
23-
Optional[Variant[Integer, Enum['absent'], Pattern[/\A[0-9]+\Z/]]] $database_max_pool_size = $puppetdb::params::database_max_pool_size,
24-
Boolean $migrate = $puppetdb::params::migrate,
25-
Boolean $postgresql_ssl_on = $puppetdb::params::postgresql_ssl_on,
26-
Stdlib::Absolutepath $ssl_cert_path = $puppetdb::params::ssl_cert_path,
27-
Stdlib::Absolutepath $ssl_key_pk8_path = $puppetdb::params::ssl_key_pk8_path,
28-
Stdlib::Absolutepath $ssl_ca_cert_path = $puppetdb::params::ssl_ca_cert_path
5+
Stdlib::Host $database_host = $puppetdb::params::database_host,
6+
Variant[Stdlib::Port::User, Pattern[/\A[0-9]+\Z/]] $database_port = $puppetdb::params::database_port,
7+
String[1] $database_username = $puppetdb::params::database_username,
8+
Variant[String[1], Sensitive[String[1]]] $database_password = $puppetdb::params::database_password,
9+
String[1] $database_name = $puppetdb::params::database_name,
10+
Boolean $manage_db_password = $puppetdb::params::manage_db_password,
11+
Variant[String[0], Boolean[false]] $jdbc_ssl_properties = $puppetdb::params::jdbc_ssl_properties,
12+
Boolean $database_validate = $puppetdb::params::database_validate,
13+
Pattern[/\A[0-9dhms]+\Z/] $node_ttl = $puppetdb::params::node_ttl,
14+
Pattern[/\A[0-9dhms]+\Z/] $node_purge_ttl = $puppetdb::params::node_purge_ttl,
15+
Pattern[/\A[0-9dhms]+\Z/] $report_ttl = $puppetdb::params::report_ttl,
16+
Optional[Array] $facts_blacklist = $puppetdb::params::facts_blacklist,
17+
Variant[Integer[0], Pattern[/\A[0-9]+\Z/]] $gc_interval = $puppetdb::params::gc_interval,
18+
Variant[Integer[0], Pattern[/\A[0-9]+\Z/]] $node_purge_gc_batch_limit = $puppetdb::params::node_purge_gc_batch_limit,
19+
Variant[Integer[0], Pattern[/\A[0-9]+\Z/]] $conn_max_age = $puppetdb::params::conn_max_age,
20+
Variant[Integer[0], Pattern[/\A[0-9]+\Z/]] $conn_lifetime = $puppetdb::params::conn_lifetime,
21+
Stdlib::Absolutepath $confdir = $puppetdb::params::confdir,
22+
String[1] $puppetdb_group = $puppetdb::params::puppetdb_group,
23+
Optional[Variant[Integer[0], Enum['absent'], Pattern[/\A[0-9]+\Z/]]] $database_max_pool_size = $puppetdb::params::database_max_pool_size,
24+
Boolean $migrate = $puppetdb::params::migrate,
25+
Boolean $postgresql_ssl_on = $puppetdb::params::postgresql_ssl_on,
26+
Stdlib::Absolutepath $ssl_cert_path = $puppetdb::params::ssl_cert_path,
27+
Stdlib::Absolutepath $ssl_key_pk8_path = $puppetdb::params::ssl_key_pk8_path,
28+
Stdlib::Absolutepath $ssl_ca_cert_path = $puppetdb::params::ssl_ca_cert_path
2929
) inherits puppetdb::params {
3030
if str2bool($database_validate) {
3131
# Validate the database connection. If we can't connect, we want to fail

‎manifests/server/jetty.pp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
Stdlib::Absolutepath $ssl_cert_path = $puppetdb::params::ssl_cert_path,
1313
Stdlib::Absolutepath $ssl_key_path = $puppetdb::params::ssl_key_path,
1414
Stdlib::Absolutepath $ssl_ca_cert_path = $puppetdb::params::ssl_ca_cert_path,
15-
Optional[String] $ssl_protocols = $puppetdb::params::ssl_protocols,
16-
Optional[String] $cipher_suites = $puppetdb::params::cipher_suites,
15+
Optional[String[1]] $ssl_protocols = $puppetdb::params::ssl_protocols,
16+
Optional[String[1]] $cipher_suites = $puppetdb::params::cipher_suites,
1717
Stdlib::Absolutepath $confdir = $puppetdb::params::confdir,
18-
Optional[Integer] $max_threads = $puppetdb::params::max_threads,
18+
Optional[Integer[0]] $max_threads = $puppetdb::params::max_threads,
1919
String[1] $puppetdb_group = $puppetdb::params::puppetdb_group,
2020
) inherits puppetdb::params {
2121
$jetty_ini = "${confdir}/jetty.ini"

‎manifests/server/read_database.pp‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@
22
#
33
# @api private
44
class puppetdb::server::read_database (
5-
Optional[Stdlib::Host] $read_database_host = $puppetdb::params::read_database_host,
6-
Variant[Stdlib::Port::User, Pattern[/\A[0-9]+\Z/]] $read_database_port = $puppetdb::params::read_database_port,
7-
String[1] $read_database_username = $puppetdb::params::read_database_username,
8-
Variant[String[1], Sensitive[String[1]]] $read_database_password = $puppetdb::params::read_database_password,
9-
String[1] $read_database_name = $puppetdb::params::read_database_name,
10-
Boolean $manage_db_password = $puppetdb::params::manage_read_db_password,
11-
Variant[String, Boolean] $jdbc_ssl_properties = $puppetdb::params::read_database_jdbc_ssl_properties,
12-
Boolean $database_validate = $puppetdb::params::read_database_validate,
13-
Variant[Integer, Pattern[/\A[0-9]+\Z/]] $conn_max_age = $puppetdb::params::read_conn_max_age,
14-
Variant[Integer, Pattern[/\A[0-9]+\Z/]] $conn_lifetime = $puppetdb::params::read_conn_lifetime,
15-
Stdlib::Absolutepath $confdir = $puppetdb::params::confdir,
16-
String[1] $puppetdb_group = $puppetdb::params::puppetdb_group,
17-
Optional[Variant[Integer, Enum['absent'], Pattern[/\A[0-9]+\Z/]]] $database_max_pool_size = $puppetdb::params::read_database_max_pool_size,
18-
Boolean $postgresql_ssl_on = $puppetdb::params::postgresql_ssl_on,
19-
Stdlib::Absolutepath $ssl_cert_path = $puppetdb::params::ssl_cert_path,
20-
Stdlib::Absolutepath $ssl_key_pk8_path = $puppetdb::params::ssl_key_pk8_path,
21-
Stdlib::Absolutepath $ssl_ca_cert_path = $puppetdb::params::ssl_ca_cert_path
5+
Optional[Stdlib::Host] $read_database_host = $puppetdb::params::read_database_host,
6+
Variant[Stdlib::Port::User, Pattern[/\A[0-9]+\Z/]] $read_database_port = $puppetdb::params::read_database_port,
7+
String[1] $read_database_username = $puppetdb::params::read_database_username,
8+
Variant[String[1], Sensitive[String[1]]] $read_database_password = $puppetdb::params::read_database_password,
9+
String[1] $read_database_name = $puppetdb::params::read_database_name,
10+
Boolean $manage_db_password = $puppetdb::params::manage_read_db_password,
11+
Variant[String[0], Boolean[false]] $jdbc_ssl_properties = $puppetdb::params::read_database_jdbc_ssl_properties,
12+
Boolean $database_validate = $puppetdb::params::read_database_validate,
13+
Variant[Integer[0], Pattern[/\A[0-9]+\Z/]] $conn_max_age = $puppetdb::params::read_conn_max_age,
14+
Variant[Integer[0], Pattern[/\A[0-9]+\Z/]] $conn_lifetime = $puppetdb::params::read_conn_lifetime,
15+
Stdlib::Absolutepath $confdir = $puppetdb::params::confdir,
16+
String[1] $puppetdb_group = $puppetdb::params::puppetdb_group,
17+
Optional[Variant[Integer[0], Enum['absent'], Pattern[/\A[0-9]+\Z/]]] $database_max_pool_size = $puppetdb::params::read_database_max_pool_size,
18+
Boolean $postgresql_ssl_on = $puppetdb::params::postgresql_ssl_on,
19+
Stdlib::Absolutepath $ssl_cert_path = $puppetdb::params::ssl_cert_path,
20+
Stdlib::Absolutepath $ssl_key_pk8_path = $puppetdb::params::ssl_key_pk8_path,
21+
Stdlib::Absolutepath $ssl_ca_cert_path = $puppetdb::params::ssl_ca_cert_path
2222
) inherits puppetdb::params {
2323
if $read_database_host != undef {
2424
if str2bool($database_validate) {

0 commit comments

Comments
 (0)