Skip to content

Commit 5125aa1

Browse files
traylenatortraylenator
authored
Merge pull request voxpupuli#191 from traylenator/tests
Add parameter typing to all classes
2 parents b216514 + acc88d8 commit 5125aa1

File tree

6 files changed

+35
-40
lines changed

6 files changed

+35
-40
lines changed

‎.puppet-lint.rc‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎.sync.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,3 @@ spec/spec_helper.rb:
55
spec/spec_helper_acceptance.rb:
66
unmanaged: false
77

8-
.puppet-lint.rc:
9-
enabled_lint_checks:
10-
- parameter_documentation

‎manifests/config.pp‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,32 @@
22
# @api private
33
#
44
class cvmfs::config (
5-
$mount_method = $cvmfs::mount_method,
6-
$manage_autofs_service = $cvmfs::manage_autofs_service,
7-
$cvmfs_http_proxy = $cvmfs::cvmfs_http_proxy,
8-
$cvmfs_quota_limit = $cvmfs::cvmfs_quota_limit,
9-
$cvmfs_quota_ratio = $cvmfs::cvmfs_quota_ratio,
10-
$cvmfs_cache_base = $cvmfs::cvmfs_cache_base,
11-
$cvmfs_tracefile = $cvmfs::cvmfs_tracefile,
12-
$cvmfs_debuglog = $cvmfs::cvmfs_debuglog,
13-
$cvmfs_max_ttl = $cvmfs::cvmfs_max_ttl,
14-
$cvmfs_repo_list = $cvmfs::cvmfs_repo_list,
15-
$cvmfs_memcache_size = $cvmfs::cvmfs_memcache_size,
16-
$cvmfs_claim_ownership = $cvmfs::cvmfs_claim_ownership,
17-
$cvmfs_syslog_level = $cvmfs::cvmfs_syslog_level,
18-
$cvmfs_uid_map = $cvmfs::cvmfs_uid_map,
19-
$cvmfs_gid_map = $cvmfs::cvmfs_gid_map,
20-
$cvmfs_instrument_fuse = $cvmfs::cvmfs_instrument_fuse,
21-
$cvmfs_mount_rw = $cvmfs::cvmfs_mount_rw,
22-
$default_cvmfs_partsize = $cvmfs::default_cvmfs_partsize,
23-
$cvmfs_timeout = $cvmfs::cvmfs_timeout,
24-
$cvmfs_timeout_direct = $cvmfs::cvmfs_timeout_direct,
25-
$cvmfs_nfiles = $cvmfs::cvmfs_nfiles,
26-
$cvmfs_env_variables = $cvmfs::cvmfs_env_variables,
27-
$cvmfs_use_geoapi = $cvmfs::cvmfs_use_geoapi,
28-
$cvmfs_follow_redirects = $cvmfs::cvmfs_follow_redirects,
29-
$cvmfs_alien_cache = $cvmfs::cvmfs_alien_cache,
30-
$cvmfs_shared_cache = $cvmfs::cvmfs_shared_cache,
5+
Enum['autofs','mount','none'] $mount_method = $cvmfs::mount_method,
6+
Boolean $manage_autofs_service = $cvmfs::manage_autofs_service,
7+
Variant[Undef, String] $cvmfs_http_proxy = $cvmfs::cvmfs_http_proxy,
8+
Variant[Enum['auto'],Integer] $cvmfs_quota_limit = $cvmfs::cvmfs_quota_limit,
9+
Float $cvmfs_quota_ratio = $cvmfs::cvmfs_quota_ratio,
10+
Stdlib::Absolutepath $cvmfs_cache_base = $cvmfs::cvmfs_cache_base,
11+
Optional[Stdlib::Absolutepath] $cvmfs_tracefile = $cvmfs::cvmfs_tracefile,
12+
Optional[Stdlib::Absolutepath] $cvmfs_debuglog = $cvmfs::cvmfs_debuglog,
13+
Optional[Integer] $cvmfs_max_ttl = $cvmfs::cvmfs_max_ttl,
14+
Boolean $cvmfs_repo_list = $cvmfs::cvmfs_repo_list,
15+
Optional[Integer] $cvmfs_memcache_size = $cvmfs::cvmfs_memcache_size,
16+
Optional[Enum['yes','no']] $cvmfs_claim_ownership = $cvmfs::cvmfs_claim_ownership,
17+
Optional[Integer[1,2]] $cvmfs_syslog_level = $cvmfs::cvmfs_syslog_level,
18+
Optional[Hash[Variant[Integer,String], Integer, 1]] $cvmfs_uid_map = $cvmfs::cvmfs_uid_map,
19+
Optional[Hash[Variant[Integer,String], Integer, 1]] $cvmfs_gid_map = $cvmfs::cvmfs_gid_map,
20+
Boolean $cvmfs_instrument_fuse = $cvmfs::cvmfs_instrument_fuse,
21+
Optional[Enum['yes','no']] $cvmfs_mount_rw = $cvmfs::cvmfs_mount_rw,
22+
Integer $default_cvmfs_partsize = $cvmfs::default_cvmfs_partsize,
23+
Optional[Integer] $cvmfs_timeout = $cvmfs::cvmfs_timeout,
24+
Optional[Integer] $cvmfs_timeout_direct = $cvmfs::cvmfs_timeout_direct,
25+
Optional[Integer] $cvmfs_nfiles = $cvmfs::cvmfs_nfiles,
26+
Hash $cvmfs_env_variables = $cvmfs::cvmfs_env_variables,
27+
Optional[Enum['yes','no']] $cvmfs_use_geoapi = $cvmfs::cvmfs_use_geoapi,
28+
Optional[Enum['yes','no']] $cvmfs_follow_redirects = $cvmfs::cvmfs_follow_redirects,
29+
Optional[String] $cvmfs_alien_cache = $cvmfs::cvmfs_alien_cache,
30+
Optional[Enum['yes','no']] $cvmfs_shared_cache = $cvmfs::cvmfs_shared_cache,
3131
Optional[Variant[Integer[4,4],Integer[6,6]]] $cvmfs_ipfamily_prefer = $cvmfs::cvmfs_ipfamily_prefer,
3232
Optional[Integer] $cvmfs_dns_max_ttl = $cvmfs::cvmfs_dns_max_ttl,
3333
Optional[Integer] $cvmfs_dns_min_ttl = $cvmfs::cvmfs_dns_min_ttl,
@@ -39,7 +39,7 @@
3939
Optional[Array[Integer[0],1]] $cvmfs_cpu_affinity = $cvmfs::cvmfs_cpu_affinity,
4040
Optional[Array[Integer[1],1]] $cvmfs_xattr_privileged_gids = $cvmfs::cvmfs_xattr_privileged_gids,
4141
Optional[Array[String[1],1]] $cvmfs_xattr_protected_xattrs = $cvmfs::cvmfs_xattr_protected_xattrs,
42-
$cvmfs_repositories = $cvmfs::cvmfs_repositories,
42+
Optional[String[1]] $cvmfs_repositories = $cvmfs::cvmfs_repositories,
4343
) inherits cvmfs {
4444
# If cvmfspartsize fact exists use it, otherwise use a sensible default.
4545
if $facts['cvmfspartsize'] {

‎manifests/fsck.pp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
# @param usesystemd Use a systemd timer
99
#
1010
class cvmfs::fsck (
11-
$cvmfs_cache_base = $cvmfs::cvmfs_cache_base,
12-
$options = $cvmfs::cvmfs_fsck_options,
13-
$onreboot = $cvmfs::cvmfs_fsck_onreboot,
11+
Stdlib::Absolutepath $cvmfs_cache_base = $cvmfs::cvmfs_cache_base,
12+
Optional[String] $options = $cvmfs::cvmfs_fsck_options,
13+
Boolean $onreboot = $cvmfs::cvmfs_fsck_onreboot,
1414
Optional[Boolean] $usesystemd = undef,
1515
) inherits cvmfs {
1616
if ($facts['os']['family'] == 'RedHat' and (versioncmp($facts['os']['release']['major'],'7') <= 0))

‎manifests/install.pp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# @api private
33
#
44
class cvmfs::install (
5-
$cvmfs_version = $cvmfs::cvmfs_version,
6-
$cvmfs_cache_base = $cvmfs::cvmfs_cache_base,
7-
$fuse3 = $cvmfs::fuse3,
5+
String[1] $cvmfs_version = $cvmfs::cvmfs_version,
6+
Stdlib::Absolutepath $cvmfs_cache_base = $cvmfs::cvmfs_cache_base,
7+
Optional[Boolean] $fuse3 = $cvmfs::fuse3,
88
) inherits cvmfs {
99
# Create the cache dir if one is defined, otherwise assume default is in the package.
1010
# Require the package so we know the user is in place.

‎manifests/service.pp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# @api private
33
#
44
class cvmfs::service (
5-
$mount_method = $cvmfs::mount_method,
6-
$manage_autofs_service = $cvmfs::manage_autofs_service,
5+
Enum['autofs','mount','none'] $mount_method = $cvmfs::mount_method,
6+
Boolean $manage_autofs_service = $cvmfs::manage_autofs_service,
77
) inherits cvmfs {
88
# CVMFS 2.1 at least uses cvmfs_config.
99

0 commit comments

Comments
 (0)