Skip to content

Commit 5131e0f

Browse files
LukasAudLukasAud
committed
Add datatypes
1 parent 08a16b2 commit 5131e0f

13 files changed

+222
-219
lines changed

‎.puppet-lint.rc

-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
--relative
2-
--no-parameter_types-check
3-
--no-parameter_documentation-check
42
--no-top_scope_facts-check
53
--no-anchor_resource-check
6-
--no-relative_classname_reference-check
74
--no-params_empty_string_assignment-check

‎.sync.yml

-3
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@ Rakefile:
3636
changelog_since_tag: 'v11.0.3'
3737
Rakefile:
3838
extra_disabled_lint_checks:
39-
- parameter_types
40-
- parameter_documentation
4139
- top_scope_facts
4240
- anchor_resource
43-
- relative_classname_reference
4441
- params_empty_string_assignment

‎Rakefile

-3
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,8 @@ def changelog_future_release
4242
end
4343

4444
PuppetLint.configuration.send('disable_relative')
45-
PuppetLint.configuration.send('disable_parameter_types')
46-
PuppetLint.configuration.send('disable_parameter_documentation')
4745
PuppetLint.configuration.send('disable_top_scope_facts')
4846
PuppetLint.configuration.send('disable_anchor_resource')
49-
PuppetLint.configuration.send('disable_relative_classname_reference')
5047
PuppetLint.configuration.send('disable_params_empty_string_assignment')
5148

5249

‎examples/mysql_login_path.pp

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
class { 'mysql::client':
3636
package_manage => false,
3737
package_name => 'mysql-community-client',
38-
require => Class['::mysql::server'],
38+
require => Class['mysql::server'],
3939
}
4040

4141
mysql_login_path { 'client':
@@ -54,7 +54,7 @@
5454
password => Sensitive('blah'),
5555
port => 3306,
5656
owner => root,
57-
require => Class['::mysql::server'],
57+
require => Class['mysql::server'],
5858
}
5959

6060
mysql_user { 'dan@localhost':

‎manifests/backup/mysqlbackup.pp

+28-28
Original file line numberDiff line numberDiff line change
@@ -4,34 +4,34 @@
44
# @api private
55
#
66
class mysql::backup::mysqlbackup (
7-
$backupuser = '',
8-
Variant[String, Sensitive[String]] $backuppassword = '',
9-
$maxallowedpacket = '1M',
10-
$backupdir = '',
11-
$backupdirmode = '0700',
12-
$backupdirowner = 'root',
13-
$backupdirgroup = $mysql::params::root_group,
14-
$backupcompress = true,
15-
$backuprotate = 30,
16-
$backupmethod = '',
17-
$backup_success_file_path = undef,
18-
$ignore_events = true,
19-
$delete_before_dump = false,
20-
$backupdatabases = [],
21-
$file_per_database = false,
22-
$include_triggers = true,
23-
$include_routines = false,
24-
$ensure = 'present',
25-
$time = ['23', '5'],
26-
$prescript = false,
27-
$postscript = false,
28-
$execpath = '/usr/bin:/usr/sbin:/bin:/sbin',
29-
$optional_args = [],
30-
$incremental_backups = false,
31-
$install_cron = true,
32-
$compression_command = undef,
33-
$compression_extension = undef,
34-
$backupmethod_package = undef,
7+
String $backupuser = '',
8+
Variant[String, Sensitive[String]] $backuppassword = '',
9+
String[1] $maxallowedpacket = '1M',
10+
String $backupdir = '',
11+
String[1] $backupdirmode = '0700',
12+
String[1] $backupdirowner = 'root',
13+
String[1] $backupdirgroup = $mysql::params::root_group,
14+
Boolean $backupcompress = true,
15+
Variant[Integer, String[1]] $backuprotate = 30,
16+
String $backupmethod = '',
17+
Optional[String[1]] $backup_success_file_path = undef,
18+
Boolean $ignore_events = true,
19+
Boolean $delete_before_dump = false,
20+
Array[String[1]] $backupdatabases = [],
21+
Boolean $file_per_database = false,
22+
Boolean $include_triggers = true,
23+
Boolean $include_routines = false,
24+
Enum['present', 'absent'] $ensure = 'present',
25+
Variant[Array[String[1]], Array[Integer]] $time = ['23', '5'],
26+
Variant[Boolean, String[1], Array[String[1]]] $prescript = false,
27+
Variant[Boolean, String[1], Array[String[1]]] $postscript = false,
28+
String[1] $execpath = '/usr/bin:/usr/sbin:/bin:/sbin',
29+
Array[String[1]] $optional_args = [],
30+
Boolean $incremental_backups = false,
31+
Boolean $install_cron = true,
32+
Optional[String[1]] $compression_command = undef,
33+
Optional[String[1]] $compression_extension = undef,
34+
Optional[String[1]] $backupmethod_package = undef,
3535
) inherits mysql::params {
3636
$backuppassword_unsensitive = if $backuppassword =~ Sensitive {
3737
$backuppassword.unwrap

‎manifests/backup/mysqldump.pp

+31-31
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,37 @@
33
# @api private
44
#
55
class mysql::backup::mysqldump (
6-
$backupuser = '',
7-
Variant[String, Sensitive[String]] $backuppassword = '',
8-
$backupdir = '',
9-
$maxallowedpacket = '1M',
10-
$backupdirmode = '0700',
11-
$backupdirowner = 'root',
12-
$backupdirgroup = $mysql::params::root_group,
13-
$backupcompress = true,
14-
$backuprotate = 30,
15-
$backupmethod = 'mysqldump',
16-
$backup_success_file_path = undef,
17-
$ignore_events = true,
18-
$delete_before_dump = false,
19-
$backupdatabases = [],
20-
$file_per_database = false,
21-
$include_triggers = false,
22-
$include_routines = false,
23-
$ensure = 'present',
24-
$time = ['23', '5'],
25-
$prescript = false,
26-
$postscript = false,
27-
$execpath = '/usr/bin:/usr/sbin:/bin:/sbin',
28-
$optional_args = [],
29-
$mysqlbackupdir_ensure = 'directory',
30-
$mysqlbackupdir_target = undef,
31-
$incremental_backups = false,
32-
$install_cron = true,
33-
$compression_command = 'bzcat -zc',
34-
$compression_extension = '.bz2',
35-
$backupmethod_package = undef,
36-
Array[String] $excludedatabases = [],
6+
String $backupuser = '',
7+
Variant[String, Sensitive[String]] $backuppassword = '',
8+
String $backupdir = '',
9+
String[1] $maxallowedpacket = '1M',
10+
String[1] $backupdirmode = '0700',
11+
String[1] $backupdirowner = 'root',
12+
String[1] $backupdirgroup = $mysql::params::root_group,
13+
Boolean $backupcompress = true,
14+
Variant[Integer, String[1]] $backuprotate = 30,
15+
String[1] $backupmethod = 'mysqldump',
16+
Optional[String[1]] $backup_success_file_path = undef,
17+
Boolean $ignore_events = true,
18+
Boolean $delete_before_dump = false,
19+
Array[String[1]] $backupdatabases = [],
20+
Boolean $file_per_database = false,
21+
Boolean $include_triggers = false,
22+
Boolean $include_routines = false,
23+
Enum['present', 'absent'] $ensure = 'present',
24+
Variant[Array[String[1]], Array[Integer]] $time = ['23', '5'],
25+
Variant[Boolean, String[1], Array[String[1]]] $prescript = false,
26+
Variant[Boolean, String[1], Array[String[1]]] $postscript = false,
27+
String[1] $execpath = '/usr/bin:/usr/sbin:/bin:/sbin',
28+
Array[String[1]] $optional_args = [],
29+
String[1] $mysqlbackupdir_ensure = 'directory',
30+
Optional[String[1]] $mysqlbackupdir_target = undef,
31+
Boolean $incremental_backups = false,
32+
Boolean $install_cron = true,
33+
String[1] $compression_command = 'bzcat -zc',
34+
String[1] $compression_extension = '.bz2',
35+
Optional[String[1]] $backupmethod_package = undef,
36+
Array[String] $excludedatabases = [],
3737
) inherits mysql::params {
3838
$backuppassword_unsensitive = if $backuppassword =~ Sensitive {
3939
$backuppassword.unwrap

‎manifests/backup/xtrabackup.pp

+31-31
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,37 @@
33
# @api private
44
#
55
class mysql::backup::xtrabackup (
6-
$backupuser = undef,
7-
Optional[Variant[String, Sensitive[String]]] $backuppassword = undef,
8-
$backupdir = '',
9-
$maxallowedpacket = '1M',
10-
$backupmethod = 'xtrabackup',
11-
$backupdirmode = '0700',
12-
$backupdirowner = 'root',
13-
$backupdirgroup = $mysql::params::root_group,
14-
$backupcompress = true,
15-
$backuprotate = 30,
16-
$backupscript_template = 'mysql/xtrabackup.sh.erb',
17-
$backup_success_file_path = undef,
18-
$ignore_events = true,
19-
$delete_before_dump = false,
20-
$backupdatabases = [],
21-
$file_per_database = false,
22-
$include_triggers = true,
23-
$include_routines = false,
24-
$ensure = 'present',
25-
$time = ['23', '5'],
26-
$prescript = false,
27-
$postscript = false,
28-
$execpath = '/usr/bin:/usr/sbin:/bin:/sbin',
29-
$optional_args = [],
30-
$additional_cron_args = '--backup',
31-
$incremental_backups = true,
32-
$install_cron = true,
33-
$compression_command = undef,
34-
$compression_extension = undef,
35-
$backupmethod_package = $mysql::params::xtrabackup_package_name,
36-
Array[String] $excludedatabases = [],
6+
Optional[String] $backupuser = undef,
7+
Optional[Variant[String, Sensitive[String]]] $backuppassword = undef,
8+
String $backupdir = '',
9+
String[1] $maxallowedpacket = '1M',
10+
String[1] $backupmethod = 'xtrabackup',
11+
String[1] $backupdirmode = '0700',
12+
String[1] $backupdirowner = 'root',
13+
String[1] $backupdirgroup = $mysql::params::root_group,
14+
Boolean $backupcompress = true,
15+
Variant[Integer, String[1]] $backuprotate = 30,
16+
String[1] $backupscript_template = 'mysql/xtrabackup.sh.erb',
17+
Optional[String[1]] $backup_success_file_path = undef,
18+
Boolean $ignore_events = true,
19+
Boolean $delete_before_dump = false,
20+
Array[String[1]] $backupdatabases = [],
21+
Boolean $file_per_database = false,
22+
Boolean $include_triggers = true,
23+
Boolean $include_routines = false,
24+
Enum['present', 'absent'] $ensure = 'present',
25+
Variant[Array[String[1]], Array[Integer]] $time = ['23', '5'],
26+
Variant[Boolean, String[1], Array[String[1]]] $prescript = false,
27+
Variant[Boolean, String[1], Array[String[1]]] $postscript = false,
28+
String[1] $execpath = '/usr/bin:/usr/sbin:/bin:/sbin',
29+
Array[String[1]] $optional_args = [],
30+
String[1] $additional_cron_args = '--backup',
31+
Boolean $incremental_backups = true,
32+
Boolean $install_cron = true,
33+
Optional[String[1]] $compression_command = undef,
34+
Optional[String[1]] $compression_extension = undef,
35+
String[1] $backupmethod_package = $mysql::params::xtrabackup_package_name,
36+
Array[String] $excludedatabases = [],
3737
) inherits mysql::params {
3838
ensure_packages($backupmethod_package)
3939

‎manifests/bindings.pp

+29-29
Original file line numberDiff line numberDiff line change
@@ -68,37 +68,37 @@
6868
# The provider to use to install the daemon_dev package. Only applies if `daemon_dev => true`.
6969
#
7070
class mysql::bindings (
71-
$install_options = undef,
71+
Optional[Array[String[1]]] $install_options = undef,
7272
# Boolean to determine if we should include the classes.
73-
$java_enable = false,
74-
$perl_enable = false,
75-
$php_enable = false,
76-
$python_enable = false,
77-
$ruby_enable = false,
78-
$client_dev = false,
79-
$daemon_dev = false,
73+
Boolean $java_enable = false,
74+
Boolean $perl_enable = false,
75+
Boolean $php_enable = false,
76+
Boolean $python_enable = false,
77+
Boolean $ruby_enable = false,
78+
Boolean $client_dev = false,
79+
Boolean $daemon_dev = false,
8080
# Settings for the various classes.
81-
$java_package_ensure = $mysql::params::java_package_ensure,
82-
$java_package_name = $mysql::params::java_package_name,
83-
$java_package_provider = $mysql::params::java_package_provider,
84-
$perl_package_ensure = $mysql::params::perl_package_ensure,
85-
$perl_package_name = $mysql::params::perl_package_name,
86-
$perl_package_provider = $mysql::params::perl_package_provider,
87-
$php_package_ensure = $mysql::params::php_package_ensure,
88-
$php_package_name = $mysql::params::php_package_name,
89-
$php_package_provider = $mysql::params::php_package_provider,
90-
$python_package_ensure = $mysql::params::python_package_ensure,
91-
$python_package_name = $mysql::params::python_package_name,
92-
$python_package_provider = $mysql::params::python_package_provider,
93-
$ruby_package_ensure = $mysql::params::ruby_package_ensure,
94-
$ruby_package_name = $mysql::params::ruby_package_name,
95-
$ruby_package_provider = $mysql::params::ruby_package_provider,
96-
$client_dev_package_ensure = $mysql::params::client_dev_package_ensure,
97-
$client_dev_package_name = $mysql::params::client_dev_package_name,
98-
$client_dev_package_provider = $mysql::params::client_dev_package_provider,
99-
$daemon_dev_package_ensure = $mysql::params::daemon_dev_package_ensure,
100-
$daemon_dev_package_name = $mysql::params::daemon_dev_package_name,
101-
$daemon_dev_package_provider = $mysql::params::daemon_dev_package_provider
81+
Variant[Enum['present','absent'], Pattern[/(\d+)[\.](\d+)[\.](\d+)/]] $java_package_ensure = $mysql::params::java_package_ensure,
82+
String[1] $java_package_name = $mysql::params::java_package_name,
83+
Optional[String[1]] $java_package_provider = $mysql::params::java_package_provider,
84+
Variant[Enum['present','absent'], Pattern[/(\d+)[\.](\d+)[\.](\d+)/]] $perl_package_ensure = $mysql::params::perl_package_ensure,
85+
String[1] $perl_package_name = $mysql::params::perl_package_name,
86+
Optional[String[1]] $perl_package_provider = $mysql::params::perl_package_provider,
87+
Variant[Enum['present','absent'], Pattern[/(\d+)[\.](\d+)[\.](\d+)/]] $php_package_ensure = $mysql::params::php_package_ensure,
88+
String[1] $php_package_name = $mysql::params::php_package_name,
89+
Optional[String[1]] $php_package_provider = $mysql::params::php_package_provider,
90+
Variant[Enum['present','absent'], Pattern[/(\d+)[\.](\d+)[\.](\d+)/]] $python_package_ensure = $mysql::params::python_package_ensure,
91+
String[1] $python_package_name = $mysql::params::python_package_name,
92+
Optional[String[1]] $python_package_provider = $mysql::params::python_package_provider,
93+
Variant[Enum['present','absent'], Pattern[/(\d+)[\.](\d+)[\.](\d+)/]] $ruby_package_ensure = $mysql::params::ruby_package_ensure,
94+
String[1] $ruby_package_name = $mysql::params::ruby_package_name,
95+
Optional[String[1]] $ruby_package_provider = $mysql::params::ruby_package_provider,
96+
Variant[Enum['present','absent'], Pattern[/(\d+)[\.](\d+)[\.](\d+)/]] $client_dev_package_ensure = $mysql::params::client_dev_package_ensure,
97+
Optional[String[1]] $client_dev_package_name = $mysql::params::client_dev_package_name,
98+
Optional[String[1]] $client_dev_package_provider = $mysql::params::client_dev_package_provider,
99+
Variant[Enum['present','absent'], Pattern[/(\d+)[\.](\d+)[\.](\d+)/]] $daemon_dev_package_ensure = $mysql::params::daemon_dev_package_ensure,
100+
String[1] $daemon_dev_package_name = $mysql::params::daemon_dev_package_name,
101+
Optional[String[1]] $daemon_dev_package_provider = $mysql::params::daemon_dev_package_provider
102102
) inherits mysql::params {
103103
case $facts['os']['family'] {
104104
'Archlinux': {

‎manifests/client.pp

+11-7
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,19 @@
1818
# Whether to manage the MySQL client package. Defaults to `true`.
1919
# @param package_name
2020
# The name of the MySQL client package to install.
21+
# @param package_provider
22+
# Specify the provider of the package. Optional. Valid value is a String.
23+
# @param package_source
24+
# Specify the path to the package source. Optional. Valid value is a String
2125
#
2226
class mysql::client (
23-
$bindings_enable = $mysql::params::bindings_enable,
24-
$install_options = undef,
25-
$package_ensure = $mysql::params::client_package_ensure,
26-
$package_manage = $mysql::params::client_package_manage,
27-
$package_name = $mysql::params::client_package_name,
28-
$package_provider = undef,
29-
$package_source = undef,
27+
Boolean $bindings_enable = $mysql::params::bindings_enable,
28+
Optional[Array[String[1]]] $install_options = undef,
29+
Variant[Enum['present','absent'], Pattern[/(\d+)[\.](\d+)[\.](\d+)/]] $package_ensure = $mysql::params::client_package_ensure,
30+
Boolean $package_manage = $mysql::params::client_package_manage,
31+
String[1] $package_name = $mysql::params::client_package_name,
32+
Optional[String[1]] $package_provider = undef,
33+
Optional[String[1]] $package_source = undef,
3034
) inherits mysql::params {
3135
include 'mysql::client::install'
3236

0 commit comments

Comments
 (0)