refactor: enable more linters

Author: bfabio

.golangci.yaml

@@ -34,11 +34,9 @@ linters:
 
     # TODO: fix and enable these
     - cyclop
-    - depguard
     - err113
     - errname
     - errorlint
-    - exhaustruct
     - forbidigo
     - forcetypeassert
     - funlen
@@ -52,23 +50,15 @@ linters:
     - ireturn
     - lll
     - nestif
-    - nlreturn
     - perfsprint
-    - prealloc
     - recvcheck
     - revive
-    - tagalign
     - tagliatelle
-    - unused
     - varnamelen
-    - whitespace
     - wrapcheck
-    - wsl
     - gocritic
     - gocyclo
     - noctx
-    - predeclared
-    - unparam
 
   settings:
     wrapcheck:

errors.go

@@ -73,9 +73,10 @@ func (e ValidationWarning) MarshalJSON() ([]byte, error) {
 type ValidationResults []error
 
 func (vr ValidationResults) Error() string {
-	var s []string
+	s := make([]string, 0, len(vr))
 	for _, e := range vr {
 		s = append(s, e.Error())
 	}
+
 	return strings.Join(s, "\n")
 }

fields.go

@@ -22,6 +22,7 @@ func validateFieldsV0(publiccode PublicCode, parser Parser, network bool) error
 		if reachable, err := parser.isReachable(*(*url.URL)(publiccodev0.URL), network); !reachable {
 			vr = append(vr, newValidationError("url", "'%s' not reachable: %s", publiccodev0.URL, err.Error()))
 		}
+
 		if !vcsurl.IsRepo((*url.URL)(publiccodev0.URL)) {
 			vr = append(vr, newValidationError("url", "is not a valid code repository"))
 		}
@@ -46,14 +47,15 @@ func validateFieldsV0(publiccode PublicCode, parser Parser, network bool) error
 	}
 
 	if publiccodev0.Logo != "" {
-		if validLogo, err := parser.validLogo(toCodeHostingURL(publiccodev0.Logo, parser.baseURL), parser, network); !validLogo {
+		if validLogo, err := parser.validLogo(toCodeHostingURL(publiccodev0.Logo, parser.baseURL), network); !validLogo {
 			vr = append(vr, newValidationError("logo", err.Error()))
 		}
 	}
+
 	if publiccodev0.MonochromeLogo != "" {
 		vr = append(vr, ValidationWarning{"monochromeLogo", "This key is DEPRECATED and will be removed in the future", 0, 0})
 
-		if validLogo, err := parser.validLogo(toCodeHostingURL(publiccodev0.MonochromeLogo, parser.baseURL), parser, network); !validLogo {
+		if validLogo, err := parser.validLogo(toCodeHostingURL(publiccodev0.MonochromeLogo, parser.baseURL), network); !validLogo {
 			vr = append(vr, newValidationError("monochromeLogo", err.Error()))
 		}
 	}
@@ -71,6 +73,7 @@ func validateFieldsV0(publiccode PublicCode, parser Parser, network bool) error
 	if len(publiccodev0.InputTypes) > 0 {
 		vr = append(vr, ValidationWarning{"inputTypes", "This key is DEPRECATED and will be removed in the future", 0, 0})
 	}
+
 	for i, mimeType := range publiccodev0.InputTypes {
 		if !isMIME(mimeType) {
 			vr = append(vr, newValidationError(
@@ -82,6 +85,7 @@ func validateFieldsV0(publiccode PublicCode, parser Parser, network bool) error
 	if len(publiccodev0.OutputTypes) > 0 {
 		vr = append(vr, ValidationWarning{"outputTypes", "This key is DEPRECATED and will be removed in the future", 0, 0})
 	}
+
 	for i, mimeType := range publiccodev0.OutputTypes {
 		if !isMIME(mimeType) {
 			vr = append(vr, newValidationError(
@@ -110,6 +114,7 @@ func validateFieldsV0(publiccode PublicCode, parser Parser, network bool) error
 				))
 			}
 		}
+
 		if network && desc.APIDocumentation != nil {
 			if reachable, err := parser.isReachable(*(*url.URL)(desc.APIDocumentation), network); !reachable {
 				vr = append(vr, newValidationError(
@@ -127,6 +132,7 @@ func validateFieldsV0(publiccode PublicCode, parser Parser, network bool) error
 				))
 			}
 		}
+
 		for i, v := range desc.Videos {
 			_, err := parser.isOEmbedURL((*url.URL)(v))
 			if err != nil {

internal/netutil.go

@@ -19,6 +19,7 @@ func downloadFile(filepath string, url *url.URL, headers map[string]string) erro
 	if err != nil {
 		return err
 	}
+
 	defer func() {
 		_ = out.Close()
 	}()
@@ -47,6 +48,7 @@ func DownloadTmpFile(url *url.URL, headers map[string]string) (string, error) {
 
 	// Download the file in the temp dir.
 	tmpFile := filepath.Join(tmpdir, path.Base(url.Path))
+
 	err = downloadFile(tmpFile, url, headers)
 	if err != nil {
 		return "", err

marshallers.go

@@ -17,6 +17,7 @@ func (u *URL) UnmarshalYAML(unmarshal func(interface{}) error) error {
 	if err != nil {
 		return err
 	}
+
 	*u = (URL)(*urlp)
 
 	return nil
@@ -34,13 +35,16 @@ type UrlOrUrlArray []*URL
 
 func (a *UrlOrUrlArray) UnmarshalYAML(unmarshal func(interface{}) error) error {
 	var multi []*URL
+
 	err := unmarshal(&multi)
 	if err != nil {
 		var single *URL
+
 		err := unmarshal(&single)
 		if err != nil {
 			return err
 		}
+
 		*a = []*URL{single}
 	} else {
 		*a = multi

parser.go

@@ -111,6 +111,7 @@ func (p *Parser) ParseStream(in io.Reader) (PublicCode, error) {
 	if version == nil {
 		return nil, ValidationResults{newValidationError("publiccodeYmlVersion", "publiccodeYmlVersion is a required field")}
 	}
+
 	if version.ShortTag() != "!!str" {
 		line, column := getPositionInFile("publiccodeYmlVersion", node)
 
@@ -152,7 +153,9 @@ func (p *Parser) ParseStream(in io.Reader) (PublicCode, error) {
 	}
 
 	var publiccode PublicCode
+
 	var validateFields validateFn
+
 	var decodeResults ValidationResults
 
 	if version.Value[0] == '0' {
@@ -276,6 +279,7 @@ func (p *Parser) Parse(uri string) (PublicCode, error) {
 		if err != nil {
 			return nil, fmt.Errorf("can't GET '%s': %w", uri, err)
 		}
+
 		defer func() {
 			_ = resp.Body.Close()
 		}()
@@ -394,6 +398,7 @@ func decode[T any](data []byte, publiccode *T, node yaml.Node) ValidationResults
 
 	d := yaml.NewDecoder(bytes.NewReader(data))
 	d.KnownFields(true)
+
 	if err := d.Decode(&publiccode); err != nil {
 		switch err := err.(type) {
 		case *yaml.TypeError:

publiccode-parser/publiccode_parser.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"flag"
 	"fmt"
-	"net/url"
 	"os"
 	"runtime/debug"
 
@@ -25,6 +24,7 @@ func init() {
 			version = info.Main.Version
 		}
 	}
+
 	if date == "" {
 		date = "(latest)"
 	}
@@ -45,11 +45,13 @@ func main() {
 
 	if *versionPtr {
 		println(version, date)
+
 		return
 	}
 
 	if *helpPtr || len(flag.Args()) < 1 {
 		flag.Usage()
+
 		return
 	}
 
@@ -93,6 +95,7 @@ func main() {
 		if err != nil {
 			fmt.Println(err)
 		}
+
 		if hasValidationErrors(err) {
 			os.Exit(1)
 		}
@@ -120,26 +123,3 @@ func hasValidationErrors(results error) bool {
 
 	return false
 }
-
-// isValidURL tests a string to determine if it is a well-structured url or not.
-func isValidURL(toTest string) (bool, *url.URL) {
-	_, err := url.ParseRequestURI(toTest)
-	if err != nil {
-		return false, nil
-	}
-
-	u, err := url.Parse(toTest)
-	if err != nil || u.Scheme == "" || u.Host == "" {
-		return false, nil
-	}
-
-	// Check it's an acceptable scheme
-	switch u.Scheme {
-	case "http":
-	case "https":
-	default:
-		return false, nil
-	}
-
-	return true, u
-}