test: java binary skip for apple Silicon

Signed-off-by: Christopher Phillips <32073428+spiffcs@users.noreply.github.com>

.binny.yaml

@@ -2,7 +2,7 @@ tools:
   # we want to use a pinned version of binny to manage the toolchain (so binny manages itself!)
   - name: binny
     version:
-      want: v0.10.0
+      want: v0.9.0
     method: github-release
     with:
       repo: anchore/binny
@@ -26,7 +26,7 @@ tools:
   # used for linting
   - name: golangci-lint
     version:
-      want: v2.5.0
+      want: v2.4.0
     method: github-release
     with:
       repo: golangci/golangci-lint
@@ -42,7 +42,7 @@ tools:
   # used for signing the checksums file at release
   - name: cosign
     version:
-      want: v3.0.2
+      want: v2.5.3
     method: github-release
     with:
       repo: sigstore/cosign
@@ -58,7 +58,7 @@ tools:
   # used to release all artifacts
   - name: goreleaser
     version:
-      want: v2.12.7
+      want: v2.11.2
     method: github-release
     with:
       repo: goreleaser/goreleaser
@@ -90,7 +90,7 @@ tools:
   # used for running all local and CI tasks
   - name: task
     version:
-      want: v3.45.4
+      want: v3.44.1
     method: github-release
     with:
       repo: go-task/task
@@ -98,7 +98,7 @@ tools:
   # used for triggering a release
   - name: gh
     version:
-      want: v2.82.1
+      want: v2.78.0
     method: github-release
     with:
       repo: cli/cli
@@ -106,7 +106,7 @@ tools:
   # used to upload test fixture cache
   - name: oras
     version:
-      want: v1.3.0
+      want: v1.2.3
     method: github-release
     with:
       repo: oras-project/oras
@@ -114,7 +114,7 @@ tools:
   # used to upload test fixture cache
   - name: yq
     version:
-      want: v4.48.1
+      want: v4.47.1
     method: github-release
     with:
       repo: mikefarah/yq

.bouncer.yaml

@@ -9,9 +9,6 @@ permit:
   - Unlicense
 
 ignore-packages:
-  # https://github.com/sorairolake/lzip-go/blob/34a2615d2abf740175c6b0a835baa08364e09430/go.sum.license#L3
-  # has `SPDX-License-Identifier: Apache-2.0 OR MIT`, both of which are acceptable
-  - github.com/sorairolake/lzip-go
   # packageurl-go is released under the MIT license located in the root of the repo at /mit.LICENSE
   - github.com/anchore/packageurl-go
 

.github/actions/bootstrap/action.yaml

@@ -29,7 +29,7 @@ runs:
   using: "composite"
   steps:
     # note: go mod and build is automatically cached on default with v4+
-    - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
+    - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
       if: inputs.go-version != ''
       with:
         go-version: ${{ inputs.go-version }}
@@ -37,7 +37,7 @@ runs:
     - name: Restore tool cache
       if: inputs.tools == 'true'
       id: tool-cache
-      uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+      uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
       with:
         path: ${{ github.workspace }}/.tool
         key: ${{ inputs.cache-key-prefix }}-${{ runner.os }}-tool-${{ hashFiles('.binny.yaml') }}
@@ -63,7 +63,7 @@ runs:
 
     - name: Restore ORAS cache from github actions
       if: inputs.download-test-fixture-cache == 'true'
-      uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+      uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
       with:
         path: ${{ github.workspace }}/.tmp/oras-cache
         key: ${{ inputs.cache-key-prefix }}-oras-cache

.github/workflows/codeql-analysis.yml

@@ -41,13 +41,13 @@ jobs:
         persist-credentials: false
 
     - name: Install Go
-      uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 #v6.0.0
+      uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 #v5.5.0
       with:
         go-version-file: go.mod
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@0499de31b99561a6d14a36a5f662c2a54f91beee #v3.29.5
+      uses: github/codeql-action/init@3c3833e0f8c1c83d449a7478aa59c036a9165498 #v3.29.5
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -58,7 +58,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@0499de31b99561a6d14a36a5f662c2a54f91beee #v3.29.5
+      uses: github/codeql-action/autobuild@3c3833e0f8c1c83d449a7478aa59c036a9165498 #v3.29.5
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -72,4 +72,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@0499de31b99561a6d14a36a5f662c2a54f91beee #v3.29.5
+      uses: github/codeql-action/analyze@3c3833e0f8c1c83d449a7478aa59c036a9165498 #v3.29.5

.github/workflows/release.yaml

@@ -19,16 +19,6 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: Bootstrap environment
-        uses: ./.github/actions/bootstrap
-
-      - name: Validate Apple notarization credentials
-        run: .tool/quill submission list
-        env:
-          QUILL_NOTARY_ISSUER: ${{ secrets.APPLE_NOTARY_ISSUER }}
-          QUILL_NOTARY_KEY_ID: ${{ secrets.APPLE_NOTARY_KEY_ID }}
-          QUILL_NOTARY_KEY: ${{ secrets.APPLE_NOTARY_KEY }}
-
       - name: Check if running on main
         if: github.ref != 'refs/heads/main'
         # we are using the following flag when running `cosign blob-verify` for checksum signature verification:
@@ -171,13 +161,13 @@ jobs:
           # for updating brew formula in anchore/homebrew-syft
           GITHUB_BREW_TOKEN: ${{ secrets.ANCHOREOPS_GITHUB_OSS_WRITE_TOKEN }}
 
-      - uses: anchore/sbom-action@8e94d75ddd33f69f691467e42275782e4bfefe84 #v0.20.9
+      - uses: anchore/sbom-action@da167eac915b4e86f08b264dbdbc867b61be6f0c #v0.20.5
         continue-on-error: true
         with:
           file: go.mod
           artifact-name: sbom.spdx.json
 
-      - uses: 8398a7/action-slack@77eaa4f1c608a7d68b38af4e3f739dcd8cba273e #v3.19.0
+      - uses: 8398a7/action-slack@1750b5085f3ec60384090fb7c52965ef822e869e #v3.18.0
         continue-on-error: true
         with:
           status: ${{ job.status }}

.github/workflows/update-cpe-dictionary-index.yml

@@ -47,7 +47,7 @@ jobs:
             Update CPE dictionary index based on the latest available CPE dictionary
           token: ${{ steps.generate-token.outputs.token }}
 
-      - uses: 8398a7/action-slack@77eaa4f1c608a7d68b38af4e3f739dcd8cba273e #v3.19.0
+      - uses: 8398a7/action-slack@1750b5085f3ec60384090fb7c52965ef822e869e #v3.18.0
         with:
           status: ${{ job.status }}
           fields: workflow,eventName,job

.github/workflows/update-spdx-license-list.yaml

@@ -1,54 +0,0 @@
-name: PR to update SPDX license list
-on:
-  schedule:
-    - cron: "0 6 * * 1" # every monday at 6 AM UTC
-
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-env:
-  SLACK_NOTIFICATIONS: true
-
-jobs:
-  upgrade-spdx-license-list:
-    runs-on: ubuntu-latest
-    if: github.repository == 'anchore/syft' # only run for main repo
-    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0
-        with:
-          persist-credentials: false
-
-      - name: Bootstrap environment
-        uses: ./.github/actions/bootstrap
-
-      - run: |
-          make generate-license-list
-
-      - uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a #v2.1.0
-        id: generate-token
-        with:
-          app_id: ${{ secrets.TOKEN_APP_ID }}
-          private_key: ${{ secrets.TOKEN_APP_PRIVATE_KEY }}
-
-      - uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e #v7.0.8
-        with:
-          signoff: true
-          delete-branch: true
-          branch: auto/latest-spdx-license-list
-          labels: dependencies
-          commit-message: "chore(deps): update SPDX license list"
-          title: "chore(deps): update SPDX license list"
-          body: |
-            Update SPDX license list based on the latest available list from spdx.org
-          token: ${{ steps.generate-token.outputs.token }}
-
-      - uses: 8398a7/action-slack@77eaa4f1c608a7d68b38af4e3f739dcd8cba273e #v3.19.0
-        with:
-          status: ${{ job.status }}
-          fields: workflow,eventName,job
-          text: Syft SPDX license list update failed
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_TOOLBOX_WEBHOOK_URL }}
-        if: ${{ failure() && env.SLACK_NOTIFICATIONS == 'true' }}

.github/workflows/validate-github-actions.yaml

@@ -28,7 +28,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run zizmor"
-        uses: zizmorcore/zizmor-action@e673c3917a1aef3c65c972347ed84ccd013ecda4 # v0.2.0
+        uses: zizmorcore/zizmor-action@5ca5fc7a4779c5263a3ffa0e1f693009994446d1 # v0.1.2
         with:
           config-file: .github/zizmor.yml
           sarif-upload: true

.github/workflows/validations.yaml

@@ -90,7 +90,7 @@ jobs:
       # why not use actions/upload-artifact? It is very slow (3 minutes to upload ~600MB of data, vs 10 seconds with this approach).
       # see https://github.com/actions/upload-artifact/issues/199 for more info
       - name: Upload snapshot artifacts
-        uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 #v4.3.0
+        uses: actions/cache/save@0400d5f644dc74513175e3cd8d07132dd4860809 #v4.2.4
         with:
           # we need to preserve the snapshot data itself as well as the task data that confirms if the
           # snapshot build is stale or not. Otherwise the downstream jobs will attempt to rebuild the snapshot
@@ -118,7 +118,7 @@ jobs:
 
       - name: Download snapshot build
         id: snapshot-cache
-        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 #v4.3.0
+        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 #v4.2.4
         with:
           path: |
             snapshot
@@ -133,7 +133,7 @@ jobs:
 
       - run: npm install @actions/artifact@2.2.2
 
-      - uses: actions/github-script@v8
+      - uses: actions/github-script@v7
         with:
           script: |
             const { readdirSync } = require('fs')
@@ -175,7 +175,7 @@ jobs:
 
       - name: Download snapshot build
         id: snapshot-cache
-        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 #v4.3.0
+        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 #v4.2.4
         with:
           path: |
             snapshot
@@ -210,7 +210,7 @@ jobs:
     runs-on: macos-latest
     steps:
       - name: Install Cosign
-        uses: sigstore/cosign-installer@faadad0cce49287aee09b3a48701e75088a2c6ad # v4.0.0
+        uses: sigstore/cosign-installer@d58896d6a1865668819e1d91763c7751a165e159 # v3.9.2
 
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0
         with:
@@ -225,7 +225,7 @@ jobs:
 
       - name: Download snapshot build
         id: snapshot-cache
-        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 #v4.3.0
+        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 #v4.2.4
         with:
           path: |
             snapshot
@@ -262,7 +262,7 @@ jobs:
 
       - name: Download snapshot build
         id: snapshot-cache
-        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 #v4.3.0
+        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 #v4.2.4
         with:
           path: |
             snapshot

.gitignore

@@ -2,7 +2,6 @@
 go.work
 go.work.sum
 .tool-versions
-.python-version
 
 # app configuration
 /.syft.yaml
@@ -17,8 +16,6 @@ bin/
 /snapshot
 /.tool
 /.task
-/generate
-/specs
 
 # changelog generation
 CHANGELOG.md

.goreleaser.yaml

@@ -42,7 +42,7 @@ builds:
     dir: ./cmd/syft
     binary: syft
     goos: [windows]
-    goarch: [amd64, arm64]
+    goarch: [amd64]
     mod_timestamp: *build-timestamp
     ldflags: *build-ldflags
 
@@ -337,7 +337,6 @@ signs:
     certificate: "${artifact}.pem"
     args:
       - "sign-blob"
-      - "--use-signing-config=false"
       - "--oidc-issuer=https://token.actions.githubusercontent.com"
       - "--output-certificate=${certificate}"
       - "--output-signature=${signature}"

DEVELOPING.md

@@ -27,7 +27,7 @@ Also double check that the docker context being used is the default context. If
 
 `docker context use default`
 
-After cloning, the following steps can help you get setup:
+After cloning the following step can help you get setup:
 1. run `make bootstrap` to download go mod dependencies, create the `/.tmp` dir, and download helper utilities.
 2. run `make` to view the selection of developer commands in the Makefile
 3. run `make build` to build the release snapshot binaries and packages
@@ -120,7 +120,7 @@ sequenceDiagram
     source-->>+sbom: add source to SBOM struct
     source-->>+catalog: pass src to generate catalog
     catalog-->-sbom: add cataloging results onto SBOM
-    sbom-->>encoder: pass SBOM and format desired to syft encoder
+    sbom-->>encoder: pass SBOM and format desiered to syft encoder
     encoder-->>source: return bytes that are the SBOM of the original input 
 
     Note right of catalog: cataloger configuration is done based on src
@@ -186,7 +186,7 @@ Cataloger names should be unique and named with the following rules of thumb in
 - Use lowercase letters, numbers, and hyphens only
 - Use hyphens to separate words
 - Catalogers for language ecosystems should start with the language name (e.g. `python-` for a cataloger that raises up python packages)
-- Distinguish between when the cataloger is searching for evidence of installed packages vs declared packages. For example, there are currently two different gemspec-based catalogers, the `ruby-gemspec-cataloger` and `ruby-installed-gemspec-cataloger`, where the latter requires that the gemspec is found within a `specifications` directory (which means it was installed, not just at the root of a source repo).
+- Distinct between when the cataloger is searching for evidence of installed packages vs declared packages. For example, there are currently two different gemspec-based catalogers, the `ruby-gemspec-cataloger` and `ruby-installed-gemspec-cataloger`, where the latter requires that the gemspec is found within a `specifications` directory (which means it was installed, not just at the root of a source repo).
 
 #### Building a new Cataloger
 

README.md

@@ -116,7 +116,7 @@ Where the `formats` available are:
 - `spdx-json@2.2`: A JSON report conforming to the [SPDX 2.2 JSON Schema](https://github.com/spdx/spdx-spec/blob/v2.2/schemas/spdx-schema.json).
 - `github-json`: A JSON report conforming to GitHub's dependency snapshot format.
 - `syft-table`: A columnar summary (default).
-- `template`: Lets the user specify the output format. See ["Using templates"](https://github.com/anchore/syft/wiki/using-templates) below.
+- `template`: Lets the user specify the output format. See ["Using templates"](#using-templates) below.
 
 Note that flags using the @<version> can be used for earlier versions of each specification as well.
 
@@ -133,9 +133,8 @@ Note that flags using the @<version> can be used for earlier versions of each sp
 - Elixir (mix)
 - Erlang (rebar3)
 - Go (go.mod, Go binaries)
-- GitHub (workflows, actions)
 - Haskell (cabal, stack)
-- Java (jar, ear, war, par, sar, nar, rar, native-image)
+- Java (jar, ear, war, par, sar, nar, native-image)
 - JavaScript (npm, yarn)
 - Jenkins Plugins (jpi, hpi)
 - Linux kernel archives (vmlinz)

SECURITY.md

@@ -29,4 +29,4 @@ To report a security issue, please email
 with a description of the issue, the steps you took to create the issue,
 affected versions, and, if known, mitigations for the issue.
 
-All support will be made on a best effort basis, so please indicate the "urgency level" of the vulnerability as Critical, High, Medium or Low.
+All support will be made on the best effort base, so please indicate the "urgency level" of the vulnerability as Critical, High, Medium or Low.

Taskfile.yaml

@@ -502,7 +502,7 @@ tasks:
   generate-json-schema:
     desc: Generate a new JSON schema
     cmds:
-      - "cd ./internal && go generate . && cd ./jsonschema && go run . && go fmt ../..."
+      - "cd syft/internal && go generate . && cd jsonschema && go run . && go fmt ../..."
 
   generate-license-list:
     desc: Generate an updated license processing code off of the latest available SPDX license list

cmd/syft/internal/commands/attest.go

@@ -253,6 +253,7 @@ func generateSBOMForAttestation(ctx context.Context, id clio.Identification, opt
 	}
 
 	src, err := getSource(ctx, opts, userInput, stereoscope.RegistryTag)
+
 	if err != nil {
 		return nil, err
 	}

cmd/syft/internal/commands/scan.go

@@ -185,6 +185,7 @@ func runScan(ctx context.Context, id clio.Identification, opts *scanOptions, use
 	}
 
 	src, err := getSource(ctx, &opts.Catalog, userInput, sources...)
+
 	if err != nil {
 		return err
 	}

cmd/syft/internal/test/integration/catalog_packages_test.go

@@ -25,6 +25,7 @@ func BenchmarkImagePackageCatalogers(b *testing.B) {
 	// get the source object for the image
 	theSource, err := syft.GetSource(context.Background(), tarPath, syft.DefaultGetSourceConfig().WithSources("docker-archive"))
 	require.NoError(b, err)
+
 	b.Cleanup(func() {
 		require.NoError(b, theSource.Close())
 	})

cmd/syft/internal/test/integration/utils_test.go

@@ -38,11 +38,11 @@ func catalogFixtureImageWithConfig(t *testing.T, fixtureImageName string, cfg *s
 	// get the source to build an SBOM against
 	theSource, err := syft.GetSource(context.Background(), tarPath, syft.DefaultGetSourceConfig().WithSources("docker-archive"))
 	require.NoError(t, err)
+
 	t.Cleanup(func() {
 		require.NoError(t, theSource.Close())
 	})
 
-	// build the SBOM
 	s, err := syft.CreateSBOM(context.Background(), theSource, cfg)
 
 	require.NoError(t, err)
@@ -66,7 +66,7 @@ func catalogDirectory(t *testing.T, dir string, catalogerSelection ...string) (s
 func catalogDirectoryWithConfig(t *testing.T, dir string, cfg *syft.CreateSBOMConfig) (sbom.SBOM, source.Source) {
 	cfg.CatalogerSelection = cfg.CatalogerSelection.WithDefaults(pkgcataloging.DirectoryTag)
 
-	// get the source to build an SBOM against
+	// get the source to build an sbom against
 	theSource, err := syft.GetSource(context.Background(), dir, syft.DefaultGetSourceConfig().WithSources("dir"))
 	require.NoError(t, err)
 	t.Cleanup(func() {

examples/create_custom_sbom/main.go

@@ -23,7 +23,6 @@ const defaultImage = "alpine:3.19"
 func main() {
 	// automagically get a source.Source for arbitrary string input
 	src := getSource(imageReference())
-	defer src.Close()
 
 	// will catalog the given source and return a SBOM keeping in mind several configurable options
 	sbom := getSBOM(src)
@@ -47,6 +46,7 @@ func getSource(input string) source.Source {
 	fmt.Println("detecting source type for input:", input, "...")
 
 	src, err := syft.GetSource(context.Background(), input, nil)
+
 	if err != nil {
 		panic(err)
 	}

examples/create_simple_sbom/main.go

@@ -19,7 +19,6 @@ const defaultImage = "alpine:3.19"
 func main() {
 	// automagically get a source.Source for arbitrary string input
 	src := getSource(imageReference())
-	defer src.Close()
 
 	// catalog the given source and return a SBOM
 	sbom := getSBOM(src)
@@ -41,6 +40,7 @@ func imageReference() string {
 
 func getSource(input string) source.Source {
 	src, err := syft.GetSource(context.Background(), input, nil)
+
 	if err != nil {
 		panic(err)
 	}

examples/select_catalogers/main.go

@@ -19,7 +19,6 @@ const defaultImage = "alpine:3.19"
 func main() {
 	// automagically get a source.Source for arbitrary string input
 	src := getSource(imageReference())
-	defer src.Close()
 
 	// catalog the given source and return a SBOM
 	// let's explicitly use catalogers that are:
@@ -45,6 +44,7 @@ func imageReference() string {
 
 func getSource(input string) source.Source {
 	src, err := syft.GetSource(context.Background(), input, nil)
+
 	if err != nil {
 		panic(err)
 	}

examples/source_from_registry/main.go

@@ -15,7 +15,6 @@ func main() {
 	image := "alpine:3.19"
 
 	src, _ := syft.GetSource(context.Background(), image, syft.DefaultGetSourceConfig().WithSources("registry"))
-	defer src.Close()
 
 	sbom, _ := syft.CreateSBOM(context.Background(), src, syft.DefaultCreateSBOMConfig())
 

go.mod

@@ -4,7 +4,7 @@ go 1.24.1
 
 require (
 	github.com/BurntSushi/toml v1.5.0
-	github.com/CycloneDX/cyclonedx-go v0.9.3
+	github.com/CycloneDX/cyclonedx-go v0.9.2
 	github.com/Masterminds/semver/v3 v3.4.0
 	github.com/Masterminds/sprig/v3 v3.3.0
 	github.com/OneOfOne/xxhash v1.2.8
@@ -15,7 +15,7 @@ require (
 	github.com/anchore/bubbly v0.0.0-20231115134915-def0aba654a9
 	github.com/anchore/clio v0.0.0-20250319180342-2cfe4b0cb716
 	github.com/anchore/fangs v0.0.0-20250319222917-446a1e748ec2
-	github.com/anchore/go-collections v0.0.0-20251016125210-a3c352120e8c
+	github.com/anchore/go-collections v0.0.0-20240216171411-9321230ce537
 	github.com/anchore/go-homedir v0.0.0-20250319154043-c29668562e4d
 	github.com/anchore/go-logger v0.0.0-20250318195838-07ae343dd722
 	github.com/anchore/go-macholibre v0.0.0-20220308212642-53e6d0aaf6fb
@@ -24,14 +24,14 @@ require (
 	github.com/anchore/go-testutils v0.0.0-20200925183923-d5f45b0d3c04
 	github.com/anchore/go-version v1.2.2-0.20200701162849-18adb9c92b9b
 	github.com/anchore/packageurl-go v0.1.1-0.20250220190351-d62adb6e1115
-	github.com/anchore/stereoscope v0.1.12
+	github.com/anchore/stereoscope v0.1.9-0.20250826202322-ef061ea78385
 	github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be
 	github.com/aquasecurity/go-pep440-version v0.0.1
 	github.com/bitnami/go-version v0.0.0-20250131085805-b1f57a8634ef
 	github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb
 	github.com/bmatcuk/doublestar/v4 v4.9.1
 	github.com/charmbracelet/bubbles v0.21.0
-	github.com/charmbracelet/bubbletea v1.3.10
+	github.com/charmbracelet/bubbletea v1.3.6
 	github.com/charmbracelet/lipgloss v1.1.0
 	github.com/dave/jennifer v1.7.1
 	github.com/deitch/magic v0.0.0-20230404182410-1ff89d7342da
@@ -40,35 +40,35 @@ require (
 	github.com/dustin/go-humanize v1.0.1
 	github.com/elliotchance/phpserialize v1.4.0
 	github.com/facebookincubator/nvdtools v0.1.5
-	github.com/github/go-spdx/v2 v2.3.4
-	github.com/gkampitakis/go-snaps v0.5.15
+	github.com/github/go-spdx/v2 v2.3.3
+	github.com/gkampitakis/go-snaps v0.5.14
 	github.com/go-git/go-billy/v5 v5.6.2
-	github.com/go-git/go-git/v5 v5.16.3
+	github.com/go-git/go-git/v5 v5.16.2
 	github.com/go-test/deep v1.1.1
 	github.com/go-viper/mapstructure/v2 v2.4.0
-	github.com/gohugoio/hashstructure v0.6.0
+	github.com/gohugoio/hashstructure v0.5.0
 	github.com/google/go-cmp v0.7.0
 	github.com/google/go-containerregistry v0.20.6
 	github.com/google/licensecheck v0.3.1
 	github.com/google/uuid v1.6.0
-	github.com/gookit/color v1.6.0
+	github.com/gookit/color v1.5.4
 	github.com/hashicorp/go-cleanhttp v0.5.2
-	github.com/hashicorp/go-getter v1.8.3
+	github.com/hashicorp/go-getter v1.7.9
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/hashicorp/hcl/v2 v2.24.0
 	github.com/iancoleman/strcase v0.3.0
 	github.com/invopop/jsonschema v0.7.0
-	github.com/jedib0t/go-pretty/v6 v6.6.9
+	github.com/jedib0t/go-pretty/v6 v6.6.8
 	github.com/jinzhu/copier v0.4.0
 	github.com/kastenhq/goversion v0.0.0-20230811215019-93b2f8823953
 	github.com/magiconair/properties v1.8.10
-	github.com/mholt/archives v0.1.5
+	github.com/mholt/archives v0.1.3
 	github.com/moby/sys/mountinfo v0.7.2
 	github.com/nix-community/go-nix v0.0.0-20250101154619-4bdde671e0a1
 	github.com/olekukonko/tablewriter v1.0.9
 	github.com/opencontainers/go-digest v1.0.0
 	github.com/pelletier/go-toml v1.9.5
-	github.com/quasilyte/go-ruleguard/dsl v0.3.23
+	github.com/quasilyte/go-ruleguard/dsl v0.3.22
 	github.com/rust-secure-code/go-rustaudit v0.0.0-20250226111315-e20ec32e963c
 	github.com/saintfish/chardet v0.0.0-20230101081208-5e3ef4b5456d
 	github.com/sanity-io/litter v1.5.8
@@ -78,10 +78,10 @@ require (
 	github.com/sergi/go-diff v1.4.0
 	github.com/spdx/gordf v0.0.0-20201111095634-7098f93598fb
 	github.com/spdx/tools-golang v0.5.5
-	github.com/spf13/afero v1.15.0
-	github.com/spf13/cobra v1.10.1
-	github.com/stretchr/testify v1.11.1
-	github.com/vbatts/go-mtree v0.6.0
+	github.com/spf13/afero v1.14.0
+	github.com/spf13/cobra v1.9.1
+	github.com/stretchr/testify v1.11.0
+	github.com/vbatts/go-mtree v0.5.4
 	github.com/vifraa/gopom v1.0.0
 	github.com/wagoodman/go-partybus v0.0.0-20230516145632-8ccac152c651
 	github.com/wagoodman/go-progress v0.0.0-20230925121702-07e42b3cdba0
@@ -90,9 +90,9 @@ require (
 	go.uber.org/goleak v1.3.0
 	go.yaml.in/yaml/v3 v3.0.4
 	golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b
-	golang.org/x/mod v0.29.0
-	golang.org/x/net v0.46.0
-	modernc.org/sqlite v1.40.0
+	golang.org/x/mod v0.27.0
+	golang.org/x/net v0.43.0
+	modernc.org/sqlite v1.38.2
 )
 
 require (
@@ -109,24 +109,25 @@ require (
 	github.com/Masterminds/goutils v1.1.1 // indirect
 	github.com/Microsoft/go-winio v0.6.2 // indirect
 	github.com/Microsoft/hcsshim v0.11.7 // indirect
-	github.com/ProtonMail/go-crypto v1.3.0 // indirect
-	github.com/STARRY-S/zip v0.2.3 // indirect
+	github.com/ProtonMail/go-crypto v1.2.0 // indirect
+	github.com/STARRY-S/zip v0.2.1 // indirect
 	github.com/agext/levenshtein v1.2.1 // indirect; indirectt
 	github.com/anchore/go-lzo v0.1.0 // indirect
 	github.com/anchore/go-struct-converter v0.0.0-20221118182256-c68fdcfa2092 // indirect
-	github.com/andybalholm/brotli v1.2.0 // indirect
+	github.com/andybalholm/brotli v1.1.2-0.20250424173009-453214e765f3 // indirect
 	github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
 	github.com/aquasecurity/go-version v0.0.1 // indirect
 	github.com/atotto/clipboard v0.1.4 // indirect
+	github.com/aws/aws-sdk-go v1.44.122 // indirect
 	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
 	github.com/becheran/wildmatch-go v1.0.0 // indirect
 	github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
 	github.com/bodgit/plumbing v1.3.0 // indirect
-	github.com/bodgit/sevenzip v1.6.1 // indirect
+	github.com/bodgit/sevenzip v1.6.0 // indirect
 	github.com/bodgit/windows v1.0.1 // indirect
 	github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect
 	github.com/charmbracelet/harmonica v0.2.0 // indirect
-	github.com/charmbracelet/x/ansi v0.10.1 // indirect
+	github.com/charmbracelet/x/ansi v0.9.3 // indirect
 	github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd // indirect
 	github.com/charmbracelet/x/term v0.2.1 // indirect
 	github.com/cloudflare/circl v1.6.1 // indirect
@@ -144,9 +145,9 @@ require (
 	github.com/containerd/typeurl/v2 v2.2.0 // indirect
 	github.com/cyphar/filepath-securejoin v0.4.1 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/docker/cli v28.5.1+incompatible // indirect
+	github.com/docker/cli v28.3.2+incompatible // indirect
 	github.com/docker/distribution v2.8.3+incompatible // indirect
-	github.com/docker/docker v28.5.1+incompatible // indirect
+	github.com/docker/docker v28.3.3+incompatible // indirect
 	github.com/docker/docker-credential-helpers v0.9.3 // indirect
 	github.com/docker/go-connections v0.6.0 // indirect
 	github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
@@ -154,7 +155,7 @@ require (
 	github.com/dsnet/compress v0.0.2-0.20230904184137-39efe44ab707 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
 	github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
-	github.com/fatih/color v1.18.0 // indirect
+	github.com/fatih/color v1.17.0 // indirect
 	github.com/felixge/fgprof v0.9.5 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/fsnotify/fsnotify v1.8.0 // indirect
@@ -174,12 +175,14 @@ require (
 	github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
 	github.com/googleapis/gax-go/v2 v2.13.0 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
+	github.com/hashicorp/go-safetemp v1.0.0 // indirect
 	github.com/hashicorp/go-version v1.6.0 // indirect
 	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
 	github.com/huandu/xstrings v1.5.0 // indirect
-	github.com/iancoleman/orderedmap v0.3.0
+	github.com/iancoleman/orderedmap v0.0.0-20190318233801-ac98e3ecb4b0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
+	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/kevinburke/ssh_config v1.2.0 // indirect
 	github.com/klauspost/compress v1.18.0 // indirect
 	github.com/klauspost/pgzip v1.2.6 // indirect
@@ -188,13 +191,13 @@ require (
 	github.com/logrusorgru/aurora v2.0.3+incompatible // indirect
 	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
 	github.com/maruel/natural v1.1.1 // indirect
-	github.com/mattn/go-colorable v0.1.14 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mattn/go-localereader v0.0.2-0.20220822084749-2491eb6c1c75 // indirect
 	github.com/mattn/go-runewidth v0.0.16 // indirect
 	github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
 	github.com/mikelolasagasti/xz v1.0.1 // indirect
-	github.com/minio/minlz v1.0.1 // indirect
+	github.com/minio/minlz v1.0.0 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
@@ -210,7 +213,7 @@ require (
 	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/v2 v2.2.0 // indirect
+	github.com/nwaples/rardecode/v2 v2.1.0 // indirect
 	github.com/olekukonko/errors v1.1.0 // indirect
 	github.com/olekukonko/ll v0.0.9 // indirect
 	github.com/opencontainers/image-spec v1.1.1 // indirect
@@ -232,21 +235,21 @@ require (
 	github.com/shopspring/decimal v1.4.0 // indirect
 	github.com/sirupsen/logrus v1.9.4-0.20230606125235-dd1b4c2e81af // indirect
 	github.com/skeema/knownhosts v1.3.1 // indirect
-	github.com/sorairolake/lzip-go v0.3.8 // indirect
+	github.com/sorairolake/lzip-go v0.3.5 // indirect
 	github.com/sourcegraph/conc v0.3.0 // indirect
 	github.com/spf13/cast v1.7.1 // indirect
-	github.com/spf13/pflag v1.0.9 // indirect
+	github.com/spf13/pflag v1.0.6 // indirect
 	github.com/spf13/viper v1.20.0 // indirect
 	github.com/stretchr/objx v0.5.2 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
-	github.com/sylabs/sif/v2 v2.22.0 // indirect
+	github.com/sylabs/sif/v2 v2.21.1 // indirect
 	github.com/sylabs/squashfs v1.0.6 // indirect
 	github.com/therootcompany/xz v1.0.1 // indirect
 	github.com/tidwall/gjson v1.18.0 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.1 // indirect
 	github.com/tidwall/sjson v1.2.5 // indirect
-	github.com/ulikunitz/xz v0.5.15 // indirect
+	github.com/ulikunitz/xz v0.5.12 // indirect
 	github.com/vbatts/tar-split v0.12.1 // indirect
 	github.com/xanzy/ssh-agent v0.3.3 // indirect
 	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
@@ -264,50 +267,28 @@ require (
 	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/multierr v1.9.0 // indirect
 	go4.org v0.0.0-20230225012048-214862532bf5 // indirect
-	golang.org/x/crypto v0.43.0 // indirect
+	golang.org/x/crypto v0.41.0 // indirect
 	golang.org/x/oauth2 v0.30.0 // indirect
-	golang.org/x/sync v0.17.0 // indirect
-	golang.org/x/sys v0.37.0 // indirect
-	golang.org/x/term v0.36.0 // indirect
-	golang.org/x/text v0.30.0 // indirect
+	golang.org/x/sync v0.16.0 // indirect
+	golang.org/x/sys v0.35.0 // indirect
+	golang.org/x/term v0.34.0 // indirect
+	golang.org/x/text v0.28.0 // indirect
 	golang.org/x/time v0.12.0 // indirect
-	golang.org/x/tools v0.38.0
+	golang.org/x/tools v0.35.0
 	golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
 	google.golang.org/api v0.203.0 // indirect
 	google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20241113202542-65e8d215514f // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8 // indirect
 	google.golang.org/grpc v1.67.3 // indirect
-	google.golang.org/protobuf v1.36.6 // indirect
+	google.golang.org/protobuf v1.36.4 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
-	gopkg.in/yaml.v3 v3.0.1
-	modernc.org/libc v1.66.10 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+	modernc.org/libc v1.66.3 // indirect
 	modernc.org/mathutil v1.7.1 // indirect
 	modernc.org/memory v1.11.0 // indirect
 )
 
-require (
-	github.com/aws/aws-sdk-go-v2 v1.36.5 // indirect
-	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.10 // indirect
-	github.com/aws/aws-sdk-go-v2/config v1.29.17 // indirect
-	github.com/aws/aws-sdk-go-v2/credentials v1.17.70 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.32 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.36 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.36 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.34 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.4 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.2 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.17 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.15 // indirect
-	github.com/aws/aws-sdk-go-v2/service/s3 v1.80.1 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.25.5 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.3 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sts v1.34.0 // indirect
-	github.com/aws/smithy-go v1.22.4 // indirect
-	github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.65 // indirect
-)
-
 retract (
 	v1.25.0 // published with a replace directive (confusing for API users)
 	v0.53.2

internal/cache/README.md

@@ -18,7 +18,7 @@ based on the _structure_ of the provided type.
 If the structure changes in any way it will end up with a new version key and all will re populate this new key,
 ignoring cached values from older, different versions.
 The resolver will store items using the `json` package to serialize/deserialize values, so to save space
-it is encouraged to use `omitempty`. For example:
+it is encouraged  to use `omitempty`. For example:
 
 ```go
 type myCacheItem struct {

internal/capabilities/pkgtestobservation/model.go

@@ -1,46 +0,0 @@
-package pkgtestobservation
-
-import "time"
-
-// Observations represents capability observations during testing
-type Observations struct {
-	License       bool         `json:"license"`
-	Relationships Relationship `json:"relationships"`
-	FileListing   Count        `json:"file_listing"`
-	FileDigests   Count        `json:"file_digests"`
-	IntegrityHash Count        `json:"integrity_hash"`
-}
-
-// Relationship tracks dependency relationship observations
-type Relationship struct {
-	Found bool `json:"found"`
-	Count int  `json:"count"`
-}
-
-// Count tracks whether a capability was found and how many times
-type Count struct {
-	Found bool `json:"found"`
-	Count int  `json:"count"`
-}
-
-// Test is the root structure for test-observations.json
-type Test struct {
-	Package    string                `json:"package"`
-	UpdatedAt  time.Time             `json:"updated_at"`
-	Catalogers map[string]*Cataloger `json:"catalogers"`
-	Parsers    map[string]*Parser    `json:"parsers"`
-}
-
-// Parser captures all observations for a parser
-type Parser struct {
-	MetadataTypes []string     `json:"metadata_types"`
-	PackageTypes  []string     `json:"package_types"`
-	Observations  Observations `json:"observations"`
-}
-
-// Cataloger captures all observations for a cataloger
-type Cataloger struct {
-	MetadataTypes []string     `json:"metadata_types"`
-	PackageTypes  []string     `json:"package_types"`
-	Observations  Observations `json:"observations"`
-}

internal/constants.go

@@ -3,5 +3,5 @@ package internal
 const (
 	// JSONSchemaVersion is the current schema version output by the JSON encoder
 	// This is roughly following the "SchemaVer" guidelines for versioning the JSON schema. Please see schema/json/README.md for details on how to increment.
-	JSONSchemaVersion = "16.0.41"
+	JSONSchemaVersion = "16.0.39"
 )

internal/jsonschema/README.md

@@ -1 +0,0 @@
-Please see [schema/json/README.md](../../schema/json/README.md) for more information on the JSON schema files in this directory.

internal/jsonschema/comments.go

@@ -1,159 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"go/ast"
-	"go/parser"
-	"go/token"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/invopop/jsonschema"
-)
-
-func copyAliasFieldComments(commentMap map[string]string, repoRoot string) {
-	// find all type aliases by parsing Go source files
-	aliases := findTypeAliases(repoRoot)
-
-	// for each alias, copy field comments from the source type
-	for aliasName, sourceName := range aliases {
-		// find all field comments for the source type
-		for key, comment := range commentMap {
-			// check if this is a field comment for the source type
-			// format: "github.com/anchore/syft/syft/pkg.SourceType.FieldName"
-			if strings.Contains(key, "."+sourceName+".") {
-				// create the corresponding key for the alias
-				aliasKey := strings.Replace(key, "."+sourceName+".", "."+aliasName+".", 1)
-				commentMap[aliasKey] = comment
-			}
-		}
-	}
-}
-
-func findTypeAliases(repoRoot string) map[string]string {
-	aliases := make(map[string]string)
-	fset := token.NewFileSet()
-
-	// walk through all Go files in the repo
-	err := filepath.Walk(repoRoot, func(path string, info os.FileInfo, err error) error {
-		if err != nil || info.IsDir() || !strings.HasSuffix(path, ".go") {
-			return nil
-		}
-
-		// parse the file
-		file, err := parser.ParseFile(fset, path, nil, parser.ParseComments)
-		if err != nil {
-			return nil
-		}
-
-		// look for type alias declarations
-		ast.Inspect(file, func(n ast.Node) bool {
-			typeSpec, ok := n.(*ast.TypeSpec)
-			if !ok {
-				return true
-			}
-
-			// check if this is a type alias (e.g., type A B where B is an identifier)
-			ident, ok := typeSpec.Type.(*ast.Ident)
-			if !ok {
-				return true
-			}
-
-			// store the alias mapping: aliasName -> sourceName
-			aliases[typeSpec.Name.Name] = ident.Name
-			return true
-		})
-
-		return nil
-	})
-
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "error: failed to find type aliases: %v\n", err)
-		panic(err)
-	}
-
-	return aliases
-}
-
-func hasDescriptionInAlternatives(schema *jsonschema.Schema) bool {
-	// check oneOf alternatives
-	for _, alt := range schema.OneOf {
-		if alt.Description != "" {
-			return true
-		}
-	}
-	// check anyOf alternatives
-	for _, alt := range schema.AnyOf {
-		if alt.Description != "" {
-			return true
-		}
-	}
-	return false
-}
-
-func warnMissingDescriptions(schema *jsonschema.Schema, metadataNames []string) { //nolint:gocognit
-	var missingTypeDescriptions []string
-	var missingFieldDescriptions []string
-
-	// check metadata types for missing descriptions
-	for _, name := range metadataNames {
-		def, ok := schema.Definitions[name]
-		if !ok {
-			continue
-		}
-
-		// check if type has a description
-		if def.Description == "" {
-			missingTypeDescriptions = append(missingTypeDescriptions, name)
-		}
-
-		// check if fields have descriptions
-		if def.Properties != nil {
-			for _, fieldName := range def.Properties.Keys() {
-				fieldSchemaRaw, _ := def.Properties.Get(fieldName)
-				fieldSchema, ok := fieldSchemaRaw.(*jsonschema.Schema)
-				if !ok {
-					continue
-				}
-
-				// skip if field has a description
-				if fieldSchema.Description != "" {
-					continue
-				}
-
-				// skip if field is a reference (descriptions come from the referenced type)
-				if fieldSchema.Ref != "" {
-					continue
-				}
-
-				// skip if field is an array/object with items that are references
-				if fieldSchema.Items != nil && fieldSchema.Items.Ref != "" {
-					continue
-				}
-
-				// skip if field uses oneOf/anyOf with descriptions in the alternatives
-				if hasDescriptionInAlternatives(fieldSchema) {
-					continue
-				}
-
-				missingFieldDescriptions = append(missingFieldDescriptions, fmt.Sprintf("%s.%s", name, fieldName))
-			}
-		}
-	}
-
-	// report findings
-	if len(missingTypeDescriptions) > 0 {
-		fmt.Fprintf(os.Stderr, "\nwarning: %d metadata types are missing descriptions:\n", len(missingTypeDescriptions))
-		for _, name := range missingTypeDescriptions {
-			fmt.Fprintf(os.Stderr, "  - %s\n", name)
-		}
-	}
-
-	if len(missingFieldDescriptions) > 0 {
-		fmt.Fprintf(os.Stderr, "\nwarning: %d fields are missing descriptions:\n", len(missingFieldDescriptions))
-		for _, field := range missingFieldDescriptions {
-			fmt.Fprintf(os.Stderr, "  - %s\n", field)
-		}
-	}
-}

internal/jsonschema/comments_test.go

@@ -1,382 +0,0 @@
-package main
-
-import (
-	"os"
-	"path/filepath"
-	"testing"
-
-	"github.com/iancoleman/orderedmap"
-	"github.com/invopop/jsonschema"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-// TestCopyAliasFieldComments verifies that field comments from source types are correctly copied to alias types.
-// This is important for type aliases like `type RpmArchive RpmDBEntry` where the alias should inherit all field descriptions.
-func TestCopyAliasFieldComments(t *testing.T) {
-	tests := []struct {
-		name         string
-		commentMap   map[string]string
-		aliases      map[string]string
-		wantComments map[string]string
-	}{
-		{
-			name: "copies field comments from source type to alias",
-			commentMap: map[string]string{
-				"github.com/anchore/syft/syft/pkg.RpmDBEntry":       "RpmDBEntry represents all captured data from a RPM DB package entry.",
-				"github.com/anchore/syft/syft/pkg.RpmDBEntry.Name":  "Name is the RPM package name.",
-				"github.com/anchore/syft/syft/pkg.RpmDBEntry.Epoch": "Epoch is the version epoch.",
-			},
-			aliases: map[string]string{
-				"RpmArchive": "RpmDBEntry",
-			},
-			wantComments: map[string]string{
-				"github.com/anchore/syft/syft/pkg.RpmDBEntry":       "RpmDBEntry represents all captured data from a RPM DB package entry.",
-				"github.com/anchore/syft/syft/pkg.RpmDBEntry.Name":  "Name is the RPM package name.",
-				"github.com/anchore/syft/syft/pkg.RpmDBEntry.Epoch": "Epoch is the version epoch.",
-				"github.com/anchore/syft/syft/pkg.RpmArchive.Name":  "Name is the RPM package name.",
-				"github.com/anchore/syft/syft/pkg.RpmArchive.Epoch": "Epoch is the version epoch.",
-			},
-		},
-		{
-			name: "handles multiple aliases",
-			commentMap: map[string]string{
-				"github.com/anchore/syft/syft/pkg.DpkgDBEntry":              "DpkgDBEntry represents data from dpkg.",
-				"github.com/anchore/syft/syft/pkg.DpkgDBEntry.Package":      "Package is the package name.",
-				"github.com/anchore/syft/syft/pkg.DpkgDBEntry.Architecture": "Architecture is the target arch.",
-			},
-			aliases: map[string]string{
-				"DpkgArchiveEntry": "DpkgDBEntry",
-				"DpkgSnapshot":     "DpkgDBEntry",
-			},
-			wantComments: map[string]string{
-				"github.com/anchore/syft/syft/pkg.DpkgDBEntry":                   "DpkgDBEntry represents data from dpkg.",
-				"github.com/anchore/syft/syft/pkg.DpkgDBEntry.Package":           "Package is the package name.",
-				"github.com/anchore/syft/syft/pkg.DpkgDBEntry.Architecture":      "Architecture is the target arch.",
-				"github.com/anchore/syft/syft/pkg.DpkgArchiveEntry.Package":      "Package is the package name.",
-				"github.com/anchore/syft/syft/pkg.DpkgArchiveEntry.Architecture": "Architecture is the target arch.",
-				"github.com/anchore/syft/syft/pkg.DpkgSnapshot.Package":          "Package is the package name.",
-				"github.com/anchore/syft/syft/pkg.DpkgSnapshot.Architecture":     "Architecture is the target arch.",
-			},
-		},
-		{
-			name: "does not copy non-field comments",
-			commentMap: map[string]string{
-				"github.com/anchore/syft/syft/pkg.SomeType":       "SomeType struct comment.",
-				"github.com/anchore/syft/syft/pkg.SomeType.Field": "Field comment.",
-			},
-			aliases: map[string]string{
-				"AliasType": "SomeType",
-			},
-			wantComments: map[string]string{
-				"github.com/anchore/syft/syft/pkg.SomeType":        "SomeType struct comment.",
-				"github.com/anchore/syft/syft/pkg.SomeType.Field":  "Field comment.",
-				"github.com/anchore/syft/syft/pkg.AliasType.Field": "Field comment.",
-			},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			// create temp dir for testing
-			tmpDir := t.TempDir()
-
-			// create a test go file with type aliases
-			testFile := filepath.Join(tmpDir, "test.go")
-			content := "package test\n\n"
-			for alias, source := range tt.aliases {
-				content += "type " + alias + " " + source + "\n"
-			}
-			err := os.WriteFile(testFile, []byte(content), 0644)
-			require.NoError(t, err)
-
-			// make a copy of the comment map since the function modifies it
-			commentMap := make(map[string]string)
-			for k, v := range tt.commentMap {
-				commentMap[k] = v
-			}
-
-			// run the function
-			copyAliasFieldComments(commentMap, tmpDir)
-
-			// verify results
-			assert.Equal(t, tt.wantComments, commentMap)
-		})
-	}
-}
-
-func TestFindTypeAliases(t *testing.T) {
-	tests := []struct {
-		name        string
-		fileContent string
-		wantAliases map[string]string
-	}{
-		{
-			name: "finds simple type alias",
-			fileContent: `package test
-
-type RpmArchive RpmDBEntry
-type DpkgArchiveEntry DpkgDBEntry
-`,
-			wantAliases: map[string]string{
-				"RpmArchive":       "RpmDBEntry",
-				"DpkgArchiveEntry": "DpkgDBEntry",
-			},
-		},
-		{
-			name: "ignores struct definitions",
-			fileContent: `package test
-
-type MyStruct struct {
-	Field string
-}
-
-type AliasType BaseType
-`,
-			wantAliases: map[string]string{
-				"AliasType": "BaseType",
-			},
-		},
-		{
-			name: "ignores interface definitions",
-			fileContent: `package test
-
-type MyInterface interface {
-	Method()
-}
-
-type AliasType BaseType
-`,
-			wantAliases: map[string]string{
-				"AliasType": "BaseType",
-			},
-		},
-		{
-			name: "handles multiple files",
-			fileContent: `package test
-
-type Alias1 Base1
-type Alias2 Base2
-`,
-			wantAliases: map[string]string{
-				"Alias1": "Base1",
-				"Alias2": "Base2",
-			},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			// create temp dir
-			tmpDir := t.TempDir()
-
-			// write test file
-			testFile := filepath.Join(tmpDir, "test.go")
-			err := os.WriteFile(testFile, []byte(tt.fileContent), 0644)
-			require.NoError(t, err)
-
-			// run function
-			aliases := findTypeAliases(tmpDir)
-
-			// verify
-			assert.Equal(t, tt.wantAliases, aliases)
-		})
-	}
-}
-
-func TestHasDescriptionInAlternatives(t *testing.T) {
-	tests := []struct {
-		name   string
-		schema *jsonschema.Schema
-		want   bool
-	}{
-		{
-			name: "returns true when oneOf has description",
-			schema: &jsonschema.Schema{
-				OneOf: []*jsonschema.Schema{
-					{Description: "First alternative"},
-					{Type: "null"},
-				},
-			},
-			want: true,
-		},
-		{
-			name: "returns true when anyOf has description",
-			schema: &jsonschema.Schema{
-				AnyOf: []*jsonschema.Schema{
-					{Description: "First alternative"},
-					{Type: "null"},
-				},
-			},
-			want: true,
-		},
-		{
-			name: "returns false when no alternatives have descriptions",
-			schema: &jsonschema.Schema{
-				OneOf: []*jsonschema.Schema{
-					{Type: "integer"},
-					{Type: "null"},
-				},
-			},
-			want: false,
-		},
-		{
-			name: "returns false when no oneOf or anyOf",
-			schema: &jsonschema.Schema{
-				Type: "string",
-			},
-			want: false,
-		},
-		{
-			name: "returns true when any alternative in oneOf has description",
-			schema: &jsonschema.Schema{
-				OneOf: []*jsonschema.Schema{
-					{Type: "integer"},
-					{Type: "string", Description: "Second alternative"},
-					{Type: "null"},
-				},
-			},
-			want: true,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got := hasDescriptionInAlternatives(tt.schema)
-			assert.Equal(t, tt.want, got)
-		})
-	}
-}
-
-func TestWarnMissingDescriptions(t *testing.T) {
-	tests := []struct {
-		name              string
-		schema            *jsonschema.Schema
-		metadataNames     []string
-		wantTypeWarnings  int
-		wantFieldWarnings int
-	}{
-		{
-			name: "no warnings when all types have descriptions",
-			schema: &jsonschema.Schema{
-				Definitions: map[string]*jsonschema.Schema{
-					"TypeA": {
-						Description: "Type A description",
-						Properties: newOrderedMap(map[string]*jsonschema.Schema{
-							"field1": {Type: "string", Description: "Field 1"},
-						}),
-					},
-				},
-			},
-			metadataNames:     []string{"TypeA"},
-			wantTypeWarnings:  0,
-			wantFieldWarnings: 0,
-		},
-		{
-			name: "warns about missing type description",
-			schema: &jsonschema.Schema{
-				Definitions: map[string]*jsonschema.Schema{
-					"TypeA": {
-						Properties: newOrderedMap(map[string]*jsonschema.Schema{
-							"field1": {Type: "string", Description: "Field 1"},
-						}),
-					},
-				},
-			},
-			metadataNames:     []string{"TypeA"},
-			wantTypeWarnings:  1,
-			wantFieldWarnings: 0,
-		},
-		{
-			name: "warns about missing field description",
-			schema: &jsonschema.Schema{
-				Definitions: map[string]*jsonschema.Schema{
-					"TypeA": {
-						Description: "Type A description",
-						Properties: newOrderedMap(map[string]*jsonschema.Schema{
-							"field1": {Type: "string"},
-						}),
-					},
-				},
-			},
-			metadataNames:     []string{"TypeA"},
-			wantTypeWarnings:  0,
-			wantFieldWarnings: 1,
-		},
-		{
-			name: "skips fields with references",
-			schema: &jsonschema.Schema{
-				Definitions: map[string]*jsonschema.Schema{
-					"TypeA": {
-						Description: "Type A description",
-						Properties: newOrderedMap(map[string]*jsonschema.Schema{
-							"field1": {Ref: "#/$defs/OtherType"},
-						}),
-					},
-				},
-			},
-			metadataNames:     []string{"TypeA"},
-			wantTypeWarnings:  0,
-			wantFieldWarnings: 0,
-		},
-		{
-			name: "skips fields with items that are references",
-			schema: &jsonschema.Schema{
-				Definitions: map[string]*jsonschema.Schema{
-					"TypeA": {
-						Description: "Type A description",
-						Properties: newOrderedMap(map[string]*jsonschema.Schema{
-							"field1": {
-								Type:  "array",
-								Items: &jsonschema.Schema{Ref: "#/$defs/OtherType"},
-							},
-						}),
-					},
-				},
-			},
-			metadataNames:     []string{"TypeA"},
-			wantTypeWarnings:  0,
-			wantFieldWarnings: 0,
-		},
-		{
-			name: "skips fields with oneOf containing descriptions",
-			schema: &jsonschema.Schema{
-				Definitions: map[string]*jsonschema.Schema{
-					"TypeA": {
-						Description: "Type A description",
-						Properties: newOrderedMap(map[string]*jsonschema.Schema{
-							"field1": {
-								OneOf: []*jsonschema.Schema{
-									{Type: "integer", Description: "Integer value"},
-									{Type: "null"},
-								},
-							},
-						}),
-					},
-				},
-			},
-			metadataNames:     []string{"TypeA"},
-			wantTypeWarnings:  0,
-			wantFieldWarnings: 0,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			// capture stderr output would require more complex testing
-			// for now, just verify the function runs without panicking
-			require.NotPanics(t, func() {
-				warnMissingDescriptions(tt.schema, tt.metadataNames)
-			})
-		})
-	}
-}
-
-// helper to create an ordered map from a regular map
-func newOrderedMap(m map[string]*jsonschema.Schema) *orderedmap.OrderedMap {
-	om := orderedmap.New()
-	for k, v := range m {
-		om.Set(k, v)
-	}
-	return om
-}

internal/os/feature_detection_test.go

@@ -81,10 +81,6 @@ func Test_EnvironmentTask(t *testing.T) {
 			// get the source
 			theSource, err := syft.GetSource(context.Background(), tarPath, syft.DefaultGetSourceConfig().WithSources("docker-archive"))
 			require.NoError(t, err)
-			t.Cleanup(func() {
-				require.NoError(t, theSource.Close())
-			})
-
 			resolver, err := theSource.FileResolver(source.SquashedScope)
 			require.NoError(t, err)
 

internal/spdxlicense/generate/generate_license_list.go

@@ -10,6 +10,7 @@ import (
 	"sort"
 	"strings"
 	"text/template"
+	"time"
 )
 
 // This program generates license_list.go.
@@ -19,7 +20,8 @@ const (
 )
 
 var tmp = template.Must(template.New("").Parse(`// Code generated by go generate; DO NOT EDIT.
-// This file was generated using data from {{ .URL }}
+// This file was generated by robots at {{ .Timestamp }}
+// using data from {{ .URL }}
 package spdxlicense
 
 const Version = {{ printf "%q" .Version }}
@@ -76,11 +78,13 @@ func run() error {
 	urlToLicense := buildURLToLicenseMap(result)
 
 	err = tmp.Execute(f, struct {
+		Timestamp    time.Time
 		URL          string
 		Version      string
 		LicenseIDs   map[string]string
 		URLToLicense map[string]string
 	}{
+		Timestamp:    time.Now(),
 		URL:          url,
 		Version:      result.Version,
 		LicenseIDs:   licenseIDs,

internal/task/package_tasks.go

@@ -32,7 +32,6 @@ import (
 	"github.com/anchore/syft/syft/pkg/cataloger/ruby"
 	"github.com/anchore/syft/syft/pkg/cataloger/rust"
 	sbomCataloger "github.com/anchore/syft/syft/pkg/cataloger/sbom"
-	"github.com/anchore/syft/syft/pkg/cataloger/snap"
 	"github.com/anchore/syft/syft/pkg/cataloger/swift"
 	"github.com/anchore/syft/syft/pkg/cataloger/swipl"
 	"github.com/anchore/syft/syft/pkg/cataloger/terraform"
@@ -174,7 +173,6 @@ func DefaultPackageTaskFactories() Factories {
 		newSimplePackageTaskFactory(terraform.NewLockCataloger, pkgcataloging.DeclaredTag, pkgcataloging.DirectoryTag, "terraform"),
 		newSimplePackageTaskFactory(homebrew.NewCataloger, pkgcataloging.DirectoryTag, pkgcataloging.InstalledTag, pkgcataloging.ImageTag, "homebrew"),
 		newSimplePackageTaskFactory(conda.NewCondaMetaCataloger, pkgcataloging.DirectoryTag, pkgcataloging.InstalledTag, pkgcataloging.PackageTag, "conda"),
-		newSimplePackageTaskFactory(snap.NewCataloger, pkgcataloging.DirectoryTag, pkgcataloging.InstalledTag, pkgcataloging.ImageTag, "snap"),
 
 		// deprecated catalogers ////////////////////////////////////////
 		// these are catalogers that should not be selectable other than specific inclusion via name or "deprecated" tag (to remain backwards compatible)

schema/cyclonedx/README.md

@@ -13,6 +13,6 @@ prior spec version (e.g. if updating to 1.7, compare the files in this directory
 equivalents). 
 
 One can also update the schemas and observe the errors in order to make the necessary updates. 
-At the time of writing, the cyclonedx.xsd needed modifications to link to the local spdx.xsd,
-and also to change the minOccurs for a license tag to 0. (The json schema does not require
+At the time of writing, the cyclonedx.xsd needed modifications to link to the local spdx.xsd, 
+and also to changes the minOccurs for a license tag to 0. (The json schema does not require 
 modification for the generated file to lint properly, but can simply be copy/pasted).   

syft/file/cataloger/executable/macho.go

@@ -3,7 +3,6 @@ package executable
 import (
 	"debug/macho"
 
-	"github.com/anchore/syft/internal"
 	"github.com/anchore/syft/syft/file"
 	"github.com/anchore/syft/syft/internal/unionreader"
 )
@@ -20,38 +19,20 @@ const (
 func findMachoFeatures(data *file.Executable, reader unionreader.UnionReader) error {
 	// TODO: support security features
 
-	// a universal binary may have multiple architectures, so we need to check each one
-	readers, err := unionreader.GetReaders(reader)
+	// TODO: support multi-architecture binaries
+	f, err := macho.NewFile(reader)
 	if err != nil {
 		return err
 	}
 
-	var libs []string
-	for _, r := range readers {
-		f, err := macho.NewFile(r)
-		if err != nil {
-			return err
-		}
-
-		rLibs, err := f.ImportedLibraries()
-		if err != nil {
-			return err
-		}
-		libs = append(libs, rLibs...)
-
-		// TODO handle only some having entrypoints/exports? If that is even practical
-		// only check for entrypoint if we don't already have one
-		if !data.HasEntrypoint {
-			data.HasEntrypoint = machoHasEntrypoint(f)
-		}
-		// only check for exports if we don't already have them
-		if !data.HasExports {
-			data.HasExports = machoHasExports(f)
-		}
+	libs, err := f.ImportedLibraries()
+	if err != nil {
+		return err
 	}
 
-	// de-duplicate libraries
-	data.ImportedLibraries = internal.NewSet(libs...).ToSlice()
+	data.ImportedLibraries = libs
+	data.HasEntrypoint = machoHasEntrypoint(f)
+	data.HasExports = machoHasExports(f)
 
 	return nil
 }

syft/file/cataloger/executable/macho_test.go

@@ -9,7 +9,6 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/anchore/syft/syft/file"
 	"github.com/anchore/syft/syft/internal/unionreader"
 )
 
@@ -84,39 +83,3 @@ func Test_machoHasExports(t *testing.T) {
 		})
 	}
 }
-
-func Test_machoUniversal(t *testing.T) {
-	readerForFixture := func(t *testing.T, fixture string) unionreader.UnionReader {
-		t.Helper()
-		f, err := os.Open(filepath.Join("test-fixtures/shared-info", fixture))
-		require.NoError(t, err)
-		return f
-	}
-
-	tests := []struct {
-		name    string
-		fixture string
-		want    file.Executable
-	}{
-		{
-			name:    "universal lib",
-			fixture: "bin/libhello_universal.dylib",
-			want:    file.Executable{HasExports: true, HasEntrypoint: false},
-		},
-		{
-			name:    "universal application",
-			fixture: "bin/hello_mac_universal",
-			want:    file.Executable{HasExports: false, HasEntrypoint: true},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			var data file.Executable
-			err := findMachoFeatures(&data, readerForFixture(t, tt.fixture))
-			require.NoError(t, err)
-
-			assert.Equal(t, tt.want.HasEntrypoint, data.HasEntrypoint)
-			assert.Equal(t, tt.want.HasExports, data.HasExports)
-		})
-	}
-}

syft/file/cataloger/executable/test-fixtures/shared-info/project/hello/Makefile

@@ -2,13 +2,13 @@
 
 BIN=../../bin
 
-all: $(BIN)/hello_linux $(BIN)/hello.exe $(BIN)/hello_mac $(BIN)/hello_mac_universal
+all: $(BIN)/hello_linux $(BIN)/hello.exe $(BIN)/hello_mac
 
 linux: $(BIN)/libhello.so
 
 windows: $(BIN)/libhello.dll
 
-mac: $(BIN)/libhello.dylib $(BIN)/hello_mac_universal
+mac: $(BIN)/libhello.dylib
 
 $(BIN)/hello_linux:
 	gcc hello.c -o $(BIN)/hello_linux
@@ -19,8 +19,5 @@ $(BIN)/hello.exe:
 $(BIN)/hello_mac:
 	o64-clang hello.c -o $(BIN)/hello_mac
 
-$(BIN)/hello_mac_universal:
-	o64-clang -arch arm64 -arch x86_64 hello.c -o $(BIN)/hello_mac_universal
-
 clean:
-	rm -f $(BIN)/hello_linux $(BIN)/hello.exe $(BIN)/hello_mac $(BIN)/hello_mac_universal
+	rm -f $(BIN)/hello_linux $(BIN)/hello.exe $(BIN)/hello_mac

syft/file/cataloger/executable/test-fixtures/shared-info/project/libhello/Makefile

@@ -2,13 +2,13 @@
 
 BIN=../../bin
 
-all:  $(BIN)/libhello.so  $(BIN)/libhello.dll $(BIN)/libhello.dylib $(BIN)/libhello_universal.dylib
+all:  $(BIN)/libhello.so  $(BIN)/libhello.dll $(BIN)/libhello.dylib
 
 linux: $(BIN)/libhello.so
 
 windows: $(BIN)/libhello.dll
 
-mac: $(BIN)/libhello.dylib $(BIN)/libhello_universal.dylib
+mac: $(BIN)/libhello.dylib
 
 $(BIN)/libhello.so:
 	gcc -shared -fPIC -o $(BIN)/libhello.so hello.c
@@ -19,8 +19,5 @@ $(BIN)/libhello.dll:
 $(BIN)/libhello.dylib:
 	o64-clang -dynamiclib -o $(BIN)/libhello.dylib hello.c
 
-$(BIN)/libhello_universal.dylib:
-	o64-clang -dynamiclib -arch arm64 -arch x86_64 hello.c -o $(BIN)/libhello_universal.dylib
-
 clean:
-	rm -f $(BIN)/libhello.so $(BIN)/hello.dll $(BIN)/libhello.dylib $(BIN)/libhello.a $(BIN)/libhello_universal.dylib
+	rm -f $(BIN)/libhello.so $(BIN)/hello.dll $(BIN)/libhello.dylib $(BIN)/libhello.a

syft/file/coordinate_set.go

@@ -7,7 +7,6 @@ import (
 	"github.com/scylladb/go-set/strset"
 )
 
-// CoordinateSet provides a unique collection of Coordinates with set operations.
 type CoordinateSet struct {
 	set map[Coordinates]struct{}
 }

syft/file/coordinates.go

@@ -9,11 +9,8 @@ import (
 
 // Coordinates contains the minimal information needed to describe how to find a file within any possible source object (e.g. image and directory sources)
 type Coordinates struct {
-	// RealPath is the canonical absolute form of the path accessed (all symbolic links have been followed and relative path components like '.' and '..' have been removed).
-	RealPath string `json:"path" cyclonedx:"path"`
-
-	// FileSystemID is an ID representing and entire filesystem. For container images, this is a layer digest. For directories or a root filesystem, this is blank.
-	FileSystemID string `json:"layerID,omitempty" cyclonedx:"layerID"`
+	RealPath     string `json:"path" cyclonedx:"path"`                 // The path where all path ancestors have no hardlinks / symlinks
+	FileSystemID string `json:"layerID,omitempty" cyclonedx:"layerID"` // An ID representing the filesystem. For container images, this is a layer digest. For directories or a root filesystem, this is blank.
 }
 
 func NewCoordinates(realPath, fsID string) Coordinates {

syft/file/digest.go

@@ -1,10 +1,6 @@
 package file
 
-// Digest represents a cryptographic hash of file contents.
 type Digest struct {
-	// Algorithm specifies the hash algorithm used (e.g., "sha256", "md5").
 	Algorithm string `json:"algorithm"`
-
-	// Value is the hexadecimal string representation of the hash.
-	Value string `json:"value"`
+	Value     string `json:"value"`
 }

syft/file/executable.go

@@ -1,60 +1,40 @@
 package file
 
 type (
-	// ExecutableFormat represents the binary executable format type.
-	ExecutableFormat string
-
-	// RelocationReadOnly indicates the RELRO security protection level applied to an ELF binary.
+	ExecutableFormat   string
 	RelocationReadOnly string
 )
 
 const (
-	ELF   ExecutableFormat = "elf"   // Executable and Linkable Format used on Unix-like systems
-	MachO ExecutableFormat = "macho" // Mach object file format used on macOS and iOS
-	PE    ExecutableFormat = "pe"    // Portable Executable format used on Windows
+	ELF   ExecutableFormat = "elf"
+	MachO ExecutableFormat = "macho"
+	PE    ExecutableFormat = "pe"
 
-	RelocationReadOnlyNone    RelocationReadOnly = "none"    // no RELRO protection
-	RelocationReadOnlyPartial RelocationReadOnly = "partial" // partial RELRO protection
-	RelocationReadOnlyFull    RelocationReadOnly = "full"    // full RELRO protection
+	RelocationReadOnlyNone    RelocationReadOnly = "none"
+	RelocationReadOnlyPartial RelocationReadOnly = "partial"
+	RelocationReadOnlyFull    RelocationReadOnly = "full"
 )
 
-// Executable contains metadata about binary files and their security features.
 type Executable struct {
 	// Format denotes either ELF, Mach-O, or PE
 	Format ExecutableFormat `json:"format" yaml:"format" mapstructure:"format"`
 
-	// HasExports indicates whether the binary exports symbols.
-	HasExports bool `json:"hasExports" yaml:"hasExports" mapstructure:"hasExports"`
-
-	// HasEntrypoint indicates whether the binary has an entry point function.
-	HasEntrypoint bool `json:"hasEntrypoint" yaml:"hasEntrypoint" mapstructure:"hasEntrypoint"`
-
-	// ImportedLibraries lists the shared libraries required by this executable.
-	ImportedLibraries []string `json:"importedLibraries" yaml:"importedLibraries" mapstructure:"importedLibraries"`
-
-	// ELFSecurityFeatures contains ELF-specific security hardening information when Format is ELF.
+	HasExports          bool                 `json:"hasExports" yaml:"hasExports" mapstructure:"hasExports"`
+	HasEntrypoint       bool                 `json:"hasEntrypoint" yaml:"hasEntrypoint" mapstructure:"hasEntrypoint"`
+	ImportedLibraries   []string             `json:"importedLibraries" yaml:"importedLibraries" mapstructure:"importedLibraries"`
 	ELFSecurityFeatures *ELFSecurityFeatures `json:"elfSecurityFeatures,omitempty" yaml:"elfSecurityFeatures" mapstructure:"elfSecurityFeatures"`
 }
 
-// ELFSecurityFeatures captures security hardening and protection mechanisms in ELF binaries.
 type ELFSecurityFeatures struct {
-	// SymbolTableStripped indicates whether debugging symbols have been removed.
 	SymbolTableStripped bool `json:"symbolTableStripped" yaml:"symbolTableStripped" mapstructure:"symbolTableStripped"`
 
-	// StackCanary indicates whether stack smashing protection is enabled.
-	StackCanary *bool `json:"stackCanary,omitempty" yaml:"stackCanary" mapstructure:"stackCanary"`
+	// classic protections
 
-	// NoExecutable indicates whether NX (no-execute) protection is enabled for the stack.
-	NoExecutable bool `json:"nx" yaml:"nx" mapstructure:"nx"`
-
-	// RelocationReadOnly indicates the RELRO protection level.
-	RelocationReadOnly RelocationReadOnly `json:"relRO" yaml:"relRO" mapstructure:"relRO"`
-
-	// PositionIndependentExecutable indicates whether the binary is compiled as PIE.
-	PositionIndependentExecutable bool `json:"pie" yaml:"pie" mapstructure:"pie"`
-
-	// DynamicSharedObject indicates whether the binary is a shared library.
-	DynamicSharedObject bool `json:"dso" yaml:"dso" mapstructure:"dso"`
+	StackCanary                   *bool              `json:"stackCanary,omitempty" yaml:"stackCanary" mapstructure:"stackCanary"`
+	NoExecutable                  bool               `json:"nx" yaml:"nx" mapstructure:"nx"`
+	RelocationReadOnly            RelocationReadOnly `json:"relRO" yaml:"relRO" mapstructure:"relRO"`
+	PositionIndependentExecutable bool               `json:"pie" yaml:"pie" mapstructure:"pie"`
+	DynamicSharedObject           bool               `json:"dso" yaml:"dso" mapstructure:"dso"`
 
 	// LlvmSafeStack represents a compiler-based security mechanism that separates the stack into a safe stack for storing return addresses and other critical data, and an unsafe stack for everything else, to mitigate stack-based memory corruption errors
 	// see https://clang.llvm.org/docs/SafeStack.html

syft/file/license.go

@@ -5,33 +5,18 @@ import (
 	"github.com/anchore/syft/syft/license"
 )
 
-// License represents license information discovered within a file.
 type License struct {
-	// Value is the raw license string as found in the file.
-	Value string
-
-	// SPDXExpression is the parsed SPDX license expression if available.
-	SPDXExpression string
-
-	// Type categorizes how the license was determined (e.g., declared, concluded -- following the same semantics as SPDX).
-	Type license.Type
-
-	LicenseEvidence *LicenseEvidence
-
-	// Contents optionally stores the full license text.
-	Contents string `hash:"ignore"`
+	Value           string
+	SPDXExpression  string
+	Type            license.Type
+	LicenseEvidence *LicenseEvidence // evidence from license classifier
+	Contents        string           `hash:"ignore"`
 }
 
-// LicenseEvidence contains details from license classifier analysis.
 type LicenseEvidence struct {
-	// Confidence is a score indicating certainty of the license match.
 	Confidence int
-
-	// Offset is the byte position where the license text begins in the file.
-	Offset int
-
-	// Extent is the length in bytes of the matched license text.
-	Extent int
+	Offset     int
+	Extent     int
 }
 
 func NewLicense(value string) License {

syft/file/location.go

@@ -27,24 +27,18 @@ type Location struct {
 	LocationMetadata `cyclonedx:""`
 }
 
-// LocationData contains the core identifying information for a file location.
 type LocationData struct {
 	Coordinates `cyclonedx:""` // Empty string here means there is no intermediate property name, e.g. syft:locations:0:path without "coordinates"
 	// note: it is IMPORTANT to ignore anything but the coordinates for a Location when considering the ID (hash value)
 	// since the coordinates are the minimally correct ID for a location (symlinks should not come into play)
-
-	// AccessPath is the path used to retrieve file contents (which may or may not have hardlinks / symlinks in the path)
-	AccessPath string `hash:"ignore" json:"accessPath"`
-
-	// ref is the stereoscope file reference relative to the stereoscope.FileCatalog that has more information about this location.
-	ref file.Reference `hash:"ignore"`
+	AccessPath string         `hash:"ignore" json:"accessPath"` // The path to the file which may or may not have hardlinks / symlinks
+	ref        file.Reference `hash:"ignore"`                   // The file reference relative to the stereoscope.FileCatalog that has more information about this location.
 }
 
 func (l LocationData) Reference() file.Reference {
 	return l.ref
 }
 
-// LocationMetadata provides additional contextual information about a file location.
 type LocationMetadata struct {
 	Annotations map[string]string `json:"annotations,omitempty"` // Arbitrary key-value pairs that can be used to annotate a location
 }

syft/file/location_read_closer.go

@@ -2,7 +2,6 @@ package file
 
 import "io"
 
-// LocationReadCloser combines a Location with a ReadCloser for accessing file content with location metadata.
 type LocationReadCloser struct {
 	Location
 	io.ReadCloser

syft/file/location_set.go

@@ -9,7 +9,6 @@ import (
 	"github.com/anchore/syft/internal/log"
 )
 
-// LocationSet provides a unique collection of Locations with metadata and set operations.
 type LocationSet struct {
 	set map[LocationData]LocationMetadata
 }

syft/file/locations.go

@@ -8,7 +8,6 @@ import (
 
 var locationSorterWithoutLayers = LocationSorter(nil)
 
-// Locations is a sortable slice of Location values.
 type Locations []Location
 
 func (l Locations) Len() int {

syft/file/resolver.go

@@ -18,7 +18,6 @@ type ContentResolver interface {
 	FileContentsByLocation(Location) (io.ReadCloser, error)
 }
 
-// MetadataResolver provides file metadata lookup by location.
 type MetadataResolver interface {
 	FileMetadataByLocation(Location) (Metadata, error)
 }
@@ -52,7 +51,6 @@ type PathResolver interface {
 	RelativeFileByPath(_ Location, path string) *Location
 }
 
-// LocationResolver provides iteration over all file locations in a source.
 type LocationResolver interface {
 	// AllLocations returns a channel of all file references from the underlying source.
 	// The implementation for this may vary, however, generally the following considerations should be made:
@@ -61,7 +59,6 @@ type LocationResolver interface {
 	AllLocations(ctx context.Context) <-chan Location
 }
 
-// WritableResolver extends Resolver with the ability to write file content.
 type WritableResolver interface {
 	Resolver
 

syft/file/search_result.go

@@ -4,25 +4,13 @@ import (
 	"fmt"
 )
 
-// SearchResult represents a match found during content scanning, such as secret detection.
 type SearchResult struct {
-	// Classification identifies the type or category of the matched content.
 	Classification string `json:"classification"`
-
-	// LineNumber is the 1-indexed line number where the match was found.
-	LineNumber int64 `json:"lineNumber"`
-
-	// LineOffset is the character offset from the start of the line where the match begins.
-	LineOffset int64 `json:"lineOffset"`
-
-	// SeekPosition is the absolute byte offset from the start of the file.
-	SeekPosition int64 `json:"seekPosition"`
-
-	// Length is the size in bytes of the matched content.
-	Length int64 `json:"length"`
-
-	// Value optionally contains the actual matched content.
-	Value string `json:"value,omitempty"`
+	LineNumber     int64  `json:"lineNumber"`
+	LineOffset     int64  `json:"lineOffset"`
+	SeekPosition   int64  `json:"seekPosition"`
+	Length         int64  `json:"length"`
+	Value          string `json:"value,omitempty"`
 }
 
 func (s SearchResult) String() string {

syft/file/selection.go

@@ -1,10 +1,9 @@
 package file
 
 const (
-	NoFilesSelection             Selection = "none"             // no files are selected
-	FilesOwnedByPackageSelection Selection = "owned-by-package" // only files owned by packages are selected
-	AllFilesSelection            Selection = "all"              // all files are selected
+	NoFilesSelection             Selection = "none"
+	FilesOwnedByPackageSelection Selection = "owned-by-package"
+	AllFilesSelection            Selection = "all"
 )
 
-// Selection defines which files should be included during cataloging operations.
 type Selection string

syft/format/common/spdxhelpers/to_format_model_test.go

@@ -15,10 +15,10 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/anchore/syft/internal/relationship"
-	"github.com/anchore/syft/internal/sourcemetadata"
 	"github.com/anchore/syft/syft/artifact"
 	"github.com/anchore/syft/syft/file"
 	"github.com/anchore/syft/syft/format/internal/spdxutil/helpers"
+	"github.com/anchore/syft/syft/internal/sourcemetadata"
 	"github.com/anchore/syft/syft/pkg"
 	"github.com/anchore/syft/syft/sbom"
 	"github.com/anchore/syft/syft/source"

syft/format/github/internal/model/model.go

@@ -87,9 +87,6 @@ func toGithubManifests(s *sbom.SBOM) Manifests {
 		}
 
 		name := dependencyName(p)
-		if name == "" || p.PURL == "" {
-			continue
-		}
 		manifest.Resolved[name] = DependencyNode{
 			PackageURL:   p.PURL,
 			Metadata:     toDependencyMetadata(p),

syft/format/github/internal/model/model_test.go

@@ -8,8 +8,8 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	"github.com/anchore/packageurl-go"
-	"github.com/anchore/syft/internal/sourcemetadata"
 	"github.com/anchore/syft/syft/file"
+	"github.com/anchore/syft/syft/internal/sourcemetadata"
 	"github.com/anchore/syft/syft/linux"
 	"github.com/anchore/syft/syft/pkg"
 	"github.com/anchore/syft/syft/sbom"

syft/format/github/test-fixtures/snapshot/TestGithubDirectoryEncoder.golden

@@ -16,6 +16,11 @@
         "source_location": "redacted/some/path/some/path/pkg1"
       },
       "resolved": {
+        "": {
+          "package_url": "a-purl-2",
+          "relationship": "direct",
+          "scope": "runtime"
+        },
         "pkg:deb/debian/package-2@2.0.1": {
           "package_url": "pkg:deb/debian/package-2@2.0.1",
           "relationship": "direct",

syft/format/github/test-fixtures/snapshot/TestGithubImageEncoder.golden

@@ -17,6 +17,13 @@
       },
       "metadata": {
         "syft:filesystem":"redacted"
+      },
+      "resolved": {
+        "": {
+          "package_url": "a-purl-1",
+          "relationship": "direct",
+          "scope": "runtime"
+        }
       }
     },
     "user-image-input:/somefile-2.txt": {

syft/format/internal/backfill.go

@@ -29,7 +29,6 @@ func Backfill(p *pkg.Package) {
 
 	var cpes []cpe.CPE
 	epoch := ""
-	rpmmod := ""
 
 	for _, qualifier := range purl.Qualifiers {
 		switch qualifier.Key {
@@ -45,8 +44,6 @@ func Backfill(p *pkg.Package) {
 			}
 		case pkg.PURLQualifierEpoch:
 			epoch = qualifier.Value
-		case pkg.PURLQualifierRpmModularity:
-			rpmmod = qualifier.Value
 		}
 	}
 
@@ -66,10 +63,6 @@ func Backfill(p *pkg.Package) {
 		setJavaMetadataFromPurl(p, purl)
 	}
 
-	if p.Type == pkg.RpmPkg {
-		setRpmMetadataFromPurl(p, rpmmod)
-	}
-
 	for _, c := range cpes {
 		if slices.Contains(p.CPEs, c) {
 			continue
@@ -89,35 +82,6 @@ func setJavaMetadataFromPurl(p *pkg.Package, _ packageurl.PackageURL) {
 	}
 }
 
-func setRpmMetadataFromPurl(p *pkg.Package, rpmmod string) {
-	if p.Type != pkg.RpmPkg {
-		return
-	}
-	if rpmmod == "" {
-		return
-	}
-
-	if p.Metadata == nil {
-		p.Metadata = pkg.RpmDBEntry{
-			ModularityLabel: &rpmmod,
-		}
-		return
-	}
-
-	switch m := p.Metadata.(type) {
-	case pkg.RpmDBEntry:
-		if m.ModularityLabel == nil {
-			m.ModularityLabel = &rpmmod
-			p.Metadata = m
-		}
-	case pkg.RpmArchive:
-		if m.ModularityLabel == nil {
-			m.ModularityLabel = &rpmmod
-			p.Metadata = m
-		}
-	}
-}
-
 func setVersionFromPurl(p *pkg.Package, purl packageurl.PackageURL, epoch string) {
 	if p.Version == "" {
 		p.Version = purl.Version

syft/format/internal/backfill_test.go

@@ -53,21 +53,6 @@ func Test_Backfill(t *testing.T) {
 				Version: "1:1.12.8-26.el8",
 			},
 		},
-		{
-			name: "rpm with rpmmod",
-			in: pkg.Package{
-				PURL: "pkg:rpm/redhat/httpd@2.4.37-51?arch=x86_64&distro=rhel-8.7&rpmmod=httpd:2.4",
-			},
-			expected: pkg.Package{
-				PURL:    "pkg:rpm/redhat/httpd@2.4.37-51?arch=x86_64&distro=rhel-8.7&rpmmod=httpd:2.4",
-				Type:    pkg.RpmPkg,
-				Name:    "httpd",
-				Version: "2.4.37-51",
-				Metadata: pkg.RpmDBEntry{
-					ModularityLabel: strRef("httpd:2.4"),
-				},
-			},
-		},
 		{
 			name: "bad cpe",
 			in: pkg.Package{
@@ -186,7 +171,3 @@ func Test_nameFromPurl(t *testing.T) {
 		})
 	}
 }
-
-func strRef(s string) *string {
-	return &s
-}

syft/format/internal/cyclonedxutil/helpers/component.go

@@ -8,9 +8,9 @@ import (
 	"github.com/CycloneDX/cyclonedx-go"
 
 	"github.com/anchore/packageurl-go"
-	"github.com/anchore/syft/internal/packagemetadata"
 	"github.com/anchore/syft/syft/file"
 	"github.com/anchore/syft/syft/format/internal"
+	"github.com/anchore/syft/syft/internal/packagemetadata"
 	"github.com/anchore/syft/syft/pkg"
 )
 

syft/format/internal/spdxutil/helpers/document_name_test.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/anchore/syft/internal/sourcemetadata"
+	"github.com/anchore/syft/syft/internal/sourcemetadata"
 	"github.com/anchore/syft/syft/source"
 )
 

syft/format/internal/spdxutil/helpers/document_namespace_test.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/anchore/syft/internal/sourcemetadata"
+	"github.com/anchore/syft/syft/internal/sourcemetadata"
 	"github.com/anchore/syft/syft/sbom"
 	"github.com/anchore/syft/syft/source"
 )

syft/format/internal/spdxutil/helpers/originator_supplier_test.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/anchore/syft/internal/packagemetadata"
+	"github.com/anchore/syft/syft/internal/packagemetadata"
 	"github.com/anchore/syft/syft/pkg"
 )
 
@@ -42,13 +42,11 @@ func Test_OriginatorSupplier(t *testing.T) {
 		pkg.PhpPeclEntry{},
 		pkg.PortageEntry{},
 		pkg.PythonPipfileLockEntry{},
-		pkg.PythonPdmLockEntry{},
 		pkg.PythonRequirementsEntry{},
 		pkg.PythonPoetryLockEntry{},
 		pkg.PythonUvLockEntry{},
 		pkg.RustBinaryAuditEntry{},
 		pkg.RustCargoLockEntry{},
-		pkg.SnapEntry{},
 		pkg.SwiftPackageManagerResolvedEntry{},
 		pkg.SwiplPackEntry{},
 		pkg.OpamPackage{},
@@ -343,25 +341,6 @@ func Test_OriginatorSupplier(t *testing.T) {
 			originator: "Person: auth (auth@auth.gov)",
 			supplier:   "Person: auth (auth@auth.gov)",
 		},
-		{
-			name: "from python PDM lock",
-			input: pkg.Package{
-				Metadata: pkg.PythonPdmLockEntry{
-					Files: []pkg.PythonFileRecord{
-						{
-							Path: "",
-							Digest: &pkg.PythonFileDigest{
-								Algorithm: "sha256",
-								Value:     "3d5da6925056f6f18f119200434a4780a94263f10d1c21d032a6f6b2baa20651",
-							},
-						},
-					},
-					Summary: "A test package",
-				},
-			},
-			originator: "",
-			supplier:   "",
-		},
 		{
 			name: "from r -- maintainer > author",
 			input: pkg.Package{

syft/format/syftjson/model/package.go

@@ -8,8 +8,8 @@ import (
 	"strings"
 
 	"github.com/anchore/syft/internal/log"
-	"github.com/anchore/syft/internal/packagemetadata"
 	"github.com/anchore/syft/syft/file"
+	"github.com/anchore/syft/syft/internal/packagemetadata"
 	"github.com/anchore/syft/syft/license"
 	"github.com/anchore/syft/syft/pkg"
 )

syft/format/syftjson/model/source.go

@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/anchore/syft/internal/sourcemetadata"
+	"github.com/anchore/syft/syft/internal/sourcemetadata"
 	"github.com/anchore/syft/syft/source"
 )
 

syft/format/syftjson/model/source_test.go

@@ -8,8 +8,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/anchore/syft/internal/sourcemetadata"
 	"github.com/anchore/syft/syft/file"
+	"github.com/anchore/syft/syft/internal/sourcemetadata"
 	"github.com/anchore/syft/syft/source"
 )
 

syft/format/syftjson/schema_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/iancoleman/strcase"
 	"github.com/stretchr/testify/require"
 
-	"github.com/anchore/syft/internal/packagemetadata"
+	"github.com/anchore/syft/syft/internal/packagemetadata"
 )
 
 type schema struct {

syft/format/syftjson/to_format_model.go

@@ -8,12 +8,12 @@ import (
 	stereoscopeFile "github.com/anchore/stereoscope/pkg/file"
 	"github.com/anchore/syft/internal"
 	"github.com/anchore/syft/internal/log"
-	"github.com/anchore/syft/internal/packagemetadata"
-	"github.com/anchore/syft/internal/sourcemetadata"
 	"github.com/anchore/syft/syft/artifact"
 	"github.com/anchore/syft/syft/file"
 	formatInternal "github.com/anchore/syft/syft/format/internal"
 	"github.com/anchore/syft/syft/format/syftjson/model"
+	"github.com/anchore/syft/syft/internal/packagemetadata"
+	"github.com/anchore/syft/syft/internal/sourcemetadata"
 	"github.com/anchore/syft/syft/linux"
 	"github.com/anchore/syft/syft/pkg"
 	"github.com/anchore/syft/syft/sbom"

syft/format/syftjson/to_format_model_test.go

@@ -10,9 +10,9 @@ import (
 	"github.com/stretchr/testify/require"
 
 	stereoscopeFile "github.com/anchore/stereoscope/pkg/file"
-	"github.com/anchore/syft/internal/sourcemetadata"
 	"github.com/anchore/syft/syft/file"
 	"github.com/anchore/syft/syft/format/syftjson/model"
+	"github.com/anchore/syft/syft/internal/sourcemetadata"
 	"github.com/anchore/syft/syft/pkg"
 	"github.com/anchore/syft/syft/source"
 )

syft/format/syftjson/to_syft_model_test.go

@@ -11,10 +11,10 @@ import (
 	"github.com/stretchr/testify/require"
 
 	stereoFile "github.com/anchore/stereoscope/pkg/file"
-	"github.com/anchore/syft/internal/sourcemetadata"
 	"github.com/anchore/syft/syft/artifact"
 	"github.com/anchore/syft/syft/file"
 	"github.com/anchore/syft/syft/format/syftjson/model"
+	"github.com/anchore/syft/syft/internal/sourcemetadata"
 	"github.com/anchore/syft/syft/pkg"
 	"github.com/anchore/syft/syft/sbom"
 	"github.com/anchore/syft/syft/source"

syft/get_source_config_test.go

@@ -1,37 +0,0 @@
-package syft
-
-import (
-	"testing"
-
-	"github.com/anchore/stereoscope"
-	"github.com/anchore/syft/syft/source/sourceproviders"
-)
-
-func TestGetProviders_DefaultImagePullSource(t *testing.T) {
-	userInput := ""
-	cfg := &GetSourceConfig{DefaultImagePullSource: stereoscope.RegistryTag}
-	allSourceProviders := sourceproviders.All(userInput, cfg.SourceProviderConfig)
-
-	providers, err := cfg.getProviders(userInput)
-	if err != nil {
-		t.Errorf("Expected no error for DefaultImagePullSource parameter, got: %v", err)
-	}
-
-	if len(providers) != len(allSourceProviders) {
-		t.Errorf("Expected %d providers, got %d", len(allSourceProviders), len(providers))
-	}
-}
-
-func TestGetProviders_Sources(t *testing.T) {
-	userInput := ""
-	cfg := &GetSourceConfig{Sources: []string{stereoscope.RegistryTag}}
-
-	providers, err := cfg.getProviders(userInput)
-	if err != nil {
-		t.Errorf("Expected no error for Sources parameter, got: %v", err)
-	}
-
-	if len(providers) != 1 {
-		t.Errorf("Expected 1 providers, got %d", len(providers))
-	}
-}

syft/get_source_test.go

@@ -6,7 +6,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/anchore/stereoscope/pkg/image"
-	"github.com/anchore/syft/internal/sourcemetadata"
+	"github.com/anchore/syft/syft/internal/sourcemetadata"
 	"github.com/anchore/syft/syft/source"
 	"github.com/anchore/syft/syft/source/sourceproviders"
 )

syft/internal/fileresolver/directory.go

@@ -19,16 +19,16 @@ type Directory struct {
 	indexer *directoryIndexer
 }
 
-func NewFromDirectory(root, base string, pathFilters ...PathIndexVisitor) (*Directory, error) {
-	resolver, err := newFromDirectoryWithoutIndex(root, base, pathFilters...)
+func NewFromDirectory(root string, base string, pathFilters ...PathIndexVisitor) (*Directory, error) {
+	r, err := newFromDirectoryWithoutIndex(root, base, pathFilters...)
 	if err != nil {
 		return nil, err
 	}
 
-	return resolver, resolver.buildIndex()
+	return r, r.buildIndex()
 }
 
-func newFromDirectoryWithoutIndex(root, base string, pathFilters ...PathIndexVisitor) (*Directory, error) {
+func newFromDirectoryWithoutIndex(root string, base string, pathFilters ...PathIndexVisitor) (*Directory, error) {
 	chroot, err := NewChrootContextFromCWD(root, base)
 	if err != nil {
 		return nil, fmt.Errorf("unable to interpret chroot context: %w", err)
@@ -66,6 +66,6 @@ func (r *Directory) buildIndex() error {
 }
 
 // Stringer to represent a directory path data source
-func (r *Directory) String() string {
+func (r Directory) String() string {
 	return fmt.Sprintf("dir:%s", r.path)
 }

syft/internal/fileresolver/directory_indexer.go

@@ -322,7 +322,7 @@ func (r directoryIndexer) addDirectoryToIndex(p string, info os.FileInfo) error
 		return err
 	}
 
-	metadata := NewMetadataFromPath(p, info)
+	metadata := file.NewMetadataFromPath(p, info)
 	r.index.Add(*ref, metadata)
 
 	return nil
@@ -334,7 +334,7 @@ func (r directoryIndexer) addFileToIndex(p string, info os.FileInfo) error {
 		return err
 	}
 
-	metadata := NewMetadataFromPath(p, info)
+	metadata := file.NewMetadataFromPath(p, info)
 	r.index.Add(*ref, metadata)
 
 	return nil
@@ -416,7 +416,7 @@ func (r directoryIndexer) addSymlinkToIndex(p string, info os.FileInfo) (string,
 		targetAbsPath = filepath.Clean(filepath.Join(path.Dir(p), linkTarget))
 	}
 
-	metadata := NewMetadataFromPath(p, info)
+	metadata := file.NewMetadataFromPath(p, info)
 	metadata.LinkDestination = linkTarget
 	r.index.Add(*ref, metadata)
 

syft/internal/fileresolver/file.go

@@ -17,31 +17,17 @@ type File struct {
 	indexer *fileIndexer
 }
 
-// NewFromFile single file analyser
+// parent should be the symlink free absolute path to the parent directory
 // path is the filepath of the file we're creating content access for
-func NewFromFile(path string, pathFilters ...PathIndexVisitor) (*File, error) {
-	resolver, err := newFromFileWithoutIndex(path, pathFilters...)
-	if err != nil {
-		return nil, err
-	}
-
-	return resolver, resolver.buildIndex()
-}
-
-func newFromFileWithoutIndex(path string, pathFilters ...PathIndexVisitor) (*File, error) {
-	absParentDir, err := absoluteSymlinkFreePathToParent(path)
-	if err != nil {
-		return nil, err
-	}
-
-	chroot, err := NewChrootContextFromCWD(absParentDir, absParentDir)
+func NewFromFile(parent, path string, pathFilters ...PathIndexVisitor) (*File, error) {
+	chroot, err := NewChrootContextFromCWD(parent, parent)
 	if err != nil {
 		return nil, fmt.Errorf("unable to interpret chroot context: %w", err)
 	}
 
 	cleanBase := chroot.Base()
 
-	return &File{
+	file := &File{
 		path: path,
 		FiletreeResolver: FiletreeResolver{
 			Chroot: *chroot,
@@ -50,7 +36,9 @@ func newFromFileWithoutIndex(path string, pathFilters ...PathIndexVisitor) (*Fil
 			Opener: nativeOSFileOpener,
 		},
 		indexer: newFileIndexer(path, cleanBase, pathFilters...),
-	}, nil
+	}
+
+	return file, file.buildIndex()
 }
 
 func (r *File) buildIndex() error {
@@ -70,6 +58,6 @@ func (r *File) buildIndex() error {
 }
 
 // Stringer to represent a file path data source
-func (r *File) String() string {
+func (r File) String() string {
 	return fmt.Sprintf("file:%s", r.path)
 }

syft/internal/fileresolver/file_indexer.go

@@ -173,7 +173,7 @@ func (r *fileIndexer) addDirectoryToIndex(path string, info os.FileInfo) error {
 		return err
 	}
 
-	metadata := NewMetadataFromPath(path, info)
+	metadata := file.NewMetadataFromPath(path, info)
 	r.index.Add(*ref, metadata)
 
 	return nil
@@ -185,7 +185,7 @@ func (r *fileIndexer) addFileToIndex(path string, info os.FileInfo) error {
 		return err
 	}
 
-	metadata := NewMetadataFromPath(path, info)
+	metadata := file.NewMetadataFromPath(path, info)
 	r.index.Add(*ref, metadata)
 
 	return nil

syft/internal/fileresolver/filetree_resolver_test.go

@@ -1384,10 +1384,9 @@ func TestFileResolver_FilesByPath(t *testing.T) {
 			require.NoError(t, err)
 			require.NotNil(t, parentPath)
 
-			resolver, err := NewFromFile(tt.filePath)
+			resolver, err := NewFromFile(parentPath, tt.filePath)
 			require.NoError(t, err)
 			require.NotNil(t, resolver)
-			assert.Equal(t, resolver.Chroot.Base(), parentPath)
 
 			refs, err := resolver.FilesByPath(tt.fileByPathInput)
 			require.NoError(t, err)
@@ -1432,11 +1431,8 @@ func TestFileResolver_MultipleFilesByPath(t *testing.T) {
 			require.NoError(t, err)
 			require.NotNil(t, parentPath)
 
-			resolver, err := NewFromFile(filePath)
+			resolver, err := NewFromFile(parentPath, filePath)
 			assert.NoError(t, err)
-			require.NotNil(t, resolver)
-			assert.Equal(t, resolver.Chroot.Base(), parentPath)
-
 			refs, err := resolver.FilesByPath(tt.input...)
 			assert.NoError(t, err)
 
@@ -1453,11 +1449,8 @@ func TestFileResolver_FilesByGlob(t *testing.T) {
 	require.NoError(t, err)
 	require.NotNil(t, parentPath)
 
-	resolver, err := NewFromFile(filePath)
+	resolver, err := NewFromFile(parentPath, filePath)
 	assert.NoError(t, err)
-	require.NotNil(t, resolver)
-	assert.Equal(t, resolver.Chroot.Base(), parentPath)
-
 	refs, err := resolver.FilesByGlob("**/*.txt")
 	assert.NoError(t, err)
 
@@ -1483,11 +1476,8 @@ func Test_fileResolver_FilesByMIMEType(t *testing.T) {
 			require.NoError(t, err)
 			require.NotNil(t, parentPath)
 
-			resolver, err := NewFromFile(filePath)
+			resolver, err := NewFromFile(parentPath, filePath)
 			assert.NoError(t, err)
-			require.NotNil(t, resolver)
-			assert.Equal(t, resolver.Chroot.Base(), parentPath)
-
 			locations, err := resolver.FilesByMIMEType(test.mimeType)
 			assert.NoError(t, err)
 			assert.Equal(t, test.expectedPaths.Size(), len(locations))
@@ -1507,12 +1497,10 @@ func Test_fileResolver_FileContentsByLocation(t *testing.T) {
 	require.NoError(t, err)
 	require.NotNil(t, parentPath)
 
-	resolver, err := NewFromFile(filePath)
+	r, err := NewFromFile(parentPath, filePath)
 	require.NoError(t, err)
-	require.NotNil(t, resolver)
-	assert.Equal(t, resolver.Chroot.Base(), parentPath)
 
-	exists, existingPath, err := resolver.Tree.File(stereoscopeFile.Path(filepath.Join(cwd, "test-fixtures/image-simple/file-1.txt")))
+	exists, existingPath, err := r.Tree.File(stereoscopeFile.Path(filepath.Join(cwd, "test-fixtures/image-simple/file-1.txt")))
 	require.True(t, exists)
 	require.NoError(t, err)
 	require.True(t, existingPath.HasReference())
@@ -1537,7 +1525,7 @@ func Test_fileResolver_FileContentsByLocation(t *testing.T) {
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
 
-			actual, err := resolver.FileContentsByLocation(test.location)
+			actual, err := r.FileContentsByLocation(test.location)
 			if test.err {
 				require.Error(t, err)
 				return
@@ -1558,11 +1546,8 @@ func TestFileResolver_AllLocations_errorOnDirRequest(t *testing.T) {
 	parentPath, err := absoluteSymlinkFreePathToParent(filePath)
 	require.NoError(t, err)
 	require.NotNil(t, parentPath)
-
-	resolver, err := NewFromFile(filePath)
+	resolver, err := NewFromFile(parentPath, filePath)
 	require.NoError(t, err)
-	require.NotNil(t, resolver)
-	assert.Equal(t, resolver.Chroot.Base(), parentPath)
 
 	var dirLoc *file.Location
 	ctx, cancel := context.WithCancel(context.Background())
@@ -1590,11 +1575,8 @@ func TestFileResolver_AllLocations(t *testing.T) {
 	parentPath, err := absoluteSymlinkFreePathToParent(filePath)
 	require.NoError(t, err)
 	require.NotNil(t, parentPath)
-
-	resolver, err := NewFromFile(filePath)
+	resolver, err := NewFromFile(parentPath, filePath)
 	require.NoError(t, err)
-	require.NotNil(t, resolver)
-	assert.Equal(t, resolver.Chroot.Base(), parentPath)
 
 	paths := strset.New()
 	for loc := range resolver.AllLocations(context.Background()) {
@@ -1618,11 +1600,8 @@ func Test_FileResolver_AllLocationsDoesNotLeakGoRoutine(t *testing.T) {
 	parentPath, err := absoluteSymlinkFreePathToParent(filePath)
 	require.NoError(t, err)
 	require.NotNil(t, parentPath)
-
-	resolver, err := NewFromFile(filePath)
+	resolver, err := NewFromFile(parentPath, filePath)
 	require.NoError(t, err)
-	require.NotNil(t, resolver)
-	assert.Equal(t, resolver.Chroot.Base(), parentPath)
 
 	require.NoError(t, err)
 	ctx, cancel := context.WithCancel(context.Background())

syft/internal/fileresolver/get_xid.go

@@ -1,20 +0,0 @@
-//go:build !windows
-
-package fileresolver
-
-import (
-	"os"
-	"syscall"
-)
-
-// getXid is the UID GID system info for unix
-func getXid(info os.FileInfo) (uid, gid int) {
-	uid = -1
-	gid = -1
-	if stat, ok := info.Sys().(*syscall.Stat_t); ok {
-		uid = int(stat.Uid)
-		gid = int(stat.Gid)
-	}
-
-	return uid, gid
-}

syft/internal/fileresolver/get_xid_win.go

@@ -1,12 +0,0 @@
-//go:build windows
-
-package fileresolver
-
-import (
-	"os"
-)
-
-// getXid is a placeholder for windows file information
-func getXid(info os.FileInfo) (uid, gid int) {
-	return -1, -1
-}

syft/internal/fileresolver/metadata.go

@@ -1,44 +0,0 @@
-package fileresolver
-
-import (
-	"os"
-
-	"github.com/anchore/stereoscope/pkg/file"
-	"github.com/anchore/syft/internal"
-	"github.com/anchore/syft/syft/internal/windows"
-)
-
-func NewMetadataFromPath(path string, info os.FileInfo) file.Metadata {
-	var mimeType string
-	uid, gid := getXid(info)
-
-	ty := file.TypeFromMode(info.Mode())
-
-	if ty == file.TypeRegular {
-		usablePath := path
-		// denormalize the path back to windows so we can open the file
-		if windows.HostRunningOnWindows() {
-			usablePath = windows.FromPosix(usablePath)
-		}
-
-		f, err := os.Open(usablePath)
-		if err != nil {
-			// TODO: it may be that the file is inaccessible, however, this is not an error or a warning. In the future we need to track these as known-unknowns
-			f = nil
-		} else {
-			defer internal.CloseAndLogError(f, usablePath)
-		}
-
-		mimeType = file.MIMEType(f)
-	}
-
-	return file.Metadata{
-		FileInfo: info,
-		Path:     path,
-		Type:     ty,
-		// unsupported across platforms
-		UserID:   uid,
-		GroupID:  gid,
-		MIMEType: mimeType,
-	}
-}

syft/internal/fileresolver/metadata_test.go

@@ -1,51 +0,0 @@
-package fileresolver
-
-import (
-	"os"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
-	"github.com/anchore/stereoscope/pkg/file"
-)
-
-func TestFileMetadataFromPath(t *testing.T) {
-
-	tests := []struct {
-		path             string
-		expectedType     file.Type
-		expectedMIMEType string
-	}{
-		{
-			path:             "test-fixtures/symlinks-simple/readme",
-			expectedType:     file.TypeRegular,
-			expectedMIMEType: "text/plain",
-		},
-		{
-			path:             "test-fixtures/symlinks-simple/link_to_new_readme",
-			expectedType:     file.TypeSymLink,
-			expectedMIMEType: "",
-		},
-		{
-			path:             "test-fixtures/symlinks-simple/link_to_link_to_new_readme",
-			expectedType:     file.TypeSymLink,
-			expectedMIMEType: "",
-		},
-		{
-			path:             "test-fixtures/symlinks-simple",
-			expectedType:     file.TypeDirectory,
-			expectedMIMEType: "",
-		},
-	}
-	for _, test := range tests {
-		t.Run(test.path, func(t *testing.T) {
-			info, err := os.Lstat(test.path)
-			require.NoError(t, err)
-
-			actual := NewMetadataFromPath(test.path, info)
-			assert.Equal(t, test.expectedMIMEType, actual.MIMEType, "unexpected MIME type for %s", test.path)
-			assert.Equal(t, test.expectedType, actual.Type, "unexpected type for %s", test.path)
-		})
-	}
-}

syft/internal/fileresolver/test-fixtures/symlinks-loop/README.md

@@ -1 +1 @@
-This mimics a partial layout on a Linux system within /sys/devices/virtual to help ensure globbing for files does not end up in an infinite loop.
+this mimics a partial layout on a linux system within /sys/devices/virtual to help with ensuring globbing for files does not end up in a infinite loop

syft/internal/jsonschema/README.md

@@ -0,0 +1 @@
+Please see [schema/json/README.md](../../../schema/json/README.md) for more information on the JSON schema files in this directory.

syft/internal/jsonschema/main.go

@@ -15,8 +15,8 @@ import (
 	"github.com/invopop/jsonschema"
 
 	"github.com/anchore/syft/internal"
-	"github.com/anchore/syft/internal/packagemetadata"
 	syftJsonModel "github.com/anchore/syft/syft/format/syftjson/model"
+	"github.com/anchore/syft/syft/internal/packagemetadata"
 )
 
 /*
@@ -26,17 +26,6 @@ are not captured (empty interfaces). This means that pkg.Package.Metadata is not
 can be extended to include specific package metadata struct shapes in the future.
 */
 
-var repoRoot string
-
-func init() {
-	var err error
-	repoRoot, err = packagemetadata.RepoRoot()
-	if err != nil {
-		fmt.Println("unable to determine repo root")
-		os.Exit(1)
-	}
-}
-
 func main() {
 	write(encode(build()))
 }
@@ -71,7 +60,7 @@ func assembleTypeContainer(items []any) (any, map[string]string) {
 	}
 
 	if len(typesMissingNames) > 0 {
-		fmt.Println("the following types are missing JSON names (manually curated in ./internal/packagemetadata/names.go):")
+		fmt.Println("the following types are missing JSON names (manually curated in ./syft/internal/packagemetadata/names.go):")
 		for _, t := range typesMissingNames {
 			fmt.Println("  - ", t.Name())
 		}
@@ -89,38 +78,6 @@ func build() *jsonschema.Schema {
 		Namer: func(r reflect.Type) string {
 			return strings.TrimPrefix(r.Name(), "JSON")
 		},
-		CommentMap: make(map[string]string),
-	}
-
-	// extract comments from Go source files to enrich schema descriptions
-	//
-	// note: AddGoComments parses from the module root and creates keys like "syft/pkg.TypeName",
-	// but the reflector expects fully qualified paths like "github.com/anchore/syft/syft/pkg.TypeName".
-	// We fix up the keys after extraction to match the expected format.
-	if err := reflector.AddGoComments("github.com/anchore/syft", repoRoot); err != nil {
-		fmt.Fprintf(os.Stderr, "warning: failed to extract Go comments: %v\n", err)
-	} else {
-		// fix up comment map keys to use fully qualified import paths
-		// note: AddGoComments includes the absolute repo path WITHOUT the leading slash
-		repoRootNoSlash := strings.TrimPrefix(repoRoot, "/")
-		fixedMap := make(map[string]string)
-		for k, v := range reflector.CommentMap {
-			newKey := k
-			if !strings.HasPrefix(k, "github.com/") {
-				// key doesn't have module prefix, add it
-				newKey = "github.com/anchore/syft/" + k
-			} else if strings.Contains(k, repoRootNoSlash) {
-				// key has the absolute repo path embedded, strip it
-				// format: github.com/anchore/syft/Users/wagoodman/code/syft-manual/syft/pkg.Type
-				// should be: github.com/anchore/syft/syft/pkg.Type
-				newKey = strings.Replace(k, repoRootNoSlash+"/", "", 1)
-			}
-			fixedMap[newKey] = v
-		}
-		reflector.CommentMap = fixedMap
-
-		// copy field comments for type aliases (e.g., type RpmArchive RpmDBEntry)
-		copyAliasFieldComments(reflector.CommentMap, repoRoot)
 	}
 
 	pkgMetadataContainer, pkgMetadataMapping := assembleTypeContainer(packagemetadata.AllTypes())
@@ -173,9 +130,6 @@ func build() *jsonschema.Schema {
 		"anyOf": metadataTypes,
 	})
 
-	// warn about missing descriptions
-	warnMissingDescriptions(documentSchema, metadataNames)
-
 	return documentSchema
 }
 
@@ -194,6 +148,11 @@ func encode(schema *jsonschema.Schema) []byte {
 }
 
 func write(schema []byte) {
+	repoRoot, err := packagemetadata.RepoRoot()
+	if err != nil {
+		fmt.Println("unable to determine repo root")
+		os.Exit(1)
+	}
 	schemaPath := filepath.Join(repoRoot, "schema", "json", fmt.Sprintf("schema-%s.json", internal.JSONSchemaVersion))
 	latestSchemaPath := filepath.Join(repoRoot, "schema", "json", "schema-latest.json")
 

syft/internal/packagemetadata/discover_type_names.go

@@ -24,7 +24,7 @@ var knownNonMetadataTypeNames = strset.New(
 
 // these are names that would be removed due to common convention (e.g. used within another metadata type) but are
 // known to be metadata types themselves. Adding to this list will prevent the removal of the type from the schema.
-var knownMetadataTypeNames = strset.New(
+var knownMetadaTypeNames = strset.New(
 	"DotnetPortableExecutableEntry",
 )
 
@@ -72,7 +72,7 @@ func findMetadataDefinitionNames(paths ...string) ([]string, error) {
 	}
 
 	// any definition that is used within another struct should not be considered a top-level metadata definition
-	removeNames := strset.Difference(usedNames, knownMetadataTypeNames)
+	removeNames := strset.Difference(usedNames, knownMetadaTypeNames)
 	names.Remove(removeNames.List()...)
 
 	// remove known exceptions, that is, types exported in the pkg Package that are not used

syft/internal/packagemetadata/generate/main.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/dave/jennifer/jen"
 
-	"github.com/anchore/syft/internal/packagemetadata"
+	"github.com/anchore/syft/syft/internal/packagemetadata"
 )
 
 // This program is invoked from syft/internal and generates packagemetadata/generated.go
@@ -31,7 +31,7 @@ func main() {
 	fmt.Printf("updating package metadata type list with %+v types\n", len(typeNames))
 
 	f := jen.NewFile("packagemetadata")
-	f.HeaderComment("DO NOT EDIT: generated by internal/packagemetadata/generate/main.go")
+	f.HeaderComment("DO NOT EDIT: generated by syft/internal/packagemetadata/generate/main.go")
 	f.ImportName(pkgImport, "pkg")
 	f.Comment("AllTypes returns a list of all pkg metadata types that syft supports (that are represented in the pkg.Package.Metadata field).")
 

syft/internal/packagemetadata/generated.go

@@ -1,4 +1,4 @@
-// DO NOT EDIT: generated by internal/packagemetadata/generate/main.go
+// DO NOT EDIT: generated by syft/internal/packagemetadata/generate/main.go
 
 package packagemetadata
 
@@ -51,7 +51,6 @@ func AllTypes() []any {
 		pkg.PhpPeclEntry{},
 		pkg.PortageEntry{},
 		pkg.PythonPackage{},
-		pkg.PythonPdmLockEntry{},
 		pkg.PythonPipfileLockEntry{},
 		pkg.PythonPoetryLockEntry{},
 		pkg.PythonRequirementsEntry{},
@@ -62,7 +61,6 @@ func AllTypes() []any {
 		pkg.RubyGemspec{},
 		pkg.RustBinaryAuditEntry{},
 		pkg.RustCargoLockEntry{},
-		pkg.SnapEntry{},
 		pkg.SwiftPackageManagerResolvedEntry{},
 		pkg.SwiplPackEntry{},
 		pkg.TerraformLockProviderEntry{},

syft/internal/packagemetadata/names.go

@@ -102,7 +102,6 @@ var jsonTypes = makeJSONTypes(
 	jsonNames(pkg.PhpPearEntry{}, "php-pear-entry"),
 	jsonNames(pkg.PortageEntry{}, "portage-db-entry", "PortageMetadata"),
 	jsonNames(pkg.PythonPackage{}, "python-package", "PythonPackageMetadata"),
-	jsonNames(pkg.PythonPdmLockEntry{}, "python-pdm-lock-entry"),
 	jsonNames(pkg.PythonPipfileLockEntry{}, "python-pipfile-lock-entry", "PythonPipfileLockMetadata"),
 	jsonNames(pkg.PythonPoetryLockEntry{}, "python-poetry-lock-entry", "PythonPoetryLockMetadata"),
 	jsonNames(pkg.PythonRequirementsEntry{}, "python-pip-requirements-entry", "PythonRequirementsMetadata"),
@@ -116,7 +115,6 @@ var jsonTypes = makeJSONTypes(
 	jsonNames(pkg.OpamPackage{}, "opam-package"),
 	jsonNames(pkg.RustCargoLockEntry{}, "rust-cargo-lock-entry", "RustCargoPackageMetadata"),
 	jsonNamesWithoutLookup(pkg.RustBinaryAuditEntry{}, "rust-cargo-audit-entry", "RustCargoPackageMetadata"), // the legacy value is split into two types, where the other is preferred
-	jsonNames(pkg.SnapEntry{}, "snap-entry"),
 	jsonNames(pkg.WordpressPluginEntry{}, "wordpress-plugin-entry", "WordpressMetadata"),
 	jsonNames(pkg.HomebrewFormula{}, "homebrew-formula"),
 	jsonNames(pkg.LuaRocksPackage{}, "luarocks-package"),

syft/internal/sourcemetadata/generate/main.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/dave/jennifer/jen"
 
-	"github.com/anchore/syft/internal/sourcemetadata"
+	"github.com/anchore/syft/syft/internal/sourcemetadata"
 )
 
 // This program is invoked from syft/internal and generates sourcemetadata/generated.go
@@ -25,7 +25,7 @@ func main() {
 	fmt.Printf("updating source metadata type list with %+v types\n", len(typeNames))
 
 	f := jen.NewFile("sourcemetadata")
-	f.HeaderComment("DO NOT EDIT: generated by internal/sourcemetadata/generate/main.go")
+	f.HeaderComment("DO NOT EDIT: generated by syft/internal/sourcemetadata/generate/main.go")
 	f.ImportName(srcImport, "source")
 	f.Comment("AllTypes returns a list of all source metadata types that syft supports (that are represented in the source.Description.Metadata field).")
 

syft/internal/sourcemetadata/generated.go

@@ -1,4 +1,4 @@
-// DO NOT EDIT: generated by internal/sourcemetadata/generate/main.go
+// DO NOT EDIT: generated by syft/internal/sourcemetadata/generate/main.go
 
 package sourcemetadata