Mirrors/grype
2
0
Fork 0
mirror of https://github.com/anchore/grype synced 2024-11-10 06:34:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add additional DB archive decompressors (#657)

Browse source
This commit is contained in:
Alex Goodman 2022-03-07 11:44:43 -05:00 committed by GitHub
parent fc8e13f5b8
commit 1368ea05cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
go.mod
View file

@ -28,6 +28,7 @@ require (
github.com/jinzhu/gorm v1.9.14
github.com/knqyf263/go-apk-version v0.0.0-20200609155635-041fdbb8563f
github.com/knqyf263/go-deb-version v0.0.0-20190517075300-09fca494f03d
github.com/mholt/archiver/v3 v3.5.1
github.com/mitchellh/go-homedir v1.1.0
github.com/mitchellh/hashstructure/v2 v2.0.2
github.com/olekukonko/tablewriter v0.0.5
@ -102,7 +103,6 @@ require (
github.com/mattn/go-runewidth v0.0.13 // indirect
github.com/mattn/go-sqlite3 v1.14.0 // indirect
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
github.com/mholt/archiver/v3 v3.5.1 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
github.com/mitchellh/mapstructure v1.4.3 // indirect

14
grype/db/curator.go
View file

@ -10,6 +10,7 @@ import (
"strconv"
"github.com/hashicorp/go-cleanhttp"
"github.com/mholt/archiver/v3"
"github.com/spf13/afero"
"github.com/wagoodman/go-partybus"
"github.com/wagoodman/go-progress"
@ -224,18 +225,7 @@ func (c *Curator) ImportFrom(dbArchivePath string) error {
return fmt.Errorf("unable to create db temp dir: %w", err)
}
f, err := os.Open(dbArchivePath)
if err != nil {
return fmt.Errorf("unable to open archive (%s): %w", dbArchivePath, err)
}
defer func() {
err = f.Close()
if err != nil {
log.Errorf("unable to close archive (%s): %w", dbArchivePath, err)
}
}()
err = file.UnTarGz(tempDir, f)
err = archiver.DecompressFile(dbArchivePath, tempDir)
if err != nil {
return err
}

14
internal/file/getter.go
View file

@ -13,12 +13,7 @@ import (
)
var (
archiveExtensions = []string{
".tar",
".tar.gz",
".tgz",
".zip",
}
archiveExtensions = getterDecompressorNames()
ErrNonArchiveSource = fmt.Errorf("non-archive sources are not supported for directory destinations")
)
@ -140,3 +135,10 @@ func (a *progressAdapter) TrackProgress(_ string, currentSize, totalSize int64,
Reader: *progress.NewProxyReader(stream, a.monitor),
}
}
func getterDecompressorNames() (names []string) {
for name := range getter.Decompressors {
names = append(names, name)
}
return names
}