fix(lint): resolve gosimple/ineffassign/staticcheck issues

Author: iseki0

envinspection/osinfo_linux.go

@@ -1,7 +1,7 @@
 package envinspection
 
 import (
-	"io/ioutil"
+	"os"
 	"regexp"
 	"strings"
 
@@ -13,9 +13,9 @@ func getOsInfo() string {
 	si.GetSysInfo()
 	var vendor = si.OS.Vendor
 	var version = si.OS.Version
-	// centos/rhel 兼容补丁
+	// centos/rhel 鍏煎琛ヤ竵
 	if vendor == "" || vendor == "unknown" {
-		if content, err := ioutil.ReadFile("/etc/redhat-release"); err == nil {
+		if content, err := os.ReadFile("/etc/redhat-release"); err == nil {
 			line := strings.ToLower(string(content))
 			var re = regexp.MustCompile(`([a-zA-Z ]+) release ([0-9.]+)`)
 			if m := re.FindStringSubmatch(line); len(m) == 3 {
@@ -28,7 +28,7 @@ func getOsInfo() string {
 				default:
 					vendor = strings.ReplaceAll(v, " ", "_")
 				}
-				// 只保留大版本号
+				// Keep major OS version only
 				ver := m[2]
 				if idx := strings.Index(ver, "."); idx > 0 {
 					version = ver[:idx]

module/python/venv.go

@@ -10,10 +10,10 @@ import (
 	"path/filepath"
 	"runtime"
 
+	"context"
 	"github.com/murphysecurity/murphysec/env"
 	"github.com/murphysecurity/murphysec/model"
 	"go.uber.org/zap"
-	"golang.org/x/net/context"
 )
 
 const pipConf = `[global]
@@ -309,12 +309,12 @@ func Run(ctx context.Context, dir string, logger *zap.SugaredLogger, nvMp map[st
 	if err := installpipdeptree(venvPath, logger); err != nil {
 		return nil, err
 	}
-	// 读取新创建的 requirements.txt
+	// Read generated requirements.txt
 	data, err := readTextFile(requirementsPath, 64*1024)
 	if err != nil {
 		logger.Warnf("read requirement: %s %v", requirementsPath, err)
 	}
-	//  对比原本的 requirements.txt 拿到原本包的版本
+	// Restore versions from original requirements when needed
 	oldRequirements := parseRequirements(string(data))
 	for k, v := range nvMp {
 		if newV, ok := oldRequirements[k]; ok && newV != v {
@@ -331,9 +331,9 @@ func Run(ctx context.Context, dir string, logger *zap.SugaredLogger, nvMp map[st
 			mod = append(mod, buildTree(j, 0))
 		}
 	}
-	// 对于没有pip install成功的依赖 只加入pipreqs中列出的直接依赖
+	// Keep direct dependencies even when pip install does not succeed
 	directDependenceSurvival(&mod, oldRequirements)
-	// 对于pipreqs生成的requirements.txt 中未列出的直接依赖加入到依赖树中直接依赖一层
+	// Add direct dependencies inferred by pipreqs.
 	data, err = readTextFile(venvRequirementsPath, 64*1024)
 	if err != nil {
 		logger.Warnf("read requirement: %s %v", requirementsPath, err)

utils/file.go

@@ -6,12 +6,8 @@ import (
 )
 
 func IsPathExist(path string) bool {
-	var err error
-	_, err = os.Stat(path)
-	if err != nil {
-		return false
-	}
-	return true
+	_, err := os.Stat(path)
+	return err == nil
 }
 
 func IsDir(path string) bool {
@@ -23,10 +19,9 @@ func IsDir(path string) bool {
 }
 
 func IsDirResolveSymlink(path string) bool {
-	var realPath = path
-	realPath, e := filepath.EvalSymlinks(path)
-	if e == nil {
-		realPath = path
+	realPath := path
+	if p, e := filepath.EvalSymlinks(path); e == nil {
+		realPath = p
 	}
 	return IsDir(realPath)
 }