Skip to content

Commit ca7330a

Browse files
cx-rogerio-dalotcx-rogerio-dalot
committed
fix:fix test
1 parent e9e066d commit ca7330a

File tree

7 files changed

+43
-78
lines changed

7 files changed

+43
-78
lines changed

‎cmd/workers.go‎

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package cmd
22

33
import (
4+
"context"
5+
46
"github.com/checkmarx/2ms/engine"
57
"github.com/checkmarx/2ms/engine/extra"
68
"golang.org/x/sync/errgroup"
@@ -9,18 +11,11 @@ import (
911
func ProcessItems(engineInstance engine.IEngine, pluginName string) {
1012
defer Channels.WaitGroup.Done()
1113

12-
g := errgroup.Group{}
14+
g, ctx := errgroup.WithContext(context.Background())
1315
g.SetLimit(1000)
14-
for item := range channels.Items {
15-
report.TotalItemsScanned++
16-
g.Go(func() error {
17-
engine.Detect(item, secretsChan, pluginName, channels.Errors)
18-
return nil
19-
})
20-
}
21-
g.Wait()
22-
close(secretsChan)
23-
}
16+
for item := range Channels.Items {
17+
Report.TotalItemsScanned++
18+
item := item
2419

2520
switch pluginName {
2621
case "filesystem":
@@ -63,28 +58,28 @@ func ProcessSecretsExtras() {
6358

6459
g := errgroup.Group{}
6560
g.SetLimit(10)
66-
for secret := range secretsExtrasChan {
61+
for secret := range SecretsExtrasChan {
6762
g.Go(func() error {
6863
extra.AddExtraToSecret(secret)
6964
return nil
7065
})
7166
}
72-
g.Wait()
67+
_ = g.Wait()
7368
}
7469

7570
func ProcessValidationAndScoreWithValidation(engine engine.IEngine) {
7671
defer Channels.WaitGroup.Done()
7772

7873
g := errgroup.Group{}
7974
g.SetLimit(10)
80-
for secret := range validationChan {
75+
for secret := range ValidationChan {
8176
g.Go(func() error {
8277
engine.RegisterForValidation(secret)
8378
engine.Score(secret, true)
8479
return nil
8580
})
8681
}
87-
g.Wait()
82+
_ = g.Wait()
8883
engine.Validate()
8984
}
9085

@@ -93,11 +88,11 @@ func ProcessScoreWithoutValidation(engine engine.IEngine) {
9388

9489
g := errgroup.Group{}
9590
g.SetLimit(10)
96-
for secret := range cvssScoreWithoutValidationChan {
91+
for secret := range CvssScoreWithoutValidationChan {
9792
g.Go(func() error {
9893
engine.Score(secret, false)
9994
return nil
10095
})
10196
}
102-
g.Wait()
97+
_ = g.Wait()
10398
}

‎engine/engine.go‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111
"os"
1212
"regexp"
1313
"strings"
14-
sync "sync"
1514
"text/tabwriter"
1615

1716
"github.com/checkmarx/2ms/engine/chunk"
@@ -45,8 +44,8 @@ type IEngine interface {
4544
DetectFragment(item plugins.ISourceItem, secretsChannel chan *secrets.Secret, pluginName string) error
4645
DetectFile(ctx context.Context, item plugins.ISourceItem, secretsChannel chan *secrets.Secret) error
4746
AddRegexRules(patterns []string) error
48-
RegisterForValidation(secret *secrets.Secret, wg *sync.WaitGroup)
49-
Score(secret *secrets.Secret, validateFlag bool, wg *sync.WaitGroup)
47+
RegisterForValidation(secret *secrets.Secret)
48+
Score(secret *secrets.Secret, validateFlag bool)
5049
Validate()
5150
GetRuleBaseRiskScore(ruleId string) float64
5251
}
@@ -252,11 +251,11 @@ func (e *Engine) AddRegexRules(patterns []string) error {
252251
return nil
253252
}
254253

255-
func (s *Engine) RegisterForValidation(secret *secrets.Secret) {
256-
s.validator.RegisterForValidation(secret)
254+
func (e *Engine) RegisterForValidation(secret *secrets.Secret) {
255+
e.validator.RegisterForValidation(secret)
257256
}
258257

259-
func (s *Engine) Score(secret *secrets.Secret, validateFlag bool) {
258+
func (e *Engine) Score(secret *secrets.Secret, validateFlag bool) {
260259
validationStatus := secrets.UnknownResult // default validity
261260
if validateFlag {
262261
validationStatus = secret.ValidationStatus

‎engine/engine_mock.go‎

Lines changed: 8 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎go.mod‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ require (
1515
github.com/stretchr/testify v1.10.0
1616
github.com/zricethezav/gitleaks/v8 v8.18.2
1717
go.uber.org/mock v0.5.2
18-
golang.org/x/sync v0.12.0
18+
golang.org/x/net v0.40.0
19+
golang.org/x/sync v0.14.0
1920
golang.org/x/time v0.5.0
2021
gopkg.in/yaml.v3 v3.0.1
2122
)
@@ -48,11 +49,7 @@ require (
4849
github.com/subosito/gotenv v1.6.0 // indirect
4950
github.com/yusufpapurcu/wmi v1.2.4 // indirect
5051
go.uber.org/multierr v1.11.0 // indirect
51-
golang.org/x/crypto v0.35.0 // indirect
52-
golang.org/x/sys v0.31.0 // indirect
53-
golang.org/x/text v0.23.0 // indirect
52+
golang.org/x/crypto v0.38.0 // indirect
53+
golang.org/x/sys v0.33.0 // indirect
54+
golang.org/x/text v0.25.0 // indirect
5455
)
55-
56-
//transitive dependency not applied but also reported as not used by go mod why
57-
58-
replace golang.org/x/net => golang.org/x/net v0.34.0

‎go.sum‎

Lines changed: 11 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf
9797
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
9898
github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
9999
github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
100-
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
101100
github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
102101
github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
103102
github.com/zricethezav/gitleaks/v8 v8.18.2 h1:slo/sMmgs3qA+6Vv6iqVhsCv+gsl3RekQXqDN0M4g5M=
@@ -107,51 +106,27 @@ go.uber.org/mock v0.5.2/go.mod h1:wLlUxC2vVTPTaE3UD51E0BGOAElKrILxhVSDYQLld5o=
107106
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
108107
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
109108
golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
110-
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
111-
golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
112-
golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs=
113-
golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=
114-
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
115-
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
116-
golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
117-
golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
118-
golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
119-
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
120-
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
121-
golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
122-
golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
123-
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
124-
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
125-
golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
126-
golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
109+
golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8=
110+
golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw=
111+
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
112+
golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY=
113+
golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=
114+
golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ=
115+
golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
127116
golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
128117
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
129-
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
130-
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
131118
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
132119
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
133120
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
134-
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
135-
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
136-
golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
137-
golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
138-
golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
139-
golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
121+
golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
122+
golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
140123
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
141-
golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
142124
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
143-
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
144-
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
145-
golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
146-
golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
125+
golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
126+
golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
147127
golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
148128
golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
149129
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
150-
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
151-
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
152-
golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
153-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
154-
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
155130
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
156131
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
157132
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=

‎plugins/filesystem.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ func (p *FileSystemPlugin) getItems(items chan ISourceItem, errs chan error, fil
114114
return nil
115115
})
116116
}
117-
g.Wait()
117+
_ = g.Wait()
118118
}
119119

120120
func (p *FileSystemPlugin) getItem(filePath string) (*item, error) {

‎plugins/filesystem_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ func TestGetFiles(t *testing.T) {
170170
errsChan := make(chan error, 10)
171171
var wg sync.WaitGroup
172172

173-
plugin.GetFiles(itemsChan, errsChan, &wg)
173+
plugin.getFiles(itemsChan, errsChan)
174174
wg.Wait()
175175
close(itemsChan)
176176
close(errsChan)

0 commit comments

Comments
 (0)