fix: linter issues

Signed-off-by: knqyf263 <[email protected]>
aquasecurity · Apr 16, 2024 · 025e73f · 025e73f
1 parent 61eddab
commit 025e73f
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 10 deletions.
diff --git a/pkg/fanal/analyzer/pkg/dpkg/copyright.go b/pkg/fanal/analyzer/pkg/dpkg/copyright.go
@@ -88,7 +88,7 @@ func (a *dpkgLicenseAnalyzer) parseCopyright(r xio.ReadSeekerAt) ([]types.Licens
 			l := strings.TrimSpace(line[8:])
 
 			l = normalizeLicense(l)
-			if len(l) > 0 {
+			if l != "" {
 				for _, lic := range licensing.SplitLicenses(l) {
 					lic = licensing.Normalize(lic)
 					if !slices.Contains(licenses, lic) {

diff --git a/pkg/fanal/walker/fs.go b/pkg/fanal/walker/fs.go
@@ -2,7 +2,6 @@ package walker
 
 import (
 	"errors"
-	xio "github.com/aquasecurity/trivy/pkg/x/io"
 	"io/fs"
 	"os"
 	"path/filepath"
@@ -11,6 +10,7 @@ import (
 	"golang.org/x/xerrors"
 
 	"github.com/aquasecurity/trivy/pkg/log"
+	xio "github.com/aquasecurity/trivy/pkg/x/io"
 )
 
 // FS is the filesystem walker

diff --git a/pkg/flag/report_flags.go b/pkg/flag/report_flags.go
@@ -261,7 +261,7 @@ func (f *ReportFlagGroup) ToOptions() (ReportOptions, error) {
 }
 
 func loadComplianceTypes(compliance string) (spec.ComplianceSpec, error) {
-	if len(compliance) > 0 && !slices.Contains(types.SupportedCompliances, compliance) && !strings.HasPrefix(compliance, "@") {
+	if compliance != "" && !slices.Contains(types.SupportedCompliances, compliance) && !strings.HasPrefix(compliance, "@") {
 		return spec.ComplianceSpec{}, xerrors.Errorf("unknown compliance : %v", compliance)
 	}
 

diff --git a/pkg/iac/rules/register.go b/pkg/iac/rules/register.go
@@ -125,7 +125,7 @@ func GetFrameworkRules(fw ...framework.Framework) []ruleTypes.RegisteredRule {
 }
 
 func GetSpecRules(spec string) []ruleTypes.RegisteredRule {
-	if len(spec) > 0 {
+	if spec != "" {
 		return coreRegistry.getSpecRules(spec)
 	}
 

diff --git a/pkg/iac/scanners/azure/functions/first.go b/pkg/iac/scanners/azure/functions/first.go
@@ -9,7 +9,7 @@ func First(args ...interface{}) interface{} {
 
 	switch cType := container.(type) {
 	case string:
-		if len(cType) > 0 {
+		if cType != "" {
 			return string(cType[0])
 		}
 	case interface{}:

diff --git a/pkg/iac/scanners/azure/functions/last.go b/pkg/iac/scanners/azure/functions/last.go
@@ -9,7 +9,7 @@ func Last(args ...interface{}) interface{} {
 
 	switch cType := container.(type) {
 	case string:
-		if len(cType) > 0 {
+		if cType != "" {
 			return string(cType[len(cType)-1])
 		}
 	case interface{}:

diff --git a/pkg/k8s/commands/namespace.go b/pkg/k8s/commands/namespace.go
@@ -36,7 +36,7 @@ func namespaceRun(ctx context.Context, opts flag.Options, cluster k8s.Cluster) e
 }
 
 func getNamespace(opts flag.Options, currentNamespace string) string {
-	if len(opts.K8sOptions.Namespace) > 0 {
+	if opts.K8sOptions.Namespace != "" {
 		return opts.K8sOptions.Namespace
 	}
 

diff --git a/pkg/mapfs/fs.go b/pkg/mapfs/fs.go
@@ -235,7 +235,7 @@ func (m *FS) RemoveAll(path string) error {
 
 func cleanPath(path string) string {
 	// Convert the volume name like 'C:' into dir like 'C\'
-	if vol := filepath.VolumeName(path); len(vol) > 0 {
+	if vol := filepath.VolumeName(path); vol != "" {
 		newVol := strings.TrimSuffix(vol, ":")
 		newVol = fmt.Sprintf("%s%c", newVol, filepath.Separator)
 		path = strings.Replace(path, vol, newVol, 1)

diff --git a/pkg/report/table/vulnerability.go b/pkg/report/table/vulnerability.go
@@ -124,7 +124,7 @@ func (r *vulnerabilityRenderer) setVulnerabilityRows(tw *table.Table, vulns []ty
 			title = strings.Join(splitTitle[:12], " ") + "..."
 		}
 
-		if len(v.PrimaryURL) > 0 {
+		if v.PrimaryURL != "" {
 			if r.isTerminal {
 				title = tml.Sprintf("%s\n<blue>%s</blue>", title, v.PrimaryURL)
 			} else {

diff --git a/pkg/sbom/cyclonedx/marshal.go b/pkg/sbom/cyclonedx/marshal.go
@@ -298,7 +298,7 @@ func (*Marshaler) Properties(properties []core.Property) *[]cdx.Property {
 	cdxProps := make([]cdx.Property, 0, len(properties))
 	for _, property := range properties {
 		namespace := Namespace
-		if len(property.Namespace) > 0 {
+		if property.Namespace != "" {
 			namespace = property.Namespace
 		}