Skip to content

Commit a725381

Browse files
mtrzoscopybara-github
authored andcommitted
Clean up the sbom extractors after PluginConfig migration.
PiperOrigin-RevId: 859567590
1 parent 5a62348 commit a725381

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

extractor/filesystem/sbom/cdx/cdx.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,15 @@ import (
2323
"strings"
2424

2525
"github.com/CycloneDX/cyclonedx-go"
26-
cpb "github.com/google/osv-scalibr/binary/proto/config_go_proto"
2726
"github.com/google/osv-scalibr/extractor"
2827
"github.com/google/osv-scalibr/extractor/filesystem"
2928
cdxmeta "github.com/google/osv-scalibr/extractor/filesystem/sbom/cdx/metadata"
3029
"github.com/google/osv-scalibr/inventory"
3130
"github.com/google/osv-scalibr/log"
3231
"github.com/google/osv-scalibr/plugin"
3332
"github.com/google/osv-scalibr/purl"
33+
34+
cpb "github.com/google/osv-scalibr/binary/proto/config_go_proto"
3435
)
3536

3637
const (

extractor/filesystem/sbom/spdx/spdx.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
"path/filepath"
2323
"strings"
2424

25-
cpb "github.com/google/osv-scalibr/binary/proto/config_go_proto"
2625
"github.com/google/osv-scalibr/extractor"
2726
"github.com/google/osv-scalibr/extractor/filesystem"
2827
spdxmeta "github.com/google/osv-scalibr/extractor/filesystem/sbom/spdx/metadata"
@@ -35,6 +34,8 @@ import (
3534
"github.com/spdx/tools-golang/spdx"
3635
"github.com/spdx/tools-golang/tagvalue"
3736
"github.com/spdx/tools-golang/yaml"
37+
38+
cpb "github.com/google/osv-scalibr/binary/proto/config_go_proto"
3839
)
3940

4041
const (

0 commit comments

Comments
 (0)