Skip to content

Commit 655ac5e

Browse files
LukasAudLukasAud
committed
(CONT-361) Syntax update
Code is now compliant with rules regarding: parameter datatypes
1 parent 54602cd commit 655ac5e

35 files changed

+328
-330
lines changed

‎.puppet-lint.rc

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
--relative
2-
--no-parameter_types-check
32
--no-parameter_documentation-check
43
--no-anchor_resource-check
54
--no-params_empty_string_assignment-check

‎.sync.yml

-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ spec/spec_helper.rb:
6363
delete: true
6464
Rakefile:
6565
extra_disabled_lint_checks:
66-
- parameter_types
6766
- parameter_documentation
6867
- anchor_resource
6968
- params_empty_string_assignment

‎Rakefile

-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ def changelog_future_release
4242
end
4343

4444
PuppetLint.configuration.send('disable_relative')
45-
PuppetLint.configuration.send('disable_parameter_types')
4645
PuppetLint.configuration.send('disable_parameter_documentation')
4746
PuppetLint.configuration.send('disable_anchor_resource')
4847
PuppetLint.configuration.send('disable_params_empty_string_assignment')

‎manifests/client.pp

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
# @param package_ensure
1313
# Ensure the client package is installed
1414
class postgresql::client (
15-
Enum['file', 'absent'] $file_ensure = 'file',
16-
Stdlib::Absolutepath $validcon_script_path = $postgresql::params::validcon_script_path,
17-
String[1] $package_name = $postgresql::params::client_package_name,
18-
String[1] $package_ensure = 'present'
15+
Enum['file', 'absent'] $file_ensure = 'file',
16+
Stdlib::Absolutepath $validcon_script_path = $postgresql::params::validcon_script_path,
17+
String[1] $package_name = $postgresql::params::client_package_name,
18+
Enum['present', 'absent', 'latest'] $package_ensure = 'present'
1919
) inherits postgresql::params {
2020
if $package_name != 'UNSET' {
2121
package { 'postgresql-client':

‎manifests/globals.pp

+53-53
Original file line numberDiff line numberDiff line change
@@ -95,72 +95,72 @@
9595
#
9696
#
9797
class postgresql::globals (
98-
$client_package_name = undef,
99-
$server_package_name = undef,
100-
$contrib_package_name = undef,
101-
$devel_package_name = undef,
102-
$java_package_name = undef,
103-
$docs_package_name = undef,
104-
$perl_package_name = undef,
105-
$plperl_package_name = undef,
106-
$plpython_package_name = undef,
107-
$python_package_name = undef,
108-
$postgis_package_name = undef,
98+
Optional[String[1]] $client_package_name = undef,
99+
Optional[String[1]] $server_package_name = undef,
100+
Optional[String[1]] $contrib_package_name = undef,
101+
Optional[String[1]] $devel_package_name = undef,
102+
Optional[String[1]] $java_package_name = undef,
103+
Optional[String[1]] $docs_package_name = undef,
104+
Optional[String[1]] $perl_package_name = undef,
105+
Optional[String[1]] $plperl_package_name = undef,
106+
Optional[String[1]] $plpython_package_name = undef,
107+
Optional[String[1]] $python_package_name = undef,
108+
Optional[String[1]] $postgis_package_name = undef,
109109

110-
$service_name = undef,
111-
$service_provider = undef,
112-
$service_status = undef,
113-
$default_database = undef,
110+
Optional[String[1]] $service_name = undef,
111+
Optional[String[1]] $service_provider = undef,
112+
Optional[String[1]] $service_status = undef,
113+
Optional[String[1]] $default_database = undef,
114114

115-
$validcon_script_path = undef,
115+
Optional[String[1]] $validcon_script_path = undef,
116116

117-
$initdb_path = undef,
118-
$createdb_path = undef,
119-
$psql_path = undef,
120-
$pg_hba_conf_path = undef,
121-
$pg_ident_conf_path = undef,
122-
$postgresql_conf_path = undef,
117+
Optional[String[1]] $initdb_path = undef,
118+
Optional[String[1]] $createdb_path = undef,
119+
Optional[String[1]] $psql_path = undef,
120+
Optional[String[1]] $pg_hba_conf_path = undef,
121+
Optional[String[1]] $pg_ident_conf_path = undef,
122+
Optional[String[1]] $postgresql_conf_path = undef,
123123
Optional[Stdlib::Filemode] $postgresql_conf_mode = undef,
124-
$recovery_conf_path = undef,
125-
$default_connect_settings = {},
124+
Optional[String[1]] $recovery_conf_path = undef,
125+
Hash $default_connect_settings = {},
126126

127-
$pg_hba_conf_defaults = undef,
127+
Optional[Boolean] $pg_hba_conf_defaults = undef,
128128

129-
$datadir = undef,
130-
$confdir = undef,
131-
$bindir = undef,
132-
$xlogdir = undef,
133-
$logdir = undef,
134-
$log_line_prefix = undef,
135-
$manage_datadir = undef,
136-
$manage_logdir = undef,
137-
$manage_xlogdir = undef,
129+
Optional[String[1]] $datadir = undef,
130+
Optional[String[1]] $confdir = undef,
131+
Optional[String[1]] $bindir = undef,
132+
Optional[String[1]] $xlogdir = undef,
133+
Optional[String[1]] $logdir = undef,
134+
Optional[String[1]] $log_line_prefix = undef,
135+
Optional[Boolean] $manage_datadir = undef,
136+
Optional[Boolean] $manage_logdir = undef,
137+
Optional[Boolean] $manage_xlogdir = undef,
138138

139-
$user = undef,
140-
$group = undef,
139+
Optional[String[1]] $user = undef,
140+
Optional[String[1]] $group = undef,
141141

142-
$version = undef,
143-
$postgis_version = undef,
144-
$repo_proxy = undef,
145-
$repo_baseurl = undef,
146-
$yum_repo_commonurl = undef,
142+
Optional[String[1]] $version = undef,
143+
Optional[String[1]] $postgis_version = undef,
144+
Optional[String[1]] $repo_proxy = undef,
145+
Optional[String[1]] $repo_baseurl = undef,
146+
Optional[String[1]] $yum_repo_commonurl = undef,
147147

148-
$needs_initdb = undef,
148+
Optional[Boolean] $needs_initdb = undef,
149149

150-
$encoding = undef,
151-
$locale = undef,
152-
$data_checksums = undef,
153-
$timezone = undef,
150+
Optional[String[1]] $encoding = undef,
151+
Optional[String[1]] $locale = undef,
152+
Optional[String[1]] $data_checksums = undef,
153+
Optional[String[1]] $timezone = undef,
154154

155-
$manage_pg_hba_conf = undef,
156-
$manage_pg_ident_conf = undef,
157-
$manage_recovery_conf = undef,
158-
$manage_postgresql_conf_perms = undef,
159-
$manage_selinux = undef,
155+
Optional[Boolean] $manage_pg_hba_conf = undef,
156+
Optional[Boolean] $manage_pg_ident_conf = undef,
157+
Optional[Boolean] $manage_recovery_conf = undef,
158+
Optional[Boolean] $manage_postgresql_conf_perms = undef,
159+
Optional[Boolean] $manage_selinux = undef,
160160

161-
$manage_package_repo = undef,
161+
Optional[Boolean] $manage_package_repo = undef,
162162
Boolean $manage_dnf_module = false,
163-
$module_workdir = undef,
163+
Optional[String[1]] $module_workdir = undef,
164164
) {
165165
# We are determining this here, because it is needed by the package repo
166166
# class.

‎manifests/lib/devel.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#
1111
class postgresql::lib::devel (
1212
String $package_name = $postgresql::params::devel_package_name,
13-
String[1] $package_ensure = 'present',
13+
Enum['present', 'absent', 'latest'] $package_ensure = 'present',
1414
Boolean $link_pg_config = $postgresql::params::link_pg_config
1515
) inherits postgresql::params {
1616
if $facts['os']['family'] == 'Gentoo' {

‎manifests/lib/docs.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#
1212
class postgresql::lib::docs (
1313
String $package_name = $postgresql::params::docs_package_name,
14-
String[1] $package_ensure = 'present',
14+
Enum['present', 'absent', 'latest'] $package_ensure = 'present',
1515
) inherits postgresql::params {
1616
package { 'postgresql-docs':
1717
ensure => $package_ensure,

‎manifests/lib/java.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#
1111
class postgresql::lib::java (
1212
String $package_name = $postgresql::params::java_package_name,
13-
String[1] $package_ensure = 'present'
13+
Enum['present', 'absent', 'latest'] $package_ensure = 'present'
1414
) inherits postgresql::params {
1515
package { 'postgresql-jdbc':
1616
ensure => $package_ensure,

‎manifests/lib/perl.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
class postgresql::lib::perl (
99
String $package_name = $postgresql::params::perl_package_name,
10-
String[1] $package_ensure = 'present'
10+
Enum['present', 'absent', 'latest'] $package_ensure = 'present'
1111
) inherits postgresql::params {
1212
package { 'perl-DBD-Pg':
1313
ensure => $package_ensure,

‎manifests/lib/python.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
class postgresql::lib::python (
99
String[1] $package_name = $postgresql::params::python_package_name,
10-
String[1] $package_ensure = 'present'
10+
Enum['present', 'absent', 'latest'] $package_ensure = 'present'
1111
) inherits postgresql::params {
1212
package { 'python-psycopg2':
1313
ensure => $package_ensure,

‎manifests/repo.pp

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# @api private
22
class postgresql::repo (
3-
$version = undef,
4-
$proxy = undef,
5-
$baseurl = undef,
6-
$commonurl = undef,
3+
Optional[String[1]] $version = undef,
4+
Optional[String[1]] $proxy = undef,
5+
Optional[String[1]] $baseurl = undef,
6+
Optional[String[1]] $commonurl = undef,
77
) {
88
case $facts['os']['family'] {
99
'RedHat', 'Linux': {

0 commit comments

Comments
 (0)