Skip to content

Commit

Permalink
more lints
Browse files Browse the repository at this point in the history
  • Loading branch information
alvagante committed Sep 24, 2024
1 parent 111fd0f commit e3fb234
Show file tree
Hide file tree
Showing 9 changed files with 17 additions and 14 deletions.
3 changes: 2 additions & 1 deletion .puppet-lint.rc
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
--relative
--ignore-lint-parameter_documentation
--no-parameter_documentation
--no-params_empty_string
4 changes: 2 additions & 2 deletions manifests/netinstall.pp
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
String $retrieve_args = '',
String $owner = 'root',
String $group = 'root',
$timeout = '3600',
Variant[String,Integer] $timeout = '3600',
String $work_dir = '/var/tmp',
String $path = '/bin:/sbin:/usr/bin:/usr/sbin',
String $extract_command = '',
Expand Down Expand Up @@ -133,7 +133,7 @@
}

exec { "Extract ${source_filename} from ${work_dir} - ${title}":
command => "mkdir -p ${destination_dir} && cd ${destination_dir} && ${real_extract_command} ${work_dir}/${source_filename} ${extract_command_second_arg}",
command => "mkdir -p ${destination_dir} && cd ${destination_dir} && ${real_extract_command} ${work_dir}/${source_filename} ${extract_command_second_arg}", # lint:ignore:140chars
unless => "ls ${destination_dir}/${real_extracted_dir}",
creates => "${destination_dir}/${real_extracted_dir}",
timeout => $timeout,
Expand Down
4 changes: 2 additions & 2 deletions manifests/project/git.pp
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@
puppi::deploy { "${name}-Deploy_Files":
priority => '40' ,
command => 'git.sh' ,
arguments => "-a deploy -s ${source} -d ${deploy_root} -u ${user} -gs ${git_subdir} -t ${tag} -b ${branch} -c ${commit} -v ${bool_verbose} -k ${bool_keep_gitdata}" ,
arguments => "-a deploy -s ${source} -d ${deploy_root} -u ${user} -gs ${git_subdir} -t ${tag} -b ${branch} -c ${commit} -v ${bool_verbose} -k ${bool_keep_gitdata}" , # lint:ignore:140chars
user => 'root' ,
project => $name ,
enable => $enable ,
Expand Down Expand Up @@ -352,7 +352,7 @@
puppi::rollback { "${name}-Rollback_Files":
priority => '40' ,
command => 'git.sh' ,
arguments => "-a rollback -s ${source} -d ${deploy_root} -gs ${git_subdir} -t ${tag} -b ${branch} -c ${commit} -v ${bool_verbose} -k ${bool_keep_gitdata}" ,
arguments => "-a rollback -s ${source} -d ${deploy_root} -gs ${git_subdir} -t ${tag} -b ${branch} -c ${commit} -v ${bool_verbose} -k ${bool_keep_gitdata}" , # lint:ignore:140chars
user => $user ,
project => $name ,
enable => $enable ,
Expand Down
4 changes: 2 additions & 2 deletions manifests/project/hg.pp
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@
puppi::deploy { "${name}-Deploy_Files":
priority => '40' ,
command => 'hg.sh' ,
arguments => "-a deploy -s ${source} -d ${deploy_root} -u ${user} -t ${tag} -b ${branch} -c ${commit} -v ${bool_verbose} -k ${bool_keep_hgdata}" ,
arguments => "-a deploy -s ${source} -d ${deploy_root} -u ${user} -t ${tag} -b ${branch} -c ${commit} -v ${bool_verbose} -k ${bool_keep_hgdata}" , # lint:ignore:140chars
user => 'root' ,
project => $name ,
enable => $enable ,
Expand Down Expand Up @@ -346,7 +346,7 @@
puppi::rollback { "${name}-Rollback_Files":
priority => '40' ,
command => 'hg.sh' ,
arguments => "-a rollback -s ${source} -d ${deploy_root} -t ${tag} -b ${branch} -c ${commit} -v ${bool_verbose} -k ${bool_keep_hgdata}" ,
arguments => "-a rollback -s ${source} -d ${deploy_root} -t ${tag} -b ${branch} -c ${commit} -v ${bool_verbose} -k ${bool_keep_hgdata}" , # lint:ignore:140chars
user => $user ,
project => $name ,
enable => $enable ,
Expand Down
2 changes: 2 additions & 0 deletions manifests/project/mysql.pp
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,8 @@
define puppi::project::mysql (
String $source,
String $mysql_database,
String $deploy_root = '',
String $user = 'root',
String $mysql_user = 'root',
String $mysql_host = 'localhost',
String $mysql_password = '',
Expand Down
4 changes: 2 additions & 2 deletions manifests/project/svn.pp
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@
puppi::deploy { "${name}-Deploy_Files":
priority => '40' ,
command => 'svn.sh' ,
arguments => "-a deploy -s ${source} -d ${deploy_root} -u ${user} -gs ${svn_subdir} -su ${svn_user} -sp ${svn_password} -t ${tag} -b ${branch} -c ${commit} -v ${bool_verbose} -k ${bool_keep_svndata} -e ${bool_svn_export}" ,
arguments => "-a deploy -s ${source} -d ${deploy_root} -u ${user} -gs ${svn_subdir} -su ${svn_user} -sp ${svn_password} -t ${tag} -b ${branch} -c ${commit} -v ${bool_verbose} -k ${bool_keep_svndata} -e ${bool_svn_export}" , # lint:ignore:140chars
user => 'root' ,
project => $name ,
enable => $enable ,
Expand Down Expand Up @@ -373,7 +373,7 @@
puppi::rollback { "${name}-Rollback_Files":
priority => '40' ,
command => 'svn.sh' ,
arguments => "-a rollback -s ${source} -d ${deploy_root} -gs ${svn_subdir} -t ${tag} -b ${branch} -c ${commit} -v ${bool_verbose} -k ${bool_keep_svndata}" ,
arguments => "-a rollback -s ${source} -d ${deploy_root} -gs ${svn_subdir} -t ${tag} -b ${branch} -c ${commit} -v ${bool_verbose} -k ${bool_keep_svndata}" , # lint:ignore:140chars
user => $user ,
project => $name ,
enable => $enable ,
Expand Down
2 changes: 1 addition & 1 deletion manifests/project/tar.pp
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@

if ($verify_ssl) {
$ssl_arg = ''
}else {
} else {
$ssl_arg = '-k'
}

Expand Down
6 changes: 3 additions & 3 deletions manifests/project/y4maven.pp
Original file line number Diff line number Diff line change
Expand Up @@ -293,8 +293,8 @@

# First: hybrisServer-Platform
$platform_metadata_arguments = $http_password ? {
'' => "-s ${source}/hybrisServer-Platform/maven-metadata.xml -t maven-metadata -a ${real_always_deploy}" ,
default => "-s ${source}/hybrisServer-Platform/maven-metadata.xml -t maven-metadata -a ${real_always_deploy} -u ${http_user} -p ${http_password}"
'' => "-s ${source}/hybrisServer-Platform/maven-metadata.xml -t maven-metadata -a ${real_always_deploy}" ,
default => "-s ${source}/hybrisServer-Platform/maven-metadata.xml -t maven-metadata -a ${real_always_deploy} -u ${http_user} -p ${http_password}", # lint:ignore:140chars
}

puppi::deploy { "${name}-Get_Maven_Metadata_hybrisServer-Platform_File":
Expand Down Expand Up @@ -335,7 +335,7 @@
# Second: hybrisServer-AllExtensions
$extensions_metadata_arguments = $http_password ? {
'' => "-s ${source}/hybrisServer-AllExtensions/maven-metadata.xml -t maven-metadata -a ${real_always_deploy}",
default => "-s ${source}/hybrisServer-AllExtensions/maven-metadata.xml -t maven-metadata -a ${real_always_deploy} -u ${http_user} -p ${http_password}",
default => "-s ${source}/hybrisServer-AllExtensions/maven-metadata.xml -t maven-metadata -a ${real_always_deploy} -u ${http_user} -p ${http_password}", # lint:ignore:140chars
}

puppi::deploy { "${name}-Get_Maven_Metadata_hybrisServer-AllExtensions_File":
Expand Down
2 changes: 1 addition & 1 deletion manifests/runscript.pp
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
Optional[String] $creates = undef,
Optional[String] $onlyif = undef,
Optional[String] $unless = undef,
String $asedir = '/usr/local/sbin',
String $basedir = '/usr/local/sbin',
String $cron = '',
String $cron_user = 'root',
String $owner = 'root',
Expand Down

0 comments on commit e3fb234

Please sign in to comment.