From 7a288bd81274f15577f2b238fc7506e6446cd5d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Lesimple?= Date: Wed, 8 Nov 2023 10:30:09 +0000 Subject: [PATCH] chore: perlcritic adjustement on RequireArgUnpacking --- .gitignore | 1 + bin/admin/check-consistency.pl | 12 ++++++------ bin/dev/perlcriticrc | 3 +++ contrib/nrpe/probes/bastion-healthcheck | 1 - contrib/nrpe/probes/bastion-http-proxy | 1 - contrib/nrpe/probes/bastion-locked | 1 - contrib/nrpe/probes/bastion-root-connected-too-long | 1 - contrib/nrpe/probes/bastion-version | 1 - lib/perl/OVH/Result.pm | 4 ++-- lib/perl/OVH/SimpleLog.pm | 6 +++--- 10 files changed, 15 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index ca9d8af..b866203 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ doc/sphinx/_build +docs diff --git a/bin/admin/check-consistency.pl b/bin/admin/check-consistency.pl index 529796f..48008ba 100755 --- a/bin/admin/check-consistency.pl +++ b/bin/admin/check-consistency.pl @@ -18,14 +18,14 @@ my $bad; # generate a uniq prefix based on caller's lineno and caller's caller's lineno, useful to grep or grep -v sub _prefix { return uc(unpack('H*', pack('S', (caller(1))[2])) . unpack('H*', pack('S', (caller(2))[2]))) . ": "; } -sub info { print $_[0] . "\n"; return 1; } ## no critic (RequireArgUnpacking) -sub _wrn { $bad++; print colored(_prefix() . $_[0], "blue") . "\n"; return 1; } ## no critic (RequireArgUnpacking,ProhibitUnusedPrivateSubroutine) -sub _err { $bad++; print colored(_prefix() . $_[0], "red") . "\n"; return 1; } ## no critic (RequireArgUnpacking) -sub _crit { $bad++; print colored(_prefix() . $_[0], "bold red") . "\n"; return 1; } ## no critic (RequireArgUnpacking) +sub info { print $_[0] . "\n"; return 1; } +sub _wrn { $bad++; print colored(_prefix() . $_[0], "blue") . "\n"; return 1; } ## no critic (ProhibitUnusedPrivateSubroutine) +sub _err { $bad++; print colored(_prefix() . $_[0], "red") . "\n"; return 1; } +sub _crit { $bad++; print colored(_prefix() . $_[0], "bold red") . "\n"; return 1; } # Linux and BSD don't always have the same account names for UID/GID 0 -my ($UID0) = (qx{getent passwd 0})[0] =~ /^([^:]+)/; ## no critic (ProhibitBacktickOperators) -my ($GID0) = (qx{getent group 0})[0] =~ /^([^:]+)/; ## no critic (ProhibitBacktickOperators) +my ($UID0) = (qx{getent passwd 0})[0] =~ /^([^:]+)/; ## no critic (ProhibitBacktickOperators) +my ($GID0) = (qx{getent group 0})[0] =~ /^([^:]+)/; ## no critic (ProhibitBacktickOperators) my $islinux = (($^O =~ /linux/i) ? 1 : 0); my $hasacls = (($^O =~ /linux|freebsd/i) ? 1 : 0); diff --git a/bin/dev/perlcriticrc b/bin/dev/perlcriticrc index c3a083d..ae159ba 100644 --- a/bin/dev/perlcriticrc +++ b/bin/dev/perlcriticrc @@ -22,6 +22,9 @@ max_nests = 6 [Variables::ProhibitPackageVars] packages = Data::Dumper File::Find FindBin Log::Log4perl DBI +[Subroutines::RequireArgUnpacking] +short_subroutine_statements = 3 + [-BuiltinFunctions::ProhibitBooleanGrep] [-ControlStructures::ProhibitCascadingIfElse] [-ControlStructures::ProhibitPostfixControls] diff --git a/contrib/nrpe/probes/bastion-healthcheck b/contrib/nrpe/probes/bastion-healthcheck index 75d885e..884337e 100755 --- a/contrib/nrpe/probes/bastion-healthcheck +++ b/contrib/nrpe/probes/bastion-healthcheck @@ -11,7 +11,6 @@ use Getopt::Long; my $PROBE_NAME = basename($0); my $debug; -## no critic (Subroutines::RequireArgUnpacking) ## no critic (Subroutines::RequireFinalReturn) sub _out { diff --git a/contrib/nrpe/probes/bastion-http-proxy b/contrib/nrpe/probes/bastion-http-proxy index 74a2009..de690f7 100755 --- a/contrib/nrpe/probes/bastion-http-proxy +++ b/contrib/nrpe/probes/bastion-http-proxy @@ -14,7 +14,6 @@ use JSON; my $PROBE_NAME = basename($0); my $debug; -## no critic (Subroutines::RequireArgUnpacking) ## no critic (Subroutines::RequireFinalReturn) sub _out { diff --git a/contrib/nrpe/probes/bastion-locked b/contrib/nrpe/probes/bastion-locked index eb993d9..d4de63b 100755 --- a/contrib/nrpe/probes/bastion-locked +++ b/contrib/nrpe/probes/bastion-locked @@ -11,7 +11,6 @@ use Getopt::Long; my $PROBE_NAME = basename($0); my $debug; -## no critic (Subroutines::RequireArgUnpacking) ## no critic (Subroutines::RequireFinalReturn) sub _out { diff --git a/contrib/nrpe/probes/bastion-root-connected-too-long b/contrib/nrpe/probes/bastion-root-connected-too-long index e68cd4e..dc846e6 100755 --- a/contrib/nrpe/probes/bastion-root-connected-too-long +++ b/contrib/nrpe/probes/bastion-root-connected-too-long @@ -15,7 +15,6 @@ $SIG{'CHLD'} = 'IGNORE'; # don't bother using waitpid on this short-lived pro my $PROBE_NAME = basename($0); my $debug; -## no critic (Subroutines::RequireArgUnpacking) ## no critic (Subroutines::RequireFinalReturn) sub _out { diff --git a/contrib/nrpe/probes/bastion-version b/contrib/nrpe/probes/bastion-version index 6f55eda..4bc8e57 100755 --- a/contrib/nrpe/probes/bastion-version +++ b/contrib/nrpe/probes/bastion-version @@ -11,7 +11,6 @@ use Getopt::Long; my $PROBE_NAME = basename($0); my $debug; -## no critic (Subroutines::RequireArgUnpacking) ## no critic (Subroutines::RequireFinalReturn) ## no critic (InputOutput::ProhibitBacktickOperators) diff --git a/lib/perl/OVH/Result.pm b/lib/perl/OVH/Result.pm index 6a1da00..f13b0da 100644 --- a/lib/perl/OVH/Result.pm +++ b/lib/perl/OVH/Result.pm @@ -43,7 +43,7 @@ sub new { ## no critic (ArgUnpacking) return $Object; } -sub R { return OVH::Result->new(err => shift, @_); } ## no critic (ArgUnpacking) +sub R { return OVH::Result->new(err => shift, @_); } =cut uncomment for result tracing sub R { @@ -58,7 +58,7 @@ sub R { sub err { return shift->{'err'} } sub value { return shift->{'value'} } -sub msg { return $_[0]->{'msg'} ? $_[0]->{'msg'} : $_[0]->{'err'} } ## no critic (ArgUnpacking) +sub msg { return $_[0]->{'msg'} ? $_[0]->{'msg'} : $_[0]->{'err'} } sub is_err { return shift->{'err'} =~ /^ERR/ } sub is_ok { return shift->{'err'} =~ /^OK/ } diff --git a/lib/perl/OVH/SimpleLog.pm b/lib/perl/OVH/SimpleLog.pm index dec94c8..efbb7e4 100644 --- a/lib/perl/OVH/SimpleLog.pm +++ b/lib/perl/OVH/SimpleLog.pm @@ -64,9 +64,9 @@ sub closeSyslog { return 1; } -sub _log { _display('LOG', @_); return 1; } ## no critic (RequireArgUnpacking,ProhibitUnusedPrivateSubroutines) -sub _warn { _display('WARN', @_); $NB_WARNINGS++; return 1; } ## no critic (RequireArgUnpacking,ProhibitUnusedPrivateSubroutines) -sub _err { _display('ERR', @_); $NB_ERRORS++; return 1; } ## no critic (RequireArgUnpacking,ProhibitUnusedPrivateSubroutines) +sub _log { _display('LOG', @_); return 1; } ## no critic (ProhibitUnusedPrivateSubroutines) +sub _warn { _display('WARN', @_); $NB_WARNINGS++; return 1; } +sub _err { _display('ERR', @_); $NB_ERRORS++; return 1; } ## no critic (ProhibitUnusedPrivateSubroutines) # Display a message sub _display {