feat: detect name/version from directory scans

Signed-off-by: Keith Zantow <kzantow@gmail.com>

.binny.yaml

@@ -2,7 +2,7 @@ tools:
   # we want to use a pinned version of binny to manage the toolchain (so binny manages itself!)
   - name: binny
     version:
-      want: v0.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.5.1
+      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.64.5
+      want: v1.59.0
     method: github-release
     with:
       repo: golangci/golangci-lint
@@ -34,7 +34,7 @@ tools:
   # used for showing the changelog at release
   - name: glow
     version:
-      want: v2.0.0
+      want: v1.5.1
     method: github-release
     with:
       repo: charmbracelet/glow
@@ -42,7 +42,7 @@ tools:
   # used for signing the checksums file at release
   - name: cosign
     version:
-      want: v2.4.3
+      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.7.0
+      want: v1.26.2
     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.41.0
+      want: v3.37.2
     method: github-release
     with:
       repo: go-task/task
@@ -111,23 +111,7 @@ tools:
   # used for triggering a release
   - name: gh
     version:
-      want: v2.67.0
+      want: v2.49.2
     method: github-release
     with:
       repo: cli/cli
-
-  # used to upload test fixture cache
-  - name: oras
-    version:
-      want: v1.2.2
-    method: github-release
-    with:
-      repo: oras-project/oras
-
-  # used to upload test fixture cache
-  - name: yq
-    version:
-      want: v4.45.1
-    method: github-release
-    with:
-      repo: mikefarah/yq

.bouncer.yaml

@@ -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

.github/ISSUE_TEMPLATE/config.yml

@@ -1,6 +1,6 @@
 contact_links:
 
-  - name: Join our Discourse community 💬
-    # link to our community Discourse site
-    url: https://anchore.com/discourse
+  - name: Join the Slack community 💬
+    # link to our community Slack registration page
+    url: https://anchore.com/slack
     about: 'Come chat with us! Ask for help, join our software development efforts, or just give us feedback!'

.github/actions/bootstrap/action.yaml

@@ -5,7 +5,7 @@ inputs:
   go-version:
     description: "Go version to install"
     required: true
-    default: "1.24.x"
+    default: "1.21.x"
   go-dependencies:
     description: "Download go dependencies"
     required: true
@@ -13,38 +13,34 @@ inputs:
   cache-key-prefix:
     description: "Prefix all cache keys with this value"
     required: true
-    default: "181053ac82"
-  download-test-fixture-cache:
-    description: "Download test fixture cache from OCI and github actions"
+    default: "1ac8281053"
+  compute-fingerprints:
+    description: "Compute test fixture fingerprints"
     required: true
-    default: "false"
-  tools:
-    description: "whether to install tools"
     default: "true"
   bootstrap-apt-packages:
     description: "Space delimited list of tools to install via apt"
     default: "libxml2-utils"
 
+
 runs:
   using: "composite"
   steps:
     # note: go mod and build is automatically cached on default with v4+
-    - uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
+    - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 #v5.0.1
       if: inputs.go-version != ''
       with:
         go-version: ${{ inputs.go-version }}
 
     - name: Restore tool cache
-      if: inputs.tools == 'true'
       id: tool-cache
-      uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
+      uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 #v3.3.2
       with:
         path: ${{ github.workspace }}/.tool
         key: ${{ inputs.cache-key-prefix }}-${{ runner.os }}-tool-${{ hashFiles('.binny.yaml') }}
 
     - name: Install project tools
       shell: bash
-      if: inputs.tools == 'true'
       run: make tools
 
     - name: Install go dependencies
@@ -58,14 +54,8 @@ runs:
       run: |
         DEBIAN_FRONTEND=noninteractive sudo apt update && sudo -E apt install -y ${{ inputs.bootstrap-apt-packages }}
 
-    - name: Restore ORAS cache from github actions
-      if: inputs.download-test-fixture-cache == 'true'
-      uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
-      with:
-        path: ${{ github.workspace }}/.tmp/oras-cache
-        key: ${{ inputs.cache-key-prefix }}-oras-cache
-
-    - name: Download test fixture cache
-      if: inputs.download-test-fixture-cache == 'true'
+    - name: Create all cache fingerprints
+      if: inputs.compute-fingerprints == 'true'
       shell: bash
-      run: make download-test-fixture-cache
+      run: make fingerprints
+

.github/dependabot.yml

@@ -17,11 +17,3 @@ updates:
     open-pull-requests-limit: 10
     labels:
       - "dependencies"
-
-  - package-ecosystem: "github-actions"
-    directory: "/.github/actions/bootstrap"
-    schedule:
-      interval: "daily"
-    open-pull-requests-limit: 10
-    labels:
-      - "dependencies"

.github/pull_request_template.md

@@ -1,25 +0,0 @@
-# Description
-
-Please include a summary of the changes along with any relevant motivation and context,
-or link to an issue where this is explained.
-
-<!-- If this completes an issue, please include: -->
-
-- Fixes
-
-## Type of change
-
-<!-- Delete any that are not relevant -->
-
-- [ ] Bug fix (non-breaking change which fixes an issue)
-- [ ] New feature (non-breaking change which adds functionality)
-- [ ] Breaking change (please discuss with the team first; Syft is 1.0 software and we won't accept breaking changes without going to 2.0)
-- [ ] Documentation (updates the documentation)
-- [ ] Chore (improve the developer experience, fix a test flake, etc, without changing the visible behavior of Syft)
-- [ ] Performance (make Syft run faster or use less memory, without changing visible behavior much)
-
-# Checklist:
-
-- [ ] I have added unit tests that cover changed behavior
-- [ ] I have tested my code in common scenarios and confirmed there are no regressions
-- [ ] I have added comments to my code, particularly in hard-to-understand sections

.github/scripts/find_cache_paths.py

@@ -1,135 +0,0 @@
-#!/usr/bin/env python3
-from __future__ import annotations
-
-import os
-import glob
-import sys
-import json
-import hashlib
-
-
-IGNORED_PREFIXES = []
-
-
-def find_fingerprints_and_check_dirs(base_dir):
-    all_fingerprints = set(glob.glob(os.path.join(base_dir, '**', 'test*', '**', '*.fingerprint'), recursive=True))
-
-    all_fingerprints = {os.path.relpath(fp) for fp in all_fingerprints
-                        if not any(fp.startswith(prefix) for prefix in IGNORED_PREFIXES)}
-
-    if not all_fingerprints:
-        show("No .fingerprint files or cache directories found.")
-        exit(1)
-
-    missing_content = []
-    valid_paths = set()
-    fingerprint_contents = []
-
-    for fingerprint in all_fingerprints:
-        path = fingerprint.replace('.fingerprint', '')
-
-        if not os.path.exists(path):
-            missing_content.append(path)
-            continue
-
-        if not os.path.isdir(path):
-            valid_paths.add(path)
-            continue
-
-        if os.listdir(path):
-            valid_paths.add(path)
-        else:
-            missing_content.append(path)
-
-        with open(fingerprint, 'r') as f:
-            content = f.read().strip()
-            fingerprint_contents.append((fingerprint, content))
-
-    return sorted(valid_paths), missing_content, fingerprint_contents
-
-
-def parse_fingerprint_contents(fingerprint_content):
-    input_map = {}
-    for line in fingerprint_content.splitlines():
-        digest, path = line.split()
-        input_map[path] = digest
-    return input_map
-
-
-def calculate_sha256(fingerprint_contents):
-    sorted_fingerprint_contents = sorted(fingerprint_contents, key=lambda x: x[0])
-
-    concatenated_contents = ''.join(content for _, content in sorted_fingerprint_contents)
-
-    sha256_hash = hashlib.sha256(concatenated_contents.encode()).hexdigest()
-
-    return sha256_hash
-
-
-def calculate_file_sha256(file_path):
-    sha256_hash = hashlib.sha256()
-    with open(file_path, 'rb') as f:
-        for byte_block in iter(lambda: f.read(4096), b""):
-            sha256_hash.update(byte_block)
-    return sha256_hash.hexdigest()
-
-
-def show(*s: str):
-    print(*s, file=sys.stderr)
-
-
-def main(file_path: str | None):
-    base_dir = '.'
-    valid_paths, missing_content, fingerprint_contents = find_fingerprints_and_check_dirs(base_dir)
-
-    if missing_content:
-        show("The following paths are missing or have no content, but have corresponding .fingerprint files:")
-        for path in sorted(missing_content):
-            show(f"- {path}")
-        show("Please ensure these paths exist and have content if they are directories.")
-        exit(1)
-
-    sha256_hash = calculate_sha256(fingerprint_contents)
-
-    paths_with_digests = []
-    for path in sorted(valid_paths):
-        fingerprint_file = f"{path}.fingerprint"
-        try:
-            if os.path.exists(fingerprint_file):
-                file_digest = calculate_file_sha256(fingerprint_file)
-
-                # Parse the fingerprint file to get the digest/path tuples
-                with open(fingerprint_file, 'r') as f:
-                    fingerprint_content = f.read().strip()
-                    input_map = parse_fingerprint_contents(fingerprint_content)
-
-                paths_with_digests.append({
-                    "path": path,
-                    "digest": file_digest,
-                    "input": input_map
-                })
-
-        except Exception as e:
-            show(f"Error processing {fingerprint_file}: {e}")
-            raise e
-
-
-    output = {
-        "digest": sha256_hash,
-        "paths": paths_with_digests
-    }
-
-    content = json.dumps(output, indent=2, sort_keys=True)
-
-    if file_path:
-        with open(file_path, 'w') as f:
-            f.write(content)
-
-    print(content)
-
-
-if __name__ == "__main__":
-    file_path = None
-    if len(sys.argv) > 1:
-        file_path = sys.argv[1]
-    main(file_path)

.github/scripts/fingerprint_docker_fixtures.py

@@ -1,70 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-import subprocess
-import hashlib
-
-BOLD = '\033[1m'
-YELLOW = '\033[0;33m'
-RESET = '\033[0m'
-
-
-def print_message(message):
-    print(f"{YELLOW}{message}{RESET}")
-
-
-def sha256sum(filepath):
-    h = hashlib.sha256()
-    with open(filepath, 'rb') as f:
-        for chunk in iter(lambda: f.read(4096), b""):
-            h.update(chunk)
-    return h.hexdigest()
-
-
-def is_git_tracked_or_untracked(directory):
-    """Returns a sorted list of files in the directory that are tracked or not ignored by Git."""
-    result = subprocess.run(
-        ["git", "ls-files", "--cached", "--others", "--exclude-standard"],
-        cwd=directory,
-        stdout=subprocess.PIPE,
-        text=True
-    )
-    return sorted(result.stdout.strip().splitlines())
-
-
-def find_test_fixture_dirs_with_images(base_dir):
-    """Find directories that contain 'test-fixtures' and at least one 'image-*' directory."""
-    for root, dirs, files in os.walk(base_dir):
-        if 'test-fixtures' in root:
-            image_dirs = [d for d in dirs if d.startswith('image-')]
-            if image_dirs:
-                yield os.path.realpath(root)
-
-
-def generate_fingerprints():
-    print_message("creating fingerprint files for docker fixtures...")
-
-    for test_fixture_dir in find_test_fixture_dirs_with_images('.'):
-        cache_fingerprint_path = os.path.join(test_fixture_dir, 'cache.fingerprint')
-
-        with open(cache_fingerprint_path, 'w') as fingerprint_file:
-            for image_dir in find_image_dirs(test_fixture_dir):
-                for file in is_git_tracked_or_untracked(image_dir):
-                    file_path = os.path.join(image_dir, file)
-                    checksum = sha256sum(file_path)
-                    path_from_fixture_dir = os.path.relpath(file_path, test_fixture_dir)
-                    fingerprint_file.write(f"{checksum}  {path_from_fixture_dir}\n")
-
-
-def find_image_dirs(test_fixture_dir):
-    """Find all 'image-*' directories inside a given test-fixture directory."""
-    result = []
-    for root, dirs, files in os.walk(test_fixture_dir):
-        for dir_name in dirs:
-            if dir_name.startswith('image-'):
-                result.append(os.path.join(root, dir_name))
-    return sorted(result)
-
-
-if __name__ == "__main__":
-    generate_fingerprints()

.github/scripts/labeler.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-
 from __future__ import annotations
 
 import sys

.github/scripts/labeler_test.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-
 import unittest
 from unittest.mock import patch
 import subprocess

.github/scripts/trigger-release.sh

@@ -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)

.github/workflows/benchmark-testing.yaml

@@ -11,19 +11,19 @@ jobs:
 
   Benchmark-Test:
     name: "Benchmark tests"
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-20.04
     # note: we want benchmarks to run on pull_request events in order to publish results to a sticky comment, and
     # we also want to run on push such that merges to main are recorded to the cache. For this reason we don't filter
     # the job by event.
     steps:
       - name: Checkout code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
 
       - name: Bootstrap environment
         uses: ./.github/actions/bootstrap
 
       - name: Restore base benchmark result
-        uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f #v4.2.1
+        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 #v4.0.2
         with:
           path: test/results/benchmark-main.txt
           # use base sha for PR or new commit hash for main push in benchmark result key
@@ -39,13 +39,13 @@ jobs:
           OUTPUT="${OUTPUT//$'\r'/'%0D'}" # URL encode all '\r' characters
           echo "result=$OUTPUT" >> $GITHUB_OUTPUT
 
-      - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+      - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
         with:
           name: benchmark-test-results
           path: test/results/**/*
 
       - name: Update PR benchmark results comment
-        uses: marocchino/sticky-pull-request-comment@52423e01640425a022ef5fd42c6fb5f633a02728 #v2.9.1
+        uses: marocchino/sticky-pull-request-comment@331f8f5b4215f0445d3c07b4967662a32a2d3e31 #v2.9.0
         continue-on-error: true
         with:
           header: benchmark

.github/workflows/codeql-analysis.yml

@@ -36,16 +36,16 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
+      uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 #v4.1.6
 
     - name: Install Go
-      uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 #v5.3.0
+      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@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 #v3.28.9
+      uses: github/codeql-action/init@9fdb3e49720b44c48891d036bb502feb25684276 #v3.25.6
       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@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 #v3.28.9
+      uses: github/codeql-action/autobuild@9fdb3e49720b44c48891d036bb502feb25684276 #v3.25.6
 
     # ℹ️ 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@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 #v3.28.9
+      uses: github/codeql-action/analyze@9fdb3e49720b44c48891d036bb502feb25684276 #v3.25.6

.github/workflows/detect-schema-changes.yaml

@@ -30,7 +30,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
 
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 #v4.1.6
 
       - run: python .github/scripts/labeler.py
         env:
@@ -40,7 +40,7 @@ jobs:
 
       - name: Delete existing comment
         if: ${{ hashFiles( env.CI_COMMENT_FILE ) == '' }}
-        uses: marocchino/sticky-pull-request-comment@52423e01640425a022ef5fd42c6fb5f633a02728 #v2.9.1
+        uses: marocchino/sticky-pull-request-comment@331f8f5b4215f0445d3c07b4967662a32a2d3e31 #v2.9.0
         with:
           header: ${{ env.COMMENT_HEADER }}
           hide: true
@@ -48,7 +48,7 @@ jobs:
 
       - name: Add comment
         if: ${{ hashFiles( env.CI_COMMENT_FILE ) != '' }}
-        uses: marocchino/sticky-pull-request-comment@52423e01640425a022ef5fd42c6fb5f633a02728 #v2.9.1
+        uses: marocchino/sticky-pull-request-comment@331f8f5b4215f0445d3c07b4967662a32a2d3e31 #v2.9.0
         with:
           header: ${{ env.COMMENT_HEADER }}
           path: ${{ env.CI_COMMENT_FILE }}

.github/workflows/release-version-file.yaml

@@ -1,4 +1,4 @@
-name: "Release: version file"
+name: "Release"
 
 on:
 
@@ -18,9 +18,9 @@ on:
 jobs:
 
   release:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 #v4.1.6
 
       - name: Update version file
         run: make ci-release-version-file

.github/workflows/release.yaml

@@ -13,17 +13,9 @@ on:
 jobs:
   quality-gate:
     environment: release
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
-
-      - 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@a5ac7e51b41094c92402da3b24376905380afc29 #v4.1.6
 
       - name: Check if tag already exists
         # note: this will fail if the tag already exists
@@ -98,14 +90,14 @@ jobs:
 
   release:
     needs: [quality-gate]
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-20.04
     permissions:
       contents: write
       packages: write
       # required for goreleaser signs section with cosign
       id-token: write
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 #v4.1.6
         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@0d4c9c5ea7693da7b068278f7b52bda2a190a446  #v3.2.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@0d4c9c5ea7693da7b068278f7b52bda2a190a446  #v3.2.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -148,10 +140,9 @@ jobs:
           # for updating brew formula in anchore/homebrew-syft
           GITHUB_BREW_TOKEN: ${{ secrets.ANCHOREOPS_GITHUB_OSS_WRITE_TOKEN }}
 
-      - uses: anchore/sbom-action@f325610c9f50a54015d37c8d16cb3b0e2c8f4de0 #v0.18.0
+      - uses: anchore/sbom-action@e8d2a6937ecead383dfe75190d104edd1f9c5751 #v0.16.0
         continue-on-error: true
         with:
-          file: go.mod
           artifact-name: sbom.spdx.json
 
       - uses: 8398a7/action-slack@28ba43ae48961b90635b50953d216767a6bea486 #v3.16.2

.github/workflows/remove-awaiting-response-label.yaml

@@ -1,11 +0,0 @@
-name: "Manage Awaiting Response Label"
-
-on:
-  issue_comment:
-    types: [created]
-
-jobs:
-  run:
-    uses: "anchore/workflows/.github/workflows/remove-awaiting-response-label.yaml@main"
-    secrets:
-      token: ${{ secrets.OSS_PROJECT_GH_TOKEN }}

.github/workflows/test-fixture-cache-publish.yaml

@@ -1,39 +0,0 @@
-name: "Test fixture cache: publish"
-
-on:
-  workflow_dispatch:
-  schedule:
-    # run nightly at 4AM UTC
-    - cron: "0 4 * * *"
-
-permissions:
-  contents: read
-
-jobs:
-
-  Publish:
-    name: "Publish test fixture image cache"
-    # we use this runner to get enough storage space for docker images and fixture cache
-    runs-on: ubuntu-22.04-4core-16gb
-    permissions:
-      packages: write
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
-
-      - name: Bootstrap environment
-        uses: ./.github/actions/bootstrap
-        with:
-          # we want to rebuild the cache with no previous state
-          download-test-fixture-cache: false
-
-      - name: Run all tests
-        run: make test
-        env:
-          # we want to rebuild the cache with no previous state
-          DOWNLOAD_TEST_FIXTURE_CACHE: "false"
-
-      - name: Login to GitHub Container Registry (ORAS)
-        run: echo "${{ secrets.GITHUB_TOKEN }}" | .tool/oras login ghcr.io -u ${{ github.actor }} --password-stdin
-
-      - name: Publish test fixture cache
-        run: make upload-test-fixture-cache

.github/workflows/update-anchore-dependencies.yml

@@ -1,49 +0,0 @@
-name: PR to update Anchore dependencies
-on:
-  workflow_dispatch:
-    inputs:
-      repos:
-        description: "List of dependencies to update"
-        required: true
-        type: string
-
-permissions:
-  contents: read
-
-jobs:
-  update:
-    runs-on: ubuntu-latest
-    if: github.repository_owner == 'anchore' # only run for main repo (not forks)
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
-
-      - name: Bootstrap environment
-        uses: ./.github/actions/bootstrap
-        with:
-          tools: false
-          bootstrap-apt-packages: ""
-
-      - name: Update dependencies
-        id: update
-        uses: anchore/workflows/.github/actions/update-go-dependencies@main
-        with:
-          repos: ${{ github.event.inputs.repos }}
-
-      - uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a #v2.1.0
-        id: generate-token
-        with:
-          app_id: ${{ secrets.TOKEN_APP_ID }}
-          private_key: ${{ secrets.TOKEN_APP_PRIVATE_KEY }}
-
-      - uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f #v7.0.6
-        with:
-          signoff: true
-          delete-branch: true
-          draft: ${{ steps.update.outputs.draft }}
-          # do not change this branch, as other workflows depend on it
-          branch: auto/integration
-          labels: dependencies,pre-release
-          commit-message: "chore(deps): update anchore dependencies"
-          title: "chore(deps): update anchore dependencies"
-          body: ${{ steps.update.outputs.summary }}
-          token: ${{ steps.generate-token.outputs.token }}

.github/workflows/update-bootstrap-tools.yml

@@ -13,12 +13,13 @@ jobs:
     runs-on: ubuntu-latest
     if: github.repository == 'anchore/syft' # only run for main repo
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 #v4.1.6
 
       - name: Bootstrap environment
         uses: ./.github/actions/bootstrap
         with:
           bootstrap-apt-packages: ""
+          compute-fingerprints: "false"
           go-dependencies: false
 
       - name: "Update tool versions"
@@ -49,7 +50,7 @@ jobs:
           app_id: ${{ secrets.TOKEN_APP_ID }}
           private_key: ${{ secrets.TOKEN_APP_PRIVATE_KEY }}
 
-      - uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f #v7.0.6
+      - uses: peter-evans/create-pull-request@6d6857d36972b65feb161a90e484f2984215f83e #v6.0.5
         with:
           signoff: true
           delete-branch: true

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

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.repository == 'anchore/syft' # only run for main repo
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 #v4.1.6
 
       - 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@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f #v7.0.6
+      - uses: peter-evans/create-pull-request@6d6857d36972b65feb161a90e484f2984215f83e #v6.0.5
         with:
           signoff: true
           delete-branch: true

.github/workflows/update-stereoscope-release.yml

@@ -0,0 +1,57 @@
+name: PR for latest Stereoscope release
+on:
+  schedule:
+    - cron: "0 8 * * *" # 3 AM EST
+
+  workflow_dispatch:
+
+env:
+  GO_VERSION: "1.21.x"
+  GO_STABLE_VERSION: true
+
+permissions:
+  contents: read
+
+jobs:
+  upgrade-stereoscope:
+    runs-on: ubuntu-latest
+    if: github.repository == 'anchore/syft' # only run for main repo
+    steps:
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 #v4.1.6
+
+      - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 #v5.0.1
+        with:
+          go-version: ${{ env.GO_VERSION }}
+          stable: ${{ env.GO_STABLE_VERSION }}
+
+      - name: Bootstrap environment
+        uses: ./.github/actions/bootstrap
+
+      - run: |
+          LATEST_VERSION=$(git ls-remote https://github.com/anchore/stereoscope main | head -n1 | awk '{print $1;}')
+
+          # update go.mod
+          go get github.com/anchore/stereoscope@$LATEST_VERSION
+          go mod tidy
+
+          # export the version for use with create-pull-request
+          echo "LATEST_VERSION=$LATEST_VERSION" >> $GITHUB_OUTPUT
+        id: latest-version
+
+      - uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a #v2.1.0
+        id: generate-token
+        with:
+          app_id: ${{ secrets.TOKEN_APP_ID }}
+          private_key: ${{ secrets.TOKEN_APP_PRIVATE_KEY }}
+
+      - uses: peter-evans/create-pull-request@6d6857d36972b65feb161a90e484f2984215f83e #v6.0.5
+        with:
+          signoff: true
+          delete-branch: true
+          branch: auto/latest-stereoscope
+          labels: dependencies
+          commit-message: "chore(deps): update stereoscope to ${{ steps.latest-version.outputs.LATEST_VERSION }}"
+          title: "chore(deps): update stereoscope to ${{ steps.latest-version.outputs.LATEST_VERSION }}"
+          body: |
+            Update Stereoscope to ${{ steps.latest-version.outputs.LATEST_VERSION }}
+          token: ${{ steps.generate-token.outputs.token }}

.github/workflows/validations.yaml

@@ -15,9 +15,9 @@ jobs:
   Static-Analysis:
     # Note: changing this job name requires making the same update in the .github/workflows/release.yaml pipeline
     name: "Static analysis"
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 #v4.1.6
 
       - name: Bootstrap environment
         uses: ./.github/actions/bootstrap
@@ -29,14 +29,54 @@ jobs:
   Unit-Test:
     # Note: changing this job name requires making the same update in the .github/workflows/release.yaml pipeline
     name: "Unit tests"
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 #v4.1.6
 
       - name: Bootstrap environment
         uses: ./.github/actions/bootstrap
+
+      - name: Restore file executable test-fixture cache
+        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 #v4.0.2
         with:
-          download-test-fixture-cache: true
+          path: syft/file/cataloger/executable/test-fixtures/elf/bin
+          key: ${{ runner.os }}-unit-file-executable-elf-cache-${{ hashFiles( 'syft/file/cataloger/executable/test-fixtures/elf/cache.fingerprint' ) }}
+
+      - name: Restore file executable shared-info test-fixture cache
+        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 #v4.0.2
+        with:
+          path: syft/file/cataloger/executable/test-fixtures/shared-info/bin
+          key: ${{ runner.os }}-unit-file-executable-shared-info-cache-${{ hashFiles( 'syft/file/cataloger/executable/test-fixtures/shared-info/cache.fingerprint' ) }}
+
+      - name: Restore Java test-fixture cache
+        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 #v4.0.2
+        with:
+          path: syft/pkg/cataloger/java/test-fixtures/java-builds/packages
+          key: ${{ runner.os }}-unit-java-cache-${{ hashFiles( 'syft/pkg/cataloger/java/test-fixtures/java-builds/cache.fingerprint' ) }}
+
+      - name: Restore RPM test-fixture cache
+        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 #v4.0.2
+        with:
+          path: syft/pkg/cataloger/redhat/test-fixtures/rpms
+          key: ${{ runner.os }}-unit-rpm-cache-${{ hashFiles( 'syft/pkg/cataloger/redhat/test-fixtures/rpms.fingerprint' ) }}
+
+      - name: Restore go binary test-fixture cache
+        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 #v4.0.2
+        with:
+          path: syft/pkg/cataloger/golang/test-fixtures/archs/binaries
+          key: ${{ runner.os }}-unit-go-binaries-cache-${{ hashFiles( 'syft/pkg/cataloger/golang/test-fixtures/archs/binaries.fingerprint' ) }}
+
+      - name: Restore binary cataloger test-fixture cache
+        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 #v4.0.2
+        with:
+          path: syft/pkg/cataloger/binary/test-fixtures/classifiers/bin
+          key: ${{ runner.os }}-unit-binary-cataloger-cache-${{ hashFiles( 'syft/pkg/cataloger/binary/test-fixtures/cache.fingerprint' ) }}
+
+      - name: Restore Kernel test-fixture cache
+        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 #v4.0.2
+        with:
+          path: syft/pkg/cataloger/kernel/test-fixtures/cache
+          key: ${{ runner.os }}-unit-kernel-cache-${{ hashFiles( 'syft/pkg/cataloger/kernel/test-fixtures/cache.fingerprint' ) }}
 
       - name: Run unit tests
         run: make unit
@@ -45,27 +85,31 @@ jobs:
   Integration-Test:
     # Note: changing this job name requires making the same update in the .github/workflows/release.yaml pipeline
     name: "Integration tests"
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 #v4.1.6
 
       - name: Bootstrap environment
         uses: ./.github/actions/bootstrap
-        with:
-          download-test-fixture-cache: true
 
       - name: Validate syft output against the CycloneDX schema
         run: make validate-cyclonedx-schema
 
+      - name: Restore integration test cache
+        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 #v4.0.2
+        with:
+          path: ${{ github.workspace }}/cmd/syft/internal/test/integration/test-fixtures/cache
+          key: ${{ runner.os }}-integration-test-cache-${{ hashFiles('/cmd/syft/internal/test/integration/test-fixtures/cache.fingerprint') }}
+
       - name: Run integration tests
         run: make integration
 
 
   Build-Snapshot-Artifacts:
     name: "Build snapshot artifacts"
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 #v4.1.6
 
       - name: Bootstrap environment
         uses: ./.github/actions/bootstrap
@@ -78,7 +122,7 @@ jobs:
       # why not use actions/upload-artifact? It is very slow (3 minutes to upload ~600MB of data, vs 10 seconds with this approach).
       # see https://github.com/actions/upload-artifact/issues/199 for more info
       - name: Upload snapshot artifacts
-        uses: actions/cache/save@0c907a75c2c80ebcb7f088228285e798b750cf8f #v4.2.1
+        uses: actions/cache/save@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 #v4.0.2
         with:
           # we need to preserve the snapshot data itself as well as the task data that confirms if the
           # snapshot build is stale or not. Otherwise the downstream jobs will attempt to rebuild the snapshot
@@ -93,18 +137,16 @@ jobs:
     # Note: changing this job name requires making the same update in the .github/workflows/release.yaml pipeline
     name: "Acceptance tests (Linux)"
     needs: [Build-Snapshot-Artifacts]
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 #v4.1.6
 
       - name: Bootstrap environment
         uses: ./.github/actions/bootstrap
-        with:
-          download-test-fixture-cache: true
 
       - name: Download snapshot build
         id: snapshot-cache
-        uses: actions/cache/restore@0c907a75c2c80ebcb7f088228285e798b750cf8f #v4.2.1
+        uses: actions/cache/restore@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 #v4.0.2
         with:
           path: |
             snapshot
@@ -120,6 +162,13 @@ jobs:
       - name: Run comparison tests (Linux)
         run: make compare-linux
 
+      - name: Restore install.sh test image cache
+        id: install-test-image-cache
+        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 #v4.0.2
+        with:
+          path: ${{ github.workspace }}/test/install/cache
+          key: ${{ runner.os }}-install-test-image-cache-${{ hashFiles('test/install/cache.fingerprint') }}
+
       - name: Load test image cache
         if: steps.install-test-image-cache.outputs.cache-hit == 'true'
         run: make install-test-cache-load
@@ -138,21 +187,18 @@ jobs:
     needs: [Build-Snapshot-Artifacts]
     runs-on: macos-latest
     steps:
-      - name: Install Cosign
-        uses: sigstore/cosign-installer@v3.8.0
-
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 #v4.1.6
 
       - name: Bootstrap environment
         uses: ./.github/actions/bootstrap
         with:
           bootstrap-apt-packages: ""
+          compute-fingerprints: "false"
           go-dependencies: false
-          download-test-fixture-cache: true
 
       - name: Download snapshot build
         id: snapshot-cache
-        uses: actions/cache/restore@0c907a75c2c80ebcb7f088228285e798b750cf8f #v4.2.1
+        uses: actions/cache/restore@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 #v4.0.2
         with:
           path: |
             snapshot
@@ -165,6 +211,13 @@ jobs:
         if: steps.snapshot-cache.outputs.cache-hit != 'true'
         run: echo "unable to download snapshots from previous job" && false
 
+      - name: Restore docker image cache for compare testing
+        id: mac-compare-testing-cache
+        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 #v4.0.2
+        with:
+          path: image.tar
+          key: ${{ runner.os }}-${{ hashFiles('test/compare/mac.sh') }}
+
       - name: Run comparison tests (Mac)
         run: make compare-mac
 
@@ -176,18 +229,22 @@ jobs:
     # Note: changing this job name requires making the same update in the .github/workflows/release.yaml pipeline
     name: "CLI tests (Linux)"
     needs: [Build-Snapshot-Artifacts]
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 #v4.1.6
 
       - name: Bootstrap environment
         uses: ./.github/actions/bootstrap
+
+      - name: Restore CLI test-fixture cache
+        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 #v4.0.2
         with:
-          download-test-fixture-cache: true
+          path: ${{ github.workspace }}/test/cli/test-fixtures/cache
+          key: ${{ runner.os }}-cli-test-cache-${{ hashFiles('test/cli/test-fixtures/cache.fingerprint') }}
 
       - name: Download snapshot build
         id: snapshot-cache
-        uses: actions/cache/restore@0c907a75c2c80ebcb7f088228285e798b750cf8f #v4.2.1
+        uses: actions/cache/restore@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 #v4.0.2
         with:
           path: |
             snapshot
@@ -202,22 +259,3 @@ jobs:
 
       - name: Run CLI Tests (Linux)
         run: make cli
-
-
-  Cleanup-Cache:
-    name: "Cleanup snapshot cache"
-    if: github.event.pull_request.head.repo.full_name == github.repository
-    runs-on: ubuntu-24.04
-    permissions:
-      actions: write
-    needs:
-      - Acceptance-Linux
-      - Acceptance-Mac
-      - Cli-Linux
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
-
-      - name: Delete snapshot cache
-        run: gh cache delete "snapshot-build-${{ github.run_id }}"
-        env:
-          GH_TOKEN: ${{ github.token }}

.golangci.yaml

@@ -1,6 +1,5 @@
 issues:
   max-same-issues: 25
-  uniq-by-line: false
 
   # TODO: enable this when we have coverage on docstring comments
 #  # The list of ids of default excludes to include or disable.
@@ -13,10 +12,10 @@ linters:
   enable:
     - asciicheck
     - bodyclose
-    - copyloopvar
     - dogsled
     - dupl
     - errcheck
+    - exportloopref
     - funlen
     - gocognit
     - goconst
@@ -31,7 +30,6 @@ linters:
     - ineffassign
     - misspell
     - nakedret
-    - nolintlint
     - revive
     - staticcheck
     - stylecheck
@@ -58,9 +56,8 @@ linters-settings:
     settings:
       ruleguard:
         rules: "test/rules/rules.go"
-  gosec:
-    excludes:
-      - G115
+output:
+  uniq-by-line: false
 run:
   timeout: 10m
   tests: false
@@ -83,6 +80,7 @@ run:
 #    - lll         # without a way to specify per-line exception cases, this is not usable
 #    - maligned    # this is an excellent linter, but tricky to optimize and we are not sensitive to memory layout optimizations
 #    - nestif
+#    - nolintlint   # as of go1.19 this conflicts with the behavior of gofmt, which is a deal-breaker (lint-fix will still fail when running lint)
 #    - prealloc     # following this rule isn't consistently a good idea, as it sometimes forces unnecessary allocations that result in less idiomatic code
 #    - rowserrcheck # not in a repo with sql, so this is not useful
 #    - scopelint    # deprecated

.goreleaser.yaml

@@ -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}}"

CODE_OF_CONDUCT.md

@@ -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.

CONTRIBUTORS.md

@@ -8,8 +8,4 @@ A cataloger contributed by Oracle Corporation that extracts packages given withi
 
 ## Swift Package Manager
 
-A cataloger contributed by Axis Communications that catalogs packages resolved by Swift Package Manager.
-
-## Bitnami Packages
-
-A cataloger contributed by Bitnami developer that catalogs packages described in Bitnami SBOMs.
+A cataloger contributed by Axis Communications that catalogs packages resolved by Swift Package Manager.

DEVELOPING.md

@@ -83,7 +83,7 @@ Syft's core library is implemented in the `syft` package and subpackages, where
 - the `syft` package contains a single function that can take a `source.Source` object and catalog it, producing an `sbom.SBOM` object
 - the `syft/format` package contains the ability to encode and decode SBOMs to and from different SBOM formats (such as SPDX and CycloneDX)
 
-The `cmd` package at the highest level execution flow wires up [`spf13/cobra`](https://github.com/spf13/cobra) commands for execution in the main application:
+The `cmd` pacakge at the highest level execution flow wires up [`spf13/cobra`](https://github.com/spf13/cobra) commands for execution in the main application:
 ```mermaid
 sequenceDiagram
     participant main as cmd/syft/main
@@ -212,7 +212,7 @@ Finally, here is an example of where the package construction is done within the
 - [The APK package constructor itself](https://github.com/anchore/syft/tree/v0.70.0/syft/pkg/cataloger/apkdb/package.go#L12-L27)
 
 Interested in building a new cataloger? Checkout the [list of issues with the `new-cataloger` label](https://github.com/anchore/syft/issues?q=is%3Aopen+is%3Aissue+label%3Anew-cataloger+no%3Aassignee)!
-If you have questions about implementing a cataloger feel free to file an issue or reach out to us [on discourse](https://anchore.com/discourse)!
+If you have questions about implementing a cataloger feel free to file an issue or reach out to us [on slack](https://anchore.com/slack)!
 
 
 #### Searching for files
@@ -367,11 +367,11 @@ package under test and should always be updated by invoking `go test` on the spe
 update flag provided.
 
 Many of the `Format` tests make use of this approach, where the raw SBOM report is saved in the repo and the test 
-compares that SBOM with what is generated from the latest presenter code. The following command can be used to
-update the golden files for the various snapshot tests:
+compares that SBOM with what is generated from the latest presenter code. For instance, at the time of this writing 
+the CycloneDX presenter snapshots can be updated by running:
 
 ```bash
-make update-format-golden-files
+go test ./internal/formats -update-cyclonedx
 ```
 
 These flags are defined at the top of the test files that have tests that use the snapshot files.

Makefile

@@ -25,8 +25,8 @@ ci-bootstrap-go:
 
 # this is a bootstrapping catch-all, where if the target doesn't exist, we'll ensure the tools are installed and then try again
 %:
-	@make --silent $(TASK)
-	@$(TASK) $@
+	make $(TASK)
+	$(TASK) $@
 
 ## Shim targets #################################
 

README.md

@@ -11,9 +11,8 @@
  &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/discourse" target="_blank"><img alt="Join our Discourse" src="https://img.shields.io/badge/Discourse-Join-blue?logo=discourse"/></a>&nbsp;
- &nbsp;<a rel="me" href="https://fosstodon.org/@syft"><img alt="Follow on Mastodon" src="https://img.shields.io/badge/Mastodon-Follow-blue?logoColor=white&logo=mastodon"/></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>
 
 ![syft-demo](https://user-images.githubusercontent.com/590471/90277200-2a253000-de33-11ea-893f-32c219eea11a.gif)
@@ -41,10 +40,11 @@ Syft binaries are provided for Linux, macOS and Windows.
 > 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)
+... or, you can specify a release version and destination directory for the installation:
+
+> ```bash
+> curl -sSfL https://raw.githubusercontent.com/anchore/syft/main/install.sh | sh -s -- -b <DESTINATION_DIR> <RELEASE_VERSION>
+> ```
 
 ### Homebrew
 ```bash
@@ -67,7 +67,7 @@ choco install syft -y
 
 ### Nix
 
-**Note**: Nix packaging of Syft is [community maintained](https://github.com/NixOS/nixpkgs/blob/master/pkgs/by-name/sy/syft/package.nix). Syft is available in the [stable channel](https://wiki.nixos.org/wiki/Nix_channels#The_official_channels) since NixOS `22.05`.
+**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
@@ -106,10 +106,8 @@ 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/).
+- `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).
@@ -118,12 +116,9 @@ Where the `formats` available are:
 - `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)
-- Bitnami packages
 - C (conan)
 - C++ (conan)
 - Dart (pubs)
@@ -147,7 +142,6 @@ Note that flags using the @<version> can be used for earlier versions of each sp
 - Rust (cargo.lock)
 - Swift (cocoapods, swift-package-manager)
 - Wordpress plugins
-- Terraform providers (.terraform.lock.hcl)
 
 ## Documentation
 
@@ -171,17 +165,9 @@ Our [wiki](https://github.com/anchore/syft/wiki) contains further details on the
   * [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)
 
-## Contributing
-
-Check out our [contributing](/CONTRIBUTING.md) guide and [developer](/DEVELOPING.md) docs.
-
 ## Syft Team Meetings
 
 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!
-
-## Syft Logo
-
-<p xmlns:cc="http://creativecommons.org/ns#" xmlns:dct="http://purl.org/dc/terms/"><a property="dct:title" rel="cc:attributionURL" href="https://anchore.com/wp-content/uploads/2024/11/syft-logo.svg">Syft Logo</a> by <a rel="cc:attributionURL dct:creator" property="cc:attributionName" href="https://anchore.com/">Anchore</a> is licensed under <a href="https://creativecommons.org/licenses/by/4.0/" target="_blank" rel="license noopener noreferrer" style="display:inline-block;">CC BY 4.0<img style="height:22px!important;margin-left:3px;vertical-align:text-bottom;" src="https://mirrors.creativecommons.org/presskit/icons/cc.svg" alt=""><img style="height:22px!important;margin-left:3px;vertical-align:text-bottom;" src="https://mirrors.creativecommons.org/presskit/icons/by.svg" alt=""></a></p>

RELEASE.md

@@ -1,16 +1,5 @@
 # Release
 
-A release of syft comprises:
-- a new semver git tag from the current tip of the main branch
-- a new [github release](https://github.com/anchore/syft/releases) with a changelog and archived binary assets
-- docker images published to `ghcr.io` and `dockerhub`, including multi architecture images + manifest
-- [`anchore/homebrew-syft`](https://github.com/anchore/homebrew-syft) tap updated to point to assets in the latest github release
-
-Ideally releasing should be done often with small increments when possible. Unless a
-breaking change is blocking the release, or no fixes/features have been merged, a good
-target release cadence is between every 1 or 2 weeks.
-
-
 ## Creating a release
 
 This release process itself should be as automated as possible, and has only a few steps:
@@ -20,10 +9,16 @@ This release process itself should be as automated as possible, and has only a f
   you can abort and adjust the labels on the PRs and issues to be included in the release and
   re-run the release trigger command.
 
-1. A release admin must approve the release on the GitHub Actions [release pipeline](https://github.com/anchore/syft/actions/workflows/release.yaml) run page.
+1. A release admin must approve the release on the GitHub Actions release pipeline run page.
    Once approved, the release pipeline will generate all assets and publish a GitHub Release.
 
-   
+1. If there is a release Milestone, close it.
+
+Ideally releasing should be done often with small increments when possible. Unless a
+breaking change is blocking the release, or no fixes/features have been merged, a good
+target release cadence is between every 1 or 2 weeks.
+
+
 ## Retracting a release
 
 If a release is found to be problematic, it can be retracted with the following steps:
@@ -37,3 +32,81 @@ If a release is found to be problematic, it can be retracted with the following
 in the go proxy, which will cause confusion when trying to reuse the tag later (the H1 hash will not match and there
 will be a warning when users try to pull the new release).
 
+
+## Background
+
+A good release process has the following qualities:
+
+1. There is a way to plan what should be in a release
+1. There is a way to see what is actually in a release
+1. Allow for different kinds of releases (major breaking vs backwards compatible enhancements vs patch updates)
+1. Specify a repeatable way to build and publish software artifacts
+
+
+### Planning a release
+
+To indicate a set of features to be released together add each issue to an in-repository
+Milestone named with major-minor version to be released (e.g. `v0.1`). It is OK for other
+features to be in the release that were not originally planned, and these issues and PRs
+do not need to be added to the Milestone in question. Only the set of features that, when
+completed, would allow the release to be considered complete. A Milestone is only used to:
+
+- Plan what is desired to be in a release
+- Track progress to indicate when we may be ready to cut a new release
+
+Not all releases need to be planned. For instance, patch releases for fixes should be
+released when they are ready and when releasing would not interfere with another current
+release (where some partial or breaking features have already been merged).
+
+Unless necessary, feature releases should be small and frequent, which may obviate the
+need for regular release planning under a Milestone.
+
+
+### What is in a release
+
+Milestones are specifically for planning a release, not necessarily tracking all changes
+that a release may bring (and more importantly, not all releases are necessarily planned
+either).
+
+This is one of the (many) reasons for a Changelog. A good Changelog lists changes grouped
+by the type of change (new, enhancement, deprecation, breaking, bug fix, security fix), in
+chronological order (within groups), linking the PR where the change was made in the
+Changelog line. Furthermore, there should be a place to see all released versions, the
+release date for each release, the semantic version of the release, and the set of changes
+for each release.
+
+**This project auto-generates the Changelog contents for each current release and posts the
+generated contents to the GitHub Release page**. Leveraging the GitHub Releases feature
+allows GitHub to manage the Changelog on each release outside of the git source tree while
+still being hosted with the released assets.
+
+The Changelog is generated from the metadata from in-repository issues and PRs, using
+labels to guide what kind of change each item is (e.g. breaking, new feature, bug fix,
+etx). Only issues/PRs with select labels are included in the Changelog, and only if the
+issue/PR was created after the last release. Additional labels are used to exclude items
+from the Changelog.
+
+The above suggestions imply that we should:
+
+- Ensure there is a sufficient title for each PR and issue title to be included in the
+  Changelog
+- The appropriate label is applied to PRs and/or issues to drive specific change type
+  sections (deprecated, breaking, security, bug, etc)
+
+**With this approach as we cultivate good organization of PRs and issues we automatically
+get an equally good Changelog.**
+
+
+### Major, minor, and patch releases
+
+The latest version of the tool is the only supported version, which implies that multiple
+parallel release branches will not be a regular process (if ever). Multiple releases can
+be planned in parallel, however, only one can be actively developed at a time. That is, if
+PRs attached to a release Milestone have been merged into the main branch, that release is
+now the "next" release. **This implies that the source of truth for release lies with the
+git log and Changelog, not with the release Milestones** (which are purely for planning and
+tracking).
+
+Semantic versioning should be used to indicate breaking changes, new features, and fixes.
+The exception to this is `< 1.0`, where the major version is not bumped for breaking changes,
+instead the minor version indicates both new features and breaking changes.

Taskfile.yaml

@@ -4,19 +4,9 @@ vars:
   OWNER: anchore
   PROJECT: syft
 
-  CACHE_IMAGE: ghcr.io/{{ .OWNER }}/{{ .PROJECT }}/test-fixture-cache:latest
-
   # static file dirs
   TOOL_DIR: .tool
   TMP_DIR: .tmp
-  ORAS_CACHE: "{{ .TMP_DIR }}/oras-cache"
-  CACHE_PATHS_FILE: "{{ .TMP_DIR }}/cache_paths.json"
-  LAST_CACHE_PULL_FILE: "{{ .TMP_DIR }}/last_cache_paths.json"
-
-  # TOOLS
-  ORAS: "{{ .TOOL_DIR }}/oras"
-  YQ: "{{ .TOOL_DIR }}/yq"
-  TASK: "{{ .TOOL_DIR }}/task"
 
   # used for changelog generation
   CHANGELOG: CHANGELOG.md
@@ -27,7 +17,7 @@ vars:
     sh: uname -s | tr '[:upper:]' '[:lower:]'
   ARCH:
     sh: |
-      [ "$(uname -m)" = "x86_64" ] && echo "amd64_v1" || { [ "$(uname -m)" = "aarch64" ] && echo "arm64_v8.0" || echo $(uname -m); }
+      [ "$(uname -m)" = "x86_64" ] && echo "amd64_v1" || echo $(uname -m)
   PROJECT_ROOT:
     sh: echo $PWD
   # note: the snapshot dir must be a relative path starting with ./
@@ -43,9 +33,6 @@ vars:
   COMPARE_DIR: ./test/compare
   COMPARE_TEST_IMAGE: centos:8.2.2004
 
-env:
-  GNUMAKEFLAGS: '--no-print-directory'
-
 tasks:
 
   ## High-level tasks #################################
@@ -78,7 +65,6 @@ tasks:
       - task: benchmark
       - task: test-utils
       - task: cli
-      - task: check-docker-cache
 
   ## Bootstrap tasks #################################
 
@@ -191,14 +177,6 @@ tasks:
 
 
   ## Testing tasks #################################
-  update-format-golden-files:
-    desc: "Update golden (i.e. snapshot) files used by unit tests"
-    cmds:
-      - go test ./syft/format/spdxjson -update-spdx-json
-      - go test ./syft/format/spdxtagvalue -update-spdx-tv
-      - go test ./syft/format/cyclonedxxml -update-cyclonedx-xml
-      - go test ./syft/format/cyclonedxjson -update-cyclonedx-json
-      - go test ./syft/format/syftjson -update-json
 
   unit:
     desc: Run unit tests
@@ -234,10 +212,15 @@ tasks:
     # that the cache being restored with the correct binary will be rebuilt since the timestamps
     # and local checksums will not line up.
     deps: [tools, snapshot]
+    sources:
+      - "{{ .SNAPSHOT_BIN }}"
+      - ./test/cli/**
+      - ./**/*.go
     cmds:
       - cmd: "echo 'testing binary: {{ .SNAPSHOT_BIN }}'"
         silent: true
-      - cmd: "test -f {{ .SNAPSHOT_BIN }} || (find {{ .SNAPSHOT_DIR }} && echo '\nno snapshot found for {{ .SNAPSHOT_BIN }}' && false)"
+
+      - cmd: "test -f {{ .SNAPSHOT_BIN }} || (find {{ .SNAPSHOT_DIR }} && echo '\nno snapshot found' && false)"
         silent: true
 
       - "go test -count=1 -timeout=15m -v ./test/cli"
@@ -246,14 +229,18 @@ tasks:
 
   test-utils:
     desc: Run tests for pipeline utils
+    sources:
+      - .github/scripts/labeler*.py
     cmds:
-      - cmd: .github/scripts/labeler_test.py
+      - cmd: python .github/scripts/labeler_test.py
 
 
   ## Benchmark test targets #################################
 
   benchmark:
     deps: [tmpdir]
+    sources:
+      - ./**/*.go
     generates:
       - "{{ .TMP_DIR }}/benchmark-main.txt"
     cmds:
@@ -266,6 +253,8 @@ tasks:
 
   show-benchstat:
     deps: [benchmark, tmpdir]
+    sources:
+      - "{{ .TMP_DIR }}/benchstat.txt"
     cmds:
       - cmd: "cat {{ .TMP_DIR }}/benchstat.txt"
         silent: true
@@ -274,188 +263,56 @@ tasks:
   ## Test-fixture-related targets #################################
 
   fingerprints:
-    desc: Generate fingerprints for all non-docker test fixture
-    silent: true
-    # this will look for `test-fixtures/Makefile` and invoke the `fingerprint` target to calculate all cache input fingerprint files
+    desc: Generate test fixture fingerprints
     generates:
-      - '**/test-fixtures/**/*.fingerprint'
+      - cmd/syft/internal/test/integration/test-fixtures/cache.fingerprint
+      - syft/file/cataloger/executable/test-fixtures/elf/cache.fingerprint
+      - syft/file/cataloger/executable/test-fixtures/shared-info/cache.fingerprint
+      - syft/pkg/cataloger/binary/test-fixtures/cache.fingerprint
+      - syft/pkg/cataloger/java/test-fixtures/java-builds/cache.fingerprint
+      - syft/pkg/cataloger/golang/test-fixtures/archs/binaries.fingerprint
+      - syft/pkg/cataloger/redhat/test-fixtures/rpms.fingerprint
+      - syft/pkg/cataloger/kernel/test-fixtures/cache.fingerprint
       - test/install/cache.fingerprint
+      - test/cli/test-fixtures/cache.fingerprint
     cmds:
-      - |
-        BOLD='\033[1m'
-        YELLOW='\033[0;33m'
-        RESET='\033[0m'
+      # for EXECUTABLE unit test fixtures
+      - "cd syft/file/cataloger/executable/test-fixtures/elf && make cache.fingerprint"
+      - "cd syft/file/cataloger/executable/test-fixtures/shared-info && make cache.fingerprint"
+      # for IMAGE integration test fixtures
+      - "cd cmd/syft/internal/test/integration/test-fixtures && make cache.fingerprint"
+      # for BINARY unit test fixtures
+      - "cd syft/pkg/cataloger/binary/test-fixtures && make cache.fingerprint"
+      # for JAVA BUILD unit test fixtures
+      - "cd syft/pkg/cataloger/java/test-fixtures/java-builds && make cache.fingerprint"
+      # for GO BINARY unit test fixtures
+      - "cd syft/pkg/cataloger/golang/test-fixtures/archs && make binaries.fingerprint"
+      # for RPM unit test fixtures
+      - "cd syft/pkg/cataloger/redhat/test-fixtures && make rpms.fingerprint"
+      # for Kernel unit test fixtures
+      - "cd syft/pkg/cataloger/kernel/test-fixtures && make cache.fingerprint"
+      # for INSTALL test fixtures
+      - "cd test/install && make cache.fingerprint"
+      # for CLI test fixtures
+      - "cd test/cli/test-fixtures && make cache.fingerprint"
 
-        echo -e "${YELLOW}creating fingerprint files for non-docker fixtures...${RESET}"        
-        for dir in $(find . -type d -name 'test-fixtures'); do
-          if [ -f "$dir/Makefile" ]; then
-            # for debugging...
-            #echo -e "${YELLOW}• calculating fingerprints in $dir... ${RESET}"
-            
-            (make -C "$dir" fingerprint)
-          fi
-        done
-
-        # for debugging...
-        # echo -e "generated all fixture fingerprints"
-
-      - .github/scripts/fingerprint_docker_fixtures.py
-      - |
-        # if DOWNLOAD_TEST_FIXTURE_CACHE is set to 'false', then we don't need to calculate the fingerprint for the cache
-        if [ "$DOWNLOAD_TEST_FIXTURE_CACHE" = "false" ]; then
-          exit 0
-        fi
-        .github/scripts/find_cache_paths.py {{ .CACHE_PATHS_FILE }} > /dev/null
-
-
-  refresh-fixtures:
-    desc: Clear and fetch all test fixture cache
-    aliases:
-      - fixtures
-    silent: true
-    deps:
-      - tools
+  fixtures:
+    desc: Generate test fixtures
     cmds:
-      - |
-        BOLD='\033[1m'
-        PURPLE='\033[0;35m'
-        RESET='\033[0m'
-        
-        # if DOWNLOAD_TEST_FIXTURE_CACHE is set to 'false', then skip the cache download and always build
-        if [ "$DOWNLOAD_TEST_FIXTURE_CACHE" = "false" ]; then
-            echo -e "${BOLD}${PURPLE}skipping cache download, rebuilding cache...${RESET}"
-            {{ .TASK }} build-fixtures
-            exit 0
-        fi
-        
-        LATEST_FINGERPRINT=$(docker manifest inspect {{ .CACHE_IMAGE }} | {{ .YQ }} -r '.annotations.fingerprint')
-
-        echo "latest cache:      $LATEST_FINGERPRINT"
-        
-        if [ -f {{ .LAST_CACHE_PULL_FILE }} ]; then
-          LAST_PULL_FINGERPRINT=$(cat {{ .LAST_CACHE_PULL_FILE }} | {{ .YQ }} -r '.digest')
-        else
-          echo -e "${BOLD}${PURPLE}empty cache, downloading cache...${RESET}"
-          {{ .TASK }} download-test-fixture-cache
-          exit 0
-        fi
-        
-        {{ .TASK }} fingerprints
-
-        WANT_FINGERPRINT=$(cat {{ .CACHE_PATHS_FILE }} | {{ .YQ }} -r '.digest')        
-
-        echo "desired cache:     $WANT_FINGERPRINT"
-        echo "last pulled cache: $LAST_PULL_FINGERPRINT"
-  
-        # if we already have the latest cache, skip the refresh
-        if [ "$LAST_PULL_FINGERPRINT" = "$WANT_FINGERPRINT" ]; then
-            echo -e "${BOLD}${PURPLE}already have the latest cache (skipping cache download)${RESET}"
-            exit 0
-        fi
-  
-        # at this point we only refresh the cache if we want the same cache that is currently available.
-        # we don't by default refresh the cache if the cache if it is simply different from what we have,
-        # because we may be working on a code change that doesn't require a cache refresh (but could trigger one,
-        # which would be annoying to deal with in a development workflow).
-  
-        if [ "$LATEST_FINGERPRINT" = "$WANT_FINGERPRINT" ]; then
-          echo -e "${BOLD}${PURPLE}found newer cache! downloading cache...${RESET}"
-          {{ .TASK }} download-test-fixture-cache
-        else
-          echo -e "${BOLD}${PURPLE}found different cache, but isn't clear if it's newer (skipping cache download and manually building)${RESET}"
-        
-          {{ .YQ }} eval '.paths[] | "\(.digest) \(.path)"' {{ .LAST_CACHE_PULL_FILE }} > .tmp/last_cache_lines
-          {{ .YQ }} eval '.paths[] | "\(.digest) \(.path)"' {{ .CACHE_PATHS_FILE }} > .tmp/cache_lines
-          diff .tmp/last_cache_lines .tmp/cache_lines || true
-        
-          echo -e "${BOLD}${PURPLE}diff with more context...${RESET}"
-        
-          diff -U10000 {{ .LAST_CACHE_PULL_FILE }} {{ .CACHE_PATHS_FILE }} || true
-        
-          echo -e "${BOLD}${PURPLE}detected changes to input material, manually building fixtures...${RESET}"
-        
-          {{ .TASK }} build-fixtures
-        fi
-
-  build-fixtures:
-    desc: Generate all non-docker test fixtures
-    silent: true
-    # this will look for `test-fixtures/Makefile` and invoke the `fixtures` target to generate any and all test fixtures
-    cmds:
-      - |
-        BOLD='\033[1m'
-        YELLOW='\033[0;33m'
-        RESET='\033[0m'
-        
-        # Use a for loop with command substitution to avoid subshell issues
-        for dir in $(find . -type d -name 'test-fixtures'); do
-          if [ -f "$dir/Makefile" ]; then
-            echo -e "${YELLOW}${BOLD}generating fixtures in $dir${RESET}"
-            (make -C "$dir" fixtures)
-          fi
-        done
-        echo -e "${BOLD}generated all fixtures${RESET}"
-
-  download-test-fixture-cache:
-    desc: Download test fixture cache from ghcr.io
-    deps: [tools, clean-cache]
-    vars:
-      CACHE_DIGEST:
-        sh: docker manifest inspect {{ .CACHE_IMAGE }} | {{ .YQ }} -r '.annotations.fingerprint'
-    cmds:
-      - silent: true
-        cmd: |
-          # if oras cache is > 4 GB, delete it
-          if [ -d {{ .ORAS_CACHE }} ]; then
-            total_size=$(du -c {{ .ORAS_CACHE }} | grep total | awk '{print $1}')
-            if [ "$total_size" -gt 4194304 ]; then
-              echo 'deleting oras cache'
-              rm -rf {{ .ORAS_CACHE }}
-            fi
-          fi
-      - "ORAS_CACHE={{ .ORAS_CACHE }} {{ .ORAS }} pull {{ .CACHE_IMAGE }}"
-      - "cp {{ .CACHE_PATHS_FILE }} {{ .LAST_CACHE_PULL_FILE }}"
-
-  upload-test-fixture-cache:
-    desc: Upload the test fixture cache to ghcr.io
-    deps: [tools, fingerprints]
-    silent: true
-    cmd: |
-      set -eu
-      oras_command="{{ .ORAS }} push {{ .CACHE_IMAGE }}"
-
-      paths=$(cat {{ .CACHE_PATHS_FILE }} | {{ .YQ }} -r '.paths[].path')      
-      for path in $paths; do
-        oras_command+=" $path"
-      done
-      oras_command+=" {{ .CACHE_PATHS_FILE }}"
-      
-      oras_command+=" --annotation org.opencontainers.image.source=https://github.com/{{ .OWNER }}/{{ .PROJECT }}"
-      oras_command+=" --annotation fingerprint=$(cat {{ .CACHE_PATHS_FILE }} | {{ .YQ }} -r '.digest')"
-    
-      echo "Executing: $oras_command"
-      eval $oras_command
+      - "cd syft/file/cataloger/executable/test-fixtures/elf && make"
+      - "cd syft/file/cataloger/executable/test-fixtures/shared-info && make"
+      - "cd syft/pkg/cataloger/java/test-fixtures/java-builds && make"
+      - "cd syft/pkg/cataloger/redhat/test-fixtures && make"
+      - "cd syft/pkg/cataloger/binary/test-fixtures && make"
 
   show-test-image-cache:
     silent: true
     cmds:
-      - "echo 'Docker daemon cache:'"
+      - "echo '\nDocker daemon cache:'"
       - "docker images --format '{{`{{.ID}}`}} {{`{{.Repository}}`}}:{{`{{.Tag}}`}}' | grep stereoscope-fixture- | sort"
       - "echo '\nTar cache:'"
-      - 'find . -type f -wholename "**/test-fixtures/cache/stereoscope-fixture-*.tar" | sort'
+      - 'find . -type f -wholename "**/test-fixtures/snapshot/*" | sort'
 
-  check-docker-cache:
-    desc: Ensure docker caches aren't using too much disk space
-    silent: true
-    cmd: |
-      total_size=$(find . | grep cache | grep tar | xargs du -c | grep total | awk '{print $1}')
-      find . | grep cache | grep tar | xargs du
-      echo "total $total_size KB"
-
-      if [ "$total_size" -gt 1048576 ]; then
-        echo 'docker cache is larger than 1GB'
-        exit 1
-      fi
 
   ## install.sh testing targets #################################
 
@@ -632,31 +489,8 @@ tasks:
       - "rm -rf {{ .SNAPSHOT_DIR }}"
       - "rm -rf {{ .TMP_DIR }}/goreleaser.yaml"
 
-  clean-docker-cache:
-    desc: Remove all docker cache tars and images from the daemon
-    cmds:
-      - find . -type d -wholename "**/test-fixtures/cache" | xargs rm -rf
-      - docker images --format '{{`{{.ID}}`}} {{`{{.Repository}}`}}' | grep stereoscope-fixture- | awk '{print $1}' | uniq | xargs -r docker rmi --force
-
-  clean-oras-cache:
-    desc: Remove all cache for oras commands
-    cmd: rm -rf {{ .ORAS_CACHE }}
-
   clean-cache:
-    desc: Remove all image docker tar cache, images from the docker daemon, and ephemeral test fixtures
+    desc: Remove all docker cache and local image tar cache
     cmds:
-      - task: clean-docker-cache
-      - |
-        BOLD='\033[1m'
-        YELLOW='\033[0;33m'
-        RESET='\033[0m'
-        
-        # Use a for loop with command substitution to avoid subshell issues
-        for dir in $(find . -type d -name 'test-fixtures'); do
-        if [ -f "$dir/Makefile" ]; then
-          echo -e "${YELLOW}${BOLD}deleting ephemeral test fixtures in $dir${RESET}"
-          (make -C "$dir" clean)
-        fi
-        done
-        echo -e "${BOLD}Deleted all ephemeral test fixtures${RESET}"
-      - rm -f {{ .LAST_CACHE_PULL_FILE }} {{ .CACHE_PATHS_FILE }}
+      - 'find . -type f -wholename "**/test-fixtures/cache/stereoscope-fixture-*.tar" -delete'
+      - "docker images --format '{{`{{.ID}}`}} {{`{{.Repository}}`}}' | grep stereoscope-fixture- | awk '{print $$1}' | uniq | xargs -r docker rmi --force"

cmd/syft/cli/ui/handle_attestation.go

@@ -61,7 +61,7 @@ type backgroundLineReader struct {
 func (m *Handler) handleAttestationStarted(e partybus.Event) []tea.Model {
 	reader, prog, taskInfo, err := syftEventParsers.ParseAttestationStartedEvent(e)
 	if err != nil {
-		log.WithFields("error", err).Debug("unable to parse event")
+		log.WithFields("error", err).Warn("unable to parse event")
 		return nil
 	}
 

cmd/syft/cli/ui/handle_cataloger_task.go

@@ -89,7 +89,7 @@ func (cts catalogerTaskModel) View() string {
 func (m *Handler) handleCatalogerTaskStarted(e partybus.Event) ([]tea.Model, tea.Cmd) {
 	mon, info, err := syftEventParsers.ParseCatalogerTaskStarted(e)
 	if err != nil {
-		log.WithFields("error", err).Debug("unable to parse event")
+		log.WithFields("error", err).Warn("unable to parse event")
 		return nil, nil
 	}
 

cmd/syft/cli/ui/handle_fetch_image.go

@@ -12,7 +12,7 @@ import (
 func (m *Handler) handleFetchImage(e partybus.Event) []tea.Model {
 	imgName, prog, err := stereoEventParsers.ParseFetchImage(e)
 	if err != nil {
-		log.WithFields("error", err).Debug("unable to parse event")
+		log.WithFields("error", err).Warn("unable to parse event")
 		return nil
 	}
 

cmd/syft/cli/ui/handle_file_indexing.go

@@ -12,7 +12,7 @@ import (
 func (m *Handler) handleFileIndexingStarted(e partybus.Event) []tea.Model {
 	path, prog, err := syftEventParsers.ParseFileIndexingStarted(e)
 	if err != nil {
-		log.WithFields("error", err).Debug("unable to parse event")
+		log.WithFields("error", err).Warn("unable to parse event")
 		return nil
 	}
 

cmd/syft/cli/ui/handle_pull_containerd_image.go

@@ -43,7 +43,7 @@ type containerdPullStatusFormatter struct {
 func (m *Handler) handlePullContainerdImage(e partybus.Event) []tea.Model {
 	_, pullStatus, err := stereoscopeParsers.ParsePullContainerdImage(e)
 	if err != nil {
-		log.WithFields("error", err).Debug("unable to parse event")
+		log.WithFields("error", err).Warn("unable to parse event")
 		return nil
 	}
 

cmd/syft/cli/ui/handle_pull_docker_image.go

@@ -44,7 +44,7 @@ type dockerPullStatusFormatter struct {
 func (m *Handler) handlePullDockerImage(e partybus.Event) []tea.Model {
 	_, pullStatus, err := stereoscopeParsers.ParsePullDockerImage(e)
 	if err != nil {
-		log.WithFields("error", err).Debug("unable to parse event")
+		log.WithFields("error", err).Warn("unable to parse event")
 		return nil
 	}
 

cmd/syft/cli/ui/handle_read_image.go

@@ -12,7 +12,7 @@ import (
 func (m *Handler) handleReadImage(e partybus.Event) []tea.Model {
 	imgMetadata, prog, err := stereoEventParsers.ParseReadImage(e)
 	if err != nil {
-		log.WithFields("error", err).Debug("unable to parse event")
+		log.WithFields("error", err).Warn("unable to parse event")
 		return nil
 	}
 

cmd/syft/internal/clio_setup_config.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/anchore/clio"
 	"github.com/anchore/stereoscope"
-	handler "github.com/anchore/syft/cmd/syft/cli/ui"
+	ui2 "github.com/anchore/syft/cmd/syft/cli/ui"
 	"github.com/anchore/syft/cmd/syft/internal/ui"
 	"github.com/anchore/syft/internal/bus"
 	"github.com/anchore/syft/internal/log"
@@ -20,18 +20,18 @@ func AppClioSetupConfig(id clio.Identification, out io.Writer) *clio.SetupConfig
 		WithConfigInRootHelp().   // --help on the root command renders the full application config in the help text
 		WithUIConstructor(
 			// select a UI based on the logging configuration and state of stdin (if stdin is a tty)
-			func(cfg clio.Config) (*clio.UICollection, error) {
+			func(cfg clio.Config) ([]clio.UI, error) {
 				noUI := ui.None(out, cfg.Log.Quiet)
 				if !cfg.Log.AllowUI(os.Stdin) || cfg.Log.Quiet {
-					return clio.NewUICollection(noUI), nil
+					return []clio.UI{noUI}, nil
 				}
 
-				return clio.NewUICollection(
+				return []clio.UI{
 					ui.New(out, cfg.Log.Quiet,
-						handler.New(handler.DefaultHandlerConfig()),
+						ui2.New(ui2.DefaultHandlerConfig()),
 					),
 					noUI,
-				), nil
+				}, nil
 			},
 		).
 		WithInitializers(

cmd/syft/internal/commands/attest.go

@@ -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(),
 	}
 }
 
@@ -93,13 +91,14 @@ func defaultAttestOutputOptions() options.Output {
 			string(spdxtagvalue.ID),
 		},
 		Outputs: []string{syftjson.ID.String()},
-		OutputFile: options.OutputFile{ //nolint:staticcheck
+		OutputFile: options.OutputFile{ // nolint:staticcheck
 			Enabled: false, // explicitly not allowed
 		},
 		Format: options.DefaultFormat(),
 	}
 }
 
+//nolint:funlen
 func runAttest(ctx context.Context, id clio.Identification, opts *attestOptions, userInput string) error {
 	// TODO: what other validation here besides binary name?
 	if !commandExists(cosignBinName) {

cmd/syft/internal/commands/cataloger_list.go

@@ -3,7 +3,6 @@ package commands
 import (
 	"encoding/json"
 	"fmt"
-	"os"
 	"sort"
 	"strings"
 
@@ -15,15 +14,7 @@ import (
 	"github.com/anchore/clio"
 	"github.com/anchore/syft/internal/bus"
 	"github.com/anchore/syft/internal/task"
-	"github.com/anchore/syft/syft/cataloging"
-)
-
-var (
-	activelyAddedStyle     = lipgloss.NewStyle().Foreground(lipgloss.Color("10")) // hi green
-	deselectedStyle        = lipgloss.NewStyle().Foreground(lipgloss.Color("8"))  // dark grey
-	activelyRemovedStyle   = lipgloss.NewStyle().Foreground(lipgloss.Color("9"))  // high red
-	defaultStyle           = lipgloss.NewStyle().Underline(true)
-	deselectedDefaultStyle = lipgloss.NewStyle().Inherit(deselectedStyle).Underline(true)
+	"github.com/anchore/syft/syft/cataloging/pkgcataloging"
 )
 
 type catalogerListOptions struct {
@@ -53,9 +44,8 @@ func CatalogerList(app clio.Application) *cobra.Command {
 	opts := defaultCatalogerListOptions()
 
 	return app.SetupCommand(&cobra.Command{
-		Use:     "list [OPTIONS]",
-		Short:   "List available catalogers",
-		PreRunE: disableUI(app, os.Stdout),
+		Use:   "list [OPTIONS]",
+		Short: "List available catalogers",
 		RunE: func(_ *cobra.Command, _ []string) error {
 			return runCatalogerList(opts)
 		},
@@ -63,19 +53,13 @@ func CatalogerList(app clio.Application) *cobra.Command {
 }
 
 func runCatalogerList(opts *catalogerListOptions) error {
-	pkgTaskFactories := task.DefaultPackageTaskFactories()
-	fileTaskFactories := task.DefaultFileTaskFactories()
-	allPkgTasks, err := pkgTaskFactories.Tasks(task.DefaultCatalogingFactoryConfig())
+	factories := task.DefaultPackageTaskFactories()
+	allTasks, err := factories.Tasks(task.DefaultCatalogingFactoryConfig())
 	if err != nil {
-		return fmt.Errorf("unable to create pkg cataloger tasks: %w", err)
+		return fmt.Errorf("unable to create cataloger tasks: %w", err)
 	}
 
-	allFileTasks, err := fileTaskFactories.Tasks(task.DefaultCatalogingFactoryConfig())
-	if err != nil {
-		return fmt.Errorf("unable to create file cataloger tasks: %w", err)
-	}
-
-	report, err := catalogerListReport(opts, [][]task.Task{allPkgTasks, allFileTasks})
+	report, err := catalogerListReport(opts, allTasks)
 	if err != nil {
 		return fmt.Errorf("unable to generate cataloger list report: %w", err)
 	}
@@ -85,10 +69,9 @@ func runCatalogerList(opts *catalogerListOptions) error {
 	return nil
 }
 
-func catalogerListReport(opts *catalogerListOptions, allTaskGroups [][]task.Task) (string, error) {
-	selectedTaskGroups, selectionEvidence, err := task.SelectInGroups(
-		allTaskGroups,
-		cataloging.NewSelectionRequest().
+func catalogerListReport(opts *catalogerListOptions, allTasks []task.Task) (string, error) {
+	selectedTasks, selectionEvidence, err := task.Select(allTasks,
+		pkgcataloging.NewSelectionRequest().
 			WithDefaults(opts.DefaultCatalogers...).
 			WithExpression(opts.SelectCatalogers...),
 	)
@@ -99,12 +82,12 @@ func catalogerListReport(opts *catalogerListOptions, allTaskGroups [][]task.Task
 
 	switch opts.Output {
 	case "json":
-		report, err = renderCatalogerListJSON(flattenTaskGroups(selectedTaskGroups), selectionEvidence, opts.DefaultCatalogers, opts.SelectCatalogers)
+		report, err = renderCatalogerListJSON(selectedTasks, selectionEvidence, opts.DefaultCatalogers, opts.SelectCatalogers)
 	case "table", "":
 		if opts.ShowHidden {
-			report = renderCatalogerListTables(allTaskGroups, selectionEvidence)
+			report = renderCatalogerListTable(allTasks, selectionEvidence, opts.DefaultCatalogers, opts.SelectCatalogers)
 		} else {
-			report = renderCatalogerListTables(selectedTaskGroups, selectionEvidence)
+			report = renderCatalogerListTable(selectedTasks, selectionEvidence, opts.DefaultCatalogers, opts.SelectCatalogers)
 		}
 	}
 
@@ -115,14 +98,6 @@ func catalogerListReport(opts *catalogerListOptions, allTaskGroups [][]task.Task
 	return report, nil
 }
 
-func flattenTaskGroups(taskGroups [][]task.Task) []task.Task {
-	var allTasks []task.Task
-	for _, tasks := range taskGroups {
-		allTasks = append(allTasks, tasks...)
-	}
-	return allTasks
-}
-
 func renderCatalogerListJSON(tasks []task.Task, selection task.Selection, defaultSelections, selections []string) (string, error) {
 	type node struct {
 		Name string   `json:"name"`
@@ -134,12 +109,7 @@ func renderCatalogerListJSON(tasks []task.Task, selection task.Selection, defaul
 	nodesByName := make(map[string]node)
 
 	for name := range tagsByName {
-		tokensByTask, ok := selection.TokensByTask[name]
-
-		var tagsSelected []string
-		if ok {
-			tagsSelected = tokensByTask.SelectedOn.List()
-		}
+		tagsSelected := selection.TokensByTask[name].SelectedOn.List()
 
 		if len(tagsSelected) == 1 && tagsSelected[0] == "all" {
 			tagsSelected = tagsByName[name]
@@ -183,56 +153,10 @@ func renderCatalogerListJSON(tasks []task.Task, selection task.Selection, defaul
 	return string(by), err
 }
 
-func renderCatalogerListTables(taskGroups [][]task.Task, selection task.Selection) string {
-	pkgCatalogerTable := renderCatalogerListTable(taskGroups[0], selection, "Package Cataloger")
-	fileCatalogerTable := renderCatalogerListTable(taskGroups[1], selection, "File Cataloger")
-
-	report := fileCatalogerTable + "\n" + pkgCatalogerTable + "\n"
-
-	hasAdditions := len(selection.Request.AddNames) > 0
-	hasDefaults := len(selection.Request.DefaultNamesOrTags) > 0
-	hasRemovals := len(selection.Request.RemoveNamesOrTags) > 0
-	hasSubSelections := len(selection.Request.SubSelectTags) > 0
-	expressions := len(selection.Request.SubSelectTags) + len(selection.Request.AddNames) + len(selection.Request.RemoveNamesOrTags)
-
-	var header string
-
-	header += fmt.Sprintf("Default selections: %d\n", len(selection.Request.DefaultNamesOrTags))
-	if hasDefaults {
-		for _, expr := range selection.Request.DefaultNamesOrTags {
-			header += fmt.Sprintf("  • '%s'\n", expr)
-		}
-	}
-
-	header += fmt.Sprintf("Selection expressions: %d\n", expressions)
-
-	if hasSubSelections {
-		for _, n := range selection.Request.SubSelectTags {
-			header += fmt.Sprintf("  • '%s' (intersect)\n", n)
-		}
-	}
-	if hasRemovals {
-		for _, n := range selection.Request.RemoveNamesOrTags {
-			header += fmt.Sprintf("  • '-%s' (remove)\n", n)
-		}
-	}
-	if hasAdditions {
-		for _, n := range selection.Request.AddNames {
-			header += fmt.Sprintf("  • '+%s' (add)\n", n)
-		}
-	}
-
-	return header + report
-}
-
-func renderCatalogerListTable(tasks []task.Task, selection task.Selection, kindTitle string) string {
-	if len(tasks) == 0 {
-		return activelyRemovedStyle.Render(fmt.Sprintf("No %ss selected", strings.ToLower(kindTitle)))
-	}
-
+func renderCatalogerListTable(tasks []task.Task, selection task.Selection, defaultSelections, selections []string) string {
 	t := table.NewWriter()
 	t.SetStyle(table.StyleLight)
-	t.AppendHeader(table.Row{kindTitle, "Tags"})
+	t.AppendHeader(table.Row{"Cataloger", "Tags"})
 
 	names, tagsByName := extractTaskInfo(tasks)
 
@@ -248,12 +172,27 @@ func renderCatalogerListTable(tasks []task.Task, selection task.Selection, kindT
 
 	report := t.Render()
 
+	if len(selections) > 0 {
+		header := "Selected by expressions:\n"
+		for _, expr := range selections {
+			header += fmt.Sprintf("  - %q\n", expr)
+		}
+		report = header + report
+	}
+
+	if len(defaultSelections) > 0 {
+		header := "Default selections:\n"
+		for _, expr := range defaultSelections {
+			header += fmt.Sprintf("  - %q\n", expr)
+		}
+		report = header + report
+	}
+
 	return report
 }
 
 func formatRow(name string, tags []string, selection task.Selection) table.Row {
 	isIncluded := selection.Result.Has(name)
-	defaults := strset.New(selection.Request.DefaultNamesOrTags...)
 	var selections *task.TokenSelection
 	if s, exists := selection.TokensByTask[name]; exists {
 		selections = &s
@@ -261,32 +200,35 @@ func formatRow(name string, tags []string, selection task.Selection) table.Row {
 
 	var formattedTags []string
 	for _, tag := range tags {
-		formattedTags = append(formattedTags, formatToken(tag, selections, isIncluded, defaults))
+		formattedTags = append(formattedTags, formatToken(tag, selections, isIncluded))
 	}
 
 	var tagStr string
 	if isIncluded {
 		tagStr = strings.Join(formattedTags, ", ")
 	} else {
-		tagStr = strings.Join(formattedTags, deselectedStyle.Render(", "))
+		tagStr = strings.Join(formattedTags, grey.Render(", "))
 	}
 
 	// TODO: selection should keep warnings (non-selections) in struct
 
 	return table.Row{
-		formatToken(name, selections, isIncluded, defaults),
+		formatToken(name, selections, isIncluded),
 		tagStr,
 	}
 }
 
-func formatToken(token string, selection *task.TokenSelection, included bool, defaults *strset.Set) string {
+var (
+	green = lipgloss.NewStyle().Foreground(lipgloss.Color("10")) // hi green
+	grey  = lipgloss.NewStyle().Foreground(lipgloss.Color("8"))  // dark grey
+	red   = lipgloss.NewStyle().Foreground(lipgloss.Color("9"))  // high red
+)
+
+func formatToken(token string, selection *task.TokenSelection, included bool) string {
 	if included && selection != nil {
 		// format all tokens in selection in green
 		if selection.SelectedOn.Has(token) {
-			if defaults.Has(token) {
-				return defaultStyle.Render(token)
-			}
-			return activelyAddedStyle.Render(token)
+			return green.Render(token)
 		}
 
 		return token
@@ -294,12 +236,10 @@ func formatToken(token string, selection *task.TokenSelection, included bool, de
 
 	// format all tokens in selection in red, all others in grey
 	if selection != nil && selection.DeselectedOn.Has(token) {
-		return activelyRemovedStyle.Render(token)
+		return red.Render(token)
 	}
-	if defaults.Has(token) {
-		return deselectedDefaultStyle.Render(token)
-	}
-	return deselectedStyle.Render(token)
+
+	return grey.Render(token)
 }
 
 func extractTaskInfo(tasks []task.Task) ([]string, map[string][]string) {

cmd/syft/internal/commands/cataloger_list_test.go

@@ -40,35 +40,23 @@ func (d dummyTask) Execute(_ context.Context, _ file.Resolver, _ sbomsync.Builde
 	panic("implement me")
 }
 
-func testTasks() [][]task.Task {
-	return [][]task.Task{
-		{
-			dummyTask{
-				name:      "task1",
-				selectors: []string{"image", "a", "b", "1"},
-			},
-			dummyTask{
-				name:      "task2",
-				selectors: []string{"image", "b", "c", "2"},
-			},
-			dummyTask{
-				name:      "task3",
-				selectors: []string{"directory", "c", "d", "3"},
-			},
-			dummyTask{
-				name:      "task4",
-				selectors: []string{"directory", "d", "e", "4"},
-			},
+func testTasks() []task.Task {
+	return []task.Task{
+		dummyTask{
+			name:      "task1",
+			selectors: []string{"image", "a", "b", "1"},
 		},
-		{
-			dummyTask{
-				name:      "file-task1",
-				selectors: []string{"file", "ft", "ft-1-b"},
-			},
-			dummyTask{
-				name:      "file-task2",
-				selectors: []string{"file", "ft", "ft-2-b"},
-			},
+		dummyTask{
+			name:      "task2",
+			selectors: []string{"image", "b", "c", "2"},
+		},
+		dummyTask{
+			name:      "task3",
+			selectors: []string{"directory", "c", "d", "3"},
+		},
+		dummyTask{
+			name:      "task4",
+			selectors: []string{"directory", "d", "e", "4"},
 		},
 	}
 }
@@ -88,23 +76,16 @@ func Test_catalogerListReport(t *testing.T) {
 				return c
 			}(),
 			want: `
-Default selections: 1
-  • 'all'
-Selection expressions: 0
-┌────────────────┬──────────────────┐
-│ FILE CATALOGER │ TAGS             │
-├────────────────┼──────────────────┤
-│ file-task1     │ file, ft, ft-1-b │
-│ file-task2     │ file, ft, ft-2-b │
-└────────────────┴──────────────────┘
-┌───────────────────┬────────────────────┐
-│ PACKAGE CATALOGER │ TAGS               │
-├───────────────────┼────────────────────┤
-│ task1             │ 1, a, b, image     │
-│ task2             │ 2, b, c, image     │
-│ task3             │ 3, c, d, directory │
-│ task4             │ 4, d, directory, e │
-└───────────────────┴────────────────────┘
+Default selections:
+  - "all"
+┌───────────┬────────────────────┐
+│ CATALOGER │ TAGS               │
+├───────────┼────────────────────┤
+│ task1     │ 1, a, b, image     │
+│ task2     │ 2, b, c, image     │
+│ task3     │ 3, c, d, directory │
+│ task4     │ 4, d, directory, e │
+└───────────┴────────────────────┘
 `,
 		},
 		{
@@ -115,7 +96,7 @@ Selection expressions: 0
 				return c
 			}(),
 			want: `
-{"default":["all"],"selection":[],"catalogers":[{"name":"file-task1","tags":["file","ft","ft-1-b"]},{"name":"file-task2","tags":["file","ft","ft-2-b"]},{"name":"task1","tags":["1","a","b","image"]},{"name":"task2","tags":["2","b","c","image"]},{"name":"task3","tags":["3","c","d","directory"]},{"name":"task4","tags":["4","d","directory","e"]}]}
+{"default":["all"],"selection":[],"catalogers":[{"name":"task1","tags":["1","a","b","image"]},{"name":"task2","tags":["2","b","c","image"]},{"name":"task3","tags":["3","c","d","directory"]},{"name":"task4","tags":["4","d","directory","e"]}]}
 `,
 		},
 		{
@@ -124,27 +105,19 @@ Selection expressions: 0
 				c := defaultCatalogerListOptions()
 				c.Output = "table"
 				c.DefaultCatalogers = []string{
-					"image", // note: for backwards compatibility file will automatically be added
+					"image",
 				}
 				return c
 			}(),
 			want: `
-Default selections: 2
-  • 'image'
-  • 'file'
-Selection expressions: 0
-┌────────────────┬──────────────────┐
-│ FILE CATALOGER │ TAGS             │
-├────────────────┼──────────────────┤
-│ file-task1     │ file, ft, ft-1-b │
-│ file-task2     │ file, ft, ft-2-b │
-└────────────────┴──────────────────┘
-┌───────────────────┬────────────────┐
-│ PACKAGE CATALOGER │ TAGS           │
-├───────────────────┼────────────────┤
-│ task1             │ 1, a, b, image │
-│ task2             │ 2, b, c, image │
-└───────────────────┴────────────────┘
+Default selections:
+  - "image"
+┌───────────┬────────────────┐
+│ CATALOGER │ TAGS           │
+├───────────┼────────────────┤
+│ task1     │ 1, a, b, image │
+│ task2     │ 2, b, c, image │
+└───────────┴────────────────┘
 `,
 		},
 		{
@@ -158,7 +131,7 @@ Selection expressions: 0
 				return c
 			}(),
 			want: `
-{"default":["image"],"selection":[],"catalogers":[{"name":"file-task1","tags":["file"]},{"name":"file-task2","tags":["file"]},{"name":"task1","tags":["image"]},{"name":"task2","tags":["image"]}]}
+{"default":["image"],"selection":[],"catalogers":[{"name":"task1","tags":["image"]},{"name":"task2","tags":["image"]}]}
 `,
 		},
 		{
@@ -174,32 +147,23 @@ Selection expressions: 0
 					"+task3",
 					"-c",
 					"b",
-					"-file",
-					"+file-task1",
 				}
 				return c
 			}(),
 			want: `
-Default selections: 1
-  • 'image'
-Selection expressions: 6
-  • 'b' (intersect)
-  • '-directory' (remove)
-  • '-c' (remove)
-  • '-file' (remove)
-  • '+task3' (add)
-  • '+file-task1' (add)
-┌────────────────┬──────────────────┐
-│ FILE CATALOGER │ TAGS             │
-├────────────────┼──────────────────┤
-│ file-task1     │ file, ft, ft-1-b │
-└────────────────┴──────────────────┘
-┌───────────────────┬────────────────────┐
-│ PACKAGE CATALOGER │ TAGS               │
-├───────────────────┼────────────────────┤
-│ task1             │ 1, a, b, image     │
-│ task3             │ 3, c, d, directory │
-└───────────────────┴────────────────────┘
+Default selections:
+  - "image"
+Selected by expressions:
+  - "-directory"
+  - "+task3"
+  - "-c"
+  - "b"
+┌───────────┬────────────────────┐
+│ CATALOGER │ TAGS               │
+├───────────┼────────────────────┤
+│ task1     │ 1, a, b, image     │
+│ task3     │ 3, c, d, directory │
+└───────────┴────────────────────┘
 `,
 		},
 		{
@@ -219,7 +183,7 @@ Selection expressions: 6
 				return c
 			}(),
 			want: `
-{"default":["image"],"selection":["-directory","+task3","-c","b"],"catalogers":[{"name":"file-task1","tags":["file"]},{"name":"file-task2","tags":["file"]},{"name":"task1","tags":["b","image"]},{"name":"task3","tags":["task3"]}]}
+{"default":["image"],"selection":["-directory","+task3","-c","b"],"catalogers":[{"name":"task1","tags":["b","image"]},{"name":"task3","tags":["task3"]}]}
 `,
 		},
 	}

cmd/syft/internal/commands/convert.go

@@ -17,7 +17,7 @@ import (
 
 const (
 	convertExample = `  {{.appName}} {{.command}} img.syft.json -o spdx-json                      convert a syft SBOM to spdx-json, output goes to stdout
-  {{.appName}} {{.command}} img.syft.json -o cyclonedx-json=img.cdx.json    convert a syft SBOM to CycloneDX, output is written to the file "img.cdx.json"
+  {{.appName}} {{.command}} img.syft.json -o cyclonedx-json=img.cdx.json    convert a syft SBOM to CycloneDX, output is written to the file "img.cdx.json""
   {{.appName}} {{.command}} - -o spdx-json                                  convert an SBOM from STDIN to spdx-json
 `
 )
@@ -28,6 +28,7 @@ type ConvertOptions struct {
 	options.UpdateCheck `yaml:",inline" mapstructure:",squash"`
 }
 
+//nolint:dupl
 func Convert(app clio.Application) *cobra.Command {
 	id := app.ID()
 
@@ -39,7 +40,7 @@ func Convert(app clio.Application) *cobra.Command {
 	return app.SetupCommand(&cobra.Command{
 		Use:   "convert [SOURCE-SBOM] -o [FORMAT]",
 		Short: "Convert between SBOM formats",
-		Long:  "[Experimental] Convert SBOM files to, and from, SPDX, CycloneDX and Syft's format. For more info about data loss between formats see https://github.com/anchore/syft/wiki/format-conversion",
+		Long:  "[Experimental] Convert SBOM files to, and from, SPDX, CycloneDX and Syft's format. For more info about data loss between formats see https://github.com/anchore/syft#format-conversion-experimental",
 		Example: internal.Tprintf(convertExample, map[string]interface{}{
 			"appName": id.Name,
 			"command": "convert",

cmd/syft/internal/commands/scan.go

@@ -13,7 +13,6 @@ import (
 	"gopkg.in/yaml.v3"
 
 	"github.com/anchore/clio"
-	"github.com/anchore/fangs"
 	"github.com/anchore/go-collections"
 	"github.com/anchore/stereoscope"
 	"github.com/anchore/stereoscope/pkg/image"
@@ -69,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 {
@@ -77,10 +75,10 @@ func defaultScanOptions() *scanOptions {
 		Output:      options.DefaultOutput(),
 		UpdateCheck: options.DefaultUpdateCheck(),
 		Catalog:     options.DefaultCatalog(),
-		Cache:       options.DefaultCache(),
 	}
 }
 
+//nolint:dupl
 func Scan(app clio.Application) *cobra.Command {
 	id := app.ID()
 
@@ -110,7 +108,7 @@ func (o *scanOptions) PostLoad() error {
 }
 
 func (o *scanOptions) validateLegacyOptionsNotUsed() error {
-	if len(fangs.Flatten(o.Config.ConfigFile)) == 0 {
+	if o.Config.ConfigFile == "" {
 		return nil
 	}
 
@@ -122,33 +120,32 @@ func (o *scanOptions) validateLegacyOptionsNotUsed() error {
 		File                            any     `yaml:"file" json:"file" mapstructure:"file"`
 	}
 
-	for _, f := range fangs.Flatten(o.Config.ConfigFile) {
-		by, err := os.ReadFile(f)
-		if err != nil {
-			return fmt.Errorf("unable to read config file during validations %q: %w", f, err)
-		}
-
-		var legacy legacyConfig
-		if err := yaml.Unmarshal(by, &legacy); err != nil {
-			return fmt.Errorf("unable to parse config file during validations %q: %w", f, err)
-		}
-
-		if legacy.DefaultImagePullSource != nil {
-			return fmt.Errorf("the config file option 'default-image-pull-source' has been removed, please use 'source.image.default-pull-source' instead")
-		}
-
-		if legacy.ExcludeBinaryOverlapByOwnership != nil {
-			return fmt.Errorf("the config file option 'exclude-binary-overlap-by-ownership' has been removed, please use 'package.exclude-binary-overlap-by-ownership' instead")
-		}
-
-		if legacy.BasePath != nil {
-			return fmt.Errorf("the config file option 'base-path' has been removed, please use 'source.base-path' instead")
-		}
-
-		if legacy.File != nil && reflect.TypeOf(legacy.File).Kind() == reflect.String {
-			return fmt.Errorf("the config file option 'file' has been removed, please use 'outputs' instead")
-		}
+	by, err := os.ReadFile(o.Config.ConfigFile)
+	if err != nil {
+		return fmt.Errorf("unable to read config file during validations %q: %w", o.Config.ConfigFile, err)
 	}
+
+	var legacy legacyConfig
+	if err := yaml.Unmarshal(by, &legacy); err != nil {
+		return fmt.Errorf("unable to parse config file during validations %q: %w", o.Config.ConfigFile, err)
+	}
+
+	if legacy.DefaultImagePullSource != nil {
+		return fmt.Errorf("the config file option 'default-image-pull-source' has been removed, please use 'source.image.default-pull-source' instead")
+	}
+
+	if legacy.ExcludeBinaryOverlapByOwnership != nil {
+		return fmt.Errorf("the config file option 'exclude-binary-overlap-by-ownership' has been removed, please use 'package.exclude-binary-overlap-by-ownership' instead")
+	}
+
+	if legacy.BasePath != nil {
+		return fmt.Errorf("the config file option 'base-path' has been removed, please use 'source.base-path' instead")
+	}
+
+	if legacy.File != nil && reflect.TypeOf(legacy.File).Kind() == reflect.String {
+		return fmt.Errorf("the config file option 'file' has been removed, please use 'outputs' instead")
+	}
+
 	return nil
 }
 
@@ -156,13 +153,13 @@ func validateScanArgs(cmd *cobra.Command, args []string) error {
 	return validateArgs(cmd, args, "an image/directory argument is required")
 }
 
-func validateArgs(cmd *cobra.Command, args []string, err string) error {
+func validateArgs(cmd *cobra.Command, args []string, error string) error {
 	if len(args) == 0 {
 		// in the case that no arguments are given we want to show the help text and return with a non-0 return code.
 		if err := cmd.Help(); err != nil {
 			return fmt.Errorf("unable to display help: %w", err)
 		}
-		return fmt.Errorf("%v", err)
+		return fmt.Errorf(error)
 	}
 
 	return cobra.MaximumNArgs(1)(cmd, args)
@@ -397,13 +394,13 @@ func getExplanation(expErr task.ErrInvalidExpression) string {
 
 	if errors.Is(err, task.ErrNamesNotAllowed) {
 		if expErr.Operation == task.SubSelectOperation {
-			return "However, " + err.Error() + ".\nIt seems like you are intending to add a cataloger in addition to the default set."
+			return "However, " + err.Error() + ".\nIt seems like you are intending to add a cataloger in addition to the default set." // nolint:goconst
 		}
-		return "However, " + err.Error() + "."
+		return "However, " + err.Error() + "." // nolint:goconst
 	}
 
 	if errors.Is(err, task.ErrTagsNotAllowed) {
-		return "However, " + err.Error() + ".\nAdding groups of catalogers may result in surprising behavior (create inaccurate SBOMs)."
+		return "However, " + err.Error() + ".\nAdding groups of catalogers may result in surprising behavior (create inaccurate SBOMs)." // nolint:goconst
 	}
 
 	if errors.Is(err, task.ErrAllNotAllowed) {

cmd/syft/internal/commands/utils.go

@@ -1,23 +0,0 @@
-package commands
-
-import (
-	"io"
-
-	"github.com/spf13/cobra"
-
-	"github.com/anchore/clio"
-	"github.com/anchore/syft/cmd/syft/internal/ui"
-)
-
-func disableUI(app clio.Application, out io.Writer) func(*cobra.Command, []string) error {
-	return func(_ *cobra.Command, _ []string) error {
-		type Stater interface {
-			State() *clio.State
-		}
-
-		state := app.(Stater).State()
-		state.UI = clio.NewUICollection(ui.None(out, state.Config.Log.Quiet))
-
-		return nil
-	}
-}

cmd/syft/internal/options/cache.go

@@ -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
-}

cmd/syft/internal/options/cache_test.go

@@ -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)
-		})
-	}
-}

cmd/syft/internal/options/catalog.go

@@ -11,7 +11,6 @@ import (
 	"github.com/anchore/fangs"
 	intFile "github.com/anchore/syft/internal/file"
 	"github.com/anchore/syft/internal/log"
-	"github.com/anchore/syft/internal/task"
 	"github.com/anchore/syft/syft"
 	"github.com/anchore/syft/syft/cataloging"
 	"github.com/anchore/syft/syft/cataloging/filecataloging"
@@ -19,7 +18,6 @@ import (
 	"github.com/anchore/syft/syft/file/cataloger/executable"
 	"github.com/anchore/syft/syft/file/cataloger/filecontent"
 	"github.com/anchore/syft/syft/pkg/cataloger/binary"
-	"github.com/anchore/syft/syft/pkg/cataloger/dotnet"
 	"github.com/anchore/syft/syft/pkg/cataloger/golang"
 	"github.com/anchore/syft/syft/pkg/cataloger/java"
 	"github.com/anchore/syft/syft/pkg/cataloger/javascript"
@@ -34,16 +32,12 @@ type Catalog struct {
 	DefaultCatalogers []string            `yaml:"default-catalogers" json:"default-catalogers" mapstructure:"default-catalogers"`
 	SelectCatalogers  []string            `yaml:"select-catalogers" json:"select-catalogers" mapstructure:"select-catalogers"`
 	Package           packageConfig       `yaml:"package" json:"package" mapstructure:"package"`
-	License           licenseConfig       `yaml:"license" json:"license" mapstructure:"license"`
 	File              fileConfig          `yaml:"file" json:"file" mapstructure:"file"`
 	Scope             string              `yaml:"scope" json:"scope" mapstructure:"scope"`
 	Parallelism       int                 `yaml:"parallelism" json:"parallelism" mapstructure:"parallelism"` // the number of catalog workers to run in parallel
 	Relationships     relationshipsConfig `yaml:"relationships" json:"relationships" mapstructure:"relationships"`
-	Compliance        complianceConfig    `yaml:"compliance" json:"compliance" mapstructure:"compliance"`
-	Enrich            []string            `yaml:"enrich" json:"enrich" mapstructure:"enrich"`
 
 	// ecosystem-specific cataloger configuration
-	Dotnet      dotnetConfig      `yaml:"dotnet" json:"dotnet" mapstructure:"dotnet"`
 	Golang      golangConfig      `yaml:"golang" json:"golang" mapstructure:"golang"`
 	Java        javaConfig        `yaml:"java" json:"java" mapstructure:"java"`
 	JavaScript  javaScriptConfig  `yaml:"javascript" json:"javascript" mapstructure:"javascript"`
@@ -56,30 +50,22 @@ type Catalog struct {
 	Platform   string         `yaml:"platform" json:"platform" mapstructure:"platform"`
 	Source     sourceConfig   `yaml:"source" json:"source" mapstructure:"source"`
 	Exclusions []string       `yaml:"exclude" json:"exclude" mapstructure:"exclude"`
-
-	// configuration for inclusion of unknown information within elements
-	Unknowns unknownsConfig `yaml:"unknowns" mapstructure:"unknowns"`
 }
 
 var _ interface {
 	clio.FlagAdder
 	clio.PostLoader
-	clio.FieldDescriber
+	fangs.FieldDescriber
 } = (*Catalog)(nil)
 
 func DefaultCatalog() Catalog {
 	return Catalog{
-		Compliance:    defaultComplianceConfig(),
 		Scope:         source.SquashedScope.String(),
 		Package:       defaultPackageConfig(),
-		License:       defaultLicenseConfig(),
 		LinuxKernel:   defaultLinuxKernelConfig(),
-		Dotnet:        defaultDotnetConfig(),
 		Golang:        defaultGolangConfig(),
-		Java:          defaultJavaConfig(),
 		File:          defaultFileConfig(),
 		Relationships: defaultRelationshipsConfig(),
-		Unknowns:      defaultUnknowns(),
 		Source:        defaultSourceConfig(),
 		Parallelism:   1,
 	}
@@ -90,14 +76,11 @@ func (cfg Catalog) ToSBOMConfig(id clio.Identification) *syft.CreateSBOMConfig {
 		WithTool(id.Name, id.Version).
 		WithParallelism(cfg.Parallelism).
 		WithRelationshipsConfig(cfg.ToRelationshipsConfig()).
-		WithComplianceConfig(cfg.ToComplianceConfig()).
-		WithUnknownsConfig(cfg.ToUnknownsConfig()).
 		WithSearchConfig(cfg.ToSearchConfig()).
 		WithPackagesConfig(cfg.ToPackagesConfig()).
-		WithLicenseConfig(cfg.ToLicenseConfig()).
 		WithFilesConfig(cfg.ToFilesConfig()).
 		WithCatalogerSelection(
-			cataloging.NewSelectionRequest().
+			pkgcataloging.NewSelectionRequest().
 				WithDefaults(cfg.DefaultCatalogers...).
 				WithExpression(cfg.SelectCatalogers...),
 		)
@@ -118,20 +101,6 @@ func (cfg Catalog) ToRelationshipsConfig() cataloging.RelationshipsConfig {
 	}
 }
 
-func (cfg Catalog) ToComplianceConfig() cataloging.ComplianceConfig {
-	return cataloging.ComplianceConfig{
-		MissingName:    cfg.Compliance.MissingName,
-		MissingVersion: cfg.Compliance.MissingVersion,
-	}
-}
-
-func (cfg Catalog) ToUnknownsConfig() cataloging.UnknownsConfig {
-	return cataloging.UnknownsConfig{
-		IncludeExecutablesWithoutPackages: cfg.Unknowns.ExecutablesWithoutPackages,
-		IncludeUnexpandedArchives:         cfg.Unknowns.UnexpandedArchives,
-	}
-}
-
 func (cfg Catalog) ToFilesConfig() filecataloging.Config {
 	hashers, err := intFile.Hashers(cfg.File.Metadata.Digests...)
 	if err != nil {
@@ -152,13 +121,6 @@ func (cfg Catalog) ToFilesConfig() filecataloging.Config {
 	}
 }
 
-func (cfg Catalog) ToLicenseConfig() cataloging.LicenseConfig {
-	return cataloging.LicenseConfig{
-		IncludeUnkownLicenseContent: cfg.License.IncludeUnknownLicenseContent,
-		Coverage:                    cfg.License.LicenseCoverage,
-	}
-}
-
 func (cfg Catalog) ToPackagesConfig() pkgcataloging.Config {
 	archiveSearch := cataloging.ArchiveSearchConfig{
 		IncludeIndexedArchives:   cfg.Package.SearchIndexedArchives,
@@ -166,14 +128,10 @@ func (cfg Catalog) ToPackagesConfig() pkgcataloging.Config {
 	}
 	return pkgcataloging.Config{
 		Binary: binary.DefaultClassifierCatalogerConfig(),
-		Dotnet: dotnet.DefaultCatalogerConfig().
-			WithCertificateValidation(cfg.Dotnet.EnableCertificateValidation),
 		Golang: golang.DefaultCatalogerConfig().
-			WithSearchLocalModCacheLicenses(*multiLevelOption(false, enrichmentEnabled(cfg.Enrich, task.Go, task.Golang), cfg.Golang.SearchLocalModCacheLicenses)).
+			WithSearchLocalModCacheLicenses(cfg.Golang.SearchLocalModCacheLicenses).
 			WithLocalModCacheDir(cfg.Golang.LocalModCacheDir).
-			WithSearchLocalVendorLicenses(*multiLevelOption(false, enrichmentEnabled(cfg.Enrich, task.Go, task.Golang), cfg.Golang.SearchLocalVendorLicenses)).
-			WithLocalVendorDir(cfg.Golang.LocalVendorDir).
-			WithSearchRemoteLicenses(*multiLevelOption(false, enrichmentEnabled(cfg.Enrich, task.Go, task.Golang), cfg.Golang.SearchRemoteLicenses)).
+			WithSearchRemoteLicenses(cfg.Golang.SearchRemoteLicenses).
 			WithProxy(cfg.Golang.Proxy).
 			WithNoProxy(cfg.Golang.NoProxy).
 			WithMainModuleVersion(
@@ -183,8 +141,7 @@ func (cfg Catalog) ToPackagesConfig() pkgcataloging.Config {
 					WithFromLDFlags(cfg.Golang.MainModuleVersion.FromLDFlags),
 			),
 		JavaScript: javascript.DefaultCatalogerConfig().
-			WithIncludeDevDependencies(*multiLevelOption(false, cfg.JavaScript.IncludeDevDependencies)).
-			WithSearchRemoteLicenses(*multiLevelOption(false, enrichmentEnabled(cfg.Enrich, task.JavaScript, task.Node, task.NPM), cfg.JavaScript.SearchRemoteLicenses)).
+			WithSearchRemoteLicenses(cfg.JavaScript.SearchRemoteLicenses).
 			WithNpmBaseURL(cfg.JavaScript.NpmBaseURL),
 		LinuxKernel: kernel.LinuxKernelCatalogerConfig{
 			CatalogModules: cfg.LinuxKernel.CatalogModules,
@@ -193,12 +150,9 @@ func (cfg Catalog) ToPackagesConfig() pkgcataloging.Config {
 			GuessUnpinnedRequirements: cfg.Python.GuessUnpinnedRequirements,
 		},
 		JavaArchive: java.DefaultArchiveCatalogerConfig().
-			WithUseMavenLocalRepository(*multiLevelOption(false, enrichmentEnabled(cfg.Enrich, task.Java, task.Maven), cfg.Java.UseMavenLocalRepository)).
-			WithMavenLocalRepositoryDir(cfg.Java.MavenLocalRepositoryDir).
-			WithUseNetwork(*multiLevelOption(false, enrichmentEnabled(cfg.Enrich, task.Java, task.Maven), cfg.Java.UseNetwork)).
+			WithUseNetwork(cfg.Java.UseNetwork).
 			WithMavenBaseURL(cfg.Java.MavenURL).
-			WithArchiveTraversal(archiveSearch, cfg.Java.MaxParentRecursiveDepth).
-			WithResolveTransitiveDependencies(cfg.Java.ResolveTransitiveDependencies),
+			WithArchiveTraversal(archiveSearch, cfg.Java.MaxParentRecursiveDepth),
 	}
 }
 
@@ -236,9 +190,6 @@ func (cfg *Catalog) AddFlags(flags clio.FlagSet) {
 	flags.StringArrayVarP(&cfg.SelectCatalogers, "select-catalogers", "",
 		"add, remove, and filter the catalogers to be used")
 
-	flags.StringArrayVarP(&cfg.Enrich, "enrich", "",
-		fmt.Sprintf("enable package data enrichment from local and online sources (options: %s)", strings.Join(publicisedEnrichmentOptions, ", ")))
-
 	flags.StringVarP(&cfg.Source.Name, "source-name", "",
 		"set the name of the target being analyzed")
 
@@ -251,10 +202,6 @@ func (cfg *Catalog) AddFlags(flags clio.FlagSet) {
 
 func (cfg *Catalog) DescribeFields(descriptions fangs.FieldDescriptionSet) {
 	descriptions.Add(&cfg.Parallelism, "number of cataloger workers to run in parallel")
-
-	descriptions.Add(&cfg.Enrich, fmt.Sprintf(`Enable data enrichment operations, which can utilize services such as Maven Central and NPM.
-By default all enrichment is disabled, use: all to enable everything.
-Available options are: %s`, strings.Join(publicisedEnrichmentOptions, ", ")))
 }
 
 func (cfg *Catalog) PostLoad() error {
@@ -265,12 +212,23 @@ func (cfg *Catalog) PostLoad() error {
 		return fmt.Errorf("cannot use both 'catalogers' and 'select-catalogers'/'default-catalogers' flags")
 	}
 
+	flatten := func(l []string) []string {
+		var out []string
+		for _, v := range l {
+			for _, s := range strings.Split(v, ",") {
+				out = append(out, strings.TrimSpace(s))
+			}
+		}
+		sort.Strings(out)
+
+		return out
+	}
+
 	cfg.From = flatten(cfg.From)
 
 	cfg.Catalogers = flatten(cfg.Catalogers)
 	cfg.DefaultCatalogers = flatten(cfg.DefaultCatalogers)
 	cfg.SelectCatalogers = flatten(cfg.SelectCatalogers)
-	cfg.Enrich = flatten(cfg.Enrich)
 
 	// for backwards compatibility
 	cfg.DefaultCatalogers = append(cfg.DefaultCatalogers, cfg.Catalogers...)
@@ -280,75 +238,5 @@ func (cfg *Catalog) PostLoad() error {
 		return fmt.Errorf("bad scope value %q", cfg.Scope)
 	}
 
-	// the binary package exclusion code depends on the file overlap relationships being created upstream in processing
-	if !cfg.Relationships.PackageFileOwnershipOverlap && cfg.Package.ExcludeBinaryOverlapByOwnership {
-		return fmt.Errorf("cannot enable exclude-binary-overlap-by-ownership without enabling package-file-ownership-overlap")
-	}
-
 	return nil
 }
-
-func flatten(commaSeparatedEntries []string) []string {
-	var out []string
-	for _, v := range commaSeparatedEntries {
-		for _, s := range strings.Split(v, ",") {
-			out = append(out, strings.TrimSpace(s))
-		}
-	}
-	sort.Strings(out)
-	return out
-}
-
-var publicisedEnrichmentOptions = []string{
-	"all",
-	task.Golang,
-	task.Java,
-	task.JavaScript,
-}
-
-func enrichmentEnabled(enrichDirectives []string, features ...string) *bool {
-	if len(enrichDirectives) == 0 {
-		return nil
-	}
-
-	enabled := func(features ...string) *bool {
-		for _, directive := range enrichDirectives {
-			enable := true
-			directive = strings.TrimPrefix(directive, "+") // +java and java are equivalent
-			if strings.HasPrefix(directive, "-") {
-				directive = directive[1:]
-				enable = false
-			}
-			for _, feature := range features {
-				if directive == feature {
-					return &enable
-				}
-			}
-		}
-		return nil
-	}
-
-	enableAll := enabled("all")
-	disableAll := enabled("none")
-
-	if disableAll != nil && *disableAll {
-		if enableAll != nil {
-			log.Warn("you have specified to both enable and disable all enrichment functionality, defaulting to disabled")
-		}
-		enableAll = ptr(false)
-	}
-
-	// check for explicit enable/disable of feature names
-	for _, feat := range features {
-		enableFeature := enabled(feat)
-		if enableFeature != nil {
-			return enableFeature
-		}
-	}
-
-	return enableAll
-}
-
-func ptr[T any](val T) *T {
-	return &val
-}

cmd/syft/internal/options/catalog_test.go

@@ -57,14 +57,6 @@ func TestCatalog_PostLoad(t *testing.T) {
 				assert.Empty(t, options.Catalogers)
 			},
 		},
-		{
-			name: "must have package overlap flag when pruning binaries by overlap",
-			options: Catalog{
-				Package:       packageConfig{ExcludeBinaryOverlapByOwnership: true},
-				Relationships: relationshipsConfig{PackageFileOwnershipOverlap: false},
-			},
-			wantErr: assert.Error,
-		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -78,69 +70,3 @@ func TestCatalog_PostLoad(t *testing.T) {
 		})
 	}
 }
-
-func Test_enrichmentEnabled(t *testing.T) {
-	tests := []struct {
-		directives string
-		test       string
-		expected   *bool
-	}{
-		{
-			directives: "",
-			test:       "java",
-			expected:   nil,
-		},
-		{
-			directives: "none",
-			test:       "java",
-			expected:   ptr(false),
-		},
-		{
-			directives: "none,+java",
-			test:       "java",
-			expected:   ptr(true),
-		},
-		{
-			directives: "all,none",
-			test:       "java",
-			expected:   ptr(false),
-		},
-		{
-			directives: "all",
-			test:       "java",
-			expected:   ptr(true),
-		},
-		{
-			directives: "golang,js",
-			test:       "java",
-			expected:   nil,
-		},
-		{
-			directives: "golang,-js,java",
-			test:       "java",
-			expected:   ptr(true),
-		},
-		{
-			directives: "golang,js,-java",
-			test:       "java",
-			expected:   ptr(false),
-		},
-		{
-			directives: "all",
-			test:       "java",
-			expected:   ptr(true),
-		},
-		{
-			directives: "all,-java",
-			test:       "java",
-			expected:   ptr(false),
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.directives, func(t *testing.T) {
-			got := enrichmentEnabled(flatten([]string{test.directives}), test.test)
-			assert.Equal(t, test.expected, got)
-		})
-	}
-}

cmd/syft/internal/options/compliance.go

@@ -1,35 +0,0 @@
-package options
-
-import (
-	"github.com/anchore/fangs"
-	"github.com/anchore/syft/syft/cataloging"
-)
-
-var (
-	_ fangs.FieldDescriber = (*complianceConfig)(nil)
-	_ fangs.PostLoader     = (*complianceConfig)(nil)
-)
-
-type complianceConfig struct {
-	MissingName    cataloging.ComplianceAction `mapstructure:"missing-name" json:"missing-name" yaml:"missing-name"`
-	MissingVersion cataloging.ComplianceAction `mapstructure:"missing-version" json:"missing-version" yaml:"missing-version"`
-}
-
-func defaultComplianceConfig() complianceConfig {
-	def := cataloging.DefaultComplianceConfig()
-	return complianceConfig{
-		MissingName:    def.MissingName,
-		MissingVersion: def.MissingVersion,
-	}
-}
-
-func (r *complianceConfig) DescribeFields(descriptions fangs.FieldDescriptionSet) {
-	descriptions.Add(&r.MissingName, "action to take when a package is missing a name")
-	descriptions.Add(&r.MissingVersion, "action to take when a package is missing a version")
-}
-
-func (r *complianceConfig) PostLoad() error {
-	r.MissingName = r.MissingName.Parse()
-	r.MissingVersion = r.MissingVersion.Parse()
-	return nil
-}

cmd/syft/internal/options/config.go

@@ -2,11 +2,11 @@ package options
 
 import "github.com/anchore/fangs"
 
-// Config holds a reference to the specific config file(s) that were used to load application configuration
+// Config holds a reference to the specific config file that was used to load application configuration
 type Config struct {
 	ConfigFile string `yaml:"config" json:"config" mapstructure:"config"`
 }
 
 func (cfg *Config) DescribeFields(descriptions fangs.FieldDescriptionSet) {
-	descriptions.Add(&cfg.ConfigFile, "the configuration file(s) used to load application configuration")
+	descriptions.Add(&cfg.ConfigFile, "the configuration file that was used to load application configuration")
 }

cmd/syft/internal/options/dotnet.go

@@ -1,25 +0,0 @@
-package options
-
-import (
-	"github.com/anchore/clio"
-	"github.com/anchore/syft/syft/pkg/cataloger/dotnet"
-)
-
-type dotnetConfig struct {
-	EnableCertificateValidation bool `json:"enable-certificate-validation" yaml:"enable-certificate-validation" mapstructure:"enable-certificate-validation"`
-}
-
-var _ interface {
-	clio.FieldDescriber
-} = (*dotnetConfig)(nil)
-
-func (o *dotnetConfig) DescribeFields(descriptions clio.FieldDescriptionSet) {
-	descriptions.Add(&o.EnableCertificateValidation, `enable certificate validation -- this requires an active internet connection to download certificates and CRLs`)
-}
-
-func defaultDotnetConfig() dotnetConfig {
-	def := dotnet.DefaultCatalogerConfig()
-	return dotnetConfig{
-		EnableCertificateValidation: def.EnableCertificateValidation,
-	}
-}

cmd/syft/internal/options/format.go

@@ -50,7 +50,7 @@ if false, uses the syft-json output for templating (which follows the syft JSON
 
 Note: long term support for this option is not guaranteed (it may change or break at any time)`)
 
-	prettyDescription := `include space indentation and newlines
+	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)

cmd/syft/internal/options/golang.go

@@ -8,11 +8,9 @@ import (
 )
 
 type golangConfig struct {
-	SearchLocalModCacheLicenses *bool                         `json:"search-local-mod-cache-licenses" yaml:"search-local-mod-cache-licenses" mapstructure:"search-local-mod-cache-licenses"`
+	SearchLocalModCacheLicenses bool                          `json:"search-local-mod-cache-licenses" yaml:"search-local-mod-cache-licenses" mapstructure:"search-local-mod-cache-licenses"`
 	LocalModCacheDir            string                        `json:"local-mod-cache-dir" yaml:"local-mod-cache-dir" mapstructure:"local-mod-cache-dir"`
-	SearchLocalVendorLicenses   *bool                         `json:"search-local-vendor-licenses" yaml:"search-local-vendor-licenses" mapstructure:"search-local-vendor-licenses"`
-	LocalVendorDir              string                        `json:"local-vendor-dir" yaml:"local-vendor-dir" mapstructure:"local-vendor-dir"`
-	SearchRemoteLicenses        *bool                         `json:"search-remote-licenses" yaml:"search-remote-licenses" mapstructure:"search-remote-licenses"`
+	SearchRemoteLicenses        bool                          `json:"search-remote-licenses" yaml:"search-remote-licenses" mapstructure:"search-remote-licenses"`
 	Proxy                       string                        `json:"proxy" yaml:"proxy" mapstructure:"proxy"`
 	NoProxy                     string                        `json:"no-proxy" yaml:"no-proxy" mapstructure:"no-proxy"`
 	MainModuleVersion           golangMainModuleVersionConfig `json:"main-module-version" yaml:"main-module-version" mapstructure:"main-module-version"`
@@ -26,9 +24,6 @@ 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.SearchLocalVendorLicenses, `search for go package licences in the vendor folder on 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.LocalVendorDir, `specify an explicit go vendor directory, if unset this defaults to ./vendor`)
 	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`)
@@ -52,11 +47,9 @@ type golangMainModuleVersionConfig struct {
 func defaultGolangConfig() golangConfig {
 	def := golang.DefaultCatalogerConfig()
 	return golangConfig{
-		SearchLocalModCacheLicenses: nil, // this defaults to false, which is the API default
+		SearchLocalModCacheLicenses: def.SearchLocalModCacheLicenses,
 		LocalModCacheDir:            def.LocalModCacheDir,
-		SearchLocalVendorLicenses:   nil, // this defaults to false, which is the API default
-		LocalVendorDir:              def.LocalVendorDir,
-		SearchRemoteLicenses:        nil, // this defaults to false, which is the API default
+		SearchRemoteLicenses:        def.SearchRemoteLicenses,
 		Proxy:                       strings.Join(def.Proxies, ","),
 		NoProxy:                     strings.Join(def.NoProxy, ","),
 		MainModuleVersion: golangMainModuleVersionConfig{

cmd/syft/internal/options/java.go

@@ -1,30 +1,11 @@
 package options
 
-import (
-	"github.com/anchore/clio"
-	"github.com/anchore/syft/syft/pkg/cataloger/java"
-)
+import "github.com/anchore/clio"
 
 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"`
-	ResolveTransitiveDependencies bool   `yaml:"resolve-transitive-dependencies" json:"resolve-transitive-dependencies" mapstructure:"resolve-transitive-dependencies"`
-}
-
-func defaultJavaConfig() javaConfig {
-	def := java.DefaultArchiveCatalogerConfig()
-
-	return javaConfig{
-		UseNetwork:                    nil, // this defaults to false, which is the API default
-		MaxParentRecursiveDepth:       def.MaxParentRecursiveDepth,
-		UseMavenLocalRepository:       nil, // this defaults to false, which is the API default
-		MavenLocalRepositoryDir:       def.MavenLocalRepositoryDir,
-		MavenURL:                      def.MavenBaseURL,
-		ResolveTransitiveDependencies: def.ResolveTransitiveDependencies,
-	}
+	UseNetwork              bool   `yaml:"use-network" json:"use-network" mapstructure:"use-network"`
+	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"`
 }
 
 var _ interface {
@@ -32,18 +13,12 @@ var _ interface {
 } = (*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.UseNetwork, `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`)
 	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`)
-	descriptions.Add(&o.ResolveTransitiveDependencies, `resolve transient dependencies such as those defined in a dependency's POM on Maven central`)
+	descriptions.Add(&o.MaxParentRecursiveDepth, `depth to recursively resolve parent POMs`)
 }

cmd/syft/internal/options/javascript.go

@@ -3,9 +3,8 @@ 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"`
-	IncludeDevDependencies *bool  `json:"include-dev-dependencies" yaml:"include-dev-dependencies" mapstructure:"include-dev-dependencies"`
+	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 {
@@ -15,5 +14,4 @@ var _ interface {
 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`)
-	descriptions.Add(&o.IncludeDevDependencies, `include development-scoped dependencies`)
 }

cmd/syft/internal/options/license.go

@@ -1,28 +0,0 @@
-package options
-
-import (
-	"github.com/anchore/clio"
-)
-
-type licenseConfig struct {
-	IncludeUnknownLicenseContent bool    `yaml:"include-unknown-license-content" json:"include-unknown-license-content" mapstructure:"include-unknown-license-content"`
-	LicenseCoverage              float64 `yaml:"license-coverage" json:"license-coverage" mapstructure:"license-coverage"`
-}
-
-var _ interface {
-	clio.FieldDescriber
-} = (*licenseConfig)(nil)
-
-func (o *licenseConfig) DescribeFields(descriptions clio.FieldDescriptionSet) {
-	descriptions.Add(&o.IncludeUnknownLicenseContent, `include the content of a license in the SBOM when syft
-cannot determine a valid SPDX ID for the given license`)
-	descriptions.Add(&o.LicenseCoverage, `adjust the percent as a fraction of the total text, in normalized words, that
-matches any valid license for the given inputs, expressed as a percentage across all of the licenses matched.`)
-}
-
-func defaultLicenseConfig() licenseConfig {
-	return licenseConfig{
-		IncludeUnknownLicenseContent: false,
-		LicenseCoverage:              75,
-	}
-}

cmd/syft/internal/options/output_file.go

@@ -28,7 +28,7 @@ func (o *OutputFile) AddFlags(flags clio.FlagSet) {
 
 		if pfp, ok := flags.(fangs.PFlagSetProvider); ok {
 			flagSet := pfp.PFlagSet()
-			flagSet.Lookup("file").Deprecated = "use: --output FORMAT=PATH"
+			flagSet.Lookup("file").Deprecated = "use: output"
 		}
 	}
 }

cmd/syft/internal/options/pkg.go

@@ -16,9 +16,9 @@ var _ interface {
 } = (*packageConfig)(nil)
 
 func (o *packageConfig) DescribeFields(descriptions clio.FieldDescriptionSet) {
-	descriptions.Add(&o.SearchIndexedArchives, `search within archives that do contain a file index to search against (zip)
+	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.SearchUnindexedArchives, `search within archives that do not contain a file index to search against (tar, tar.gz, tar.bz2, etc)
+	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

cmd/syft/internal/options/source.go

@@ -5,11 +5,9 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/dustin/go-humanize"
 	"github.com/scylladb/go-set/strset"
 
 	"github.com/anchore/clio"
-	stereoscopeFile "github.com/anchore/stereoscope/pkg/file"
 	"github.com/anchore/syft/syft/source/sourceproviders"
 )
 
@@ -29,8 +27,6 @@ var _ interface {
 	clio.FieldDescriber
 } = (*sourceConfig)(nil)
 
-var _ clio.PostLoader = (*imageSource)(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
@@ -39,7 +35,6 @@ valid values are: registry, docker, podman`)
 
 type imageSource struct {
 	DefaultPullSource string `json:"default-pull-source" yaml:"default-pull-source" mapstructure:"default-pull-source"`
-	MaxLayerSize      string `json:"max-layer-size" yaml:"max-layer-size" mapstructure:"max-layer-size"`
 }
 
 func defaultSourceConfig() sourceConfig {
@@ -61,14 +56,7 @@ func (c *fileSource) PostLoad() error {
 	return nil
 }
 
-func (c *imageSource) PostLoad() error {
-	if c.MaxLayerSize != "" {
-		perFileReadLimit, err := humanize.ParseBytes(c.MaxLayerSize)
-		if err != nil {
-			return err
-		}
-		stereoscopeFile.SetPerFileReadLimit(int64(perFileReadLimit))
-	}
+func (c imageSource) PostLoad() error {
 	return checkDefaultSourceValues(c.DefaultPullSource)
 }
 

cmd/syft/internal/options/unknowns.go

@@ -1,31 +0,0 @@
-package options
-
-import (
-	"github.com/anchore/clio"
-	"github.com/anchore/syft/syft/cataloging"
-)
-
-type unknownsConfig struct {
-	RemoveWhenPackagesDefined  bool `json:"remove-when-packages-defined" yaml:"remove-when-packages-defined" mapstructure:"remove-when-packages-defined"`
-	ExecutablesWithoutPackages bool `json:"executables-without-packages" yaml:"executables-without-packages" mapstructure:"executables-without-packages"`
-	UnexpandedArchives         bool `json:"unexpanded-archives" yaml:"unexpanded-archives" mapstructure:"unexpanded-archives"`
-}
-
-var _ interface {
-	clio.FieldDescriber
-} = (*unknownsConfig)(nil)
-
-func (o *unknownsConfig) DescribeFields(descriptions clio.FieldDescriptionSet) {
-	descriptions.Add(&o.RemoveWhenPackagesDefined, `remove unknown errors on files with discovered packages`)
-	descriptions.Add(&o.ExecutablesWithoutPackages, `include executables without any identified packages`)
-	descriptions.Add(&o.UnexpandedArchives, `include archives which were not expanded and searched`)
-}
-
-func defaultUnknowns() unknownsConfig {
-	def := cataloging.DefaultUnknownsConfig()
-	return unknownsConfig{
-		RemoveWhenPackagesDefined:  def.RemoveWhenPackagesDefined,
-		ExecutablesWithoutPackages: def.IncludeExecutablesWithoutPackages,
-		UnexpandedArchives:         def.IncludeUnexpandedArchives,
-	}
-}

cmd/syft/internal/test/integration/.gitignore

@@ -1 +0,0 @@
-results

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

@@ -7,7 +7,7 @@ import (
 )
 
 func Test_AllLayersIncludesSquashed(t *testing.T) {
-	// This is a verification test for issue grype/#894 (https://github.com/anchore/grype/issues/894)
+	// This is a verification test for issue #894 (https://github.com/anchore/syft/issues/894)
 	allLayers, _ := catalogFixtureImage(t, "image-suse-all-layers", source.AllLayersScope)
 	squashed, _ := catalogFixtureImage(t, "image-suse-all-layers", source.SquashedScope)
 

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

@@ -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",
@@ -265,7 +265,7 @@ var dirOnlyTestCases = []testCase{
 		name:        "find java packages including pom.xml", // directory scans can include packages that have yet to be installed
 		pkgType:     pkg.JavaPkg,
 		pkgLanguage: pkg.Java,
-		duplicates:  2, // joda-time and example-java-app-maven are included in both pom.xml AND the .jar collection
+		duplicates:  1, // joda-time is included in both pom.xml AND the .jar collection
 		pkgInfo: map[string]string{
 			"example-java-app-maven": "0.1.0",
 			"joda-time":              "2.9.2",
@@ -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,
@@ -410,22 +402,6 @@ var dirOnlyTestCases = []testCase{
 			"octo-org/this-repo/.github/workflows/workflow-1.yml": "172239021f7ba04fe7327647b213799853a9eb89",
 		},
 	},
-	{
-		name:        "find opam package",
-		pkgType:     pkg.OpamPkg,
-		pkgLanguage: pkg.OCaml,
-		pkgInfo: map[string]string{
-			"ocaml-base-compiler": "4.14.0",
-		},
-	},
-	{
-		name:        "find terraform packages",
-		pkgType:     pkg.TerraformPkg,
-		pkgLanguage: pkg.Go,
-		pkgInfo: map[string]string{
-			"registry.terraform.io/hashicorp/aws": "5.72.1",
-		},
-	},
 }
 
 var commonTestCases = []testCase{

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

@@ -51,8 +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.OCaml.String())
 	definedLanguages.Remove(pkg.CPP.String())
 	definedLanguages.Remove(pkg.Haskell.String())
 	definedLanguages.Remove(pkg.Elixir.String())
@@ -74,17 +72,12 @@ func TestPkgCoverageImage(t *testing.T) {
 	definedPkgs.Remove(string(pkg.ConanPkg))
 	definedPkgs.Remove(string(pkg.HackagePkg))
 	definedPkgs.Remove(string(pkg.BinaryPkg))
-	definedPkgs.Remove(string(pkg.BitnamiPkg))
-	definedPkgs.Remove(string(pkg.GraalVMNativeImagePkg))
 	definedPkgs.Remove(string(pkg.HexPkg))
 	definedPkgs.Remove(string(pkg.LinuxKernelPkg))
 	definedPkgs.Remove(string(pkg.LinuxKernelModulePkg))
 	definedPkgs.Remove(string(pkg.SwiftPkg))
-	definedPkgs.Remove(string(pkg.SwiplPackPkg))
-	definedPkgs.Remove(string(pkg.OpamPkg))
 	definedPkgs.Remove(string(pkg.GithubActionPkg))
 	definedPkgs.Remove(string(pkg.GithubActionWorkflowPkg))
-	definedPkgs.Remove(string(pkg.TerraformPkg))
 
 	var cases []testCase
 	cases = append(cases, commonTestCases...)
@@ -221,8 +214,6 @@ func TestPkgCoverageDirectory(t *testing.T) {
 	definedLanguages.Remove(pkg.R.String())
 	observedPkgs.Remove(string(pkg.UnknownPkg))
 	definedPkgs.Remove(string(pkg.BinaryPkg))
-	definedPkgs.Remove(string(pkg.BitnamiPkg))
-	definedPkgs.Remove(string(pkg.GraalVMNativeImagePkg))
 	definedPkgs.Remove(string(pkg.LinuxKernelPkg))
 	definedPkgs.Remove(string(pkg.LinuxKernelModulePkg))
 	definedPkgs.Remove(string(pkg.Rpkg))

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

@@ -2,9 +2,7 @@ package integration
 
 import (
 	"bytes"
-	"os"
-	"path/filepath"
-	"strings"
+	"regexp"
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
@@ -14,6 +12,8 @@ import (
 
 	"github.com/anchore/syft/cmd/syft/internal/options"
 	"github.com/anchore/syft/syft/format"
+	"github.com/anchore/syft/syft/format/cyclonedxjson"
+	"github.com/anchore/syft/syft/format/cyclonedxxml"
 	"github.com/anchore/syft/syft/format/syftjson"
 	"github.com/anchore/syft/syft/source"
 )
@@ -43,27 +43,26 @@ func TestEncodeDecodeEncodeCycleComparison(t *testing.T) {
 			},
 			json: true,
 		},
-		// TODO: ignoring the `ref` field though does create stable results to compare, but the SBOM is fundamentally gutted and not worth comparing (find a better redaction or compare method)
-		//{
-		//	name: cyclonedxjson.ID.String(),
-		//	redactor: func(in []byte) []byte {
-		//		// unstable values
-		//		in = regexp.MustCompile(`"(timestamp|serialNumber|bom-ref|ref)":\s*"(\n|[^"])+"`).ReplaceAll(in, []byte(`"$1": "redacted"`))
-		//		in = regexp.MustCompile(`"(dependsOn)":\s*\[(?:\s|[^]])+]`).ReplaceAll(in, []byte(`"$1": []`))
-		//		return in
-		//	},
-		//	json: true,
-		//},
-		//{
-		//	name: cyclonedxxml.ID.String(),
-		//	redactor: func(in []byte) []byte {
-		//		// unstable values
-		//		in = regexp.MustCompile(`(serialNumber|bom-ref|ref)="[^"]+"`).ReplaceAll(in, []byte{})
-		//		in = regexp.MustCompile(`<timestamp>[^<]+</timestamp>`).ReplaceAll(in, []byte{})
-		//
-		//		return in
-		//	},
-		//},
+		{
+			name: cyclonedxjson.ID.String(),
+			redactor: func(in []byte) []byte {
+				// unstable values
+				in = regexp.MustCompile(`"(timestamp|serialNumber|bom-ref|ref)":\s*"(\n|[^"])+"`).ReplaceAll(in, []byte(`"$1": "redacted"`))
+				in = regexp.MustCompile(`"(dependsOn)":\s*\[(?:\s|[^]])+]`).ReplaceAll(in, []byte(`"$1": []`))
+				return in
+			},
+			json: true,
+		},
+		{
+			name: cyclonedxxml.ID.String(),
+			redactor: func(in []byte) []byte {
+				// unstable values
+				in = regexp.MustCompile(`(serialNumber|bom-ref|ref)="[^"]+"`).ReplaceAll(in, []byte{})
+				in = regexp.MustCompile(`<timestamp>[^<]+</timestamp>`).ReplaceAll(in, []byte{})
+
+				return in
+			},
+		},
 	}
 
 	opts := options.DefaultOutput()
@@ -113,21 +112,6 @@ func TestEncodeDecodeEncodeCycleComparison(t *testing.T) {
 					diffs := dmp.DiffMain(string(by1), string(by2), true)
 					t.Errorf("diff: %s", dmp.DiffPrettyText(diffs))
 				}
-
-				// write raw IMAGE@NAME-start and IMAGE@NAME-finish to files within the results dir
-				// ... this is helpful for debugging
-				require.NoError(t, os.MkdirAll("results", 0700))
-
-				suffix := "sbom"
-				switch {
-				case strings.Contains(test.name, "json"):
-					suffix = "json"
-				case strings.Contains(test.name, "xml"):
-					suffix = "xml"
-				}
-
-				require.NoError(t, os.WriteFile(filepath.Join("results", image+"@"+test.name+"-start."+suffix), by1, 0600))
-				require.NoError(t, os.WriteFile(filepath.Join("results", image+"@"+test.name+"-finish."+suffix), by2, 0600))
 			}
 		})
 	}

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

@@ -35,8 +35,8 @@ func TestGolangCompilerDetection(t *testing.T) {
 			for _, pkg := range packages {
 				foundCompilerVersions[pkg.Version] = struct{}{}
 				foundPURL[pkg.PURL] = struct{}{}
-				for _, c := range pkg.CPEs {
-					foundCPE[c] = struct{}{}
+				for _, cpe := range pkg.CPEs {
+					foundCPE[cpe] = struct{}{}
 				}
 			}
 

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

@@ -0,0 +1,37 @@
+package integration
+
+import (
+	"encoding/json"
+	"net/http"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+
+	"github.com/anchore/syft/internal/spdxlicense"
+)
+
+func TestSPDXLicenseListIsTheLatest(t *testing.T) {
+	resp, err := http.Get("https://spdx.org/licenses/licenses.json")
+	if err != nil {
+		t.Fatalf("unable to get licenses list: %+v", err)
+	}
+
+	type licenseList struct {
+		Version  string `json:"licenseListVersion"`
+		Licenses []struct {
+			ID          string   `json:"licenseId"`
+			Name        string   `json:"name"`
+			Text        string   `json:"licenseText"`
+			Deprecated  bool     `json:"isDeprecatedLicenseId"`
+			OSIApproved bool     `json:"isOsiApproved"`
+			SeeAlso     []string `json:"seeAlso"`
+		} `json:"licenses"`
+	}
+
+	var latest licenseList
+	if err = json.NewDecoder(resp.Body).Decode(&latest); err != nil {
+		t.Fatalf("unable to decode license list: %+v", err)
+	}
+
+	assert.Equal(t, latest.Version, spdxlicense.Version)
+}

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

@@ -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

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

@@ -25,7 +25,7 @@ func TestNpmPackageLockDirectory(t *testing.T) {
 	}
 
 	// ensure that integration test commonTestCases stay in sync with the available catalogers
-	const expectedPackageCount = 2
+	const expectedPackageCount = 6
 	if foundPackages.Size() != expectedPackageCount {
 		t.Errorf("found the wrong set of npm package-lock.json packages (expected: %d, actual: %d)", expectedPackageCount, foundPackages.Size())
 	}

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

@@ -5,7 +5,6 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/anchore/syft/internal/relationship"
 	"github.com/anchore/syft/syft/artifact"
 	"github.com/anchore/syft/syft/source"
 )
@@ -45,13 +44,12 @@ func TestBinaryElfRelationships(t *testing.T) {
 		}
 	}
 
-	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)
+		rels := sbom.RelationshipsForPackage(*p, artifact.DependencyOfRelationship)
 		require.NotEmpty(t, rels, "expected package %q to have relationships", name)
 
 		toIds := map[artifact.ID]struct{}{}

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

@@ -1,3 +1,5 @@
+//go:build !arm64
+
 package integration
 
 import (
@@ -5,6 +7,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 
 	"github.com/anchore/syft/syft/pkg"
 	"github.com/anchore/syft/syft/source"
@@ -19,39 +22,41 @@ func TestPackageDeduplication(t *testing.T) {
 	}{
 		{
 			scope:        source.AllLayersScope,
-			packageCount: 178, // without deduplication this would be ~600
+			packageCount: 172, // without deduplication this would be 618
 			instanceCount: map[string]int{
-				"basesystem":   1,
-				"wget":         1,
-				"curl-minimal": 2, // upgraded in the image
-				"vsftpd":       1,
-				"httpd":        1, // rpm, - we exclude binary
+				"basesystem": 1,
+				"wget":       1,
+				"curl":       2, // upgraded in the image
+				"vsftpd":     1,
+				"httpd":      1, // rpm, - we exclude binary
 			},
 			locationCount: map[string]int{
-				"basesystem-11-13.el9":               5, // in all layers
-				"curl-minimal-7.76.1-26.el9_3.2.0.1": 2, // base + wget layer
-				"curl-minimal-7.76.1-29.el9_4.1":     3, // curl upgrade layer + all above layers
-				"wget-1.21.1-8.el9_4":                4, // wget + all above layers
-				"vsftpd-3.0.5-5.el9":                 2, // vsftpd + all above layers
-				"httpd-2.4.57-11.el9_4.1":            1, // last layer
+				"basesystem-10.0-7.el7.centos": 4,
+				"curl-7.29.0-59.el7":           1, // from base image
+				"curl-7.29.0-59.el7_9.1":       3, // upgrade
+				"wget-1.14-18.el7_6.1":         3,
+				"vsftpd-3.0.2-29.el7_9":        2,
+				"httpd-2.4.6-97.el7.centos.5":  1,
+				// "httpd-2.4.6":                  1, // binary
 			},
 		},
 		{
 			scope:        source.SquashedScope,
-			packageCount: 172,
+			packageCount: 170,
 			instanceCount: map[string]int{
-				"basesystem":   1,
-				"wget":         1,
-				"curl-minimal": 1, // upgraded, but the most recent
-				"vsftpd":       1,
-				"httpd":        1, // rpm, binary is now excluded by overlap
+				"basesystem": 1,
+				"wget":       1,
+				"curl":       1, // upgraded, but the most recent
+				"vsftpd":     1,
+				"httpd":      1, // rpm, binary is now excluded by overlap
 			},
 			locationCount: map[string]int{
-				"basesystem-11-13.el9":           1,
-				"curl-minimal-7.76.1-29.el9_4.1": 1, // upgrade
-				"wget-1.21.1-8.el9_4":            1,
-				"vsftpd-3.0.5-5.el9":             1,
-				"httpd-2.4.57-11.el9_4.1":        1,
+				"basesystem-10.0-7.el7.centos": 1,
+				"curl-7.29.0-59.el7_9.1":       1, // upgrade
+				"wget-1.14-18.el7_6.1":         1,
+				"vsftpd-3.0.2-29.el7_9":        1,
+				"httpd-2.4.6-97.el7.centos.5":  1,
+				// "httpd-2.4.6":                  1, // binary (excluded)
 			},
 		},
 	}
@@ -70,21 +75,20 @@ func TestPackageDeduplication(t *testing.T) {
 				pkgs := sbom.Artifacts.Packages.PackagesByName(name)
 
 				// with multiple packages with the same name, something is wrong (or this is the wrong fixture)
-				if assert.Len(t, pkgs, expectedInstanceCount, "unexpected package count for %s", name) {
-					for _, p := range pkgs {
-						nameVersion := fmt.Sprintf("%s-%s", name, p.Version)
-						expectedLocationCount, ok := tt.locationCount[nameVersion]
-						if !ok {
-							t.Errorf("missing name-version: %s", nameVersion)
-							continue
-						}
+				require.Len(t, pkgs, expectedInstanceCount)
 
-						// we should see merged locations (assumption, there was 1 location for each package)
-						assert.Len(t, p.Locations.ToSlice(), expectedLocationCount, "unexpected location count for %s", nameVersion)
-
-						// all paths should match
-						assert.Len(t, p.Locations.CoordinateSet().Paths(), 1, "unexpected location count for %s", nameVersion)
+				for _, p := range pkgs {
+					nameVersion := fmt.Sprintf("%s-%s", name, p.Version)
+					expectedLocationCount, ok := tt.locationCount[nameVersion]
+					if !ok {
+						t.Fatalf("missing name-version: %s", nameVersion)
 					}
+
+					// we should see merged locations (assumption, there was 1 location for each package)
+					assert.Len(t, p.Locations.ToSlice(), expectedLocationCount)
+
+					// all paths should match
+					assert.Len(t, p.Locations.CoordinateSet().Paths(), 1)
 				}
 			}
 

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

@@ -1,25 +0,0 @@
-package integration
-
-import (
-	"reflect"
-	"testing"
-
-	"github.com/anchore/syft/syft/pkg"
-	"github.com/anchore/syft/syft/source"
-)
-
-func TestSbomMetadataComponent(t *testing.T) {
-	sbom, _ := catalogFixtureImage(t, "image-sbom-metadata-component", source.SquashedScope, "+sbom-cataloger")
-
-	expectedPkgs := []string{"first-subcomponent", "main-component"}
-	foundPkgs := []string{}
-
-	for sbomPkg := range sbom.Artifacts.Packages.Enumerate(pkg.JavaPkg) {
-		foundPkgs = append(foundPkgs, sbomPkg.Name)
-	}
-
-	// check if both the package in `.metadata.component` and the one in `.components` were found
-	if !reflect.DeepEqual(expectedPkgs, foundPkgs) {
-		t.Errorf("expected packages %v, got %v", expectedPkgs, foundPkgs)
-	}
-}

cmd/syft/internal/test/integration/test-fixtures/Makefile

@@ -1,21 +1,6 @@
-FINGERPRINT_FILE := cache.fingerprint
+# change these if you want CI to not use previous stored cache
+INTEGRATION_CACHE_BUSTER := "894d8ca"
 
-.DEFAULT_GOAL := fixtures
-
-# requirement 1: 'fixtures' goal to generate any and all test fixtures
-fixtures:
-	@echo "nothing to do"
-
-# requirement 2: 'fingerprint' goal to determine if the fixture input that indicates any existing cache should be busted
-fingerprint: $(FINGERPRINT_FILE)
-
-# requirement 3: we always need to recalculate the fingerprint based on source regardless of any existing fingerprint
-.PHONY: $(FINGERPRINT_FILE)
-$(FINGERPRINT_FILE):
-	@find image-* -type f -exec sha256sum {} \; | sort -k2 > $(FINGERPRINT_FILE)
-	@#cat $(FINGERPRINT_FILE) | sha256sum | awk '{print $$1}'
-
-# requirement 4: 'clean' goal to remove all generated test fixtures
-.PHONY: clean
-clean:
-	rm -f $(FINGERPRINT_FILE)
+.PHONY: cache.fingerprint
+cache.fingerprint:
+	find image-* -type f -exec md5sum {} + | awk '{print $1}' | sort | tee /dev/stderr | md5sum | tee cache.fingerprint && echo "$(INTEGRATION_CACHE_BUSTER)" >> cache.fingerprint

cmd/syft/internal/test/integration/test-fixtures/image-golang-compiler/Dockerfile

@@ -1,6 +1 @@
-FROM --platform=linux/amd64 golang:1.18.10-alpine
-
-FROM scratch
-
-# we don't need the entire golang toolchain, just a single binary with the stdlib baked in
-COPY --from=0 /usr/local/go/bin/gofmt bin/gofmt
+FROM golang:1.18.10-alpine

cmd/syft/internal/test/integration/test-fixtures/image-java-no-main-package/Dockerfile

@@ -1,4 +1,4 @@
-FROM jenkins/jenkins:2.346.3-slim-jdk17@sha256:028fbbd9112c60ed086f5197fcba71992317864d27644e5949cf9c52ff4b65f0 AS base
+FROM jenkins/jenkins:2.346.3-slim-jdk17@sha256:028fbbd9112c60ed086f5197fcba71992317864d27644e5949cf9c52ff4b65f0
 
 USER root
 
@@ -12,7 +12,7 @@ RUN apt-get update 2>&1 > /dev/null && apt-get install -y less zip 2>&1 > /dev/n
 
 RUN unzip ../jenkins.war 2>&1 > /dev/null
 
-RUN rm -rf ./META-INF/MANIFEST.MF ./WEB-INF ./jsbundles ./scripts ./css
+RUN rm -f ./META-INF/MANIFEST.MF
 
 WORKDIR /usr/share/jenkins
 
@@ -21,7 +21,3 @@ RUN rm -rf jenkins.war
 RUN cd ./tmp && zip -r ../jenkins.war . && cd ..
 
 RUN rm -rf ./tmp
-
-FROM scratch
-
-COPY --from=base /usr/share/jenkins/jenkins.war /jenkins.war

cmd/syft/internal/test/integration/test-fixtures/image-java-virtualpath-regression/Dockerfile

@@ -1,15 +1,7 @@
-FROM alpine:3.18.3@sha256:7144f7bab3d4c2648d7e59409f15ec52a18006a128c733fcff20d3a4a54ba44a AS base
+FROM alpine:3.18.3@sha256:7144f7bab3d4c2648d7e59409f15ec52a18006a128c733fcff20d3a4a54ba44a
 
 RUN wget https://repo1.maven.org/maven2/org/jvnet/hudson/main/hudson-war/2.2.1/hudson-war-2.2.1.war
 
 RUN mv hudson-war-2.2.1.war hudson.war
 
-# let's make this image a little smaller as to not take up so much disk space
-# we'll only keep the jar metadata files (pom data + manifest) and throw away the rest
-RUN apk add --no-cache python3 py3-pip
-COPY extract.py /extract.py
-RUN python extract.py
 
-FROM scratch
-
-COPY --from=base /slim /

cmd/syft/internal/test/integration/test-fixtures/image-java-virtualpath-regression/extract.py

@@ -1,69 +0,0 @@
-import os
-import zipfile
-import io
-
-ARCHIVE_EXTENSIONS = ('.jar', '.war', '.ear', '.hpi', '.war', '.sar', '.nar', '.par')
-METADATA_FILES = ('pom.xml', 'pom.properties', 'MANIFEST.MF')
-
-
-def slim_archive(archive, output_dir, base_path="", archive_name=""):
-    """
-    extracts metadata files from the archive and creates a slim JAR file
-    containing only these files. handles nested JARs by preserving them.
-    """
-    slim_buffer = io.BytesIO()
-    with zipfile.ZipFile(archive, 'r') as zip_file:
-        with zipfile.ZipFile(slim_buffer, 'w', zipfile.ZIP_DEFLATED) as slim_zip:
-            for file_name in zip_file.namelist():
-                # check for metadata files or nested JARs
-                if file_name.endswith(METADATA_FILES):
-                    # add metadata files directly to the slimmed archive
-                    file_data = zip_file.read(file_name)
-                    slim_zip.writestr(file_name, file_data)
-                elif file_name.endswith(ARCHIVE_EXTENSIONS):
-                    # if it's a nested archive, recursively slim it
-                    nested_archive = io.BytesIO(zip_file.read(file_name))
-                    nested_slim_buffer = io.BytesIO()
-                    slim_archive(
-                        nested_archive,
-                        nested_slim_buffer,
-                        base_path=os.path.join(base_path, os.path.dirname(file_name)),
-                        archive_name=os.path.basename(file_name)
-                    )
-                    # add the slimmed nested archive back to the parent archive
-                    nested_slim_buffer.seek(0)
-                    slim_zip.writestr(file_name, nested_slim_buffer.read())
-
-    # write out the slimmed JAR to the output directory if output_dir is a directory
-    if isinstance(output_dir, str):
-        output_path = os.path.join(output_dir, base_path, archive_name)
-        os.makedirs(os.path.dirname(output_path), exist_ok=True)
-        with open(output_path, 'wb') as f:
-            slim_buffer.seek(0)
-            f.write(slim_buffer.read())
-    else:
-        # if output_dir is a BytesIO buffer (for nested archives), just write to it
-        output_dir.seek(0)
-        output_dir.write(slim_buffer.getvalue())
-
-
-def walk_directory_and_slim_jars(base_dir, output_dir):
-    """
-    recursively walks through a directory tree looking for .jar, .war, .ear,
-    .hpi files and slims them down by keeping only metadata files.
-    """
-    for dirpath, _, filenames in os.walk(base_dir):
-        for filename in filenames:
-            if filename.endswith(ARCHIVE_EXTENSIONS):
-                archive_path = os.path.join(dirpath, filename)
-                print(f"Processing {archive_path}")
-                slim_archive(archive_path, output_dir, os.path.relpath(dirpath, base_dir), filename)
-
-
-# a helper script for slimming down JAR files by keeping only metadata files but still keeping the jar packaging,
-# including nested JARs! Useful for testing purposes.
-if __name__ == "__main__":
-    BASE_DIR = "."
-    OUTPUT_DIR = "./slim"
-    os.makedirs(OUTPUT_DIR, exist_ok=True)
-    walk_directory_and_slim_jars(BASE_DIR, OUTPUT_DIR)

cmd/syft/internal/test/integration/test-fixtures/image-large-apk-data/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine@sha256:d9a7354e3845ea8466bb00b22224d9116b183e594527fb5b6c3d30bc01a20378 AS base
+FROM alpine@sha256:d9a7354e3845ea8466bb00b22224d9116b183e594527fb5b6c3d30bc01a20378
 
 # we keep these unpinned so that if alpine
 # changes our integration tests can adapt
@@ -6,8 +6,3 @@ RUN apk add --no-cache \
             tzdata \
             vim \
             alpine-sdk
-
-# we don't need the installed bins for this test, only the APK installed metadata
-FROM scratch
-
-COPY --from=base /lib/apk/db/installed /lib/apk/db/installed

cmd/syft/internal/test/integration/test-fixtures/image-mariner-distroless/Dockerfile

@@ -1,8 +1 @@
-FROM mcr.microsoft.com/cbl-mariner/distroless/base:2.0.202205275@sha256:f550c5428df17b145851ad75983aca6d613ad4b51ca7983b2a83e67d0ac91a5d AS base
-
-# let's shoot for smaller test fixtures
-FROM scratch
-
-COPY --from=base /var/lib/rpmmanifest/container-manifest-2 /var/lib/rpmmanifest/container-manifest-2
-COPY --from=base /usr/bin/gencat /usr/bin/gencat
-COPY --from=base /usr/bin/openssl /usr/bin/openssl
+FROM mcr.microsoft.com/cbl-mariner/distroless/base:2.0.202205275@sha256:f550c5428df17b145851ad75983aca6d613ad4b51ca7983b2a83e67d0ac91a5d

cmd/syft/internal/test/integration/test-fixtures/image-owning-package/Dockerfile

@@ -1,8 +1,3 @@
-FROM ubuntu:20.04@sha256:33a5cc25d22c45900796a1aca487ad7a7cb09f09ea00b779e3b2026b4fc2faba AS base
+FROM ubuntu:20.04@sha256:33a5cc25d22c45900796a1aca487ad7a7cb09f09ea00b779e3b2026b4fc2faba
 # this covers rpm-python
 RUN apt-get update && apt-get install -y python-pil=6.2.1-3
-
-# let's save some space...
-FROM scratch
-
-COPY --from=base /var/lib/dpkg/status /var/lib/dpkg/status

cmd/syft/internal/test/integration/test-fixtures/image-photon-all-layers/Dockerfile

@@ -1,5 +1 @@
-FROM photon:5.0-20230729@sha256:4cf2a1ce0a3f4625f13a0becb6b9bccfdb014c565be6e9a2ec4c4aad1ff8a5d9 AS base
-
-FROM scratch
-
-COPY --from=base /usr/lib/sysimage/rpm /usr/lib/sysimage/rpm
+FROM photon:5.0-20230729@sha256:4cf2a1ce0a3f4625f13a0becb6b9bccfdb014c565be6e9a2ec4c4aad1ff8a5d9

cmd/syft/internal/test/integration/test-fixtures/image-pkg-coverage/pkgs/opam/ocaml-base-compiler.4.14.0/opam

@@ -1,93 +0,0 @@
-opam-version: "2.0"
-synopsis: "Official release 4.14.0"
-maintainer: [
-  "David Allsopp <david@tarides.com>"
-  "Florian Angeletti <florian.angeletti@inria.fr>"
-]
-authors: "Xavier Leroy and many contributors"
-license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception"
-homepage: "https://ocaml.org"
-bug-reports: "https://github.com/ocaml/opam-repository/issues"
-depends: [
-  "ocaml" {= "4.14.0" & post}
-  "base-unix" {post}
-  "base-bigarray" {post}
-  "base-threads" {post}
-  "host-arch-arm32" {arch = "arm32" & post}
-  "host-arch-arm64" {arch = "arm64" & post}
-  "host-arch-ppc64" {arch = "ppc64" & post}
-  "host-arch-riscv64" {arch = "riscv64" & post}
-  "host-arch-s390x" {arch = "s390x" & post}
-  "host-arch-x86_32" {os != "win32" & arch = "x86_32" & post}
-  "host-arch-x86_64" {os != "win32" & arch = "x86_64" & post}
-  "host-arch-unknown"
-    {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" &
-     arch != "riscv64" &
-     arch != "s390x" &
-     arch != "x86_32" &
-     arch != "x86_64" &
-     post}
-  (("arch-x86_64" {os = "win32" & arch = "x86_64"} &
-    (("system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & post}) |
-     "system-msvc")) |
-   ("arch-x86_32" {os = "win32"} &
-    (("system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & post}) |
-     "system-msvc")) |
-   "host-system-other" {os != "win32" & post})
-  "ocaml-options-vanilla" {post}
-  "flexdll" {>= "0.36" & os = "win32"}
-]
-conflict-class: "ocaml-core-compiler"
-flags: compiler
-setenv: CAML_LD_LIBRARY_PATH = "%{lib}%/stublibs"
-build: [
-  [
-    "./configure"
-    "--host=x86_64-pc-windows"
-      {system-msvc:installed & arch-x86_64:installed}
-    "--host=x86_64-w64-mingw32"
-      {os-distribution = "cygwin" & system-mingw:installed &
-       arch-x86_64:installed}
-    "--host=i686-pc-windows" {system-msvc:installed & arch-x86_32:installed}
-    "--host=i686-w64-mingw32"
-      {os-distribution = "cygwin" & system-mingw:installed &
-       arch-x86_32:installed}
-    "--prefix=%{prefix}%"
-    "--docdir=%{doc}%/ocaml"
-    "--with-flexdll=%{flexdll:share}%" {os = "win32" & flexdll:installed}
-    "-C"
-    "CC=cc" {os = "openbsd" | os = "macos"}
-    "ASPP=cc -c" {os = "openbsd" | os = "macos"}
-  ]
-  [make "-j%{jobs}%"]
-]
-install: [make "install"]
-build-env: MSYS2_ARG_CONV_EXCL = "*"
-post-messages: [
-  """\
-A failure in the middle of the build may be caused by build parallelism
-   (enabled by default).
-   Please file a bug report at https://github.com/ocaml/opam-repository/issues"""
-    {failure & jobs > "1"}
-  """\
-You can try installing again including --jobs=1
-   to force a sequential build instead."""
-    {failure & jobs > "1" & opam-version >= "2.0.5"}
-]
-dev-repo: "git+https://github.com/ocaml/ocaml#4.14"
-url {
-  src: "https://github.com/ocaml/ocaml/archive/4.14.0.tar.gz"
-  checksum:
-    "sha256=39f44260382f28d1054c5f9d8bf4753cb7ad64027da792f7938344544da155e8"
-}
-extra-source "ocaml-base-compiler.install" {
-  src:
-    "https://raw.githubusercontent.com/ocaml/opam-source-archives/main/patches/ocaml-base-compiler/ocaml-base-compiler.install"
-  checksum: [
-    "sha256=79f2a1a5044a91350a0eb6ce12e261a72a2855c094c425cddf3860e58c486678"
-    "md5=3e969b841df1f51ca448e6e6295cb451"
-  ]
-}
-x-env-path-rewrite: [
-  [CAML_LD_LIBRARY_PATH (";" {os = "win32"} ":" {os != "win32"}) "target"]
-]

cmd/syft/internal/test/integration/test-fixtures/image-pkg-coverage/swipl/pack/hdt/pack.pl

@@ -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' ).

cmd/syft/internal/test/integration/test-fixtures/image-pkg-coverage/terraform/.terraform.lock.hcl

@@ -1,25 +0,0 @@
-# This file is maintained automatically by "terraform init".
-# Manual edits may be lost in future updates.
-
-provider "registry.terraform.io/hashicorp/aws" {
-  version     = "5.72.1"
-  constraints = ">= 5.72.0"
-  hashes = [
-    "h1:jhd5O5o0CfZCNEwwN0EiDAzb7ApuFrtxJqa6HXW4EKE=",
-    "zh:0dea6843836e926d33469b48b948744079023816d16a2ff7666bcfb6aa3522d4",
-    "zh:195fa9513f75800a0d62797ebec75ee73e9b8c28d713fe9b63d3b1d1eec129b3",
-    "zh:1ed92f3961715bf0e024bcde3c12dfbdc50b00c1f8a43cc00802cfc45a256208",
-    "zh:2ac687e3a52606466cae4a6813e81d923042488df88d2424e28d3f8530f091bb",
-    "zh:32e7ca75f9314557daada3c44628fe1f3bf964a4f833bfb4b2295d833fe64b6f",
-    "zh:374ee0e6b4327cc6ef666908ce5d6450a3a56e90cd2b785e83c2bcfc100021d2",
-    "zh:5500fd6fdac44f96411fcf9c6d01691159ec35455ed127eb4c3a498e1cc92a64",
-    "zh:723a2dc4b064c12e7ee62ad4fbfd72fa5e025206ea47b735994ef53f3c373152",
-    "zh:89d97b87605f1d734f27e642567cbecf785b521af8ea81dac55c77ccde876221",
-    "zh:951ee1e5731e8d65d521d71b95927e55055b3c4656eef6d46fa580a63328befc",
-    "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425",
-    "zh:9b2b362470b64ec227b2da64762ab8bc4111c6b80365fd9d82fc5e1e33f44038",
-    "zh:aa6e57d0cb974ff0da5dee5d43ad2745cbbc4a2b507d4c799839b9fa96daf688",
-    "zh:ba0d14c4a6b7aa844a830d47c0bf995b632e37f0795394b5b60c638b62b7fc03",
-    "zh:c9764065a9c5d324db0b02bd201b9e3a2118e49c4960884acdeea377173302e9",
-  ]
-}

cmd/syft/internal/test/integration/test-fixtures/image-sbom-metadata-component/Dockerfile

@@ -1,2 +0,0 @@
-FROM scratch
-COPY test.cdx.json /

cmd/syft/internal/test/integration/test-fixtures/image-sbom-metadata-component/test.cdx.json

@@ -1,32 +0,0 @@
-{
-  "bomFormat" : "CycloneDX",
-  "specVersion" : "1.5",
-  "serialNumber" : "urn:uuid:dc807d4b-0415-35ab-ba61-49b5d39bc2d9",
-  "version" : 1,
-  "metadata" : {
-    "component" : {
-      "name" : "main-component",
-      "version" : "1.2.3",
-      "purl" : "pkg:maven/org.example/main-component@1.2.3",
-      "type" : "library",
-      "bom-ref" : "pkg:maven/org.example/main-component@1.2.3"
-    }
-  },
-  "components" : [
-    {
-      "name" : "first-subcomponent",
-      "version" : "2.3.4",
-      "purl" : "pkg:maven/org.example/first-subcomponent@2.3.4",
-      "type" : "library",
-      "bom-ref" : "pkg:maven/org.example/first-subcomponent@2.3.4"
-    }
-  ],
-  "dependencies" : [
-    {
-      "ref" : "pkg:maven/org.example/main-component-assembly@1.2.3",
-      "dependsOn" : [
-        "pkg:maven/org.example/first-subcomponent@2.3.4"
-      ]
-    }
-  ]
-}

cmd/syft/internal/test/integration/test-fixtures/image-sqlite-rpmdb/Dockerfile

@@ -1,6 +1 @@
-FROM fedora:35@sha256:36af84ba69e21c9ef86a0424a090674c433b2b80c2462e57503886f1d823abe8 AS base
-
-# lets save some space
-FROM scratch
-
-COPY --from=base /var/lib/rpm /var/lib/rpm
+FROM fedora:35@sha256:36af84ba69e21c9ef86a0424a090674c433b2b80c2462e57503886f1d823abe8

cmd/syft/internal/test/integration/test-fixtures/image-suse-all-layers/Dockerfile

@@ -1,11 +1,2 @@
-FROM registry.suse.com/suse/sle15:15.3.17.20.20@sha256:fd657ecbab5ca564d6933e887f6ae8542a9398e6a4b399f352ce10c3a24afc64 AS base
+FROM registry.suse.com/suse/sle15:15.3.17.20.20@sha256:fd657ecbab5ca564d6933e887f6ae8542a9398e6a4b399f352ce10c3a24afc64
 RUN zypper in -y wget
-
-# let's save some space... we really just need an image that has an RPM DB that is linked across layers
-FROM --platform=linux/amd64 busybox:1.36.1
-
-# setup a link /var/lib/rpm -> ../../usr/lib/sysimage/rpm
-RUN mkdir -p /var/lib && ln -s ../../usr/lib/sysimage/rpm /var/lib/rpm
-
-# copy the RPM DB from the SUSE image
-COPY --from=base /usr/lib/sysimage/rpm/Packages.db /usr/lib/sysimage/rpm/Packages.db

cmd/syft/internal/test/integration/test-fixtures/image-test-java-purls/Dockerfile

@@ -1,18 +1 @@
-FROM docker.io/anchore/test_images:java-88948cc@sha256:dea0e6c24636937f53bdc997d9960c2a18966d1e38bcd8ebd0c395d4e169b806 AS base
-
-# not covered in testing...
-RUN rm /packages/gradle-7.1.1-bin.zip
-
-RUN apk add --no-cache python3 py3-pip
-
-COPY extract.py /extract.py
-
-WORKDIR /
-
-# let's make this image a little smaller as to not take up so much disk space
-# we'll only keep the jar metadata files (pom data + manifest) and throw away the rest
-RUN python extract.py
-
-FROM scratch
-
-COPY --from=base /slim/packages /packages
+FROM anchore/test_images:java-1abc58f@sha256:3add9f90e9ed35739cc99b7830767e09eec921052e2412adf4491648c741f066

cmd/syft/internal/test/integration/test-fixtures/image-test-java-purls/extract.py

@@ -1,69 +0,0 @@
-import os
-import zipfile
-import io
-
-ARCHIVE_EXTENSIONS = ('.jar', '.war', '.ear', '.hpi', '.war', '.sar', '.nar', '.par')
-METADATA_FILES = ('pom.xml', 'pom.properties', 'MANIFEST.MF')
-
-
-def slim_archive(archive, output_dir, base_path="", archive_name=""):
-    """
-    extracts metadata files from the archive and creates a slim JAR file
-    containing only these files. handles nested JARs by preserving them.
-    """
-    slim_buffer = io.BytesIO()
-    with zipfile.ZipFile(archive, 'r') as zip_file:
-        with zipfile.ZipFile(slim_buffer, 'w', zipfile.ZIP_DEFLATED) as slim_zip:
-            for file_name in zip_file.namelist():
-                # check for metadata files or nested JARs
-                if file_name.endswith(METADATA_FILES):
-                    # add metadata files directly to the slimmed archive
-                    file_data = zip_file.read(file_name)
-                    slim_zip.writestr(file_name, file_data)
-                elif file_name.endswith(ARCHIVE_EXTENSIONS):
-                    # if it's a nested archive, recursively slim it
-                    nested_archive = io.BytesIO(zip_file.read(file_name))
-                    nested_slim_buffer = io.BytesIO()
-                    slim_archive(
-                        nested_archive,
-                        nested_slim_buffer,
-                        base_path=os.path.join(base_path, os.path.dirname(file_name)),
-                        archive_name=os.path.basename(file_name)
-                    )
-                    # add the slimmed nested archive back to the parent archive
-                    nested_slim_buffer.seek(0)
-                    slim_zip.writestr(file_name, nested_slim_buffer.read())
-
-    # write out the slimmed JAR to the output directory if output_dir is a directory
-    if isinstance(output_dir, str):
-        output_path = os.path.join(output_dir, base_path, archive_name)
-        os.makedirs(os.path.dirname(output_path), exist_ok=True)
-        with open(output_path, 'wb') as f:
-            slim_buffer.seek(0)
-            f.write(slim_buffer.read())
-    else:
-        # if output_dir is a BytesIO buffer (for nested archives), just write to it
-        output_dir.seek(0)
-        output_dir.write(slim_buffer.getvalue())
-
-
-def walk_directory_and_slim_jars(base_dir, output_dir):
-    """
-    recursively walks through a directory tree looking for .jar, .war, .ear,
-    .hpi files and slims them down by keeping only metadata files.
-    """
-    for dirpath, _, filenames in os.walk(base_dir):
-        for filename in filenames:
-            if filename.endswith(ARCHIVE_EXTENSIONS):
-                archive_path = os.path.join(dirpath, filename)
-                print(f"Processing {archive_path}")
-                slim_archive(archive_path, output_dir, os.path.relpath(dirpath, base_dir), filename)
-
-
-# a helper script for slimming down JAR files by keeping only metadata files but still keeping the jar packaging,
-# including nested JARs! Useful for testing purposes.
-if __name__ == "__main__":
-    BASE_DIR = "."
-    OUTPUT_DIR = "./slim"
-    os.makedirs(OUTPUT_DIR, exist_ok=True)
-    walk_directory_and_slim_jars(BASE_DIR, OUTPUT_DIR)

cmd/syft/internal/test/integration/test-fixtures/image-vertical-package-dups/Dockerfile

@@ -1,27 +1,6 @@
-FROM --platform=linux/amd64 rockylinux:9.3.20231119@sha256:d644d203142cd5b54ad2a83a203e1dee68af2229f8fe32f52a30c6e1d3c3a9e0 AS base
-
+FROM centos:7.9.2009@sha256:be65f488b7764ad3638f236b7b515b3678369a5124c47b8d32916d6487418ea4
 # modifying the RPM DB multiple times will result in duplicate packages when using all-layers (if there was no de-dup logic)
 # curl is tricky, it already exists in the image and is being upgraded
-
-# but... we want to make the test image as small as possible, so we are making the changes in stages and then
-# copying the RPM DB from each stage to a final stage in separate layers. This will result in a much smaller image.
-
-FROM base AS stage1
-RUN dnf install -y wget
-
-FROM stage1 AS stage2
-RUN dnf update -y curl-minimal
-
-FROM stage2 AS stage3
-RUN dnf install -y vsftpd
-
-FROM stage3 AS stage4
-RUN dnf install -y httpd
-
-FROM scratch
-
-COPY --from=base /var/lib/rpm /var/lib/rpm
-COPY --from=stage1 /var/lib/rpm /var/lib/rpm
-COPY --from=stage2 /var/lib/rpm /var/lib/rpm
-COPY --from=stage3 /var/lib/rpm /var/lib/rpm
-COPY --from=stage4 /var/lib/rpm /var/lib/rpm
+RUN yum install -y wget-1.14-18.el7_6.1 curl-7.29.0-59.el7_9.1
+RUN yum install -y vsftpd-3.0.2-29.el7_9
+RUN yum install -y httpd-2.4.6-97.el7.centos.5

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

@@ -10,7 +10,6 @@ import (
 	"github.com/anchore/stereoscope/pkg/imagetest"
 	"github.com/anchore/syft/cmd/syft/internal/options"
 	"github.com/anchore/syft/syft"
-	"github.com/anchore/syft/syft/cataloging"
 	"github.com/anchore/syft/syft/cataloging/pkgcataloging"
 	"github.com/anchore/syft/syft/sbom"
 	"github.com/anchore/syft/syft/source"
@@ -21,7 +20,7 @@ func catalogFixtureImage(t *testing.T, fixtureImageName string, scope source.Sco
 		Name:    "syft-tester",
 		Version: "v0.99.0",
 	}).WithCatalogerSelection(
-		cataloging.NewSelectionRequest().
+		pkgcataloging.NewSelectionRequest().
 			WithExpression(catalogerSelection...),
 	)
 	cfg.Search.Scope = scope
@@ -56,7 +55,7 @@ func catalogDirectory(t *testing.T, dir string, catalogerSelection ...string) (s
 		Name:    "syft-tester",
 		Version: "v0.99.0",
 	}).WithCatalogerSelection(
-		cataloging.NewSelectionRequest().
+		pkgcataloging.NewSelectionRequest().
 			WithExpression(catalogerSelection...),
 	)
 

cmd/syft/internal/ui/capture.go

@@ -17,11 +17,11 @@ const defaultStdoutLogBufferSize = 1024
 //	restore := CaptureStdoutToTraceLog()
 //	// here, stdout will be captured and redirected to the provided writer
 //	restore() // block until the output has all been sent to the writer and restore the original stdout
-func CaptureStdoutToTraceLog() func() {
+func CaptureStdoutToTraceLog() (close func()) {
 	return capture(&os.Stdout, newLogWriter(), defaultStdoutLogBufferSize)
 }
 
-func capture(target **os.File, writer io.Writer, bufSize int) func() {
+func capture(target **os.File, writer io.Writer, bufSize int) (close func()) {
 	original := *target
 
 	r, w, _ := os.Pipe()

cmd/syft/internal/ui/ui.go

@@ -78,13 +78,6 @@ func (m *UI) Handle(e partybus.Event) error {
 }
 
 func (m *UI) Teardown(force bool) error {
-	defer func() {
-		// allow for traditional logging to resume now that the UI is shutting down
-		if logWrapper, ok := log.Get().(logger.Controller); ok {
-			logWrapper.SetOutput(m.err)
-		}
-	}()
-
 	if !force {
 		m.handler.Wait()
 		m.program.Quit()
@@ -150,7 +143,7 @@ func (m *UI) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		}
 
 	case partybus.Event:
-		log.WithFields("component", "ui", "event", msg.Type).Trace("event")
+		log.WithFields("component", "ui").Tracef("event: %q", msg.Type)
 
 		switch msg.Type {
 		case event.CLIReport, event.CLINotification, event.CLIAppUpdateAvailable:

examples/create_custom_sbom/main.go

@@ -74,7 +74,7 @@ func getSBOM(src source.Source) sbom.SBOM {
 		// only use OS related catalogers that would have been used with the kind of
 		// source type (container image or directory), but also add a specific python cataloger
 		WithCatalogerSelection(
-			cataloging.NewSelectionRequest().
+			pkgcataloging.NewSelectionRequest().
 				WithSubSelections("os").
 				WithAdditions("python-package-cataloger"),
 		).

examples/select_catalogers/main.go

@@ -6,7 +6,6 @@ import (
 	"os"
 
 	"github.com/anchore/syft/syft"
-	"github.com/anchore/syft/syft/cataloging"
 	"github.com/anchore/syft/syft/cataloging/pkgcataloging"
 	"github.com/anchore/syft/syft/sbom"
 	"github.com/anchore/syft/syft/source"
@@ -56,7 +55,7 @@ func getSBOM(src source.Source, defaultTags ...string) sbom.SBOM {
 		WithCatalogerSelection(
 			// here you can sub-select, add, remove catalogers from the default selection...
 			// or replace the default selection entirely!
-			cataloging.NewSelectionRequest().
+			pkgcataloging.NewSelectionRequest().
 				WithDefaults(defaultTags...),
 		)
 

go.mod

@@ -1,261 +1,255 @@
 module github.com/anchore/syft
 
-go 1.24.0
+go 1.21.0
 
 require (
-	github.com/CycloneDX/cyclonedx-go v0.9.2
+	github.com/CycloneDX/cyclonedx-go v0.8.0
 	github.com/Masterminds/semver v1.5.0
-	github.com/Masterminds/sprig/v3 v3.3.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-20241115144204-29e89f9fa837
-	github.com/anchore/fangs v0.0.0-20241014201141-b6e4b3469f10
+	github.com/anchore/clio v0.0.0-20240522144804-d81e109008aa
+	github.com/anchore/fangs v0.0.0-20240508143433-f016b099950f
 	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.20250220190351-d62adb6e1115
-	github.com/anchore/stereoscope v0.0.13
+	github.com/anchore/packageurl-go v0.1.1-0.20240507183024-848e011fc24f
+	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.1
-	github.com/bmatcuk/doublestar/v4 v4.8.1
-	github.com/charmbracelet/bubbles v0.20.0
-	github.com/charmbracelet/bubbletea v1.2.4
-	github.com/charmbracelet/lipgloss v1.0.0
-	github.com/dave/jennifer v1.7.1
+	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.3
+	github.com/charmbracelet/lipgloss v0.11.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 v28.0.0+incompatible
+	github.com/docker/docker v26.1.3+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.2
-	github.com/gkampitakis/go-snaps v0.5.11
-	github.com/go-git/go-billy/v5 v5.6.2
-	github.com/go-git/go-git/v5 v5.13.2
-	github.com/go-test/deep v1.1.1
+	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.0
 	github.com/google/go-cmp v0.6.0
-	github.com/google/go-containerregistry v0.20.3
+	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.6.6
+	github.com/jedib0t/go-pretty/v6 v6.5.9
 	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/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.6
+	github.com/saferwall/pe v1.5.3
 	github.com/saintfish/chardet v0.0.0-20230101081208-5e3ef4b5456d
-	github.com/sanity-io/litter v1.5.8
+	github.com/sanity-io/litter v1.5.5
 	github.com/sassoftware/go-rpmutils v0.4.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/spf13/afero v1.12.0
-	github.com/spf13/cobra v1.9.1
-	github.com/stretchr/testify v1.10.0
-	github.com/vbatts/go-mtree v0.5.4
+	github.com/spdx/tools-golang v0.5.4
+	github.com/spf13/afero v1.11.0
+	github.com/spf13/cobra v1.8.0
+	github.com/stretchr/testify v1.9.0
+	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.23.0
-	golang.org/x/net v0.35.0
+	golang.org/x/mod v0.17.0
+	golang.org/x/net v0.25.0
 	gopkg.in/yaml.v3 v3.0.1
-	modernc.org/sqlite v1.35.0
+	modernc.org/sqlite v1.29.10
 )
 
-require google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 // indirect
+require google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 // indirect
+
+require github.com/magiconair/properties v1.8.7
 
 require (
-	github.com/BurntSushi/toml v1.4.0
-	github.com/OneOfOne/xxhash v1.2.8
-	github.com/adrg/xdg v0.5.3
-	github.com/anchore/archiver/v3 v3.5.3-0.20241210171143-5b1d8d1c7c51
-	github.com/bitnami/go-version v0.0.0-20250131085805-b1f57a8634ef
-	github.com/hashicorp/hcl/v2 v2.23.0
-	github.com/magiconair/properties v1.8.9
-	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
-)
-
-require (
-	dario.cat/mergo v1.0.1 // indirect
+	dario.cat/mergo v1.0.0 // indirect
 	github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
 	github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20230306123547-8075edf89bb0 // indirect
 	github.com/DataDog/zstd v1.5.5 // indirect
 	github.com/Masterminds/goutils v1.1.1 // indirect
-	github.com/Masterminds/semver/v3 v3.3.0 // indirect
-	github.com/Microsoft/go-winio v0.6.2 // indirect
-	github.com/Microsoft/hcsshim v0.11.7 // indirect
-	github.com/ProtonMail/go-crypto v1.1.5 // indirect
-	github.com/agext/levenshtein v1.2.1 // indirect; indirectt
+	github.com/Masterminds/semver/v3 v3.2.0 // indirect
+	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.1.1 // indirect
-	github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
-	github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
-	github.com/aquasecurity/go-version v0.0.1 // indirect
+	github.com/andybalholm/brotli v1.0.4 // indirect
+	github.com/aquasecurity/go-version v0.0.0-20210121072130-637058cfe492 // indirect
 	github.com/atotto/clipboard v0.1.4 // indirect
 	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.4.5 // indirect
-	github.com/charmbracelet/x/term v0.2.1 // indirect
+	github.com/charmbracelet/x/ansi v0.1.1 // 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/containerd/cgroups v1.1.0 // indirect
-	github.com/containerd/containerd v1.7.24 // indirect
-	github.com/containerd/containerd/api v1.7.19 // indirect
+	github.com/containerd/containerd v1.7.11 // indirect
 	github.com/containerd/continuity v0.4.2 // indirect
-	github.com/containerd/errdefs v0.3.0 // indirect
 	github.com/containerd/fifo v1.1.0 // indirect
 	github.com/containerd/log v0.1.0 // indirect
-	github.com/containerd/platforms v0.2.1 // indirect
-	github.com/containerd/stargz-snapshotter/estargz v0.16.3 // indirect
-	github.com/containerd/ttrpc v1.2.5 // indirect
+	github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect
+	github.com/containerd/ttrpc v1.2.2 // indirect
 	github.com/containerd/typeurl/v2 v2.1.1 // indirect
-	github.com/cyphar/filepath-securejoin v0.3.6 // 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.5.0+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.8.2 // indirect
-	github.com/docker/go-connections v0.5.0 // indirect
+	github.com/docker/docker-credential-helpers v0.7.0 // indirect
+	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
 	github.com/docker/go-units v0.5.0 // indirect
 	github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 // indirect
 	github.com/edsrzf/mmap-go v1.1.0 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
 	github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
-	github.com/felixge/fgprof v0.9.5 // indirect
-	github.com/felixge/httpsnoop v1.0.4 // 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.8 // indirect
-	github.com/gkampitakis/ciinfo v0.3.1 // 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
-	github.com/go-logr/logr v1.4.2 // indirect
+	github.com/go-logr/logr v1.2.4 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-restruct/restruct v1.2.0-alpha // indirect
-	github.com/goccy/go-yaml v1.15.13 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/pprof v0.0.0-20240409012703-83162a5b38cd // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
+	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
-	github.com/huandu/xstrings v1.5.0 // indirect
+	github.com/huandu/xstrings v1.3.3 // indirect
 	github.com/iancoleman/orderedmap v0.0.0-20190318233801-ac98e3ecb4b0 // indirect
+	github.com/imdario/mergo v0.3.15 // indirect
 	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.11 // indirect
-	github.com/klauspost/pgzip v1.2.6 // indirect
+	github.com/klauspost/compress v1.17.8 // 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/maruel/natural v1.1.1 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mattn/go-localereader v0.0.2-0.20220822084749-2491eb6c1c75 // indirect
-	github.com/mattn/go-runewidth v0.0.16 // indirect
+	github.com/mattn/go-runewidth v0.0.15 // indirect
 	github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
-	github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/moby/docker-image-spec v1.3.1 // indirect
 	github.com/moby/locker v1.0.1 // indirect
 	github.com/moby/sys/sequential v0.5.0 // indirect
 	github.com/moby/sys/signal v0.7.0 // indirect
-	github.com/moby/sys/user v0.3.0 // indirect
-	github.com/moby/sys/userns v0.1.0 // indirect
 	github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
 	github.com/muesli/cancelreader v0.2.2 // indirect
+	github.com/muesli/reflow v0.3.0 // indirect
 	github.com/muesli/termenv v0.15.2 // indirect
 	github.com/ncruces/go-strftime v0.1.9 // indirect
-	github.com/nwaples/rardecode v1.1.3 // indirect
-	github.com/opencontainers/image-spec v1.1.0 // indirect
-	github.com/opencontainers/runtime-spec v1.1.0 // indirect
+	github.com/nwaples/rardecode 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.2.2 // indirect
-	github.com/pierrec/lz4/v4 v4.1.21 // indirect
-	github.com/pjbgf/sha1cd v0.3.2 // indirect
+	github.com/pelletier/go-toml/v2 v2.1.0 // 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
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
-	github.com/rogpeppe/go-internal v1.13.1 // indirect
+	github.com/rogpeppe/go-internal v1.12.0 // indirect
 	github.com/sagikazarmark/locafero v0.4.0 // indirect
 	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
-	github.com/sahilm/fuzzy v0.1.1 // 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.4.0 // indirect
+	github.com/shopspring/decimal v1.2.0 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
-	github.com/skeema/knownhosts v1.3.0 // indirect
+	github.com/skeema/knownhosts v1.2.2 // indirect
 	github.com/sourcegraph/conc v0.3.0 // indirect
-	github.com/spf13/cast v1.7.0 // indirect
-	github.com/spf13/pflag v1.0.6 // indirect
-	github.com/spf13/viper v1.19.0 // indirect
+	github.com/spf13/cast v1.6.0 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/spf13/viper v1.18.2 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
-	github.com/sylabs/sif/v2 v2.20.2 // indirect
-	github.com/sylabs/squashfs v1.0.4 // 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.18.0 // 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/vbatts/tar-split v0.11.6 // 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/zclconf/go-cty v1.13.0 // indirect
 	go.opencensus.io v0.24.0 // indirect
-	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
-	go.opentelemetry.io/otel v1.33.0 // indirect
-	go.opentelemetry.io/otel/metric v1.33.0 // indirect
-	go.opentelemetry.io/otel/trace v1.33.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect
+	go.opentelemetry.io/otel v1.19.0 // indirect
+	go.opentelemetry.io/otel/metric v1.19.0 // indirect
+	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.33.0 // indirect
-	golang.org/x/sync v0.11.0 // indirect
-	golang.org/x/sys v0.30.0 // indirect
-	golang.org/x/term v0.29.0 // indirect
-	golang.org/x/text v0.22.0 // indirect
-	golang.org/x/tools v0.29.0 // indirect
-	golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8 // indirect
-	google.golang.org/grpc v1.67.3 // indirect
-	google.golang.org/protobuf v1.36.3 // indirect
+	golang.org/x/crypto v0.23.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.20.0 // indirect
+	golang.org/x/term v0.20.0 // indirect
+	golang.org/x/text v0.15.0 // indirect
+	golang.org/x/tools v0.19.0 // indirect
+	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // 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/libc v1.61.13 // indirect
-	modernc.org/mathutil v1.7.1 // indirect
-	modernc.org/memory v1.8.2 // indirect
+	modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6 // 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
+	modernc.org/token v1.1.0 // indirect
 )
 
 retract (
 	v0.53.2
 	v0.53.1 // Published accidentally with incorrect license in depdencies
 )
+
+replace github.com/mholt/archiver/v3 v3.5.1 => github.com/anchore/archiver/v3 v3.5.2