fix: linting issues and a bug

omissis · Sep 10, 2022 · e425fdb · e425fdb
1 parent 3a29b79
commit e425fdb
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/.rules/.golangci.yml b/.rules/.golangci.yml
@@ -20,23 +20,27 @@ linters:
   # https://golangci-lint.run/usage/linters/#disabled-by-default-linters--e--enable
   disable:
     # todo
-    - exhaustruct
-    - forbidigo
-    - godox
     - ireturn
     - revive
     - varnamelen
+    # unsupported
+    - rowserrcheck
+    - sqlclosecheck
+    - wastedassign
     # deprecated
     - deadcode
     - exhaustivestruct
     - golint
+    - nosnakecase
+    - structcheck
     - ifshort
     - interfacer
     - maligned
     - scopelint
     - varcheck
     # unused
-    # TBD
+    - exhaustruct
+    - forbidigo
 
 linters-settings:
   decorder:

diff --git a/cmd/validate/utils.go b/cmd/validate/utils.go
@@ -49,7 +49,6 @@ func PrintResults(output string, err error, conf any, configFile string) {
 }
 
 func printTextResults(ptrPaths [][]any, err error, conf any, configFile string) {
-	// TODO: improve formatting.
 	fmt.Printf("CONFIG FILE %s\n", configFile)
 
 	for _, path := range ptrPaths {
@@ -58,7 +57,6 @@ func printTextResults(ptrPaths [][]any, err error, conf any, configFile string)
 			logx.Fatal(serr)
 		}
 
-		// TODO: improve santhosh.JoinPtrPath output.
 		fmt.Printf(
 			"path '%s' contains an invalid configuration value: %+v\n",
 			santhosh.JoinPtrPath(path),

diff --git a/cmd/verify/utils.go b/cmd/verify/utils.go
@@ -16,7 +16,6 @@ var ErrProjectDoesNotRespectRules = errors.New("project does not respect defined
 func PrintResults(output, configFile string, results []config.RuleExecutionResult) {
 	switch output {
 	case "text":
-		// TODO: improve formatting.
 		fmt.Printf("CONFIG FILE %s\n", configFile)
 
 		for _, r := range results {

diff --git a/internal/arch/file/except/except.go b/internal/arch/file/except/except.go
@@ -20,7 +20,7 @@ func (e *baseExpression) GetErrors() []error {
 	return e.errors
 }
 
-func (e baseExpression) evaluate(rb rule.Builder, eval evaluateFunc) {
+func (e *baseExpression) evaluate(rb rule.Builder, eval evaluateFunc) {
 	frb, ok := rb.(*file.RuleBuilder)
 	if !ok {
 		e.errors = append(e.errors, file.ErrInvalidRuleBuilder)

diff --git a/internal/arch/file/that/end_with.go b/internal/arch/file/that/end_with.go
@@ -23,7 +23,7 @@ func (e *EndWithExpression) GetErrors() []error {
 	return e.errors
 }
 
-func (e EndWithExpression) Evaluate(rb rule.Builder) {
+func (e *EndWithExpression) Evaluate(rb rule.Builder) {
 	frb, ok := rb.(*file.RuleBuilder)
 	if !ok {
 		e.errors = append(e.errors, file.ErrInvalidRuleBuilder)