Skip to content

Commit 78f57a3

Browse files
anchore-actions-token-generator[bot]wagoodman
anchore-actions-token-generator[bot]
and
wagoodman
authored
chore(deps): update Syft to v0.97.0 (#1608)
* chore(deps): update Syft to v0.97.0 Signed-off-by: GitHub <[email protected]> * fix syft api usage Signed-off-by: Alex Goodman <[email protected]> --------- Signed-off-by: GitHub <[email protected]> Signed-off-by: Alex Goodman <[email protected]> Co-authored-by: wagoodman <[email protected]>
1 parent 2cbc64c commit 78f57a3

File tree

6 files changed

+22
-25
lines changed

6 files changed

+22
-25
lines changed

‎go.mod

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ require (
1414
github.com/anchore/go-version v1.2.2-0.20210903204242-51efa5b487c4
1515
github.com/anchore/packageurl-go v0.1.1-0.20230104203445-02e0a6721501
1616
github.com/anchore/stereoscope v0.0.0-20231027135531-5909e353ee88
17-
github.com/anchore/syft v0.96.0
17+
github.com/anchore/syft v0.97.0
1818
github.com/aquasecurity/go-pep440-version v0.0.0-20210121094942-22b2f8951d46
1919
github.com/bmatcuk/doublestar/v2 v2.0.4
2020
github.com/charmbracelet/bubbletea v0.24.2
@@ -233,14 +233,14 @@ require (
233233
go.uber.org/atomic v1.9.0 // indirect
234234
go.uber.org/goleak v1.2.0 // indirect
235235
go.uber.org/multierr v1.9.0 // indirect
236-
golang.org/x/crypto v0.14.0 // indirect
236+
golang.org/x/crypto v0.15.0 // indirect
237237
golang.org/x/mod v0.14.0 // indirect
238-
golang.org/x/net v0.17.0 // indirect
238+
golang.org/x/net v0.18.0 // indirect
239239
golang.org/x/oauth2 v0.12.0 // indirect
240240
golang.org/x/sync v0.3.0 // indirect
241-
golang.org/x/sys v0.13.0 // indirect
242-
golang.org/x/term v0.13.0 // indirect
243-
golang.org/x/text v0.13.0 // indirect
241+
golang.org/x/sys v0.14.0 // indirect
242+
golang.org/x/term v0.14.0 // indirect
243+
golang.org/x/text v0.14.0 // indirect
244244
golang.org/x/tools v0.13.0 // indirect
245245
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
246246
google.golang.org/api v0.143.0 // indirect

‎go.sum

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,8 @@ github.com/anchore/packageurl-go v0.1.1-0.20230104203445-02e0a6721501 h1:AV7qjwM
256256
github.com/anchore/packageurl-go v0.1.1-0.20230104203445-02e0a6721501/go.mod h1:Blo6OgJNiYF41ufcgHKkbCKF2MDOMlrqhXv/ij6ocR4=
257257
github.com/anchore/stereoscope v0.0.0-20231027135531-5909e353ee88 h1:2fQngWFSfBIUWuMGo6qy+jVTyrMNuY+eL5IkE36oTJo=
258258
github.com/anchore/stereoscope v0.0.0-20231027135531-5909e353ee88/go.mod h1:GKAnytSVV1hoqB5r5Gd9M5Ph3Rzqq0zPdEJesewjC2w=
259-
github.com/anchore/syft v0.96.0 h1:01H7gq2vqAPhZ4ZViJYRJ7FZNgNmSspTnRtRERZwU8Q=
260-
github.com/anchore/syft v0.96.0/go.mod h1:rFrR+vah/AUISayY7XHDx1waBUGGZzYy9cDVhedrwSQ=
259+
github.com/anchore/syft v0.97.0 h1:Euo/7BSCFp2X9a5D4kZzIrdN/6EBKwvF5DAH5bVLTOs=
260+
github.com/anchore/syft v0.97.0/go.mod h1:rEC0ajSw9atULFqX1FKSe8yX3E6qPRaSCocUZCnOw+s=
261261
github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
262262
github.com/andybalholm/brotli v1.0.1/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y=
263263
github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY=
@@ -1080,8 +1080,8 @@ golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0
10801080
golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
10811081
golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
10821082
golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
1083-
golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
1084-
golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
1083+
golang.org/x/crypto v0.15.0 h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA=
1084+
golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g=
10851085
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
10861086
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
10871087
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -1184,8 +1184,8 @@ golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
11841184
golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
11851185
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
11861186
golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
1187-
golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
1188-
golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
1187+
golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg=
1188+
golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ=
11891189
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
11901190
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
11911191
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -1333,17 +1333,17 @@ golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
13331333
golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
13341334
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
13351335
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1336-
golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
1337-
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1336+
golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
1337+
golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
13381338
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
13391339
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
13401340
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
13411341
golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
13421342
golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
13431343
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
13441344
golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
1345-
golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=
1346-
golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
1345+
golang.org/x/term v0.14.0 h1:LGK9IlZ8T9jvdy6cTdfKUCltatMFOehAQo9SRC46UQ8=
1346+
golang.org/x/term v0.14.0/go.mod h1:TySc+nGkYR6qt8km8wUhuFRTVSMIX3XPR58y2lC8vww=
13471347
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
13481348
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
13491349
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -1357,8 +1357,8 @@ golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
13571357
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
13581358
golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
13591359
golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
1360-
golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
1361-
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
1360+
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
1361+
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
13621362
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
13631363
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
13641364
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=

‎grype/match/ignore.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ func ruleLocationAppliesToMatch(location string, match Match) bool {
194194
return true
195195
}
196196

197-
if ruleLocationAppliesToPath(location, packageLocation.VirtualPath) {
197+
if ruleLocationAppliesToPath(location, packageLocation.AccessPath) {
198198
return true
199199
}
200200
}

‎grype/match/ignore_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ func TestShouldIgnore(t *testing.T) {
412412
match: exampleMatch,
413413
rule: IgnoreRule{
414414
Package: IgnoreRulePackage{
415-
Location: exampleMatch.Package.Locations.ToSlice()[1].VirtualPath,
415+
Location: exampleMatch.Package.Locations.ToSlice()[1].AccessPath,
416416
},
417417
},
418418
expected: true,

‎grype/pkg/provider.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ func locationMatches(location file.Location, exclusion string) (bool, error) {
7575
if err != nil {
7676
return false, err
7777
}
78-
matchesVirtualPath, err := doublestar.Match(exclusion, location.VirtualPath)
78+
matchesVirtualPath, err := doublestar.Match(exclusion, location.AccessPath)
7979
if err != nil {
8080
return false, err
8181
}

‎grype/presenter/sarif/presenter.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -186,10 +186,7 @@ func (pres *Presenter) inputPath() string {
186186

187187
// locationPath returns a path for the location, relative to the cwd
188188
func (pres *Presenter) locationPath(l file.Location) string {
189-
path := l.RealPath
190-
if l.VirtualPath != "" {
191-
path = l.VirtualPath
192-
}
189+
path := l.Path()
193190
in := pres.inputPath()
194191
path = strings.TrimPrefix(path, "./")
195192
// trimmed off any ./ and accounted for dir:. for both path and input path

0 commit comments

Comments
 (0)