Skip to content

Commit a93686e

Browse files
cuixqcuixq
committed
move govulncheck to reachability
1 parent 190a251 commit a93686e

15 files changed

Lines changed: 10 additions & 12 deletions

File tree

‎enricher/enricherlist/list.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ import (
2323
"github.com/google/osv-scalibr/enricher"
2424
"github.com/google/osv-scalibr/enricher/baseimage"
2525
"github.com/google/osv-scalibr/enricher/ffa/baseimageattr"
26-
govcsource "github.com/google/osv-scalibr/enricher/govulncheck/source"
2726
"github.com/google/osv-scalibr/enricher/hcpidentity"
2827
"github.com/google/osv-scalibr/enricher/herokuexpiration"
2928
"github.com/google/osv-scalibr/enricher/huggingfacemeta"
3029
"github.com/google/osv-scalibr/enricher/license"
3130
"github.com/google/osv-scalibr/enricher/packagedeprecation"
31+
govcsource "github.com/google/osv-scalibr/enricher/reachability/go/source"
3232
"github.com/google/osv-scalibr/enricher/reachability/java"
3333
"github.com/google/osv-scalibr/enricher/reachability/rust"
3434
"github.com/google/osv-scalibr/enricher/secrets/convert"

enricher/govulncheck/source/govulncheck.go renamed to enricher/reachability/go/source/govulncheck.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525

2626
cpb "github.com/google/osv-scalibr/binary/proto/config_go_proto"
2727
"github.com/google/osv-scalibr/enricher"
28-
"github.com/google/osv-scalibr/enricher/govulncheck/source/internal"
28+
"github.com/google/osv-scalibr/enricher/reachability/go/source/internal"
2929
"github.com/google/osv-scalibr/extractor"
3030
"github.com/google/osv-scalibr/extractor/filesystem/language/golang/gomod"
3131
"github.com/google/osv-scalibr/inventory"

enricher/govulncheck/source/govulncheck_test.go renamed to enricher/reachability/go/source/govulncheck_test.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,17 @@ import (
3333
"testing"
3434

3535
"github.com/google/go-cmp/cmp"
36-
3736
cpb "github.com/google/osv-scalibr/binary/proto/config_go_proto"
38-
govcsource "github.com/google/osv-scalibr/enricher/govulncheck/source"
39-
vulnpb "github.com/ossf/osv-schema/bindings/go/osvschema"
40-
"google.golang.org/protobuf/encoding/protojson"
41-
4237
"github.com/google/osv-scalibr/enricher"
38+
govcsource "github.com/google/osv-scalibr/enricher/reachability/go/source"
4339
"github.com/google/osv-scalibr/extractor"
4440
"github.com/google/osv-scalibr/extractor/filesystem/language/golang/gomod"
4541
scalibrfs "github.com/google/osv-scalibr/fs"
4642
"github.com/google/osv-scalibr/inventory"
4743
"github.com/google/osv-scalibr/inventory/vex"
4844
"github.com/google/osv-scalibr/purl"
45+
vulnpb "github.com/ossf/osv-schema/bindings/go/osvschema"
46+
"google.golang.org/protobuf/encoding/protojson"
4947
)
5048

5149
const testProjPath = "./testdata/goproj"

enricher/govulncheck/source/gvcinterface.go renamed to enricher/reachability/go/source/gvcinterface.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package source
1717
import (
1818
"context"
1919

20-
"github.com/google/osv-scalibr/enricher/govulncheck/source/internal"
20+
"github.com/google/osv-scalibr/enricher/reachability/go/source/internal"
2121
vulnpb "github.com/ossf/osv-schema/bindings/go/osvschema"
2222
)
2323

enricher/govulncheck/source/gvcmock_test.go renamed to enricher/reachability/go/source/gvcmock_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"encoding/json"
2020
"os"
2121

22-
"github.com/google/osv-scalibr/enricher/govulncheck/source/internal"
22+
"github.com/google/osv-scalibr/enricher/reachability/go/source/internal"
2323
vulnpb "github.com/ossf/osv-schema/bindings/go/osvschema"
2424
)
2525

enricher/govulncheck/source/gvcreal.go renamed to enricher/reachability/go/source/gvcreal.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"os"
2222
"os/exec"
2323

24-
"github.com/google/osv-scalibr/enricher/govulncheck/source/internal"
25-
"github.com/google/osv-scalibr/enricher/govulncheck/source/internal/url"
24+
"github.com/google/osv-scalibr/enricher/reachability/go/source/internal"
25+
"github.com/google/osv-scalibr/enricher/reachability/go/source/internal/url"
2626
vulnpb "github.com/ossf/osv-schema/bindings/go/osvschema"
2727
"golang.org/x/vuln/scan"
2828
"google.golang.org/protobuf/encoding/protojson"

enricher/govulncheck/source/internal/result.go renamed to enricher/reachability/go/source/internal/result.go

File renamed without changes.

enricher/govulncheck/source/internal/url/url.go renamed to enricher/reachability/go/source/internal/url/url.go

File renamed without changes.

enricher/govulncheck/source/internal/url/url_other_test.go renamed to enricher/reachability/go/source/internal/url/url_other_test.go

File renamed without changes.

enricher/govulncheck/source/internal/url/url_test.go renamed to enricher/reachability/go/source/internal/url/url_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ package url_test
2424
import (
2525
"testing"
2626

27-
"github.com/google/osv-scalibr/enricher/govulncheck/source/internal/url"
27+
"github.com/google/osv-scalibr/enricher/reachability/go/source/internal/url"
2828
)
2929

3030
// Code copied from https://github.com/golang/go/blob/7c2b69080a0b9e35174cc9c93497b6e7176f8275/src/cmd/go/internal/web/url_test.go

0 commit comments

Comments
 (0)