Skip to content

Commit d2205ce

Browse files
pohanhuangpohanhuang
committed
fix: linter issue
Signed-off-by: pohanhuang <pohan.huang@suse.com>
1 parent df7d5d7 commit d2205ce

File tree

12 files changed

+54
-56
lines changed

12 files changed

+54
-56
lines changed

‎common/db.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -358,10 +358,10 @@ func readAppDbMeta(path string, fullDb map[string]*share.ScanVulnerability, outp
358358

359359
e.Packages = append(e.Packages, &OutputPackage{Package: v.ModuleName})
360360
for _, fv := range v.FixedVer {
361-
op := strings.Replace(fv.OpCode, "or", "||", -1)
362-
op = strings.Replace(op, "gt", ">", -1)
363-
op = strings.Replace(op, "lt", "<", -1)
364-
op = strings.Replace(op, "eq", "=", -1)
361+
op := strings.ReplaceAll(fv.OpCode, "or", "||")
362+
op = strings.ReplaceAll(op, "gt", ">")
363+
op = strings.ReplaceAll(op, "lt", "<")
364+
op = strings.ReplaceAll(op, "eq", "=")
365365
e.Packages[0].FixedVersion = fmt.Sprintf("%s%s;%s", op, fv.Version, e.Packages[0].FixedVersion)
366366
}
367367
ov.Entries = append(ov.Entries, e)
@@ -575,7 +575,7 @@ func LoadCveDb(path, desPath string, encryptKey []byte) (string, string, error)
575575
newVer, update, err = CheckExpandedDb(desPath, true)
576576
if err != nil {
577577
log.WithFields(log.Fields{"error": err}).Error("CVE database format error")
578-
return "", "", errors.New("Invalid database format")
578+
return "", "", errors.New("invalid database format")
579579
}
580580
latestVer = fmt.Sprintf("%.3f", newVer)
581581
} else if oldErr == nil && err == nil && newVer > oldVer {
@@ -620,40 +620,40 @@ func LoadCveDb(path, desPath string, encryptKey []byte) (string, string, error)
620620
func GetDbVersion(path string) (float64, string, error) {
621621
f, err := os.Open(path + share.DefaultCVEDBName)
622622
if err != nil {
623-
return 0, "", fmt.Errorf("Read db file fail: %v", err)
623+
return 0, "", fmt.Errorf("read db file fail: %v", err)
624624
}
625625
defer f.Close()
626626

627627
bhead := make([]byte, 4)
628628
nlen, err := f.Read(bhead)
629629
if err != nil || nlen != 4 {
630-
return 0, "", fmt.Errorf("Read db file error: %v", err)
630+
return 0, "", fmt.Errorf("read db file error: %v", err)
631631
}
632632
var headLen int32
633633
err = binary.Read(bytes.NewReader(bhead), binary.BigEndian, &headLen)
634634
if err != nil {
635-
return 0, "", fmt.Errorf("Read header len error: %v", err)
635+
return 0, "", fmt.Errorf("read header len error: %v", err)
636636
}
637637

638638
if headLen > maxVersionHeader {
639-
return 0, "", fmt.Errorf("Version Header too big: %v", headLen)
639+
return 0, "", fmt.Errorf("version header too big: %v", headLen)
640640
}
641641

642642
bhead = make([]byte, headLen)
643643
nlen, err = f.Read(bhead)
644644
if err != nil || nlen != int(headLen) {
645-
return 0, "", fmt.Errorf("Read db file version error:%v", err)
645+
return 0, "", fmt.Errorf("read db file version error: %v", err)
646646
}
647647

648648
var keyVer KeyVersion
649649

650650
err = json.Unmarshal(bhead, &keyVer)
651651
if err != nil {
652-
return 0, "", fmt.Errorf("Unmarshal keys error:%v", err)
652+
return 0, "", fmt.Errorf("unmarshal keys error: %v", err)
653653
}
654654
verFl, err := strconv.ParseFloat(keyVer.Version, 64)
655655
if err != nil {
656-
return 0, "", fmt.Errorf("Invalid version value:%v", err)
656+
return 0, "", fmt.Errorf("invalid version value: %v", err)
657657
}
658658

659659
return verFl, keyVer.UpdateTime, nil

‎common/db_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ func TestLoadCveDB(t *testing.T) {
175175
setupFunc: func(t *testing.T) (string, string) {
176176
return "not_exist/", t.TempDir()
177177
},
178-
expectErr: errors.New("Read db file fail: open not_exist/cvedb: no such file or directory"),
178+
expectErr: errors.New("read db file fail: open not_exist/cvedb: no such file or directory"),
179179
},
180180
{
181181
name: "db file exist, expand path not exist (first load)",

‎cvetools/apps.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,11 @@ func appVul2FullVul(app detectors.AppFeatureVersion, mv common.AppModuleVul) vul
145145
func moduleVer2FixVer(app detectors.AppFeatureVersion, mv common.AppModuleVul) common.FeaFull {
146146
ft := common.FeaFull{Name: mv.ModuleName}
147147
for i, v := range mv.FixedVer {
148-
s := strings.Replace(v.OpCode, "or", "||", -1)
149-
s = strings.Replace(s, "andlt", "<", -1)
150-
s = strings.Replace(s, "gt", ">", -1)
151-
s = strings.Replace(s, "lt", "<", -1)
152-
s = strings.Replace(s, "eq", "=", -1)
148+
s := strings.ReplaceAll(v.OpCode, "or", "||")
149+
s = strings.ReplaceAll(s, "andlt", "<")
150+
s = strings.ReplaceAll(s, "gt", ">")
151+
s = strings.ReplaceAll(s, "lt", "<")
152+
s = strings.ReplaceAll(s, "eq", "=")
153153
ft.Version += s + v.Version
154154
if i < (len(mv.FixedVer) - 1) {
155155
ft.Version += ";"

‎cvetools/cvesearch.go‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -299,8 +299,8 @@ func (cv *ScanTools) ScanImage(ctx context.Context, req *share.ScanImageRequest,
299299
}
300300

301301
var info *scan.ImageInfo
302-
var baseLayers utils.Set = utils.NewSet()
303-
var secret *share.ScanSecretResult = &share.ScanSecretResult{
302+
baseLayers := utils.NewSet()
303+
secret := &share.ScanSecretResult{
304304
Error: share.ScanErrorCode_ScanErrNone,
305305
Logs: make([]*share.ScanSecretLog, 0),
306306
}
@@ -1131,10 +1131,7 @@ func searchAffectedFeature(mv map[string][]common.VulShort, namespace string, ft
11311131
}
11321132
featName := fmt.Sprintf("%s:%s", namespace, name)
11331133
vs := mv[featName]
1134-
skipEpoch := false
1135-
if strings.HasPrefix(namespace, "amzn") {
1136-
skipEpoch = true
1137-
}
1134+
skipEpoch := strings.HasPrefix(namespace, "amzn")
11381135

11391136
matchMap := make(map[string]share.ScanVulStatus)
11401137
moduleVuls := make([]detectors.ModuleVul, 0)
@@ -1182,11 +1179,12 @@ func searchAffectedFeature(mv map[string][]common.VulShort, namespace string, ft
11821179
log.WithFields(log.Fields{"error": err, "version": window.max}).Error()
11831180
continue
11841181
}
1185-
if maxVer == utils.MaxVersion {
1182+
switch maxVer {
1183+
case utils.MaxVersion:
11861184
afStatus = share.ScanVulStatus_Unpatched
1187-
} else if maxVer == utils.MinVersion {
1185+
case utils.MinVersion:
11881186
afStatus = share.ScanVulStatus_Unaffected
1189-
} else {
1187+
default:
11901188
afStatus = share.ScanVulStatus_FixExists
11911189
}
11921190
//check if module is within version window.
@@ -1261,11 +1259,12 @@ func searchAffectedFeature(mv map[string][]common.VulShort, namespace string, ft
12611259
log.WithFields(log.Fields{"error": err, "version": fixVer}).Error()
12621260
continue
12631261
}
1264-
if ver == utils.MaxVersion {
1262+
switch ver {
1263+
case utils.MaxVersion:
12651264
afStatus = share.ScanVulStatus_Unpatched
1266-
} else if ver == utils.MinVersion {
1265+
case utils.MinVersion:
12671266
afStatus = share.ScanVulStatus_Unaffected
1268-
} else {
1267+
default:
12691268
afStatus = share.ScanVulStatus_FixExists
12701269
}
12711270
if skipEpoch {
@@ -1492,7 +1491,7 @@ func getVulItemList(vuls []vulFullReport, dbPrefix string) []*share.ScanVulnerab
14921491
PackageNameDeprecated: featver.Package,
14931492
PackageName: featver.Package,
14941493
PackageVersion: packVer,
1495-
FixedVersion: strings.Replace(fixedInVer, "||", " OR ", -1),
1494+
FixedVersion: strings.ReplaceAll(fixedInVer, "||", " OR "),
14961495
PublishedDate: fmt.Sprintf("%d", v.IssuedDate.Unix()),
14971496
LastModifiedDate: fmt.Sprintf("%d", v.LastModDate.Unix()),
14981497
CPEs: cpes,

‎cvetools/scan_cache.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ func (lc *ImageLayerCacher) RecordName(id string, record interface{}) string {
214214
func (lc *ImageLayerCacher) ReadRecordCache(id string, record interface{}) (string, error) {
215215
name := lc.RecordName(id, record)
216216
if name == "" {
217-
return "", errors.New("Invalid type")
217+
return "", errors.New("invalid type")
218218
}
219219

220220
// log.WithFields(log.Fields{"name": name}).Debug()
@@ -253,7 +253,7 @@ func (lc *ImageLayerCacher) ReadRecordCache(id string, record interface{}) (stri
253253
func (lc *ImageLayerCacher) WriteRecordCache(id string, record interface{}, keeper utils.Set) error {
254254
name := lc.RecordName(id, record)
255255
if name == "" {
256-
return errors.New("Invalid type")
256+
return errors.New("invalid type")
257257
}
258258

259259
// log.WithFields(log.Fields{"name": name}).Debug()

‎cvetools/tools.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func collectImageFileMap(rootPath string, fmap map[string]string) (int, []string
4040
}
4141
//
4242
var opqDirs []string
43-
var curfmap map[string]string = make(map[string]string)
43+
curfmap := make(map[string]string)
4444

4545
rootLen := len(filepath.Clean(rootPath))
4646
errorCnt := 0

‎detectors/features.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ func detectRPM(namespace string, files map[string]*FeatureFile, path string) ([]
378378
}
379379

380380
// Parse version
381-
version, err := utils.NewVersion(strings.Replace(line[1], "(none):", "", -1))
381+
version, err := utils.NewVersion(strings.ReplaceAll(line[1], "(none):", ""))
382382
if err != nil {
383383
log.Warningf("could not parse package version '%s': %s. skipping", line[1], err.Error())
384384
continue

‎detectors/namespace.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,22 +49,22 @@ func detectOSRelease(data map[string]*FeatureFile) *Namespace {
4949

5050
r := osReleaseOSRegexp.FindStringSubmatch(line)
5151
if len(r) == 2 {
52-
OS = strings.Replace(strings.ToLower(r[1]), "\"", "", -1)
52+
OS = strings.ReplaceAll(strings.ToLower(r[1]), "\"", "")
5353
}
5454

5555
r = osReleaseVersionRegexp.FindStringSubmatch(line)
5656
if len(r) == 2 {
57-
version = strings.Replace(strings.ToLower(r[1]), "\"", "", -1)
57+
version = strings.ReplaceAll(strings.ToLower(r[1]), "\"", "")
5858
}
5959

6060
r = osReleaseCodenameRegexp.FindStringSubmatch(line)
6161
if len(r) == 2 {
62-
codename = strings.Replace(strings.ToLower(r[1]), "\"", "", -1)
62+
codename = strings.ReplaceAll(strings.ToLower(r[1]), "\"", "")
6363
}
6464

6565
r = osReleaseRHELVersionRegexp.FindStringSubmatch(line)
6666
if len(r) == 2 {
67-
rhelVer = strings.Replace(strings.ToLower(r[1]), "\"", "", -1)
67+
rhelVer = strings.ReplaceAll(strings.ToLower(r[1]), "\"", "")
6868
}
6969

7070
if OS == "rhel" {
@@ -106,12 +106,12 @@ func detectLSBRelease(data map[string]*FeatureFile) *Namespace {
106106

107107
r := lsbReleaseOSRegexp.FindStringSubmatch(line)
108108
if len(r) == 2 {
109-
OS = strings.Replace(strings.ToLower(r[1]), "\"", "", -1)
109+
OS = strings.ReplaceAll(strings.ToLower(r[1]), "\"", "")
110110
}
111111

112112
r = lsbReleaseVersionRegexp.FindStringSubmatch(line)
113113
if len(r) == 2 {
114-
version = strings.Replace(strings.ToLower(r[1]), "\"", "", -1)
114+
version = strings.ReplaceAll(strings.ToLower(r[1]), "\"", "")
115115

116116
// We care about the .04 for Ubuntu but not for Debian / CentOS
117117
if OS == "centos" || OS == "debian" {

‎server.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ func scannerRegisterStream(ctx context.Context, client share.ControllerScanServi
282282
stream, err := client.ScannerRegisterStream(ctx)
283283
if err != nil {
284284
log.WithFields(log.Fields{"error": err}).Error("Failed to get stream")
285-
return errors.New("Failed to to controller")
285+
return errors.New("failed to connect to controller")
286286
}
287287

288288
// send a block without data to test if stream API is supported
@@ -295,7 +295,7 @@ func scannerRegisterStream(ctx context.Context, client share.ControllerScanServi
295295
err = stream.Send(data)
296296
if err == io.EOF {
297297
log.Info("Stream register API is not supported")
298-
return errors.New("Stream register API is not supported")
298+
return errors.New("stream register API is not supported")
299299
} else if err != nil {
300300
log.WithFields(log.Fields{"error": err}).Error("Failed to send")
301301
return err
@@ -334,7 +334,7 @@ func scannerRegisterStream(ctx context.Context, client share.ControllerScanServi
334334
err = stream.Send(data)
335335
if err == io.EOF {
336336
log.Info("Stream register API is not supported")
337-
return errors.New("Stream register API is not supported")
337+
return errors.New("stream register API is not supported")
338338
} else if err != nil {
339339
log.WithFields(log.Fields{"error": err}).Error("Failed to send")
340340
return err
@@ -417,7 +417,7 @@ func scannerRegister(joinIP string, joinPort uint16, data *share.ScannerRegister
417417
client, err := getControllerServiceClient(joinIP, joinPort, cb)
418418
if err != nil {
419419
log.WithFields(log.Fields{"error": err}).Error("Failed to find ctrl client")
420-
return errors.New("Failed to connect to controller")
420+
return errors.New("failed to connect to controller")
421421
}
422422

423423
ctx, cancel := context.WithTimeout(context.Background(), time.Second*180)
@@ -475,7 +475,7 @@ func scannerRegister(joinIP string, joinPort uint16, data *share.ScannerRegister
475475
_, err = client.ScannerRegister(ctx, data)
476476
if err != nil {
477477
log.WithFields(log.Fields{"error": err}).Error("Failed to register")
478-
return errors.New("Failed to send register request")
478+
return errors.New("failed to send register request")
479479
}
480480
return nil
481481
}
@@ -486,7 +486,7 @@ func scannerDeregister(joinIP string, joinPort uint16, id string) error {
486486
client, err := getControllerServiceClient(joinIP, joinPort, nil)
487487
if err != nil {
488488
log.WithFields(log.Fields{"error": err}).Error("Failed to find ctrl client")
489-
return errors.New("Failed to connect to controller")
489+
return errors.New("failed to connect to controller")
490490
}
491491

492492
ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
@@ -495,7 +495,7 @@ func scannerDeregister(joinIP string, joinPort uint16, id string) error {
495495
_, err = client.ScannerDeregister(ctx, &share.ScannerDeregisterData{ID: id})
496496
if err != nil {
497497
log.WithFields(log.Fields{"error": err}).Error("Failed to deregister")
498-
return errors.New("Failed to send deregister request")
498+
return errors.New("failed to send deregister request")
499499
}
500500
return nil
501501
}
@@ -504,7 +504,7 @@ func getScannerAvailable(joinIP string, joinPort uint16, data *share.ScannerRegi
504504
client, err := getControllerServiceClient(joinIP, joinPort, cb)
505505
if err != nil {
506506
log.WithFields(log.Fields{"error": err}).Error("Failed to find ctrl client")
507-
return &share.ScannerAvailable{Visible: false}, errors.New("Failed to connect to controller")
507+
return &share.ScannerAvailable{Visible: false}, errors.New("failed to connect to controller")
508508
}
509509

510510
ctx, cancel := context.WithTimeout(context.Background(), time.Second*60)

‎standalone.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import (
1919

2020
"github.com/neuvector/neuvector/controller/api"
2121
"github.com/neuvector/neuvector/share"
22-
"github.com/neuvector/neuvector/share/scan"
2322
scanUtils "github.com/neuvector/neuvector/share/scan"
2423
"github.com/neuvector/neuvector/share/system"
2524
"github.com/neuvector/neuvector/share/utils"
@@ -269,7 +268,7 @@ func scanRunning(pid int, cvedb map[string]*share.ScanVulnerability, showOptions
269268

270269
sys := system.NewSystemTools()
271270
sysInfo := sys.GetSystemInfo()
272-
scanUtil := scan.NewScanUtil(sys)
271+
scanUtil := scanUtils.NewScanUtil(sys)
273272
cveTools := cvetools.NewScanTools("", sys, nil, "")
274273

275274
var data share.ScanData
@@ -465,7 +464,7 @@ func apiLogin(c *apiClient, myIP string, user, pass string) error {
465464
defer resp.Body.Close()
466465

467466
if resp.StatusCode/100 != 2 {
468-
return fmt.Errorf("Login failed with status code %d", resp.StatusCode)
467+
return fmt.Errorf("login failed with status code %d", resp.StatusCode)
469468
}
470469

471470
body, err = io.ReadAll(resp.Body)
@@ -499,7 +498,7 @@ func apiLogout(c *apiClient) error {
499498
defer resp.Body.Close()
500499

501500
if resp.StatusCode/100 != 2 {
502-
return fmt.Errorf("Logout failed with status code %d", resp.StatusCode)
501+
return fmt.Errorf("logout failed with status code %d", resp.StatusCode)
503502
}
504503

505504
c.token = ""
@@ -526,7 +525,7 @@ func apiSubmitResult(c *apiClient, result *share.ScanResult) error {
526525
defer resp.Body.Close()
527526

528527
if resp.StatusCode/100 != 2 {
529-
return fmt.Errorf("Submit scan result failed with status code %d", resp.StatusCode)
528+
return fmt.Errorf("submit scan result failed with status code %d", resp.StatusCode)
530529
}
531530

532531
return nil

0 commit comments

Comments
 (0)