From ef674f626c8fb8353fc717dcd7161f471256bdb2 Mon Sep 17 00:00:00 2001 From: Marcin Federowicz Date: Mon, 9 Dec 2024 02:03:08 +0100 Subject: [PATCH] helper: newInternalFailureError --- rule/add_constant.go | 3 ++- rule/argument_limit.go | 2 +- rule/banned_characters.go | 2 +- rule/cognitive_complexity.go | 2 +- rule/comment_spacings.go | 2 +- rule/comments_density.go | 2 +- rule/context_as_argument.go | 2 +- rule/cyclomatic.go | 2 +- rule/defer.go | 2 +- rule/dot_imports.go | 2 +- rule/enforce_map_style.go | 2 +- rule/enforce_repeated_arg_type_style.go | 2 +- rule/enforce_slice_style.go | 2 +- rule/error_strings.go | 2 +- rule/exported.go | 2 +- rule/file_header.go | 2 +- rule/file_length_limit.go | 2 +- rule/filename_format.go | 2 +- rule/function_length.go | 2 +- rule/function_result_limit.go | 2 +- rule/import_alias_naming.go | 2 +- rule/imports_blocklist.go | 2 +- rule/line_length_limit.go | 2 +- rule/max_control_nesting.go | 2 +- rule/max_public_structs.go | 2 +- rule/receiver_naming.go | 2 +- rule/struct_tag.go | 2 +- rule/unchecked_type_assertion.go | 2 +- rule/unhandled_error.go | 2 +- rule/unused_param.go | 2 +- rule/unused_receiver.go | 2 +- rule/utils.go | 5 +++++ rule/var_naming.go | 2 +- 33 files changed, 38 insertions(+), 32 deletions(-) diff --git a/rule/add_constant.go b/rule/add_constant.go index 3f17b9f5b..58e2885ef 100644 --- a/rule/add_constant.go +++ b/rule/add_constant.go @@ -46,7 +46,7 @@ func (r *AddConstantRule) Apply(file *lint.File, arguments lint.Arguments) []lin var configureErr error r.configureOnce.Do(func() { configureErr = r.configure(arguments) }) if configureErr != nil { - return []lint.Failure{lint.NewInternalFailure(configureErr.Error())} + return newInternalFailureError(configureErr) } var failures []lint.Failure @@ -69,6 +69,7 @@ func (r *AddConstantRule) Apply(file *lint.File, arguments lint.Arguments) []lin return failures } + // Name returns the rule name. func (*AddConstantRule) Name() string { return "add-constant" diff --git a/rule/argument_limit.go b/rule/argument_limit.go index c8822ab20..045de3284 100644 --- a/rule/argument_limit.go +++ b/rule/argument_limit.go @@ -38,7 +38,7 @@ func (r *ArgumentsLimitRule) Apply(file *lint.File, arguments lint.Arguments) [] r.configureOnce.Do(func() { configureErr = r.configure(arguments) }) if configureErr != nil { - return []lint.Failure{lint.NewInternalFailure(configureErr.Error())} + return newInternalFailureError(configureErr) } var failures []lint.Failure diff --git a/rule/banned_characters.go b/rule/banned_characters.go index 571b87fb8..5f90a24f2 100644 --- a/rule/banned_characters.go +++ b/rule/banned_characters.go @@ -40,7 +40,7 @@ func (r *BannedCharsRule) Apply(file *lint.File, arguments lint.Arguments) []lin r.configureOnce.Do(func() { configureErr = r.configure(arguments) }) if configureErr != nil { - return []lint.Failure{lint.NewInternalFailure(configureErr.Error())} + return newInternalFailureError(configureErr) } var failures []lint.Failure diff --git a/rule/cognitive_complexity.go b/rule/cognitive_complexity.go index efbb70f4a..524d45e27 100644 --- a/rule/cognitive_complexity.go +++ b/rule/cognitive_complexity.go @@ -40,7 +40,7 @@ func (r *CognitiveComplexityRule) Apply(file *lint.File, arguments lint.Argument r.configureOnce.Do(func() { configureErr = r.configure(arguments) }) if configureErr != nil { - return []lint.Failure{lint.NewInternalFailure(configureErr.Error())} + return newInternalFailureError(configureErr) } var failures []lint.Failure diff --git a/rule/comment_spacings.go b/rule/comment_spacings.go index 132cc104d..540c2c5e0 100644 --- a/rule/comment_spacings.go +++ b/rule/comment_spacings.go @@ -34,7 +34,7 @@ func (r *CommentSpacingsRule) Apply(file *lint.File, arguments lint.Arguments) [ r.configureOnce.Do(func() { configureErr = r.configure(arguments) }) if configureErr != nil { - return []lint.Failure{lint.NewInternalFailure(configureErr.Error())} + return newInternalFailureError(configureErr) } var failures []lint.Failure diff --git a/rule/comments_density.go b/rule/comments_density.go index fd36df92b..e60cff547 100644 --- a/rule/comments_density.go +++ b/rule/comments_density.go @@ -38,7 +38,7 @@ func (r *CommentsDensityRule) Apply(file *lint.File, arguments lint.Arguments) [ r.configureOnce.Do(func() { configureErr = r.configure(arguments) }) if configureErr != nil { - return []lint.Failure{lint.NewInternalFailure(configureErr.Error())} + return newInternalFailureError(configureErr) } commentsLines := countDocLines(file.AST.Comments) diff --git a/rule/context_as_argument.go b/rule/context_as_argument.go index 02de700d3..3c4b656fd 100644 --- a/rule/context_as_argument.go +++ b/rule/context_as_argument.go @@ -22,7 +22,7 @@ func (r *ContextAsArgumentRule) Apply(file *lint.File, arguments lint.Arguments) r.configureOnce.Do(func() { configureErr = r.configure(arguments) }) if configureErr != nil { - return []lint.Failure{lint.NewInternalFailure(configureErr.Error())} + return newInternalFailureError(configureErr) } var failures []lint.Failure diff --git a/rule/cyclomatic.go b/rule/cyclomatic.go index 84624193a..ba20bd0d2 100644 --- a/rule/cyclomatic.go +++ b/rule/cyclomatic.go @@ -40,7 +40,7 @@ func (r *CyclomaticRule) Apply(file *lint.File, arguments lint.Arguments) []lint r.configureOnce.Do(func() { configureErr = r.configure(arguments) }) if configureErr != nil { - return []lint.Failure{lint.NewInternalFailure(configureErr.Error())} + return newInternalFailureError(configureErr) } var failures []lint.Failure diff --git a/rule/defer.go b/rule/defer.go index 51cf9d9eb..a784fa45a 100644 --- a/rule/defer.go +++ b/rule/defer.go @@ -30,7 +30,7 @@ func (r *DeferRule) Apply(file *lint.File, arguments lint.Arguments) []lint.Fail r.configureOnce.Do(func() { configureErr = r.configure(arguments) }) if configureErr != nil { - return []lint.Failure{lint.NewInternalFailure(configureErr.Error())} + return newInternalFailureError(configureErr) } var failures []lint.Failure diff --git a/rule/dot_imports.go b/rule/dot_imports.go index c39d0253b..a0fc2a2ab 100644 --- a/rule/dot_imports.go +++ b/rule/dot_imports.go @@ -21,7 +21,7 @@ func (r *DotImportsRule) Apply(file *lint.File, arguments lint.Arguments) []lint r.configureOnce.Do(func() { configureErr = r.configure(arguments) }) if configureErr != nil { - return []lint.Failure{lint.NewInternalFailure(configureErr.Error())} + return newInternalFailureError(configureErr) } var failures []lint.Failure diff --git a/rule/enforce_map_style.go b/rule/enforce_map_style.go index 64a994595..e85efdf16 100644 --- a/rule/enforce_map_style.go +++ b/rule/enforce_map_style.go @@ -70,7 +70,7 @@ func (r *EnforceMapStyleRule) Apply(file *lint.File, arguments lint.Arguments) [ r.configureOnce.Do(func() { configureErr = r.configure(arguments) }) if configureErr != nil { - return []lint.Failure{lint.NewInternalFailure(configureErr.Error())} + return newInternalFailureError(configureErr) } if r.enforceMapStyle == enforceMapStyleTypeAny { diff --git a/rule/enforce_repeated_arg_type_style.go b/rule/enforce_repeated_arg_type_style.go index 25f9cdf2d..c5dcba8d7 100644 --- a/rule/enforce_repeated_arg_type_style.go +++ b/rule/enforce_repeated_arg_type_style.go @@ -106,7 +106,7 @@ func (r *EnforceRepeatedArgTypeStyleRule) Apply(file *lint.File, arguments lint. r.configureOnce.Do(func() { configureErr = r.configure(arguments) }) if configureErr != nil { - return []lint.Failure{lint.NewInternalFailure(configureErr.Error())} + return newInternalFailureError(configureErr) } if r.funcArgStyle == enforceRepeatedArgTypeStyleTypeAny && r.funcRetValStyle == enforceRepeatedArgTypeStyleTypeAny { diff --git a/rule/enforce_slice_style.go b/rule/enforce_slice_style.go index 436b0e6d4..bb530ac19 100644 --- a/rule/enforce_slice_style.go +++ b/rule/enforce_slice_style.go @@ -73,7 +73,7 @@ func (r *EnforceSliceStyleRule) Apply(file *lint.File, arguments lint.Arguments) r.configureOnce.Do(func() { configureErr = r.configure(arguments) }) if configureErr != nil { - return []lint.Failure{lint.NewInternalFailure(configureErr.Error())} + return newInternalFailureError(configureErr) } if r.enforceSliceStyle == enforceSliceStyleTypeAny { diff --git a/rule/error_strings.go b/rule/error_strings.go index dc4e83ce0..514365dec 100644 --- a/rule/error_strings.go +++ b/rule/error_strings.go @@ -58,7 +58,7 @@ func (r *ErrorStringsRule) Apply(file *lint.File, arguments lint.Arguments) []li r.configureOnce.Do(func() { configureErr = r.configure(arguments) }) if configureErr != nil { - return []lint.Failure{lint.NewInternalFailure(configureErr.Error())} + return newInternalFailureError(configureErr) } var failures []lint.Failure diff --git a/rule/exported.go b/rule/exported.go index 87bdd4e20..3cd8452b7 100644 --- a/rule/exported.go +++ b/rule/exported.go @@ -112,7 +112,7 @@ func (r *ExportedRule) Apply(file *lint.File, arguments lint.Arguments) []lint.F r.configureOnce.Do(func() { configureErr = r.configure(arguments) }) if configureErr != nil { - return []lint.Failure{lint.NewInternalFailure(configureErr.Error())} + return newInternalFailureError(configureErr) } var failures []lint.Failure diff --git a/rule/file_header.go b/rule/file_header.go index 9bf790a6d..2b6284366 100644 --- a/rule/file_header.go +++ b/rule/file_header.go @@ -39,7 +39,7 @@ func (r *FileHeaderRule) Apply(file *lint.File, arguments lint.Arguments) []lint r.configureOnce.Do(func() { configureErr = r.configure(arguments) }) if configureErr != nil { - return []lint.Failure{lint.NewInternalFailure(configureErr.Error())} + return newInternalFailureError(configureErr) } if r.header == "" { diff --git a/rule/file_length_limit.go b/rule/file_length_limit.go index 7beb98bb7..c3b6096da 100644 --- a/rule/file_length_limit.go +++ b/rule/file_length_limit.go @@ -30,7 +30,7 @@ func (r *FileLengthLimitRule) Apply(file *lint.File, arguments lint.Arguments) [ r.configureOnce.Do(func() { configureErr = r.configure(arguments) }) if configureErr != nil { - return []lint.Failure{lint.NewInternalFailure(configureErr.Error())} + return newInternalFailureError(configureErr) } if r.max <= 0 { diff --git a/rule/filename_format.go b/rule/filename_format.go index 20d207c85..f6a3da144 100644 --- a/rule/filename_format.go +++ b/rule/filename_format.go @@ -23,7 +23,7 @@ func (r *FilenameFormatRule) Apply(file *lint.File, arguments lint.Arguments) [] r.configureOnce.Do(func() { configureErr = r.configure(arguments) }) if configureErr != nil { - return []lint.Failure{lint.NewInternalFailure(configureErr.Error())} + return newInternalFailureError(configureErr) } filename := filepath.Base(file.Name) diff --git a/rule/function_length.go b/rule/function_length.go index 4e30d071d..693625fdb 100644 --- a/rule/function_length.go +++ b/rule/function_length.go @@ -33,7 +33,7 @@ func (r *FunctionLength) Apply(file *lint.File, arguments lint.Arguments) []lint r.configureOnce.Do(func() { configureErr = r.configure(arguments) }) if configureErr != nil { - return []lint.Failure{lint.NewInternalFailure(configureErr.Error())} + return newInternalFailureError(configureErr) } var failures []lint.Failure diff --git a/rule/function_result_limit.go b/rule/function_result_limit.go index c2d7cfcc9..17c4eae76 100644 --- a/rule/function_result_limit.go +++ b/rule/function_result_limit.go @@ -22,7 +22,7 @@ func (r *FunctionResultsLimitRule) Apply(file *lint.File, arguments lint.Argumen r.configureOnce.Do(func() { configureErr = r.configure(arguments) }) if configureErr != nil { - return []lint.Failure{lint.NewInternalFailure(configureErr.Error())} + return newInternalFailureError(configureErr) } var failures []lint.Failure diff --git a/rule/import_alias_naming.go b/rule/import_alias_naming.go index 43bf9d545..202a95a1f 100644 --- a/rule/import_alias_naming.go +++ b/rule/import_alias_naming.go @@ -66,7 +66,7 @@ func (r *ImportAliasNamingRule) Apply(file *lint.File, arguments lint.Arguments) r.configureOnce.Do(func() { configureErr = r.configure(arguments) }) if configureErr != nil { - return []lint.Failure{lint.NewInternalFailure(configureErr.Error())} + return newInternalFailureError(configureErr) } var failures []lint.Failure diff --git a/rule/imports_blocklist.go b/rule/imports_blocklist.go index 3e147f1aa..032681df1 100644 --- a/rule/imports_blocklist.go +++ b/rule/imports_blocklist.go @@ -48,7 +48,7 @@ func (r *ImportsBlocklistRule) Apply(file *lint.File, arguments lint.Arguments) r.configureOnce.Do(func() { configureErr = r.configure(arguments) }) if configureErr != nil { - return []lint.Failure{lint.NewInternalFailure(configureErr.Error())} + return newInternalFailureError(configureErr) } var failures []lint.Failure diff --git a/rule/line_length_limit.go b/rule/line_length_limit.go index c55b8706e..74002d103 100644 --- a/rule/line_length_limit.go +++ b/rule/line_length_limit.go @@ -43,7 +43,7 @@ func (r *LineLengthLimitRule) Apply(file *lint.File, arguments lint.Arguments) [ r.configureOnce.Do(func() { configureErr = r.configure(arguments) }) if configureErr != nil { - return []lint.Failure{lint.NewInternalFailure(configureErr.Error())} + return newInternalFailureError(configureErr) } var failures []lint.Failure diff --git a/rule/max_control_nesting.go b/rule/max_control_nesting.go index a3755dcb5..2f8838428 100644 --- a/rule/max_control_nesting.go +++ b/rule/max_control_nesting.go @@ -24,7 +24,7 @@ func (r *MaxControlNestingRule) Apply(file *lint.File, arguments lint.Arguments) r.configureOnce.Do(func() { configureErr = r.configure(arguments) }) if configureErr != nil { - return []lint.Failure{lint.NewInternalFailure(configureErr.Error())} + return newInternalFailureError(configureErr) } var failures []lint.Failure diff --git a/rule/max_public_structs.go b/rule/max_public_structs.go index 40c140399..daf1f8843 100644 --- a/rule/max_public_structs.go +++ b/rule/max_public_structs.go @@ -44,7 +44,7 @@ func (r *MaxPublicStructsRule) Apply(file *lint.File, arguments lint.Arguments) r.configureOnce.Do(func() { configureErr = r.configure(arguments) }) if configureErr != nil { - return []lint.Failure{lint.NewInternalFailure(configureErr.Error())} + return newInternalFailureError(configureErr) } var failures []lint.Failure diff --git a/rule/receiver_naming.go b/rule/receiver_naming.go index 54eee4eff..3e0cc561c 100644 --- a/rule/receiver_naming.go +++ b/rule/receiver_naming.go @@ -50,7 +50,7 @@ func (r *ReceiverNamingRule) Apply(file *lint.File, arguments lint.Arguments) [] r.configureOnce.Do(func() { configureErr = r.configure(arguments) }) if configureErr != nil { - return []lint.Failure{lint.NewInternalFailure(configureErr.Error())} + return newInternalFailureError(configureErr) } typeReceiver := map[string]string{} diff --git a/rule/struct_tag.go b/rule/struct_tag.go index a7d0939c3..be1222df5 100644 --- a/rule/struct_tag.go +++ b/rule/struct_tag.go @@ -52,7 +52,7 @@ func (r *StructTagRule) Apply(file *lint.File, arguments lint.Arguments) []lint. r.configureOnce.Do(func() { configureErr = r.configure(arguments) }) if configureErr != nil { - return []lint.Failure{lint.NewInternalFailure(configureErr.Error())} + return newInternalFailureError(configureErr) } var failures []lint.Failure diff --git a/rule/unchecked_type_assertion.go b/rule/unchecked_type_assertion.go index a4962201e..987769ef7 100644 --- a/rule/unchecked_type_assertion.go +++ b/rule/unchecked_type_assertion.go @@ -51,7 +51,7 @@ func (r *UncheckedTypeAssertionRule) Apply(file *lint.File, arguments lint.Argum r.configureOnce.Do(func() { configureErr = r.configure(arguments) }) if configureErr != nil { - return []lint.Failure{lint.NewInternalFailure(configureErr.Error())} + return newInternalFailureError(configureErr) } var failures []lint.Failure diff --git a/rule/unhandled_error.go b/rule/unhandled_error.go index 9ab865e64..3a0753c37 100644 --- a/rule/unhandled_error.go +++ b/rule/unhandled_error.go @@ -47,7 +47,7 @@ func (r *UnhandledErrorRule) Apply(file *lint.File, arguments lint.Arguments) [] r.configureOnce.Do(func() { configureErr = r.configure(arguments) }) if configureErr != nil { - return []lint.Failure{lint.NewInternalFailure(configureErr.Error())} + return newInternalFailureError(configureErr) } var failures []lint.Failure diff --git a/rule/unused_param.go b/rule/unused_param.go index 365802b15..374e899e2 100644 --- a/rule/unused_param.go +++ b/rule/unused_param.go @@ -55,7 +55,7 @@ func (r *UnusedParamRule) Apply(file *lint.File, arguments lint.Arguments) []lin r.configureOnce.Do(func() { configureErr = r.configure(arguments) }) if configureErr != nil { - return []lint.Failure{lint.NewInternalFailure(configureErr.Error())} + return newInternalFailureError(configureErr) } var failures []lint.Failure diff --git a/rule/unused_receiver.go b/rule/unused_receiver.go index b8fba059e..29860684d 100644 --- a/rule/unused_receiver.go +++ b/rule/unused_receiver.go @@ -53,7 +53,7 @@ func (r *UnusedReceiverRule) Apply(file *lint.File, arguments lint.Arguments) [] r.configureOnce.Do(func() { configureErr = r.configure(arguments) }) if configureErr != nil { - return []lint.Failure{lint.NewInternalFailure(configureErr.Error())} + return newInternalFailureError(configureErr) } var failures []lint.Failure diff --git a/rule/utils.go b/rule/utils.go index 55390e2fb..43a2b1b32 100644 --- a/rule/utils.go +++ b/rule/utils.go @@ -122,3 +122,8 @@ func isDirectiveComment(line string) bool { func isCallToExitFunction(pkgName, functionName string) bool { return exitFunctions[pkgName] != nil && exitFunctions[pkgName][functionName] } +// newInternalFailureError returns single internal failure +func newInternalFailureError(e error) []lint.Failure { + return []lint.Failure{lint.NewInternalFailure(e.Error())} +} + diff --git a/rule/var_naming.go b/rule/var_naming.go index 5d3bf1ad7..002f72279 100644 --- a/rule/var_naming.go +++ b/rule/var_naming.go @@ -96,7 +96,7 @@ func (r *VarNamingRule) Apply(file *lint.File, arguments lint.Arguments) []lint. r.configureOnce.Do(func() { configureErr = r.configure(arguments) }) if configureErr != nil { - return []lint.Failure{lint.NewInternalFailure(configureErr.Error())} + return newInternalFailureError(configureErr) } var failures []lint.Failure