rename to syft

This commit is contained in:
Alex Goodman 2020-07-23 20:54:04 -04:00
parent 2132700198
commit a4016d35ce
No known key found for this signature in database
GPG key ID: 86E2870463D5E890
192 changed files with 241 additions and 239 deletions

View file

@ -85,16 +85,16 @@ jobs:
- restore_cache:
keys:
- unit-test-java-cache-{{ checksum "imgbom/cataloger/java/test-fixtures/java-builds/packages.fingerprint" }}
- unit-test-java-cache-{{ checksum "syft/cataloger/java/test-fixtures/java-builds/packages.fingerprint" }}
- run:
name: run unit tests
command: make unit
- save_cache:
key: unit-test-java-cache-{{ checksum "imgbom/cataloger/java/test-fixtures/java-builds/packages.fingerprint" }}
key: unit-test-java-cache-{{ checksum "syft/cataloger/java/test-fixtures/java-builds/packages.fingerprint" }}
paths:
- "imgbom/cataloger/java/test-fixtures/java-builds/packages"
- "syft/cataloger/java/test-fixtures/java-builds/packages"
- run:
name: build hash key for integration test-fixtures blobs

View file

@ -1,5 +1,5 @@
builds:
- binary: imgbom
- binary: syft
env:
- CGO_ENABLED=0
goos:
@ -15,15 +15,15 @@ builds:
-w
-s
-extldflags '-static'
-X github.com/anchore/imgbom/internal/version.version={{.Version}}
-X github.com/anchore/imgbom/internal/version.gitCommit={{.Commit}}
-X github.com/anchore/imgbom/internal/version.buildDate={{.Date}}
-X github.com/anchore/imgbom/internal/version.gitTreeState={{.Env.BUILD_GIT_TREE_STATE}}
-X github.com/anchore/syft/internal/version.version={{.Version}}
-X github.com/anchore/syft/internal/version.gitCommit={{.Commit}}
-X github.com/anchore/syft/internal/version.buildDate={{.Date}}
-X github.com/anchore/syft/internal/version.gitTreeState={{.Env.BUILD_GIT_TREE_STATE}}
nfpms:
- license: "Apache 2.0"
maintainer: "Anchore, Inc"
homepage: &website "https://github.com/anchore/imgbom"
homepage: &website "https://github.com/anchore/syft"
description: &description "A tool that generates a Software Bill Of Materials (SBOM) from container images and filesystems"
formats:
- rpm
@ -32,7 +32,7 @@ nfpms:
brews:
- tap:
owner: anchore
name: homebrew-imgbom
name: homebrew-syft
homepage: *website
description: *description

View file

@ -1,4 +1,4 @@
BIN = imgbom
BIN = syft
TEMPDIR = ./.tmp
RESULTSDIR = $(TEMPDIR)/results
COVER_REPORT = $(RESULTSDIR)/cover.report
@ -129,7 +129,7 @@ test/integration/test-fixtures/tar-cache.key, integration-fingerprint:
.PHONY: java-packages-fingerprint
java-packages-fingerprint:
@cd imgbom/cataloger/java/test-fixtures/java-builds && \
@cd syft/cataloger/java/test-fixtures/java-builds && \
make packages.fingerprint
.PHONY: clear-test-cache

View file

@ -1 +1,3 @@
# imgbom (TBD Name)
# syft
A CLI tool and go library for generating a Software Bill of Materials from container images and filesystems.

View file

@ -6,15 +6,15 @@ import (
"github.com/spf13/cobra"
"github.com/anchore/imgbom/imgbom/presenter"
"github.com/anchore/imgbom/imgbom/scope"
"github.com/anchore/syft/syft/presenter"
"github.com/anchore/syft/syft/scope"
"github.com/anchore/imgbom/imgbom"
"github.com/anchore/imgbom/internal/config"
"github.com/anchore/imgbom/internal/format"
"github.com/anchore/imgbom/internal/log"
"github.com/anchore/imgbom/internal/logger"
"github.com/anchore/stereoscope"
"github.com/anchore/syft/internal/config"
"github.com/anchore/syft/internal/format"
"github.com/anchore/syft/internal/log"
"github.com/anchore/syft/internal/logger"
"github.com/anchore/syft/syft"
"github.com/spf13/viper"
"github.com/wagoodman/go-partybus"
"gopkg.in/yaml.v2"
@ -99,7 +99,7 @@ func initLogging() {
}
logWrapper := logger.NewZapLogger(config)
imgbom.SetLogger(logWrapper)
syft.SetLogger(logWrapper)
stereoscope.SetLogger(logWrapper)
}
@ -118,5 +118,5 @@ func initEventBus() {
eventSubscription = eventBus.Subscribe()
stereoscope.SetBus(eventBus)
imgbom.SetBus(eventBus)
syft.SetBus(eventBus)
}

View file

@ -4,14 +4,14 @@ import (
"fmt"
"os"
"github.com/anchore/imgbom/imgbom"
"github.com/anchore/imgbom/imgbom/event"
"github.com/anchore/imgbom/imgbom/presenter"
"github.com/anchore/imgbom/internal"
"github.com/anchore/imgbom/internal/bus"
"github.com/anchore/imgbom/internal/log"
"github.com/anchore/imgbom/internal/ui"
"github.com/anchore/imgbom/internal/version"
"github.com/anchore/syft/internal"
"github.com/anchore/syft/internal/bus"
"github.com/anchore/syft/internal/log"
"github.com/anchore/syft/internal/ui"
"github.com/anchore/syft/internal/version"
"github.com/anchore/syft/syft"
"github.com/anchore/syft/syft/event"
"github.com/anchore/syft/syft/presenter"
"github.com/spf13/cobra"
"github.com/wagoodman/go-partybus"
)
@ -58,7 +58,7 @@ func startWorker(userInput string) <-chan error {
}
}
catalog, scope, _, err := imgbom.Catalog(userInput, appConfig.ScopeOpt)
catalog, scope, _, err := syft.Catalog(userInput, appConfig.ScopeOpt)
if err != nil {
errs <- fmt.Errorf("failed to catalog input: %+v", err)
return

View file

@ -3,8 +3,8 @@ package cmd
import (
"fmt"
"github.com/anchore/imgbom/internal"
"github.com/anchore/imgbom/internal/version"
"github.com/anchore/syft/internal"
"github.com/anchore/syft/internal/version"
"github.com/spf13/cobra"
)

2
go.mod
View file

@ -1,4 +1,4 @@
module github.com/anchore/imgbom
module github.com/anchore/syft
go 1.14

View file

@ -6,9 +6,9 @@ import (
"strings"
"github.com/adrg/xdg"
"github.com/anchore/imgbom/imgbom/presenter"
"github.com/anchore/imgbom/imgbom/scope"
"github.com/anchore/imgbom/internal"
"github.com/anchore/syft/internal"
"github.com/anchore/syft/syft/presenter"
"github.com/anchore/syft/syft/scope"
"github.com/mitchellh/go-homedir"
"github.com/spf13/viper"
"go.uber.org/zap/zapcore"

View file

@ -1,4 +1,4 @@
package internal
// note: must be a single word, all lowercase
const ApplicationName = "imgbom"
const ApplicationName = "syft"

View file

@ -6,9 +6,9 @@ import (
"os"
"sort"
"github.com/anchore/imgbom/internal"
"github.com/anchore/syft/internal"
"github.com/anchore/imgbom/internal/log"
"github.com/anchore/syft/internal/log"
)
type ZipFileManifest map[string]os.FileInfo

View file

@ -11,7 +11,7 @@ import (
"path/filepath"
"strings"
"github.com/anchore/imgbom/internal/log"
"github.com/anchore/syft/internal/log"
)
const (

View file

@ -67,7 +67,7 @@ func equal(r1, r2 io.Reader) (bool, error) {
}
func TestUnzipToDir(t *testing.T) {
archivePrefix, err := ioutil.TempFile("", "imgbom-ziputil-archive-TEST-")
archivePrefix, err := ioutil.TempFile("", "syft-ziputil-archive-TEST-")
if err != nil {
t.Fatalf("unable to create tempfile: %+v", err)
}
@ -79,7 +79,7 @@ func TestUnzipToDir(t *testing.T) {
generateFixture(t, archivePrefix.Name())
contentsDir, err := ioutil.TempDir("", "imgbom-ziputil-contents-TEST-")
contentsDir, err := ioutil.TempDir("", "syft-ziputil-contents-TEST-")
if err != nil {
t.Fatalf("unable to create tempdir: %+v", err)
}
@ -162,7 +162,7 @@ func TestUnzipToDir(t *testing.T) {
}
func TestExtractFilesFromZipFile(t *testing.T) {
archivePrefix, err := ioutil.TempFile("", "imgbom-ziputil-archive-TEST-")
archivePrefix, err := ioutil.TempFile("", "syft-ziputil-archive-TEST-")
if err != nil {
t.Fatalf("unable to create tempfile: %+v", err)
}
@ -211,7 +211,7 @@ func TestExtractFilesFromZipFile(t *testing.T) {
}
func TestZipFileManifest(t *testing.T) {
archivePrefix, err := ioutil.TempFile("", "imgbom-ziputil-archive-TEST-")
archivePrefix, err := ioutil.TempFile("", "syft-ziputil-archive-TEST-")
if err != nil {
t.Fatalf("unable to create tempfile: %+v", err)
}

View file

@ -1,6 +1,6 @@
package log
import "github.com/anchore/imgbom/imgbom/logger"
import "github.com/anchore/syft/syft/logger"
var Log logger.Logger = &nopLogger{}

View file

@ -3,7 +3,7 @@ package logger
import (
"os"
"github.com/anchore/imgbom/internal/format"
"github.com/anchore/syft/internal/format"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
)

View file

@ -4,13 +4,13 @@ import (
"fmt"
"os"
imgbomEventParsers "github.com/anchore/imgbom/imgbom/event/parsers"
syftEventParsers "github.com/anchore/syft/syft/event/parsers"
"github.com/wagoodman/go-partybus"
)
func CatalogerFinishedHandler(event partybus.Event) error {
// show the report to stdout
pres, err := imgbomEventParsers.ParseCatalogerFinished(event)
pres, err := syftEventParsers.ParseCatalogerFinished(event)
if err != nil {
return fmt.Errorf("bad CatalogerFinished event: %w", err)
}

View file

@ -6,10 +6,10 @@ import (
"os"
"sync"
imgbomEvent "github.com/anchore/imgbom/imgbom/event"
"github.com/anchore/imgbom/internal/log"
"github.com/anchore/imgbom/internal/ui/common"
stereoscopeEvent "github.com/anchore/stereoscope/pkg/event"
"github.com/anchore/syft/internal/log"
"github.com/anchore/syft/internal/ui/common"
syftEvent "github.com/anchore/syft/syft/event"
"github.com/wagoodman/go-partybus"
"github.com/wagoodman/jotframe/pkg/frame"
)
@ -68,7 +68,7 @@ eventLoop:
break eventLoop
}
switch e.Type {
case imgbomEvent.AppUpdateAvailable:
case syftEvent.AppUpdateAvailable:
err = appUpdateAvailableHandler(ctx, fr, e, wg)
if err != nil {
log.Errorf("unable to show AppUpdateAvailable event: %+v", err)
@ -86,12 +86,12 @@ eventLoop:
log.Errorf("unable to show FetchImage event: %+v", err)
}
case imgbomEvent.CatalogerStarted:
case syftEvent.CatalogerStarted:
err = catalogerStartedHandler(ctx, fr, e, wg)
if err != nil {
log.Errorf("unable to show CatalogerStarted event: %+v", err)
}
case imgbomEvent.CatalogerFinished:
case syftEvent.CatalogerFinished:
// we may have other background processes still displaying progress, wait for them to
// finish before discontinuing dynamic content and showing the final report
wg.Wait()

View file

@ -7,8 +7,8 @@ import (
"sync"
"time"
imgbomEventParsers "github.com/anchore/imgbom/imgbom/event/parsers"
stereoEventParsers "github.com/anchore/stereoscope/pkg/event/parsers"
syftEventParsers "github.com/anchore/syft/syft/event/parsers"
"github.com/gookit/color"
"github.com/wagoodman/go-partybus"
"github.com/wagoodman/go-progress"
@ -111,7 +111,7 @@ func imageReadHandler(ctx context.Context, fr *frame.Frame, event partybus.Event
}
func catalogerStartedHandler(ctx context.Context, fr *frame.Frame, event partybus.Event, wg *sync.WaitGroup) error {
monitor, err := imgbomEventParsers.ParseCatalogerStarted(event)
monitor, err := syftEventParsers.ParseCatalogerStarted(event)
if err != nil {
return fmt.Errorf("bad CatalogerStarted event: %w", err)
}
@ -145,7 +145,7 @@ func catalogerStartedHandler(ctx context.Context, fr *frame.Frame, event partybu
}
func appUpdateAvailableHandler(_ context.Context, fr *frame.Frame, event partybus.Event, _ *sync.WaitGroup) error {
newVersion, err := imgbomEventParsers.ParseAppUpdateAvailable(event)
newVersion, err := syftEventParsers.ParseAppUpdateAvailable(event)
if err != nil {
return fmt.Errorf("bad AppUpdateAvailable event: %w", err)
}

View file

@ -1,9 +1,9 @@
package ui
import (
imgbomEvent "github.com/anchore/imgbom/imgbom/event"
"github.com/anchore/imgbom/internal/log"
"github.com/anchore/imgbom/internal/ui/common"
"github.com/anchore/syft/internal/log"
"github.com/anchore/syft/internal/ui/common"
syftEvent "github.com/anchore/syft/syft/event"
"github.com/wagoodman/go-partybus"
)
@ -23,7 +23,7 @@ eventLoop:
}
// ignore all events except for the final event
if e.Type == imgbomEvent.CatalogerFinished {
if e.Type == syftEvent.CatalogerFinished {
err := common.CatalogerFinishedHandler(e)
if err != nil {
log.Errorf("unable to show catalog image finished event: %+v", err)

View file

@ -4,7 +4,7 @@ import (
"os"
"runtime"
"github.com/anchore/imgbom/internal/ui/etui"
"github.com/anchore/syft/internal/ui/etui"
"golang.org/x/crypto/ssh/terminal"
)

View file

@ -15,7 +15,7 @@ var latestAppVersionURL = struct {
}{
// TODO: set me to release host/path before release
host: "https://anchore.io",
path: "/imgbom/releases/latest/VERSION",
path: "/syft/releases/latest/VERSION",
}
func IsUpdateAvailable() (bool, string, error) {

View file

@ -1,7 +1,7 @@
package main
import (
"github.com/anchore/imgbom/cmd"
"github.com/anchore/syft/cmd"
)
func main() {

View file

@ -1,10 +1,10 @@
package apkdb
import (
"github.com/anchore/imgbom/imgbom/cataloger/common"
"github.com/anchore/imgbom/imgbom/pkg"
"github.com/anchore/imgbom/imgbom/scope"
"github.com/anchore/stereoscope/pkg/file"
"github.com/anchore/syft/syft/cataloger/common"
"github.com/anchore/syft/syft/pkg"
"github.com/anchore/syft/syft/scope"
)
type Cataloger struct {

View file

@ -9,7 +9,7 @@ import (
"github.com/mitchellh/mapstructure"
"github.com/anchore/imgbom/imgbom/pkg"
"github.com/anchore/syft/syft/pkg"
)
func parseApkDB(_ string, reader io.Reader) ([]pkg.Package, error) {

View file

@ -7,7 +7,7 @@ import (
"github.com/go-test/deep"
"github.com/anchore/imgbom/imgbom/pkg"
"github.com/anchore/syft/syft/pkg"
)
func TestSinglePackage(t *testing.T) {

View file

@ -1,10 +1,10 @@
package bundler
import (
"github.com/anchore/imgbom/imgbom/cataloger/common"
"github.com/anchore/imgbom/imgbom/pkg"
"github.com/anchore/imgbom/imgbom/scope"
"github.com/anchore/stereoscope/pkg/file"
"github.com/anchore/syft/syft/cataloger/common"
"github.com/anchore/syft/syft/pkg"
"github.com/anchore/syft/syft/scope"
)
type Cataloger struct {

View file

@ -5,8 +5,8 @@ import (
"io"
"strings"
"github.com/anchore/imgbom/imgbom/pkg"
"github.com/anchore/imgbom/internal"
"github.com/anchore/syft/internal"
"github.com/anchore/syft/syft/pkg"
)
var sectionsOfInterest = internal.NewStringSetFromSlice([]string{"GEM"})

View file

@ -4,7 +4,7 @@ import (
"os"
"testing"
"github.com/anchore/imgbom/imgbom/pkg"
"github.com/anchore/syft/syft/pkg"
)
var expected = map[string]string{

View file

@ -1,9 +1,9 @@
package cataloger
import (
"github.com/anchore/imgbom/imgbom/pkg"
"github.com/anchore/imgbom/imgbom/scope"
"github.com/anchore/stereoscope/pkg/file"
"github.com/anchore/syft/syft/pkg"
"github.com/anchore/syft/syft/scope"
)
type Cataloger interface {

View file

@ -3,10 +3,10 @@ package common
import (
"strings"
"github.com/anchore/imgbom/imgbom/pkg"
"github.com/anchore/imgbom/imgbom/scope"
"github.com/anchore/imgbom/internal/log"
"github.com/anchore/stereoscope/pkg/file"
"github.com/anchore/syft/internal/log"
"github.com/anchore/syft/syft/pkg"
"github.com/anchore/syft/syft/scope"
)
// GenericCataloger implements the Catalog interface and is responsible for dispatching the proper parser function for

View file

@ -6,9 +6,9 @@ import (
"io/ioutil"
"testing"
"github.com/anchore/imgbom/imgbom/pkg"
"github.com/anchore/imgbom/internal"
"github.com/anchore/stereoscope/pkg/file"
"github.com/anchore/syft/internal"
"github.com/anchore/syft/syft/pkg"
)
type testResolver struct {

View file

@ -3,7 +3,7 @@ package common
import (
"io"
"github.com/anchore/imgbom/imgbom/pkg"
"github.com/anchore/syft/syft/pkg"
)
// ParserFn standardizes a function signature for parser functions that accept the virtual file path (not usable for file reads) and contents and return any discovered packages from that file

View file

@ -1,20 +1,20 @@
package cataloger
import (
"github.com/anchore/imgbom/imgbom/cataloger/apkdb"
"github.com/anchore/imgbom/imgbom/cataloger/bundler"
"github.com/anchore/imgbom/imgbom/cataloger/dpkg"
golang "github.com/anchore/imgbom/imgbom/cataloger/golang"
"github.com/anchore/imgbom/imgbom/cataloger/java"
"github.com/anchore/imgbom/imgbom/cataloger/npm"
"github.com/anchore/imgbom/imgbom/cataloger/python"
"github.com/anchore/imgbom/imgbom/cataloger/rpmdb"
"github.com/anchore/imgbom/imgbom/event"
"github.com/anchore/imgbom/imgbom/pkg"
"github.com/anchore/imgbom/imgbom/scope"
"github.com/anchore/imgbom/internal/bus"
"github.com/anchore/imgbom/internal/log"
"github.com/anchore/stereoscope/pkg/file"
"github.com/anchore/syft/internal/bus"
"github.com/anchore/syft/internal/log"
"github.com/anchore/syft/syft/cataloger/apkdb"
"github.com/anchore/syft/syft/cataloger/bundler"
"github.com/anchore/syft/syft/cataloger/dpkg"
golang "github.com/anchore/syft/syft/cataloger/golang"
"github.com/anchore/syft/syft/cataloger/java"
"github.com/anchore/syft/syft/cataloger/npm"
"github.com/anchore/syft/syft/cataloger/python"
"github.com/anchore/syft/syft/cataloger/rpmdb"
"github.com/anchore/syft/syft/event"
"github.com/anchore/syft/syft/pkg"
"github.com/anchore/syft/syft/scope"
"github.com/hashicorp/go-multierror"
"github.com/wagoodman/go-partybus"
"github.com/wagoodman/go-progress"

View file

@ -1,10 +1,10 @@
package dpkg
import (
"github.com/anchore/imgbom/imgbom/cataloger/common"
"github.com/anchore/imgbom/imgbom/pkg"
"github.com/anchore/imgbom/imgbom/scope"
"github.com/anchore/stereoscope/pkg/file"
"github.com/anchore/syft/syft/cataloger/common"
"github.com/anchore/syft/syft/pkg"
"github.com/anchore/syft/syft/scope"
)
type Cataloger struct {

View file

@ -6,7 +6,7 @@ import (
"io"
"strings"
"github.com/anchore/imgbom/imgbom/pkg"
"github.com/anchore/syft/syft/pkg"
"github.com/mitchellh/mapstructure"
)

View file

@ -5,7 +5,7 @@ import (
"os"
"testing"
"github.com/anchore/imgbom/imgbom/pkg"
"github.com/anchore/syft/syft/pkg"
"github.com/go-test/deep"
)

View file

@ -1,10 +1,10 @@
package golang
import (
"github.com/anchore/imgbom/imgbom/cataloger/common"
"github.com/anchore/imgbom/imgbom/pkg"
"github.com/anchore/imgbom/imgbom/scope"
"github.com/anchore/stereoscope/pkg/file"
"github.com/anchore/syft/syft/cataloger/common"
"github.com/anchore/syft/syft/pkg"
"github.com/anchore/syft/syft/scope"
)
type Cataloger struct {

View file

@ -8,7 +8,7 @@ import (
"github.com/rogpeppe/go-internal/modfile"
"github.com/anchore/imgbom/imgbom/pkg"
"github.com/anchore/syft/syft/pkg"
)
func parseGoMod(path string, reader io.Reader) ([]pkg.Package, error) {

View file

@ -6,7 +6,7 @@ import (
"github.com/go-test/deep"
"github.com/anchore/imgbom/imgbom/pkg"
"github.com/anchore/syft/syft/pkg"
)
func TestParseGoMod(t *testing.T) {

View file

@ -1,5 +1,5 @@
module (
github.com/anchore/imgbom
github.com/anchore/syft
)
go 1.14

View file

@ -1,4 +1,4 @@
module github.com/anchore/imgbom
module github.com/anchore/syft
go 1.14

View file

@ -5,9 +5,9 @@ import (
"regexp"
"strings"
"github.com/anchore/imgbom/internal/log"
"github.com/anchore/syft/internal/log"
"github.com/anchore/imgbom/imgbom/pkg"
"github.com/anchore/syft/syft/pkg"
)
// match examples:

View file

@ -1,7 +1,7 @@
package java
import (
"github.com/anchore/imgbom/imgbom/pkg"
"github.com/anchore/syft/syft/pkg"
"github.com/sergi/go-diff/diffmatchpatch"
"testing"
)

View file

@ -5,9 +5,9 @@ import (
"io"
"strings"
"github.com/anchore/imgbom/imgbom/pkg"
"github.com/anchore/imgbom/internal"
"github.com/anchore/imgbom/internal/file"
"github.com/anchore/syft/internal"
"github.com/anchore/syft/internal/file"
"github.com/anchore/syft/syft/pkg"
)
var archiveFormatGlobs = []string{

View file

@ -11,9 +11,9 @@ import (
"syscall"
"testing"
"github.com/anchore/imgbom/internal"
"github.com/anchore/syft/internal"
"github.com/anchore/imgbom/imgbom/pkg"
"github.com/anchore/syft/syft/pkg"
"github.com/go-test/deep"
"github.com/gookit/color"
)

View file

@ -1,10 +1,10 @@
package java
import (
"github.com/anchore/imgbom/imgbom/cataloger/common"
"github.com/anchore/imgbom/imgbom/pkg"
"github.com/anchore/imgbom/imgbom/scope"
"github.com/anchore/stereoscope/pkg/file"
"github.com/anchore/syft/syft/cataloger/common"
"github.com/anchore/syft/syft/pkg"
"github.com/anchore/syft/syft/scope"
)
type Cataloger struct {

View file

@ -6,7 +6,7 @@ import (
"io"
"strings"
"github.com/anchore/imgbom/imgbom/pkg"
"github.com/anchore/syft/syft/pkg"
"github.com/mitchellh/mapstructure"
)

View file

@ -2,7 +2,7 @@ package java
import (
"encoding/json"
"github.com/anchore/imgbom/imgbom/pkg"
"github.com/anchore/syft/syft/pkg"
"github.com/go-test/deep"
"os"
"testing"

View file

@ -6,7 +6,7 @@ import (
"io"
"strings"
"github.com/anchore/imgbom/imgbom/pkg"
"github.com/anchore/syft/syft/pkg"
"github.com/mitchellh/mapstructure"
)

View file

@ -2,7 +2,7 @@ package java
import (
"encoding/json"
"github.com/anchore/imgbom/imgbom/pkg"
"github.com/anchore/syft/syft/pkg"
"github.com/go-test/deep"
"os"
"testing"

View file

@ -7,11 +7,11 @@ import (
"os"
"path/filepath"
"github.com/anchore/imgbom/internal/log"
"github.com/anchore/syft/internal/log"
)
func saveArchiveToTmp(reader io.Reader) (string, string, func(), error) {
tempDir, err := ioutil.TempDir("", "imgbom-jar-contents-")
tempDir, err := ioutil.TempDir("", "syft-jar-contents-")
if err != nil {
return "", "", func() {}, fmt.Errorf("unable to create tempdir for jar processing: %w", err)
}

View file

@ -1,10 +1,10 @@
package npm
import (
"github.com/anchore/imgbom/imgbom/cataloger/common"
"github.com/anchore/imgbom/imgbom/pkg"
"github.com/anchore/imgbom/imgbom/scope"
"github.com/anchore/stereoscope/pkg/file"
"github.com/anchore/syft/syft/cataloger/common"
"github.com/anchore/syft/syft/pkg"
"github.com/anchore/syft/syft/scope"
)
type Cataloger struct {

View file

@ -5,7 +5,7 @@ import (
"fmt"
"io"
"github.com/anchore/imgbom/imgbom/pkg"
"github.com/anchore/syft/syft/pkg"
)
type PackageLock struct {

View file

@ -4,7 +4,7 @@ import (
"os"
"testing"
"github.com/anchore/imgbom/imgbom/pkg"
"github.com/anchore/syft/syft/pkg"
)
func assertPkgsEqual(t *testing.T, actual []pkg.Package, expected map[string]pkg.Package) {

View file

@ -1,10 +1,10 @@
package python
import (
"github.com/anchore/imgbom/imgbom/cataloger/common"
"github.com/anchore/imgbom/imgbom/pkg"
"github.com/anchore/imgbom/imgbom/scope"
"github.com/anchore/stereoscope/pkg/file"
"github.com/anchore/syft/syft/cataloger/common"
"github.com/anchore/syft/syft/pkg"
"github.com/anchore/syft/syft/scope"
)
type Cataloger struct {

View file

@ -6,7 +6,7 @@ import (
"io"
"strings"
"github.com/anchore/imgbom/imgbom/pkg"
"github.com/anchore/syft/syft/pkg"
)
func parseRequirementsTxt(_ string, reader io.Reader) ([]pkg.Package, error) {

View file

@ -4,7 +4,7 @@ import (
"os"
"testing"
"github.com/anchore/imgbom/imgbom/pkg"
"github.com/anchore/syft/syft/pkg"
)
func TestParseRequirementsTxt(t *testing.T) {

View file

@ -6,7 +6,7 @@ import (
"io"
"strings"
"github.com/anchore/imgbom/imgbom/pkg"
"github.com/anchore/syft/syft/pkg"
)
func parseWheelMetadata(_ string, reader io.Reader) ([]pkg.Package, error) {

Some files were not shown because too many files have changed in this diff Show more