Skip to content

Commit a1c47a5

Browse files
ekohlekohl
committed
Make puppet-lint parameter_types pass
1 parent c45bdb9 commit a1c47a5

File tree

4 files changed

+82
-80
lines changed

4 files changed

+82
-80
lines changed

‎manifests/agent/install.pp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# Install the puppet agent package
22
# @api private
33
class puppet::agent::install (
4-
$manage_packages = $puppet::manage_packages,
5-
$package_name = $puppet::client_package,
6-
$package_version = $puppet::version,
7-
$package_provider = $puppet::package_provider,
8-
$package_install_options = $puppet::package_install_options,
9-
$package_source = $puppet::package_source,
4+
Variant[Boolean, Enum['server', 'agent']] $manage_packages = $puppet::manage_packages,
5+
Variant[String, Array[String]] $package_name = $puppet::client_package,
6+
String[1] $package_version = $puppet::version,
7+
Optional[String[1]] $package_provider = $puppet::package_provider,
8+
Variant[Undef, String, Hash, Array] $package_install_options = $puppet::package_install_options,
9+
Variant[Undef, Stdlib::Absolutepath, Stdlib::HTTPUrl] $package_source = $puppet::package_source,
1010
) {
1111
if $manage_packages == true or $manage_packages == 'agent' {
1212
package { $package_name:

‎manifests/config.pp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Set up the puppet config
22
# @api private
33
class puppet::config (
4+
# lint:ignore:parameter_types
45
$allow_any_crl_auth = $puppet::allow_any_crl_auth,
56
$auth_allowed = $puppet::auth_allowed,
67
$auth_template = $puppet::auth_template,
@@ -17,6 +18,7 @@
1718
$use_srv_records = $puppet::use_srv_records,
1819
$additional_settings = $puppet::additional_settings,
1920
$client_certname = $puppet::client_certname,
21+
# lint:endignore
2022
) {
2123
puppet::config::main {
2224
'vardir': value => $puppet::vardir;

‎manifests/server/enc.pp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Set up the ENC config
22
# @api private
33
class puppet::server::enc (
4-
$enc_path = $puppet::server::external_nodes
4+
Variant[Undef, String[0], Stdlib::Absolutepath] $enc_path = $puppet::server::external_nodes
55
) {
66
puppet::config::master {
77
'external_nodes': value => $enc_path;

‎manifests/server/puppetserver.pp‎

Lines changed: 73 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -73,79 +73,79 @@
7373
# }
7474
#
7575
class puppet::server::puppetserver (
76-
$config = $puppet::server::jvm_config,
77-
$java_bin = $puppet::server::jvm_java_bin,
78-
$jvm_extra_args = $puppet::server::real_jvm_extra_args,
79-
$jvm_cli_args = $puppet::server::jvm_cli_args,
80-
$jvm_min_heap_size = $puppet::server::jvm_min_heap_size,
81-
$jvm_max_heap_size = $puppet::server::jvm_max_heap_size,
82-
$server_puppetserver_dir = $puppet::server::puppetserver_dir,
83-
$server_puppetserver_vardir = $puppet::server::puppetserver_vardir,
84-
$server_puppetserver_rundir = $puppet::server::puppetserver_rundir,
85-
$server_puppetserver_logdir = $puppet::server::puppetserver_logdir,
86-
$server_jruby_gem_home = $puppet::server::jruby_gem_home,
87-
$server_environment_vars = $puppet::server::server_environment_vars,
88-
$server_ruby_load_paths = $puppet::server::ruby_load_paths,
89-
$server_cipher_suites = $puppet::server::cipher_suites,
90-
$server_max_active_instances = $puppet::server::max_active_instances,
91-
$server_max_requests_per_instance = $puppet::server::max_requests_per_instance,
92-
$server_max_queued_requests = $puppet::server::max_queued_requests,
93-
$server_max_retry_delay = $puppet::server::max_retry_delay,
94-
$server_multithreaded = $puppet::server::multithreaded,
95-
$server_ssl_protocols = $puppet::server::ssl_protocols,
96-
$server_ssl_ca_crl = $puppet::server::ssl_ca_crl,
97-
$server_ssl_ca_cert = $puppet::server::ssl_ca_cert,
98-
$server_ssl_cert = $puppet::server::ssl_cert,
99-
$server_ssl_cert_key = $puppet::server::ssl_cert_key,
100-
$server_ssl_chain = $puppet::server::ssl_chain,
101-
$server_crl_enable = $puppet::server::crl_enable_real,
102-
$server_ip = $puppet::server::ip,
103-
$server_port = $puppet::server::port,
104-
$server_http = $puppet::server::http,
105-
$server_http_port = $puppet::server::http_port,
106-
$server_ca = $puppet::server::ca,
107-
$server_dir = $puppet::server::dir,
108-
$codedir = $puppet::server::codedir,
109-
$server_idle_timeout = $puppet::server::idle_timeout,
110-
$server_web_idle_timeout = $puppet::server::web_idle_timeout,
111-
$server_connect_timeout = $puppet::server::connect_timeout,
112-
$server_ca_auth_required = $puppet::server::ca_auth_required,
113-
$server_ca_client_self_delete = $puppet::server::ca_client_self_delete,
114-
$server_ca_client_whitelist = $puppet::server::ca_client_whitelist,
115-
$server_admin_api_whitelist = $puppet::server::admin_api_whitelist,
116-
$server_puppetserver_version = $puppet::server::real_puppetserver_version,
117-
$server_use_legacy_auth_conf = $puppet::server::use_legacy_auth_conf,
118-
$server_check_for_updates = $puppet::server::check_for_updates,
119-
$server_environment_class_cache_enabled = $puppet::server::environment_class_cache_enabled,
120-
$server_metrics = $puppet::server::puppetserver_metrics,
121-
$server_profiler = $puppet::server::puppetserver_profiler,
122-
$server_telemetry = $puppet::server::puppetserver_telemetry,
123-
$metrics_jmx_enable = $puppet::server::metrics_jmx_enable,
124-
$metrics_graphite_enable = $puppet::server::metrics_graphite_enable,
125-
$metrics_graphite_host = $puppet::server::metrics_graphite_host,
126-
$metrics_graphite_port = $puppet::server::metrics_graphite_port,
127-
$metrics_server_id = $puppet::server::metrics_server_id,
128-
$metrics_graphite_interval = $puppet::server::metrics_graphite_interval,
129-
$metrics_allowed = $puppet::server::metrics_allowed,
130-
$server_experimental = $puppet::server::puppetserver_experimental,
131-
$server_auth_template = $puppet::server::puppetserver_auth_template,
132-
$server_trusted_agents = $puppet::server::puppetserver_trusted_agents,
133-
$server_trusted_certificate_extensions = $puppet::server::puppetserver_trusted_certificate_extensions,
134-
$allow_header_cert_info = $puppet::server::allow_header_cert_info,
135-
$compile_mode = $puppet::server::compile_mode,
136-
$acceptor_threads = $puppet::server::acceptor_threads,
137-
$selector_threads = $puppet::server::selector_threads,
138-
$ssl_acceptor_threads = $puppet::server::ssl_acceptor_threads,
139-
$ssl_selector_threads = $puppet::server::ssl_selector_threads,
140-
$max_threads = $puppet::server::max_threads,
141-
$ca_allow_sans = $puppet::server::ca_allow_sans,
142-
$ca_allow_auth_extensions = $puppet::server::ca_allow_auth_extensions,
143-
$ca_enable_infra_crl = $puppet::server::ca_enable_infra_crl,
144-
$max_open_files = $puppet::server::max_open_files,
145-
$versioned_code_id = $puppet::server::versioned_code_id,
146-
$versioned_code_content = $puppet::server::versioned_code_content,
147-
$disable_fips = $facts['os']['family'] == 'RedHat' and $facts['os']['release']['major'] == '8',
148-
$jolokia_metrics_whitelist = $puppet::server::jolokia_metrics_whitelist,
76+
String $config = $puppet::server::jvm_config,
77+
String $java_bin = $puppet::server::jvm_java_bin,
78+
Variant[String, Array[String]] $jvm_extra_args = $puppet::server::real_jvm_extra_args,
79+
Optional[String] $jvm_cli_args = $puppet::server::jvm_cli_args,
80+
Pattern[/^[0-9]+[kKmMgG]$/] $jvm_min_heap_size = $puppet::server::jvm_min_heap_size,
81+
Pattern[/^[0-9]+[kKmMgG]$/] $jvm_max_heap_size = $puppet::server::jvm_max_heap_size,
82+
Stdlib::Absolutepath $server_puppetserver_dir = $puppet::server::puppetserver_dir,
83+
Stdlib::Absolutepath $server_puppetserver_vardir = $puppet::server::puppetserver_vardir,
84+
Optional[Stdlib::Absolutepath] $server_puppetserver_rundir = $puppet::server::puppetserver_rundir,
85+
Optional[Stdlib::Absolutepath] $server_puppetserver_logdir = $puppet::server::puppetserver_logdir,
86+
Optional[Stdlib::Absolutepath] $server_jruby_gem_home = $puppet::server::jruby_gem_home,
87+
Hash[String, String] $server_environment_vars = $puppet::server::server_environment_vars,
88+
Array[String] $server_ruby_load_paths = $puppet::server::ruby_load_paths,
89+
Array[String] $server_cipher_suites = $puppet::server::cipher_suites,
90+
Integer[1] $server_max_active_instances = $puppet::server::max_active_instances,
91+
Integer[0] $server_max_requests_per_instance = $puppet::server::max_requests_per_instance,
92+
Integer[0] $server_max_queued_requests = $puppet::server::max_queued_requests,
93+
Integer[0] $server_max_retry_delay = $puppet::server::max_retry_delay,
94+
Boolean $server_multithreaded = $puppet::server::multithreaded,
95+
Array[String] $server_ssl_protocols = $puppet::server::ssl_protocols,
96+
Stdlib::Absolutepath $server_ssl_ca_crl = $puppet::server::ssl_ca_crl,
97+
Stdlib::Absolutepath $server_ssl_ca_cert = $puppet::server::ssl_ca_cert,
98+
Stdlib::Absolutepath $server_ssl_cert = $puppet::server::ssl_cert,
99+
Stdlib::Absolutepath $server_ssl_cert_key = $puppet::server::ssl_cert_key,
100+
Variant[Boolean, Stdlib::Absolutepath] $server_ssl_chain = $puppet::server::ssl_chain,
101+
Boolean $server_crl_enable = $puppet::server::crl_enable_real,
102+
String $server_ip = $puppet::server::ip,
103+
Stdlib::Port $server_port = $puppet::server::port,
104+
Boolean $server_http = $puppet::server::http,
105+
Stdlib::Port $server_http_port = $puppet::server::http_port,
106+
Boolean $server_ca = $puppet::server::ca,
107+
String $server_dir = $puppet::server::dir,
108+
Stdlib::Absolutepath $codedir = $puppet::server::codedir,
109+
Integer[0] $server_idle_timeout = $puppet::server::idle_timeout,
110+
Integer[0] $server_web_idle_timeout = $puppet::server::web_idle_timeout,
111+
Integer[0] $server_connect_timeout = $puppet::server::connect_timeout,
112+
Boolean $server_ca_auth_required = $puppet::server::ca_auth_required,
113+
Boolean $server_ca_client_self_delete = $puppet::server::ca_client_self_delete,
114+
Array[String] $server_ca_client_whitelist = $puppet::server::ca_client_whitelist,
115+
Array[String] $server_admin_api_whitelist = $puppet::server::admin_api_whitelist,
116+
String[1] $server_puppetserver_version = $puppet::server::real_puppetserver_version,
117+
Boolean $server_use_legacy_auth_conf = $puppet::server::use_legacy_auth_conf,
118+
Boolean $server_check_for_updates = $puppet::server::check_for_updates,
119+
Boolean $server_environment_class_cache_enabled = $puppet::server::environment_class_cache_enabled,
120+
Optional[Boolean] $server_metrics = $puppet::server::puppetserver_metrics,
121+
Boolean $server_profiler = $puppet::server::puppetserver_profiler,
122+
Boolean $server_telemetry = $puppet::server::puppetserver_telemetry,
123+
Boolean $metrics_jmx_enable = $puppet::server::metrics_jmx_enable,
124+
Boolean $metrics_graphite_enable = $puppet::server::metrics_graphite_enable,
125+
String $metrics_graphite_host = $puppet::server::metrics_graphite_host,
126+
Stdlib::Port $metrics_graphite_port = $puppet::server::metrics_graphite_port,
127+
String $metrics_server_id = $puppet::server::metrics_server_id,
128+
Integer $metrics_graphite_interval = $puppet::server::metrics_graphite_interval,
129+
Optional[Array] $metrics_allowed = $puppet::server::metrics_allowed,
130+
Boolean $server_experimental = $puppet::server::puppetserver_experimental,
131+
Optional[String[1]] $server_auth_template = $puppet::server::puppetserver_auth_template,
132+
Array[String] $server_trusted_agents = $puppet::server::puppetserver_trusted_agents,
133+
Array[Hash] $server_trusted_certificate_extensions = $puppet::server::puppetserver_trusted_certificate_extensions,
134+
Boolean $allow_header_cert_info = $puppet::server::allow_header_cert_info,
135+
Optional[Enum['off', 'jit', 'force']] $compile_mode = $puppet::server::compile_mode,
136+
Optional[Integer[1]] $acceptor_threads = $puppet::server::acceptor_threads,
137+
Optional[Integer[1]] $selector_threads = $puppet::server::selector_threads,
138+
Optional[Integer[1]] $ssl_acceptor_threads = $puppet::server::ssl_acceptor_threads,
139+
Optional[Integer[1]] $ssl_selector_threads = $puppet::server::ssl_selector_threads,
140+
Optional[Integer[1]] $max_threads = $puppet::server::max_threads,
141+
Boolean $ca_allow_sans = $puppet::server::ca_allow_sans,
142+
Boolean $ca_allow_auth_extensions = $puppet::server::ca_allow_auth_extensions,
143+
Boolean $ca_enable_infra_crl = $puppet::server::ca_enable_infra_crl,
144+
Optional[Integer[1]] $max_open_files = $puppet::server::max_open_files,
145+
Optional[Stdlib::Absolutepath] $versioned_code_id = $puppet::server::versioned_code_id,
146+
Optional[Stdlib::Absolutepath] $versioned_code_content = $puppet::server::versioned_code_content,
147+
Boolean $disable_fips = $facts['os']['family'] == 'RedHat' and $facts['os']['release']['major'] == '8',
148+
Array[String[1]] $jolokia_metrics_whitelist = $puppet::server::jolokia_metrics_whitelist,
149149
) {
150150
include puppet::server
151151

0 commit comments

Comments
 (0)