[wip]

Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>
2026-10-12 06:07:20 +02:00 · 2024-05-03 16:12:00 -04:00
412 changed files with 5376 additions and 55390 deletions
@@ -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.8.0
+      want: v0.7.0
    method: github-release
    with:
      repo: anchore/binny
@@ -18,7 +18,7 @@ tools:
  # used to sign mac binaries at release
  - name: quill
    version:
-      want: v0.4.2
+      want: v0.4.1
    method: github-release
    with:
      repo: anchore/quill
@@ -26,7 +26,7 @@ tools:
  # used for linting
  - name: golangci-lint
    version:
-      want: v1.59.1
+      want: v1.57.2
    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: v2.3.0
+      want: v2.2.4
    method: github-release
    with:
      repo: sigstore/cosign
@@ -58,7 +58,7 @@ tools:
  # used to release all artifacts
  - name: goreleaser
    version:
-      want: v2.1.0
+      want: v1.25.1
    method: github-release
    with:
      repo: goreleaser/goreleaser
@@ -103,7 +103,7 @@ tools:
  # used for running all local and CI tasks
  - name: task
    version:
-      want: v3.38.0
+      want: v3.36.0
    method: github-release
    with:
      repo: go-task/task
@@ -111,7 +111,7 @@ tools:
  # used for triggering a release
  - name: gh
    version:
-      want: v2.54.0
+      want: v2.48.0
    method: github-release
    with:
      repo: cli/cli
@@ -6,7 +6,6 @@ permit:
  - MPL.*
  - ISC
  - WTFPL
-  - Unlicense

 ignore-packages:
  # packageurl-go is released under the MIT license located in the root of the repo at /mit.LICENSE
@@ -5,7 +5,7 @@ inputs:
  go-version:
    description: "Go version to install"
    required: true
-    default: "1.22.x"
+    default: "1.21.x"
  go-dependencies:
    description: "Download go dependencies"
    required: true
@@ -27,14 +27,14 @@ runs:
  using: "composite"
  steps:
    # note: go mod and build is automatically cached on default with v4+
-    - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
+    - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe #v4.1.0
      if: inputs.go-version != ''
      with:
        go-version: ${{ inputs.go-version }}

    - name: Restore tool cache
      id: tool-cache
-      uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
+      uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 #v3.3.2
      with:
        path: ${{ github.workspace }}/.tool
        key: ${{ inputs.cache-key-prefix }}-${{ runner.os }}-tool-${{ hashFiles('.binny.yaml') }}
@@ -17,11 +17,3 @@ updates:
    open-pull-requests-limit: 10
    labels:
      - "dependencies"
-
-  - package-ecosystem: "github-actions"
-    directory: "/.github/actions/boostrap"
-    schedule:
-      interval: "daily"
-    open-pull-requests-limit: 10
-    labels:
-      - "dependencies"
@@ -4,19 +4,12 @@ set -eu
 bold=$(tput bold)
 normal=$(tput sgr0)

-GH_CLI=.tool/gh
-
-if ! [ -x "$(command -v $GH_CLI)" ]; then
-    echo "The GitHub CLI could not be found. run: make bootstrap"
+if ! [ -x "$(command -v gh)" ]; then
+    echo "The GitHub CLI could not be found. To continue follow the instructions at https://github.com/cli/cli#installation"
    exit 1
 fi

-$GH_CLI auth status
-
-# set the default repo in cases where multiple remotes are defined
-$GH_CLI repo set-default anchore/syft
-
-export GITHUB_TOKEN="${GITHUB_TOKEN-"$($GH_CLI auth token)"}"
+gh auth status

 # we need all of the git state to determine the next version. Since tagging is done by
 # the release pipeline it is possible to not have all of the tags from previous releases.
@@ -44,7 +37,7 @@ done

 echo "${bold}Kicking off release for ${NEXT_VERSION}${normal}..."
 echo
-$GH_CLI workflow run release.yaml -f version=${NEXT_VERSION}
+gh workflow run release.yaml -f version=${NEXT_VERSION}

 echo
 echo "${bold}Waiting for release to start...${normal}"
@@ -52,6 +45,6 @@ sleep 10

 set +e

-echo "${bold}Head to the release workflow to monitor the release:${normal} $($GH_CLI run list --workflow=release.yaml --limit=1 --json url --jq '.[].url')"
-id=$($GH_CLI run list --workflow=release.yaml --limit=1 --json databaseId --jq '.[].databaseId')
-$GH_CLI run watch $id --exit-status || (echo ; echo "${bold}Logs of failed step:${normal}" && GH_PAGER="" $GH_CLI run view $id --log-failed)
+echo "${bold}Head to the release workflow to monitor the release:${normal} $(gh run list --workflow=release.yaml --limit=1 --json url --jq '.[].url')"
+id=$(gh run list --workflow=release.yaml --limit=1 --json databaseId --jq '.[].databaseId')
+gh run watch $id --exit-status || (echo ; echo "${bold}Logs of failed step:${normal}" && GH_PAGER="" gh run view $id --log-failed)
@@ -2,8 +2,8 @@
 set -ue

 BIN="syft"
-VERSION_FILE="VERSION"
-VERSION=$1
+DISTDIR=$1
+VERSION=$2

 # the source of truth as to whether we want to notify users of an update is if the release just created is NOT
 # flagged as a pre-release on github
@@ -12,9 +12,10 @@ if [[ "$(curl -SsL https://api.github.com/repos/anchore/${BIN}/releases/tags/${V
   exit 0
 fi

-echo "creating and publishing version file (${VERSION})"
+echo "creating and publishing version file"

 # create a version file for version-update checks
+VERSION_FILE="${DISTDIR}/VERSION"
 echo "${VERSION}" | tee "${VERSION_FILE}"

 # upload the version file that supports the application version update check
@@ -17,7 +17,7 @@ jobs:
    # the job by event.
    steps:
      - name: Checkout code
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4

      - name: Bootstrap environment
        uses: ./.github/actions/bootstrap
@@ -39,7 +39,7 @@ jobs:
          OUTPUT="${OUTPUT//$'\r'/'%0D'}" # URL encode all '\r' characters
          echo "result=$OUTPUT" >> $GITHUB_OUTPUT

-      - uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # v4.3.5
+      - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
        with:
          name: benchmark-test-results
          path: test/results/**/*
@@ -36,16 +36,16 @@ jobs:

    steps:
    - name: Checkout repository
-      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
+      uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b #v4.1.4

    - name: Install Go
-      uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 #v5.0.2
+      uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 #v5.0.1
      with:
        go-version-file: go.mod

    # Initializes the CodeQL tools for scanning.
    - name: Initialize CodeQL
-      uses: github/codeql-action/init@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a #v3.25.15
+      uses: github/codeql-action/init@d39d31e687223d841ef683f52467bd88e9b21c14 #v3.25.3
      with:
        languages: ${{ matrix.language }}
        # If you wish to specify custom queries, you can do so here or in a config file.
@@ -56,7 +56,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@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a #v3.25.15
+      uses: github/codeql-action/autobuild@d39d31e687223d841ef683f52467bd88e9b21c14 #v3.25.3

    # ℹ️ Command-line programs to run using the OS shell.
    # 📚 https://git.io/JvXDl
@@ -70,4 +70,4 @@ jobs:
    #   make release

    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a #v3.25.15
+      uses: github/codeql-action/analyze@d39d31e687223d841ef683f52467bd88e9b21c14 #v3.25.3
@@ -30,7 +30,7 @@ jobs:
    runs-on: ubuntu-22.04
    steps:

-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b #v4.1.4

      - run: python .github/scripts/labeler.py
        env:
@@ -0,0 +1,48 @@
+name: "Release Homebrew"
+
+on:
+  workflow_dispatch:
+  release:
+    types:
+      - released
+
+jobs:
+  homebrew:
+    runs-on: ubuntu-20.04
+    steps:
+
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b #v4.1.4
+        with:
+          # we need to be able to get the commit for a tag
+          fetch-depth: 0
+
+      - name: Get release info
+        id: release_info
+        run: |
+          echo -n "tag_name=$(gh release view --json tagName --jq '.tagName')" | tee -a $GITHUB_OUTPUT
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Get commit info
+        id: git_info
+        run: |
+          git checkout ${{ steps.release_info.outputs.tag_name }}
+          echo -n "commit=$(git rev-parse HEAD)" | tee -a $GITHUB_OUTPUT
+
+      - name: Update Homebrew formula
+        uses: dawidd6/action-homebrew-bump-formula@baf2b60c51fc1f8453c884b0c61052668a71bd1d # v3.11.0
+        with:
+          token: ${{ secrets.HOMEBREW_TOKEN }}
+          org: anchore
+          formula: syft
+          tag: ${{ steps.release_info.outputs.tag_name }}
+          revision: ${{ steps.git_info.outputs.commit }}
+
+      - uses: 8398a7/action-slack@28ba43ae48961b90635b50953d216767a6bea486 #v3.16.2
+        if: ${{ failure() }}
+        with:
+          status: ${{ job.status }}
+          fields: repo,workflow,action,eventName
+          text: "Post-release homebrew publish workflow has failed: https://github.com/anchore/syft/actions/workflows/release-homebrew.yaml"
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_TOOLBOX_WEBHOOK_URL }}
@@ -1,31 +0,0 @@
-name: "Release"
-
-on:
-
-  workflow_dispatch:
-    inputs:
-      version:
-        description: release version to update the version file with (prefixed with v)
-        required: true
-
-  workflow_call:
-    inputs:
-      version:
-        type: string
-        description: release version to update the version file with (prefixed with v)
-        required: true
-
-jobs:
-
-  release:
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
-
-      - name: Update version file
-        run: make ci-release-version-file
-        env:
-          RELEASE_VERSION: ${{ github.event.inputs.version }}
-          # for updating the VERSION file in S3...
-          AWS_ACCESS_KEY_ID: ${{ secrets.TOOLBOX_AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.TOOLBOX_AWS_SECRET_ACCESS_KEY }}
@@ -15,15 +15,7 @@ jobs:
    environment: release
    runs-on: ubuntu-20.04
    steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
-
-      - 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:
-        #   --certificate-identity-regexp "https://github.com/anchore/.github/workflows/release.yaml@refs/heads/main"
-        # if we are not on the main branch, the signature will not be verifiable since the suffix requires the main branch
-        # at the time of when the OIDC token was issued on the Github Actions runner.
-        run: echo "This can only be run on the main branch otherwise releases produced will not be verifiable with cosign" && exit 1
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b #v4.1.4

      - name: Check if tag already exists
        # note: this will fail if the tag already exists
@@ -105,7 +97,7 @@ jobs:
      # required for goreleaser signs section with cosign
      id-token: write
    steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b #v4.1.4
        with:
          fetch-depth: 0

@@ -113,13 +105,13 @@ jobs:
        uses: ./.github/actions/bootstrap

      - name: Login to Docker Hub
-        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567  #v3.3.0
+        uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20  #v3.1.0
        with:
          username: ${{ secrets.ANCHOREOSSWRITE_DH_USERNAME }}
          password: ${{ secrets.ANCHOREOSSWRITE_DH_PAT }}

      - name: Login to GitHub Container Registry
-        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567  #v3.3.0
+        uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20  #v3.1.0
        with:
          registry: ghcr.io
          username: ${{ github.actor }}
@@ -147,8 +139,11 @@ jobs:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          # for updating brew formula in anchore/homebrew-syft
          GITHUB_BREW_TOKEN: ${{ secrets.ANCHOREOPS_GITHUB_OSS_WRITE_TOKEN }}
+          # for updating the VERSION file in S3...
+          AWS_ACCESS_KEY_ID: ${{ secrets.TOOLBOX_AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.TOOLBOX_AWS_SECRET_ACCESS_KEY }}

-      - uses: anchore/sbom-action@d94f46e13c6c62f59525ac9a1e147a99dc0b9bf5 #v0.17.0
+      - uses: anchore/sbom-action@7ccf588e3cf3cc2611714c2eeae48550fbc17552 #v0.15.11
        continue-on-error: true
        with:
          artifact-name: sbom.spdx.json
@@ -162,10 +157,3 @@ jobs:
        env:
          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_TOOLBOX_WEBHOOK_URL }}
        if: ${{ success() }}
-
-  release-version-file:
-    needs: [release]
-    uses: ./.github/workflows/release-version-file.yaml
-    with:
-      version: ${{ github.event.inputs.version }}
-    secrets: inherit
@@ -13,7 +13,7 @@ jobs:
    runs-on: ubuntu-latest
    if: github.repository == 'anchore/syft' # only run for main repo
    steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b #v4.1.4

      - name: Bootstrap environment
        uses: ./.github/actions/bootstrap
@@ -50,7 +50,7 @@ jobs:
          app_id: ${{ secrets.TOKEN_APP_ID }}
          private_key: ${{ secrets.TOKEN_APP_PRIVATE_KEY }}

-      - uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c #v6.1.0
+      - uses: peter-evans/create-pull-request@6d6857d36972b65feb161a90e484f2984215f83e #v6.0.5
        with:
          signoff: true
          delete-branch: true
@@ -16,7 +16,7 @@ jobs:
    runs-on: ubuntu-latest
    if: github.repository == 'anchore/syft' # only run for main repo
    steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b #v4.1.4

      - name: Bootstrap environment
        uses: ./.github/actions/bootstrap
@@ -33,7 +33,7 @@ jobs:
          app_id: ${{ secrets.TOKEN_APP_ID }}
          private_key: ${{ secrets.TOKEN_APP_PRIVATE_KEY }}

-      - uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c #v6.1.0
+      - uses: peter-evans/create-pull-request@6d6857d36972b65feb161a90e484f2984215f83e #v6.0.5
        with:
          signoff: true
          delete-branch: true
@@ -17,9 +17,9 @@ jobs:
    runs-on: ubuntu-latest
    if: github.repository == 'anchore/syft' # only run for main repo
    steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b #v4.1.4

-      - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 #v5.0.2
+      - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 #v5.0.1
        with:
          go-version: ${{ env.GO_VERSION }}
          stable: ${{ env.GO_STABLE_VERSION }}
@@ -44,7 +44,7 @@ jobs:
          app_id: ${{ secrets.TOKEN_APP_ID }}
          private_key: ${{ secrets.TOKEN_APP_PRIVATE_KEY }}

-      - uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c #v6.1.0
+      - uses: peter-evans/create-pull-request@6d6857d36972b65feb161a90e484f2984215f83e #v6.0.5
        with:
          signoff: true
          delete-branch: true
@@ -17,7 +17,7 @@ jobs:
    name: "Static analysis"
    runs-on: ubuntu-20.04
    steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b #v4.1.4

      - name: Bootstrap environment
        uses: ./.github/actions/bootstrap
@@ -31,7 +31,7 @@ jobs:
    name: "Unit tests"
    runs-on: ubuntu-20.04
    steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b #v4.1.4

      - name: Bootstrap environment
        uses: ./.github/actions/bootstrap
@@ -87,7 +87,7 @@ jobs:
    name: "Integration tests"
    runs-on: ubuntu-20.04
    steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b #v4.1.4

      - name: Bootstrap environment
        uses: ./.github/actions/bootstrap
@@ -109,7 +109,7 @@ jobs:
    name: "Build snapshot artifacts"
    runs-on: ubuntu-20.04
    steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b #v4.1.4

      - name: Bootstrap environment
        uses: ./.github/actions/bootstrap
@@ -139,7 +139,7 @@ jobs:
    needs: [Build-Snapshot-Artifacts]
    runs-on: ubuntu-20.04
    steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b #v4.1.4

      - name: Bootstrap environment
        uses: ./.github/actions/bootstrap
@@ -187,10 +187,7 @@ jobs:
    needs: [Build-Snapshot-Artifacts]
    runs-on: macos-latest
    steps:
-      - name: Install Cosign
-        uses: sigstore/cosign-installer@v3.5.0
-
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b #v4.1.4

      - name: Bootstrap environment
        uses: ./.github/actions/bootstrap
@@ -198,6 +195,7 @@ jobs:
          bootstrap-apt-packages: ""
          compute-fingerprints: "false"
          go-dependencies: false
+          go-version: ""

      - name: Download snapshot build
        id: snapshot-cache
@@ -234,7 +232,7 @@ jobs:
    needs: [Build-Snapshot-Artifacts]
    runs-on: ubuntu-20.04
    steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b #v4.1.4

      - name: Bootstrap environment
        uses: ./.github/actions/bootstrap
@@ -52,15 +52,10 @@ linters-settings:
  gocritic:
    enabled-checks:
      - deferInLoop
-      - ruleguard
-    settings:
-      ruleguard:
-        rules: "test/rules/rules.go"
 output:
  uniq-by-line: false
 run:
  timeout: 10m
-  tests: false

 # do not enable...
 #    - deadcode          # The owner seems to have abandoned the linter. Replaced by "unused".
@@ -1,5 +1,3 @@
-version: 2
-
 release:
  prerelease: auto
  draft: false
@@ -82,7 +80,7 @@ nfpms:
      - deb

 brews:
-  - repository:
+  - tap:
      owner: anchore
      name: homebrew-syft
      token: "{{.Env.GITHUB_BREW_TOKEN}}"
@@ -1,128 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-We as members, contributors, and leaders pledge to make participation in our
-community a harassment-free experience for everyone, regardless of age, body
-size, visible or invisible disability, ethnicity, sex characteristics, gender
-identity and expression, level of experience, education, socio-economic status,
-nationality, personal appearance, race, religion, or sexual identity
-and orientation.
-
-We pledge to act and interact in ways that contribute to an open, welcoming,
-diverse, inclusive, and healthy community.
-
-## Our Standards
-
-Examples of behavior that contributes to a positive environment for our
-community include:
-
-* Demonstrating empathy and kindness toward other people
-* Being respectful of differing opinions, viewpoints, and experiences
-* Giving and gracefully accepting constructive feedback
-* Accepting responsibility and apologizing to those affected by our mistakes,
-  and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the
-  overall community
-
-Examples of unacceptable behavior include:
-
-* The use of sexualized language or imagery, and sexual attention or
-  advances of any kind
-* Trolling, insulting or derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or email
-  address, without their explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Enforcement Responsibilities
-
-Community leaders are responsible for clarifying and enforcing our standards of
-acceptable behavior and will take appropriate and fair corrective action in
-response to any behavior that they deem inappropriate, threatening, offensive,
-or harmful.
-
-Community leaders have the right and responsibility to remove, edit, or reject
-comments, commits, code, wiki edits, issues, and other contributions that are
-not aligned to this Code of Conduct, and will communicate reasons for moderation
-decisions when appropriate.
-
-## Scope
-
-This Code of Conduct applies within all community spaces, and also applies when
-an individual is officially representing the community in public spaces.
-Examples of representing our community include using an official e-mail address,
-posting via an official social media account, or acting as an appointed
-representative at an online or offline event.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported to the community leaders responsible for enforcement at
-[opensource@anchore.com](mailto:opensource@anchore.com).
-All complaints will be reviewed and investigated promptly and fairly.
-
-All community leaders are obligated to respect the privacy and security of the
-reporter of any incident.
-
-## Enforcement Guidelines
-
-Community leaders will follow these Community Impact Guidelines in determining
-the consequences for any action they deem in violation of this Code of Conduct:
-
-### 1. Correction
-
-**Community Impact**: Use of inappropriate language or other behavior deemed
-unprofessional or unwelcome in the community.
-
-**Consequence**: A private, written warning from community leaders, providing
-clarity around the nature of the violation and an explanation of why the
-behavior was inappropriate. A public apology may be requested.
-
-### 2. Warning
-
-**Community Impact**: A violation through a single incident or series
-of actions.
-
-**Consequence**: A warning with consequences for continued behavior. No
-interaction with the people involved, including unsolicited interaction with
-those enforcing the Code of Conduct, for a specified period of time. This
-includes avoiding interactions in community spaces as well as external channels
-like social media. Violating these terms may lead to a temporary or
-permanent ban.
-
-### 3. Temporary Ban
-
-**Community Impact**: A serious violation of community standards, including
-sustained inappropriate behavior.
-
-**Consequence**: A temporary ban from any sort of interaction or public
-communication with the community for a specified period of time. No public or
-private interaction with the people involved, including unsolicited interaction
-with those enforcing the Code of Conduct, is allowed during this period.
-Violating these terms may lead to a permanent ban.
-
-### 4. Permanent Ban
-
-**Community Impact**: Demonstrating a pattern of violation of community
-standards, including sustained inappropriate behavior,  harassment of an
-individual, or aggression toward or disparagement of classes of individuals.
-
-**Consequence**: A permanent ban from any sort of public interaction within
-the community.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 2.0, available at
-https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
-
-Community Impact Guidelines were inspired by [Mozilla's code of conduct
-enforcement ladder](https://github.com/mozilla/diversity).
-
-[homepage]: https://www.contributor-covenant.org
-
-For answers to common questions about this code of conduct, see the FAQ at
-https://www.contributor-covenant.org/faq. Translations are available at
-https://www.contributor-covenant.org/translations.
@@ -2,27 +2,25 @@
    <img src="https://user-images.githubusercontent.com/5199289/136844524-1527b09f-c5cb-4aa9-be54-5aa92a6086c1.png" width="271" alt="Cute pink owl syft logo">
 </p>

-# Syft
+[![Validations](https://github.com/anchore/syft/actions/workflows/validations.yaml/badge.svg)](https://github.com/anchore/syft/actions/workflows/validations.yaml)
+[![Go Report Card](https://goreportcard.com/badge/github.com/anchore/syft)](https://goreportcard.com/report/github.com/anchore/syft)
+[![GitHub release](https://img.shields.io/github/release/anchore/syft.svg)](https://github.com/anchore/syft/releases/latest)
+[![GitHub go.mod Go version](https://img.shields.io/github/go-mod/go-version/anchore/syft.svg)](https://github.com/anchore/syft)
+[![License: Apache-2.0](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/anchore/syft/blob/main/LICENSE)
+[![Slack Invite](https://img.shields.io/badge/Slack-Join-blue?logo=slack)](https://anchore.com/slack)

-**A CLI tool and Go library for generating a Software Bill of Materials (SBOM) from container images and filesystems. Exceptional for vulnerability detection when used with a scanner like [Grype](https://github.com/anchore/grype).**
+A CLI tool and Go library for generating a Software Bill of Materials (SBOM) from container images and filesystems. Exceptional for vulnerability detection when used with a scanner like [Grype](https://github.com/anchore/grype).

-<p align="center">
- &nbsp;<a href="https://github.com/anchore/syft/actions/workflows/validations.yaml" target="_blank"><img alt="Validations" src="https://github.com/anchore/syft/actions/workflows/validations.yaml/badge.svg"></a>&nbsp;
- &nbsp;<a href="https://goreportcard.com/report/github.com/anchore/syft" target="_blank"><img alt="Go Report Card" src="https://goreportcard.com/badge/github.com/anchore/syft"></a>&nbsp;
- &nbsp;<a href="https://github.com/anchore/syft/releases/latest" target="_blank"><img alt="GitHub release" src="https://img.shields.io/github/release/anchore/syft.svg"></a>&nbsp;
- &nbsp;<a href="https://github.com/anchore/syft" target="_blank"><img alt="GitHub go.mod Go version" src="https://img.shields.io/github/go-mod/go-version/anchore/syft.svg"></a>&nbsp;
- &nbsp;<a href="" target="_blank"><img alt="License: Apache-2.0" src="https://img.shields.io/badge/License-Apache%202.0-blue.svg"></a>&nbsp;
- &nbsp;<a href="https://anchore.com/slack" target="_blank"><img alt="Slack" src="https://img.shields.io/badge/Slack-Join-blue?logo=slack"></a>&nbsp;
-</p>
+### Join our community meetings!
+
+- Calendar: https://calendar.google.com/calendar/u/0/r?cid=Y182OTM4dGt0MjRtajI0NnNzOThiaGtnM29qNEBncm91cC5jYWxlbmRhci5nb29nbGUuY29t
+- Agenda: https://docs.google.com/document/d/1ZtSAa6fj2a6KRWviTn3WoJm09edvrNUp4Iz_dOjjyY8/edit?usp=sharing (join [this group](https://groups.google.com/g/anchore-oss-community) for write access)
+- All are welcome!
+
+For commercial support options with Syft or Grype, please [contact Anchore](https://get.anchore.com/contact/)

 ![syft-demo](https://user-images.githubusercontent.com/590471/90277200-2a253000-de33-11ea-893f-32c219eea11a.gif)

-## Introduction
-
-Syft is a powerful and easy-to-use open-source tool for generating Software Bill of Materials (SBOMs) for container images and filesystems. It provides detailed visibility into the packages and dependencies in your software, helping you manage vulnerabilities, license compliance, and software supply chain security.
-
-Syft development is sponsored by [Anchore](https://anchore.com/), and is released under the [Apache-2.0 License](https://github.com/anchore/syft?tab=Apache-2.0-1-ov-file). For commercial support options with Syft or Grype, please [contact Anchore](https://get.anchore.com/contact/).
-
 ## Features
 - Generates SBOMs for container images, filesystems, archives, and more to discover packages and libraries
 - Supports OCI, Docker and [Singularity](https://github.com/sylabs/singularity) image formats
@@ -31,94 +29,6 @@ Syft development is sponsored by [Anchore](https://anchore.com/), and is release
 - Able to create signed SBOM attestations using the [in-toto specification](https://github.com/in-toto/attestation/blob/main/spec/README.md)
 - Convert between SBOM formats, such as CycloneDX, SPDX, and Syft's own format.

-## Installation
-
-Syft binaries are provided for Linux, macOS and Windows.
-
-### Recommended
-> ```bash 
-> curl -sSfL https://raw.githubusercontent.com/anchore/syft/main/install.sh | sh -s -- -b /usr/local/bin
-> ```
-
-Install script options:
-	`-b`: Specify a custom installation directory (defaults to `./bin`)
-	`-d`: More verbose logging levels (`-d` for debug, `-dd` for trace)
-	`-v`: Verify the signature of the downloaded artifact before installation (requires [`cosign`](https://github.com/sigstore/cosign) to be installed)
-
-### Homebrew
-```bash
-brew install syft
-```
-
-### Scoop
-
-```powershell
-scoop install syft
-```
-
-### Chocolatey
-
-The chocolatey distribution of Syft is community-maintained and not distributed by the Anchore team
-
-```powershell
-choco install syft -y
-```
-
-### Nix
-
-**Note**: Nix packaging of Syft is [community maintained](https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/admin/syft/default.nix). Syft is available in the [stable channel](https://wiki.nixos.org/wiki/Nix_channels#The_official_channels) since NixOS `22.05`.
-
-```bash
-nix-env -i syft
-```
-
-... or, just try it out in an ephemeral nix shell:
-
-```bash
-nix-shell -p syft
-```
-
-## Getting started
-
-### SBOM
-
-To generate an SBOM for a container image:
-
-```bash
-syft <image>
-```
-
-The above output includes only software that is visible in the container (i.e., the squashed representation of the image). To include software from all image layers in the SBOM, regardless of its presence in the final image, provide `--scope all-layers`:
-
-```bash
-syft <image> --scope all-layers
-```
-
-### Output formats
-
-The output format for Syft is configurable as well using the `-o` (or `--output`) option:
-
-```
-syft <image> -o <format>
-```
-
-Where the `formats` available are:
- `syft-json`: Use this to get as much information out of Syft as possible!
- `syft-text`: A row-oriented, human-and-machine-friendly output.
- `cyclonedx-xml`: A XML report conforming to the [CycloneDX 1.6 specification](https://cyclonedx.org/specification/overview/).
- `cyclonedx-xml@1.5`: A XML report conforming to the [CycloneDX 1.5 specification](https://cyclonedx.org/specification/overview/).
- `cyclonedx-json`: A JSON report conforming to the [CycloneDX 1.6 specification](https://cyclonedx.org/specification/overview/).
- `cyclonedx-json@1.5`: A JSON report conforming to the [CycloneDX 1.5 specification](https://cyclonedx.org/specification/overview/).
- `spdx-tag-value`: A tag-value formatted report conforming to the [SPDX 2.3 specification](https://spdx.github.io/spdx-spec/v2.3/).
- `spdx-tag-value@2.2`: A tag-value formatted report conforming to the [SPDX 2.2 specification](https://spdx.github.io/spdx-spec/v2.2.2/).
- `spdx-json`: A JSON report conforming to the [SPDX 2.3 JSON Schema](https://github.com/spdx/spdx-spec/blob/v2.3/schemas/spdx-schema.json).
- `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"](#using-templates) below.
-
-Note that flags using the @<version> can be used for earlier versions of each specification as well.
-
 ### Supported Ecosystems

 - Alpine (apk)
@@ -146,37 +56,816 @@ Note that flags using the @<version> can be used for earlier versions of each sp
 - Swift (cocoapods, swift-package-manager)
 - Wordpress plugins

-## Documentation
+## Installation

-Our [wiki](https://github.com/anchore/syft/wiki) contains further details on the following topics:
+**Note**: Currently, Syft is built only for Linux, macOS and Windows.

-* [Supported Sources](https://github.com/anchore/syft/wiki/supported-sources)
-* [File Selection](https://github.com/anchore/syft/wiki/file-selection)
-* [Excluding file paths](https://github.com/anchore/syft/wiki/excluding-file-paths)
-* [Output formats](https://github.com/anchore/syft/wiki/output-formats)
-* [Package Cataloger Selection](https://github.com/anchore/syft/wiki/package-cataloger-selection) 
-  * [Concepts](https://github.com/anchore/syft/wiki/package-cataloger-selection#concepts)
-  * [Examples](https://github.com/anchore/syft/wiki/package-cataloger-selection#examples)
-* [Using templates](https://github.com/anchore/syft/wiki/using-templates)
-* [Multiple outputs](https://github.com/anchore/syft/wiki/multiple-outputs)
-* [Private Registry Authentication](https://github.com/anchore/syft/wiki/private-registry-authentication)
-  * [Local Docker Credentials](https://github.com/anchore/syft/wiki/private-registry-authentication#local-docker)
-  * [Docker Credentials in Kubernetes](https://github.com/anchore/syft/wiki/private-registry-authentication#docker-credentials-in-kubernetes)
-* [Attestation (experimental)](https://github.com/anchore/syft/wiki/attestation)
-  * [Keyless Support](https://github.com/anchore/syft/wiki/attestation#keyless-support)
-  * [Local private key support](https://github.com/anchore/syft/wiki/attestation#local-private-key-support)
-  * [Adding an SBOM to an image as an attestation using Syft](https://github.com/anchore/syft/wiki/attestation#adding-an-sbom-to-an-image-as-an-attestation-using-syft)
-* [Configuration](https://github.com/anchore/syft/wiki/configuration)
+### Recommended
+```bash
+curl -sSfL https://raw.githubusercontent.com/anchore/syft/main/install.sh | sh -s -- -b /usr/local/bin
+```

-## Contributing
+... or, you can specify a release version and destination directory for the installation:

-Check out our [contributing](/CONTRIBUTING.md) guide and [developer](/DEVELOPING.md) docs.
+```
+curl -sSfL https://raw.githubusercontent.com/anchore/syft/main/install.sh | sh -s -- -b <DESTINATION_DIR> <RELEASE_VERSION>
+```

-## Syft Team Meetings
+### Chocolatey

-The Syft Team hold regular community meetings online. All are welcome to join to bring topics for discussion. 
- Check the [calendar](https://calendar.google.com/calendar/u/0/r?cid=Y182OTM4dGt0MjRtajI0NnNzOThiaGtnM29qNEBncm91cC5jYWxlbmRhci5nb29nbGUuY29t) for the next meeting date. 
- Add items to the [agenda](https://docs.google.com/document/d/1ZtSAa6fj2a6KRWviTn3WoJm09edvrNUp4Iz_dOjjyY8/edit?usp=sharing) (join [this group](https://groups.google.com/g/anchore-oss-community) for write access to the [agenda](https://docs.google.com/document/d/1ZtSAa6fj2a6KRWviTn3WoJm09edvrNUp4Iz_dOjjyY8/edit?usp=sharing))
- See you there!
+The chocolatey distribution of syft is community maintained and not distributed by the anchore team

-<!-- KJIc1D4zXJbRybKEJrWd --> 
+```powershell
+choco install syft -y
+```
+
+### Scoop
+
+```powershell
+scoop install syft
+```
+
+### Homebrew
+```bash
+brew install syft
+```
+
+### Nix
+
+**Note**: Nix packaging of Syft is [community maintained](https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/admin/syft/default.nix). Syft is available in the [stable channel](https://nixos.wiki/wiki/Nix_channels#The_official_channels) since NixOS `22.05`.
+
+```bash
+nix-env -i syft
+```
+
+... or, just try it out in an ephemeral nix shell:
+
+```bash
+nix-shell -p syft
+```
+
+## Getting started
+
+### SBOM
+
+To generate an SBOM for a container image:
+
+```bash
+syft <image>
+```
+
+The above output includes only software that is visible in the container (i.e., the squashed representation of the image). To include software from all image layers in the SBOM, regardless of its presence in the final image, provide `--scope all-layers`:
+
+```bash
+syft <image> --scope all-layers
+```
+
+### Supported sources
+
+Syft can generate an SBOM from a variety of sources including images, files, directories, and archives. Syft will attempt to
+determine the type of source based on provided input, for example:
+
+```bash
+# catalog a container image archive (from the result of `docker image save ...`, `podman save ...`, or `skopeo copy` commands)
+syft path/to/image.tar
+
+# catalog a Singularity Image Format (SIF) container
+syft path/to/image.sif
+
+# catalog a directory
+syft path/to/dir
+```
+
+To explicitly specify the source behavior, use the `--from` flag. Allowable options are:
+
+```
+docker             use images from the Docker daemon
+podman             use images from the Podman daemon
+containerd         use images from the Containerd daemon
+docker-archive     use a tarball from disk for archives created from "docker save"
+oci-archive        use a tarball from disk for OCI archives (from Skopeo or otherwise)
+oci-dir            read directly from a path on disk for OCI layout directories (from Skopeo or otherwise)
+singularity        read directly from a Singularity Image Format (SIF) container on disk
+dir                read directly from a path on disk (any directory)
+file               read directly from a path on disk (any single file)
+registry           pull image directly from a registry (no container runtime required)
+```
+If a source is not provided and Syft identifies the input as a potential image reference, Syft will attempt to resolve it using:
+the Docker, Podman, and Containerd daemons followed by direct registry access, in that order.
+
+This default behavior can be overridden with the `default-image-pull-source` configuration option (See [Configuration](#configuration) for more details).
+
+
+### File selection
+
+By default, Syft will catalog file details and digests for files that are owned by discovered packages. You can change this behavior by using the `SYFT_FILE_METADATA_SELECTION` environment variable or the `file.metadata.selection` configuration option. The options are:
+
+- `all`: capture all files from the search space
+- `owned-by-package`: capture only files owned by packages (default)
+- `none`: disable capturing any file information
+
+
+### Package cataloger selection
+
+#### Concepts
+
+> [!IMPORTANT]  
+> Syft uses a different set of catalogers by default when scanning files directly than it does when scanning images
+
+The catalogers for an image scan assumes that package installation steps have already been completed. For example, Syft will identify Python packages that have egg or wheel metadata files under a `site-packages` directory, since this is how the canonical tooling `pip` installs python packages.
+
+The catalogers for a directory scan will look for installed software as well as declared dependencies that are not necessarily installed. For example, dependencies listed in a Python `requirements.txt`.
+
+This default set of catalogers being dynamic is critical as this allows Syft to be used in a variety of contexts while still generating accurate SBOMs.
+Overriding the set of default catalogers is not recommended for most purposes, however, is possible if needed.
+
+Catalogers can be referenced in two different ways:
+- *by name*: the exact cataloger name (e.g. `java-pom-cataloger` or `java-archive-cataloger`)
+- *by tag*: a tag that is associated with a cataloger (e.g. `java`)
+
+Syft can take lists of references on the CLI or in the application configuration to define which catalogers to use.
+
+You can **set** the list of catalogers explicitly to use with the `--override-default-catalogers` CLI flag, accepting a comma-separated list of cataloger names or tags.
+
+You can also **add** to, **remove** from, or **sub-select** catalogers to use within the default set of catalogers by using the `--select-catalogers` CLI flag.
+  - To **sub-select** catalogers simply provide a tag (e.g. `--select-catalogers TAG`). Catalogers will always be selected from the default set of catalogers (e.g. `--select-catalogers java,go` will select all the `java` catalogers in the default set and all the `go` catalogers in the default set).
+  - To **add** a cataloger prefix the cataloger name with `+` (e.g. `--select-catalogers +NAME`). Added catalogers will _always be added_ regardless of removals, filtering, or other defaults.
+  - To **remove** a cataloger prefix the cataloger name or tag with `-` (e.g. `--select-catalogers -NAME_OR_TAG`). Catalogers are removed from the set of default catalogers after processing any sub-selections.
+
+These rules and the dynamic default cataloger sets approximates to the following logic:
+
+```
+image_catalogers = all_catalogers AND catalogers_tagged("image")
+
+directory_catalogers = all_catalogers AND catalogers_tagged("directory")
+
+default_catalogers = image_catalogers OR directory_catalogers
+
+sub_selected_catalogers = default_catalogers INTERSECT catalogers_tagged(TAG) [ UNION sub_selected_catalogers ... ]
+
+base_catalogers = default_catalogers OR sub_selected_catalogers
+
+final_set = (base_catalogers SUBTRACT removed_catalogers) UNION added_catalogers
+```
+
+
+#### Examples
+
+Only scan for python related packages with catalogers appropriate for the source type (image or directory):
+```bash
+syft <some container image> --select-catalogers "python"
+# results in the following catalogers being used:
+# - python-installed-package-cataloger
+```
+
+Same command, but the set of catalogers changes based on what is being analyzed (in this case a directory):
+```bash
+syft <a directory> --select-catalogers "python"
+# results in the following catalogers being used:
+# - python-installed-package-cataloger
+# - python-package-cataloger
+```
+
+Use the default set of catalogers and add a cataloger to the set:
+```bash
+syft ... --select-catalogers "+sbom-cataloger"
+```
+
+Use the default set of catalogers but remove any catalogers that deal with RPMs:
+```bash
+syft ... --select-catalogers "-rpm"
+```
+
+Only scan with catalogers that:
+- are tagged with "go"
+- always use the sbom-cataloger
+- are appropriate for the source type (image or directory)
+
+```bash
+syft <some container image> --select-catalogers "go,+sbom-cataloger"
+# results in the following catalogers being used:
+# - go-module-binary-cataloger
+# - sbom-cataloger
+```
+
+Scan with all catalogers that deal with binary analysis, regardless of the source type:
+```bash
+syft ... --override-default-catalogers "binary"
+# results in the following catalogers being used:
+# - binary-cataloger
+# - cargo-auditable-binary-cataloger
+# - dotnet-portable-executable-cataloger
+# - go-module-binary-cataloger
+```
+
+Only scan with the specific `go-module-binary-cataloger` and `go-module-file-cataloger` catalogers:
+```bash
+syft ... --override-default-catalogers "go-module-binary-cataloger,go-module-file-cataloger"
+```
+
+
+### Excluding file paths
+
+Syft can exclude files and paths from being scanned within a source by using glob expressions
+with one or more `--exclude` parameters:
+```
+syft <source> --exclude './out/**/*.json' --exclude /etc
+```
+**Note:** in the case of _image scanning_, since the entire filesystem is scanned it is
+possible to use absolute paths like `/etc` or `/usr/**/*.txt` whereas _directory scans_
+exclude files _relative to the specified directory_. For example: scanning `/usr/foo` with
+`--exclude ./package.json` would exclude `/usr/foo/package.json` and `--exclude '**/package.json'`
+would exclude all `package.json` files under `/usr/foo`. For _directory scans_,
+it is required to begin path expressions with `./`, `*/`, or `**/`, all of which
+will be resolved _relative to the specified scan directory_. Keep in mind, your shell
+may attempt to expand wildcards, so put those parameters in single quotes, like:
+`'**/*.json'`.
+
+### Output formats
+
+The output format for Syft is configurable as well using the
+`-o` (or `--output`) option:
+
+```
+syft <image> -o <format>
+```
+
+Where the `formats` available are:
+- `syft-json`: Use this to get as much information out of Syft as possible!
+- `syft-text`: A row-oriented, human-and-machine-friendly output.
+- `cyclonedx-xml`: A XML report conforming to the [CycloneDX 1.4 specification](https://cyclonedx.org/specification/overview/).
+- `cyclonedx-json`: A JSON report conforming to the [CycloneDX 1.4 specification](https://cyclonedx.org/specification/overview/).
+- `spdx-tag-value`: A tag-value formatted report conforming to the [SPDX 2.3 specification](https://spdx.github.io/spdx-spec/v2.3/).
+- `spdx-tag-value@2.2`: A tag-value formatted report conforming to the [SPDX 2.2 specification](https://spdx.github.io/spdx-spec/v2.2.2/).
+- `spdx-json`: A JSON report conforming to the [SPDX 2.3 JSON Schema](https://github.com/spdx/spdx-spec/blob/v2.3/schemas/spdx-schema.json).
+- `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"](#using-templates) below.
+
+## Using templates
+
+Syft lets you define custom output formats, using [Go templates](https://pkg.go.dev/text/template) relative to the Syft JSON output. Here's how it works:
+
+- Define your format as a Go template, and save this template as a file.
+
+- Set the output format to "template" (`-o template`).
+
+- Specify the path to the template file (`-t ./path/to/custom.template`).
+
+- Syft's template processing uses the same data models as the `syft-json` output format — so if you're wondering what data is available as you author a template, you can use the output from `syft <image> -o syft-json` as a reference.
+
+**Example:** You could make Syft output data in CSV format by writing a Go template that renders CSV data and then running `syft <image> -o template -t ~/path/to/csv.tmpl`.
+
+Here's what the `csv.tmpl` file might look like:
+```gotemplate
+"Package","Version Installed", "Found by"
+{{- range .artifacts}}
+"{{.name}}","{{.version}}","{{.foundBy}}"
+{{- end}}
+```
+
+Which would produce output like:
+```text
+"Package","Version Installed","Found by"
+"alpine-baselayout","3.2.0-r20","apkdb-cataloger"
+"alpine-baselayout-data","3.2.0-r20","apkdb-cataloger"
+"alpine-keys","2.4-r1","apkdb-cataloger"
+...
+```
+
+Syft also includes a vast array of utility templating functions from [sprig](http://masterminds.github.io/sprig/) apart from the default Golang [text/template](https://pkg.go.dev/text/template#hdr-Functions) to allow users to customize the output format.
+
+Lastly, Syft has custom templating functions defined in `./syft/format/template/encoder.go` to help parse the passed-in JSON structs.
+
+> [!NOTE]
+> If you have templates being used before Syft v0.102.0 that are no longer working. This is because templating keys were relative to the internal go structs before this version whereas now the keys are relative to the Syft JSON output. To get the legacy behavior back you can set the `format.template.legacy` option to `true` in your configuration.
+
+## Multiple outputs
+
+Syft can also output _multiple_ files in differing formats by appending
+`=<file>` to the option, for example to output Syft JSON and SPDX JSON:
+
+```shell
+syft <image> -o syft-json=sbom.syft.json -o spdx-json=sbom.spdx.json
+```
+
+## Private Registry Authentication
+
+### Local Docker Credentials
+When a container runtime is not present, Syft can still utilize credentials configured in common credential sources (such as `~/.docker/config.json`). It will pull images from private registries using these credentials. The config file is where your credentials are stored when authenticating with private registries via some command like `docker login`. For more information see the `go-containerregistry` [documentation](https://github.com/google/go-containerregistry/tree/main/pkg/authn).
+
+An example `config.json` looks something like this:
+```json
+{
+	"auths": {
+		"registry.example.com": {
+			"username": "AzureDiamond",
+			"password": "hunter2"
+		}
+	}
+}
+```
+
+You can run the following command as an example. It details the mount/environment configuration a container needs to access a private registry:
+
+```
+docker run -v ./config.json:/config/config.json -e "DOCKER_CONFIG=/config" anchore/syft:latest  <private_image>
+```
+
+### Docker Credentials in Kubernetes
+
+Here's a simple workflow to mount this config file as a secret into a container on Kubernetes.
+
+1. Create a secret. The value of `config.json` is important. It refers to the specification detailed [here](https://github.com/google/go-containerregistry/tree/main/pkg/authn#the-config-file). Below this section is the `secret.yaml` file that the pod configuration will consume as a volume. The key `config.json` is important. It will end up being the name of the file when mounted into the pod.
+
+    ```yaml
+    # secret.yaml
+
+    apiVersion: v1
+    kind: Secret
+    metadata:
+      name: registry-config
+      namespace: syft
+    data:
+      config.json: <base64 encoded config.json>
+    ```
+
+   `kubectl apply -f secret.yaml`
+
+
+2. Create your pod running syft. The env `DOCKER_CONFIG` is important because it advertises where to look for the credential file. In the below example, setting `DOCKER_CONFIG=/config` informs syft that credentials can be found at `/config/config.json`. This is why we used `config.json` as the key for our secret. When mounted into containers the secrets' key is used as the filename. The `volumeMounts` section mounts our secret to `/config`. The `volumes` section names our volume and leverages the secret we created in step one.
+
+    ```yaml
+    # pod.yaml
+
+    apiVersion: v1
+    kind: Pod
+    metadata:
+      name: syft-k8s-usage
+    spec:
+      containers:
+        - image: anchore/syft:latest
+          name: syft-private-registry-demo
+          env:
+            - name: DOCKER_CONFIG
+              value: /config
+          volumeMounts:
+          - mountPath: /config
+            name: registry-config
+            readOnly: true
+          args:
+            - <private_image>
+      volumes:
+      - name: registry-config
+        secret:
+          secretName: registry-config
+    ```
+
+   `kubectl apply -f pod.yaml`
+
+
+3. The user can now run `kubectl logs syft-private-registry-demo`. The logs should show the Syft analysis for the `<private_image>` provided in the pod configuration.
+
+Using the above information, users should be able to configure private registry access without having to do so in the `grype` or `syft` configuration files.  They will also not be dependent on a Docker daemon, (or some other runtime software) for registry configuration and access.
+
+## Format conversion (experimental)
+
+The ability to convert existing SBOMs means you can create SBOMs in different formats quickly, without the need to regenerate the SBOM from scratch, which may take significantly more time.
+
+```
+syft convert <ORIGINAL-SBOM-FILE> -o <NEW-SBOM-FORMAT>[=<NEW-SBOM-FILE>]
+```
+
+This feature is experimental and data might be lost when converting formats. Packages are the main SBOM component easily transferable across formats, whereas files and relationships, as well as other information Syft doesn't support, are more likely to be lost.
+
+We support formats with wide community usage AND good encode/decode support by Syft. The supported formats are:
+- Syft JSON (```-o syft-json```)
+- SPDX 2.2 JSON (```-o spdx-json```)
+- SPDX 2.2 tag-value (```-o spdx-tag-value```)
+- CycloneDX 1.4 JSON (```-o cyclonedx-json```)
+- CycloneDX 1.4 XML (```-o cyclonedx-xml```)
+
+Conversion example:
+```sh
+syft alpine:latest -o syft-json=sbom.syft.json # generate a syft SBOM
+syft convert sbom.syft.json -o cyclonedx-json=sbom.cdx.json  # convert it to CycloneDX
+```
+
+## Attestation (experimental)
+### Keyless support
+Syft supports generating attestations using cosign's [keyless](https://github.com/sigstore/cosign/blob/main/KEYLESS.md) signatures.
+
+Note: users need to have >= v1.12.0 of cosign installed for this command to function
+
+To use this feature with a format like CycloneDX json simply run:
+```
+syft attest --output cyclonedx-json <IMAGE WITH OCI WRITE ACCESS>
+```
+This command will open a web browser and allow the user to authenticate their OIDC identity as the root of trust for the attestation (Github, Google, Microsoft).
+
+After authenticating, Syft will upload the attestation to the OCI registry specified by the image that the user has write access to.
+
+You will need to make sure your credentials are configured for the OCI registry you are uploading to so that the attestation can write successfully.
+
+Users can then verify the attestation(or any image with attestations) by running:
+```
+COSIGN_EXPERIMENTAL=1 cosign verify-attestation <IMAGE_WITH_ATTESTATIONS>
+```
+
+Users should see that the uploaded attestation claims are validated, the claims exist within the transparency log, and certificates on the attestations were verified against [fulcio](https://github.com/SigStore/fulcio).
+There will also be a printout of the certificates subject `<user identity>` and the certificate issuer URL: `<provider of user identity (Github, Google, Microsoft)>`:
+```
+Certificate subject:  test.email@testdomain.com
+Certificate issuer URL:  https://accounts.google.com
+```
+
+### Local private key support
+
+To generate an SBOM attestation for a container image using a local private key:
+```
+syft attest --output [FORMAT] --key [KEY] [SOURCE] [flags]
+```
+
+The above output is in the form of the [DSSE envelope](https://github.com/secure-systems-lab/dsse/blob/master/envelope.md#dsse-envelope).
+The payload is a base64 encoded `in-toto` statement with the generated SBOM as the predicate. For details on workflows using this command see [here](#adding-an-sbom-to-an-image-as-an-attestation-using-syft).
+
+
+
+## Configuration
+
+Configuration search paths:
+
+- `.syft.yaml`
+- `.syft/config.yaml`
+- `~/.syft.yaml`
+- `<XDG_CONFIG_HOME>/syft/config.yaml`
+
+Configuration options (example values are the default):
+
+```yaml
+# the output format(s) of the SBOM report (options: syft-table, syft-text, syft-json, spdx-json, ...)
+# to specify multiple output files in differing formats, use a list:
+# output:
+#   - "syft-json=<syft-json-output-file>"
+#   - "spdx-json=<spdx-json-output-file>"
+# SYFT_OUTPUT env var / -o, --output flags
+output: 
+  - "syft-table"
+
+# suppress all output (except for the SBOM report)
+# SYFT_QUIET env var / -q flag
+quiet: false
+
+# enable/disable checking for application updates on startup
+# SYFT_CHECK_FOR_APP_UPDATE env var 
+check-for-app-update: true
+
+# maximum number of workers used to process the list of package catalogers in parallel
+parallelism: 1
+
+# a list of globs to exclude from scanning, for example:
+# exclude:
+#   - "/etc/**"
+#   - "./out/**/*.json"
+# SYFT_EXCLUDE env var / --exclude flag
+exclude: []
+
+# os and/or architecture to use when referencing container images (e.g. "windows/armv6" or "arm64")
+# SYFT_PLATFORM env var / --platform flag
+platform: ""
+
+# the search space to look for file and package data (options: all-layers, squashed)
+# SYFT_SCOPE env var
+scope: "squashed"
+
+# set the list of package catalogers to use when generating the SBOM
+# default = empty (cataloger set determined automatically by the source type [image or file/directory])
+# Use `syft cataloger list` for a list of catalogers you can specify
+# DEPRECATED: please use default-catalogers and select-catalogers configuration options instead
+# SYFT_CATALOGERS env var / --catalogers flag
+catalogers:
+
+# set the base set of catalogers to use (defaults to 'image' or 'directory' depending on the scan source)
+# SYFT_DEFAULT_CATALOGERS env var / --override-default-catalogers flag
+default-catalogers: []
+
+# add, remove, and filter the catalogers to be used
+# SYFT_SELECT_CATALOGERS env var / --select-catalogers flag;
+select-catalogers: []
+
+# all format configuration
+format:
+ 
+  # default value for all formats that support the "pretty" option (default is unset)
+  # SYFT_FORMAT_PRETTY env var
+  pretty: 
+
+  # all syft-json format options
+  json:
+
+    # include space indention and newlines (inherits default value from 'format.pretty' or 'false' if parent is unset)
+    # note: inherits default value from 'format.pretty' or 'false' if parent is unset
+    # SYFT_FORMAT_JSON_PRETTY env var
+    pretty: false
+    
+    # transform any syft-json output to conform to an approximation of the v11.0.1 schema. This includes:
+    # - using the package metadata type names from before v12 of the JSON schema (changed in https://github.com/anchore/syft/pull/1983)
+    #
+    # Note: this will still include package types and fields that were added at or after json schema v12. This means
+    # that output might not strictly be json schema v11 compliant, however, for consumers that require time to port
+    # over to the final syft 1.0 json output this option can be used to ease the transition.
+    #
+    # Note: long term support for this option is not guaranteed (it may change or break at any time).
+    # SYFT_FORMAT_JSON_LEGACY env var
+    legacy: false
+
+  # all template format options
+  template:
+    # path to the template file to use when rendering the output with the `template` output format. 
+    # Note that all template paths are based on the current syft-json schema.
+    # SYFT_FORMAT_TEMPLATE_PATH env var / -t flag 
+    path: ""
+    
+    # if true, uses the go structs for the syft-json format for templating. 
+    # if false, uses the syft-json output for templating (which follows the syft JSON schema exactly).
+    #
+    # Note: long term support for this option is not guaranteed (it may change or break at any time).
+    # SYFT_FORMAT_TEMPLATE_LEGACY env var
+    legacy: false
+
+  # all spdx-json format options
+  spdx-json:
+
+    # include space indention and newlines
+    # note: inherits default value from 'format.pretty' or 'false' if parent is unset
+    # SYFT_FORMAT_SPDX_JSON_PRETTY env var
+    pretty: false
+
+  # all cyclonedx-json format options
+  cyclonedx-json:
+
+     # include space indention and newlines
+     # note: inherits default value from 'format.pretty' or 'false' if parent is unset
+     # SYFT_FORMAT_CYCLONEDX_JSON_PRETTY env var
+     pretty: false
+
+  # all cyclonedx-xml format options
+  cyclonedx-xml:
+
+     # include space indention
+     # note: inherits default value from 'format.pretty' or 'false' if parent is unset
+     # SYFT_FORMAT_CYCLONEDX_XML_PRETTY env var
+     pretty: false
+
+
+file:
+
+   metadata: 
+      # select which files should be captured by the file-metadata cataloger and included in the SBOM. 
+      # Options include:
+      #  - "all": capture all files from the search space
+      #  - "owned-by-package": capture only files owned by packages
+      #  - "none", "": do not capture any files
+      # SYFT_FILE_METADATA_SELECTION env var
+      selection: "owned-by-package"
+
+      # the file digest algorithms to use when cataloging files (options: "md5", "sha1", "sha224", "sha256", "sha384", "sha512")
+      # SYFT_FILE_METADATA_DIGESTS env var
+      digests:
+      - "sha256"
+      - "sha1"
+
+   # capture the contents of select files in the SBOM
+   content:
+      # skip searching a file entirely if it is above the given size (default = 1MB; unit = bytes)
+      # SYFT_FILE_CONTENT_SKIP_FILES_ABOVE_SIZE env var
+      skip-files-above-size: 1048576
+   
+      # file globs for the cataloger to match on
+      # SYFT_FILE_CONTENT_GLOBS env var
+      globs: []
+
+
+# cataloging packages is exposed through the packages and power-user subcommands
+package:
+   
+  # search within archives that do contain a file index to search against (zip)
+  # note: for now this only applies to the java package cataloger
+  # SYFT_PACKAGE_SEARCH_INDEXED_ARCHIVES env var
+  search-indexed-archives: true
+
+  # search within archives that do not contain a file index to search against (tar, tar.gz, tar.bz2, etc)
+  # note: enabling this may result in a performance impact since all discovered compressed tars will be decompressed
+  # note: for now this only applies to the java package cataloger
+  # SYFT_PACKAGE_SEARCH_UNINDEXED_ARCHIVES env var
+  search-unindexed-archives: false
+
+  # allows users to exclude synthetic binary packages from the sbom
+  # these packages are removed if an overlap with a non-synthetic package is found
+  # SYFT_PACKAGE_EXCLUDE_BINARY_OVERLAP_BY_OWNERSHIP env var
+  exclude-binary-overlap-by-ownership: true
+
+
+golang:
+   # search for go package licences in the GOPATH of the system running Syft, note that this is outside the
+   # container filesystem and potentially outside the root of a local directory scan
+   # SYFT_GOLANG_SEARCH_LOCAL_MOD_CACHE_LICENSES env var
+   search-local-mod-cache-licenses: false
+   
+   # specify an explicit go mod cache directory, if unset this defaults to $GOPATH/pkg/mod or $HOME/go/pkg/mod
+   # SYFT_GOLANG_LOCAL_MOD_CACHE_DIR env var
+   local-mod-cache-dir: ""
+
+   # search for go package licences by retrieving the package from a network proxy
+   # SYFT_GOLANG_SEARCH_REMOTE_LICENSES env var
+   search-remote-licenses: false
+
+   # remote proxy to use when retrieving go packages from the network,
+   # if unset this defaults to $GOPROXY followed by https://proxy.golang.org
+   # SYFT_GOLANG_PROXY env var
+   proxy: ""
+
+   # specifies packages which should not be fetched by proxy
+   # if unset this defaults to $GONOPROXY
+   # SYFT_GOLANG_NOPROXY env var
+   no-proxy: ""
+  
+   # the go main module version discovered from binaries built with the go compiler will
+   # always show (devel) as the version. Use these options to control heuristics to guess
+   # a more accurate version from the binary.
+   main-module-version:
+      
+      # look for LD flags that appear to be setting a version (e.g. -X main.version=1.0.0)
+      # SYFT_GOLANG_MAIN_MODULE_VERSION_FROM_LD_FLAGS env var
+      from-ld-flags: true
+      
+      # use the build settings (e.g. vcs.version & vcs.time) to craft a v0 pseudo version 
+      # (e.g. v0.0.0-20220308212642-53e6d0aaf6fb) when a more accurate version cannot be found otherwise.
+      # SYFT_GOLANG_MAIN_MODULE_VERSION_FROM_BUILD_SETTINGS env var
+      from-build-settings: true
+      
+      # search for semver-like strings in the binary contents.
+      # SYFT_GOLANG_MAIN_MODULE_VERSION_FROM_CONTENTS env var
+      from-contents: true
+  
+java:
+   maven-url: "https://repo1.maven.org/maven2"
+   max-parent-recursive-depth: 5
+   # enables Syft to use the network to fill in more detailed information about artifacts
+   # currently this enables searching maven-url for license data
+   # when running across pom.xml files that could have more information, syft will
+   # explicitly search maven for license information by querying the online pom when this is true
+   # this option is helpful for when the parent pom has more data,
+   # that is not accessible from within the final built artifact
+   use-network: false
+
+linux-kernel:
+   # whether to catalog linux kernel modules found within lib/modules/** directories
+   # SYFT_LINUX_KERNEL_CATALOG_MODULES env var
+   catalog-modules: true
+
+python:
+   # when running across entries in requirements.txt that do not specify a specific version 
+   # (e.g. "sqlalchemy >= 1.0.0, <= 2.0.0, != 3.0.0, <= 3.0.0"), attempt to guess what the version could
+   # be based on the version requirements specified (e.g. "1.0.0"). When enabled the lowest expressible version 
+   # when given an arbitrary constraint will be used (even if that version may not be available/published).
+   guess-unpinned-requirements: false
+
+javascript:
+  search-remote-licenses: false
+  npm-base-url: "https://registry.npmjs.org"
+
+
+# configuration for the source that the SBOM is generated from (e.g. a file, directory, or container image)
+source:
+  # alias name for the source
+  # SYFT_SOURCE_NAME env var / --source-name flag
+  name: ""
+   
+  # alias version for the source
+  # SYFT_SOURCE_VERSION env var / --source-version flag
+  version: ""
+
+  # base directory for scanning, no links will be followed above this directory, and all paths will be 
+  # reported relative to this directory
+  # SYFT_SOURCE_BASE_PATH env var
+  base-path: ''
+
+   # options affecting the file source type
+  file:
+    # the file digest algorithms to use on the scanned file (options: "md5", "sha1", "sha224", "sha256", "sha384", "sha512")
+    digests: 
+     - "sha256"
+
+  image:
+     
+    # allows users to specify which image source should be used to generate the sbom
+    # valid values are: registry, docker, podman
+    # SYFT_SOURCE_IMAGE_DEFAULT_PULL_SOURCE env var
+    default-pull-source: ""
+
+
+# options when pulling directly from a registry via the "registry:" or "containerd:" scheme
+registry:
+  # skip TLS verification when communicating with the registry
+  # SYFT_REGISTRY_INSECURE_SKIP_TLS_VERIFY env var
+  insecure-skip-tls-verify: false
+
+  # use http instead of https when connecting to the registry
+  # SYFT_REGISTRY_INSECURE_USE_HTTP env var
+  insecure-use-http: false
+
+  # filepath to a CA certificate (or directory containing *.crt, *.cert, *.pem) used to generate the client certificate
+  # SYFT_REGISTRY_CA_CERT env var
+  ca-cert: ""
+
+  # credentials for specific registries
+  auth:
+      # the URL to the registry (e.g. "docker.io", "localhost:5000", etc.)
+      # SYFT_REGISTRY_AUTH_AUTHORITY env var
+    - authority: ""
+
+      # SYFT_REGISTRY_AUTH_USERNAME env var
+      username: ""
+
+      # SYFT_REGISTRY_AUTH_PASSWORD env var
+      password: ""
+
+      # note: token and username/password are mutually exclusive
+      # SYFT_REGISTRY_AUTH_TOKEN env var
+      token: ""
+
+      # filepath to the client certificate used for TLS authentication to the registry
+      # SYFT_REGISTRY_AUTH_TLS_CERT env var
+      tls-cert: ""
+
+      # filepath to the client key used for TLS authentication to the registry
+      # SYFT_REGISTRY_AUTH_TLS_KEY env var
+      tls-key: ""
+    
+    # - ... # note, more credentials can be provided via config file only (not env vars)
+
+# generate an attested SBOM
+attest:
+  # path to the private key file to use for attestation
+  # SYFT_ATTEST_KEY env var
+  key: "cosign.key"
+
+  # password to decrypt to given private key
+  # SYFT_ATTEST_PASSWORD env var, additionally responds to COSIGN_PASSWORD
+  password: ""
+
+log:
+  # use structured logging
+  # SYFT_LOG_STRUCTURED env var
+  structured: false
+
+  # the log level; note: detailed logging suppress the ETUI
+  # SYFT_LOG_LEVEL env var
+  level: "error"
+
+  # location to write the log file (default is not to have a log file)
+  # SYFT_LOG_FILE env var
+  file: ""
+```
+
+### Adding an SBOM to an image as an attestation using Syft
+
+`syft attest --output [FORMAT] --key [KEY] [SOURCE] [flags]`
+
+SBOMs themselves can serve as input to different analysis tools. [Grype](https://github.com/anchore/grype), a vulnerability scanner CLI tool from Anchore, is one such tool. Publishers of container images can use attestations to enable their consumers to trust Syft-generated SBOM descriptions of those container images. To create and provide these attestations, image publishers can run `syft attest` in conjunction with the [cosign](https://github.com/sigstore/cosign) tool to attach SBOM attestations to their images.
+
+#### Example attestation
+Note for the following example replace `docker.io/image:latest` with an image you own. You should also have push access to
+its remote reference. Replace `$MY_PRIVATE_KEY` with a private key you own or have generated with cosign.
+
+```bash
+syft attest --key $MY_PRIVATE_KEY -o spdx-json docker.io/image:latest > image_latest_sbom_attestation.json
+cosign attach attestation --attestation image_latest_sbom_attestation.json docker.io/image:latest
+```
+
+Verify the new attestation exists on your image.
+
+```bash
+cosign verify-attestation --key $MY_PUBLIC_KEY --type spdxjson docker.io/image:latest | jq '.payload | @base64d | .payload | fromjson | .predicate'
+```
+
+You should see this output along with the attached SBOM:
+
+```
+Verification for docker.io/image:latest --
+The following checks were performed on each of these signatures:
+  - The cosign claims were validated
+  - The signatures were verified against the specified public key
+  - Any certificates were verified against the Fulcio roots.
+```
+
+Consumers of your image can now trust that the SBOM associated with your image is correct and from a trusted source.
+
+The SBOM can be piped to Grype:
+
+
+```bash
+cosign verify-attestation --key $MY_PUBLIC_KEY --type spdxjson docker.io/image:latest | jq '.payload | @base64d | .payload | fromjson | .predicate' | grype
+```
@@ -470,16 +470,6 @@ tasks:
        silent: true
      - "{{ .RELEASE_CMD }}"

-  ci-release-version-file:
-    # desc: "[CI only] Update the version file"
-    deps: [tools]
-    cmds:
-      - task: ci-check
-      - ".github/scripts/update-version-file.sh {{ .RELEASE_VERSION }}"
-    requires:
-      vars:
-        - RELEASE_VERSION
-

  ## Cleanup targets #################################

@@ -48,7 +48,6 @@ func create(id clio.Identification, out io.Writer) (clio.Application, *cobra.Com
 		commands.Attest(app),
 		commands.Convert(app),
 		clio.VersionCommand(id),
-		clio.ConfigCommand(app, nil),
 		cranecmd.NewCmdAuthLogin(id.Name), // syft login uses the same command as crane
 	)

@@ -43,7 +43,6 @@ type attestOptions struct {
 	options.UpdateCheck `yaml:",inline" mapstructure:",squash"`
 	options.Catalog     `yaml:",inline" mapstructure:",squash"`
 	Attest              options.Attest `yaml:"attest" mapstructure:"attest"`
-	Cache               options.Cache  `json:"-" yaml:"cache" mapstructure:"cache"`
 }

 func Attest(app clio.Application) *cobra.Command {
@@ -78,7 +77,6 @@ func defaultAttestOptions() attestOptions {
 		Output:      defaultAttestOutputOptions(),
 		UpdateCheck: options.DefaultUpdateCheck(),
 		Catalog:     options.DefaultCatalog(),
-		Cache:       options.DefaultCache(),
 	}
 }

@@ -68,7 +68,6 @@ type scanOptions struct {
 	options.Output      `yaml:",inline" mapstructure:",squash"`
 	options.UpdateCheck `yaml:",inline" mapstructure:",squash"`
 	options.Catalog     `yaml:",inline" mapstructure:",squash"`
-	Cache               options.Cache `json:"-" yaml:"cache" mapstructure:"cache"`
 }

 func defaultScanOptions() *scanOptions {
@@ -76,7 +75,6 @@ func defaultScanOptions() *scanOptions {
 		Output:      options.DefaultOutput(),
 		UpdateCheck: options.DefaultUpdateCheck(),
 		Catalog:     options.DefaultCatalog(),
-		Cache:       options.DefaultCache(),
 	}
 }

@@ -12,16 +12,8 @@ type Attest struct {
 	Password secret `yaml:"password" json:"password" mapstructure:"password"`
 }

-var _ interface {
-	clio.FlagAdder
-	clio.FieldDescriber
-} = (*Attest)(nil)
+var _ clio.FlagAdder = (*Attest)(nil)

 func (o *Attest) AddFlags(flags clio.FlagSet) {
 	flags.StringVarP((*string)(&o.Key), "key", "k", "the key to use for the attestation")
 }
-
-func (o *Attest) DescribeFields(descriptions clio.FieldDescriptionSet) {
-	descriptions.Add(&o.Password, `password to decrypt to given private key
-additionally responds to COSIGN_PASSWORD env var`)
-}
@@ -1,131 +0,0 @@
-package options
-
-import (
-	"fmt"
-	"os"
-	"path/filepath"
-	"regexp"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/adrg/xdg"
-	"github.com/mitchellh/go-homedir"
-
-	"github.com/anchore/clio"
-	"github.com/anchore/syft/internal/cache"
-	"github.com/anchore/syft/internal/log"
-)
-
-// Cache provides configuration for the Syft caching behavior
-type Cache struct {
-	Dir string `yaml:"dir" mapstructure:"dir"`
-	TTL string `yaml:"ttl" mapstructure:"ttl"`
-}
-
-func (c *Cache) DescribeFields(descriptions clio.FieldDescriptionSet) {
-	descriptions.Add(&c.Dir, "root directory to cache any downloaded content; empty string will use an in-memory cache")
-	descriptions.Add(&c.TTL, "time to live for cached data; setting this to 0 will disable caching entirely")
-}
-
-func (c *Cache) PostLoad() error {
-	ttl, err := parseDuration(c.TTL)
-	if err != nil {
-		log.Warnf("unable to parse duration '%v', using default (%s) due to: %v", c.TTL, durationToString(defaultTTL()), err)
-		ttl = defaultTTL()
-	}
-	// if TTL is <= 0, disable caching entirely
-	if ttl <= 0 {
-		cache.SetManager(nil)
-		return nil
-	}
-	// if dir == "" but we have a TTL, use an in-memory cache
-	if c.Dir == "" {
-		cache.SetManager(cache.NewInMemory(ttl))
-		return nil
-	}
-	dir, err := homedir.Expand(c.Dir)
-	if err != nil {
-		log.Warnf("unable to expand cache directory %s: %v", c.Dir, err)
-		cache.SetManager(cache.NewInMemory(ttl))
-	} else {
-		m, err := cache.NewFromDir(dir, ttl)
-		if err != nil {
-			log.Warnf("unable to get filesystem cache at %s: %v", c.Dir, err)
-			cache.SetManager(cache.NewInMemory(ttl))
-		} else {
-			cache.SetManager(m)
-		}
-	}
-	return nil
-}
-
-var _ interface {
-	clio.PostLoader
-	clio.FieldDescriber
-} = (*Cache)(nil)
-
-func DefaultCache() Cache {
-	return Cache{
-		Dir: defaultDir(),
-		TTL: durationToString(defaultTTL()),
-	}
-}
-
-func defaultTTL() time.Duration {
-	return 7 * 24 * time.Hour
-}
-
-func defaultDir() string {
-	var err error
-	cacheRoot := xdg.CacheHome
-	if cacheRoot == "" {
-		cacheRoot, err = homedir.Dir()
-		if err != nil {
-			cacheRoot = os.TempDir()
-			log.Debugf("unable to get stable cache directory due to: %v, defaulting cache to temp dir: %s", err, cacheRoot)
-		} else {
-			cacheRoot = filepath.Join(cacheRoot, ".cache")
-		}
-	}
-
-	return filepath.Join(cacheRoot, "syft")
-}
-
-func durationToString(duration time.Duration) string {
-	days := int64(duration / (24 * time.Hour))
-	remain := duration % (24 * time.Hour)
-	out := ""
-	if days > 0 {
-		out = fmt.Sprintf("%vd", days)
-	}
-	if remain != 0 {
-		out += remain.String()
-	}
-	if out == "" {
-		return "0"
-	}
-	return out
-}
-
-func parseDuration(duration string) (time.Duration, error) {
-	whitespace := regexp.MustCompile(`\s+`)
-	duration = strings.ToLower(whitespace.ReplaceAllString(duration, ""))
-	parts := strings.SplitN(duration, "d", 2)
-	var days time.Duration
-	var remain time.Duration
-	var err error
-	if len(parts) > 1 {
-		numDays, daysErr := strconv.Atoi(parts[0])
-		if daysErr != nil {
-			return 0, daysErr
-		}
-		days = time.Duration(numDays) * 24 * time.Hour
-		if len(parts[1]) > 0 {
-			remain, err = time.ParseDuration(parts[1])
-		}
-	} else {
-		remain, err = time.ParseDuration(duration)
-	}
-	return days + remain, err
-}
@@ -1,313 +0,0 @@
-package options
-
-import (
-	"io"
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/adrg/xdg"
-	"github.com/mitchellh/go-homedir"
-	"github.com/stretchr/testify/require"
-
-	"github.com/anchore/syft/internal"
-	"github.com/anchore/syft/internal/cache"
-)
-
-func Test_defaultDir(t *testing.T) {
-	tmpDir := filepath.Join(t.TempDir(), "cache-temp")
-	xdgCacheDir := filepath.Join(tmpDir, "fake-xdg-cache")
-	homeDir := filepath.Join(tmpDir, "fake-home")
-
-	tests := []struct {
-		name     string
-		env      map[string]string
-		expected string
-	}{
-		{
-			name: "no-xdg",
-			env: map[string]string{
-				"HOME": homeDir,
-			},
-			expected: homeDir,
-		},
-		{
-			name: "xdg-cache",
-			env: map[string]string{
-				"XDG_CACHE_HOME": xdgCacheDir,
-			},
-			expected: xdgCacheDir,
-		},
-	}
-
-	// capture all the initial environment variables to reset them before we reset library caches
-	env := map[string]string{
-		"HOME":            "",
-		"XDG_DATA_HOME":   "",
-		"XDG_DATA_DIRS":   "",
-		"XDG_CONFIG_HOME": "",
-		"XDG_CONFIG_DIRS": "",
-		"XDG_STATE_HOME":  "",
-		"XDG_CACHE_HOME":  "",
-		"XDG_RUNTIME_DIR": "",
-	}
-	for k := range env {
-		env[k] = os.Getenv(k)
-	}
-
-	unsetEnv := func(t *testing.T) {
-		for k := range env {
-			t.Setenv(k, "")
-		}
-	}
-
-	resetEnv := func() {
-		for k, v := range env {
-			if v == "" {
-				_ = os.Unsetenv(k)
-			} else {
-				_ = os.Setenv(k, v)
-			}
-		}
-		homedir.Reset()
-		xdg.Reload()
-	}
-
-	t.Cleanup(resetEnv)
-
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			defer resetEnv()
-
-			unsetEnv(t)
-			for k, v := range test.env {
-				t.Setenv(k, v)
-			}
-			homedir.Reset()
-			xdg.Reload()
-
-			got := defaultDir()
-
-			require.True(t, strings.HasPrefix(got, test.expected))
-		})
-	}
-}
-
-func Test_cacheOptions(t *testing.T) {
-	tmp := t.TempDir()
-	tests := []struct {
-		name string
-		opts Cache
-		test func(t *testing.T)
-	}{
-		{
-			name: "disable-1",
-			opts: Cache{
-				Dir: "some-dir",
-				TTL: "0",
-			},
-			test: func(t *testing.T) {
-				c := cache.GetManager().GetCache("test-disable-1", "v-disable-1")
-				err := c.Write("key-disable-1", strings.NewReader("some-value-disable-1"))
-				require.NoError(t, err)
-				rdr, err := c.Read("key-disable-1")
-				require.Nil(t, rdr)
-				require.Error(t, err)
-			},
-		},
-		{
-			name: "disable-2",
-			opts: Cache{
-				Dir: "some-dir",
-				TTL: "0s",
-			},
-			test: func(t *testing.T) {
-				c := cache.GetManager().GetCache("test-disable-2", "v-disable-2")
-				err := c.Write("key-disable-2", strings.NewReader("some-value-disable-2"))
-				require.NoError(t, err)
-				rdr, err := c.Read("key-disable-2")
-				require.Nil(t, rdr)
-				require.Error(t, err)
-			},
-		},
-
-		{
-			name: "disable-3",
-			opts: Cache{
-				Dir: "some-dir",
-				TTL: "0d",
-			},
-			test: func(t *testing.T) {
-				c := cache.GetManager().GetCache("test-disable-3", "v-disable-3")
-				err := c.Write("key-disable-3", strings.NewReader("some-value-disable-3"))
-				require.NoError(t, err)
-				rdr, err := c.Read("key-disable-3")
-				require.Nil(t, rdr)
-				require.Error(t, err)
-			},
-		},
-		{
-			name: "in-memory",
-			opts: Cache{
-				Dir: "",
-				TTL: "10m",
-			},
-			test: func(t *testing.T) {
-				c := cache.GetManager().GetCache("test-mem", "v-mem")
-				err := c.Write("key-mem", strings.NewReader("some-value-mem"))
-				require.NoError(t, err)
-				rdr, err := c.Read("key-mem")
-				require.NotNil(t, rdr)
-				defer internal.CloseAndLogError(rdr, "")
-				require.NoError(t, err)
-				data, err := io.ReadAll(rdr)
-				require.NoError(t, err)
-				require.Equal(t, "some-value-mem", string(data))
-				require.NoDirExists(t, filepath.Join("test-mem", "v-mem"))
-			},
-		},
-		{
-			name: "on disk",
-			opts: Cache{
-				Dir: tmp,
-				TTL: "10m",
-			},
-			test: func(t *testing.T) {
-				c := cache.GetManager().GetCache("test-disk", "v-disk")
-				err := c.Write("key-disk", strings.NewReader("some-value-disk"))
-				require.NoError(t, err)
-				rdr, err := c.Read("key-disk")
-				require.NotNil(t, rdr)
-				defer internal.CloseAndLogError(rdr, "")
-				require.NoError(t, err)
-				data, err := io.ReadAll(rdr)
-				require.NoError(t, err)
-				require.Equal(t, "some-value-disk", string(data))
-				require.DirExists(t, filepath.Join(tmp, "test-disk", "v-disk"))
-			},
-		},
-	}
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			original := cache.GetManager()
-			defer cache.SetManager(original)
-
-			err := test.opts.PostLoad()
-			require.NoError(t, err)
-
-			test.test(t)
-		})
-	}
-}
-
-func Test_parseDuration(t *testing.T) {
-	tests := []struct {
-		duration string
-		expect   time.Duration
-		err      require.ErrorAssertionFunc
-	}{
-		{
-			duration: "0d",
-			expect:   0,
-		},
-		{
-			duration: "0m",
-			expect:   0,
-		},
-		{
-			duration: "0s",
-			expect:   0,
-		},
-		{
-			duration: "0",
-			expect:   0,
-		},
-		{
-			duration: "1d",
-			expect:   24 * time.Hour,
-		},
-		{
-			duration: "7d",
-			expect:   7 * 24 * time.Hour,
-		},
-		{
-			duration: "365D",
-			expect:   365 * 24 * time.Hour,
-		},
-		{
-			duration: "7d1h1m1s",
-			expect:   7*24*time.Hour + time.Hour + time.Minute + time.Second,
-		},
-		{
-			duration: "7d  1h 1m 1s",
-			expect:   7*24*time.Hour + time.Hour + time.Minute + time.Second,
-		},
-		{
-			duration: "2h",
-			expect:   2 * time.Hour,
-		},
-		{
-			duration: "2h5m",
-			expect:   2*time.Hour + 5*time.Minute,
-		},
-		{
-			duration: "2h 5m",
-			expect:   2*time.Hour + 5*time.Minute,
-		},
-		{
-			duration: "d24h",
-			err:      require.Error,
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.duration, func(t *testing.T) {
-			got, err := parseDuration(test.duration)
-			if test.err != nil {
-				test.err(t, err)
-				return
-			} else {
-				require.NoError(t, err)
-			}
-			require.Equal(t, test.expect, got)
-		})
-	}
-}
-
-func Test_durationToString(t *testing.T) {
-	tests := []struct {
-		duration time.Duration
-		expect   string
-		err      require.ErrorAssertionFunc
-	}{
-		{
-			expect:   "1d",
-			duration: 24 * time.Hour,
-		},
-		{
-			expect:   "7d",
-			duration: 7 * 24 * time.Hour,
-		},
-		{
-			expect:   "7d1h1m1s",
-			duration: 7*24*time.Hour + time.Hour + time.Minute + time.Second,
-		},
-		{
-			expect:   "2h0m0s",
-			duration: 2 * time.Hour,
-		},
-		{
-			expect:   "2h5m0s",
-			duration: 2*time.Hour + 5*time.Minute,
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.expect, func(t *testing.T) {
-			got := durationToString(test.duration)
-			require.Equal(t, test.expect, got)
-		})
-	}
-}
@@ -64,7 +64,6 @@ func DefaultCatalog() Catalog {
 		Package:       defaultPackageConfig(),
 		LinuxKernel:   defaultLinuxKernelConfig(),
 		Golang:        defaultGolangConfig(),
-		Java:          defaultJavaConfig(),
 		File:          defaultFileConfig(),
 		Relationships: defaultRelationshipsConfig(),
 		Source:        defaultSourceConfig(),
@@ -151,8 +150,6 @@ func (cfg Catalog) ToPackagesConfig() pkgcataloging.Config {
 			GuessUnpinnedRequirements: cfg.Python.GuessUnpinnedRequirements,
 		},
 		JavaArchive: java.DefaultArchiveCatalogerConfig().
-			WithUseMavenLocalRepository(cfg.Java.UseMavenLocalRepository).
-			WithMavenLocalRepositoryDir(cfg.Java.MavenLocalRepositoryDir).
 			WithUseNetwork(cfg.Java.UseNetwork).
 			WithMavenBaseURL(cfg.Java.MavenURL).
 			WithArchiveTraversal(archiveSearch, cfg.Java.MaxParentRecursiveDepth),
@@ -6,7 +6,6 @@ import (

 	"github.com/scylladb/go-set/strset"

-	"github.com/anchore/clio"
 	intFile "github.com/anchore/syft/internal/file"
 	"github.com/anchore/syft/syft/file"
 )
@@ -46,11 +45,6 @@ func defaultFileConfig() fileConfig {
 	}
 }

-var _ interface {
-	clio.PostLoader
-	clio.FieldDescriber
-} = (*fileConfig)(nil)
-
 func (c *fileConfig) PostLoad() error {
 	digests := strset.New(c.Metadata.Digests...).List()
 	sort.Strings(digests)
@@ -62,17 +56,3 @@ func (c *fileConfig) PostLoad() error {
 	}
 	return fmt.Errorf("invalid file metadata selection: %q", c.Metadata.Selection)
 }
-
-func (c *fileConfig) DescribeFields(descriptions clio.FieldDescriptionSet) {
-	descriptions.Add(&c.Metadata.Selection, `select which files should be captured by the file-metadata cataloger and included in the SBOM. 
-Options include:
- - "all": capture all files from the search space
- - "owned-by-package": capture only files owned by packages
- - "none", "": do not capture any files`)
-	descriptions.Add(&c.Metadata.Digests, `the file digest algorithms to use when cataloging files (options: "md5", "sha1", "sha224", "sha256", "sha384", "sha512")`)
-
-	descriptions.Add(&c.Content.SkipFilesAboveSize, `skip searching a file entirely if it is above the given size (default = 1MB; unit = bytes)`)
-	descriptions.Add(&c.Content.Globs, `file globs for the cataloger to match on`)
-
-	descriptions.Add(&c.Executable.Globs, `file globs for the cataloger to match on`)
-}
@@ -7,19 +7,16 @@ import (
 	"github.com/anchore/syft/syft/sbom"
 )

-var _ interface {
-	clio.PostLoader
-	clio.FieldDescriber
-} = (*Format)(nil)
+var _ clio.PostLoader = (*Format)(nil)

 // Format contains all user configuration for output formatting.
 type Format struct {
 	Pretty        *bool               `yaml:"pretty" json:"pretty" mapstructure:"pretty"`
-	Template      FormatTemplate      `yaml:"template" json:"template" mapstructure:"template" description:"all template format options"`
-	SyftJSON      FormatSyftJSON      `yaml:"json" json:"json" mapstructure:"json" description:"all syft-json format options"`
-	SPDXJSON      FormatSPDXJSON      `yaml:"spdx-json" json:"spdx-json" mapstructure:"spdx-json" description:"all spdx-json format options"`
-	CyclonedxJSON FormatCyclonedxJSON `yaml:"cyclonedx-json" json:"cyclonedx-json" mapstructure:"cyclonedx-json" description:"all cyclonedx-json format options"`
-	CyclonedxXML  FormatCyclonedxXML  `yaml:"cyclonedx-xml" json:"cyclonedx-xml" mapstructure:"cyclonedx-xml" description:"all cyclonedx-xml format options"`
+	Template      FormatTemplate      `yaml:"template" json:"template" mapstructure:"template"`
+	SyftJSON      FormatSyftJSON      `yaml:"json" json:"json" mapstructure:"json"`
+	SPDXJSON      FormatSPDXJSON      `yaml:"spdx-json" json:"spdx-json" mapstructure:"spdx-json"`
+	CyclonedxJSON FormatCyclonedxJSON `yaml:"cyclonedx-json" json:"cyclonedx-json" mapstructure:"cyclonedx-json"`
+	CyclonedxXML  FormatCyclonedxXML  `yaml:"cyclonedx-xml" json:"cyclonedx-xml" mapstructure:"cyclonedx-xml"`
 }

 func (o *Format) PostLoad() error {
@@ -31,33 +28,6 @@ func (o *Format) PostLoad() error {
 	return nil
 }

-func (o *Format) DescribeFields(descriptions clio.FieldDescriptionSet) {
-	descriptions.Add(&o.Pretty, `default value for all formats that support the "pretty" option (default is unset)`)
-	descriptions.Add(&o.SyftJSON, `all syft-json format options`)
-	descriptions.Add(&o.SyftJSON.Legacy, `transform any syft-json output to conform to an approximation of the v11.0.1 schema. This includes:
- using the package metadata type names from before v12 of the JSON schema (changed in https://github.com/anchore/syft/pull/1983)
-
-Note: this will still include package types and fields that were added at or after json schema v12. This means
-that output might not strictly be json schema v11 compliant, however, for consumers that require time to port
-over to the final syft 1.0 json output this option can be used to ease the transition.
-
-Note: long term support for this option is not guaranteed (it may change or break at any time)`)
-
-	descriptions.Add(&o.Template.Path, `path to the template file to use when rendering the output with the template output format. 
-Note that all template paths are based on the current syft-json schema`)
-	descriptions.Add(&o.Template.Legacy, `if true, uses the go structs for the syft-json format for templating. 
-if false, uses the syft-json output for templating (which follows the syft JSON schema exactly).
-
-Note: long term support for this option is not guaranteed (it may change or break at any time)`)
-
-	prettyDescription := `include space indention and newlines
-note: inherits default value from 'format.pretty' or 'false' if parent is unset`
-	descriptions.Add(&o.SyftJSON.Pretty, prettyDescription)
-	descriptions.Add(&o.SPDXJSON.Pretty, prettyDescription)
-	descriptions.Add(&o.CyclonedxJSON.Pretty, prettyDescription)
-	descriptions.Add(&o.CyclonedxXML.Pretty, prettyDescription)
-}
-
 func DefaultFormat() Format {
 	return Format{
 		Template:      DefaultFormatTemplate(),
@@ -3,7 +3,6 @@ package options
 import (
 	"strings"

-	"github.com/anchore/clio"
 	"github.com/anchore/syft/syft/pkg/cataloger/golang"
 )

@@ -16,28 +15,6 @@ type golangConfig struct {
 	MainModuleVersion           golangMainModuleVersionConfig `json:"main-module-version" yaml:"main-module-version" mapstructure:"main-module-version"`
 }

-var _ interface {
-	clio.FieldDescriber
-} = (*golangConfig)(nil)
-
-func (o *golangConfig) DescribeFields(descriptions clio.FieldDescriptionSet) {
-	descriptions.Add(&o.SearchLocalModCacheLicenses, `search for go package licences in the GOPATH of the system running Syft, note that this is outside the
-container filesystem and potentially outside the root of a local directory scan`)
-	descriptions.Add(&o.LocalModCacheDir, `specify an explicit go mod cache directory, if unset this defaults to $GOPATH/pkg/mod or $HOME/go/pkg/mod`)
-	descriptions.Add(&o.SearchRemoteLicenses, `search for go package licences by retrieving the package from a network proxy`)
-	descriptions.Add(&o.Proxy, `remote proxy to use when retrieving go packages from the network,
-if unset this defaults to $GOPROXY followed by https://proxy.golang.org`)
-	descriptions.Add(&o.NoProxy, `specifies packages which should not be fetched by proxy
-if unset this defaults to $GONOPROXY`)
-	descriptions.Add(&o.MainModuleVersion, `the go main module version discovered from binaries built with the go compiler will
-always show (devel) as the version. Use these options to control heuristics to guess
-a more accurate version from the binary.`)
-	descriptions.Add(&o.MainModuleVersion.FromLDFlags, `look for LD flags that appear to be setting a version (e.g. -X main.version=1.0.0)`)
-	descriptions.Add(&o.MainModuleVersion.FromBuildSettings, `use the build settings (e.g. vcs.version & vcs.time) to craft a v0 pseudo version 
-(e.g. v0.0.0-20220308212642-53e6d0aaf6fb) when a more accurate version cannot be found otherwise`)
-	descriptions.Add(&o.MainModuleVersion.FromContents, `search for semver-like strings in the binary contents`)
-}
-
 type golangMainModuleVersionConfig struct {
 	FromLDFlags       bool `json:"from-ld-flags" yaml:"from-ld-flags" mapstructure:"from-ld-flags"`
 	FromContents      bool `json:"from-contents" yaml:"from-contents" mapstructure:"from-contents"`
@@ -1,46 +1,7 @@
 package options

-import (
-	"github.com/anchore/clio"
-	"github.com/anchore/syft/syft/pkg/cataloger/java"
-)
-
 type javaConfig struct {
 	UseNetwork              bool   `yaml:"use-network" json:"use-network" mapstructure:"use-network"`
-	UseMavenLocalRepository bool   `yaml:"use-maven-local-repository" json:"use-maven-local-repository" mapstructure:"use-maven-local-repository"`
-	MavenLocalRepositoryDir string `yaml:"maven-local-repository-dir" json:"maven-local-repository-dir" mapstructure:"maven-local-repository-dir"`
 	MavenURL                string `yaml:"maven-url" json:"maven-url" mapstructure:"maven-url"`
 	MaxParentRecursiveDepth int    `yaml:"max-parent-recursive-depth" json:"max-parent-recursive-depth" mapstructure:"max-parent-recursive-depth"`
 }
-
-func defaultJavaConfig() javaConfig {
-	def := java.DefaultArchiveCatalogerConfig()
-
-	return javaConfig{
-		UseNetwork:              def.UseNetwork,
-		MaxParentRecursiveDepth: def.MaxParentRecursiveDepth,
-		UseMavenLocalRepository: def.UseMavenLocalRepository,
-		MavenLocalRepositoryDir: def.MavenLocalRepositoryDir,
-		MavenURL:                def.MavenBaseURL,
-	}
-}
-
-var _ interface {
-	clio.FieldDescriber
-} = (*javaConfig)(nil)
-
-func (o *javaConfig) DescribeFields(descriptions clio.FieldDescriptionSet) {
-	descriptions.Add(&o.UseNetwork, `enables Syft to use the network to fetch version and license information for packages when
-a parent or imported pom file is not found in the local maven repository.
-the pom files are downloaded from the remote Maven repository at 'maven-url'`)
-	descriptions.Add(&o.MavenURL, `maven repository to use, defaults to Maven central`)
-	descriptions.Add(&o.MaxParentRecursiveDepth, `depth to recursively resolve parent POMs, no limit if <= 0`)
-	descriptions.Add(&o.UseMavenLocalRepository, `use the local Maven repository to retrieve pom files. When Maven is installed and was previously used
-for building the software that is being scanned, then most pom files will be available in this
-repository on the local file system. this greatly speeds up scans. when all pom files are available
-in the local repository, then 'use-network' is not needed.
-TIP: If you want to download all required pom files to the local repository without running a full
-build, run 'mvn help:effective-pom' before performing the scan with syft.`)
-	descriptions.Add(&o.MavenLocalRepositoryDir, `override the default location of the local Maven repository. 
-the default is the subdirectory '.m2/repository' in your home directory`)
-}
@@ -1,17 +1,6 @@
 package options

-import "github.com/anchore/clio"
-
 type javaScriptConfig struct {
 	SearchRemoteLicenses bool   `json:"search-remote-licenses" yaml:"search-remote-licenses" mapstructure:"search-remote-licenses"`
 	NpmBaseURL           string `json:"npm-base-url" yaml:"npm-base-url" mapstructure:"npm-base-url"`
 }
-
-var _ interface {
-	clio.FieldDescriber
-} = (*javaScriptConfig)(nil)
-
-func (o *javaScriptConfig) DescribeFields(descriptions clio.FieldDescriptionSet) {
-	descriptions.Add(&o.SearchRemoteLicenses, `enables Syft to use the network to fill in more detailed license information`)
-	descriptions.Add(&o.NpmBaseURL, `base NPM url to use`)
-}
@@ -1,7 +1,5 @@
 package options

-import "github.com/anchore/clio"
-
 type linuxKernelConfig struct {
 	CatalogModules bool `json:"catalog-modules" yaml:"catalog-modules" mapstructure:"catalog-modules"`
 }
@@ -11,11 +9,3 @@ func defaultLinuxKernelConfig() linuxKernelConfig {
 		CatalogModules: true,
 	}
 }
-
-var _ interface {
-	clio.FieldDescriber
-} = (*linuxKernelConfig)(nil)
-
-func (o *linuxKernelConfig) DescribeFields(descriptions clio.FieldDescriptionSet) {
-	descriptions.Add(&o.CatalogModules, `whether to catalog linux kernel modules found within lib/modules/** directories`)
-}
@@ -24,7 +24,6 @@ import (
 var _ interface {
 	clio.FlagAdder
 	clio.PostLoader
-	clio.FieldDescriber
 } = (*Output)(nil)

 // Output has the standard output options syft accepts: multiple -o, --file, --template
@@ -71,15 +70,6 @@ func (o *Output) AddFlags(flags clio.FlagSet) {
 		fmt.Sprintf("report output format (<format>=<file> to output to a file), formats=%v", names))
 }

-func (o *Output) DescribeFields(descriptions clio.FieldDescriptionSet) {
-	descriptions.Add(&o.Outputs, `the output format(s) of the SBOM report (options: syft-table, syft-text, syft-json, spdx-json, ...)
-to specify multiple output files in differing formats, use a list:
-output:
-  - "syft-json=<syft-json-output-file>"
-  - "spdx-json=<spdx-json-output-file>"
-`)
-}
-
 func (o Output) SBOMWriter() (sbom.Writer, error) {
 	names := o.OutputNameSet()

@@ -1,9 +1,6 @@
 package options

-import (
-	"github.com/anchore/clio"
-	"github.com/anchore/syft/syft/cataloging"
-)
+import "github.com/anchore/syft/syft/cataloging"

 type packageConfig struct {
 	SearchUnindexedArchives         bool `yaml:"search-unindexed-archives" json:"search-unindexed-archives" mapstructure:"search-unindexed-archives"`
@@ -11,20 +8,6 @@ type packageConfig struct {
 	ExcludeBinaryOverlapByOwnership bool `yaml:"exclude-binary-overlap-by-ownership" json:"exclude-binary-overlap-by-ownership" mapstructure:"exclude-binary-overlap-by-ownership"` // exclude synthetic binary packages owned by os package files
 }

-var _ interface {
-	clio.FieldDescriber
-} = (*packageConfig)(nil)
-
-func (o *packageConfig) DescribeFields(descriptions clio.FieldDescriptionSet) {
-	descriptions.Add(&o.SearchUnindexedArchives, `search within archives that do contain a file index to search against (zip)
-note: for now this only applies to the java package cataloger`)
-	descriptions.Add(&o.SearchIndexedArchives, `search within archives that do not contain a file index to search against (tar, tar.gz, tar.bz2, etc)
-note: enabling this may result in a performance impact since all discovered compressed tars will be decompressed
-note: for now this only applies to the java package cataloger`)
-	descriptions.Add(&o.ExcludeBinaryOverlapByOwnership, `allows users to exclude synthetic binary packages from the sbom
-these packages are removed if an overlap with a non-synthetic package is found`)
-}
-
 func defaultPackageConfig() packageConfig {
 	c := cataloging.DefaultArchiveSearchConfig()
 	return packageConfig{
@@ -1,18 +1,5 @@
 package options

-import "github.com/anchore/clio"
-
 type pythonConfig struct {
 	GuessUnpinnedRequirements bool `json:"guess-unpinned-requirements" yaml:"guess-unpinned-requirements" mapstructure:"guess-unpinned-requirements"`
 }
-
-var _ interface {
-	clio.FieldDescriber
-} = (*pythonConfig)(nil)
-
-func (o *pythonConfig) DescribeFields(descriptions clio.FieldDescriptionSet) {
-	descriptions.Add(&o.GuessUnpinnedRequirements, `when running across entries in requirements.txt that do not specify a specific version 
-(e.g. "sqlalchemy >= 1.0.0, <= 2.0.0, != 3.0.0, <= 3.0.0"), attempt to guess what the version could
-be based on the version requirements specified (e.g. "1.0.0"). When enabled the lowest expressible version 
-when given an arbitrary constraint will be used (even if that version may not be available/published).`)
-}
@@ -25,10 +25,7 @@ type registryConfig struct {
 	CACert                string                `yaml:"ca-cert" json:"ca-cert" mapstructure:"ca-cert"`
 }

-var _ interface {
-	clio.PostLoader
-	clio.FieldDescriber
-} = (*registryConfig)(nil)
+var _ clio.PostLoader = (*registryConfig)(nil)

 func (cfg *registryConfig) PostLoad() error {
 	// there may be additional credentials provided by env var that should be appended to the set of credentials
@@ -58,20 +55,6 @@ func (cfg *registryConfig) PostLoad() error {
 	return nil
 }

-func (cfg *registryConfig) DescribeFields(descriptions clio.FieldDescriptionSet) {
-	descriptions.Add(&cfg.InsecureSkipTLSVerify, "skip TLS verification when communicating with the registry")
-	descriptions.Add(&cfg.InsecureUseHTTP, "use http instead of https when connecting to the registry")
-	descriptions.Add(&cfg.CACert, "filepath to a CA certificate (or directory containing *.crt, *.cert, *.pem) used to generate the client certificate")
-	descriptions.Add(&cfg.Auth, `Authentication credentials for specific registries. Each entry describes authentication for a specific authority:
-	authority: the registry authority URL the URL to the registry (e.g. "docker.io", "localhost:5000", etc.) (env: SYFT_REGISTRY_AUTH_AUTHORITY)
-	username: a username if using basic credentials (env: SYFT_REGISTRY_AUTH_USERNAME)
-	password: a corresponding password (env: SYFT_REGISTRY_AUTH_PASSWORD)
-	token: a token if using token-based authentication, mutually exclusive with username/password (env: SYFT_REGISTRY_AUTH_TOKEN)
-	tls-cert: filepath to the client certificate used for TLS authentication to the registry (env: SYFT_REGISTRY_AUTH_TLS_CERT)
-	tls-key: filepath to the client key used for TLS authentication to the registry (env: SYFT_REGISTRY_AUTH_TLS_KEY)
-`)
-}
-
 func hasNonEmptyCredentials(username, password, token, tlsCert, tlsKey string) bool {
 	hasUserPass := username != "" && password != ""
 	hasToken := token != ""
@@ -17,6 +17,6 @@ func defaultRelationshipsConfig() relationshipsConfig {
 }

 func (r *relationshipsConfig) DescribeFields(descriptions fangs.FieldDescriptionSet) {
-	descriptions.Add(&r.PackageFileOwnership, "include package-to-file relationships that indicate which files are owned by which packages")
-	descriptions.Add(&r.PackageFileOwnershipOverlap, "include package-to-package relationships that indicate one package is owned by another due to files claimed to be owned by one package are also evidence of another package's existence")
+	descriptions.Add(&r.PackageFileOwnership, "include package-to-file relationships that indicate which files are owned by which packages.")
+	descriptions.Add(&r.PackageFileOwnershipOverlap, "include package-to-package relationships that indicate one package is owned by another due to files claimed to be owned by one package are also evidence of another package's existence.")
 }
@@ -7,7 +7,6 @@ import (

 	"github.com/scylladb/go-set/strset"

-	"github.com/anchore/clio"
 	"github.com/anchore/syft/syft/source/sourceproviders"
 )

@@ -23,16 +22,6 @@ type fileSource struct {
 	Digests []string `json:"digests" yaml:"digests" mapstructure:"digests"`
 }

-var _ interface {
-	clio.FieldDescriber
-} = (*sourceConfig)(nil)
-
-func (o *sourceConfig) DescribeFields(descriptions clio.FieldDescriptionSet) {
-	descriptions.Add(&o.File.Digests, `the file digest algorithms to use on the scanned file (options: "md5", "sha1", "sha224", "sha256", "sha384", "sha512")`)
-	descriptions.Add(&o.Image.DefaultPullSource, `allows users to specify which image source should be used to generate the sbom
-valid values are: registry, docker, podman`)
-}
-
 type imageSource struct {
 	DefaultPullSource string `json:"default-pull-source" yaml:"default-pull-source" mapstructure:"default-pull-source"`
 }
@@ -35,7 +35,7 @@ var imageOnlyTestCases = []testCase{
 		pkgType:     pkg.PythonPkg,
 		pkgLanguage: pkg.Python,
 		pkgInfo: map[string]string{
-			"pygments":     "2.6.1",
+			"Pygments":     "2.6.1",
 			"requests":     "2.22.0",
 			"somerequests": "3.22.0",
 			"someotherpkg": "3.19.0",
@@ -172,7 +172,7 @@ var dirOnlyTestCases = []testCase{
 			"passlib":            "1.7.2",
 			"mypy":               "v0.770",
 			// common to image and directory
-			"pygments":     "2.6.1",
+			"Pygments":     "2.6.1",
 			"requests":     "2.22.0",
 			"somerequests": "3.22.0",
 			"someotherpkg": "3.19.0",
@@ -388,14 +388,6 @@ var dirOnlyTestCases = []testCase{
 			"swift-numerics":         "1.0.2",
 		},
 	},
-	{
-		name:        "find swipl pack package manager packages",
-		pkgType:     pkg.SwiplPackPkg,
-		pkgLanguage: pkg.Swipl,
-		pkgInfo: map[string]string{
-			"hdt": "0.5.2",
-		},
-	},
 	{
 		name:    "find github action packages (from usage in workflow files and composite actions)",
 		pkgType: pkg.GithubActionPkg,
@@ -476,12 +468,4 @@ var commonTestCases = []testCase{
 			"memcached": "3.2.0",
 		},
 	},
-	{
-		name:        "find lua rock package",
-		pkgType:     pkg.LuaRocksPkg,
-		pkgLanguage: pkg.Lua,
-		pkgInfo: map[string]string{
-			"kong": "3.7.0-0",
-		},
-	},
 }
@@ -51,7 +51,6 @@ func TestPkgCoverageImage(t *testing.T) {
 	definedLanguages.Remove(pkg.Rust.String())
 	definedLanguages.Remove(pkg.Dart.String())
 	definedLanguages.Remove(pkg.Swift.String())
-	definedLanguages.Remove(pkg.Swipl.String())
 	definedLanguages.Remove(pkg.CPP.String())
 	definedLanguages.Remove(pkg.Haskell.String())
 	definedLanguages.Remove(pkg.Elixir.String())
@@ -77,7 +76,6 @@ func TestPkgCoverageImage(t *testing.T) {
 	definedPkgs.Remove(string(pkg.LinuxKernelPkg))
 	definedPkgs.Remove(string(pkg.LinuxKernelModulePkg))
 	definedPkgs.Remove(string(pkg.SwiftPkg))
-	definedPkgs.Remove(string(pkg.SwiplPackPkg))
 	definedPkgs.Remove(string(pkg.GithubActionPkg))
 	definedPkgs.Remove(string(pkg.GithubActionWorkflowPkg))

@@ -10,8 +10,7 @@ import (
 func TestMarinerDistroless(t *testing.T) {
 	sbom, _ := catalogFixtureImage(t, "image-mariner-distroless", source.SquashedScope)

-	// 12 RPMs + 2 binaries with ELF package notes claiming to be RPMs
-	expectedPkgs := 14
+	expectedPkgs := 12
 	actualPkgs := 0
 	for range sbom.Artifacts.Packages.Enumerate(pkg.RpmPkg) {
 		actualPkgs += 1
@@ -1,69 +0,0 @@
-package integration
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/anchore/syft/internal/relationship"
-	"github.com/anchore/syft/syft/artifact"
-	"github.com/anchore/syft/syft/source"
-)
-
-func TestBinaryElfRelationships(t *testing.T) {
-	// node --> ["dependency of" nodes]
-	expectedGraph := map[string][]string{
-		"glibc": {
-			"libhello_world.so",
-			"syfttestfixture",
-		},
-		"libstdc++": {
-			"syfttestfixture",
-		},
-		"libhello_world.so": {
-			"syfttestfixture",
-		},
-	}
-
-	// run the test...
-	sbom, _ := catalogFixtureImage(t, "elf-test-fixtures", source.SquashedScope)
-
-	// get a mapping of package names to their IDs
-	nameToId := map[string]artifact.ID{}
-
-	recordPkgId := func(name string) {
-		pkgs := sbom.Artifacts.Packages.PackagesByName(name)
-		require.NotEmpty(t, pkgs, "expected package %q to be present in the SBOM", name)
-		for _, p := range pkgs {
-			nameToId[p.Name] = p.ID()
-		}
-	}
-	for name, depNames := range expectedGraph {
-		recordPkgId(name)
-		for _, depName := range depNames {
-			recordPkgId(depName)
-		}
-	}
-
-	relationshipIndex := relationship.NewIndex(sbom.Relationships...)
-	for name, expectedDepNames := range expectedGraph {
-		pkgId := nameToId[name]
-		p := sbom.Artifacts.Packages.Package(pkgId)
-		require.NotNil(t, p, "expected package %q to be present in the SBOM", name)
-
-		rels := relationshipIndex.References(*p, artifact.DependencyOfRelationship)
-		require.NotEmpty(t, rels, "expected package %q to have relationships", name)
-
-		toIds := map[artifact.ID]struct{}{}
-		for _, rel := range rels {
-			toIds[rel.To.ID()] = struct{}{}
-		}
-
-		for _, depName := range expectedDepNames {
-			depId := nameToId[depName]
-			_, exists := toIds[depId]
-			require.True(t, exists, "expected package %q to have a relationship to %q", name, depName)
-		}
-	}
-
-}
@@ -1 +0,0 @@
-../../../../../../syft/pkg/cataloger/binary/test-fixtures/elf-test-fixtures
@@ -1,612 +0,0 @@
-package = "kong"
-version = "3.7.0-0"
-rockspec_format = "3.0"
-supported_platforms = {"linux", "macosx"}
-source = {
-  url = "git+https://github.com/Kong/kong.git",
-  tag = "3.7.0"
-}
-description = {
-  summary = "Kong is a scalable and customizable API Management Layer built on top of Nginx.",
-  homepage = "https://konghq.com",
-  license = "Apache 2.0"
-}
-dependencies = {
-  "inspect == 3.1.3",
-  "luasec == 1.3.2",
-  "luasocket == 3.0-rc1",
-  "penlight == 1.13.1",
-  "lua-resty-http == 0.17.1",
-  "lua-resty-jit-uuid == 0.0.7",
-  "lua-ffi-zlib == 0.6",
-  "multipart == 0.5.9",
-  "version == 1.0.1",
-  "kong-lapis == 1.16.0.1",
-  "kong-pgmoon == 1.16.2",
-  "luatz == 0.4",
-  "lua_system_constants == 0.1.4",
-  "lyaml == 6.2.8",
-  "luasyslog == 2.0.1",
-  "lua_pack == 2.0.0",
-  "binaryheap >= 0.4",
-  "luaxxhash >= 1.0",
-  "lua-protobuf == 0.5.0",
-  "lua-resty-healthcheck == 3.0.1",
-  "lua-messagepack == 0.5.4",
-  "lua-resty-aws == 1.3.6",
-  "lua-resty-openssl == 1.2.0",
-  "lua-resty-counter == 0.2.1",
-  "lua-resty-ipmatcher == 0.6.1",
-  "lua-resty-acme == 0.12.0",
-  "lua-resty-session == 4.0.5",
-  "lua-resty-timer-ng == 0.2.6",
-  "lpeg == 1.1.0",
-  "lua-resty-ljsonschema == 1.1.6-2",
-}
-build = {
-  type = "builtin",
-  modules = {
-    ["kong"] = "kong/init.lua",
-    ["kong.meta"] = "kong/meta.lua",
-    ["kong.cache"] = "kong/cache/init.lua",
-    ["kong.cache.warmup"] = "kong/cache/warmup.lua",
-    ["kong.global"] = "kong/global.lua",
-    ["kong.reports"] = "kong/reports.lua",
-    ["kong.constants"] = "kong/constants.lua",
-    ["kong.concurrency"] = "kong/concurrency.lua",
-    ["kong.deprecation"] = "kong/deprecation.lua",
-    ["kong.globalpatches"] = "kong/globalpatches.lua",
-    ["kong.error_handlers"] = "kong/error_handlers.lua",
-    ["kong.hooks"] = "kong/hooks.lua",
-
-    ["kong.router"] = "kong/router/init.lua",
-    ["kong.router.traditional"] = "kong/router/traditional.lua",
-    ["kong.router.compat"] = "kong/router/compat.lua",
-    ["kong.router.expressions"] = "kong/router/expressions.lua",
-    ["kong.router.atc"] = "kong/router/atc.lua",
-    ["kong.router.fields"] = "kong/router/fields.lua",
-    ["kong.router.utils"] = "kong/router/utils.lua",
-
-    ["kong.conf_loader"] = "kong/conf_loader/init.lua",
-    ["kong.conf_loader.constants"] = "kong/conf_loader/constants.lua",
-    ["kong.conf_loader.parse"] = "kong/conf_loader/parse.lua",
-    ["kong.conf_loader.listeners"] = "kong/conf_loader/listeners.lua",
-
-    ["kong.clustering"] = "kong/clustering/init.lua",
-    ["kong.clustering.data_plane"] = "kong/clustering/data_plane.lua",
-    ["kong.clustering.control_plane"] = "kong/clustering/control_plane.lua",
-    ["kong.clustering.utils"] = "kong/clustering/utils.lua",
-    ["kong.clustering.events"] = "kong/clustering/events.lua",
-    ["kong.clustering.compat"] = "kong/clustering/compat/init.lua",
-    ["kong.clustering.compat.version"] = "kong/clustering/compat/version.lua",
-    ["kong.clustering.compat.removed_fields"] = "kong/clustering/compat/removed_fields.lua",
-    ["kong.clustering.compat.checkers"] = "kong/clustering/compat/checkers.lua",
-    ["kong.clustering.config_helper"] = "kong/clustering/config_helper.lua",
-    ["kong.clustering.tls"] = "kong/clustering/tls.lua",
-
-    ["kong.cluster_events"] = "kong/cluster_events/init.lua",
-    ["kong.cluster_events.strategies.postgres"] = "kong/cluster_events/strategies/postgres.lua",
-    ["kong.cluster_events.strategies.off"] = "kong/cluster_events/strategies/off.lua",
-
-    ["kong.templates.nginx"] = "kong/templates/nginx.lua",
-    ["kong.templates.nginx_kong"] = "kong/templates/nginx_kong.lua",
-    ["kong.templates.nginx_kong_gui_include"] = "kong/templates/nginx_kong_gui_include.lua",
-    ["kong.templates.nginx_kong_stream"] = "kong/templates/nginx_kong_stream.lua",
-    ["kong.templates.kong_defaults"] = "kong/templates/kong_defaults.lua",
-    ["kong.templates.nginx_inject"] = "kong/templates/nginx_inject.lua",
-    ["kong.templates.nginx_kong_inject"] = "kong/templates/nginx_kong_inject.lua",
-    ["kong.templates.nginx_kong_stream_inject"] = "kong/templates/nginx_kong_stream_inject.lua",
-    ["kong.templates.kong_yml"] = "kong/templates/kong_yml.lua",
-
-    ["kong.resty.dns.client"] = "kong/resty/dns/client.lua",
-    ["kong.resty.dns.utils"] = "kong/resty/dns/utils.lua",
-    ["kong.resty.ctx"] = "kong/resty/ctx.lua",
-
-    ["kong.resty.mlcache"] = "kong/resty/mlcache/init.lua",
-    ["kong.resty.mlcache.ipc"] = "kong/resty/mlcache/ipc.lua",
-
-    ["kong.cmd"] = "kong/cmd/init.lua",
-    ["kong.cmd.roar"] = "kong/cmd/roar.lua",
-    ["kong.cmd.stop"] = "kong/cmd/stop.lua",
-    ["kong.cmd.quit"] = "kong/cmd/quit.lua",
-    ["kong.cmd.start"] = "kong/cmd/start.lua",
-    ["kong.cmd.check"] = "kong/cmd/check.lua",
-    ["kong.cmd.config"] = "kong/cmd/config.lua",
-    ["kong.cmd.reload"] = "kong/cmd/reload.lua",
-    ["kong.cmd.restart"] = "kong/cmd/restart.lua",
-    ["kong.cmd.prepare"] = "kong/cmd/prepare.lua",
-    ["kong.cmd.migrations"] = "kong/cmd/migrations.lua",
-    ["kong.cmd.health"] = "kong/cmd/health.lua",
-    ["kong.cmd.vault"] = "kong/cmd/vault.lua",
-    ["kong.cmd.version"] = "kong/cmd/version.lua",
-    ["kong.cmd.hybrid"] = "kong/cmd/hybrid.lua",
-    ["kong.cmd.utils.log"] = "kong/cmd/utils/log.lua",
-    ["kong.cmd.utils.kill"] = "kong/cmd/utils/kill.lua",
-    ["kong.cmd.utils.env"] = "kong/cmd/utils/env.lua",
-    ["kong.cmd.utils.migrations"] = "kong/cmd/utils/migrations.lua",
-    ["kong.cmd.utils.tty"] = "kong/cmd/utils/tty.lua",
-    ["kong.cmd.utils.nginx_signals"] = "kong/cmd/utils/nginx_signals.lua",
-    ["kong.cmd.utils.prefix_handler"] = "kong/cmd/utils/prefix_handler.lua",
-    ["kong.cmd.utils.process_secrets"] = "kong/cmd/utils/process_secrets.lua",
-    ["kong.cmd.utils.inject_confs"] = "kong/cmd/utils/inject_confs.lua",
-
-    ["kong.api"] = "kong/api/init.lua",
-    ["kong.api.api_helpers"] = "kong/api/api_helpers.lua",
-    ["kong.api.arguments"] = "kong/api/arguments.lua",
-    ["kong.api.endpoints"] = "kong/api/endpoints.lua",
-    ["kong.api.routes.cache"] = "kong/api/routes/cache.lua",
-    ["kong.api.routes.certificates"] = "kong/api/routes/certificates.lua",
-    ["kong.api.routes.clustering"] = "kong/api/routes/clustering.lua",
-    ["kong.api.routes.config"] = "kong/api/routes/config.lua",
-    ["kong.api.routes.consumers"] = "kong/api/routes/consumers.lua",
-    ["kong.api.routes.debug"] = "kong/api/routes/debug.lua",
-    ["kong.api.routes.filter_chains"] = "kong/api/routes/filter_chains.lua",
-    ["kong.api.routes.health"] = "kong/api/routes/health.lua",
-    ["kong.api.routes.kong"] = "kong/api/routes/kong.lua",
-    ["kong.api.routes.plugins"] = "kong/api/routes/plugins.lua",
-    ["kong.api.routes.snis"] = "kong/api/routes/snis.lua",
-    ["kong.api.routes.tags"] = "kong/api/routes/tags.lua",
-    ["kong.api.routes.targets"] = "kong/api/routes/targets.lua",
-    ["kong.api.routes.upstreams"] = "kong/api/routes/upstreams.lua",
-
-    ["kong.admin_gui"] = "kong/admin_gui/init.lua",
-    ["kong.admin_gui.utils"] = "kong/admin_gui/utils.lua",
-
-    ["kong.status"] = "kong/status/init.lua",
-    ["kong.status.ready"] = "kong/status/ready.lua",
-
-    ["kong.tools.dns"] = "kong/tools/dns.lua",
-    ["kong.tools.grpc"] = "kong/tools/grpc.lua",
-    ["kong.tools.utils"] = "kong/tools/utils.lua",
-    ["kong.tools.timestamp"] = "kong/tools/timestamp.lua",
-    ["kong.tools.stream_api"] = "kong/tools/stream_api.lua",
-    ["kong.tools.queue"] = "kong/tools/queue.lua",
-    ["kong.tools.queue_schema"] = "kong/tools/queue_schema.lua",
-    ["kong.tools.sandbox"] = "kong/tools/sandbox.lua",
-    ["kong.tools.uri"] = "kong/tools/uri.lua",
-    ["kong.tools.kong-lua-sandbox"] = "kong/tools/kong-lua-sandbox.lua",
-    ["kong.tools.protobuf"] = "kong/tools/protobuf.lua",
-    ["kong.tools.mime_type"] = "kong/tools/mime_type.lua",
-    ["kong.tools.request_aware_table"] = "kong/tools/request_aware_table.lua",
-    ["kong.tools.gzip"] = "kong/tools/gzip.lua",
-    ["kong.tools.string"] = "kong/tools/string.lua",
-    ["kong.tools.table"] = "kong/tools/table.lua",
-    ["kong.tools.sha256"] = "kong/tools/sha256.lua",
-    ["kong.tools.yield"] = "kong/tools/yield.lua",
-    ["kong.tools.uuid"] = "kong/tools/uuid.lua",
-    ["kong.tools.rand"] = "kong/tools/rand.lua",
-    ["kong.tools.system"] = "kong/tools/system.lua",
-    ["kong.tools.time"] = "kong/tools/time.lua",
-    ["kong.tools.module"] = "kong/tools/module.lua",
-    ["kong.tools.ip"] = "kong/tools/ip.lua",
-    ["kong.tools.http"] = "kong/tools/http.lua",
-    ["kong.tools.cjson"] = "kong/tools/cjson.lua",
-    ["kong.tools.redis.schema"] = "kong/tools/redis/schema.lua",
-
-    ["kong.runloop.handler"] = "kong/runloop/handler.lua",
-    ["kong.runloop.events"] = "kong/runloop/events.lua",
-    ["kong.runloop.log_level"] = "kong/runloop/log_level.lua",
-    ["kong.runloop.certificate"] = "kong/runloop/certificate.lua",
-    ["kong.runloop.plugins_iterator"] = "kong/runloop/plugins_iterator.lua",
-    ["kong.runloop.upstream_ssl"] = "kong/runloop/upstream_ssl.lua",
-    ["kong.runloop.balancer"] = "kong/runloop/balancer/init.lua",
-    ["kong.runloop.balancer.balancers"] = "kong/runloop/balancer/balancers.lua",
-    ["kong.runloop.balancer.consistent_hashing"] = "kong/runloop/balancer/consistent_hashing.lua",
-    ["kong.runloop.balancer.healthcheckers"] = "kong/runloop/balancer/healthcheckers.lua",
-    ["kong.runloop.balancer.least_connections"] = "kong/runloop/balancer/least_connections.lua",
-    ["kong.runloop.balancer.latency"] = "kong/runloop/balancer/latency.lua",
-    ["kong.runloop.balancer.round_robin"] = "kong/runloop/balancer/round_robin.lua",
-    ["kong.runloop.balancer.targets"] = "kong/runloop/balancer/targets.lua",
-    ["kong.runloop.balancer.upstreams"] = "kong/runloop/balancer/upstreams.lua",
-    ["kong.runloop.plugin_servers"] = "kong/runloop/plugin_servers/init.lua",
-    ["kong.runloop.plugin_servers.process"] = "kong/runloop/plugin_servers/process.lua",
-    ["kong.runloop.plugin_servers.mp_rpc"] = "kong/runloop/plugin_servers/mp_rpc.lua",
-    ["kong.runloop.plugin_servers.pb_rpc"] = "kong/runloop/plugin_servers/pb_rpc.lua",
-    ["kong.runloop.wasm"] = "kong/runloop/wasm.lua",
-    ["kong.runloop.wasm.properties"] = "kong/runloop/wasm/properties.lua",
-
-    ["kong.workspaces"] = "kong/workspaces/init.lua",
-
-    ["kong.db"] = "kong/db/init.lua",
-    ["kong.db.utils"] = "kong/db/utils.lua",
-    ["kong.db.errors"] = "kong/db/errors.lua",
-    ["kong.db.iteration"] = "kong/db/iteration.lua",
-    ["kong.db.dao"] = "kong/db/dao/init.lua",
-    ["kong.db.dao.certificates"] = "kong/db/dao/certificates.lua",
-    ["kong.db.dao.snis"] = "kong/db/dao/snis.lua",
-    ["kong.db.dao.targets"] = "kong/db/dao/targets.lua",
-    ["kong.db.dao.plugins"] = "kong/db/dao/plugins.lua",
-    ["kong.db.dao.tags"] = "kong/db/dao/tags.lua",
-    ["kong.db.dao.vaults"] = "kong/db/dao/vaults.lua",
-    ["kong.db.dao.workspaces"] = "kong/db/dao/workspaces.lua",
-    ["kong.db.dao.services"] = "kong/db/dao/services.lua",
-    ["kong.db.dao.ca_certificates"] = "kong/db/dao/ca_certificates.lua",
-    ["kong.db.declarative"] = "kong/db/declarative/init.lua",
-    ["kong.db.declarative.marshaller"] = "kong/db/declarative/marshaller.lua",
-    ["kong.db.declarative.export"] = "kong/db/declarative/export.lua",
-    ["kong.db.declarative.import"] = "kong/db/declarative/import.lua",
-    ["kong.db.schema"] = "kong/db/schema/init.lua",
-    ["kong.db.dao.keys"] = "kong/db/dao/keys.lua",
-    ["kong.db.dao.key_sets"] = "kong/db/dao/key_sets.lua",
-    ["kong.db.schema.entities.keys"] = "kong/db/schema/entities/keys.lua",
-    ["kong.db.schema.entities.key_sets"] = "kong/db/schema/entities/key_sets.lua",
-    ["kong.db.schema.entities.consumers"] = "kong/db/schema/entities/consumers.lua",
-    ["kong.db.schema.entities.routes"] = "kong/db/schema/entities/routes.lua",
-    ["kong.db.schema.entities.routes_subschemas"] = "kong/db/schema/entities/routes_subschemas.lua",
-    ["kong.db.schema.entities.services"] = "kong/db/schema/entities/services.lua",
-    ["kong.db.schema.entities.certificates"] = "kong/db/schema/entities/certificates.lua",
-    ["kong.db.schema.entities.snis"] = "kong/db/schema/entities/snis.lua",
-    ["kong.db.schema.entities.upstreams"] = "kong/db/schema/entities/upstreams.lua",
-    ["kong.db.schema.entities.targets"] = "kong/db/schema/entities/targets.lua",
-    ["kong.db.schema.entities.plugins"] = "kong/db/schema/entities/plugins.lua",
-    ["kong.db.schema.entities.tags"] = "kong/db/schema/entities/tags.lua",
-    ["kong.db.schema.entities.ca_certificates"] = "kong/db/schema/entities/ca_certificates.lua",
-    ["kong.db.schema.entities.vaults"] = "kong/db/schema/entities/vaults.lua",
-    ["kong.db.schema.entities.workspaces"] = "kong/db/schema/entities/workspaces.lua",
-    ["kong.db.schema.entities.clustering_data_planes"] = "kong/db/schema/entities/clustering_data_planes.lua",
-    ["kong.db.schema.entities.parameters"] = "kong/db/schema/entities/parameters.lua",
-    ["kong.db.schema.entities.filter_chains"] = "kong/db/schema/entities/filter_chains.lua",
-    ["kong.db.schema.json"] = "kong/db/schema/json.lua",
-    ["kong.db.schema.others.migrations"] = "kong/db/schema/others/migrations.lua",
-    ["kong.db.schema.others.declarative_config"] = "kong/db/schema/others/declarative_config.lua",
-    ["kong.db.schema.entity"] = "kong/db/schema/entity.lua",
-    ["kong.db.schema.metaschema"] = "kong/db/schema/metaschema.lua",
-    ["kong.db.schema.typedefs"] = "kong/db/schema/typedefs.lua",
-    ["kong.db.schema.plugin_loader"] = "kong/db/schema/plugin_loader.lua",
-    ["kong.db.schema.vault_loader"] = "kong/db/schema/vault_loader.lua",
-    ["kong.db.schema.topological_sort"] = "kong/db/schema/topological_sort.lua",
-    ["kong.db.strategies"] = "kong/db/strategies/init.lua",
-    ["kong.db.strategies.connector"] = "kong/db/strategies/connector.lua",
-    ["kong.db.strategies.postgres"] = "kong/db/strategies/postgres/init.lua",
-    ["kong.db.strategies.postgres.connector"] = "kong/db/strategies/postgres/connector.lua",
-    ["kong.db.strategies.postgres.tags"] = "kong/db/strategies/postgres/tags.lua",
-    ["kong.db.strategies.postgres.services"] = "kong/db/strategies/postgres/services.lua",
-    ["kong.db.strategies.postgres.plugins"] = "kong/db/strategies/postgres/plugins.lua",
-    ["kong.db.strategies.off"] = "kong/db/strategies/off/init.lua",
-    ["kong.db.strategies.off.connector"] = "kong/db/strategies/off/connector.lua",
-    ["kong.db.strategies.off.tags"] = "kong/db/strategies/off/tags.lua",
-
-    ["kong.db.migrations.state"] = "kong/db/migrations/state.lua",
-    ["kong.db.migrations.subsystems"] = "kong/db/migrations/subsystems.lua",
-    ["kong.db.migrations.core"] = "kong/db/migrations/core/init.lua",
-    ["kong.db.migrations.core.000_base"] = "kong/db/migrations/core/000_base.lua",
-    ["kong.db.migrations.core.003_100_to_110"] = "kong/db/migrations/core/003_100_to_110.lua",
-    ["kong.db.migrations.core.004_110_to_120"] = "kong/db/migrations/core/004_110_to_120.lua",
-    ["kong.db.migrations.core.005_120_to_130"] = "kong/db/migrations/core/005_120_to_130.lua",
-    ["kong.db.migrations.core.006_130_to_140"] = "kong/db/migrations/core/006_130_to_140.lua",
-    ["kong.db.migrations.core.007_140_to_150"] = "kong/db/migrations/core/007_140_to_150.lua",
-    ["kong.db.migrations.core.008_150_to_200"] = "kong/db/migrations/core/008_150_to_200.lua",
-    ["kong.db.migrations.core.009_200_to_210"] = "kong/db/migrations/core/009_200_to_210.lua",
-    ["kong.db.migrations.core.010_210_to_211"] = "kong/db/migrations/core/010_210_to_211.lua",
-    ["kong.db.migrations.core.011_212_to_213"] = "kong/db/migrations/core/011_212_to_213.lua",
-    ["kong.db.migrations.core.012_213_to_220"] = "kong/db/migrations/core/012_213_to_220.lua",
-    ["kong.db.migrations.core.013_220_to_230"] = "kong/db/migrations/core/013_220_to_230.lua",
-    ["kong.db.migrations.core.014_230_to_270"] = "kong/db/migrations/core/014_230_to_270.lua",
-    ["kong.db.migrations.core.015_270_to_280"] = "kong/db/migrations/core/015_270_to_280.lua",
-    ["kong.db.migrations.core.016_280_to_300"] = "kong/db/migrations/core/016_280_to_300.lua",
-    ["kong.db.migrations.core.017_300_to_310"] = "kong/db/migrations/core/017_300_to_310.lua",
-    ["kong.db.migrations.core.018_310_to_320"] = "kong/db/migrations/core/018_310_to_320.lua",
-    ["kong.db.migrations.core.019_320_to_330"] = "kong/db/migrations/core/019_320_to_330.lua",
-    ["kong.db.migrations.core.020_330_to_340"] = "kong/db/migrations/core/020_330_to_340.lua",
-    ["kong.db.migrations.core.021_340_to_350"] = "kong/db/migrations/core/021_340_to_350.lua",
-    ["kong.db.migrations.core.022_350_to_360"] = "kong/db/migrations/core/022_350_to_360.lua",
-    ["kong.db.migrations.operations.200_to_210"] = "kong/db/migrations/operations/200_to_210.lua",
-    ["kong.db.migrations.operations.212_to_213"] = "kong/db/migrations/operations/212_to_213.lua",
-    ["kong.db.migrations.operations.280_to_300"] = "kong/db/migrations/operations/280_to_300.lua",
-    ["kong.db.migrations.migrate_path_280_300"] = "kong/db/migrations/migrate_path_280_300.lua",
-    ["kong.db.declarative.migrations"] = "kong/db/declarative/migrations/init.lua",
-    ["kong.db.declarative.migrations.route_path"] = "kong/db/declarative/migrations/route_path.lua",
-
-    ["kong.pdk"] = "kong/pdk/init.lua",
-    ["kong.pdk.private.checks"] = "kong/pdk/private/checks.lua",
-    ["kong.pdk.private.phases"] = "kong/pdk/private/phases.lua",
-    ["kong.pdk.private.node"] = "kong/pdk/private/node.lua",
-    ["kong.pdk.client"] = "kong/pdk/client.lua",
-    ["kong.pdk.client.tls"] = "kong/pdk/client/tls.lua",
-    ["kong.pdk.ctx"] = "kong/pdk/ctx.lua",
-    ["kong.pdk.ip"] = "kong/pdk/ip.lua",
-    ["kong.pdk.log"] = "kong/pdk/log.lua",
-    ["kong.pdk.service"] = "kong/pdk/service.lua",
-    ["kong.pdk.service.request"] = "kong/pdk/service/request.lua",
-    ["kong.pdk.service.response"] = "kong/pdk/service/response.lua",
-    ["kong.pdk.router"] = "kong/pdk/router.lua",
-    ["kong.pdk.request"] = "kong/pdk/request.lua",
-    ["kong.pdk.response"] = "kong/pdk/response.lua",
-    ["kong.pdk.table"] = "kong/pdk/table.lua",
-    ["kong.pdk.node"] = "kong/pdk/node.lua",
-    ["kong.pdk.nginx"] = "kong/pdk/nginx.lua",
-    ["kong.pdk.cluster"] = "kong/pdk/cluster.lua",
-    ["kong.pdk.vault"] = "kong/pdk/vault.lua",
-    ["kong.pdk.tracing"] = "kong/pdk/tracing.lua",
-    ["kong.pdk.plugin"] = "kong/pdk/plugin.lua",
-
-    ["kong.plugins.basic-auth.migrations"] = "kong/plugins/basic-auth/migrations/init.lua",
-    ["kong.plugins.basic-auth.migrations.000_base_basic_auth"] = "kong/plugins/basic-auth/migrations/000_base_basic_auth.lua",
-    ["kong.plugins.basic-auth.migrations.002_130_to_140"] = "kong/plugins/basic-auth/migrations/002_130_to_140.lua",
-    ["kong.plugins.basic-auth.migrations.003_200_to_210"] = "kong/plugins/basic-auth/migrations/003_200_to_210.lua",
-    ["kong.plugins.basic-auth.crypto"] = "kong/plugins/basic-auth/crypto.lua",
-    ["kong.plugins.basic-auth.handler"] = "kong/plugins/basic-auth/handler.lua",
-    ["kong.plugins.basic-auth.access"] = "kong/plugins/basic-auth/access.lua",
-    ["kong.plugins.basic-auth.schema"] = "kong/plugins/basic-auth/schema.lua",
-    ["kong.plugins.basic-auth.daos"] = "kong/plugins/basic-auth/daos.lua",
-
-    ["kong.plugins.key-auth.migrations"] = "kong/plugins/key-auth/migrations/init.lua",
-    ["kong.plugins.key-auth.migrations.000_base_key_auth"] = "kong/plugins/key-auth/migrations/000_base_key_auth.lua",
-    ["kong.plugins.key-auth.migrations.002_130_to_140"] = "kong/plugins/key-auth/migrations/002_130_to_140.lua",
-    ["kong.plugins.key-auth.migrations.003_200_to_210"] = "kong/plugins/key-auth/migrations/003_200_to_210.lua",
-    ["kong.plugins.key-auth.migrations.004_320_to_330"] = "kong/plugins/key-auth/migrations/004_320_to_330.lua",
-    ["kong.plugins.key-auth.handler"] = "kong/plugins/key-auth/handler.lua",
-    ["kong.plugins.key-auth.schema"] = "kong/plugins/key-auth/schema.lua",
-    ["kong.plugins.key-auth.daos"] = "kong/plugins/key-auth/daos.lua",
-
-    ["kong.plugins.oauth2.migrations"] = "kong/plugins/oauth2/migrations/init.lua",
-    ["kong.plugins.oauth2.migrations.000_base_oauth2"] = "kong/plugins/oauth2/migrations/000_base_oauth2.lua",
-    ["kong.plugins.oauth2.migrations.003_130_to_140"] = "kong/plugins/oauth2/migrations/003_130_to_140.lua",
-    ["kong.plugins.oauth2.migrations.004_200_to_210"] = "kong/plugins/oauth2/migrations/004_200_to_210.lua",
-    ["kong.plugins.oauth2.migrations.005_210_to_211"] = "kong/plugins/oauth2/migrations/005_210_to_211.lua",
-    ["kong.plugins.oauth2.migrations.006_320_to_330"] = "kong/plugins/oauth2/migrations/006_320_to_330.lua",
-    ["kong.plugins.oauth2.migrations.007_320_to_330"] = "kong/plugins/oauth2/migrations/007_320_to_330.lua",
-    ["kong.plugins.oauth2.handler"] = "kong/plugins/oauth2/handler.lua",
-    ["kong.plugins.oauth2.secret"] = "kong/plugins/oauth2/secret.lua",
-    ["kong.plugins.oauth2.access"] = "kong/plugins/oauth2/access.lua",
-    ["kong.plugins.oauth2.schema"] = "kong/plugins/oauth2/schema.lua",
-    ["kong.plugins.oauth2.daos"] = "kong/plugins/oauth2/daos.lua",
-    ["kong.plugins.oauth2.daos.oauth2_tokens"] = "kong/plugins/oauth2/daos/oauth2_tokens.lua",
-
-    ["kong.plugins.tcp-log.handler"] = "kong/plugins/tcp-log/handler.lua",
-    ["kong.plugins.tcp-log.schema"] = "kong/plugins/tcp-log/schema.lua",
-
-    ["kong.plugins.udp-log.handler"] = "kong/plugins/udp-log/handler.lua",
-    ["kong.plugins.udp-log.schema"] = "kong/plugins/udp-log/schema.lua",
-
-    ["kong.plugins.http-log.handler"] = "kong/plugins/http-log/handler.lua",
-    ["kong.plugins.http-log.schema"] = "kong/plugins/http-log/schema.lua",
-    ["kong.plugins.http-log.migrations"] = "kong/plugins/http-log/migrations/init.lua",
-    ["kong.plugins.http-log.migrations.001_280_to_300"] = "kong/plugins/http-log/migrations/001_280_to_300.lua",
-
-    ["kong.plugins.file-log.handler"] = "kong/plugins/file-log/handler.lua",
-    ["kong.plugins.file-log.schema"] = "kong/plugins/file-log/schema.lua",
-
-    ["kong.plugins.rate-limiting.migrations"] = "kong/plugins/rate-limiting/migrations/init.lua",
-    ["kong.plugins.rate-limiting.migrations.000_base_rate_limiting"] = "kong/plugins/rate-limiting/migrations/000_base_rate_limiting.lua",
-    ["kong.plugins.rate-limiting.migrations.003_10_to_112"] = "kong/plugins/rate-limiting/migrations/003_10_to_112.lua",
-    ["kong.plugins.rate-limiting.migrations.004_200_to_210"] = "kong/plugins/rate-limiting/migrations/004_200_to_210.lua",
-    ["kong.plugins.rate-limiting.migrations.005_320_to_330"] = "kong/plugins/rate-limiting/migrations/005_320_to_330.lua",
-    ["kong.plugins.rate-limiting.migrations.006_350_to_360"] = "kong/plugins/rate-limiting/migrations/006_350_to_360.lua",
-    ["kong.plugins.rate-limiting.expiration"] = "kong/plugins/rate-limiting/expiration.lua",
-    ["kong.plugins.rate-limiting.handler"] = "kong/plugins/rate-limiting/handler.lua",
-    ["kong.plugins.rate-limiting.schema"] = "kong/plugins/rate-limiting/schema.lua",
-    ["kong.plugins.rate-limiting.daos"] = "kong/plugins/rate-limiting/daos.lua",
-    ["kong.plugins.rate-limiting.policies"] = "kong/plugins/rate-limiting/policies/init.lua",
-    ["kong.plugins.rate-limiting.policies.cluster"] = "kong/plugins/rate-limiting/policies/cluster.lua",
-    ["kong.plugins.rate-limiting.clustering.compat.redis_translation"] = "kong/plugins/rate-limiting/clustering/compat/redis_translation.lua",
-
-    ["kong.plugins.response-ratelimiting.migrations"] = "kong/plugins/response-ratelimiting/migrations/init.lua",
-    ["kong.plugins.response-ratelimiting.migrations.000_base_response_rate_limiting"] = "kong/plugins/response-ratelimiting/migrations/000_base_response_rate_limiting.lua",
-    ["kong.plugins.response-ratelimiting.migrations.001_350_to_360"] = "kong/plugins/response-ratelimiting/migrations/001_350_to_360.lua",
-    ["kong.plugins.response-ratelimiting.handler"] = "kong/plugins/response-ratelimiting/handler.lua",
-    ["kong.plugins.response-ratelimiting.access"] = "kong/plugins/response-ratelimiting/access.lua",
-    ["kong.plugins.response-ratelimiting.header_filter"] = "kong/plugins/response-ratelimiting/header_filter.lua",
-    ["kong.plugins.response-ratelimiting.log"] = "kong/plugins/response-ratelimiting/log.lua",
-    ["kong.plugins.response-ratelimiting.schema"] = "kong/plugins/response-ratelimiting/schema.lua",
-    ["kong.plugins.response-ratelimiting.policies"] = "kong/plugins/response-ratelimiting/policies/init.lua",
-    ["kong.plugins.response-ratelimiting.policies.cluster"] = "kong/plugins/response-ratelimiting/policies/cluster.lua",
-    ["kong.plugins.response-ratelimiting.clustering.compat.redis_translation"] = "kong/plugins/response-ratelimiting/clustering/compat/redis_translation.lua",
-
-    ["kong.plugins.request-size-limiting.handler"] = "kong/plugins/request-size-limiting/handler.lua",
-    ["kong.plugins.request-size-limiting.schema"] = "kong/plugins/request-size-limiting/schema.lua",
-
-    ["kong.plugins.response-transformer.handler"] = "kong/plugins/response-transformer/handler.lua",
-    ["kong.plugins.response-transformer.body_transformer"] = "kong/plugins/response-transformer/body_transformer.lua",
-    ["kong.plugins.response-transformer.header_transformer"] = "kong/plugins/response-transformer/header_transformer.lua",
-    ["kong.plugins.response-transformer.schema"] = "kong/plugins/response-transformer/schema.lua",
-
-    ["kong.plugins.cors.handler"] = "kong/plugins/cors/handler.lua",
-    ["kong.plugins.cors.schema"] = "kong/plugins/cors/schema.lua",
-
-    ["kong.plugins.ip-restriction.handler"] = "kong/plugins/ip-restriction/handler.lua",
-    ["kong.plugins.ip-restriction.schema"] = "kong/plugins/ip-restriction/schema.lua",
-    ["kong.plugins.ip-restriction.migrations"] = "kong/plugins/ip-restriction/migrations/init.lua",
-    ["kong.plugins.ip-restriction.migrations.001_200_to_210"] = "kong/plugins/ip-restriction/migrations/001_200_to_210.lua",
-
-    ["kong.plugins.acl.migrations"] = "kong/plugins/acl/migrations/init.lua",
-    ["kong.plugins.acl.migrations.000_base_acl"] = "kong/plugins/acl/migrations/000_base_acl.lua",
-    ["kong.plugins.acl.migrations.002_130_to_140"] = "kong/plugins/acl/migrations/002_130_to_140.lua",
-    ["kong.plugins.acl.migrations.003_200_to_210"] = "kong/plugins/acl/migrations/003_200_to_210.lua",
-    ["kong.plugins.acl.migrations.004_212_to_213"] = "kong/plugins/acl/migrations/004_212_to_213.lua",
-    ["kong.plugins.acl.handler"] = "kong/plugins/acl/handler.lua",
-    ["kong.plugins.acl.schema"] = "kong/plugins/acl/schema.lua",
-    ["kong.plugins.acl.daos"] = "kong/plugins/acl/daos.lua",
-    ["kong.plugins.acl.groups"] = "kong/plugins/acl/groups.lua",
-    ["kong.plugins.acl.acls"] = "kong/plugins/acl/acls.lua",
-    ["kong.plugins.acl.api"] = "kong/plugins/acl/api.lua",
-
-    ["kong.plugins.correlation-id.handler"] = "kong/plugins/correlation-id/handler.lua",
-    ["kong.plugins.correlation-id.schema"] = "kong/plugins/correlation-id/schema.lua",
-
-    ["kong.plugins.jwt.migrations"] = "kong/plugins/jwt/migrations/init.lua",
-    ["kong.plugins.jwt.migrations.000_base_jwt"] = "kong/plugins/jwt/migrations/000_base_jwt.lua",
-    ["kong.plugins.jwt.migrations.002_130_to_140"] = "kong/plugins/jwt/migrations/002_130_to_140.lua",
-    ["kong.plugins.jwt.migrations.003_200_to_210"] = "kong/plugins/jwt/migrations/003_200_to_210.lua",
-    ["kong.plugins.jwt.handler"] = "kong/plugins/jwt/handler.lua",
-    ["kong.plugins.jwt.schema"] = "kong/plugins/jwt/schema.lua",
-    ["kong.plugins.jwt.daos"] = "kong/plugins/jwt/daos.lua",
-    ["kong.plugins.jwt.jwt_parser"] = "kong/plugins/jwt/jwt_parser.lua",
-
-    ["kong.plugins.hmac-auth.migrations"] = "kong/plugins/hmac-auth/migrations/init.lua",
-    ["kong.plugins.hmac-auth.migrations.000_base_hmac_auth"] = "kong/plugins/hmac-auth/migrations/000_base_hmac_auth.lua",
-    ["kong.plugins.hmac-auth.migrations.002_130_to_140"] = "kong/plugins/hmac-auth/migrations/002_130_to_140.lua",
-    ["kong.plugins.hmac-auth.migrations.003_200_to_210"] = "kong/plugins/hmac-auth/migrations/003_200_to_210.lua",
-    ["kong.plugins.hmac-auth.handler"] = "kong/plugins/hmac-auth/handler.lua",
-    ["kong.plugins.hmac-auth.access"] = "kong/plugins/hmac-auth/access.lua",
-    ["kong.plugins.hmac-auth.schema"] = "kong/plugins/hmac-auth/schema.lua",
-    ["kong.plugins.hmac-auth.daos"] = "kong/plugins/hmac-auth/daos.lua",
-
-    ["kong.plugins.ldap-auth.handler"] = "kong/plugins/ldap-auth/handler.lua",
-    ["kong.plugins.ldap-auth.access"] = "kong/plugins/ldap-auth/access.lua",
-    ["kong.plugins.ldap-auth.schema"] = "kong/plugins/ldap-auth/schema.lua",
-    ["kong.plugins.ldap-auth.ldap"] = "kong/plugins/ldap-auth/ldap.lua",
-    ["kong.plugins.ldap-auth.asn1"] = "kong/plugins/ldap-auth/asn1.lua",
-
-    ["kong.plugins.syslog.handler"] = "kong/plugins/syslog/handler.lua",
-    ["kong.plugins.syslog.schema"] = "kong/plugins/syslog/schema.lua",
-
-    ["kong.plugins.loggly.handler"] = "kong/plugins/loggly/handler.lua",
-    ["kong.plugins.loggly.schema"] = "kong/plugins/loggly/schema.lua",
-
-    ["kong.plugins.datadog.handler"] = "kong/plugins/datadog/handler.lua",
-    ["kong.plugins.datadog.schema"] = "kong/plugins/datadog/schema.lua",
-    ["kong.plugins.datadog.statsd_logger"] = "kong/plugins/datadog/statsd_logger.lua",
-
-    ["kong.plugins.statsd.constants"] = "kong/plugins/statsd/constants.lua",
-    ["kong.plugins.statsd.handler"] = "kong/plugins/statsd/handler.lua",
-    ["kong.plugins.statsd.log"] = "kong/plugins/statsd/log.lua",
-    ["kong.plugins.statsd.schema"] = "kong/plugins/statsd/schema.lua",
-    ["kong.plugins.statsd.statsd_logger"] = "kong/plugins/statsd/statsd_logger.lua",
-
-    ["kong.plugins.bot-detection.handler"] = "kong/plugins/bot-detection/handler.lua",
-    ["kong.plugins.bot-detection.schema"] = "kong/plugins/bot-detection/schema.lua",
-    ["kong.plugins.bot-detection.rules"] = "kong/plugins/bot-detection/rules.lua",
-    ["kong.plugins.bot-detection.migrations"] = "kong/plugins/bot-detection/migrations/init.lua",
-    ["kong.plugins.bot-detection.migrations.001_200_to_210"] = "kong/plugins/bot-detection/migrations/001_200_to_210.lua",
-
-    ["kong.plugins.request-termination.handler"] = "kong/plugins/request-termination/handler.lua",
-    ["kong.plugins.request-termination.schema"] = "kong/plugins/request-termination/schema.lua",
-
-    ["kong.plugins.aws-lambda.handler"]              = "kong/plugins/aws-lambda/handler.lua",
-    ["kong.plugins.aws-lambda.schema"]               = "kong/plugins/aws-lambda/schema.lua",
-    ["kong.plugins.aws-lambda.request-util"]         = "kong/plugins/aws-lambda/request-util.lua",
-
-    ["kong.plugins.grpc-gateway.deco"] = "kong/plugins/grpc-gateway/deco.lua",
-    ["kong.plugins.grpc-gateway.handler"] = "kong/plugins/grpc-gateway/handler.lua",
-    ["kong.plugins.grpc-gateway.schema"] = "kong/plugins/grpc-gateway/schema.lua",
-
-    ["kong.plugins.acme.api"] = "kong/plugins/acme/api.lua",
-    ["kong.plugins.acme.client"] = "kong/plugins/acme/client.lua",
-    ["kong.plugins.acme.clustering.compat.redis_translation"] = "kong/plugins/acme/clustering/compat/redis_translation.lua",
-    ["kong.plugins.acme.daos"] = "kong/plugins/acme/daos.lua",
-    ["kong.plugins.acme.handler"] = "kong/plugins/acme/handler.lua",
-    ["kong.plugins.acme.migrations.000_base_acme"] = "kong/plugins/acme/migrations/000_base_acme.lua",
-    ["kong.plugins.acme.migrations.001_280_to_300"] = "kong/plugins/acme/migrations/001_280_to_300.lua",
-    ["kong.plugins.acme.migrations.002_320_to_330"] = "kong/plugins/acme/migrations/002_320_to_330.lua",
-    ["kong.plugins.acme.migrations.003_350_to_360"] = "kong/plugins/acme/migrations/003_350_to_360.lua",
-    ["kong.plugins.acme.migrations"] = "kong/plugins/acme/migrations/init.lua",
-    ["kong.plugins.acme.schema"] = "kong/plugins/acme/schema.lua",
-    ["kong.plugins.acme.storage.kong"] = "kong/plugins/acme/storage/kong.lua",
-    ["kong.plugins.acme.storage.config_adapters"] = "kong/plugins/acme/storage/config_adapters/init.lua",
-    ["kong.plugins.acme.storage.config_adapters.redis"] = "kong/plugins/acme/storage/config_adapters/redis.lua",
-    ["kong.plugins.acme.reserved_words"] = "kong/plugins/acme/reserved_words.lua",
-
-    ["kong.plugins.prometheus.api"] = "kong/plugins/prometheus/api.lua",
-    ["kong.plugins.prometheus.status_api"] = "kong/plugins/prometheus/status_api.lua",
-    ["kong.plugins.prometheus.exporter"] = "kong/plugins/prometheus/exporter.lua",
-    ["kong.plugins.prometheus.handler"] = "kong/plugins/prometheus/handler.lua",
-    ["kong.plugins.prometheus.prometheus"] = "kong/plugins/prometheus/prometheus.lua",
-    ["kong.plugins.prometheus.serve"] = "kong/plugins/prometheus/serve.lua",
-    ["kong.plugins.prometheus.schema"] = "kong/plugins/prometheus/schema.lua",
-
-    ["kong.plugins.session.handler"] = "kong/plugins/session/handler.lua",
-    ["kong.plugins.session.schema"] = "kong/plugins/session/schema.lua",
-    ["kong.plugins.session.access"] = "kong/plugins/session/access.lua",
-    ["kong.plugins.session.header_filter"] = "kong/plugins/session/header_filter.lua",
-    ["kong.plugins.session.session"] = "kong/plugins/session/session.lua",
-    ["kong.plugins.session.daos"] = "kong/plugins/session/daos.lua",
-    ["kong.plugins.session.storage.kong"] = "kong/plugins/session/storage/kong.lua",
-    ["kong.plugins.session.migrations.000_base_session"] = "kong/plugins/session/migrations/000_base_session.lua",
-    ["kong.plugins.session.migrations.001_add_ttl_index"] = "kong/plugins/session/migrations/001_add_ttl_index.lua",
-    ["kong.plugins.session.migrations.002_320_to_330"] = "kong/plugins/session/migrations/002_320_to_330.lua",
-    ["kong.plugins.session.migrations"] = "kong/plugins/session/migrations/init.lua",
-
-    ["kong.plugins.proxy-cache.handler"]              = "kong/plugins/proxy-cache/handler.lua",
-    ["kong.plugins.proxy-cache.cache_key"]            = "kong/plugins/proxy-cache/cache_key.lua",
-    ["kong.plugins.proxy-cache.schema"]               = "kong/plugins/proxy-cache/schema.lua",
-    ["kong.plugins.proxy-cache.api"]                  = "kong/plugins/proxy-cache/api.lua",
-    ["kong.plugins.proxy-cache.strategies"]           = "kong/plugins/proxy-cache/strategies/init.lua",
-    ["kong.plugins.proxy-cache.strategies.memory"]    = "kong/plugins/proxy-cache/strategies/memory.lua",
-
-    ["kong.plugins.grpc-web.deco"] = "kong/plugins/grpc-web/deco.lua",
-    ["kong.plugins.grpc-web.handler"] = "kong/plugins/grpc-web/handler.lua",
-    ["kong.plugins.grpc-web.schema"] = "kong/plugins/grpc-web/schema.lua",
-
-    ["kong.plugins.pre-function._handler"] = "kong/plugins/pre-function/_handler.lua",
-    ["kong.plugins.pre-function._schema"] = "kong/plugins/pre-function/_schema.lua",
-    ["kong.plugins.pre-function.migrations._001_280_to_300"] = "kong/plugins/pre-function/migrations/_001_280_to_300.lua",
-
-    ["kong.plugins.pre-function.handler"] = "kong/plugins/pre-function/handler.lua",
-    ["kong.plugins.pre-function.schema"] = "kong/plugins/pre-function/schema.lua",
-    ["kong.plugins.pre-function.migrations"] = "kong/plugins/pre-function/migrations/init.lua",
-    ["kong.plugins.pre-function.migrations.001_280_to_300"] = "kong/plugins/pre-function/migrations/001_280_to_300.lua",
-
-    ["kong.plugins.post-function.handler"] = "kong/plugins/post-function/handler.lua",
-    ["kong.plugins.post-function.schema"] = "kong/plugins/post-function/schema.lua",
-    ["kong.plugins.post-function.migrations"] = "kong/plugins/post-function/migrations/init.lua",
-    ["kong.plugins.post-function.migrations.001_280_to_300"] = "kong/plugins/post-function/migrations/001_280_to_300.lua",
-
-    ["kong.plugins.zipkin.handler"] = "kong/plugins/zipkin/handler.lua",
-    ["kong.plugins.zipkin.reporter"] = "kong/plugins/zipkin/reporter.lua",
-    ["kong.plugins.zipkin.span"] = "kong/plugins/zipkin/span.lua",
-    ["kong.plugins.zipkin.schema"] = "kong/plugins/zipkin/schema.lua",
-    ["kong.plugins.zipkin.request_tags"] = "kong/plugins/zipkin/request_tags.lua",
-
-    ["kong.plugins.request-transformer.migrations.postgres"] = "kong/plugins/request-transformer/migrations/postgres.lua",
-    ["kong.plugins.request-transformer.migrations.common"] = "kong/plugins/request-transformer/migrations/common.lua",
-    ["kong.plugins.request-transformer.handler"] = "kong/plugins/request-transformer/handler.lua",
-    ["kong.plugins.request-transformer.access"] = "kong/plugins/request-transformer/access.lua",
-    ["kong.plugins.request-transformer.schema"] = "kong/plugins/request-transformer/schema.lua",
-
-    ["kong.plugins.azure-functions.handler"] = "kong/plugins/azure-functions/handler.lua",
-    ["kong.plugins.azure-functions.schema"]  = "kong/plugins/azure-functions/schema.lua",
-
-    ["kong.plugins.opentelemetry.handler"] = "kong/plugins/opentelemetry/handler.lua",
-    ["kong.plugins.opentelemetry.schema"]  = "kong/plugins/opentelemetry/schema.lua",
-    ["kong.plugins.opentelemetry.proto"]  = "kong/plugins/opentelemetry/proto.lua",
-    ["kong.plugins.opentelemetry.otlp"]  = "kong/plugins/opentelemetry/otlp.lua",
-
-    ["kong.plugins.ai-proxy.handler"] = "kong/plugins/ai-proxy/handler.lua",
-    ["kong.plugins.ai-proxy.schema"] = "kong/plugins/ai-proxy/schema.lua",
-
-    ["kong.plugins.ai-request-transformer.handler"] = "kong/plugins/ai-request-transformer/handler.lua",
-    ["kong.plugins.ai-request-transformer.schema"] = "kong/plugins/ai-request-transformer/schema.lua",
-
-    ["kong.plugins.ai-response-transformer.handler"] = "kong/plugins/ai-response-transformer/handler.lua",
-    ["kong.plugins.ai-response-transformer.schema"] = "kong/plugins/ai-response-transformer/schema.lua",
-
-    ["kong.llm"] = "kong/llm/init.lua",
-    ["kong.llm.drivers.shared"] = "kong/llm/drivers/shared.lua",
-    ["kong.llm.drivers.openai"] = "kong/llm/drivers/openai.lua",
-    ["kong.llm.drivers.azure"] = "kong/llm/drivers/azure.lua",
-    ["kong.llm.drivers.cohere"] = "kong/llm/drivers/cohere.lua",
-    ["kong.llm.drivers.anthropic"] = "kong/llm/drivers/anthropic.lua",
-    ["kong.llm.drivers.mistral"] = "kong/llm/drivers/mistral.lua",
-    ["kong.llm.drivers.llama2"] = "kong/llm/drivers/llama2.lua",
-
-    ["kong.plugins.ai-prompt-decorator.handler"] = "kong/plugins/ai-prompt-decorator/handler.lua",
-    ["kong.plugins.ai-prompt-decorator.schema"]  = "kong/plugins/ai-prompt-decorator/schema.lua",
-
-    ["kong.plugins.ai-prompt-template.handler"] = "kong/plugins/ai-prompt-template/handler.lua",
-    ["kong.plugins.ai-prompt-template.schema"]  = "kong/plugins/ai-prompt-template/schema.lua",
-    ["kong.plugins.ai-prompt-template.templater"]  = "kong/plugins/ai-prompt-template/templater.lua",
-
-    ["kong.plugins.ai-prompt-guard.handler"] = "kong/plugins/ai-prompt-guard/handler.lua",
-    ["kong.plugins.ai-prompt-guard.schema"]  = "kong/plugins/ai-prompt-guard/schema.lua",
-
-    ["kong.vaults.env"] = "kong/vaults/env/init.lua",
-    ["kong.vaults.env.schema"] = "kong/vaults/env/schema.lua",
-
-    ["kong.tracing.instrumentation"] = "kong/tracing/instrumentation.lua",
-    ["kong.tracing.propagation"] = "kong/tracing/propagation.lua",
-    ["kong.tracing.request_id"] = "kong/tracing/request_id.lua",
-    ["kong.tracing.tracing_context"] = "kong/tracing/tracing_context.lua",
-
-    ["kong.timing"] = "kong/timing/init.lua",
-    ["kong.timing.context"] = "kong/timing/context.lua",
-    ["kong.timing.hooks"] = "kong/timing/hooks/init.lua",
-    ["kong.timing.hooks.dns"] = "kong/timing/hooks/dns.lua",
-    ["kong.timing.hooks.http"] = "kong/timing/hooks/http.lua",
-    ["kong.timing.hooks.redis"] = "kong/timing/hooks/redis.lua",
-    ["kong.timing.hooks.socket"] = "kong/timing/hooks/socket.lua",
-
-    ["kong.dynamic_hook"] = "kong/dynamic_hook/init.lua",
-    ["kong.dynamic_hook.wrap_function_gen"] = "kong/dynamic_hook/wrap_function_gen.lua",
-  }
-}
@@ -1,10 +0,0 @@
-name(hdt).
-version('0.5.2').
-% TODO: swipl_version([90121]).
-title('Access RDF HDT files').
-keywords(['RDF']).
-author( 'Jan Wielemaker', 'J.Wielemaker@vu.nl' ).
-packager( 'Jan Wielemaker', 'J.Wielemaker@vu.nl' ).
-maintainer( 'Jan Wielemaker', 'J.Wielemaker@vu.nl' ).
-home( 'https://github.com/JanWielemaker/hdt' ).
-download( 'https://github.com/JanWielemaker/hdt/archive/V*.zip' ).
@@ -32,6 +32,7 @@ func catalogFixtureImageWithConfig(t *testing.T, fixtureImageName string, cfg *s
 	cfg.CatalogerSelection = cfg.CatalogerSelection.WithDefaults(pkgcataloging.ImageTag)

 	// get the fixture image tar file
+	imagetest.GetFixtureImage(t, "docker-archive", fixtureImageName)
 	tarPath := imagetest.GetFixtureImageTarPath(t, fixtureImageName)

 	// get the source to build an SBOM against
@@ -1,96 +1,86 @@
 module github.com/anchore/syft

-go 1.22.0
+go 1.21.0

 require (
-	github.com/CycloneDX/cyclonedx-go v0.9.0
+	github.com/CycloneDX/cyclonedx-go v0.8.0
 	github.com/Masterminds/semver v1.5.0
 	github.com/Masterminds/sprig/v3 v3.2.3
 	github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d
 	github.com/acobaugh/osrelease v0.1.0
 	github.com/anchore/bubbly v0.0.0-20231115134915-def0aba654a9
-	github.com/anchore/clio v0.0.0-20240522144804-d81e109008aa
-	github.com/anchore/fangs v0.0.0-20240508143433-f016b099950f
+	github.com/anchore/clio v0.0.0-20240209204744-cb94e40a4f65
+	github.com/anchore/fangs v0.0.0-20231201140849-5075d28d6d8b
 	github.com/anchore/go-collections v0.0.0-20240216171411-9321230ce537
 	github.com/anchore/go-logger v0.0.0-20230725134548-c21dafa1ec5a
 	github.com/anchore/go-macholibre v0.0.0-20220308212642-53e6d0aaf6fb
 	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.20240507183024-848e011fc24f
-	github.com/anchore/stereoscope v0.0.3-0.20240725180315-50ce3be7aa1f
+	github.com/anchore/packageurl-go v0.1.1-0.20240312213626-055233e539b4
+	github.com/anchore/stereoscope v0.0.3-0.20240501181043-2e9894674185
 	github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be
 	// we are hinting brotli to latest due to warning when installing archiver v3:
 	// go: warning: github.com/andybalholm/brotli@v1.0.1: retracted by module author: occasional panics and data corruption
 	github.com/aquasecurity/go-pep440-version v0.0.0-20210121094942-22b2f8951d46
 	github.com/bmatcuk/doublestar/v4 v4.6.1
 	github.com/charmbracelet/bubbles v0.18.0
-	github.com/charmbracelet/bubbletea v0.26.6
-	github.com/charmbracelet/lipgloss v0.12.1
+	github.com/charmbracelet/bubbletea v0.26.1
+	github.com/charmbracelet/lipgloss v0.10.0
 	github.com/dave/jennifer v1.7.0
 	github.com/deitch/magic v0.0.0-20230404182410-1ff89d7342da
 	github.com/distribution/reference v0.6.0
-	github.com/docker/docker v27.1.1+incompatible
+	github.com/docker/docker v26.1.1+incompatible
 	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.1
-	github.com/gkampitakis/go-snaps v0.5.7
+	github.com/github/go-spdx/v2 v2.2.0
+	github.com/gkampitakis/go-snaps v0.5.4
 	github.com/go-git/go-billy/v5 v5.5.0
 	github.com/go-git/go-git/v5 v5.12.0
-	github.com/go-test/deep v1.1.1
+	github.com/go-test/deep v1.1.0
 	github.com/google/go-cmp v0.6.0
-	github.com/google/go-containerregistry v0.20.1
+	github.com/google/go-containerregistry v0.19.1
 	github.com/google/licensecheck v0.3.1
 	github.com/google/uuid v1.6.0
 	github.com/gookit/color v1.5.4
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/iancoleman/strcase v0.3.0
 	github.com/invopop/jsonschema v0.7.0
-	github.com/jedib0t/go-pretty/v6 v6.5.9
+	github.com/jedib0t/go-pretty/v6 v6.5.8
 	github.com/jinzhu/copier v0.4.0
 	github.com/kastenhq/goversion v0.0.0-20230811215019-93b2f8823953
-	github.com/knqyf263/go-rpmdb v0.1.1
+	github.com/knqyf263/go-rpmdb v0.1.0
 	github.com/mholt/archiver/v3 v3.5.1
 	github.com/microsoft/go-rustaudit v0.0.0-20220730194248-4b17361d90a5
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/mitchellh/hashstructure/v2 v2.0.2
 	github.com/mitchellh/mapstructure v1.5.0
-	github.com/moby/sys/mountinfo v0.7.2
+	github.com/moby/sys/mountinfo v0.7.1
 	github.com/olekukonko/tablewriter v0.0.5
 	github.com/opencontainers/go-digest v1.0.0
 	github.com/pelletier/go-toml v1.9.5
-	github.com/quasilyte/go-ruleguard/dsl v0.3.22
-	github.com/saferwall/pe v1.5.4
+	github.com/saferwall/pe v1.5.2
 	github.com/saintfish/chardet v0.0.0-20230101081208-5e3ef4b5456d
 	github.com/sanity-io/litter v1.5.5
-	github.com/sassoftware/go-rpmutils v0.4.0
+	github.com/sassoftware/go-rpmutils v0.3.0
 	// pinned to pull in 386 arch fix: https://github.com/scylladb/go-set/commit/cc7b2070d91ebf40d233207b633e28f5bd8f03a5
 	github.com/scylladb/go-set v1.0.3-0.20200225121959-cc7b2070d91e
 	github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3
-	github.com/spdx/tools-golang v0.5.5
+	github.com/spdx/tools-golang v0.5.4
 	github.com/spf13/afero v1.11.0
-	github.com/spf13/cobra v1.8.1
+	github.com/spf13/cobra v1.8.0
 	github.com/stretchr/testify v1.9.0
-	github.com/vbatts/go-mtree v0.5.4
+	github.com/vbatts/go-mtree v0.5.3
 	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
 	github.com/xeipuuv/gojsonschema v1.2.0
 	github.com/zyedidia/generic v1.2.2-0.20230320175451-4410d2372cb1
 	go.uber.org/goleak v1.3.0
-	golang.org/x/mod v0.20.0
-	golang.org/x/net v0.27.0
+	golang.org/x/mod v0.17.0
+	golang.org/x/net v0.24.0
 	gopkg.in/yaml.v3 v3.0.1
-	modernc.org/sqlite v1.31.1
-)
-
-require google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 // indirect
-
-require (
-	github.com/BurntSushi/toml v1.4.0
-	github.com/adrg/xdg v0.5.0
-	github.com/magiconair/properties v1.8.7
-	golang.org/x/exp v0.0.0-20231108232855-2478ac86f678
+	modernc.org/sqlite v1.29.8
 )

 require (
@@ -103,6 +93,7 @@ require (
 	github.com/Microsoft/go-winio v0.6.1 // indirect
 	github.com/Microsoft/hcsshim v0.11.4 // indirect
 	github.com/ProtonMail/go-crypto v1.0.0 // indirect
+	github.com/adrg/xdg v0.4.0 // indirect
 	github.com/anchore/go-struct-converter v0.0.0-20221118182256-c68fdcfa2092 // indirect
 	github.com/andybalholm/brotli v1.0.4 // indirect
 	github.com/aquasecurity/go-version v0.0.0-20210121072130-637058cfe492 // indirect
@@ -110,11 +101,7 @@ require (
 	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
 	github.com/becheran/wildmatch-go v1.0.0 // indirect
 	github.com/charmbracelet/harmonica v0.2.0 // indirect
-	github.com/charmbracelet/x/ansi v0.1.4 // indirect
-	github.com/charmbracelet/x/input v0.1.0 // indirect
-	github.com/charmbracelet/x/term v0.1.1 // indirect
-	github.com/charmbracelet/x/windows v0.1.0 // indirect
-	github.com/cloudflare/circl v1.3.8 // indirect
+	github.com/cloudflare/circl v1.3.7 // indirect
 	github.com/containerd/cgroups v1.1.0 // indirect
 	github.com/containerd/containerd v1.7.11 // indirect
 	github.com/containerd/continuity v0.4.2 // indirect
@@ -125,7 +112,7 @@ require (
 	github.com/containerd/typeurl/v2 v2.1.1 // indirect
 	github.com/cyphar/filepath-securejoin v0.2.4 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/docker/cli v27.0.3+incompatible // indirect
+	github.com/docker/cli v24.0.0+incompatible // indirect
 	github.com/docker/distribution v2.8.3+incompatible // indirect
 	github.com/docker/docker-credential-helpers v0.7.0 // indirect
 	github.com/docker/go-connections v0.4.0 // indirect
@@ -137,8 +124,8 @@ require (
 	github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
 	github.com/felixge/fgprof v0.9.3 // indirect
 	github.com/felixge/httpsnoop v1.0.3 // indirect
-	github.com/fsnotify/fsnotify v1.7.0 // indirect
-	github.com/gabriel-vasile/mimetype v1.4.4 // indirect
+	github.com/fsnotify/fsnotify v1.6.0 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.0 // indirect
 	github.com/gkampitakis/ciinfo v0.3.0 // indirect
 	github.com/gkampitakis/go-diff v1.3.2 // indirect
 	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
@@ -159,12 +146,13 @@ require (
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
 	github.com/kevinburke/ssh_config v1.2.0 // indirect
-	github.com/klauspost/compress v1.17.8 // indirect
+	github.com/klauspost/compress v1.17.4 // indirect
 	github.com/klauspost/pgzip v1.2.5 // indirect
 	github.com/kr/pretty v0.3.1 // indirect
 	github.com/kr/text v0.2.0 // indirect
-	github.com/logrusorgru/aurora v2.0.3+incompatible // indirect
+	github.com/logrusorgru/aurora v0.0.0-20200102142835-e9ef32dff381 // indirect
 	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
+	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/maruel/natural v1.1.1 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
@@ -183,13 +171,13 @@ require (
 	github.com/muesli/termenv v0.15.2 // indirect
 	github.com/ncruces/go-strftime v0.1.9 // indirect
 	github.com/nwaples/rardecode v1.1.0 // indirect
-	github.com/opencontainers/image-spec v1.1.0 // indirect
+	github.com/opencontainers/image-spec v1.1.0-rc3 // indirect
 	github.com/opencontainers/runc v1.1.12 // indirect
 	github.com/opencontainers/runtime-spec v1.1.0-rc.1 // indirect
 	github.com/opencontainers/selinux v1.11.0 // indirect
 	github.com/pborman/indent v1.2.1 // indirect
 	github.com/pelletier/go-toml/v2 v2.1.0 // indirect
-	github.com/pierrec/lz4/v4 v4.1.19 // indirect
+	github.com/pierrec/lz4/v4 v4.1.15 // indirect
 	github.com/pjbgf/sha1cd v0.3.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pkg/profile v1.7.0 // indirect
@@ -197,32 +185,32 @@ require (
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/rogpeppe/go-internal v1.12.0 // indirect
-	github.com/sagikazarmark/locafero v0.4.0 // indirect
+	github.com/sagikazarmark/locafero v0.3.0 // indirect
 	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
 	github.com/sahilm/fuzzy v0.1.1-0.20230530133925-c48e322e2a8f // indirect
-	github.com/secDre4mer/pkcs7 v0.0.0-20240322103146-665324a4461d // indirect
 	github.com/shopspring/decimal v1.2.0 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/skeema/knownhosts v1.2.2 // indirect
 	github.com/sourcegraph/conc v0.3.0 // indirect
-	github.com/spf13/cast v1.6.0 // indirect
+	github.com/spf13/cast v1.5.1 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/spf13/viper v1.18.2 // indirect
+	github.com/spf13/viper v1.17.0 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
-	github.com/sylabs/sif/v2 v2.17.1 // indirect
-	github.com/sylabs/squashfs v1.0.0 // indirect
+	github.com/sylabs/sif/v2 v2.11.5 // indirect
+	github.com/sylabs/squashfs v0.6.1 // indirect
 	github.com/therootcompany/xz v1.0.1 // indirect
 	github.com/tidwall/gjson v1.17.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.12 // indirect
+	github.com/ulikunitz/xz v0.5.11 // indirect
 	github.com/vbatts/tar-split v0.11.3 // indirect
 	github.com/xanzy/ssh-agent v0.3.3 // indirect
 	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
 	github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
-	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
+	github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
+	go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352 // indirect
 	go.opencensus.io v0.24.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect
 	go.opentelemetry.io/otel v1.19.0 // indirect
@@ -230,20 +218,22 @@ require (
 	go.opentelemetry.io/otel/trace v1.19.0 // indirect
 	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/multierr v1.9.0 // indirect
-	golang.org/x/crypto v0.25.0 // indirect
+	golang.org/x/crypto v0.22.0 // indirect
+	golang.org/x/exp v0.0.0-20231108232855-2478ac86f678 // indirect
 	golang.org/x/sync v0.7.0 // indirect
-	golang.org/x/sys v0.22.0 // indirect
-	golang.org/x/term v0.22.0 // indirect
-	golang.org/x/text v0.16.0 // indirect
-	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
+	golang.org/x/sys v0.19.0 // indirect
+	golang.org/x/term v0.19.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/tools v0.19.0 // indirect
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
+	google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
 	google.golang.org/grpc v1.59.0 // indirect
 	google.golang.org/protobuf v1.33.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6 // indirect
-	modernc.org/libc v1.55.3 // indirect
+	modernc.org/libc v1.49.3 // indirect
 	modernc.org/mathutil v1.6.0 // indirect
 	modernc.org/memory v1.8.0 // indirect
 	modernc.org/strutil v1.2.0 // indirect
@@ -57,11 +57,9 @@ github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg6
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/toml v0.4.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
-github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0=
-github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/CycloneDX/cyclonedx-go v0.9.0 h1:inaif7qD8bivyxp7XLgxUYtOXWtDez7+j72qKTMQTb8=
-github.com/CycloneDX/cyclonedx-go v0.9.0/go.mod h1:NE/EWvzELOFlG6+ljX/QeMlVt9VKcTwu8u0ccsACEsw=
+github.com/CycloneDX/cyclonedx-go v0.8.0 h1:FyWVj6x6hoJrui5uRQdYZcSievw3Z32Z88uYzG/0D6M=
+github.com/CycloneDX/cyclonedx-go v0.8.0/go.mod h1:K2bA+324+Og0X84fA8HhN2X066K7Bxz4rpMQ4ZhjtSk=
 github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
 github.com/DataDog/zstd v1.5.5 h1:oWf5W7GtOLgp6bciQYDmhHHjdhYkALu6S/5Ni9ZgSvQ=
 github.com/DataDog/zstd v1.5.5/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw=
@@ -85,8 +83,8 @@ github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d h1:licZJFw2RwpH
 github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d/go.mod h1:asat636LX7Bqt5lYEZ27JNDcqxfjdBQuJ/MM4CN/Lzo=
 github.com/acobaugh/osrelease v0.1.0 h1:Yb59HQDGGNhCj4suHaFQQfBps5wyoKLSSX/J/+UifRE=
 github.com/acobaugh/osrelease v0.1.0/go.mod h1:4bFEs0MtgHNHBrmHCt67gNisnabCRAlzdVasCEGHTWY=
-github.com/adrg/xdg v0.5.0 h1:dDaZvhMXatArP1NPHhnfaQUqWBLBsmx1h1HXQdMoFCY=
-github.com/adrg/xdg v0.5.0/go.mod h1:dDdY4M4DF9Rjy4kHPeNL+ilVF+p2lK8IdM9/rTSGcI4=
+github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls=
+github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
@@ -95,10 +93,10 @@ github.com/anchore/archiver/v3 v3.5.2 h1:Bjemm2NzuRhmHy3m0lRe5tNoClB9A4zYyDV58Pa
 github.com/anchore/archiver/v3 v3.5.2/go.mod h1:e3dqJ7H78uzsRSEACH1joayhuSyhnonssnDhppzS1L4=
 github.com/anchore/bubbly v0.0.0-20231115134915-def0aba654a9 h1:p0ZIe0htYOX284Y4axJaGBvXHU0VCCzLN5Wf5XbKStU=
 github.com/anchore/bubbly v0.0.0-20231115134915-def0aba654a9/go.mod h1:3ZsFB9tzW3vl4gEiUeuSOMDnwroWxIxJelOOHUp8dSw=
-github.com/anchore/clio v0.0.0-20240522144804-d81e109008aa h1:pwlAn4O9SBUnlgfa69YcqIynbUyobLVFYu8HxSoCffA=
-github.com/anchore/clio v0.0.0-20240522144804-d81e109008aa/go.mod h1:nD3H5uIvjxlfmakOBgtyFQbk5Zjp3l538kxfpHPslzI=
-github.com/anchore/fangs v0.0.0-20240508143433-f016b099950f h1:NOhzafCyNYFi88qxkBFjMzQo4dRa1vDhBzx+0Uovx8Q=
-github.com/anchore/fangs v0.0.0-20240508143433-f016b099950f/go.mod h1:sVpRS2yNCw6tLVpvA1QSDVWTJVpCuAm8JNZgn4Sjz/k=
+github.com/anchore/clio v0.0.0-20240209204744-cb94e40a4f65 h1:u9XrEabKlGPsrmRvAER+kUKkwXiJfLyqGhmOTFsXjX4=
+github.com/anchore/clio v0.0.0-20240209204744-cb94e40a4f65/go.mod h1:8Jr7CjmwFVcBPtkJdTpaAGHimoGJGfbExypjzOu87Og=
+github.com/anchore/fangs v0.0.0-20231201140849-5075d28d6d8b h1:L/djgY7ZbZ/38+wUtdkk398W3PIBJLkt1N8nU/7e47A=
+github.com/anchore/fangs v0.0.0-20231201140849-5075d28d6d8b/go.mod h1:TLcE0RE5+8oIx2/NPWem/dq1DeaMoC+fPEH7hoSzPLo=
 github.com/anchore/go-collections v0.0.0-20240216171411-9321230ce537 h1:GjNGuwK5jWjJMyVppBjYS54eOiiSNv4Ba869k4wh72Q=
 github.com/anchore/go-collections v0.0.0-20240216171411-9321230ce537/go.mod h1:1aiktV46ATCkuVg0O573ZrH56BUawTECPETbZyBcqT8=
 github.com/anchore/go-logger v0.0.0-20230725134548-c21dafa1ec5a h1:nJ2G8zWKASyVClGVgG7sfM5mwoZlZ2zYpIzN2OhjWkw=
@@ -111,10 +109,10 @@ github.com/anchore/go-testutils v0.0.0-20200925183923-d5f45b0d3c04 h1:VzprUTpc0v
 github.com/anchore/go-testutils v0.0.0-20200925183923-d5f45b0d3c04/go.mod h1:6dK64g27Qi1qGQZ67gFmBFvEHScy0/C8qhQhNe5B5pQ=
 github.com/anchore/go-version v1.2.2-0.20200701162849-18adb9c92b9b h1:e1bmaoJfZVsCYMrIZBpFxwV26CbsuoEh5muXD5I1Ods=
 github.com/anchore/go-version v1.2.2-0.20200701162849-18adb9c92b9b/go.mod h1:Bkc+JYWjMCF8OyZ340IMSIi2Ebf3uwByOk6ho4wne1E=
-github.com/anchore/packageurl-go v0.1.1-0.20240507183024-848e011fc24f h1:B/E9ixKNCasntpoch61NDaQyGPDXLEJlL+B9B/PbdbA=
-github.com/anchore/packageurl-go v0.1.1-0.20240507183024-848e011fc24f/go.mod h1:Blo6OgJNiYF41ufcgHKkbCKF2MDOMlrqhXv/ij6ocR4=
-github.com/anchore/stereoscope v0.0.3-0.20240725180315-50ce3be7aa1f h1:xuBvotcht1Ns8IdaC4UuYV1U8MFln9c5ELeo5bzDEO8=
-github.com/anchore/stereoscope v0.0.3-0.20240725180315-50ce3be7aa1f/go.mod h1:DcQdMes8SwpFli3rDH0v+Vd9qU9Jariq7JSHNJV5X/A=
+github.com/anchore/packageurl-go v0.1.1-0.20240312213626-055233e539b4 h1:SjemQ90fgflz39HG+VMkNfrpUVJpcFW6ZFA3TDXqzBM=
+github.com/anchore/packageurl-go v0.1.1-0.20240312213626-055233e539b4/go.mod h1:Blo6OgJNiYF41ufcgHKkbCKF2MDOMlrqhXv/ij6ocR4=
+github.com/anchore/stereoscope v0.0.3-0.20240501181043-2e9894674185 h1:SuViDJ27nZ+joGdKbAkxAlm7tYMt9NTxTZZ05po4hls=
+github.com/anchore/stereoscope v0.0.3-0.20240501181043-2e9894674185/go.mod h1:ckIamHiRMp8iBwWoTtE5Xkt9VQ5QC+6+O4VzwqyZr5Q=
 github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
 github.com/andybalholm/brotli v1.0.1/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y=
 github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY=
@@ -157,20 +155,12 @@ github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL
 github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/charmbracelet/bubbles v0.18.0 h1:PYv1A036luoBGroX6VWjQIE9Syf2Wby2oOl/39KLfy0=
 github.com/charmbracelet/bubbles v0.18.0/go.mod h1:08qhZhtIwzgrtBjAcJnij1t1H0ZRjwHyGsy6AL11PSw=
-github.com/charmbracelet/bubbletea v0.26.6 h1:zTCWSuST+3yZYZnVSvbXwKOPRSNZceVeqpzOLN2zq1s=
-github.com/charmbracelet/bubbletea v0.26.6/go.mod h1:dz8CWPlfCCGLFbBlTY4N7bjLiyOGDJEnd2Muu7pOWhk=
+github.com/charmbracelet/bubbletea v0.26.1 h1:xujcQeF73rh4jwu3+zhfQsvV18x+7zIjlw7/CYbzGJ0=
+github.com/charmbracelet/bubbletea v0.26.1/go.mod h1:FzKr7sKoO8iFVcdIBM9J0sJOcQv5nDQaYwsee3kpbgo=
 github.com/charmbracelet/harmonica v0.2.0 h1:8NxJWRWg/bzKqqEaaeFNipOu77YR5t8aSwG4pgaUBiQ=
 github.com/charmbracelet/harmonica v0.2.0/go.mod h1:KSri/1RMQOZLbw7AHqgcBycp8pgJnQMYYT8QZRqZ1Ao=
-github.com/charmbracelet/lipgloss v0.12.1 h1:/gmzszl+pedQpjCOH+wFkZr/N90Snz40J/NR7A0zQcs=
-github.com/charmbracelet/lipgloss v0.12.1/go.mod h1:V2CiwIuhx9S1S1ZlADfOj9HmxeMAORuz5izHb0zGbB8=
-github.com/charmbracelet/x/ansi v0.1.4 h1:IEU3D6+dWwPSgZ6HBH+v6oUuZ/nVawMiWj5831KfiLM=
-github.com/charmbracelet/x/ansi v0.1.4/go.mod h1:dk73KoMTT5AX5BsX0KrqhsTqAnhZZoCBjs7dGWp4Ktw=
-github.com/charmbracelet/x/input v0.1.0 h1:TEsGSfZYQyOtp+STIjyBq6tpRaorH0qpwZUj8DavAhQ=
-github.com/charmbracelet/x/input v0.1.0/go.mod h1:ZZwaBxPF7IG8gWWzPUVqHEtWhc1+HXJPNuerJGRGZ28=
-github.com/charmbracelet/x/term v0.1.1 h1:3cosVAiPOig+EV4X9U+3LDgtwwAoEzJjNdwbXDjF6yI=
-github.com/charmbracelet/x/term v0.1.1/go.mod h1:wB1fHt5ECsu3mXYusyzcngVWWlu1KKUmmLhfgr/Flxw=
-github.com/charmbracelet/x/windows v0.1.0 h1:gTaxdvzDM5oMa/I2ZNF7wN78X/atWemG9Wph7Ika2k4=
-github.com/charmbracelet/x/windows v0.1.0/go.mod h1:GLEO/l+lizvFDBPLIOk+49gdX49L9YWMB5t+DZd0jkQ=
+github.com/charmbracelet/lipgloss v0.10.0 h1:KWeXFSexGcfahHX+54URiZGkBFazf70JNMtwg/AFW3s=
+github.com/charmbracelet/lipgloss v0.10.0/go.mod h1:Wig9DSfvANsxqkRsqj6x87irdy123SR4dOXlKa91ciE=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
@@ -178,8 +168,8 @@ github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6D
 github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA=
-github.com/cloudflare/circl v1.3.8 h1:j+V8jJt09PoeMFIu2uh5JUyEaIHTXVOHslFoLNAKqwI=
-github.com/cloudflare/circl v1.3.8/go.mod h1:PDRU+oXvdD7KCtgKxW95M5Z8BpSCJXQORiZFnBQS5QU=
+github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU=
+github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
@@ -211,7 +201,7 @@ github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSV
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
-github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg=
 github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
@@ -227,12 +217,12 @@ github.com/deitch/magic v0.0.0-20230404182410-1ff89d7342da/go.mod h1:B3tI9iGHi4i
 github.com/dgrijalva/jwt-go/v4 v4.0.0-preview1/go.mod h1:+hnT3ywWDTAFrW5aE+u2Sa/wT555ZqwoCS+pk3p6ry4=
 github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
 github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
-github.com/docker/cli v27.0.3+incompatible h1:usGs0/BoBW8MWxGeEtqPMkzOY56jZ6kYlSN5BLDioCQ=
-github.com/docker/cli v27.0.3+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
+github.com/docker/cli v24.0.0+incompatible h1:0+1VshNwBQzQAx9lOl+OYCTCEAD8fKs/qeXMx3O0wqM=
+github.com/docker/cli v24.0.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
 github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
 github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
-github.com/docker/docker v27.1.1+incompatible h1:hO/M4MtV36kzKldqnA37IWhebRA+LnqqcqDja6kVaKY=
-github.com/docker/docker v27.1.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v26.1.1+incompatible h1:oI+4kkAgIwwb54b9OC7Xc3hSgu1RlJA/Lln/DF72djQ=
+github.com/docker/docker v26.1.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/docker-credential-helpers v0.7.0 h1:xtCHsjxogADNZcdv1pKUHXryefjlVRqWqIhk/uXJp0A=
 github.com/docker/docker-credential-helpers v0.7.0/go.mod h1:rETQfLdHNT3foU5kuNkFR1R1V12OJRRO5lzt2D1b5X0=
 github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
@@ -279,22 +269,22 @@ github.com/felixge/fgprof v0.9.3 h1:VvyZxILNuCiUCSXtPtYmmtGvb65nqXh2QFWc0Wpf2/g=
 github.com/felixge/fgprof v0.9.3/go.mod h1:RdbpDgzqYVh/T9fPELJyV7EYJuHB55UTEULNun8eiPw=
 github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk=
 github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
-github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
-github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
+github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY=
+github.com/frankban/quicktest v1.14.4/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU=
-github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
-github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
-github.com/gabriel-vasile/mimetype v1.4.4 h1:QjV6pZ7/XZ7ryI2KuyeEDE8wnh7fHP9YnQy+R0LnH8I=
-github.com/gabriel-vasile/mimetype v1.4.4/go.mod h1:JwLei5XPtWdGiMFB5Pjle1oEeoSeEuJfJE+TtfvdB/s=
+github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
+github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
+github.com/gabriel-vasile/mimetype v1.4.0 h1:Cn9dkdYsMIu56tGho+fqzh7XmvY2YyGU0FnbhiOsEro=
+github.com/gabriel-vasile/mimetype v1.4.0/go.mod h1:fA8fi6KUiG7MgQQ+mEWotXoEOvmxRtOJlERCzSmRvr8=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/github/go-spdx/v2 v2.3.1 h1:ffGuHTbHuHzWPt53n8f9o8clGutuLPObo3zB4JAjxU8=
-github.com/github/go-spdx/v2 v2.3.1/go.mod h1:2ZxKsOhvBp+OYBDlsGnUMcchLeo2mrpEBn2L1C+U3IQ=
+github.com/github/go-spdx/v2 v2.2.0 h1:yBBLMasHA70Ujd35OpL/OjJOWWVNXcJGbars0GinGRI=
+github.com/github/go-spdx/v2 v2.2.0/go.mod h1:hMCrsFgT0QnCwn7G8gxy/MxMpy67WgZrwFeISTn0o6w=
 github.com/gkampitakis/ciinfo v0.3.0 h1:gWZlOC2+RYYttL0hBqcoQhM7h1qNkVqvRCV1fOvpAv8=
 github.com/gkampitakis/ciinfo v0.3.0/go.mod h1:1NIwaOcFChN4fa/B0hEBdAb6npDlFL8Bwx4dfRLRqAo=
 github.com/gkampitakis/go-diff v1.3.2 h1:Qyn0J9XJSDTgnsgHRdz9Zp24RaJeKMUHg2+PDZZdC4M=
 github.com/gkampitakis/go-diff v1.3.2/go.mod h1:LLgOrpqleQe26cte8s36HTWcTmMEur6OPYerdAAS9tk=
-github.com/gkampitakis/go-snaps v0.5.7 h1:uVGjHR4t4pPHU944udMx7VKHpwepZXmvDMF+yDmI0rg=
-github.com/gkampitakis/go-snaps v0.5.7/go.mod h1:ZABkO14uCuVxBHAXAfKG+bqNz+aa1bGPAg8jkI0Nk8Y=
+github.com/gkampitakis/go-snaps v0.5.4 h1:GX+dkKmVsRenz7SoTbdIEL4KQARZctkMiZ8ZKprRwT8=
+github.com/gkampitakis/go-snaps v0.5.4/go.mod h1:ZABkO14uCuVxBHAXAfKG+bqNz+aa1bGPAg8jkI0Nk8Y=
 github.com/glebarez/go-sqlite v1.20.3 h1:89BkqGOXR9oRmG58ZrzgoY/Fhy5x0M+/WV48U5zVrZ4=
 github.com/glebarez/go-sqlite v1.20.3/go.mod h1:u3N6D/wftiAzIOJtZl6BmedqxmmkDfH3q+ihjqxC9u0=
 github.com/gliderlabs/ssh v0.3.7 h1:iV3Bqi942d9huXnzEF2Mt+CY9gLu8DNM4Obd+8bODRE=
@@ -323,8 +313,8 @@ github.com/go-restruct/restruct v1.2.0-alpha h1:2Lp474S/9660+SJjpVxoKuWX09JsXHSr
 github.com/go-restruct/restruct v1.2.0-alpha/go.mod h1:KqrpKpn4M8OLznErihXTGLlsXFGeLxHUrLRRI/1YjGk=
 github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/go-test/deep v1.1.1 h1:0r/53hagsehfO4bzD2Pgr/+RgHqhmf+k1Bpse2cTu1U=
-github.com/go-test/deep v1.1.1/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
+github.com/go-test/deep v1.1.0 h1:WOcxcdHcvdgThNXjw0t76K42FXTU7HpNQWHpA2HHNlg=
+github.com/go-test/deep v1.1.0/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
@@ -384,8 +374,8 @@ github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/go-containerregistry v0.20.1 h1:eTgx9QNYugV4DN5mz4U8hiAGTi1ybXn0TPi4Smd8du0=
-github.com/google/go-containerregistry v0.20.1/go.mod h1:YCMFNQeeXeLF+dnhhWkqDItx/JSkH01j1Kis4PsjzFI=
+github.com/google/go-containerregistry v0.19.1 h1:yMQ62Al6/V0Z7CqIrrS1iYoA5/oQCm88DeNujc7C1KY=
+github.com/google/go-containerregistry v0.19.1/go.mod h1:YCMFNQeeXeLF+dnhhWkqDItx/JSkH01j1Kis4PsjzFI=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/licensecheck v0.3.1 h1:QoxgoDkaeC4nFrtGN1jV7IPmDCHFNIVh54e5hSt6sPs=
 github.com/google/licensecheck v0.3.1/go.mod h1:ORkR35t/JjW+emNKtfJDII0zlciG9JgbT7SmsohlHmY=
@@ -483,8 +473,8 @@ github.com/invopop/jsonschema v0.7.0 h1:2vgQcBz1n256N+FpX3Jq7Y17AjYt46Ig3zIWyy77
 github.com/invopop/jsonschema v0.7.0/go.mod h1:O9uiLokuu0+MGFlyiaqtWxwqJm41/+8Nj0lD7A36YH0=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
-github.com/jedib0t/go-pretty/v6 v6.5.9 h1:ACteMBRrrmm1gMsXe9PSTOClQ63IXDUt03H5U+UV8OU=
-github.com/jedib0t/go-pretty/v6 v6.5.9/go.mod h1:zbn98qrYlh95FIhwwsbIip0LYpwSG8SUOScs+v9/t0E=
+github.com/jedib0t/go-pretty/v6 v6.5.8 h1:8BCzJdSvUbaDuRba4YVh+SKMGcAAKdkcF3SVFbrHAtQ=
+github.com/jedib0t/go-pretty/v6 v6.5.8/go.mod h1:zbn98qrYlh95FIhwwsbIip0LYpwSG8SUOScs+v9/t0E=
 github.com/jinzhu/copier v0.4.0 h1:w3ciUoD19shMCRargcpm0cm91ytaBhDvuRpz1ODO/U8=
 github.com/jinzhu/copier v0.4.0/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
@@ -502,13 +492,13 @@ github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
 github.com/klauspost/compress v1.11.4/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
-github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU=
-github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
+github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4=
+github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
 github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
 github.com/klauspost/pgzip v1.2.5 h1:qnWYvvKqedOF2ulHpMG72XQol4ILEJ8k2wwRl/Km8oE=
 github.com/klauspost/pgzip v1.2.5/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
-github.com/knqyf263/go-rpmdb v0.1.1 h1:oh68mTCvp1XzxdU7EfafcWzzfstUZAEa3MW0IJye584=
-github.com/knqyf263/go-rpmdb v0.1.1/go.mod h1:9LQcoMCMQ9vrF7HcDtXfvqGO4+ddxFQ8+YF/0CVGDww=
+github.com/knqyf263/go-rpmdb v0.1.0 h1:pOgjtOGtW0B+ibY905hP3ETrYFmLZsHiReKsplcs+to=
+github.com/knqyf263/go-rpmdb v0.1.0/go.mod h1:9LQcoMCMQ9vrF7HcDtXfvqGO4+ddxFQ8+YF/0CVGDww=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
@@ -522,9 +512,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
+github.com/logrusorgru/aurora v0.0.0-20200102142835-e9ef32dff381 h1:bqDmpDG49ZRnB5PcgP0RXtQvnMSgIF14M7CBd2shtXs=
 github.com/logrusorgru/aurora v0.0.0-20200102142835-e9ef32dff381/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4=
-github.com/logrusorgru/aurora v2.0.3+incompatible h1:tOpm7WcpBTn4fjmVfgpQq0EfczGlG91VSDkswnjF5A8=
-github.com/logrusorgru/aurora v2.0.3+incompatible/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4=
 github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
 github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
 github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc87/1qhoTACD8w=
@@ -555,6 +544,8 @@ github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m
 github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
 github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
 github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
+github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d h1:5PJl274Y63IEHC+7izoQE9x6ikvDFZS2mDVS3drnohI=
 github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
@@ -584,8 +575,8 @@ github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3N
 github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
 github.com/moby/locker v1.0.1 h1:fOXqR41zeveg4fFODix+1Ch4mj/gT0NE1XJbp/epuBg=
 github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc=
-github.com/moby/sys/mountinfo v0.7.2 h1:1shs6aH5s4o5H2zQLn796ADW1wMrIwHsyJ2v9KouLrg=
-github.com/moby/sys/mountinfo v0.7.2/go.mod h1:1YOa8w8Ih7uW0wALDUgT1dTTSBrZ+HiBLGws92L2RU4=
+github.com/moby/sys/mountinfo v0.7.1 h1:/tTvQaSJRr2FshkhXiIpux6fQ2Zvc4j7tAhMTStAG2g=
+github.com/moby/sys/mountinfo v0.7.1/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGpwtX+VE0rpI=
 github.com/moby/sys/sequential v0.5.0 h1:OPvI35Lzn9K04PBbCLW0g4LcFAJgHsvXsRyewg5lXtc=
 github.com/moby/sys/sequential v0.5.0/go.mod h1:tH2cOOs5V9MlPiXcQzRC+eEyab644PWKGRYaaV5ZZlo=
 github.com/moby/sys/signal v0.7.0 h1:25RW3d5TnQEoKvRbEKUGay6DCQ46IxAVTT9CUMgmsSI=
@@ -618,8 +609,8 @@ github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI=
 github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
-github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug=
-github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM=
+github.com/opencontainers/image-spec v1.1.0-rc3 h1:fzg1mXZFj8YdPeNkRXMg+zb88BFV0Ys52cJydRwBkb8=
+github.com/opencontainers/image-spec v1.1.0-rc3/go.mod h1:X4pATf0uXsnn3g5aiGIsVnJBR4mxhKzfwmvK/B2NTm8=
 github.com/opencontainers/runc v1.1.12 h1:BOIssBaW1La0/qbNZHXOOa71dZfZEQOzW7dqQf3phss=
 github.com/opencontainers/runc v1.1.12/go.mod h1:S+lQwSfncpBha7XTy/5lBwWgm5+y5Ma/O44Ekby9FK8=
 github.com/opencontainers/runtime-spec v1.1.0-rc.1 h1:wHa9jroFfKGQqFHj0I1fMRKLl0pfj+ynAqBxo3v6u9w=
@@ -636,8 +627,8 @@ github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCko
 github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4=
 github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
 github.com/pierrec/lz4/v4 v4.1.2/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
-github.com/pierrec/lz4/v4 v4.1.19 h1:tYLzDnjDXh9qIxSTKHwXwOYmm9d887Y7Y1ZkyXYHAN4=
-github.com/pierrec/lz4/v4 v4.1.19/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
+github.com/pierrec/lz4/v4 v4.1.15 h1:MO0/ucJhngq7299dKLwIMtgTfbkoSPF6AoMYDd8Q4q0=
+github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4=
 github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
@@ -669,8 +660,6 @@ github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+Gx
 github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
 github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo=
 github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4=
-github.com/quasilyte/go-ruleguard/dsl v0.3.22 h1:wd8zkOhSNr+I+8Qeciml08ivDt1pSXe60+5DqOpCjPE=
-github.com/quasilyte/go-ruleguard/dsl v0.3.22/go.mod h1:KeCP03KrjuSO0H1kTuZQCWlQPulDV6YMIXmpQss17rU=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
@@ -685,11 +674,11 @@ github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
-github.com/saferwall/pe v1.5.4 h1:tLmMggEMUfeqrpJ25zS/okUQmyFdD5xWKL2+z9njCqg=
-github.com/saferwall/pe v1.5.4/go.mod h1:mJx+PuptmNpoPFBNhWs/uDMFL/kTHVZIkg0d4OUJFbQ=
+github.com/saferwall/pe v1.5.2 h1:h5lLtLsyxGHQ9dN6cd8EfeLEBEo5gdqJpkuw4o4vTMY=
+github.com/saferwall/pe v1.5.2/go.mod h1:SNzv3cdgk8SBI0UwHfyTcdjawfdnN+nbydnEL7GZ25s=
 github.com/sagikazarmark/crypt v0.3.0/go.mod h1:uD/D+6UF4SrIR1uGEv7bBNkNqLGqUr43MRiaGWX1Nig=
-github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6keLGt6kNQ=
-github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgYEpgQ3O5fPuL3H4=
+github.com/sagikazarmark/locafero v0.3.0 h1:zT7VEGWC2DTflmccN/5T1etyKvxSxpHsjb9cJvm4SvQ=
+github.com/sagikazarmark/locafero v0.3.0/go.mod h1:w+v7UsPNFwzF1cHuOajOOzoq4U7v/ig1mpRjqV+Bu1U=
 github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE=
 github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ=
 github.com/sahilm/fuzzy v0.1.1-0.20230530133925-c48e322e2a8f h1:MvTmaQdww/z0Q4wrYjDSCcZ78NoftLQyHBSLW/Cx79Y=
@@ -698,15 +687,13 @@ github.com/saintfish/chardet v0.0.0-20230101081208-5e3ef4b5456d h1:hrujxIzL1woJ7
 github.com/saintfish/chardet v0.0.0-20230101081208-5e3ef4b5456d/go.mod h1:uugorj2VCxiV1x+LzaIdVa9b4S4qGAcH6cbhh4qVxOU=
 github.com/sanity-io/litter v1.5.5 h1:iE+sBxPBzoK6uaEP5Lt3fHNgpKcHXc/A2HGETy0uJQo=
 github.com/sanity-io/litter v1.5.5/go.mod h1:9gzJgR2i4ZpjZHsKvUXIRQVk7P+yM3e+jAF7bU2UI5U=
-github.com/sassoftware/go-rpmutils v0.4.0 h1:ojND82NYBxgwrV+mX1CWsd5QJvvEZTKddtCdFLPWhpg=
-github.com/sassoftware/go-rpmutils v0.4.0/go.mod h1:3goNWi7PGAT3/dlql2lv3+MSN5jNYPjT5mVcQcIsYzI=
+github.com/sassoftware/go-rpmutils v0.3.0 h1:tE4TZ8KcOXay5iIP64P291s6Qxd9MQCYhI7DU+f3gFA=
+github.com/sassoftware/go-rpmutils v0.3.0/go.mod h1:hM9wdxFsjUFR/tJ6SMsLrJuChcucCa0DsCzE9RMfwMo=
 github.com/scylladb/go-set v1.0.3-0.20200225121959-cc7b2070d91e h1:7q6NSFZDeGfvvtIRwBrU/aegEYJYmvev0cHAwo17zZQ=
 github.com/scylladb/go-set v1.0.3-0.20200225121959-cc7b2070d91e/go.mod h1:DkpGd78rljTxKAnTDPFqXSGxvETQnJyuSOQwsHycqfs=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
 github.com/sebdah/goldie/v2 v2.5.3 h1:9ES/mNN+HNUbNWpVAlrzuZ7jE+Nrczbj8uFRjM7624Y=
 github.com/sebdah/goldie/v2 v2.5.3/go.mod h1:oZ9fp0+se1eapSRjfYbsV/0Hqhbuu3bJVvKI/NNtssI=
-github.com/secDre4mer/pkcs7 v0.0.0-20240322103146-665324a4461d h1:RQqyEogx5J6wPdoxqL132b100j8KjcVHO1c0KLRoIhc=
-github.com/secDre4mer/pkcs7 v0.0.0-20240322103146-665324a4461d/go.mod h1:PegD7EVqlN88z7TpCqH92hHP+GBpfomGCCnw1PFtNOA=
 github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
 github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
@@ -727,25 +714,25 @@ github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9yS
 github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spdx/gordf v0.0.0-20201111095634-7098f93598fb/go.mod h1:uKWaldnbMnjsSAXRurWqqrdyZen1R7kxl8TkmWk2OyM=
-github.com/spdx/tools-golang v0.5.5 h1:61c0KLfAcNqAjlg6UNMdkwpMernhw3zVRwDZ2x9XOmk=
-github.com/spdx/tools-golang v0.5.5/go.mod h1:MVIsXx8ZZzaRWNQpUDhC4Dud34edUYJYecciXgrw5vE=
+github.com/spdx/tools-golang v0.5.4 h1:fRW4iz16P1ZCUtWStFqS6YiMgnK7WgfTFU/lrsYlvqY=
+github.com/spdx/tools-golang v0.5.4/go.mod h1:MVIsXx8ZZzaRWNQpUDhC4Dud34edUYJYecciXgrw5vE=
 github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4=
 github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=
 github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8=
 github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY=
 github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
-github.com/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0=
-github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
+github.com/spf13/cast v1.5.1 h1:R+kOtfhWQE6TVQzY+4D7wJLBgkdVasCEFxSUBYBYIlA=
+github.com/spf13/cast v1.5.1/go.mod h1:b9PdjNptOpzXr7Rq1q9gJML/2cdGQAo69NKzQ10KN48=
 github.com/spf13/cobra v1.3.0/go.mod h1:BrRVncBjOJa/eUcVVm9CE+oC6as8k+VYr4NY7WCi9V4=
-github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM=
-github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y=
+github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0=
+github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho=
 github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/spf13/viper v1.10.0/go.mod h1:SoyBPwAtKDzypXNDFKN5kzH7ppppbGZtls1UpIy5AsM=
-github.com/spf13/viper v1.18.2 h1:LUXCnvUvSM6FXAsj6nnfc8Q2tp1dIgUfY9Kc8GsSOiQ=
-github.com/spf13/viper v1.18.2/go.mod h1:EKmWIqdnk5lOcmR72yw6hS+8OPYcwD0jteitLMVB+yk=
+github.com/spf13/viper v1.17.0 h1:I5txKw7MJasPL/BrfkbA0Jyo/oELqVmux4pR/UxOMfI=
+github.com/spf13/viper v1.17.0/go.mod h1:BmMMMLQXSbcHK6KAOiFLz0l5JHrU89OdIRHvsk0+yVI=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
@@ -769,10 +756,10 @@ github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
 github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
-github.com/sylabs/sif/v2 v2.17.1 h1:p6Sl0LWyShXBj2SBsS1dMOMIMrZHe8pwBnBrYt6uo4M=
-github.com/sylabs/sif/v2 v2.17.1/go.mod h1:XUGB6AQUXGkms3qPOPdevctT3lBLRLWZNWHVnt5HMKE=
-github.com/sylabs/squashfs v1.0.0 h1:xAyMS21ogglkuR5HaY55PCfqY3H32ma9GkasTYo28Zg=
-github.com/sylabs/squashfs v1.0.0/go.mod h1:rhWzvgefq1X+R+LZdts10hfMsTg3g74OfGunW8tvg/4=
+github.com/sylabs/sif/v2 v2.11.5 h1:7ssPH3epSonsTrzbS1YxeJ9KuqAN7ISlSM61a7j/mQM=
+github.com/sylabs/sif/v2 v2.11.5/go.mod h1:GBoZs9LU3e4yJH1dcZ3Akf/jsqYgy5SeguJQC+zd75Y=
+github.com/sylabs/squashfs v0.6.1 h1:4hgvHnD9JGlYWwT0bPYNt9zaz23mAV3Js+VEgQoRGYQ=
+github.com/sylabs/squashfs v0.6.1/go.mod h1:ZwpbPCj0ocIvMy2br6KZmix6Gzh6fsGQcCnydMF+Kx8=
 github.com/terminalstatic/go-xsd-validate v0.1.5 h1:RqpJnf6HGE2CB/lZB1A8BYguk8uRtcvYAPLCF15qguo=
 github.com/terminalstatic/go-xsd-validate v0.1.5/go.mod h1:18lsvYFofBflqCrvo1umpABZ99+GneNTw2kEEc8UPJw=
 github.com/therootcompany/xz v1.0.1 h1:CmOtsn1CbtmyYiusbfmhmkpAAETj0wBIH6kCYaX+xzw=
@@ -790,12 +777,12 @@ github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6
 github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
 github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
 github.com/ulikunitz/xz v0.5.9/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
-github.com/ulikunitz/xz v0.5.12 h1:37Nm15o69RwBkXM0J6A5OlE67RZTfzUxTj8fB3dfcsc=
-github.com/ulikunitz/xz v0.5.12/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
+github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8=
+github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
 github.com/urfave/cli v1.22.12/go.mod h1:sSBEIC79qR6OvcmsD4U3KABeOTxDqQtdDnaFuUN30b8=
 github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI=
-github.com/vbatts/go-mtree v0.5.4 h1:OMAb8jaCyiFA7zXj0Zc/oARcxBDBoeu2LizjB8BVJl0=
-github.com/vbatts/go-mtree v0.5.4/go.mod h1:5GqJbVhm9BBiCc4K5uc/c42FPgXulHaQs4sFUEfIWMo=
+github.com/vbatts/go-mtree v0.5.3 h1:S/jYlfG8rZ+a0bhZd+RANXejy7M4Js8fq9U+XoWTd5w=
+github.com/vbatts/go-mtree v0.5.3/go.mod h1:eXsdoPMdL2jcJx6HweWi9lYQxBsTp4lNhqqAjgkZUg8=
 github.com/vbatts/tar-split v0.11.3 h1:hLFqsOLQ1SsppQNTMpkpPXClLDfC2A3Zgy9OUU+RVck=
 github.com/vbatts/tar-split v0.11.3/go.mod h1:9QlHN18E+fEH7RdG+QAJJcuya3rqT7eXSTY7wGrAokY=
 github.com/vifraa/gopom v1.0.0 h1:L9XlKbyvid8PAIK8nr0lihMApJQg/12OBvMA28BcWh0=
@@ -815,8 +802,8 @@ github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17
 github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
 github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofmx9yWTog9BfvIu0q41lo=
 github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos=
-github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no=
-github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
+github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 h1:QldyIu/L63oPpyvQmHgvgickp1Yw510KJOqX7H24mg8=
+github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778/go.mod h1:2MuV+tbUrU1zIOPMxZ5EncGwgmMJsa+9ucAQZXxsObs=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -828,6 +815,8 @@ github.com/zyedidia/generic v1.2.2-0.20230320175451-4410d2372cb1/go.mod h1:ly2RB
 go.etcd.io/etcd/api/v3 v3.5.1/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs=
 go.etcd.io/etcd/client/pkg/v3 v3.5.1/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
 go.etcd.io/etcd/client/v2 v2.305.1/go.mod h1:pMEacxZW7o8pg4CrFE7pquyCJJzZvkvdD2RibOCCCGs=
+go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352 h1:CCriYyAfq1Br1aIYettdHZTy8mBTIPo7We18TuO/bak=
+go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352/go.mod h1:SNgMg+EgDFwmvSmLRTNKC5fegJjB7v23qTQ0XLGUNHk=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
@@ -878,8 +867,8 @@ golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0
 golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
 golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
 golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
-golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30=
-golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M=
+golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30=
+golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -920,8 +909,8 @@ golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0=
-golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
+golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -962,14 +951,15 @@ golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLd
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8=
 golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20210505024714-0287a6fb4125/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
-golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys=
-golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE=
+golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w=
+golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -1076,20 +1066,21 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220906165534-d0df966e6959/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
-golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
+golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
-golang.org/x/term v0.22.0 h1:BbsgPEJULsl2fV/AT3v15Mjva5yXKQDyKf+TbDz7QJk=
-golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4=
+golang.org/x/term v0.19.0 h1:+ThwsDv+tYfnJFhF4L8jITxu1tdTWRTZpdsWgEgjL6Q=
+golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -1102,8 +1093,8 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
-golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
-golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -1165,8 +1156,8 @@ golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
-golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
+golang.org/x/tools v0.19.0 h1:tfGCXNR1OsFG+sVdLAitlpjAvD/I6dHDKnYrpEZUHkw=
+golang.org/x/tools v0.19.0/go.mod h1:qoJWxmGSIBmAeriMx19ogtrEPrGtDbPK634QFIcLAhc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -1359,18 +1350,18 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-modernc.org/cc/v4 v4.21.4 h1:3Be/Rdo1fpr8GrQ7IVw9OHtplU4gWbb+wNgeoBMmGLQ=
-modernc.org/cc/v4 v4.21.4/go.mod h1:HM7VJTZbUCR3rV8EYBi9wxnJ0ZBRiGE5OeGXNA0IsLQ=
-modernc.org/ccgo/v4 v4.19.2 h1:lwQZgvboKD0jBwdaeVCTouxhxAyN6iawF3STraAal8Y=
-modernc.org/ccgo/v4 v4.19.2/go.mod h1:ysS3mxiMV38XGRTTcgo0DQTeTmAO4oCmJl1nX9VFI3s=
+modernc.org/cc/v4 v4.20.0 h1:45Or8mQfbUqJOG9WaxvlFYOAQO0lQ5RvqBcFCXngjxk=
+modernc.org/cc/v4 v4.20.0/go.mod h1:HM7VJTZbUCR3rV8EYBi9wxnJ0ZBRiGE5OeGXNA0IsLQ=
+modernc.org/ccgo/v4 v4.16.0 h1:ofwORa6vx2FMm0916/CkZjpFPSR70VwTjUCe2Eg5BnA=
+modernc.org/ccgo/v4 v4.16.0/go.mod h1:dkNyWIjFrVIZ68DTo36vHK+6/ShBn4ysU61So6PIqCI=
 modernc.org/fileutil v1.3.0 h1:gQ5SIzK3H9kdfai/5x41oQiKValumqNTDXMvKo62HvE=
 modernc.org/fileutil v1.3.0/go.mod h1:XatxS8fZi3pS8/hKG2GH/ArUogfxjpEKs3Ku3aK4JyQ=
 modernc.org/gc/v2 v2.4.1 h1:9cNzOqPyMJBvrUipmynX0ZohMhcxPtMccYgGOJdOiBw=
 modernc.org/gc/v2 v2.4.1/go.mod h1:wzN5dK1AzVGoH6XOzc3YZ+ey/jPgYHLuVckd62P0GYU=
 modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6 h1:5D53IMaUuA5InSeMu9eJtlQXS2NxAhyWQvkKEgXZhHI=
 modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6/go.mod h1:Qz0X07sNOR1jWYCrJMEnbW/X55x206Q7Vt4mz6/wHp4=
-modernc.org/libc v1.55.3 h1:AzcW1mhlPNrRtjS5sS+eW2ISCgSOLLNyFzRh/V3Qj/U=
-modernc.org/libc v1.55.3/go.mod h1:qFXepLhz+JjFThQ4kzwzOjA/y/artDeg+pcYnY+Q83w=
+modernc.org/libc v1.49.3 h1:j2MRCRdwJI2ls/sGbeSk0t2bypOG/uvPZUsGQFDulqg=
+modernc.org/libc v1.49.3/go.mod h1:yMZuGkn7pXbKfoT/M35gFJOAEdSKdxL0q64sF7KqCDo=
 modernc.org/mathutil v1.6.0 h1:fRe9+AmYlaej+64JsEEhoWuAYBkOtQiMEU7n/XgfYi4=
 modernc.org/mathutil v1.6.0/go.mod h1:Ui5Q9q1TR2gFm0AQRqQUaBWFLAhQpCwNcuhBOSedWPo=
 modernc.org/memory v1.8.0 h1:IqGTL6eFMaDZZhEWwcREgeMXYwmW83LYW8cROZYkg+E=
@@ -1379,8 +1370,8 @@ modernc.org/opt v0.1.3 h1:3XOZf2yznlhC+ibLltsDGzABUGVx8J6pnFMS3E4dcq4=
 modernc.org/opt v0.1.3/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
 modernc.org/sortutil v1.2.0 h1:jQiD3PfS2REGJNzNCMMaLSp/wdMNieTbKX920Cqdgqc=
 modernc.org/sortutil v1.2.0/go.mod h1:TKU2s7kJMf1AE84OoiGppNHJwvB753OYfNl2WRb++Ss=
-modernc.org/sqlite v1.31.1 h1:XVU0VyzxrYHlBhIs1DiEgSl0ZtdnPtbLVy8hSkzxGrs=
-modernc.org/sqlite v1.31.1/go.mod h1:UqoylwmTb9F+IqXERT8bW9zzOWN8qwAIcLdzeBZs4hA=
+modernc.org/sqlite v1.29.8 h1:nGKglNx9K5v0As+zF0/Gcl1kMkmaU1XynYyq92PbsC8=
+modernc.org/sqlite v1.29.8/go.mod h1:lQPm27iqa4UNZpmr4Aor0MH0HkCLbt1huYDfWylLZFk=
 modernc.org/strutil v1.2.0 h1:agBi9dp1I+eOnxXeiZawM8F4LawKv4NzGWSaLfyeNZA=
 modernc.org/strutil v1.2.0/go.mod h1:/mdcBmfOibveCTBxUl5B5l6W+TTH1FXPLHZE6bTosX0=
 modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=
@@ -2,26 +2,34 @@
 # note: we require errors to propagate (don't set -e)
 set -u

-PROJECT_NAME=syft
+PROJECT_NAME="syft"
 OWNER=anchore
 REPO="${PROJECT_NAME}"
 GITHUB_DOWNLOAD_PREFIX=https://github.com/${OWNER}/${REPO}/releases/download
 INSTALL_SH_BASE_URL=https://raw.githubusercontent.com/${OWNER}/${PROJECT_NAME}
 PROGRAM_ARGS=$@

-# signature verification options
-
-# the location to the cosign binary (allowed to be overridden by the user)
-COSIGN_BINARY=${COSIGN_BINARY:-cosign}
-VERIFY_SIGN=false
-# this is the earliest tag in the repo where cosign sign-blob was introduced in the release process (see the goreleaser config)
-VERIFY_SIGN_SUPPORTED_VERSION=v0.104.0
-# this is the earliest tag in the repo where the -v flag was introduced to this install.sh script
-VERIFY_SIGN_FLAG_VERSION=v1.6.0
-
 # do not change the name of this parameter (this must always be backwards compatible)
 DOWNLOAD_TAG_INSTALL_SCRIPT=${DOWNLOAD_TAG_INSTALL_SCRIPT:-true}

+#
+# usage [script-name]
+#
+usage() (
+  this=$1
+  cat <<EOF
+$this: download go binaries for anchore/syft
+
+Usage: $this [-b] dir [-d] [tag]
+  -b  the installation directory (dDefaults to ./bin)
+  -d  turns on debug logging
+  -dd turns on trace logging
+  [tag] the specific release to use (if missing, then the latest will be used)
+EOF
+  exit 2
+)
+
+
 # ------------------------------------------------------------------------
 # https://github.com/client9/shlib - portable posix shell functions
 # Public domain - http://unlicense.org
@@ -262,21 +270,21 @@ hash_sha256() (
 )

 hash_sha256_verify() (
-  target=$1
+  TARGET=$1
  checksums=$2
  if [ -z "$checksums" ]; then
-    log_err "hash_sha256_verify checksum file not specified as argument"
+    log_err "hash_sha256_verify checksum file not specified in arg2"
    return 1
  fi
-  target_basename=${target##*/}
-  want=$(grep "${target_basename}" "${checksums}" 2>/dev/null | tr '\t' ' ' | cut -d ' ' -f 1)
+  BASENAME=${TARGET##*/}
+  want=$(grep "${BASENAME}" "${checksums}" 2>/dev/null | tr '\t' ' ' | cut -d ' ' -f 1)
  if [ -z "$want" ]; then
-    log_err "hash_sha256_verify unable to find checksum for '${target}' in '${checksums}'"
+    log_err "hash_sha256_verify unable to find checksum for '${TARGET}' in '${checksums}'"
    return 1
  fi
-  got=$(hash_sha256 "$target")
+  got=$(hash_sha256 "$TARGET")
  if [ "$want" != "$got" ]; then
-    log_err "hash_sha256_verify checksum for '$target' did not verify ${want} vs $got"
+    log_err "hash_sha256_verify checksum for '$TARGET' did not verify ${want} vs $got"
    return 1
  fi
 )
@@ -350,69 +358,28 @@ github_release_tag() (
  echo "$tag"
 )

-# github_release_asset_url [release-url-prefix] [name] [version] [output-dir] [filename]
-#
-# outputs the url to the release asset
-#
-github_release_asset_url() (
-  download_url="$1"
-  name="$2"
-  version="$3"
-  filename="$4"
-
-  complete_filename="${name}_${version}_${filename}"
-  complete_url="${download_url}/${complete_filename}"
-
-  echo "${complete_url}"
-)
-
-# download_github_release_checksums_files [release-url-prefix] [name] [version] [output-dir] [filename]
-#
-# outputs path to the downloaded checksums related file
-#
-download_github_release_checksums_files() (
-  download_url="$1"
-  name="$2"
-  version="$3"
-  output_dir="$4"
-  filename="$5"
-
-  log_trace "download_github_release_checksums_files(url=${download_url}, name=${name}, version=${version}, output_dir=${output_dir}, filename=${filename})"
-
-  complete_filename="${name}_${version}_${filename}"
-  complete_url=$(github_release_asset_url "${download_url}" "${name}" "${version}" "${filename}")
-  output_path="${output_dir}/${complete_filename}"
-
-  http_download "${output_path}" "${complete_url}" ""
-  asset_file_exists "${output_path}"
-
-  log_trace "download_github_release_checksums_files() returned '${output_path}' for file '${complete_filename}'"
-
-  echo "${output_path}"
-)
-
 # download_github_release_checksums [release-url-prefix] [name] [version] [output-dir]
 #
 # outputs path to the downloaded checksums file
 #
 download_github_release_checksums() (
-  download_github_release_checksums_files "$@" "checksums.txt"
-)
+  download_url="$1"
+  name="$2"
+  version="$3"
+  output_dir="$4"

-# github_release_checksums_sig_url [release-url-prefix] [name] [version]
-#
-# outputs the url to the release checksums signature file
-#
-github_release_checksums_sig_url() (
-  github_release_asset_url "$@" "checksums.txt.sig"
-)
+  log_trace "download_github_release_checksums(url=${download_url}, name=${name}, version=${version}, output_dir=${output_dir})"

-# github_release_checksums_cert_url [release-url-prefix] [name] [version]
-#
-# outputs the url to the release checksums certificate file
-#
-github_release_checksums_cert_url() (
-  github_release_asset_url "$@" "checksums.txt.pem"
+  checksum_filename=${name}_${version}_checksums.txt
+  checksum_url=${download_url}/${checksum_filename}
+  output_path="${output_dir}/${checksum_filename}"
+
+  http_download "${output_path}" "${checksum_url}" ""
+  asset_file_exists "${output_path}"
+
+  log_trace "download_github_release_checksums() returned '${output_path}'"
+
+  echo "${output_path}"
 )

 # search_for_asset [checksums-file-path] [name] [os] [arch] [format]
@@ -568,10 +535,7 @@ download_and_install_asset() (
  format="$8"
  binary="$9"

-  if ! asset_filepath=$(download_asset "${download_url}" "${download_path}" "${name}" "${os}" "${arch}" "${version}" "${format}"); then
-      log_err "could not download asset for os='${os}' arch='${arch}' format='${format}'"
-      return 1
-  fi
+  asset_filepath=$(download_asset "${download_url}" "${download_path}" "${name}" "${os}" "${arch}" "${version}" "${format}")

  # don't continue if we couldn't download an asset
  if [ -z "${asset_filepath}" ]; then
@@ -582,36 +546,6 @@ download_and_install_asset() (
  install_asset "${asset_filepath}" "${install_path}" "${binary}"
 )

-# verify_sign [checksums-file-path] [certificate-reference] [signature-reference] [version]
-#
-# attempts verify the signature of the checksums file from the release workflow in Github Actions run against the main branch.
-#
-verify_sign() {
-  checksums_file=$1
-  cert_reference=$2
-  sig_reference=$3
-
-  log_trace "verifying artifact $1"
-
-  log_file=$(mktemp)
-
-  ${COSIGN_BINARY} \
-    verify-blob "$checksums_file" \
-      --certificate "$cert_reference" \
-      --signature "$sig_reference" \
-      --certificate-identity "https://github.com/${OWNER}/${REPO}/.github/workflows/release.yaml@refs/heads/main" \
-      --certificate-oidc-issuer "https://token.actions.githubusercontent.com" > "${log_file}" 2>&1
-
-  if [ $? -ne 0 ]; then
-    log_err "$(cat "${log_file}")"
-    rm -f "${log_file}"
-    return 1
-  fi
-
-  rm -f "${log_file}"
-}
-
-
 # download_asset [release-url-prefix] [download-path] [name] [os] [arch] [version] [format] [binary]
 #
 # outputs the path to the downloaded asset asset_filepath
@@ -638,20 +572,6 @@ download_asset() (
      return 1
  fi

-  if [ "$VERIFY_SIGN" = true ]; then
-    checksum_sig_file_url=$(github_release_checksums_sig_url "${download_url}" "${name}" "${version}")
-    log_trace "checksums signature url: ${checksum_sig_file_url}"
-
-    checksums_cert_file_url=$(github_release_checksums_cert_url "${download_url}" "${name}" "${version}")
-    log_trace "checksums certificate url: ${checksums_cert_file_url}"
-
-    if ! verify_sign "${checksums_filepath}" "${checksums_cert_file_url}" "${checksum_sig_file_url}"; then
-      log_err "signature verification failed"
-      return 1
-    fi
-    log_info "signature verification succeeded"
-  fi
-
  asset_url="${download_url}/${asset_filename}"
  asset_filepath="${destination}/${asset_filename}"
  http_download "${asset_filepath}" "${asset_url}" ""
@@ -689,79 +609,6 @@ install_asset() (
  install "${archive_dir}/${binary}" "${destination}/"
 )

-# compare two semver strings. Returns 0 if version1 >= version2, 1 otherwise.
-# Note: pre-release (-) and metadata (+) are not supported.
-compare_semver() {
-    # remove leading 'v' if present
-    version1=${1#v}
-    version2=${2#v}
-
-    IFS=. read -r major1 minor1 patch1 <<EOF
-$version1
-EOF
-    IFS=. read -r major2 minor2 patch2 <<EOF
-$version2
-EOF
-
-    if [ "$major1" -gt "$major2" ]; then
-        return 0
-    elif [ "$major1" -lt "$major2" ]; then
-        return 1
-    fi
-
-    if [ "$minor1" -gt "$minor2" ]; then
-        return 0
-    elif [ "$minor1" -lt "$minor2" ]; then
-        return 1
-    fi
-
-    if [ "$patch1" -gt "$patch2" ]; then
-        return 0
-    elif [ "$patch1" -lt "$patch2" ]; then
-        return 1
-    fi
-
-    # versions are equal
-    return 0
-}
-
-prep_signature_verification() {
-  version="$1"
-
-  if [ "$VERIFY_SIGN" != true ]; then
-    return 0
-  fi
-
-  # is there any cryptographic material produced at release that we can use for signature verification?
-  if ! compare_semver "$version" "$VERIFY_SIGN_SUPPORTED_VERSION"; then
-    log_err "${PROJECT_NAME} release '$version' does not support signature verification"
-    log_err "you can still install ${PROJECT_NAME} by removing the -v flag or using a release that supports signature verification (>= '$VERIFY_SIGN_SUPPORTED_VERSION')"
-    log_err "aborting installation"
-    return 1
-  else
-    log_trace "${PROJECT_NAME} release '$version' supports signature verification (>= '$VERIFY_SIGN_SUPPORTED_VERSION')"
-  fi
-
-  # will invoking an earlier version of this script work (considering the -v flag)?
-  if ! compare_semver "$version" "$VERIFY_SIGN_FLAG_VERSION"; then
-    # the -v argument did not always exist, so we cannot be guaranteed that invoking an earlier version of this script
-    # will work (error with "illegal option -v"). However, the user requested signature verification, so we will
-    # attempt to install the application with this version of the script (keeping signature verification).
-    DOWNLOAD_TAG_INSTALL_SCRIPT=false
-    log_debug "provided version install script does not support -v flag (>= '$VERIFY_SIGN_FLAG_VERSION'), using current script for installation"
-  else
-    log_trace "provided version install script supports -v flag (>= '$VERIFY_SIGN_FLAG_VERSION')"
-  fi
-
-  # check to see if the cosign binary is installed
-  if is_command "${COSIGN_BINARY}"; then
-    log_trace "${COSIGN_BINARY} binary is installed"
-  else
-    log_err "signature verification is requested but ${COSIGN_BINARY} binary is not installed (see https://docs.sigstore.dev/system_config/installation/ to install it)"
-    return 1
-  fi
-}
-
 main() (
  # parse arguments

@@ -769,7 +616,7 @@ main() (
  install_dir=${install_dir:-./bin}

  # note: never change the program flags or arguments (this must always be backwards compatible)
-  while getopts "b:dvh?x" arg; do
+  while getopts "b:dh?x" arg; do
    case "$arg" in
      b) install_dir="$OPTARG" ;;
      d)
@@ -781,37 +628,25 @@ main() (
          log_set_priority $log_trace_priority
        fi
        ;;
-      v) VERIFY_SIGN=true;;
-      h | \?)
-        cat <<EOF
-Download and install a released binary for ${OWNER}/${REPO} from the github releases page
-
-Usage: $0 [-v] [-b DIR] [-d] [TAG]
-  -b DIR  the installation directory (defaults to ./bin)
-  -d      turns on debug logging
-  -dd     turns on trace logging
-  -v      verify checksum signature (requires cosign binary to be installed).
-  TAG     the specific release to use (if missing, then the latest will be used)
-EOF
-        exit 0
-      ;;
+      h | \?) usage "$0" ;;
      x) set -x ;;
    esac
  done
  shift $((OPTIND - 1))
-
  set +u
  tag=$1

  if [ -z "${tag}" ]; then
-    log_info "checking github for the current release tag"
+    log_debug "checking github for the current release tag"
    tag=""
  else
-    log_info "checking github for release tag='${tag}'"
+    log_debug "checking github for release tag='${tag}'"
  fi
  set -u

-  if ! tag=$(get_release_tag "${OWNER}" "${REPO}" "${tag}"); then
+  tag=$(get_release_tag "${OWNER}" "${REPO}" "${tag}")
+
+  if [ "$?" != "0" ]; then
      log_err "unable to find tag='${tag}'"
      log_err "do not specify a version or select a valid version from https://github.com/${OWNER}/${REPO}/releases"
      return 1
@@ -826,10 +661,6 @@ EOF
  binary=$(get_binary_name "${os}" "${arch}" "${PROJECT_NAME}")
  download_url="${GITHUB_DOWNLOAD_PREFIX}/${tag}"

-  if ! prep_signature_verification "$version"; then
-      return 1
-  fi
-
  # we always use the install.sh script that is associated with the tagged release. Why? the latest install.sh is not
  # guaranteed to be able to install every version of the application. We use the DOWNLOAD_TAG_INSTALL_SCRIPT env var
  # to indicate if we should continue processing with the existing script or to download the script from the given tag.
@@ -847,8 +678,10 @@ EOF

  log_debug "downloading files into ${download_dir}"

+  download_and_install_asset "${download_url}" "${download_dir}" "${install_dir}" "${PROJECT_NAME}" "${os}" "${arch}" "${version}" "${format}" "${binary}"
+
  # don't continue if we couldn't install the asset
-  if ! download_and_install_asset "${download_url}" "${download_dir}" "${install_dir}" "${PROJECT_NAME}" "${os}" "${arch}" "${version}" "${format}" "${binary}"; then
+  if [ "$?" != "0" ]; then
      log_err "failed to install ${PROJECT_NAME}"
      return 1
  fi
@@ -864,4 +697,4 @@ if [ -z "${TEST_INSTALL_SH}" ]; then
  main "$@"
  exit $?
 fi
-set -u
+set -u
@@ -1,51 +0,0 @@
-# Caching
-
-All caches are created from a global `manager`. By defaut this is a `bypassedCache`, which performs no caching.
-One benefit of this is that tests don't need to worry about caching causing issues unless they explicitly need
-to test the cache and can opt-in using the `cache.TestCache(t)` helper.
-
-Syft sets a `filesystemCache` when the [cache options](../../cmd/syft/internal/options/cache.go) are loaded.
-
-When using the `filesystemCache` all items are stored on disk under a root directory, generally in the form of:
-```
-<rootDir>/<named-cache>/<data-version>/path/to/data
-```
-
-# Using the cache
-
-The easiest and preferred method to use the cache is a `cache.Resolver`, which automatically creates a `<data-version>`
-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:
-
-```go
-type myCacheItem struct {
-	Name string `json:"name",omitempty`
-}
-```
-
-It is possible to use core types such as `pkg.Package` as long as they support the standard `json` serialization,
-but this is discouraged in order to decouple changes to them from affecting the information stored in the cache.
-
-To get a cache for this type:
-```go
-resolver := cache.GetResolver[myCacheItem]("myCacheName", "v1")
-```
-
-Using the `resolver` is a single call, which manages checking for items in the cache, expiry times,
-and if not found invoking the callback to populate the cache and return a value:
-```go
-data := resolver.Resolve("some/cache/key", func() (myCacheItem, error) {
-	// do things to return a myCacheItem or error
-})
-```
-
-If it is common that checking for an item will result in errors, and you do not want to re-run the resolve function
-when errors are encountered, instead of using `GetResolver`, you can use `GetResolverCachingErrors`, which is useful
-for things such as resolving artifacts over a network, where a number of them will not be resolved, and you do not want
-to continue to have the expense of running the network resolution. This should be used when it is acceptable a network
-outage and cached errors is an acceptable risk.
-
-An example can be seen in the [golang cataloger](../../syft/pkg/cataloger/golang/licenses.go) fetching remote licenses.
@@ -1,24 +0,0 @@
-package cache
-
-import "io"
-
-type bypassedCache struct{}
-
-func (b *bypassedCache) Read(_ string) (ReaderAtCloser, error) {
-	return nil, errNotFound
-}
-
-func (b *bypassedCache) Write(_ string, contents io.Reader) error {
-	if closer, ok := contents.(io.Closer); ok {
-		_ = closer.Close()
-	}
-	return nil
-}
-
-func (b *bypassedCache) GetCache(_, _ string) Cache {
-	return b
-}
-
-func (b *bypassedCache) RootDirs() []string {
-	return nil
-}
@@ -1,18 +0,0 @@
-package cache
-
-import (
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-)
-
-func Test_bypassedCache(t *testing.T) {
-	m := bypassedCache{}
-	cache := m.GetCache("name", "version")
-	err := cache.Write("test", strings.NewReader("value"))
-	require.NoError(t, err)
-	rdr, err := cache.Read("test")
-	require.Nil(t, rdr)
-	require.ErrorIs(t, err, errNotFound)
-}
@@ -1,49 +0,0 @@
-package cache
-
-import (
-	"io"
-)
-
-// Manager is responsible for managing cache data and instantiating all caches
-type Manager interface {
-	// GetCache returns a cache scoped to the given named, versioned data
-	GetCache(name, version string) Cache
-
-	// RootDirs returns any root directories this cache manager uses
-	RootDirs() []string
-}
-
-// ReaderAtCloser is an amalgamation of: io.Reader, io.ReaderAt, and io.Closer
-type ReaderAtCloser interface {
-	io.Reader
-	io.ReaderAt
-	io.Closer
-}
-
-// Cache is what the application interacts with to get and set cached data
-type Cache interface {
-	// Read returns a reader for the cache value, if found and not expired
-	// or errors when unable to find / expired
-	Read(key string) (ReaderAtCloser, error)
-
-	// Write writes the contents of the reader to the cache
-	// and closes it, if the reader implements io.Closer
-	Write(key string, contents io.Reader) error
-}
-
-// GetManager returns the global cache manager, which is used to instantiate all caches
-func GetManager() Manager {
-	return manager
-}
-
-// SetManager sets the global cache manager, which is used to instantiate all caches.
-// Setting this to nil disables caching.
-func SetManager(m Manager) {
-	if m == nil {
-		manager = &bypassedCache{}
-	} else {
-		manager = m
-	}
-}
-
-var manager Manager = &bypassedCache{}
@@ -1,32 +0,0 @@
-package cache
-
-import (
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-)
-
-func Test_SetManager(t *testing.T) {
-	original := GetManager()
-	defer SetManager(original)
-
-	SetManager(nil)
-
-	require.NotNil(t, GetManager())
-	require.IsType(t, &bypassedCache{}, GetManager())
-
-	SetManager(NewInMemory(0))
-
-	require.NotNil(t, GetManager())
-	require.IsType(t, &bypassedCache{}, GetManager())
-
-	SetManager(NewInMemory(1 * time.Hour))
-
-	require.NotNil(t, GetManager())
-	require.IsType(t, &filesystemCache{}, GetManager())
-
-	SetManager(nil)
-	require.NotNil(t, GetManager())
-	require.IsType(t, &bypassedCache{}, GetManager())
-}
@@ -1,40 +0,0 @@
-package cache
-
-import "fmt"
-
-// GetResolverCachingErrors returns a Resolver that caches errors and will return them
-// instead of continuing to call the provided resolve functions
-func GetResolverCachingErrors[T any](name, version string) Resolver[T] {
-	return &errorResolver[T]{
-		resolver: GetResolver[errResponse[T]](name, version),
-	}
-}
-
-type errResponse[T any] struct {
-	Error string `json:"err,omitempty"`
-	Value T      `json:"val,omitempty"`
-}
-
-type errorResolver[T any] struct {
-	resolver Resolver[errResponse[T]]
-}
-
-func (r *errorResolver[T]) Resolve(key string, resolver resolverFunc[T]) (T, error) {
-	v, err := r.resolver.Resolve(key, func() (errResponse[T], error) {
-		v, err := resolver()
-		out := errResponse[T]{
-			Value: v,
-		}
-		if err != nil {
-			out.Error = err.Error()
-		}
-		return out, nil
-	})
-	if err != nil {
-		return v.Value, err
-	}
-	if v.Error != "" {
-		return v.Value, fmt.Errorf(v.Error)
-	}
-	return v.Value, nil
-}
@@ -1,47 +0,0 @@
-package cache
-
-import (
-	"fmt"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-)
-
-func Test_errorResolver(t *testing.T) {
-	original := GetManager()
-	defer SetManager(original)
-	SetManager(NewInMemory(time.Hour))
-
-	resolver := GetResolverCachingErrors[string]("theCache", "theVersion")
-
-	resolveCount := 0
-	resolveFunc := func() (string, error) {
-		resolveCount++
-		return "theValue", nil
-	}
-
-	val, err := resolver.Resolve("theKey", resolveFunc)
-	require.NoError(t, err)
-	require.Equal(t, 1, resolveCount)
-	require.Equal(t, "theValue", val)
-
-	val, err = resolver.Resolve("theKey", resolveFunc)
-	require.NoError(t, err)
-	require.Equal(t, 1, resolveCount)
-	require.Equal(t, "theValue", val)
-
-	errorCount := 0
-	errorFunc := func() (string, error) {
-		errorCount++
-		return "", fmt.Errorf("an error")
-	}
-
-	_, err = resolver.Resolve("errorValue", errorFunc)
-	require.ErrorContains(t, err, "an error")
-	require.Equal(t, 1, errorCount)
-
-	_, err = resolver.Resolve("errorValue", errorFunc)
-	require.ErrorContains(t, err, "an error")
-	require.Equal(t, 1, errorCount)
-}
@@ -1,120 +0,0 @@
-package cache
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"net/url"
-	"os"
-	"path/filepath"
-	"regexp"
-	"strings"
-	"time"
-
-	"github.com/spf13/afero"
-
-	"github.com/anchore/syft/internal/log"
-)
-
-// NewFromDir creates a new cache manager which returns caches stored on disk, rooted at the given directory
-func NewFromDir(dir string, ttl time.Duration) (Manager, error) {
-	dir = filepath.Clean(dir)
-	fsys, err := subFs(afero.NewOsFs(), dir)
-	if err != nil {
-		return nil, err
-	}
-	return &filesystemCache{
-		dir: dir,
-		fs:  fsys,
-		ttl: ttl,
-	}, nil
-}
-
-const filePermissions = 0700
-const dirPermissions = os.ModeDir | filePermissions
-
-type filesystemCache struct {
-	dir string
-	fs  afero.Fs
-	ttl time.Duration
-}
-
-func (d *filesystemCache) GetCache(name, version string) Cache {
-	fsys, err := subFs(d.fs, name, version)
-	if err != nil {
-		log.Warnf("error getting cache for: %s/%s: %v", name, version, err)
-		return &bypassedCache{}
-	}
-	return &filesystemCache{
-		dir: filepath.Join(d.dir, name, version),
-		fs:  fsys,
-		ttl: d.ttl,
-	}
-}
-
-func (d *filesystemCache) RootDirs() []string {
-	if d.dir == "" {
-		return nil
-	}
-	return []string{d.dir}
-}
-
-func (d *filesystemCache) Read(key string) (ReaderAtCloser, error) {
-	path := makeDiskKey(key)
-	f, err := d.fs.Open(path)
-	if err != nil {
-		log.Tracef("no cache entry for %s %s: %v", d.dir, key, err)
-		return nil, errNotFound
-	} else if stat, err := f.Stat(); err != nil || stat == nil || time.Since(stat.ModTime()) > d.ttl {
-		log.Tracef("cache entry is too old for %s %s", d.dir, key)
-		return nil, errExpired
-	}
-	log.Tracef("using cache for %s %s", d.dir, key)
-	return f, nil
-}
-
-func (d *filesystemCache) Write(key string, contents io.Reader) error {
-	path := makeDiskKey(key)
-	return afero.WriteReader(d.fs, path, contents)
-}
-
-// subFs returns a writable directory with the given name under the root cache directory returned from findRoot,
-// the directory will be created if it does not exist
-func subFs(fsys afero.Fs, subDirs ...string) (afero.Fs, error) {
-	dir := filepath.Join(subDirs...)
-	dir = filepath.Clean(dir)
-	stat, err := fsys.Stat(dir)
-	if errors.Is(err, afero.ErrFileNotFound) {
-		err = fsys.MkdirAll(dir, dirPermissions)
-		if err != nil {
-			return nil, fmt.Errorf("unable to create directory at '%s': %v", dir, err)
-		}
-		stat, err = fsys.Stat(dir)
-		if err != nil {
-			return nil, err
-		}
-	}
-	if err != nil || stat == nil || !stat.IsDir() {
-		return nil, fmt.Errorf("unable to verify directory '%s': %v", dir, err)
-	}
-	fsys = afero.NewBasePathFs(fsys, dir)
-	return fsys, err
-}
-
-var keyReplacer = regexp.MustCompile("[^-._/a-zA-Z0-9]")
-
-// makeDiskKey makes a safe sub-path but not escape forward slashes, this allows for logical partitioning on disk
-func makeDiskKey(key string) string {
-	// encode single dot directory
-	if key == "." {
-		return "%2E"
-	}
-	// replace any disallowed chars with encoded form
-	key = keyReplacer.ReplaceAllStringFunc(key, url.QueryEscape)
-	// allow . in names but not ..
-	key = strings.ReplaceAll(key, "..", "%2E%2E")
-	return key
-}
-
-var errNotFound = fmt.Errorf("not found")
-var errExpired = fmt.Errorf("expired")
@@ -1,106 +0,0 @@
-package cache
-
-import (
-	"fmt"
-	"io"
-	"net/url"
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/anchore/syft/internal"
-)
-
-func Test_filesystemCache(t *testing.T) {
-	dir := t.TempDir()
-	man, err := NewFromDir(dir, 1*time.Minute)
-	require.NoError(t, err)
-
-	cacheName := "test"
-	cacheVersion := "v1"
-	cache := man.GetCache(cacheName, cacheVersion)
-
-	cacheKey := "test-key"
-	contentsValue := "some contents to cache"
-
-	err = cache.Write(cacheKey, strings.NewReader(contentsValue))
-	require.NoError(t, err)
-
-	rdr, err := cache.Read(cacheKey)
-	require.NoError(t, err)
-	defer internal.CloseAndLogError(rdr, cacheKey)
-
-	contents, err := io.ReadAll(rdr)
-	require.NoError(t, err)
-	require.Equal(t, contentsValue, string(contents))
-
-	// check the contents were actually written to disk as expected
-	contents, err = os.ReadFile(filepath.Join(dir, cacheName, cacheVersion, cacheKey))
-	require.NoError(t, err)
-	require.Equal(t, contentsValue, string(contents))
-
-	_, err = cache.Read("otherKey")
-	require.ErrorIs(t, err, errNotFound)
-}
-
-func Test_makeDiskKey(t *testing.T) {
-	tests := []struct {
-		in       string
-		expected string
-	}{
-		{
-			in:       "",
-			expected: "",
-		},
-		{
-			in:       ".",
-			expected: "%2E",
-		},
-		{
-			in:       "..",
-			expected: "%2E%2E",
-		},
-		{
-			in:       "github.com",
-			expected: "github.com",
-		},
-		{
-			in:       "../github.com",
-			expected: "%2E%2E/github.com",
-		},
-		{
-			in:       "github.com/../..",
-			expected: "github.com/%2E%2E/%2E%2E",
-		},
-		{
-			in:       "github.com/%2E../..",
-			expected: "github.com/%252E%2E%2E/%2E%2E",
-		},
-	}
-	for _, test := range tests {
-		t.Run(test.in, func(t *testing.T) {
-			got := makeDiskKey(test.in)
-			// validate appropriate escaping
-			require.Equal(t, test.expected, got)
-			// also validate that unescaped string matches original
-			unescaped, err := url.QueryUnescape(got)
-			require.NoError(t, err)
-			require.Equal(t, test.in, unescaped)
-		})
-	}
-}
-
-func Test_errors(t *testing.T) {
-	tmp := t.TempDir()
-	cache := filepath.Join(tmp, "cache")
-	// make a non-writable directory
-	require.NoError(t, os.MkdirAll(cache, 0500|os.ModeDir))
-	// attempt to make cache in non-writable directory
-	dir := filepath.Join(cache, "dir")
-	_, err := NewFromDir(dir, time.Hour)
-	require.ErrorContains(t, err, fmt.Sprintf("unable to create directory at '%s':", dir))
-}
@@ -1,71 +0,0 @@
-package cache
-
-import (
-	"fmt"
-	"reflect"
-
-	"github.com/mitchellh/hashstructure/v2"
-)
-
-// hashType returns a stable hash based on the structure of the type
-func hashType[T any]() string {
-	// get the base type and hash an empty instance
-	var t T
-	empty := emptyValue(reflect.TypeOf(t)).Interface()
-	hash, err := hashstructure.Hash(empty, hashstructure.FormatV2, &hashstructure.HashOptions{
-		ZeroNil:         false,
-		IgnoreZeroValue: false,
-		SlicesAsSets:    false,
-		UseStringer:     false,
-	})
-	if err != nil {
-		panic(fmt.Errorf("unable to use type as cache key: %w", err))
-	}
-	return fmt.Sprintf("%x", hash)
-}
-
-func emptyValue(t reflect.Type) reflect.Value {
-	switch t.Kind() {
-	case reflect.Pointer:
-		e := t.Elem()
-		v := emptyValue(e)
-		if v.CanAddr() {
-			return v.Addr()
-		}
-		ptrv := reflect.New(e)
-		ptrv.Elem().Set(v)
-		return ptrv
-	case reflect.Slice:
-		v := emptyValue(t.Elem())
-		s := reflect.MakeSlice(t, 1, 1)
-		s.Index(0).Set(v)
-		return s
-	case reflect.Struct:
-		v := reflect.New(t).Elem()
-		// get all empty field values, too
-		for i := 0; i < v.NumField(); i++ {
-			f := t.Field(i)
-			if isIgnored(f) {
-				continue
-			}
-			fv := v.Field(i)
-			if fv.CanSet() {
-				fv.Set(emptyValue(f.Type))
-			}
-		}
-		return v
-	default:
-		return reflect.New(t).Elem()
-	}
-}
-
-func isIgnored(f reflect.StructField) bool {
-	if !f.IsExported() {
-		return true
-	}
-	tag := f.Tag.Get("hash")
-	if tag == "-" || tag == "ignore" {
-		return true
-	}
-	return false
-}
@@ -1,123 +0,0 @@
-package cache
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/mitchellh/hashstructure/v2"
-	"github.com/stretchr/testify/require"
-)
-
-func Test_hashType(t *testing.T) {
-	type t1 struct {
-		Name string
-	}
-	type t2 struct {
-		Name string
-	}
-	type generic[T any] struct {
-		Val T
-	}
-	tests := []struct {
-		name     string
-		hash     func() string
-		expected string
-	}{
-		{
-			name:     "struct 1",
-			hash:     func() string { return hashType[t1]() },
-			expected: "d106c3ffbf98a0b1",
-		},
-		{
-			name:     "slice of struct 1",
-			hash:     func() string { return hashType[[]t1]() },
-			expected: "8122ace4ee1af0b4",
-		},
-		{
-			name:     "slice of struct 2",
-			hash:     func() string { return hashType[[]t2]() },
-			expected: "8cc04b5808be5bf9",
-		},
-		{
-			name:     "ptr 1",
-			hash:     func() string { return hashType[*t1]() },
-			expected: "d106c3ffbf98a0b1", // same hash as t1, which is ok since the structs are the same
-		},
-		{
-			name:     "slice of ptr 1",
-			hash:     func() string { return hashType[[]*t1]() },
-			expected: "8122ace4ee1af0b4", // same hash as []t1, again underlying serialization is the same
-		},
-		{
-			name:     "slice of ptr 2",
-			hash:     func() string { return hashType[[]*t2]() },
-			expected: "8cc04b5808be5bf9", // same hash as []t2, underlying serialization is the same
-		},
-		{
-			name:     "slice of ptr of slice of ptr",
-			hash:     func() string { return hashType[[]*[]*t1]() },
-			expected: "500d9f5b3a5977ce",
-		},
-		{
-			name:     "generic 1",
-			hash:     func() string { return hashType[generic[t1]]() },
-			expected: "b5fbb30e24400e81",
-		},
-		{
-			name:     "generic 2",
-			hash:     func() string { return hashType[generic[t2]]() },
-			expected: "becdb767c6b22bfa",
-		},
-		{
-			name:     "generic with ptr 1",
-			hash:     func() string { return hashType[generic[*t1]]() },
-			expected: "30c8855bf290fd83",
-		},
-		{
-			name:     "generic with ptr 2",
-			hash:     func() string { return hashType[generic[*t2]]() },
-			expected: "b66366b6ce9e6361",
-		},
-		{
-			name:     "generic with slice 1",
-			hash:     func() string { return hashType[generic[[]t1]]() },
-			expected: "d2ed158942fa6c29",
-		},
-		{
-			name:     "generic with slice 2",
-			hash:     func() string { return hashType[generic[[]t2]]() },
-			expected: "7a7bec575871c179",
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			require.Equal(t, test.expected, test.hash())
-		})
-	}
-}
-
-func Test_hashIgnores(t *testing.T) {
-	hash := func(v any) string {
-		v, err := hashstructure.Hash(v, hashstructure.FormatV2, &hashstructure.HashOptions{})
-		require.NoError(t, err)
-		return fmt.Sprintf("%x", v)
-	}
-	type t1 struct {
-		Name        string
-		notExported string
-	}
-	require.Equal(t, hash(t1{notExported: "a value"}), hashType[t1]())
-
-	type t2 struct {
-		Name     string
-		Exported string `hash:"ignore"`
-	}
-	require.Equal(t, hash(t2{Exported: "another value"}), hashType[t2]())
-
-	type t3 struct {
-		Name     string
-		Exported string `hash:"-"`
-	}
-	require.Equal(t, hash(t3{Exported: "still valued"}), hashType[t3]())
-}
@@ -1,19 +0,0 @@
-package cache
-
-import (
-	"time"
-
-	"github.com/spf13/afero"
-)
-
-// NewInMemory returns an in-memory only cache manager
-func NewInMemory(ttl time.Duration) Manager {
-	if ttl <= 0 {
-		return &bypassedCache{}
-	}
-	return &filesystemCache{
-		dir: "",
-		fs:  afero.NewMemMapFs(),
-		ttl: ttl,
-	}
-}
@@ -1,37 +0,0 @@
-package cache
-
-import (
-	"io"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/anchore/syft/internal"
-)
-
-func Test_NewInMemory(t *testing.T) {
-	man := NewInMemory(time.Hour)
-
-	cacheName := "test"
-	cacheVersion := "v1"
-	cache := man.GetCache(cacheName, cacheVersion)
-
-	cacheKey := "test-key"
-	contentsValue := "some contents to cache"
-
-	err := cache.Write(cacheKey, strings.NewReader(contentsValue))
-	require.NoError(t, err)
-
-	rdr, err := cache.Read(cacheKey)
-	require.NoError(t, err)
-	defer internal.CloseAndLogError(rdr, cacheKey)
-
-	contents, err := io.ReadAll(rdr)
-	require.NoError(t, err)
-	require.Equal(t, contentsValue, string(contents))
-
-	_, err = cache.Read("otherKey")
-	require.ErrorIs(t, err, errNotFound)
-}
@@ -1,83 +0,0 @@
-package cache
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"path"
-
-	"github.com/anchore/syft/internal"
-	"github.com/anchore/syft/internal/log"
-)
-
-// Resolver interface provides a single Resolve method, which will return from cache
-// or call the provided resolve function to get the value if not available in cache
-type Resolver[T any] interface {
-	// Resolve attempts to resolve the given key from cache and convert it to the type of the cache,
-	// or calls the resolver function if unable to resolve a cached value
-	Resolve(key string, resolver resolverFunc[T]) (T, error)
-}
-
-// GetResolver returns a cache resolver for persistent cached data across Syft runs, stored in a unique
-// location based on the provided name and versioned by the type
-func GetResolver[T any](name, version string) Resolver[T] {
-	typeHash := hashType[T]()
-	versionKey := path.Join(version, typeHash)
-	return &cacheResolver[T]{
-		name:  fmt.Sprintf("%s/%s", name, versionKey),
-		cache: manager.GetCache(name, versionKey),
-	}
-}
-
-const resolverKeySuffix = ".json"
-
-type resolverFunc[T any] func() (T, error)
-
-type cacheResolver[T any] struct {
-	name  string
-	cache Cache
-}
-
-var _ interface {
-	Resolver[int]
-} = (*cacheResolver[int])(nil)
-
-func (r *cacheResolver[T]) Resolve(key string, resolver resolverFunc[T]) (T, error) {
-	key += resolverKeySuffix
-
-	rdr, err := r.cache.Read(key)
-	if rdr == nil || err != nil {
-		return r.resolveAndCache(key, resolver)
-	}
-	defer internal.CloseAndLogError(rdr, key)
-
-	dec := json.NewDecoder(rdr)
-	if dec == nil {
-		log.Tracef("error getting cache json decoder for %s %v: %v", r.name, key, err)
-		return r.resolveAndCache(key, resolver)
-	}
-	var t T
-	err = dec.Decode(&t)
-	if err != nil {
-		log.Tracef("error decoding cached entry for %s %v: %v", r.name, key, err)
-		return r.resolveAndCache(key, resolver)
-	}
-	// no error, able to resolve from cache
-	return t, nil
-}
-
-func (r *cacheResolver[T]) resolveAndCache(key string, resolver func() (T, error)) (T, error) {
-	t, err := resolver()
-	if err != nil {
-		return t, err
-	}
-	var data bytes.Buffer
-	enc := json.NewEncoder(&data)
-	enc.SetEscapeHTML(false)
-	err = enc.Encode(t)
-	if err != nil {
-		return t, err
-	}
-	err = r.cache.Write(key, &data)
-	return t, err
-}
@@ -1,92 +0,0 @@
-package cache
-
-import (
-	"encoding/json"
-	"fmt"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-)
-
-func Test_Resolver(t *testing.T) {
-	original := GetManager()
-	defer SetManager(original)
-	SetManager(NewInMemory(time.Hour))
-
-	type sub struct {
-		Name  string
-		Value bool
-	}
-
-	type thing struct {
-		Value  string
-		Values []int
-		Subs   []*sub
-	}
-
-	versionHash := hashType[thing]()
-	cache := GetManager().GetCache("test", "v7/"+versionHash)
-
-	resolver := GetResolver[thing]("test", "v7")
-	require.NotNil(t, resolver)
-
-	require.IsType(t, &cacheResolver[thing]{}, resolver)
-	cr := resolver.(*cacheResolver[thing])
-
-	require.IsType(t, cache, cr.cache)
-
-	resolveErrCount := 0
-	resolveThingErr := func() (thing, error) {
-		resolveErrCount++
-		return thing{}, fmt.Errorf("an error")
-	}
-
-	_, err := resolver.Resolve("err", resolveThingErr)
-	require.ErrorContains(t, err, "an error")
-	require.Equal(t, 1, resolveErrCount)
-
-	_, err = resolver.Resolve("err", resolveThingErr)
-	require.ErrorContains(t, err, "an error")
-	require.Equal(t, 2, resolveErrCount)
-
-	aThing := thing{
-		Value:  "a value",
-		Values: []int{7, 8, 9},
-		Subs: []*sub{
-			{
-				Name:  "sub1",
-				Value: true,
-			},
-			{
-				Name:  "sub2",
-				Value: false,
-			},
-		},
-	}
-
-	resolveThingCount := 0
-	resolveThing := func() (thing, error) {
-		resolveThingCount++
-		return aThing, nil
-	}
-
-	val, err := resolver.Resolve("thing", resolveThing)
-	require.NoError(t, err)
-	require.Equal(t, 1, resolveThingCount)
-	require.Equal(t, aThing, val)
-
-	val, err = resolver.Resolve("thing", resolveThing)
-	require.NoError(t, err)
-	require.Equal(t, 1, resolveThingCount)
-	require.Equal(t, aThing, val)
-
-	rdr, err := cache.Read("thing" + resolverKeySuffix)
-	require.NoError(t, err)
-	decoder := json.NewDecoder(rdr)
-
-	var val2 thing
-	err = decoder.Decode(&val2)
-	require.NoError(t, err)
-	require.Equal(t, aThing, val2)
-}
@@ -1,71 +0,0 @@
-package cmptest
-
-import (
-	"github.com/google/go-cmp/cmp"
-	"github.com/google/go-cmp/cmp/cmpopts"
-
-	"github.com/anchore/syft/syft/file"
-	"github.com/anchore/syft/syft/pkg"
-)
-
-func DefaultCommonOptions() []cmp.Option {
-	return CommonOptions(nil, nil)
-}
-
-func CommonOptions(licenseCmp LicenseComparer, locationCmp LocationComparer) []cmp.Option {
-	if licenseCmp == nil {
-		licenseCmp = DefaultLicenseComparer
-	}
-
-	if locationCmp == nil {
-		locationCmp = DefaultLocationComparer
-	}
-
-	return []cmp.Option{
-		cmpopts.IgnoreFields(pkg.Package{}, "id"), // note: ID is not deterministic for test purposes
-		cmpopts.SortSlices(pkg.Less),
-		cmpopts.SortSlices(DefaultRelationshipComparer),
-		cmp.Comparer(
-			func(x, y file.LocationSet) bool {
-				xs := x.ToSlice()
-				ys := y.ToSlice()
-
-				if len(xs) != len(ys) {
-					return false
-				}
-				for i, xe := range xs {
-					ye := ys[i]
-					if !locationCmp(xe, ye) {
-						return false
-					}
-				}
-
-				return true
-			},
-		),
-		cmp.Comparer(
-			func(x, y pkg.LicenseSet) bool {
-				xs := x.ToSlice()
-				ys := y.ToSlice()
-
-				if len(xs) != len(ys) {
-					return false
-				}
-				for i, xe := range xs {
-					ye := ys[i]
-					if !licenseCmp(xe, ye) {
-						return false
-					}
-				}
-
-				return true
-			},
-		),
-		cmp.Comparer(
-			locationCmp,
-		),
-		cmp.Comparer(
-			licenseCmp,
-		),
-	}
-}
@@ -1,37 +0,0 @@
-package cmptest
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/google/go-cmp/cmp"
-)
-
-// DiffReporter is a simple custom reporter that only records differences detected during comparison.
-type DiffReporter struct {
-	path  cmp.Path
-	diffs []string
-}
-
-func NewDiffReporter() DiffReporter {
-	return DiffReporter{}
-}
-
-func (r *DiffReporter) PushStep(ps cmp.PathStep) {
-	r.path = append(r.path, ps)
-}
-
-func (r *DiffReporter) Report(rs cmp.Result) {
-	if !rs.Equal() {
-		vx, vy := r.path.Last().Values()
-		r.diffs = append(r.diffs, fmt.Sprintf("%#v:\n\t-: %+v\n\t+: %+v\n", r.path, vx, vy))
-	}
-}
-
-func (r *DiffReporter) PopStep() {
-	r.path = r.path[:len(r.path)-1]
-}
-
-func (r *DiffReporter) String() string {
-	return strings.Join(r.diffs, "\n")
-}
@@ -1,29 +0,0 @@
-package cmptest
-
-import (
-	"github.com/google/go-cmp/cmp"
-
-	"github.com/anchore/syft/syft/file"
-	"github.com/anchore/syft/syft/pkg"
-)
-
-type LicenseComparer func(x, y pkg.License) bool
-
-func DefaultLicenseComparer(x, y pkg.License) bool {
-	return cmp.Equal(x, y, cmp.Comparer(DefaultLocationComparer), cmp.Comparer(
-		func(x, y file.LocationSet) bool {
-			xs := x.ToSlice()
-			ys := y.ToSlice()
-			if len(xs) != len(ys) {
-				return false
-			}
-			for i, xe := range xs {
-				ye := ys[i]
-				if !DefaultLocationComparer(xe, ye) {
-					return false
-				}
-			}
-			return true
-		},
-	))
-}
@@ -1,13 +0,0 @@
-package cmptest
-
-import (
-	"github.com/google/go-cmp/cmp"
-
-	"github.com/anchore/syft/syft/file"
-)
-
-type LocationComparer func(x, y file.Location) bool
-
-func DefaultLocationComparer(x, y file.Location) bool {
-	return cmp.Equal(x.Coordinates, y.Coordinates) && cmp.Equal(x.AccessPath, y.AccessPath)
-}
@@ -1,26 +0,0 @@
-package cmptest
-
-import (
-	"github.com/sanity-io/litter"
-
-	"github.com/anchore/syft/syft/artifact"
-)
-
-type RelationshipComparer func(x, y artifact.Relationship) bool
-
-var relationshipStringer = litter.Options{
-	Compact:           true,
-	StripPackageNames: false,
-	HidePrivateFields: true, // we want to ignore package IDs
-	HideZeroValues:    true,
-	StrictGo:          true,
-	//FieldExclusions: ...  // these can be added for future values that need to be ignored
-	//FieldFilter: ...
-}
-
-func DefaultRelationshipComparer(x, y artifact.Relationship) bool {
-	// we just need a stable sort, the ordering does not need to be sensible
-	xStr := relationshipStringer.Sdump(x)
-	yStr := relationshipStringer.Sdump(y)
-	return xStr < yStr
-}
@@ -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.15"
+	JSONSchemaVersion = "16.0.7"
 )
@@ -1,184 +0,0 @@
-package binary
-
-import (
-	"path"
-
-	"github.com/anchore/syft/internal/log"
-	"github.com/anchore/syft/internal/relationship"
-	"github.com/anchore/syft/internal/sbomsync"
-	"github.com/anchore/syft/syft/artifact"
-	"github.com/anchore/syft/syft/file"
-	"github.com/anchore/syft/syft/pkg"
-	"github.com/anchore/syft/syft/sbom"
-)
-
-func NewDependencyRelationships(resolver file.Resolver, accessor sbomsync.Accessor) []artifact.Relationship {
-	// TODO: consider library format (e.g. ELF, Mach-O, PE) for the meantime assume all binaries are homogeneous format
-	// start with building new package-to-package relationships for executables-to-executables
-	// each relationship must be unique, store in a map[id]map[id]relationship to avoid duplicates
-	// 1 & 2... build an index of all shared libraries and their owning packages to search against
-	index := newShareLibIndex(resolver, accessor)
-
-	// 3. craft package-to-package relationships for each binary that represent shared library dependencies
-	//note: we only care about package-to-package relationships
-	return generateRelationships(resolver, accessor, index)
-}
-
-func generateRelationships(resolver file.Resolver, accessor sbomsync.Accessor, index *sharedLibraryIndex) []artifact.Relationship {
-	newRelationships := relationship.NewIndex()
-
-	// find all package-to-package relationships for shared library dependencies
-	accessor.ReadFromSBOM(func(s *sbom.SBOM) {
-		relIndex := relationship.NewIndex(s.Relationships...)
-
-		addRelationship := func(r artifact.Relationship) {
-			if !relIndex.Contains(r) {
-				newRelationships.Add(r)
-			}
-		}
-
-		for _, parentPkg := range s.Artifacts.Packages.Sorted(pkg.BinaryPkg) {
-			for _, evidentLocation := range parentPkg.Locations.ToSlice() {
-				if evidentLocation.Annotations[pkg.EvidenceAnnotationKey] != pkg.PrimaryEvidenceAnnotation {
-					continue
-				}
-
-				// find all libraries that this package depends on
-				exec, ok := s.Artifacts.Executables[evidentLocation.Coordinates]
-				if !ok {
-					continue
-				}
-
-				populateRelationships(exec, parentPkg, resolver, addRelationship, index)
-			}
-		}
-	})
-
-	return newRelationships.All()
-}
-
-// PackagesToRemove returns a list of binary packages (resolved by the ELF cataloger) that should be removed from the SBOM
-// These packages are removed because they are already represented by a higher order packages in the SBOM.
-func PackagesToRemove(resolver file.Resolver, accessor sbomsync.Accessor) []artifact.ID {
-	pkgsToDelete := make([]artifact.ID, 0)
-	accessor.ReadFromSBOM(func(s *sbom.SBOM) {
-		// OTHER package type > ELF package type > Binary package type
-		pkgsToDelete = append(pkgsToDelete, getBinaryPackagesToDelete(resolver, s)...)
-		pkgsToDelete = append(pkgsToDelete, compareElfBinaryPackages(s)...)
-	})
-	return pkgsToDelete
-}
-
-func compareElfBinaryPackages(s *sbom.SBOM) []artifact.ID {
-	pkgsToDelete := make([]artifact.ID, 0)
-	for _, elfPkg := range allElfPackages(s) {
-		for _, loc := range onlyPrimaryEvidenceLocations(elfPkg) {
-			for _, otherPkg := range s.Artifacts.Packages.PackagesByPath(loc.RealPath) {
-				// we only care about comparing binary packages to each other (not other types)
-				if otherPkg.Type != pkg.BinaryPkg {
-					continue
-				}
-				if !isElfPackage(otherPkg) {
-					pkgsToDelete = append(pkgsToDelete, otherPkg.ID())
-				}
-			}
-		}
-	}
-	return pkgsToDelete
-}
-
-func onlyPrimaryEvidenceLocations(p pkg.Package) []file.Location {
-	var locs []file.Location
-	for _, loc := range p.Locations.ToSlice() {
-		if loc.Annotations[pkg.EvidenceAnnotationKey] != pkg.PrimaryEvidenceAnnotation {
-			continue
-		}
-		locs = append(locs, loc)
-	}
-
-	return locs
-}
-
-func allElfPackages(s *sbom.SBOM) []pkg.Package {
-	var elfPkgs []pkg.Package
-	for _, p := range s.Artifacts.Packages.Sorted(pkg.BinaryPkg) {
-		if !isElfPackage(p) {
-			continue
-		}
-		elfPkgs = append(elfPkgs, p)
-	}
-	return elfPkgs
-}
-
-func isElfPackage(p pkg.Package) bool {
-	_, ok := p.Metadata.(pkg.ELFBinaryPackageNoteJSONPayload)
-	return ok
-}
-
-func getBinaryPackagesToDelete(resolver file.Resolver, s *sbom.SBOM) []artifact.ID {
-	pkgsToDelete := make([]artifact.ID, 0)
-	for p := range s.Artifacts.Packages.Enumerate() {
-		if p.Type == pkg.BinaryPkg {
-			continue
-		}
-		fileOwner, ok := p.Metadata.(pkg.FileOwner)
-		if !ok {
-			continue
-		}
-		ownedFiles := fileOwner.OwnedFiles()
-		locations, err := resolver.FilesByPath(ownedFiles...)
-		if err != nil {
-			log.WithFields("error", err).Trace("unable to find path for owned file")
-			continue
-		}
-		for _, loc := range locations {
-			for _, pathPkg := range s.Artifacts.Packages.PackagesByPath(loc.RealPath) {
-				if pathPkg.Type == pkg.BinaryPkg {
-					pkgsToDelete = append(pkgsToDelete, pathPkg.ID())
-				}
-			}
-		}
-	}
-	return pkgsToDelete
-}
-
-func populateRelationships(exec file.Executable, parentPkg pkg.Package, resolver file.Resolver, addRelationship func(artifact.Relationship), index *sharedLibraryIndex) {
-	for _, libReference := range exec.ImportedLibraries {
-		// for each library reference, check s.Artifacts.Packages.Sorted(pkg.BinaryPkg) for a binary package that represents that library
-		// if found, create a relationship between the parent package and the library package
-		// if not found do nothing.
-		// note: we only care about package-to-package relationships
-
-		// find the basename of the library
-		libBasename := path.Base(libReference)
-		libLocations, err := resolver.FilesByGlob("**/" + libBasename)
-		if err != nil {
-			log.WithFields("lib", libReference, "error", err).Trace("unable to resolve library basename")
-			continue
-		}
-
-		for _, loc := range libLocations {
-			// are you in our index?
-			realBaseName := path.Base(loc.RealPath)
-			pkgCollection := index.owningLibraryPackage(realBaseName)
-			if pkgCollection.PackageCount() < 1 {
-				addRelationship(
-					artifact.Relationship{
-						From: loc.Coordinates,
-						To:   parentPkg,
-						Type: artifact.DependencyOfRelationship,
-					},
-				)
-			}
-			for _, p := range pkgCollection.Sorted() {
-				addRelationship(
-					artifact.Relationship{
-						From: p,
-						To:   parentPkg,
-						Type: artifact.DependencyOfRelationship,
-					},
-				)
-			}
-		}
-	}
-}
@@ -1,366 +0,0 @@
-package binary
-
-import (
-	"path"
-	"strings"
-	"testing"
-
-	"github.com/google/go-cmp/cmp"
-	"github.com/google/go-cmp/cmp/cmpopts"
-
-	"github.com/anchore/syft/internal/sbomsync"
-	"github.com/anchore/syft/syft/artifact"
-	"github.com/anchore/syft/syft/file"
-	"github.com/anchore/syft/syft/pkg"
-	"github.com/anchore/syft/syft/sbom"
-)
-
-func TestPackagesToRemove(t *testing.T) {
-	glibcCoordinate := file.NewCoordinates("/usr/lib64/libc.so.6", "")
-	glibCPackage := pkg.Package{
-		Name:    "glibc",
-		Version: "2.28-236.el8_9.12",
-		Locations: file.NewLocationSet(
-			file.NewLocation(glibcCoordinate.RealPath),
-		),
-		Type: pkg.RpmPkg,
-		Metadata: pkg.RpmDBEntry{
-			Files: []pkg.RpmFileRecord{
-				{
-					Path: glibcCoordinate.RealPath,
-				},
-			},
-		},
-	}
-	glibCPackage.SetID()
-
-	glibCBinaryELFPackage := pkg.Package{
-		Name: "glibc",
-		Locations: file.NewLocationSet(
-			file.NewLocation(glibcCoordinate.RealPath).WithAnnotation(pkg.EvidenceAnnotationKey, pkg.PrimaryEvidenceAnnotation),
-		),
-		Type: pkg.BinaryPkg,
-		Metadata: pkg.ELFBinaryPackageNoteJSONPayload{
-			Type:       "testfixture",
-			Vendor:     "syft",
-			System:     "syftsys",
-			SourceRepo: "https://github.com/someone/somewhere.git",
-			Commit:     "5534c38d0ffef9a3f83154f0b7a7fb6ab0ab6dbb",
-		},
-	}
-	glibCBinaryELFPackage.SetID()
-
-	glibCBinaryClassifierPackage := pkg.Package{
-		Name: "glibc",
-		Locations: file.NewLocationSet(
-			file.NewLocation(glibcCoordinate.RealPath).WithAnnotation(pkg.EvidenceAnnotationKey, pkg.SupportingEvidenceAnnotation),
-		),
-		Type:     pkg.BinaryPkg,
-		Metadata: pkg.BinarySignature{},
-	}
-	glibCBinaryClassifierPackage.SetID()
-
-	libCBinaryClassifierPackage := pkg.Package{
-		Name: "libc",
-		Locations: file.NewLocationSet(
-			file.NewLocation(glibcCoordinate.RealPath).WithAnnotation(pkg.EvidenceAnnotationKey, pkg.PrimaryEvidenceAnnotation),
-		),
-		Type:     pkg.BinaryPkg,
-		Metadata: pkg.BinarySignature{},
-	}
-	libCBinaryClassifierPackage.SetID()
-
-	tests := []struct {
-		name     string
-		resolver file.Resolver
-		accessor sbomsync.Accessor
-		want     []artifact.ID
-	}{
-		{
-			name:     "remove packages that are overlapping rpm --> binary",
-			resolver: file.NewMockResolverForPaths(glibcCoordinate.RealPath),
-			accessor: newAccessor([]pkg.Package{glibCPackage, glibCBinaryELFPackage}, map[file.Coordinates]file.Executable{}, nil),
-			want:     []artifact.ID{glibCBinaryELFPackage.ID()},
-		},
-		{
-			name:     "remove no packages when there is a single binary package",
-			resolver: file.NewMockResolverForPaths(glibcCoordinate.RealPath),
-			accessor: newAccessor([]pkg.Package{glibCBinaryELFPackage}, map[file.Coordinates]file.Executable{}, nil),
-			want:     []artifact.ID{},
-		},
-		{
-			name:     "remove packages when there is a single binary package and a classifier package",
-			resolver: file.NewMockResolverForPaths(glibcCoordinate.RealPath),
-			accessor: newAccessor([]pkg.Package{glibCBinaryELFPackage, glibCBinaryClassifierPackage}, map[file.Coordinates]file.Executable{}, nil),
-			want:     []artifact.ID{glibCBinaryClassifierPackage.ID()},
-		},
-		{
-			name:     "ensure we're considering ELF packages, not just binary packages (supporting evidence)",
-			resolver: file.NewMockResolverForPaths(glibcCoordinate.RealPath),
-			accessor: newAccessor([]pkg.Package{glibCBinaryClassifierPackage}, map[file.Coordinates]file.Executable{}, nil),
-			want:     []artifact.ID{},
-		},
-		{
-			name:     "ensure we're considering ELF packages, not just binary packages (primary evidence)",
-			resolver: file.NewMockResolverForPaths(glibcCoordinate.RealPath),
-			accessor: newAccessor([]pkg.Package{libCBinaryClassifierPackage}, map[file.Coordinates]file.Executable{}, nil),
-			want:     []artifact.ID{},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			pkgsToDelete := PackagesToRemove(tt.resolver, tt.accessor)
-			if diff := cmp.Diff(tt.want, pkgsToDelete); diff != "" {
-				t.Errorf("unexpected packages to delete (-want, +got): %s", diff)
-			}
-		})
-	}
-}
-
-func TestNewDependencyRelationships(t *testing.T) {
-	// coordinates for the files under test
-	glibcCoordinate := file.NewCoordinates("/usr/lib64/libc.so.6", "")
-	secondGlibcCoordinate := file.NewCoordinates("/usr/local/lib64/libc.so.6", "")
-	nestedLibCoordinate := file.NewCoordinates("/usr/local/bin/elftests/elfbinwithnestedlib/bin/elfbinwithnestedlib", "")
-	parallelLibCoordinate := file.NewCoordinates("/usr/local/bin/elftests/elfbinwithsisterlib/bin/elfwithparallellibbin1", "")
-
-	// rpm package that was discovered in linked section of the ELF binary package
-	glibCPackage := pkg.Package{
-		Name:    "glibc",
-		Version: "2.28-236.el8_9.12",
-		Locations: file.NewLocationSet(
-			file.NewLocation(glibcCoordinate.RealPath),
-			file.NewLocation("some/other/path"),
-		),
-		Type: pkg.RpmPkg,
-		Metadata: pkg.RpmDBEntry{
-			Files: []pkg.RpmFileRecord{
-				{
-					Path: glibcCoordinate.RealPath,
-				},
-				{
-					Path: "some/other/path",
-				},
-			},
-		},
-	}
-	glibCPackage.SetID()
-
-	// second rpm package that could be discovered in linked section of the ELF binary package (same base path as above)
-	glibCustomPackage := pkg.Package{
-		Name:      "glibc",
-		Version:   "2.28-236.el8_9.12",
-		Locations: file.NewLocationSet(file.NewLocation(secondGlibcCoordinate.RealPath)),
-		Type:      pkg.RpmPkg,
-		Metadata: pkg.RpmDBEntry{
-			Files: []pkg.RpmFileRecord{
-				{
-					Path: secondGlibcCoordinate.RealPath,
-				},
-			},
-		},
-	}
-	glibCustomPackage.SetID()
-
-	// binary package that is an executable that can link against above rpm packages
-	syftTestFixturePackage := pkg.Package{
-		Name:    "syfttestfixture",
-		Version: "0.01",
-		PURL:    "pkg:generic/syftsys/syfttestfixture@0.01",
-		FoundBy: "",
-		Locations: file.NewLocationSet(
-			file.NewLocation(nestedLibCoordinate.RealPath).WithAnnotation(pkg.EvidenceAnnotationKey, pkg.PrimaryEvidenceAnnotation),
-			file.NewLocation(parallelLibCoordinate.RealPath).WithAnnotation(pkg.EvidenceAnnotationKey, pkg.SupportingEvidenceAnnotation),
-		),
-		Language: "",
-		Type:     pkg.BinaryPkg,
-		Metadata: pkg.ELFBinaryPackageNoteJSONPayload{
-			Type:       "testfixture",
-			Vendor:     "syft",
-			System:     "syftsys",
-			SourceRepo: "https://github.com/someone/somewhere.git",
-			Commit:     "5534c38d0ffef9a3f83154f0b7a7fb6ab0ab6dbb",
-		},
-	}
-	syftTestFixturePackage.SetID()
-
-	// dummy executable representation of glibc
-	glibcExecutable := file.Executable{
-		Format:            "elf",
-		HasExports:        true,
-		HasEntrypoint:     true,
-		ImportedLibraries: []string{},
-	}
-
-	// executable representation of the syftTestFixturePackage
-	syftTestFixtureExecutable := file.Executable{
-		Format:        "elf",
-		HasExports:    true,
-		HasEntrypoint: true,
-		ImportedLibraries: []string{
-			path.Base(glibcCoordinate.RealPath),
-		},
-	}
-
-	// second executable representation that has no parent package
-	syftTestFixtureExecutable2 := file.Executable{
-		Format:        "elf",
-		HasExports:    true,
-		HasEntrypoint: true,
-		ImportedLibraries: []string{
-			// this should not be a relationship because it is not a coordinate
-			"foo.so.6",
-		},
-	}
-
-	tests := []struct {
-		name                    string
-		resolver                file.Resolver
-		coordinateIndex         map[file.Coordinates]file.Executable
-		packages                []pkg.Package
-		prexistingRelationships []artifact.Relationship
-		want                    []artifact.Relationship
-	}{
-		{
-			name:            "blank sbom and accessor returns empty relationships",
-			resolver:        nil,
-			coordinateIndex: map[file.Coordinates]file.Executable{},
-			packages:        []pkg.Package{},
-		},
-		{
-			name: "given a package that imports glibc, expect a relationship between the two packages when the package is an executable",
-			resolver: file.NewMockResolverForPaths(
-				glibcCoordinate.RealPath,
-				nestedLibCoordinate.RealPath,
-				parallelLibCoordinate.RealPath,
-			),
-			// path -> executable (above mock resolver needs to be able to resolve to paths in this map)
-			coordinateIndex: map[file.Coordinates]file.Executable{
-				glibcCoordinate:       glibcExecutable,
-				nestedLibCoordinate:   syftTestFixtureExecutable,
-				parallelLibCoordinate: syftTestFixtureExecutable2,
-			},
-			packages: []pkg.Package{glibCPackage, syftTestFixturePackage},
-			want: []artifact.Relationship{
-				{
-					From: glibCPackage,
-					To:   syftTestFixturePackage,
-					Type: artifact.DependencyOfRelationship,
-				},
-			},
-		},
-		{
-			name: "given an executable maps to one base path represented by two RPM we make two relationships",
-			resolver: file.NewMockResolverForPaths(
-				glibcCoordinate.RealPath,
-				secondGlibcCoordinate.RealPath,
-				nestedLibCoordinate.RealPath,
-				parallelLibCoordinate.RealPath,
-			),
-			coordinateIndex: map[file.Coordinates]file.Executable{
-				glibcCoordinate:       glibcExecutable,
-				secondGlibcCoordinate: glibcExecutable,
-				nestedLibCoordinate:   syftTestFixtureExecutable,
-				parallelLibCoordinate: syftTestFixtureExecutable2,
-			},
-			packages: []pkg.Package{glibCPackage, glibCustomPackage, syftTestFixturePackage},
-			want: []artifact.Relationship{
-				{
-					From: glibCPackage,
-					To:   syftTestFixturePackage,
-					Type: artifact.DependencyOfRelationship,
-				},
-				{
-					From: glibCustomPackage,
-					To:   syftTestFixturePackage,
-					Type: artifact.DependencyOfRelationship,
-				},
-			},
-		},
-		{
-			name: "given some dependency relationships already exist, expect no duplicate relationships to be created",
-			resolver: file.NewMockResolverForPaths(
-				glibcCoordinate.RealPath,
-				nestedLibCoordinate.RealPath,
-				parallelLibCoordinate.RealPath,
-			),
-			coordinateIndex: map[file.Coordinates]file.Executable{
-				glibcCoordinate:       glibcExecutable,
-				nestedLibCoordinate:   syftTestFixtureExecutable,
-				parallelLibCoordinate: syftTestFixtureExecutable2,
-			},
-			packages: []pkg.Package{glibCPackage, glibCustomPackage, syftTestFixturePackage},
-			prexistingRelationships: []artifact.Relationship{
-				{
-					From: glibCPackage,
-					To:   syftTestFixturePackage,
-					Type: artifact.DependencyOfRelationship,
-				},
-			},
-		},
-		{
-			name:     "given a package that imports a library that is not tracked by the resolver, expect no relationships to be created",
-			resolver: file.NewMockResolverForPaths(),
-			coordinateIndex: map[file.Coordinates]file.Executable{
-				glibcCoordinate:       glibcExecutable,
-				nestedLibCoordinate:   syftTestFixtureExecutable,
-				parallelLibCoordinate: syftTestFixtureExecutable2,
-			},
-			packages: []pkg.Package{glibCPackage, syftTestFixturePackage},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			accessor := newAccessor(tt.packages, tt.coordinateIndex, tt.prexistingRelationships)
-			// given a resolver that knows about the paths of the packages and executables,
-			// and given an SBOM accessor that knows about the packages and executables,
-			// we should be able to create a set of relationships between the packages and executables
-			relationships := NewDependencyRelationships(tt.resolver, accessor)
-			if diff := relationshipComparer(tt.want, relationships); diff != "" {
-				t.Errorf("unexpected relationships (-want, +got): %s", diff)
-			}
-		})
-	}
-}
-
-func relationshipComparer(x, y []artifact.Relationship) string {
-	return cmp.Diff(x, y, cmpopts.IgnoreUnexported(
-		pkg.Package{},
-		artifact.Relationship{},
-		file.LocationSet{},
-		pkg.LicenseSet{},
-	), cmpopts.SortSlices(lessRelationships))
-}
-
-func lessRelationships(r1, r2 artifact.Relationship) bool {
-	c := strings.Compare(string(r1.Type), string(r2.Type))
-	if c != 0 {
-		return c < 0
-	}
-	c = strings.Compare(string(r1.From.ID()), string(r2.From.ID()))
-	if c != 0 {
-		return c < 0
-	}
-	c = strings.Compare(string(r1.To.ID()), string(r2.To.ID()))
-	return c < 0
-}
-
-func newAccessor(pkgs []pkg.Package, coordinateIndex map[file.Coordinates]file.Executable, preexistingRelationships []artifact.Relationship) sbomsync.Accessor {
-	sb := sbom.SBOM{
-		Artifacts: sbom.Artifacts{
-			Packages: pkg.NewCollection(),
-		},
-	}
-
-	builder := sbomsync.NewBuilder(&sb)
-	builder.AddPackages(pkgs...)
-
-	accessor := builder.(sbomsync.Accessor)
-	accessor.WriteToSBOM(func(s *sbom.SBOM) {
-		s.Artifacts.Executables = coordinateIndex
-		if preexistingRelationships != nil {
-			s.Relationships = preexistingRelationships
-		}
-	})
-	return accessor
-}
@@ -1,131 +0,0 @@
-package binary
-
-import (
-	"path"
-
-	"github.com/anchore/syft/internal/log"
-	"github.com/anchore/syft/internal/sbomsync"
-	"github.com/anchore/syft/syft/file"
-	"github.com/anchore/syft/syft/pkg"
-	"github.com/anchore/syft/syft/sbom"
-)
-
-type sharedLibraryIndex struct {
-	libLocationsByBasename map[string]file.CoordinateSet
-	allLibLocations        file.CoordinateSet
-	packagesByLibraryPath  map[file.Coordinates]*pkg.Collection
-}
-
-func newShareLibIndex(resolver file.Resolver, accessor sbomsync.Accessor) *sharedLibraryIndex {
-	s := &sharedLibraryIndex{
-		libLocationsByBasename: make(map[string]file.CoordinateSet),
-		allLibLocations:        file.NewCoordinateSet(),
-		packagesByLibraryPath:  make(map[file.Coordinates]*pkg.Collection),
-	}
-
-	s.build(resolver, accessor)
-
-	return s
-}
-
-func (i *sharedLibraryIndex) build(resolver file.Resolver, accessor sbomsync.Accessor) {
-	// 1. map out all locations that provide libraries (indexed by the basename)
-	i.libLocationsByBasename, i.allLibLocations = locationsThatProvideLibraries(accessor)
-
-	// 2. for each library path, find all packages that claim ownership of the library
-	i.packagesByLibraryPath = packagesWithLibraryOwnership(resolver, accessor, i.allLibLocations)
-}
-
-func (i *sharedLibraryIndex) owningLibraryPackage(libraryBasename string) *pkg.Collection {
-	// find all packages that own a library by its basename
-	collection := pkg.NewCollection()
-	if set, ok := i.libLocationsByBasename[libraryBasename]; ok {
-		for _, coord := range set.ToSlice() {
-			if pkgSet, ok := i.packagesByLibraryPath[coord]; ok {
-				toAdd := pkgSet.Sorted()
-				collection.Add(toAdd...)
-			}
-		}
-	}
-
-	return collection
-}
-
-func locationsThatProvideLibraries(accessor sbomsync.Accessor) (map[string]file.CoordinateSet, file.CoordinateSet) {
-	// map out all locations that provide libraries (indexed by the basename)
-	libLocationsByBasename := make(map[string]file.CoordinateSet)
-	allLibLocations := file.NewCoordinateSet()
-
-	accessor.ReadFromSBOM(func(s *sbom.SBOM) {
-		// PROBLEM: this does not consider all symlinks to real paths that are libraries
-		for coord, f := range s.Artifacts.Executables {
-			if !f.HasExports {
-				continue
-			}
-
-			basename := path.Base(coord.RealPath)
-			set := libLocationsByBasename[basename]
-			set.Add(coord)
-			allLibLocations.Add(coord)
-			libLocationsByBasename[basename] = set
-		}
-	})
-
-	return libLocationsByBasename, allLibLocations
-}
-func packagesWithLibraryOwnership(resolver file.Resolver, accessor sbomsync.Accessor, allLibLocations file.CoordinateSet) map[file.Coordinates]*pkg.Collection {
-	// map out all packages that claim ownership of a library at a specific path
-	packagesByLibraryPath := make(map[file.Coordinates]*pkg.Collection)
-
-	accessor.ReadFromSBOM(func(s *sbom.SBOM) {
-		for _, p := range s.Artifacts.Packages.Sorted() {
-			var ownedFilePaths []string
-			if p.Type == pkg.BinaryPkg {
-				for _, loc := range p.Locations.ToSlice() {
-					ownedFilePaths = append(ownedFilePaths, loc.Path())
-				}
-			} else {
-				fileOwner, ok := p.Metadata.(pkg.FileOwner)
-				if !ok {
-					continue
-				}
-				ownedFilePaths = fileOwner.OwnedFiles()
-			}
-
-			packagesByLibraryPath = populatePackagesByLibraryPath(resolver, allLibLocations, packagesByLibraryPath, p, ownedFilePaths)
-		}
-	})
-
-	return packagesByLibraryPath
-}
-
-func populatePackagesByLibraryPath(
-	resolver file.Resolver,
-	allLibLocations file.CoordinateSet,
-	packagesByLibraryPath map[file.Coordinates]*pkg.Collection,
-	p pkg.Package,
-	ownedFilePaths []string,
-) map[file.Coordinates]*pkg.Collection {
-	for _, pth := range ownedFilePaths {
-		ownedLocation, err := resolver.FilesByPath(pth)
-		if err != nil {
-			log.WithFields("error", err, "path", pth).Trace("unable to find path for owned file")
-			continue
-		}
-
-		for _, loc := range ownedLocation {
-			// if the location is a library, add the package to the set of packages that own the library
-			if !allLibLocations.Contains(loc.Coordinates) {
-				continue
-			}
-
-			if _, ok := packagesByLibraryPath[loc.Coordinates]; !ok {
-				packagesByLibraryPath[loc.Coordinates] = pkg.NewCollection()
-			}
-
-			// we have a library path, add the package to the set of packages that own the library
-			packagesByLibraryPath[loc.Coordinates].Add(p)
-		}
-	}
-	return packagesByLibraryPath
-}
@@ -1,105 +0,0 @@
-package binary
-
-import (
-	"path"
-	"testing"
-
-	"github.com/anchore/syft/syft/artifact"
-	"github.com/anchore/syft/syft/file"
-	"github.com/anchore/syft/syft/pkg"
-)
-
-func Test_newShareLibIndex(t *testing.T) {
-	tests := []struct {
-		name                    string
-		resolver                file.Resolver
-		coordinateIndex         map[file.Coordinates]file.Executable
-		packages                []pkg.Package
-		prexistingRelationships []artifact.Relationship
-	}{
-		{
-			name:                    "constructor",
-			resolver:                file.NewMockResolverForPaths(),
-			coordinateIndex:         map[file.Coordinates]file.Executable{},
-			packages:                []pkg.Package{},
-			prexistingRelationships: []artifact.Relationship{},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			accessor := newAccessor(tt.packages, tt.coordinateIndex, tt.prexistingRelationships)
-			sharedLibraryIndex := newShareLibIndex(tt.resolver, accessor)
-			if sharedLibraryIndex == nil {
-				t.Errorf("newShareLibIndex() = %v, want non-nil", sharedLibraryIndex)
-			}
-		})
-	}
-}
-
-func Test_sharedLibraryIndex_build(t *testing.T) {
-	glibcCoordinate := file.NewCoordinates("/usr/lib64/libc.so.6", "")
-	secondGlibcCoordinate := file.NewCoordinates("/usr/local/lib64/libc.so.6", "")
-	glibcExecutable := file.Executable{
-		Format:        "elf",
-		HasExports:    true,
-		HasEntrypoint: true,
-		ImportedLibraries: []string{
-			path.Base(glibcCoordinate.RealPath),
-			path.Base(secondGlibcCoordinate.RealPath),
-		},
-	}
-	glibCPackage := pkg.Package{
-		Name:    "glibc",
-		Version: "2.28-236.el8_9.12",
-		Locations: file.NewLocationSet(
-			file.NewLocation(glibcCoordinate.RealPath),
-			file.NewLocation("some/other/path"),
-		),
-		Type: pkg.RpmPkg,
-		Metadata: pkg.RpmDBEntry{
-			Files: []pkg.RpmFileRecord{
-				{
-					Path: glibcCoordinate.RealPath,
-				},
-				{
-					Path: "some/other/path",
-				},
-			},
-		},
-	}
-
-	tests := []struct {
-		name                    string
-		resolver                file.Resolver
-		coordinateIndex         map[file.Coordinates]file.Executable
-		packages                []pkg.Package
-		prexistingRelationships []artifact.Relationship
-	}{
-		{
-			name: "build with locations and packages",
-			resolver: file.NewMockResolverForPaths([]string{
-				glibcCoordinate.RealPath,
-				secondGlibcCoordinate.RealPath,
-			}...),
-			coordinateIndex: map[file.Coordinates]file.Executable{
-				glibcCoordinate:       glibcExecutable,
-				secondGlibcCoordinate: glibcExecutable,
-			},
-			packages: []pkg.Package{
-				glibCPackage,
-			},
-			prexistingRelationships: []artifact.Relationship{},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			accessor := newAccessor(tt.packages, tt.coordinateIndex, tt.prexistingRelationships)
-			sharedLibraryIndex := newShareLibIndex(tt.resolver, accessor)
-			sharedLibraryIndex.build(tt.resolver, accessor)
-			pkgs := sharedLibraryIndex.owningLibraryPackage(path.Base(glibcCoordinate.RealPath))
-			if pkgs.PackageCount() < 1 {
-				t.Errorf("owningLibraryPackage() = %v, want non-empty", pkgs)
-			}
-		})
-	}
-}
@@ -1 +0,0 @@
-../../../../syft/pkg/cataloger/binary/test-fixtures/elf-test-fixtures
@@ -32,7 +32,7 @@ type ownershipByFilesMetadata struct {
 	Files []string `json:"files"`
 }

-func ByFileOwnershipOverlapWorker(accessor sbomsync.Accessor) {
+func byFileOwnershipOverlapWorker(accessor sbomsync.Accessor) {
 	var relationships []artifact.Relationship

 	accessor.ReadFromSBOM(func(s *sbom.SBOM) {
@@ -58,19 +58,9 @@ func byFileOwnershipOverlap(catalog *pkg.Collection) []artifact.Relationship {
 			parent := catalog.Package(parentID) // TODO: this is potentially expensive
 			child := catalog.Package(childID)   // TODO: this is potentially expensive

-			if parent == nil {
-				log.Tracef("parent package not found: %v", parentID)
-				continue
-			}
-
-			if child == nil {
-				log.Tracef("child package not found: %v", childID)
-				continue
-			}
-
 			edges = append(edges, artifact.Relationship{
-				From: *parent,
-				To:   *child,
+				From: parent,
+				To:   child,
 				Type: artifact.OwnershipByFileOverlapRelationship,
 				Data: ownershipByFilesMetadata{
 					Files: fs,
@@ -3,10 +3,8 @@ package relationship
 import (
 	"testing"

-	"github.com/google/go-cmp/cmp"
 	"github.com/stretchr/testify/assert"

-	"github.com/anchore/syft/internal/cmptest"
 	"github.com/anchore/syft/syft/artifact"
 	"github.com/anchore/syft/syft/file"
 	"github.com/anchore/syft/syft/pkg"
@@ -145,9 +143,10 @@ func TestOwnershipByFilesRelationship(t *testing.T) {
 			assert.Len(t, relationships, len(expectedRelations))
 			for idx, expectedRelationship := range expectedRelations {
 				actualRelationship := relationships[idx]
-				if d := cmp.Diff(expectedRelationship, actualRelationship, cmptest.DefaultCommonOptions()...); d != "" {
-					t.Errorf("unexpected relationship (-want, +got): %s", d)
-				}
+				assert.Equal(t, expectedRelationship.From.ID(), actualRelationship.From.ID())
+				assert.Equal(t, expectedRelationship.To.ID(), actualRelationship.To.ID())
+				assert.Equal(t, expectedRelationship.Type, actualRelationship.Type)
+				assert.Equal(t, expectedRelationship.Data, actualRelationship.Data)
 			}
 		})
 	}
@@ -5,7 +5,7 @@ import (
 	"github.com/anchore/syft/syft/pkg"
 )

-func EvidentBy(catalog *pkg.Collection) []artifact.Relationship {
+func evidentBy(catalog *pkg.Collection) []artifact.Relationship {
 	var edges []artifact.Relationship
 	for _, p := range catalog.Sorted() {
 		for _, l := range p.Locations.ToSlice() {
@@ -76,7 +76,7 @@ func TestRelationshipsEvidentBy(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			actual := EvidentBy(tt.catalog)
+			actual := evidentBy(tt.catalog)
 			require.Len(t, actual, len(tt.want))
 			for i := range actual {
 				assert.Equal(t, tt.want[i].From.ID(), actual[i].From.ID(), "from mismatch at index %d", i)
@@ -1,7 +1,6 @@
 package relationship

 import (
-	"reflect"
 	"slices"

 	"github.com/anchore/syft/internal/sbomsync"
@@ -22,13 +21,9 @@ var (
 	binaryCatalogerTypes = []pkg.Type{
 		pkg.BinaryPkg,
 	}
-	binaryMetadataTypes = []string{
-		reflect.TypeOf(pkg.ELFBinaryPackageNoteJSONPayload{}).Name(),
-		reflect.TypeOf(pkg.BinarySignature{}).Name(),
-	}
 )

-func ExcludeBinariesByFileOwnershipOverlap(accessor sbomsync.Accessor) {
+func excludeBinariesByFileOwnershipOverlap(accessor sbomsync.Accessor) {
 	accessor.WriteToSBOM(func(s *sbom.SBOM) {
 		for _, r := range s.Relationships {
 			if excludeBinaryByFileOwnershipOverlap(r, s.Artifacts.Packages) {
@@ -65,15 +60,5 @@ func excludeBinaryByFileOwnershipOverlap(r artifact.Relationship, c *pkg.Collect
 		return false
 	}

-	if slices.Contains(binaryCatalogerTypes, child.Type) {
-		return true
-	}
-
-	if child.Metadata == nil {
-		return false
-	}
-
-	childMetadataType := reflect.TypeOf(child.Metadata)
-
-	return slices.Contains(binaryMetadataTypes, childMetadataType.Name())
+	return slices.Contains(binaryCatalogerTypes, child.Type)
 }
@@ -12,9 +12,7 @@ func TestExclude(t *testing.T) {
 	packageB := pkg.Package{Name: "package-a", Type: pkg.PythonPkg}
 	packageC := pkg.Package{Name: "package-a", Type: pkg.BinaryPkg}
 	packageD := pkg.Package{Name: "package-d", Type: pkg.BinaryPkg}
-	packageE := pkg.Package{Name: "package-e", Type: pkg.RpmPkg, Metadata: pkg.ELFBinaryPackageNoteJSONPayload{Type: "rpm"}}
-	packageF := pkg.Package{Name: "package-f", Type: pkg.RpmPkg, Metadata: pkg.BinarySignature{}}
-	for _, p := range []*pkg.Package{&packageA, &packageB, &packageC, &packageD, &packageE, &packageF} {
+	for _, p := range []*pkg.Package{&packageA, &packageB, &packageC, &packageD} {
 		p := p
 		p.SetID()
 	}
@@ -45,26 +43,6 @@ func TestExclude(t *testing.T) {
 			packages:      pkg.NewCollection(packageA, packageC),
 			shouldExclude: true,
 		},
-		{
-			name: "exclusions from os -> elf binary (as RPM)",
-			relationship: artifact.Relationship{
-				Type: artifact.OwnershipByFileOverlapRelationship,
-				From: packageA,
-				To:   packageE,
-			},
-			packages:      pkg.NewCollection(packageA, packageE),
-			shouldExclude: true,
-		},
-		{
-			name: "exclusions from os -> binary (masquerading as RPM)",
-			relationship: artifact.Relationship{
-				Type: artifact.OwnershipByFileOverlapRelationship,
-				From: packageA,
-				To:   packageF,
-			},
-			packages:      pkg.NewCollection(packageA, packageF),
-			shouldExclude: true,
-		},
 		{
 			name: "no exclusions from python -> binary",
 			relationship: artifact.Relationship{
@@ -0,0 +1,37 @@
+package relationship
+
+import (
+	"github.com/anchore/syft/internal/sbomsync"
+	"github.com/anchore/syft/syft/artifact"
+	"github.com/anchore/syft/syft/cataloging"
+	"github.com/anchore/syft/syft/sbom"
+)
+
+func Finalize(builder sbomsync.Builder, cfg cataloging.RelationshipsConfig, src artifact.Identifiable) {
+	accessor := builder.(sbomsync.Accessor)
+
+	// add relationships showing packages that are evident by a file which is owned by another package (package-to-package)
+	if cfg.PackageFileOwnershipOverlap {
+		byFileOwnershipOverlapWorker(accessor)
+	}
+
+	// conditionally remove binary packages based on file ownership overlap relationships found
+	// https://github.com/anchore/syft/issues/931
+	if cfg.ExcludeBinaryPackagesWithFileOwnershipOverlap {
+		excludeBinariesByFileOwnershipOverlap(accessor)
+	}
+
+	// add source "contains package" relationship (source-to-package)
+	var sourceRelationships []artifact.Relationship
+	accessor.ReadFromSBOM(func(s *sbom.SBOM) {
+		sourceRelationships = toSource(src, s.Artifacts.Packages)
+	})
+	builder.AddRelationships(sourceRelationships...)
+
+	// add evident-by relationships (package-to-file)
+	var evidentByRelationships []artifact.Relationship
+	accessor.ReadFromSBOM(func(s *sbom.SBOM) {
+		evidentByRelationships = evidentBy(s.Artifacts.Packages)
+	})
+	builder.AddRelationships(evidentByRelationships...)
+}
@@ -1,181 +0,0 @@
-package relationship
-
-import (
-	"slices"
-	"strings"
-
-	"github.com/anchore/syft/syft/artifact"
-	"github.com/anchore/syft/syft/file"
-)
-
-// Index indexes relationships, preventing duplicates
-type Index struct {
-	all    []*sortableRelationship
-	fromID map[artifact.ID]*mappedRelationships
-	toID   map[artifact.ID]*mappedRelationships
-}
-
-// NewIndex returns a new relationship Index
-func NewIndex(relationships ...artifact.Relationship) *Index {
-	out := Index{}
-	out.Add(relationships...)
-	return &out
-}
-
-// Add adds all the given relationships to the index, without adding duplicates
-func (i *Index) Add(relationships ...artifact.Relationship) {
-	if i.fromID == nil {
-		i.fromID = map[artifact.ID]*mappedRelationships{}
-	}
-	if i.toID == nil {
-		i.toID = map[artifact.ID]*mappedRelationships{}
-	}
-
-	// store appropriate indexes for stable ordering to minimize ID() calls
-	for _, r := range relationships {
-		// prevent duplicates
-		if i.Contains(r) {
-			continue
-		}
-
-		fromID := r.From.ID()
-		toID := r.To.ID()
-
-		relationship := &sortableRelationship{
-			from:         fromID,
-			to:           toID,
-			relationship: r,
-		}
-
-		// add to all relationships
-		i.all = append(i.all, relationship)
-
-		// add from -> to mapping
-		mapped := i.fromID[fromID]
-		if mapped == nil {
-			mapped = &mappedRelationships{}
-			i.fromID[fromID] = mapped
-		}
-		mapped.add(toID, relationship)
-
-		// add to -> from mapping
-		mapped = i.toID[toID]
-		if mapped == nil {
-			mapped = &mappedRelationships{}
-			i.toID[toID] = mapped
-		}
-		mapped.add(fromID, relationship)
-	}
-}
-
-// From returns all relationships from the given identifiable, with specified types
-func (i *Index) From(identifiable artifact.Identifiable, types ...artifact.RelationshipType) []artifact.Relationship {
-	return toSortedSlice(fromMapped(i.fromID, identifiable), types)
-}
-
-// To returns all relationships to the given identifiable, with specified types
-func (i *Index) To(identifiable artifact.Identifiable, types ...artifact.RelationshipType) []artifact.Relationship {
-	return toSortedSlice(fromMapped(i.toID, identifiable), types)
-}
-
-// References returns all relationships that reference to or from the given identifiable
-func (i *Index) References(identifiable artifact.Identifiable, types ...artifact.RelationshipType) []artifact.Relationship {
-	return toSortedSlice(append(fromMapped(i.fromID, identifiable), fromMapped(i.toID, identifiable)...), types)
-}
-
-// Coordinates returns all coordinates for the provided identifiable for provided relationship types
-// If no types are provided, all relationship types are considered.
-func (i *Index) Coordinates(identifiable artifact.Identifiable, types ...artifact.RelationshipType) []file.Coordinates {
-	var coordinates []file.Coordinates
-	for _, relationship := range i.References(identifiable, types...) {
-		cords := extractCoordinates(relationship)
-		coordinates = append(coordinates, cords...)
-	}
-	return coordinates
-}
-
-// Contains indicates the relationship is present in this index
-func (i *Index) Contains(r artifact.Relationship) bool {
-	if mapped := i.fromID[r.From.ID()]; mapped != nil {
-		if ids := mapped.typeMap[r.Type]; ids != nil {
-			return ids[r.To.ID()] != nil
-		}
-	}
-	return false
-}
-
-// All returns a sorted set of relationships matching all types, or all relationships if no types specified
-func (i *Index) All(types ...artifact.RelationshipType) []artifact.Relationship {
-	return toSortedSlice(i.all, types)
-}
-
-func fromMapped(idMap map[artifact.ID]*mappedRelationships, identifiable artifact.Identifiable) []*sortableRelationship {
-	if identifiable == nil || idMap == nil {
-		return nil
-	}
-	mapped := idMap[identifiable.ID()]
-	if mapped == nil {
-		return nil
-	}
-	return mapped.allRelated
-}
-
-func toSortedSlice(relationships []*sortableRelationship, types []artifact.RelationshipType) []artifact.Relationship {
-	// always return sorted for SBOM stability
-	slices.SortFunc(relationships, sortFunc)
-	var out []artifact.Relationship
-	for _, r := range relationships {
-		if len(types) == 0 || slices.Contains(types, r.relationship.Type) {
-			out = append(out, r.relationship)
-		}
-	}
-	return out
-}
-
-func extractCoordinates(relationship artifact.Relationship) (results []file.Coordinates) {
-	if coordinates, exists := relationship.From.(file.Coordinates); exists {
-		results = append(results, coordinates)
-	}
-
-	if coordinates, exists := relationship.To.(file.Coordinates); exists {
-		results = append(results, coordinates)
-	}
-
-	return results
-}
-
-type mappedRelationships struct {
-	typeMap    map[artifact.RelationshipType]map[artifact.ID]*sortableRelationship
-	allRelated []*sortableRelationship
-}
-
-func (m *mappedRelationships) add(id artifact.ID, newRelationship *sortableRelationship) {
-	m.allRelated = append(m.allRelated, newRelationship)
-	if m.typeMap == nil {
-		m.typeMap = map[artifact.RelationshipType]map[artifact.ID]*sortableRelationship{}
-	}
-	typeMap := m.typeMap[newRelationship.relationship.Type]
-	if typeMap == nil {
-		typeMap = map[artifact.ID]*sortableRelationship{}
-		m.typeMap[newRelationship.relationship.Type] = typeMap
-	}
-	typeMap[id] = newRelationship
-}
-
-type sortableRelationship struct {
-	from         artifact.ID
-	to           artifact.ID
-	relationship artifact.Relationship
-}
-
-func sortFunc(a, b *sortableRelationship) int {
-	cmp := strings.Compare(string(a.relationship.Type), string(b.relationship.Type))
-	if cmp != 0 {
-		return cmp
-	}
-	cmp = strings.Compare(string(a.from), string(b.from))
-	if cmp != 0 {
-		return cmp
-	}
-	return strings.Compare(string(a.to), string(b.to))
-}
@@ -1,233 +0,0 @@
-package relationship
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/anchore/syft/syft/artifact"
-	"github.com/anchore/syft/syft/file"
-	"github.com/anchore/syft/syft/pkg"
-)
-
-func Test_Index(t *testing.T) {
-	p1 := pkg.Package{
-		Name: "pkg-1",
-	}
-	p2 := pkg.Package{
-		Name: "pkg-2",
-	}
-	p3 := pkg.Package{
-		Name: "pkg-3",
-	}
-	c1 := file.Coordinates{
-		RealPath: "/coords/1",
-	}
-	c2 := file.Coordinates{
-		RealPath: "/coords/2",
-	}
-
-	for _, p := range []*pkg.Package{&p1, &p2, &p3} {
-		p.SetID()
-	}
-
-	r1 := artifact.Relationship{
-		From: p1,
-		To:   p2,
-		Type: artifact.DependencyOfRelationship,
-	}
-	r2 := artifact.Relationship{
-		From: p1,
-		To:   p3,
-		Type: artifact.DependencyOfRelationship,
-	}
-	r3 := artifact.Relationship{
-		From: p1,
-		To:   c1,
-		Type: artifact.ContainsRelationship,
-	}
-	r4 := artifact.Relationship{
-		From: p2,
-		To:   c2,
-		Type: artifact.ContainsRelationship,
-	}
-	r5 := artifact.Relationship{
-		From: p3,
-		To:   c2,
-		Type: artifact.ContainsRelationship,
-	}
-
-	dup := artifact.Relationship{
-		From: p3,
-		To:   c2,
-		Type: artifact.ContainsRelationship,
-	}
-
-	idx := NewIndex(r1, r2, r3, r4, r5, dup)
-	require.ElementsMatch(t, slice(r1, r2, r3, r4, r5), idx.All())
-
-	require.ElementsMatch(t, slice(r1, r4), idx.References(p2))
-	require.ElementsMatch(t, slice(r4), idx.References(p2, artifact.ContainsRelationship))
-
-	require.ElementsMatch(t, slice(r1), idx.To(p2))
-	require.ElementsMatch(t, []artifact.Relationship(nil), idx.To(p2, artifact.ContainsRelationship))
-
-	require.ElementsMatch(t, slice(r4), idx.From(p2))
-	require.ElementsMatch(t, slice(r4), idx.From(p2, artifact.ContainsRelationship))
-}
-
-func Test_sortOrder(t *testing.T) {
-	r1 := artifact.Relationship{
-		From: id("1"),
-		To:   id("2"),
-		Type: "1",
-	}
-	r2 := artifact.Relationship{
-		From: id("2"),
-		To:   id("3"),
-		Type: "1",
-	}
-	r3 := artifact.Relationship{
-		From: id("3"),
-		To:   id("4"),
-		Type: "1",
-	}
-	r4 := artifact.Relationship{
-		From: id("1"),
-		To:   id("2"),
-		Type: "2",
-	}
-	r5 := artifact.Relationship{
-		From: id("2"),
-		To:   id("3"),
-		Type: "2",
-	}
-	dup := artifact.Relationship{
-		From: id("2"),
-		To:   id("3"),
-		Type: "2",
-	}
-	r6 := artifact.Relationship{
-		From: id("2"),
-		To:   id("3"),
-		Type: "3",
-	}
-
-	idx := NewIndex(r5, r2, r6, r4, r1, r3, dup)
-	require.EqualValues(t, slice(r1, r2, r3, r4, r5, r6), idx.All())
-
-	require.EqualValues(t, slice(r1, r4), idx.From(id("1")))
-
-	require.EqualValues(t, slice(r2, r5, r6), idx.To(id("3")))
-
-	rLast := artifact.Relationship{
-		From: id("0"),
-		To:   id("3"),
-		Type: "9999",
-	}
-
-	rFirst := artifact.Relationship{
-		From: id("0"),
-		To:   id("3"),
-		Type: "1",
-	}
-
-	rMid := artifact.Relationship{
-		From: id("0"),
-		To:   id("1"),
-		Type: "2",
-	}
-
-	idx.Add(rLast, rFirst, rMid)
-
-	require.EqualValues(t, slice(rFirst, r1, r2, r3, rMid, r4, r5, r6, rLast), idx.All())
-
-	require.EqualValues(t, slice(rFirst, r2, r5, r6, rLast), idx.To(id("3")))
-}
-
-func Test_Coordinates(t *testing.T) {
-	p1 := pkg.Package{
-		Name: "pkg-1",
-	}
-	p2 := pkg.Package{
-		Name: "pkg-2",
-	}
-	p3 := pkg.Package{
-		Name: "pkg-3",
-	}
-	c1 := file.Coordinates{
-		RealPath: "/coords/1",
-	}
-	c2 := file.Coordinates{
-		RealPath: "/coords/2",
-	}
-	c3 := file.Coordinates{
-		RealPath: "/coords/3",
-	}
-	c4 := file.Coordinates{
-		RealPath: "/coords/4",
-	}
-
-	for _, p := range []*pkg.Package{&p1, &p2, &p3} {
-		p.SetID()
-	}
-
-	r1 := artifact.Relationship{
-		From: p1,
-		To:   p2,
-		Type: artifact.DependencyOfRelationship,
-	}
-	r2 := artifact.Relationship{
-		From: p1,
-		To:   p3,
-		Type: artifact.DependencyOfRelationship,
-	}
-	r3 := artifact.Relationship{
-		From: p1,
-		To:   c1,
-		Type: artifact.ContainsRelationship,
-	}
-	r4 := artifact.Relationship{
-		From: p2,
-		To:   c2,
-		Type: artifact.ContainsRelationship,
-	}
-	r5 := artifact.Relationship{
-		From: p3,
-		To:   c1,
-		Type: artifact.ContainsRelationship,
-	}
-	r6 := artifact.Relationship{
-		From: p3,
-		To:   c2,
-		Type: artifact.ContainsRelationship,
-	}
-	r7 := artifact.Relationship{
-		From: c1,
-		To:   c3,
-		Type: artifact.ContainsRelationship,
-	}
-	r8 := artifact.Relationship{
-		From: c3,
-		To:   c4,
-		Type: artifact.ContainsRelationship,
-	}
-
-	idx := NewIndex(r1, r2, r3, r4, r5, r6, r7, r8)
-
-	got := idx.Coordinates(p1)
-	require.ElementsMatch(t, slice(c1), got)
-
-	got = idx.Coordinates(p3)
-	require.ElementsMatch(t, slice(c1, c2), got)
-}
-
-type id string
-
-func (i id) ID() artifact.ID {
-	return artifact.ID(i)
-}
-
-func slice[T any](values ...T) []T {
-	return values
-}
@@ -5,7 +5,7 @@ import (
 	"github.com/anchore/syft/syft/pkg"
 )

-func ToSource(src artifact.Identifiable, c *pkg.Collection) []artifact.Relationship {
+func toSource(src artifact.Identifiable, c *pkg.Collection) []artifact.Relationship {
 	relationships := make([]artifact.Relationship, 0) // Should we pre-allocate this by giving catalog a Len() method?
 	for p := range c.Enumerate() {
 		relationships = append(relationships, artifact.Relationship{
@@ -20,8 +20,6 @@ type Builder interface {

 	AddPackages(...pkg.Package)

-	DeletePackages(...artifact.ID)
-
 	// edges

 	AddRelationships(...artifact.Relationship)
@@ -38,22 +36,14 @@ type Accessor interface {
 }

 type sbomBuilder struct {
-	sbom    *sbom.SBOM
-	lock    *sync.RWMutex
-	onWrite []func(*sbom.SBOM)
+	sbom *sbom.SBOM
+	lock *sync.RWMutex
 }

-func NewBuilder(s *sbom.SBOM, onWrite ...func(*sbom.SBOM)) Builder {
+func NewBuilder(s *sbom.SBOM) Builder {
 	return &sbomBuilder{
-		sbom:    s,
-		lock:    &sync.RWMutex{},
-		onWrite: onWrite,
-	}
-}
-
-func (b sbomBuilder) onWriteEvent() {
-	for _, fn := range b.onWrite {
-		fn(b.sbom)
+		sbom: s,
+		lock: &sync.RWMutex{},
 	}
 }

@@ -62,7 +52,6 @@ func (b sbomBuilder) WriteToSBOM(fn func(*sbom.SBOM)) {
 	defer b.lock.Unlock()

 	fn(b.sbom)
-	b.onWriteEvent()
 }

 func (b sbomBuilder) ReadFromSBOM(fn func(*sbom.SBOM)) {
@@ -77,35 +66,6 @@ func (b sbomBuilder) AddPackages(p ...pkg.Package) {
 	defer b.lock.Unlock()

 	b.sbom.Artifacts.Packages.Add(p...)
-	b.onWriteEvent()
-}
-
-func (b sbomBuilder) DeletePackages(ids ...artifact.ID) {
-	b.lock.Lock()
-	defer b.lock.Unlock()
-
-	deleted := make(map[artifact.ID]struct{})
-	for _, id := range ids {
-		b.sbom.Artifacts.Packages.Delete(id)
-		deleted[id] = struct{}{}
-	}
-
-	// remove any relationships that reference the deleted packages
-	var relationships []artifact.Relationship
-	for _, rel := range b.sbom.Relationships {
-		if _, ok := deleted[rel.From.ID()]; ok {
-			continue
-		}
-		if _, ok := deleted[rel.To.ID()]; ok {
-			continue
-		}
-
-		// only keep relationships that don't reference the deleted packages
-		relationships = append(relationships, rel)
-	}
-
-	b.sbom.Relationships = relationships
-	b.onWriteEvent()
 }

 func (b sbomBuilder) AddRelationships(relationship ...artifact.Relationship) {
@@ -113,7 +73,6 @@ func (b sbomBuilder) AddRelationships(relationship ...artifact.Relationship) {
 	defer b.lock.Unlock()

 	b.sbom.Relationships = append(b.sbom.Relationships, relationship...)
-	b.onWriteEvent()
 }

 func (b sbomBuilder) SetLinuxDistribution(release linux.Release) {
@@ -121,5 +80,4 @@ func (b sbomBuilder) SetLinuxDistribution(release linux.Release) {
 	defer b.lock.Unlock()

 	b.sbom.Artifacts.LinuxDistribution = &release
-	b.onWriteEvent()
 }
@@ -1,98 +0,0 @@
-package sbomsync
-
-import (
-	"testing"
-
-	"github.com/magiconair/properties/assert"
-
-	"github.com/anchore/syft/syft/artifact"
-	"github.com/anchore/syft/syft/pkg"
-	"github.com/anchore/syft/syft/sbom"
-)
-
-func TestNewBuilder(t *testing.T) {
-	tests := []struct {
-		name string
-		sbom sbom.SBOM
-	}{
-		{
-			"TestNewBuilder with empty sbom",
-			sbom.SBOM{
-				Artifacts: sbom.Artifacts{
-					Packages: pkg.NewCollection(),
-				},
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			builder := NewBuilder(&tt.sbom)
-			builder.AddPackages(pkg.Package{})
-			accessor := builder.(Accessor)
-			accessor.ReadFromSBOM(func(s *sbom.SBOM) {
-				packageCount := s.Artifacts.Packages.PackageCount()
-				assert.Equal(t, packageCount, 1, "expected 1 package in sbom")
-			})
-		})
-	}
-}
-
-func Test_sbomBuilder_DeletePackages(t *testing.T) {
-	testPackage := pkg.Package{
-		Name:    "test",
-		Version: "1.0.0",
-		Type:    pkg.DebPkg,
-	}
-	testPackage.SetID()
-
-	keepMe := pkg.Package{
-		Name:    "keepMe",
-		Version: "1.0.0",
-		Type:    pkg.DebPkg,
-	}
-
-	prexistingRelationships := []artifact.Relationship{
-		{
-			From: testPackage,
-			To:   testPackage,
-			Type: artifact.DependencyOfRelationship,
-		},
-	}
-
-	tests := []struct {
-		name string
-		sbom sbom.SBOM
-	}{
-		{
-			"Test_sbomBuilder_DeletePackages deletes a given package",
-			sbom.SBOM{
-				Artifacts: sbom.Artifacts{
-					Packages: pkg.NewCollection(),
-				},
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			builder := NewBuilder(&tt.sbom)
-			builder.AddPackages(testPackage, keepMe)
-			accessor := builder.(Accessor)
-			accessor.WriteToSBOM(func(s *sbom.SBOM) {
-				s.Relationships = prexistingRelationships
-			})
-
-			builder.DeletePackages(testPackage.ID())
-			newAccess := builder.(Accessor)
-			newAccess.ReadFromSBOM(func(s *sbom.SBOM) {
-				packageCount := s.Artifacts.Packages.PackageCount()
-
-				// deleted target package
-				assert.Equal(t, packageCount, 1, "expected 1 packages in sbom")
-				relationshipCount := len(s.Relationships)
-
-				// deleted relationships that reference the deleted package
-				assert.Equal(t, relationshipCount, 0, "expected 0 relationships in sbom")
-			})
-		})
-	}
-}
@@ -1,68 +0,0 @@
-package internal
-
-import (
-	"fmt"
-	"sort"
-)
-
-// Set represents a generic set type.
-type Set[T comparable] map[T]struct{}
-
-// NewSet creates a new empty Set.
-func NewSet[T comparable](start ...T) Set[T] {
-	ret := make(Set[T])
-	for _, v := range start {
-		ret.Add(v)
-	}
-	return ret
-}
-
-// Add adds elements to the set.
-func (s Set[T]) Add(elements ...T) {
-	for _, e := range elements {
-		s[e] = struct{}{}
-	}
-}
-
-// Remove removes an element from the set.
-func (s Set[T]) Remove(element T) {
-	delete(s, element)
-}
-
-// Contains checks if an element is in the set.
-func (s Set[T]) Contains(element T) bool {
-	_, ok := s[element]
-	return ok
-}
-
-// ToSlice returns a sorted slice of elements in the set.
-func (s Set[T]) ToSlice() []T {
-	ret := make([]T, len(s))
-	idx := 0
-	for v := range s {
-		ret[idx] = v
-		idx++
-	}
-	sort.Slice(ret, func(i, j int) bool {
-		return fmt.Sprintf("%v", ret[i]) < fmt.Sprintf("%v", ret[j])
-	})
-	return ret
-}
-
-// Equals checks if two sets are equal.
-func (s Set[T]) Equals(o Set[T]) bool {
-	if len(s) != len(o) {
-		return false
-	}
-	for k := range s {
-		if !o.Contains(k) {
-			return false
-		}
-	}
-	return true
-}
-
-// Empty checks if the set is empty.
-func (s Set[T]) Empty() bool {
-	return len(s) == 0
-}
@@ -1,146 +0,0 @@
-package internal
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func TestNewSet(t *testing.T) {
-	tests := []struct {
-		name   string
-		start  []int
-		result Set[int]
-	}{
-		{"empty set", []int{}, NewSet[int]()},
-		{"non-empty set", []int{1, 2, 3}, NewSet(1, 2, 3)},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			s := NewSet(tt.start...)
-			require.Equal(t, tt.result, s)
-		})
-	}
-}
-
-func TestAdd(t *testing.T) {
-	tests := []struct {
-		name   string
-		input  []int
-		add    []int
-		result Set[int]
-	}{
-		{"add to empty set", []int{}, []int{1, 2, 3}, NewSet(1, 2, 3)},
-		{"add to non-empty set", []int{1}, []int{2, 3}, NewSet(1, 2, 3)},
-		{"add existing elements", []int{1, 2}, []int{2, 3}, NewSet(1, 2, 3)},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			s := NewSet(tt.input...)
-			s.Add(tt.add...)
-			assert.Equal(t, tt.result, s)
-		})
-	}
-}
-
-func TestRemove(t *testing.T) {
-	tests := []struct {
-		name   string
-		input  []int
-		remove int
-		result Set[int]
-	}{
-		{"remove from non-empty set", []int{1, 2, 3}, 2, NewSet(1, 3)},
-		{"remove non-existent element", []int{1, 2}, 3, NewSet(1, 2)},
-		{"remove from single-element set", []int{1}, 1, NewSet[int]()},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			s := NewSet(tt.input...)
-			s.Remove(tt.remove)
-			assert.Equal(t, tt.result, s)
-		})
-	}
-}
-
-func TestContains(t *testing.T) {
-	tests := []struct {
-		name     string
-		input    []int
-		contains int
-		result   bool
-	}{
-		{"element in set", []int{1, 2, 3}, 2, true},
-		{"element not in set", []int{1, 2}, 3, false},
-		{"empty set", []int{}, 1, false},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			s := NewSet(tt.input...)
-			assert.Equal(t, tt.result, s.Contains(tt.contains))
-		})
-	}
-}
-
-func TestToSlice(t *testing.T) {
-	tests := []struct {
-		name   string
-		input  []int
-		result []int
-	}{
-		{"non-empty set", []int{3, 1, 2}, []int{1, 2, 3}},
-		{"empty set", []int{}, []int{}},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			s := NewSet(tt.input...)
-			assert.Equal(t, tt.result, s.ToSlice())
-		})
-	}
-}
-
-func TestEquals(t *testing.T) {
-	tests := []struct {
-		name   string
-		set1   []int
-		set2   []int
-		result bool
-	}{
-		{"equal sets", []int{1, 2, 3}, []int{3, 2, 1}, true},
-		{"different sets", []int{1, 2}, []int{2, 3}, false},
-		{"empty sets", []int{}, []int{}, true},
-		{"one empty set", []int{1, 2}, []int{}, false},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			s1 := NewSet(tt.set1...)
-			s2 := NewSet(tt.set2...)
-			assert.Equal(t, tt.result, s1.Equals(s2))
-		})
-	}
-}
-
-func TestEmpty(t *testing.T) {
-	tests := []struct {
-		name   string
-		input  []int
-		result bool
-	}{
-		{"non-empty set", []int{1}, false},
-		{"empty set", []int{}, true},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			s := NewSet(tt.input...)
-			assert.Equal(t, tt.result, s.Empty())
-		})
-	}
-}
@@ -1,15 +1,12 @@
 // Code generated by go generate; DO NOT EDIT.
-// This file was generated by robots at 2024-05-23 08:47:23.204981 -0400 EDT m=+0.050881068
+// This file was generated by robots at 2024-02-09 10:57:33.980847 -0500 EST m=+0.165923154
 // using data from https://spdx.org/licenses/licenses.json
 package spdxlicense

-const Version = "3.24.0"
+const Version = "3.23"

 var licenseIDs = map[string]string{
 	"0bsd":                                  "0BSD",
-	"3.0.0dslicer1.0":                       "3D-Slicer-1.0",
-	"3.0dslicer1.0":                         "3D-Slicer-1.0",
-	"3dslicer1.0":                           "3D-Slicer-1.0",
 	"aal":                                   "AAL",
 	"abstyles":                              "Abstyles",
 	"adacoredoc":                            "AdaCore-doc",
@@ -59,14 +56,12 @@ var licenseIDs = map[string]string{
 	"agpl3only":                             "AGPL-3.0-only",
 	"agpl3orlater":                          "AGPL-3.0-or-later",
 	"aladdin":                               "Aladdin",
-	"amdnewlib":                             "AMD-newlib",
 	"amdplpa":                               "AMDPLPA",
 	"aml":                                   "AML",
 	"amlglslang":                            "AML-glslang",
 	"ampas":                                 "AMPAS",
 	"antlrpd":                               "ANTLR-PD",
 	"antlrpdfallback":                       "ANTLR-PD-fallback",
-	"anyosi":                                "any-OSI",
 	"apache1":                               "Apache-1.0",
 	"apache1.0":                             "Apache-1.0",
 	"apache1.0.0":                           "Apache-1.0",
@@ -141,21 +136,18 @@ var licenseIDs = map[string]string{
 	"bsd1clause":                            "BSD-1-Clause",
 	"bsd2.0.0clause":                        "BSD-2-Clause",
 	"bsd2.0.0clausedarwin":                  "BSD-2-Clause-Darwin",
-	"bsd2.0.0clausefirstlines":              "BSD-2-Clause-first-lines",
 	"bsd2.0.0clausefreebsd":                 "BSD-2-Clause-Views",
 	"bsd2.0.0clausenetbsd":                  "BSD-2-Clause",
 	"bsd2.0.0clausepatent":                  "BSD-2-Clause-Patent",
 	"bsd2.0.0clauseviews":                   "BSD-2-Clause-Views",
 	"bsd2.0clause":                          "BSD-2-Clause",
 	"bsd2.0clausedarwin":                    "BSD-2-Clause-Darwin",
-	"bsd2.0clausefirstlines":                "BSD-2-Clause-first-lines",
 	"bsd2.0clausefreebsd":                   "BSD-2-Clause-Views",
 	"bsd2.0clausenetbsd":                    "BSD-2-Clause",
 	"bsd2.0clausepatent":                    "BSD-2-Clause-Patent",
 	"bsd2.0clauseviews":                     "BSD-2-Clause-Views",
 	"bsd2clause":                            "BSD-2-Clause",
 	"bsd2clausedarwin":                      "BSD-2-Clause-Darwin",
-	"bsd2clausefirstlines":                  "BSD-2-Clause-first-lines",
 	"bsd2clausefreebsd":                     "BSD-2-Clause-Views",
 	"bsd2clausenetbsd":                      "BSD-2-Clause",
 	"bsd2clausepatent":                      "BSD-2-Clause-Patent",
@@ -245,7 +237,6 @@ var licenseIDs = map[string]string{
 	"cal1combinedworkexception":             "CAL-1.0-Combined-Work-Exception",
 	"caldera":                               "Caldera",
 	"calderanopreamble":                     "Caldera-no-preamble",
-	"catharon":                              "Catharon",
 	"catosl1":                               "CATOSL-1.1",
 	"catosl1.1":                             "CATOSL-1.1",
 	"catosl1.1.0":                           "CATOSL-1.1",
@@ -486,7 +477,6 @@ var licenseIDs = map[string]string{
 	"cuda1.0":                               "C-UDA-1.0",
 	"cuda1.0.0":                             "C-UDA-1.0",
 	"curl":                                  "curl",
-	"cvetou":                                "cve-tou",
 	"dec3.0.0clause":                        "DEC-3-Clause",
 	"dec3.0clause":                          "DEC-3-Clause",
 	"dec3clause":                            "DEC-3-Clause",
@@ -711,7 +701,6 @@ var licenseIDs = map[string]string{
 	"gsoap1.3b":                             "gSOAP-1.3b",
 	"gsoap1b":                               "gSOAP-1.3b",
 	"gtkbook":                               "gtkbook",
-	"gutmann":                               "Gutmann",
 	"haskellreport":                         "HaskellReport",
 	"hdparm":                                "hdparm",
 	"hippocratic2":                          "Hippocratic-2.1",
@@ -727,27 +716,19 @@ var licenseIDs = map[string]string{
 	"hpnddec":                               "HPND-DEC",
 	"hpnddoc":                               "HPND-doc",
 	"hpnddocsell":                           "HPND-doc-sell",
-	"hpndexport2.0.0us":                     "HPND-export2-US",
-	"hpndexport2.0us":                       "HPND-export2-US",
-	"hpndexport2us":                         "HPND-export2-US",
 	"hpndexportus":                          "HPND-export-US",
-	"hpndexportusacknowledgement":           "HPND-export-US-acknowledgement",
 	"hpndexportusmodify":                    "HPND-export-US-modify",
 	"hpndfenneberglivingston":               "HPND-Fenneberg-Livingston",
 	"hpndinriaimag":                         "HPND-INRIA-IMAG",
-	"hpndintel":                             "HPND-Intel",
 	"hpndkevlinhenney":                      "HPND-Kevlin-Henney",
 	"hpndmarkuskuhn":                        "HPND-Markus-Kuhn",
-	"hpndmerchantabilityvariant":            "HPND-merchantability-variant",
 	"hpndmitdisclaimer":                     "HPND-MIT-disclaimer",
 	"hpndpbmplus":                           "HPND-Pbmplus",
 	"hpndsellmitdisclaimerxserver":          "HPND-sell-MIT-disclaimer-xserver",
 	"hpndsellregexpr":                       "HPND-sell-regexpr",
 	"hpndsellvariant":                       "HPND-sell-variant",
 	"hpndsellvariantmitdisclaimer":          "HPND-sell-variant-MIT-disclaimer",
-	"hpndsellvariantmitdisclaimerrev":       "HPND-sell-variant-MIT-disclaimer-rev",
 	"hpnduc":                                "HPND-UC",
-	"hpnducexportus":                        "HPND-UC-export-US",
 	"htmltidy":                              "HTMLTIDY",
 	"ibmpibs":                               "IBM-pibs",
 	"icu":                                   "ICU",
@@ -905,7 +886,6 @@ var licenseIDs = map[string]string{
 	"mitenna":                               "MIT-enna",
 	"mitfeh":                                "MIT-feh",
 	"mitfestival":                           "MIT-Festival",
-	"mitkhronosold":                         "MIT-Khronos-old",
 	"mitmodernvariant":                      "MIT-Modern-Variant",
 	"mitnfa":                                "MITNFA",
 	"mitopengroup":                          "MIT-open-group",
@@ -952,11 +932,9 @@ var licenseIDs = map[string]string{
 	"nbpl1":                                 "NBPL-1.0",
 	"nbpl1.0":                               "NBPL-1.0",
 	"nbpl1.0.0":                             "NBPL-1.0",
-	"ncbipd":                                "NCBI-PD",
 	"ncgluk2":                               "NCGL-UK-2.0",
 	"ncgluk2.0":                             "NCGL-UK-2.0",
 	"ncgluk2.0.0":                           "NCGL-UK-2.0",
-	"ncl":                                   "NCL",
 	"ncsa":                                  "NCSA",
 	"netcdf":                                "NetCDF",
 	"netsnmp":                               "Net-SNMP",
@@ -990,7 +968,6 @@ var licenseIDs = map[string]string{
 	"ntp":                                   "NTP",
 	"ntp0":                                  "NTP-0",
 	"nunit":                                 "Nunit",
-	"oar":                                   "OAR",
 	"occtpl":                                "OCCT-PL",
 	"oclc2":                                 "OCLC-2.0",
 	"oclc2.0":                               "OCLC-2.0",
@@ -1121,7 +1098,6 @@ var licenseIDs = map[string]string{
 	"php3.01":                               "PHP-3.01",
 	"php3.01.0":                             "PHP-3.01",
 	"pixar":                                 "Pixar",
-	"pkgconf":                               "pkgconf",
 	"plexus":                                "Plexus",
 	"pnmstitch":                             "pnmstitch",
 	"polyformnoncommercial1":                "PolyForm-Noncommercial-1.0.0",
@@ -1131,7 +1107,6 @@ var licenseIDs = map[string]string{
 	"polyformsmallbusiness1.0":              "PolyForm-Small-Business-1.0.0",
 	"polyformsmallbusiness1.0.0":            "PolyForm-Small-Business-1.0.0",
 	"postgresql":                            "PostgreSQL",
-	"ppl":                                   "PPL",
 	"psf2":                                  "PSF-2.0",
 	"psf2.0":                                "PSF-2.0",
 	"psf2.0.0":                              "PSF-2.0",
@@ -1231,9 +1206,6 @@ var licenseIDs = map[string]string{
 	"sugarcrm1.1":                           "SugarCRM-1.1.3",
 	"sugarcrm1.1.3":                         "SugarCRM-1.1.3",
 	"sunppp":                                "Sun-PPP",
-	"sunppp2000":                            "Sun-PPP-2000",
-	"sunppp2000.0":                          "Sun-PPP-2000",
-	"sunppp2000.0.0":                        "Sun-PPP-2000",
 	"sunpro":                                "SunPro",
 	"swl":                                   "SWL",
 	"swrule":                                "swrule",
@@ -1247,7 +1219,6 @@ var licenseIDs = map[string]string{
 	"tgppl1":                                "TGPPL-1.0",
 	"tgppl1.0":                              "TGPPL-1.0",
 	"tgppl1.0.0":                            "TGPPL-1.0",
-	"threeparttable":                        "threeparttable",
 	"tmate":                                 "TMate",
 	"torque1":                               "TORQUE-1.1",
 	"torque1.1":                             "TORQUE-1.1",
@@ -1331,7 +1302,6 @@ var licenseIDs = map[string]string{
 	"xnet":                                  "Xnet",
 	"xpp":                                   "xpp",
 	"xskat":                                 "XSkat",
-	"xzoom":                                 "xzoom",
 	"ypl1":                                  "YPL-1.0",
 	"ypl1.0":                                "YPL-1.0",
 	"ypl1.0.0":                              "YPL-1.0",
@@ -33,9 +33,5 @@ func SplitAny(s string, seps string) []string {
 	splitter := func(r rune) bool {
 		return strings.ContainsRune(seps, r)
 	}
-	result := strings.FieldsFunc(s, splitter)
-	if len(result) == 0 {
-		return []string{s}
-	}
-	return result
+	return strings.FieldsFunc(s, splitter)
 }
@@ -123,7 +123,7 @@ func TestSplitAny(t *testing.T) {
 			name:   "empty",
 			input:  "",
 			fields: ",",
-			want:   []string{""},
+			want:   []string{},
 		},
 		{
 			name:   "multiple separators",
@@ -0,0 +1,61 @@
+package internal
+
+import "sort"
+
+// StringSet represents a set of string types.
+type StringSet map[string]struct{}
+
+// NewStringSet creates a new empty StringSet.
+func NewStringSet(start ...string) StringSet {
+	ret := make(StringSet)
+	for _, s := range start {
+		ret.Add(s)
+	}
+	return ret
+}
+
+// Add a string to the set.
+func (s StringSet) Add(i ...string) {
+	for _, str := range i {
+		s[str] = struct{}{}
+	}
+}
+
+// Remove a string from the set.
+func (s StringSet) Remove(i string) {
+	delete(s, i)
+}
+
+// Contains indicates if the given string is contained within the set.
+func (s StringSet) Contains(i string) bool {
+	_, ok := s[i]
+	return ok
+}
+
+// ToSlice returns a sorted slice of strings that are contained within the set.
+func (s StringSet) ToSlice() []string {
+	ret := make([]string, len(s))
+	idx := 0
+	for v := range s {
+		ret[idx] = v
+		idx++
+	}
+	sort.Strings(ret)
+	return ret
+}
+
+func (s StringSet) Equals(o StringSet) bool {
+	if len(s) != len(o) {
+		return false
+	}
+	for k := range s {
+		if !o.Contains(k) {
+			return false
+		}
+	}
+	return true
+}
+
+func (s StringSet) Empty() bool {
+	return len(s) < 1
+}
@@ -19,7 +19,6 @@ import (
 	"github.com/anchore/syft/syft/pkg/cataloger/java"
 	"github.com/anchore/syft/syft/pkg/cataloger/javascript"
 	"github.com/anchore/syft/syft/pkg/cataloger/kernel"
-	"github.com/anchore/syft/syft/pkg/cataloger/lua"
 	"github.com/anchore/syft/syft/pkg/cataloger/nix"
 	"github.com/anchore/syft/syft/pkg/cataloger/php"
 	"github.com/anchore/syft/syft/pkg/cataloger/python"
@@ -29,7 +28,6 @@ import (
 	"github.com/anchore/syft/syft/pkg/cataloger/rust"
 	sbomCataloger "github.com/anchore/syft/syft/pkg/cataloger/sbom"
 	"github.com/anchore/syft/syft/pkg/cataloger/swift"
-	"github.com/anchore/syft/syft/pkg/cataloger/swipl"
 	"github.com/anchore/syft/syft/pkg/cataloger/wordpress"
 )

@@ -94,7 +92,6 @@ func DefaultPackageTaskFactories() PackageTaskFactories {
 		newSimplePackageTaskFactory(rust.NewCargoLockCataloger, pkgcataloging.DeclaredTag, pkgcataloging.DirectoryTag, pkgcataloging.LanguageTag, "rust", "cargo"),
 		newSimplePackageTaskFactory(swift.NewCocoapodsCataloger, pkgcataloging.DeclaredTag, pkgcataloging.DirectoryTag, pkgcataloging.LanguageTag, "swift", "cocoapods"),
 		newSimplePackageTaskFactory(swift.NewSwiftPackageManagerCataloger, pkgcataloging.DeclaredTag, pkgcataloging.DirectoryTag, pkgcataloging.LanguageTag, "swift", "spm"),
-		newSimplePackageTaskFactory(swipl.NewSwiplPackCataloger, pkgcataloging.DeclaredTag, pkgcataloging.DirectoryTag, pkgcataloging.LanguageTag, "swipl", "pack"),

 		// language-specific package for both image and directory scans (but not necessarily declared) ////////////////////////////////////////
 		newSimplePackageTaskFactory(dotnet.NewDotnetPortableExecutableCataloger, pkgcataloging.DirectoryTag, pkgcataloging.InstalledTag, pkgcataloging.ImageTag, pkgcataloging.LanguageTag, "dotnet", "c#", "binary"),
@@ -113,7 +110,6 @@ func DefaultPackageTaskFactories() PackageTaskFactories {
 		),
 		newSimplePackageTaskFactory(java.NewNativeImageCataloger, pkgcataloging.DirectoryTag, pkgcataloging.InstalledTag, pkgcataloging.ImageTag, pkgcataloging.LanguageTag, "java"),
 		newSimplePackageTaskFactory(nix.NewStoreCataloger, pkgcataloging.DirectoryTag, pkgcataloging.InstalledTag, pkgcataloging.ImageTag, pkgcataloging.LanguageTag, "nix"),
-		newSimplePackageTaskFactory(lua.NewPackageCataloger, pkgcataloging.DirectoryTag, pkgcataloging.InstalledTag, pkgcataloging.ImageTag, pkgcataloging.LanguageTag, "lua"),

 		// other package catalogers ///////////////////////////////////////////////////////////////////////////
 		newPackageTaskFactory(
@@ -4,12 +4,10 @@ import (
 	"context"

 	"github.com/anchore/syft/internal/relationship"
-	"github.com/anchore/syft/internal/relationship/binary"
 	"github.com/anchore/syft/internal/sbomsync"
 	"github.com/anchore/syft/syft/artifact"
 	"github.com/anchore/syft/syft/cataloging"
 	"github.com/anchore/syft/syft/file"
-	"github.com/anchore/syft/syft/sbom"
 	"github.com/anchore/syft/syft/source"
 )

@@ -24,9 +22,8 @@ func (s sourceIdentifierAdapter) ID() artifact.ID {
 }

 func NewRelationshipsTask(cfg cataloging.RelationshipsConfig, src source.Description) Task {
-	fn := func(_ context.Context, resolver file.Resolver, builder sbomsync.Builder) error {
-		finalizeRelationships(
-			resolver,
+	fn := func(_ context.Context, _ file.Resolver, builder sbomsync.Builder) error {
+		relationship.Finalize(
 			builder,
 			cfg,
 			&sourceIdentifierAdapter{desc: src})
@@ -36,43 +33,3 @@ func NewRelationshipsTask(cfg cataloging.RelationshipsConfig, src source.Descrip

 	return NewTask("relationships-cataloger", fn)
 }
-
-func finalizeRelationships(resolver file.Resolver, builder sbomsync.Builder, cfg cataloging.RelationshipsConfig, src artifact.Identifiable) {
-	accessor := builder.(sbomsync.Accessor)
-
-	// remove ELF packages and Binary packages that are already
-	// represented by a source package (e.g. a package that is evident by some package manager)
-	builder.DeletePackages(binary.PackagesToRemove(resolver, accessor)...)
-
-	// add relationships showing packages that are evident by a file which is owned by another package (package-to-package)
-	if cfg.PackageFileOwnershipOverlap {
-		relationship.ByFileOwnershipOverlapWorker(accessor)
-	}
-
-	// conditionally remove binary packages based on file ownership overlap relationships found
-	// https://github.com/anchore/syft/issues/931
-	if cfg.ExcludeBinaryPackagesWithFileOwnershipOverlap {
-		relationship.ExcludeBinariesByFileOwnershipOverlap(accessor)
-	}
-
-	// add the new relationships for executables to the SBOM
-	newBinaryRelationships := binary.NewDependencyRelationships(resolver, accessor)
-	accessor.WriteToSBOM(func(s *sbom.SBOM) {
-		s.Relationships = append(s.Relationships, newBinaryRelationships...)
-	})
-	builder.AddRelationships(newBinaryRelationships...)
-	// add source "contains package" relationship (source-to-package)
-	var sourceRelationships []artifact.Relationship
-	accessor.ReadFromSBOM(func(s *sbom.SBOM) {
-		sourceRelationships = relationship.ToSource(src, s.Artifacts.Packages)
-	})
-	builder.AddRelationships(sourceRelationships...)
-
-	// add evident-by relationships (package-to-file)
-	var evidentByRelationships []artifact.Relationship
-	accessor.ReadFromSBOM(func(s *sbom.SBOM) {
-		evidentByRelationships = relationship.EvidentBy(s.Artifacts.Packages)
-	})
-
-	builder.AddRelationships(evidentByRelationships...)
-}
@@ -7,12 +7,3 @@ For this reason we've included a copy of all schemas needed to validate `syft` o
 to reference local copies of dependent schemas.

 You can get the latest schemas from the [CycloneDX specifications repo](https://github.com/CycloneDX/specification/tree/master/schema).
-
-When the spec version is bumped an approach to determining prior modifications is to compare the 
-prior spec version (e.g. if updating to 1.7, compare the files in this directory against the 1.6 
-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 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).   
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`../../../../../../syft/pkg/cataloger/binary/test-fixtures/elf-test-fixtures`
				`@@ -1 +0,0 @@`
				`../../../../syft/pkg/cataloger/binary/test-fixtures/elf-test-fixtures`