[wip] remove sqlite import

Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>
This commit is contained in:
Alex Goodman 2025-05-19 11:50:45 -04:00
parent b4ca04001c
commit e841b03219
7 changed files with 252 additions and 283 deletions

View File

@ -14,12 +14,9 @@ builds:
dir: ./cmd/syft dir: ./cmd/syft
binary: syft binary: syft
goos: goos:
- linux - windows
goarch: goarch:
- amd64 - amd64
- arm64
- ppc64le
- s390x
# set the modified timestamp on the output binary to the git timestamp to ensure a reproducible build # set the modified timestamp on the output binary to the git timestamp to ensure a reproducible build
mod_timestamp: &build-timestamp '{{ .CommitTimestamp }}' mod_timestamp: &build-timestamp '{{ .CommitTimestamp }}'
ldflags: &build-ldflags | ldflags: &build-ldflags |
@ -31,246 +28,246 @@ builds:
-X main.buildDate={{.Date}} -X main.buildDate={{.Date}}
-X main.gitDescription={{.Summary}} -X main.gitDescription={{.Summary}}
- id: darwin-build # - id: darwin-build
dir: ./cmd/syft # dir: ./cmd/syft
binary: syft # binary: syft
goos: # goos:
- darwin # - darwin
goarch: # goarch:
- amd64 # - amd64
- arm64 # - arm64
mod_timestamp: *build-timestamp # mod_timestamp: *build-timestamp
ldflags: *build-ldflags # ldflags: *build-ldflags
hooks: # hooks:
post: # post:
- cmd: .tool/quill sign-and-notarize "{{ .Path }}" --dry-run={{ .IsSnapshot }} --ad-hoc={{ .IsSnapshot }} -vv # - cmd: .tool/quill sign-and-notarize "{{ .Path }}" --dry-run={{ .IsSnapshot }} --ad-hoc={{ .IsSnapshot }} -vv
env: # env:
- QUILL_LOG_FILE=/tmp/quill-{{ .Target }}.log # - QUILL_LOG_FILE=/tmp/quill-{{ .Target }}.log
#
# - id: windows-build
# dir: ./cmd/syft
# binary: syft
# goos:
# - windows
# goarch:
# - amd64
# mod_timestamp: *build-timestamp
# ldflags: *build-ldflags
- id: windows-build #archives:
dir: ./cmd/syft # - id: linux-archives
binary: syft # builds:
goos: # - linux-build
- windows #
goarch: # # note: the signing process is depending on tar.gz archives. If this format changes then .github/scripts/apple-signing/*.sh will need to be adjusted
- amd64 # - id: darwin-archives
mod_timestamp: *build-timestamp # builds:
ldflags: *build-ldflags # - darwin-build
#
archives: # - id: windows-archives
- id: linux-archives # format: zip
builds: # builds:
- linux-build # - windows-build
#
# note: the signing process is depending on tar.gz archives. If this format changes then .github/scripts/apple-signing/*.sh will need to be adjusted #nfpms:
- id: darwin-archives # - license: "Apache 2.0"
builds: # maintainer: "Anchore, Inc"
- darwin-build # homepage: &website "https://github.com/anchore/syft"
# description: &description "A tool that generates a Software Bill Of Materials (SBOM) from container images and filesystems"
- id: windows-archives # formats:
format: zip # - rpm
builds: # - deb
- windows-build #
#brews:
nfpms: # - repository:
- license: "Apache 2.0" # owner: anchore
maintainer: "Anchore, Inc" # name: homebrew-syft
homepage: &website "https://github.com/anchore/syft" # token: "{{.Env.GITHUB_BREW_TOKEN}}"
description: &description "A tool that generates a Software Bill Of Materials (SBOM) from container images and filesystems" # ids:
formats: # - darwin-archives
- rpm # - linux-archives
- deb # homepage: *website
# description: *description
brews: # license: "Apache License 2.0"
- repository: #
owner: anchore #dockers:
name: homebrew-syft # - image_templates:
token: "{{.Env.GITHUB_BREW_TOKEN}}" # - anchore/syft:debug
ids: # - anchore/syft:{{.Tag}}-debug
- darwin-archives # - ghcr.io/anchore/syft:debug
- linux-archives # - ghcr.io/anchore/syft:{{.Tag}}-debug
homepage: *website # goarch: amd64
description: *description # dockerfile: Dockerfile.debug
license: "Apache License 2.0" # use: buildx
# build_flag_templates:
dockers: # - "--platform=linux/amd64"
- image_templates: # - "--build-arg=BUILD_DATE={{.Date}}"
- anchore/syft:debug # - "--build-arg=BUILD_VERSION={{.Version}}"
- anchore/syft:{{.Tag}}-debug # - "--build-arg=VCS_REF={{.FullCommit}}"
- ghcr.io/anchore/syft:debug # - "--build-arg=VCS_URL={{.GitURL}}"
- ghcr.io/anchore/syft:{{.Tag}}-debug #
goarch: amd64 # - image_templates:
dockerfile: Dockerfile.debug # - anchore/syft:debug-arm64v8
use: buildx # - anchore/syft:{{.Tag}}-debug-arm64v8
build_flag_templates: # - ghcr.io/anchore/syft:debug-arm64v8
- "--platform=linux/amd64" # - ghcr.io/anchore/syft:{{.Tag}}-debug-arm64v8
- "--build-arg=BUILD_DATE={{.Date}}" # goarch: arm64
- "--build-arg=BUILD_VERSION={{.Version}}" # dockerfile: Dockerfile.debug
- "--build-arg=VCS_REF={{.FullCommit}}" # use: buildx
- "--build-arg=VCS_URL={{.GitURL}}" # build_flag_templates:
# - "--platform=linux/arm64/v8"
- image_templates: # - "--build-arg=BUILD_DATE={{.Date}}"
- anchore/syft:debug-arm64v8 # - "--build-arg=BUILD_VERSION={{.Version}}"
- anchore/syft:{{.Tag}}-debug-arm64v8 # - "--build-arg=VCS_REF={{.FullCommit}}"
- ghcr.io/anchore/syft:debug-arm64v8 # - "--build-arg=VCS_URL={{.GitURL}}"
- ghcr.io/anchore/syft:{{.Tag}}-debug-arm64v8 #
goarch: arm64 # - image_templates:
dockerfile: Dockerfile.debug # - anchore/syft:debug-ppc64le
use: buildx # - anchore/syft:{{.Tag}}-debug-ppc64le
build_flag_templates: # - ghcr.io/anchore/syft:debug-ppc64le
- "--platform=linux/arm64/v8" # - ghcr.io/anchore/syft:{{.Tag}}-debug-ppc64le
- "--build-arg=BUILD_DATE={{.Date}}" # goarch: ppc64le
- "--build-arg=BUILD_VERSION={{.Version}}" # dockerfile: Dockerfile.debug
- "--build-arg=VCS_REF={{.FullCommit}}" # use: buildx
- "--build-arg=VCS_URL={{.GitURL}}" # build_flag_templates:
# - "--platform=linux/ppc64le"
- image_templates: # - "--build-arg=BUILD_DATE={{.Date}}"
- anchore/syft:debug-ppc64le # - "--build-arg=BUILD_VERSION={{.Version}}"
- anchore/syft:{{.Tag}}-debug-ppc64le # - "--build-arg=VCS_REF={{.FullCommit}}"
- ghcr.io/anchore/syft:debug-ppc64le # - "--build-arg=VCS_URL={{.GitURL}}"
- ghcr.io/anchore/syft:{{.Tag}}-debug-ppc64le #
goarch: ppc64le # - image_templates:
dockerfile: Dockerfile.debug # - anchore/syft:debug-s390x
use: buildx # - anchore/syft:{{.Tag}}-debug-s390x
build_flag_templates: # - ghcr.io/anchore/syft:debug-s390x
- "--platform=linux/ppc64le" # - ghcr.io/anchore/syft:{{.Tag}}-debug-s390x
- "--build-arg=BUILD_DATE={{.Date}}" # goarch: s390x
- "--build-arg=BUILD_VERSION={{.Version}}" # dockerfile: Dockerfile.debug
- "--build-arg=VCS_REF={{.FullCommit}}" # use: buildx
- "--build-arg=VCS_URL={{.GitURL}}" # build_flag_templates:
# - "--platform=linux/s390x"
- image_templates: # - "--build-arg=BUILD_DATE={{.Date}}"
- anchore/syft:debug-s390x # - "--build-arg=BUILD_VERSION={{.Version}}"
- anchore/syft:{{.Tag}}-debug-s390x # - "--build-arg=VCS_REF={{.FullCommit}}"
- ghcr.io/anchore/syft:debug-s390x # - "--build-arg=VCS_URL={{.GitURL}}"
- ghcr.io/anchore/syft:{{.Tag}}-debug-s390x #
goarch: s390x # - image_templates:
dockerfile: Dockerfile.debug # - anchore/syft:latest
use: buildx # - anchore/syft:{{.Tag}}
build_flag_templates: # - ghcr.io/anchore/syft:latest
- "--platform=linux/s390x" # - ghcr.io/anchore/syft:{{.Tag}}
- "--build-arg=BUILD_DATE={{.Date}}" # goarch: amd64
- "--build-arg=BUILD_VERSION={{.Version}}" # dockerfile: Dockerfile
- "--build-arg=VCS_REF={{.FullCommit}}" # use: buildx
- "--build-arg=VCS_URL={{.GitURL}}" # build_flag_templates:
# - "--platform=linux/amd64"
- image_templates: # - "--build-arg=BUILD_DATE={{.Date}}"
- anchore/syft:latest # - "--build-arg=BUILD_VERSION={{.Version}}"
- anchore/syft:{{.Tag}} # - "--build-arg=VCS_REF={{.FullCommit}}"
- ghcr.io/anchore/syft:latest # - "--build-arg=VCS_URL={{.GitURL}}"
- ghcr.io/anchore/syft:{{.Tag}} #
goarch: amd64 # - image_templates:
dockerfile: Dockerfile # - anchore/syft:{{.Tag}}-arm64v8
use: buildx # - ghcr.io/anchore/syft:{{.Tag}}-arm64v8
build_flag_templates: # goarch: arm64
- "--platform=linux/amd64" # dockerfile: Dockerfile
- "--build-arg=BUILD_DATE={{.Date}}" # use: buildx
- "--build-arg=BUILD_VERSION={{.Version}}" # build_flag_templates:
- "--build-arg=VCS_REF={{.FullCommit}}" # - "--platform=linux/arm64/v8"
- "--build-arg=VCS_URL={{.GitURL}}" # - "--build-arg=BUILD_DATE={{.Date}}"
# - "--build-arg=BUILD_VERSION={{.Version}}"
- image_templates: # - "--build-arg=VCS_REF={{.FullCommit}}"
- anchore/syft:{{.Tag}}-arm64v8 # - "--build-arg=VCS_URL={{.GitURL}}"
- ghcr.io/anchore/syft:{{.Tag}}-arm64v8 #
goarch: arm64 # - image_templates:
dockerfile: Dockerfile # - anchore/syft:{{.Tag}}-ppc64le
use: buildx # - ghcr.io/anchore/syft:{{.Tag}}-ppc64le
build_flag_templates: # goarch: ppc64le
- "--platform=linux/arm64/v8" # dockerfile: Dockerfile
- "--build-arg=BUILD_DATE={{.Date}}" # use: buildx
- "--build-arg=BUILD_VERSION={{.Version}}" # build_flag_templates:
- "--build-arg=VCS_REF={{.FullCommit}}" # - "--platform=linux/ppc64le"
- "--build-arg=VCS_URL={{.GitURL}}" # - "--build-arg=BUILD_DATE={{.Date}}"
# - "--build-arg=BUILD_VERSION={{.Version}}"
- image_templates: # - "--build-arg=VCS_REF={{.FullCommit}}"
- anchore/syft:{{.Tag}}-ppc64le # - "--build-arg=VCS_URL={{.GitURL}}"
- ghcr.io/anchore/syft:{{.Tag}}-ppc64le #
goarch: ppc64le # - image_templates:
dockerfile: Dockerfile # - anchore/syft:{{.Tag}}-s390x
use: buildx # - ghcr.io/anchore/syft:{{.Tag}}-s390x
build_flag_templates: # goarch: s390x
- "--platform=linux/ppc64le" # dockerfile: Dockerfile
- "--build-arg=BUILD_DATE={{.Date}}" # use: buildx
- "--build-arg=BUILD_VERSION={{.Version}}" # build_flag_templates:
- "--build-arg=VCS_REF={{.FullCommit}}" # - "--platform=linux/s390x"
- "--build-arg=VCS_URL={{.GitURL}}" # - "--build-arg=BUILD_DATE={{.Date}}"
# - "--build-arg=BUILD_VERSION={{.Version}}"
- image_templates: # - "--build-arg=VCS_REF={{.FullCommit}}"
- anchore/syft:{{.Tag}}-s390x # - "--build-arg=VCS_URL={{.GitURL}}"
- ghcr.io/anchore/syft:{{.Tag}}-s390x #
goarch: s390x #docker_manifests:
dockerfile: Dockerfile # - name_template: anchore/syft:latest
use: buildx # image_templates:
build_flag_templates: # - anchore/syft:{{.Tag}}
- "--platform=linux/s390x" # - anchore/syft:{{.Tag}}-arm64v8
- "--build-arg=BUILD_DATE={{.Date}}" # - anchore/syft:{{.Tag}}-ppc64le
- "--build-arg=BUILD_VERSION={{.Version}}" # - anchore/syft:{{.Tag}}-s390x
- "--build-arg=VCS_REF={{.FullCommit}}" #
- "--build-arg=VCS_URL={{.GitURL}}" # - name_template: anchore/syft:debug
# - anchore/syft:{{.Tag}}-debug
docker_manifests: # - anchore/syft:{{.Tag}}-debug-arm64v8
- name_template: anchore/syft:latest # - anchore/syft:{{.Tag}}-debug-ppc64le
image_templates: # - anchore/syft:{{.Tag}}-debug-s390x
- anchore/syft:{{.Tag}} #
- anchore/syft:{{.Tag}}-arm64v8 # - name_template: anchore/syft:{{.Tag}}
- anchore/syft:{{.Tag}}-ppc64le # image_templates:
- anchore/syft:{{.Tag}}-s390x # - anchore/syft:{{.Tag}}
# - anchore/syft:{{.Tag}}-arm64v8
- name_template: anchore/syft:debug # - anchore/syft:{{.Tag}}-ppc64le
- anchore/syft:{{.Tag}}-debug # - anchore/syft:{{.Tag}}-s390x
- anchore/syft:{{.Tag}}-debug-arm64v8 #
- anchore/syft:{{.Tag}}-debug-ppc64le # - name_template: ghcr.io/anchore/syft:latest
- anchore/syft:{{.Tag}}-debug-s390x # image_templates:
# - ghcr.io/anchore/syft:{{.Tag}}
- name_template: anchore/syft:{{.Tag}} # - ghcr.io/anchore/syft:{{.Tag}}-arm64v8
image_templates: # - ghcr.io/anchore/syft:{{.Tag}}-ppc64le
- anchore/syft:{{.Tag}} # - ghcr.io/anchore/syft:{{.Tag}}-s390x
- anchore/syft:{{.Tag}}-arm64v8 #
- anchore/syft:{{.Tag}}-ppc64le # - name_template: ghcr.io/anchore/syft:debug
- anchore/syft:{{.Tag}}-s390x # image_templates:
# - ghcr.io/anchore/syft:{{.Tag}}-debug
- name_template: ghcr.io/anchore/syft:latest # - ghcr.io/anchore/syft:{{.Tag}}-debug-arm64v8
image_templates: # - ghcr.io/anchore/syft:{{.Tag}}-debug-ppc64le
- ghcr.io/anchore/syft:{{.Tag}} # - ghcr.io/anchore/syft:{{.Tag}}-debug-s390x
- ghcr.io/anchore/syft:{{.Tag}}-arm64v8 #
- ghcr.io/anchore/syft:{{.Tag}}-ppc64le # - name_template: ghcr.io/anchore/syft:{{.Tag}}
- ghcr.io/anchore/syft:{{.Tag}}-s390x # image_templates:
# - ghcr.io/anchore/syft:{{.Tag}}
- name_template: ghcr.io/anchore/syft:debug # - ghcr.io/anchore/syft:{{.Tag}}-arm64v8
image_templates: # - ghcr.io/anchore/syft:{{.Tag}}-ppc64le
- ghcr.io/anchore/syft:{{.Tag}}-debug # - ghcr.io/anchore/syft:{{.Tag}}-s390x
- ghcr.io/anchore/syft:{{.Tag}}-debug-arm64v8 #
- ghcr.io/anchore/syft:{{.Tag}}-debug-ppc64le #sboms:
- ghcr.io/anchore/syft:{{.Tag}}-debug-s390x # - artifacts: archive
# # this is relative to the snapshot/dist directory, not the root of the repo
- name_template: ghcr.io/anchore/syft:{{.Tag}} # cmd: ../.tool/syft
image_templates: # documents:
- ghcr.io/anchore/syft:{{.Tag}} # - "{{ .Binary }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}.sbom"
- ghcr.io/anchore/syft:{{.Tag}}-arm64v8 # args:
- ghcr.io/anchore/syft:{{.Tag}}-ppc64le # - "scan"
- ghcr.io/anchore/syft:{{.Tag}}-s390x # - "$artifact"
# - "--output"
sboms: # - "json=$document"
- artifacts: archive #
# this is relative to the snapshot/dist directory, not the root of the repo #signs:
cmd: ../.tool/syft # - cmd: .tool/cosign
documents: # signature: "${artifact}.sig"
- "{{ .Binary }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}.sbom" # certificate: "${artifact}.pem"
args: # args:
- "scan" # - "sign-blob"
- "$artifact" # - "--oidc-issuer=https://token.actions.githubusercontent.com"
- "--output" # - "--output-certificate=${certificate}"
- "json=$document" # - "--output-signature=${signature}"
# - "${artifact}"
signs: # - "--yes"
- cmd: .tool/cosign # artifacts: checksum
signature: "${artifact}.sig"
certificate: "${artifact}.pem"
args:
- "sign-blob"
- "--oidc-issuer=https://token.actions.githubusercontent.com"
- "--output-certificate=${certificate}"
- "--output-signature=${signature}"
- "${artifact}"
- "--yes"
artifacts: checksum

View File

@ -3,8 +3,6 @@ package integration
import ( import (
"testing" "testing"
_ "modernc.org/sqlite"
"github.com/anchore/syft/syft/pkg" "github.com/anchore/syft/syft/pkg"
"github.com/anchore/syft/syft/source" "github.com/anchore/syft/syft/source"
) )

View File

@ -1,8 +1,6 @@
package main package main
import ( import (
_ "modernc.org/sqlite"
"github.com/anchore/clio" "github.com/anchore/clio"
"github.com/anchore/syft/cmd/syft/cli" "github.com/anchore/syft/cmd/syft/cli"
"github.com/anchore/syft/cmd/syft/internal" "github.com/anchore/syft/cmd/syft/internal"

6
go.mod
View File

@ -89,7 +89,7 @@ require (
golang.org/x/mod v0.24.0 golang.org/x/mod v0.24.0
golang.org/x/net v0.40.0 golang.org/x/net v0.40.0
gopkg.in/yaml.v3 v3.0.1 gopkg.in/yaml.v3 v3.0.1
modernc.org/sqlite v1.37.0 modernc.org/sqlite v1.37.0 // indirect
) )
require ( require (
@ -191,7 +191,6 @@ require (
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
github.com/muesli/cancelreader v0.2.2 // indirect github.com/muesli/cancelreader v0.2.2 // indirect
github.com/muesli/termenv v0.16.0 // indirect github.com/muesli/termenv v0.16.0 // indirect
github.com/ncruces/go-strftime v0.1.9 // indirect
github.com/nwaples/rardecode v1.1.3 // indirect github.com/nwaples/rardecode v1.1.3 // indirect
github.com/nwaples/rardecode/v2 v2.1.0 // indirect github.com/nwaples/rardecode/v2 v2.1.0 // indirect
github.com/opencontainers/image-spec v1.1.1 // indirect github.com/opencontainers/image-spec v1.1.1 // indirect
@ -204,7 +203,6 @@ require (
github.com/pkg/errors v0.9.1 // indirect github.com/pkg/errors v0.9.1 // indirect
github.com/pkg/profile v1.7.0 // indirect github.com/pkg/profile v1.7.0 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
github.com/rivo/uniseg v0.4.7 // indirect github.com/rivo/uniseg v0.4.7 // indirect
github.com/rogpeppe/go-internal v1.14.1 // indirect github.com/rogpeppe/go-internal v1.14.1 // indirect
github.com/sagikazarmark/locafero v0.7.0 // indirect github.com/sagikazarmark/locafero v0.7.0 // indirect
@ -255,8 +253,6 @@ require (
google.golang.org/protobuf v1.36.4 // indirect google.golang.org/protobuf v1.36.4 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect
modernc.org/libc v1.62.1 // indirect modernc.org/libc v1.62.1 // indirect
modernc.org/mathutil v1.7.1 // indirect
modernc.org/memory v1.9.1 // indirect
) )
retract ( retract (

16
go.sum
View File

@ -1390,30 +1390,14 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
modernc.org/cc/v4 v4.25.2 h1:T2oH7sZdGvTaie0BRNFbIYsabzCxUQg8nLqCdQ2i0ic=
modernc.org/cc/v4 v4.25.2/go.mod h1:uVtb5OGqUKpoLWhqwNQo/8LwvoiEBLvZXIQ/SmO6mL0=
modernc.org/ccgo/v4 v4.25.1 h1:TFSzPrAGmDsdnhT9X2UrcPMI3N/mJ9/X9ykKXwLhDsU=
modernc.org/ccgo/v4 v4.25.1/go.mod h1:njjuAYiPflywOOrm3B7kCB444ONP5pAVr8PIEoE0uDw=
modernc.org/fileutil v1.3.0 h1:gQ5SIzK3H9kdfai/5x41oQiKValumqNTDXMvKo62HvE=
modernc.org/fileutil v1.3.0/go.mod h1:XatxS8fZi3pS8/hKG2GH/ArUogfxjpEKs3Ku3aK4JyQ=
modernc.org/gc/v2 v2.6.5 h1:nyqdV8q46KvTpZlsw66kWqwXRHdjIlJOhG6kxiV/9xI=
modernc.org/gc/v2 v2.6.5/go.mod h1:YgIahr1ypgfe7chRuJi2gD7DBQiKSLMPgBQe9oIiito=
modernc.org/libc v1.62.1 h1:s0+fv5E3FymN8eJVmnk0llBe6rOxCu/DEU+XygRbS8s= modernc.org/libc v1.62.1 h1:s0+fv5E3FymN8eJVmnk0llBe6rOxCu/DEU+XygRbS8s=
modernc.org/libc v1.62.1/go.mod h1:iXhATfJQLjG3NWy56a6WVU73lWOcdYVxsvwCgoPljuo= modernc.org/libc v1.62.1/go.mod h1:iXhATfJQLjG3NWy56a6WVU73lWOcdYVxsvwCgoPljuo=
modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU= modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU=
modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg= modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg=
modernc.org/memory v1.9.1 h1:V/Z1solwAVmMW1yttq3nDdZPJqV1rM05Ccq6KMSZ34g= modernc.org/memory v1.9.1 h1:V/Z1solwAVmMW1yttq3nDdZPJqV1rM05Ccq6KMSZ34g=
modernc.org/memory v1.9.1/go.mod h1:/JP4VbVC+K5sU2wZi9bHoq2MAkCnrt2r98UGeSK7Mjw= modernc.org/memory v1.9.1/go.mod h1:/JP4VbVC+K5sU2wZi9bHoq2MAkCnrt2r98UGeSK7Mjw=
modernc.org/opt v0.1.4 h1:2kNGMRiUjrp4LcaPuLY2PzUfqM/w9N23quVwhKt5Qm8=
modernc.org/opt v0.1.4/go.mod h1:03fq9lsNfvkYSfxrfUhZCWPk1lm4cq4N+Bh//bEtgns=
modernc.org/sortutil v1.2.1 h1:+xyoGf15mM3NMlPDnFqrteY07klSFxLElE2PVuWIJ7w=
modernc.org/sortutil v1.2.1/go.mod h1:7ZI3a3REbai7gzCLcotuw9AC4VZVpYMjDzETGsSMqJE=
modernc.org/sqlite v1.37.0 h1:s1TMe7T3Q3ovQiK2Ouz4Jwh7dw4ZDqbebSDTlSJdfjI= modernc.org/sqlite v1.37.0 h1:s1TMe7T3Q3ovQiK2Ouz4Jwh7dw4ZDqbebSDTlSJdfjI=
modernc.org/sqlite v1.37.0/go.mod h1:5YiWv+YviqGMuGw4V+PNplcyaJ5v+vQd7TQOgkACoJM= modernc.org/sqlite v1.37.0/go.mod h1:5YiWv+YviqGMuGw4V+PNplcyaJ5v+vQd7TQOgkACoJM=
modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0=
modernc.org/strutil v1.2.1/go.mod h1:EHkiggD70koQxjVdSBM3JKM7k6L0FbGE5eymy9i3B9A=
modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=
modernc.org/token v1.1.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=

View File

@ -3,16 +3,14 @@ package nix
import ( import (
"testing" "testing"
"github.com/google/go-cmp/cmp"
"github.com/scylladb/go-set/strset"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
_ "modernc.org/sqlite"
"github.com/anchore/syft/syft/artifact" "github.com/anchore/syft/syft/artifact"
"github.com/anchore/syft/syft/file" "github.com/anchore/syft/syft/file"
"github.com/anchore/syft/syft/pkg" "github.com/anchore/syft/syft/pkg"
"github.com/anchore/syft/syft/pkg/cataloger/internal/pkgtest" "github.com/anchore/syft/syft/pkg/cataloger/internal/pkgtest"
"github.com/google/go-cmp/cmp"
"github.com/scylladb/go-set/strset"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
) )
func TestCataloger_Image(t *testing.T) { func TestCataloger_Image(t *testing.T) {

View File

@ -5,15 +5,13 @@ import (
"errors" "errors"
"testing" "testing"
"github.com/google/go-cmp/cmp/cmpopts"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
_ "modernc.org/sqlite"
"github.com/anchore/syft/syft/artifact" "github.com/anchore/syft/syft/artifact"
"github.com/anchore/syft/syft/file" "github.com/anchore/syft/syft/file"
"github.com/anchore/syft/syft/pkg" "github.com/anchore/syft/syft/pkg"
"github.com/anchore/syft/syft/pkg/cataloger/internal/pkgtest" "github.com/anchore/syft/syft/pkg/cataloger/internal/pkgtest"
"github.com/google/go-cmp/cmp/cmpopts"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
) )
func Test_DBCataloger(t *testing.T) { func Test_DBCataloger(t *testing.T) {
@ -184,7 +182,7 @@ func Test_DBCataloger(t *testing.T) {
pkgtest.NewCatalogTester(). pkgtest.NewCatalogTester().
WithImageResolver(t, "image-minimal"). WithImageResolver(t, "image-minimal").
IgnoreLocationLayer(). // this fixture can be rebuilt, thus the layer ID will change IgnoreLocationLayer(). // this fixture can be rebuilt, thus the layer ID will change
WithCompareOptions(cmpopts.IgnoreFields(pkg.RpmDBEntry{}, "Files")). // this is rather long... ano not the point of the test WithCompareOptions(cmpopts.IgnoreFields(pkg.RpmDBEntry{}, "Files")). // this is rather long... ano not the point of the test
Expects(expectedPackages, expectedRelationships). Expects(expectedPackages, expectedRelationships).
TestCataloger(t, NewDBCataloger()) TestCataloger(t, NewDBCataloger())