[WIP] migrate helper functions for spdx

Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
add test reminders to put new relationships under test
2026-10-12 14:17:20 +02:00 · 2021-11-10 14:32:44 -05:00 · 2021-11-10 13:34:41 -05:00 · 2021-11-10 11:15:18 -05:00 · 2021-11-10 11:05:01 -05:00 · 2021-11-10 09:05:33 -05:00
538 changed files with 8355 additions and 55564 deletions
@@ -15,8 +15,3 @@ ignore-packages:
  # * GNU General Public License, version 2.0 or later (GPL-2.0-or-later).
  # (we choose Apache-2.0)
  - github.com/spdx/tools-golang
-
-  # from: https://github.com/xi2/xz/blob/master/LICENSE
-  # All these files have been put into the public domain.
-  # You can do whatever you want with these files.
-  - github.com/xi2/xz
@@ -1,3 +0,0 @@
-dev-pki
-log
-signing-identity.txt
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-set -eu
-
-# grab utilities
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-. "$SCRIPT_DIR"/utils.sh
-
-# cleanup any dev certs left behind
-. "$SCRIPT_DIR"/setup-import-cert.sh # defines KEYCHAIN_NAME and KEYCHAIN_PATH
-. "$SCRIPT_DIR"/setup-dev.sh
-cleanup_dev_signing
@@ -1,53 +0,0 @@
-#!/usr/bin/env bash
-
-set +xu
-if [ -z "$AC_USERNAME" ]; then
-  exit_with_error "AC_USERNAME not set"
-fi
-
-if [ -z "$AC_PASSWORD" ]; then
-  exit_with_error "AC_PASSWORD not set"
-fi
-set -u
-
-
-# notarize [archive-path]
-#
-notarize() {
-  binary_path=$1
-  archive_path=${binary_path}-archive-for-notarization.zip
-
-  title "archiving release binary into ${archive_path}"
-
-  parent=$(dirname "$binary_path")
-  (
-    cd "${parent}" && zip "${archive_path}" "$(basename ${binary_path})"
-  )
-
-  if [ ! -f "$archive_path" ]; then
-    exit_with_error "cannot find payload for notarization: $archive_path"
-  fi
-
-  # install gon
-  which gon || (go install github.com/mitchellh/gon/cmd/gon@latest)
-
-  # create config (note: json via stdin with gon is broken, can only use HCL from file)
-  hcl_file=$(mktemp).hcl
-
-  cat <<EOF > "$hcl_file"
-notarize {
-  path = "$archive_path"
-  bundle_id = "com.anchore.toolbox.syft"
-}
-
-apple_id {
-   username = "$AC_USERNAME"
-   password = "@env:AC_PASSWORD"
-}
-EOF
-
-  gon -log-level info "$hcl_file"
-
-  rm "${hcl_file}" "${archive_path}"
-}
-
@@ -1,128 +0,0 @@
-#!/usr/bin/env bash
-set -eu
-
-NAME=syft-dev
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-DIR=$SCRIPT_DIR/dev-pki
-FILE_PREFIX=$DIR/$NAME
-IDENTITY=${NAME}-id-415d8c69793
-
-## OpenSSL material
-
-KEY_PASSWORD="letthedevin"
-P12_PASSWORD="popeofnope"
-
-KEY_FILE=$FILE_PREFIX-key.pem
-CSR_FILE=$FILE_PREFIX-csr.pem
-CERT_FILE=$FILE_PREFIX-cert.pem
-EXT_FILE=$FILE_PREFIX-ext.cnf
-P12_FILE=$FILE_PREFIX.p12
-
-EXT_SECTION=codesign_reqext
-
-# setup_signing
-#
-# preps the MAC_SIGNING_IDENTITY env var for use in the signing process, using ephemeral developer certificate material
-#
-function setup_signing() {
-  # check to see if this has already been done... if so, bail!
-  set +ue
-  if security find-identity -p codesigning "$KEYCHAIN_PATH" | grep $IDENTITY ; then
-      export MAC_SIGNING_IDENTITY=$IDENTITY
-      commentary "skipping creating dev certificate material (already exists)"
-      commentary "setting MAC_SIGNING_IDENTITY=${IDENTITY}"
-      return 0
-  fi
-  set -ue
-
-  title "setting up developer certificate material"
-
-  mkdir -p "${DIR}"
-
-  # configure the openssl extensions
-  cat << EOF > "$EXT_FILE"
-  [ req ]
-  default_bits          = 2048                  # RSA key size
-  encrypt_key           = yes                   # Protect private key
-  default_md            = sha256                # MD to use
-  utf8                  = yes                   # Input is UTF-8
-  string_mask           = utf8only              # Emit UTF-8 strings
-  prompt                = yes                   # Prompt for DN
-  distinguished_name    = codesign_dn           # DN template
-  req_extensions        = $EXT_SECTION          # Desired extensions
-
-  [ codesign_dn ]
-  commonName            = $IDENTITY
-  commonName_max        = 64
-
-  [ $EXT_SECTION ]
-  keyUsage              = critical,digitalSignature
-  extendedKeyUsage      = critical,codeSigning
-  subjectKeyIdentifier  = hash
-EOF
-
-  title "create the private key"
-  openssl genrsa \
-            -des3 \
-            -out "$KEY_FILE" \
-            -passout "pass:$KEY_PASSWORD" \
-           2048
-
-  title "create the csr"
-  openssl req \
-            -new \
-            -key "$KEY_FILE" \
-            -out "$CSR_FILE" \
-            -passin "pass:$KEY_PASSWORD" \
-            -config "$EXT_FILE" \
-            -subj "/CN=$IDENTITY"
-
-  commentary "verify the csr: we should see X509 v3 extensions for codesigning in the CSR"
-  openssl req -in "$CSR_FILE" -noout -text | grep -A1 "X509v3" || exit_with_error "could not find x509 extensions in CSR"
-
-  title "create the certificate"
-  # note: Extensions in certificates are not transferred to certificate requests and vice versa. This means that
-  # just because the CSR has x509 v3 extensions doesn't mean that you'll see these extensions in the cert output.
-  # To prove this do:
-  # 	openssl x509 -text -noout -in server.crt | grep -A10 "X509v3 extensions:"
-  # ... and you will see no output (if -extensions is not used). (see https://www.openssl.org/docs/man1.1.0/man1/x509.html#BUGS)
-  # To get the extensions, use "-extensions codesign_reqext" when creating the cert. The codesign_reqext value matches
-  # the section name in the ext file used in CSR / cert creation (-extfile and -config).
-  openssl x509 \
-            -req \
-            -days 10000 \
-            -in "$CSR_FILE" \
-            -signkey "$KEY_FILE" \
-            -out "$CERT_FILE" \
-            -extfile "$EXT_FILE" \
-            -passin "pass:$KEY_PASSWORD" \
-            -extensions $EXT_SECTION
-
-  commentary "verify the certificate: we should see our extensions"
-  openssl x509 -text -noout -in "$CERT_FILE" | grep -A1 'X509v3' || exit_with_error "could not find x509 extensions in certificate"
-
-  title "export cert and private key to .p12 file"
-  # note: this step may be entirely optional, however, I found it useful to follow the prod path which goes the route of using a p12
-  openssl pkcs12 \
-            -export \
-            -out "$P12_FILE" \
-            -inkey "$KEY_FILE" \
-            -in "$CERT_FILE" \
-            -passin "pass:$KEY_PASSWORD" \
-            -passout "pass:$P12_PASSWORD"
-
-  # delete the keychain if it already exists
-  if [ -f "${KEYCHAIN_PATH}" ]; then
-    cleanup_dev_signing
-  fi
-
-  import_signing_certificate "$P12_FILE" "$P12_PASSWORD" "$IDENTITY"
-}
-
-function cleanup_dev_signing() {
-  title "delete the dev keychain and all certificate material"
-  set -xue
-  security delete-keychain "$KEYCHAIN_NAME" || true
-  rm -f "$KEYCHAIN_PATH" || true
-  rm -rf "${DIR}" || true
-}
@@ -1,55 +0,0 @@
-#!/usr/bin/env bash
-set -eu
-
-KEYCHAIN_NAME="syft-ephemeral-keychain"
-KEYCHAIN_PATH="$HOME/Library/Keychains/${KEYCHAIN_NAME}-db"
-
-# import_signing_certificate
-#
-# imports a cert from a p12 file into a keychain used for codesigning
-#
-function import_signing_certificate() {
-  p12_file=$1
-  p12_password=$2
-  identity=$3
-
-  keychain_password="$(openssl rand -base64 100)"
-
-  title "create the a new keychain"
-
-  security create-keychain -p "$keychain_password" "$KEYCHAIN_NAME"
-  security set-keychain-settings -lut 21600 "$KEYCHAIN_PATH"
-  security unlock-keychain -p "$keychain_password" "$KEYCHAIN_PATH"
-
-  if [ ! -f "$KEYCHAIN_PATH" ]; then
-    exit_with_error "cannot find keychain '$KEYCHAIN_PATH'"
-  fi
-
-  set +e
-  if ! security verify-cert -k "$KEYCHAIN_PATH" -c "$p12_file" &> /dev/null; then
-    set -e
-    title "import the cert into the new keychain if it is not already trusted by the system"
-
-    # '-t cert' is vital since it side-steps the need for user interaction with "security add-trusted-cert" (which has wider security implications)
-    security import "$p12_file" -P "$p12_password" -t cert -f pkcs12 -k "$KEYCHAIN_PATH" -T /usr/bin/codesign
-
-    # note: set the partition list for this certificate's private key to include "apple-tool:" and "apple:" allows the codesign command to access this keychain item without an interactive user prompt.
-    security set-key-partition-list -S "apple-tool:,apple:,codesign:" -s -k "$keychain_password" "$KEYCHAIN_PATH"
-  else
-    set -e
-    commentary "...cert has already been imported onto the new keychain"
-  fi
-
-  commentary "make certain there are identities that can be used for code signing"
-  security find-identity -p codesigning "$KEYCHAIN_PATH" | grep -C 30 "$identity" || exit_with_error "could not find identity that can be used with codesign"
-
-  title "add the new keychain to the search path for codesign"
-  add_keychain "$KEYCHAIN_NAME"
-
-  commentary "verify the new keychain can be found by the security sub-system"
-  security list-keychains | grep "$KEYCHAIN_NAME" || exit_with_error "could not find new keychain"
-
-  export MAC_SIGNING_IDENTITY=$identity
-  commentary "setting MAC_SIGNING_IDENTITY=${identity}"
-
-}
@@ -1,44 +0,0 @@
-#!/usr/bin/env bash
-set -eu
-
-assert_in_ci
-
-IDENTITY="Developer ID Application: ANCHORE, INC. (9MJHKYX5AT)"
-
-set +xu
-if [ -z "$APPLE_DEVELOPER_ID_CERT" ]; then
-  exit_with_error "APPLE_DEVELOPER_ID_CERT not set"
-fi
-
-if [ -z "$APPLE_DEVELOPER_ID_CERT_PASS" ]; then
-  exit_with_error "APPLE_DEVELOPER_ID_CERT_PASS not set"
-fi
-
-if [ -z "$DOCKER_USERNAME" ]; then
-  exit_with_error "DOCKER_USERNAME not set"
-fi
-
-if [ -z "$DOCKER_PASSWORD" ]; then
-  exit_with_error "DOCKER_PASSWORD not set"
-fi
-set -u
-
-# setup_signing
-#
-# preps the MAC_SIGNING_IDENTITY env var for use in the signing process, using production certificate material
-#
-setup_signing() {
-  title "setting up production certificate material"
-
-  # Write signing certificate to disk from environment variable.
-  p12_file="$HOME/developer_id_certificate.p12"
-  echo -n "$APPLE_DEVELOPER_ID_CERT" | base64 --decode > "$p12_file"
-
-  import_signing_certificate "$p12_file" "$APPLE_DEVELOPER_ID_CERT_PASS" "$IDENTITY"
-
-  # Make this new keychain the user's default keychain, so that codesign will be able to find this certificate when we specify it during signing.
-  security default-keychain -d "user" -s "${KEYCHAIN_PATH}"
-
-  commentary "log into docker -- required for publishing (since the default keychain has now been replaced)"
-  echo "${DOCKER_PASSWORD}" | docker login docker.io -u "${DOCKER_USERNAME}"  --password-stdin
-}
@@ -1,48 +0,0 @@
-#!/usr/bin/env bash
-set -eu -o pipefail
-
-IS_SNAPSHOT="$1"
-
-## grab utilities
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-. "$SCRIPT_DIR"/utils.sh
-mkdir -p "$SCRIPT_DIR/log"
-
-main() {
-  # defines KEYCHAIN_NAME and KEYCHAIN_PATH
-  . "$SCRIPT_DIR"/setup-import-cert.sh
-
-  case "$IS_SNAPSHOT" in
-
-    "1" |  "true" | "yes")
-      commentary "assuming development setup..."
-      . "$SCRIPT_DIR"/setup-dev.sh
-      ;;
-
-    "0" |  "false" | "no")
-      commentary "assuming production setup..."
-      . "$SCRIPT_DIR"/setup-prod.sh
-      ;;
-
-    *)
-      exit_with_error "could not determine if this was a production build (isSnapshot='$IS_SNAPSHOT')"
-      ;;
-  esac
-
-  # load up all signing material into a keychain (note: this should set the MAC_SIGNING_IDENTITY env var)
-  setup_signing
-
-  # write out identity to a file
-  echo -n "$MAC_SIGNING_IDENTITY" > "$SCRIPT_DIR/$SIGNING_IDENTITY_FILENAME"
-}
-
-# capture all output from a subshell to log output additionally to a file (as well as the terminal)
-( (
-  set +u
-  if [ -n "$SKIP_SIGNING" ]; then
-      commentary "skipping signing setup..."
-  else
-    set -u
-    main
-  fi
-) 2>&1) | tee "$SCRIPT_DIR/log/setup.txt"
@@ -1,98 +0,0 @@
-#!/usr/bin/env bash
-set -eu -o pipefail
-
-BINARY_PATH="$1"
-IS_SNAPSHOT="$2"
-TARGET_NAME="$3"
-
-## grab utilities
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-. "$SCRIPT_DIR"/utils.sh
-mkdir -p "$SCRIPT_DIR/log"
-
-
-# sign_binary [binary-path] [signing-identity]
-#
-# signs a single binary with cosign
-#
-sign_binary() {
-  exe_path=$1
-  identity=$2
-
-  if [ -x "$exe_path" ] && file -b "$exe_path" | grep -q "Mach-O"
-  then
-      echo "signing $exe_path ..."
-  else
-      echo "skip signing $exe_path ..."
-      return 0
-  fi
-
-  set -x
-
-  codesign \
-    -s "$identity" \
-    -f \
-    --verbose=4 \
-    --timestamp \
-    --options runtime \
-      "$exe_path"
-
-  if [ $? -ne 0 ]; then
-      exit_with_error "signing failed"
-  fi
-
-  codesign --verify "$exe_path"  --verbose=4
-
-  set +x
-}
-
-
-main() {
-  binary_abs_path=$(realpath "$BINARY_PATH")
-
-  if [ ! -f "$binary_abs_path" ]; then
-      echo "archive does not exist: $binary_abs_path"
-  fi
-
-  case "$IS_SNAPSHOT" in
-
-    "1" |  "true" | "yes")
-      commentary "disabling notarization..."
-      perform_notarization=false
-      ;;
-
-    "0" |  "false" | "no")
-      commentary "enabling notarization..."
-      . "$SCRIPT_DIR"/notarize.sh
-      perform_notarization=true
-      ;;
-
-    *)
-      exit_with_error "could not determine if this was a production build (isSnapshot='$IS_SNAPSHOT')"
-      ;;
-  esac
-
-  # grab the signing identity from the local temp file (setup by setup.sh)
-  MAC_SIGNING_IDENTITY=$(cat "$SCRIPT_DIR/$SIGNING_IDENTITY_FILENAME")
-
-  # sign all of the binaries in the archive and recreate the input archive with the signed binaries
-  sign_binary "$binary_abs_path" "$MAC_SIGNING_IDENTITY"
-
-  # send all of the binaries off to apple to bless
-  if $perform_notarization ; then
-    notarize "$binary_abs_path"
-  else
-    commentary "skipping notarization..."
-  fi
-}
-
-# capture all output from a subshell to log output additionally to a file (as well as the terminal)
-( (
-  set +u
-  if [ -n "$SKIP_SIGNING" ]; then
-      commentary "skipping signing..."
-  else
-    set -u
-    main
-  fi
-) 2>&1) | tee "$SCRIPT_DIR/log/signing-$(basename $BINARY_PATH)-$TARGET_NAME.txt"
@@ -1,78 +0,0 @@
-SIGNING_IDENTITY_FILENAME=signing-identity.txt
-
-## terminal goodies
-PURPLE='\033[0;35m'
-GREEN='\033[0;32m'
-RED='\033[0;31m'
-BOLD=$(tput -T linux bold)
-RESET='\033[0m'
-
-function success() {
-  echo -e "\n${GREEN}${BOLD}$@${RESET}"
-}
-
-function title() {
-  success "Task: $@"
-}
-
-function commentary() {
-  echo -e "\n${PURPLE}# $@${RESET}"
-}
-
-function error() {
-  echo -e "${RED}${BOLD}error: $@${RESET}"
-}
-
-function exit_with_error() {
-  error $@
-  exit 1
-}
-
-function exit_with_message() {
-  success $@
-  exit 0
-}
-
-function realpath {
-  echo "$(cd $(dirname $1); pwd)/$(basename $1)";
-}
-
-
-# this function adds all of the existing keychains plus the new one which is the same as going to Keychain Access
-# and selecting "Add Keychain" to make the keychain visible under "Custom Keychains". This is done with
-# "security list-keychains -s" for some reason. The downside is that this sets the search path, not appends
-# to it, so you will loose existing keychains in the search path... which is truly terrible.
-function add_keychain() {
-  keychains=$(security list-keychains -d user)
-  keychainNames=();
-  for keychain in $keychains
-  do
-    basename=$(basename "$keychain")
-    keychainName=${basename::${#basename}-4}
-    keychainNames+=("$keychainName")
-  done
-
-  echo "existing user keychains: ${keychainNames[@]}"
-
-  security -v list-keychains -s "${keychainNames[@]}" "$1"
-}
-
-function exit_not_ci() {
-    printf "WARNING! It looks like this isn't the CI environment. This script modifies the macOS Keychain setup in ways you probably wouldn't want for your own machine. It also requires an Apple Developer ID Certificate that you shouldn't have outside of the CI environment.\n\nExiting early to make sure nothing bad happens.\n"
-    exit 1
-}
-
-CI_HOME="/Users/runner"
-
-function assert_in_ci() {
-
-  if [[ "${HOME}" != "${CI_HOME}" ]]; then
-    exit_not_ci
-  fi
-
-  set +u
-  if [ -z "${GITHUB_ACTIONS}" ]; then
-    exit_not_ci
-  fi
-  set -u
-}
@@ -338,7 +338,7 @@ hash_sha256_verify() {
 		return 1
 	fi
 	BASENAME=${TARGET##*/}
-	want=$(grep "${BASENAME}$" "${checksums}" 2>/dev/null | tr '\t' ' ' | cut -d ' ' -f 1)
+	want=$(grep "${BASENAME}" "${checksums}" 2>/dev/null | tr '\t' ' ' | cut -d ' ' -f 1)
 	if [ -z "$want" ]; then
 		log_err "hash_sha256_verify unable to find checksum for '${TARGET}' in '${checksums}'"
 		return 1
@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+set -eu
+
+CI_HOME="/Users/runner"
+if [[ "${HOME}" != "${CI_HOME}" ]]; then
+  printf "WARNING! It looks like this isn't the CI environment. This script modifies the macOS Keychain setup in ways you probably wouldn't want for your own machine. It also requires an Apple Developer ID Certificate that you shouldn't have outside of the CI environment.\n\nExiting early to make sure nothing bad happens.\n"
+  exit 1
+fi
+
+# Install gon (see https://github.com/mitchellh/gon for details).
+brew tap mitchellh/gon
+brew install mitchellh/gon/gon
+
+# Write signing certificate to disk from environment variable.
+CERT_FILE="$HOME/developer_id_certificate.p12"
+echo -n "$APPLE_DEVELOPER_ID_CERT" | base64 --decode > "$CERT_FILE"
+
+# In order to have all keychain interactions avoid an interactive user prompt, we need to control the password for the keychain in question, which means we need to create a new keychain into which we'll import the signing certificate and from which we'll later access this certificate during code signing.
+EPHEMERAL_KEYCHAIN="ci-ephemeral-keychain"
+EPHEMERAL_KEYCHAIN_PASSWORD="$(openssl rand -base64 100)"
+security create-keychain -p "${EPHEMERAL_KEYCHAIN_PASSWORD}" "${EPHEMERAL_KEYCHAIN}"
+
+# Import signing certificate into the keychain. (This is a pre-requisite for gon, which is invoked via goreleaser.)
+EPHEMERAL_KEYCHAIN_FULL_PATH="$HOME/Library/Keychains/${EPHEMERAL_KEYCHAIN}-db"
+security import "${CERT_FILE}" -k "${EPHEMERAL_KEYCHAIN_FULL_PATH}" -P "${APPLE_DEVELOPER_ID_CERT_PASS}" -T "$(command -v codesign)"
+
+# Setting the partition list for this certificate's private key to include "apple-tool:" and "apple:" allows the codesign command to access this keychain item without an interactive user prompt. (codesign is invoked by gon.)
+security set-key-partition-list -S "apple-tool:,apple:" -s -k "${EPHEMERAL_KEYCHAIN_PASSWORD}" "${EPHEMERAL_KEYCHAIN_FULL_PATH}"
+
+# Make this new keychain the user's default keychain, so that codesign will be able to find this certificate when we specify it during signing.
+security default-keychain -d "user" -s "${EPHEMERAL_KEYCHAIN_FULL_PATH}"
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+set -eu
+
+IS_SNAPSHOT="$1"                        # e.g. "true", "false"
+
+if [[ "${IS_SNAPSHOT}" == "true" ]]; then
+  # This is a snapshot build —— skipping signing and notarization...
+  exit 0
+fi
+
+GON_CONFIG="$2"                                       # e.g. "gon.hcl"
+NEW_NAME_WITHOUT_EXTENSION="$3"                       # e.g. "./dist/syft-0.1.0"
+ORIGINAL_NAME_WITHOUT_EXTENSION="./dist/output"       # This should match dmg and zip output_path in the gon config file, without the extension.
+
+gon "${GON_CONFIG}"
+
+# Rename outputs with specified desired name
+mv -v "${ORIGINAL_NAME_WITHOUT_EXTENSION}.dmg" "${NEW_NAME_WITHOUT_EXTENSION}.dmg"
+mv -v "${ORIGINAL_NAME_WITHOUT_EXTENSION}.zip" "${NEW_NAME_WITHOUT_EXTENSION}.zip"
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+set -ue
+
+DISTDIR=$1
+
+export FINGERPRINT=$(gpg --verify ${DISTDIR}/*checksums.txt.sig ${DISTDIR}/*checksums.txt 2>&1 | grep 'using RSA key' | awk '{ print $NF }')
+
+if [[ "${FINGERPRINT}" == "${SIGNING_FINGERPRINT}" ]]; then
+    echo 'verified signature'
+else
+    echo "signed with unknown fingerprint: ${FINGERPRINT}"
+    echo "           expected fingerprint: ${SIGNING_FINGERPRINT}"
+    exit 1
+fi
@@ -7,10 +7,10 @@ name: "CodeQL Security Scan"

 on:
  push:
-    branches:
-      # only run when there are pushes to the main branch (not on PRs)
-      - main
-
+    branches: [main]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [main]
  schedule:
    - cron: '0 0 * * 3'

@@ -9,12 +9,12 @@ on:
      - "v*"

 env:
-  GO_VERSION: "1.18.x"
+  GO_VERSION: "1.16.x"

 jobs:
  quality-gate:
    environment: release
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest # This OS choice is arbitrary. None of the steps in this job are specific to either Linux or macOS.
    steps:
      - uses: actions/checkout@v2

@@ -34,16 +34,6 @@ jobs:
          checkName: "Static analysis"
          ref: ${{ github.event.pull_request.head.sha || github.sha }}

-      - name: Check static analysis results - golangci-lint
-        uses: fountainhead/action-wait-for-check@v1.0.0
-        id: static-analysis-golangci-lint
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          # This check name is defined as the github action job name (in .github/workflows/testing.yaml)
-          checkName: "Static analysis - golangci-lint"
-          ref: ${{ github.event.pull_request.head.sha || github.sha }}
-
-
      - name: Check unit test results
        uses: fountainhead/action-wait-for-check@v1.0.0
        id: unit
@@ -90,10 +80,9 @@ jobs:
          ref: ${{ github.event.pull_request.head.sha || github.sha }}

      - name: Quality gate
-        if: steps.static-analysis.outputs.conclusion != 'success' || steps.static-analysis-golangci-lint.outputs.conclusion != 'success' || steps.unit.outputs.conclusion != 'success' || steps.integration.outputs.conclusion != 'success' || steps.cli-linux.outputs.conclusion != 'success' || steps.acceptance-linux.outputs.conclusion != 'success' || steps.acceptance-mac.outputs.conclusion != 'success'
+        if: steps.static-analysis.outputs.conclusion != 'success' || steps.unit.outputs.conclusion != 'success' || steps.integration.outputs.conclusion != 'success' || steps.cli-linux.outputs.conclusion != 'success' || steps.acceptance-linux.outputs.conclusion != 'success' || steps.acceptance-mac.outputs.conclusion != 'success'
        run: |
          echo "Static Analysis Status: ${{ steps.static-analysis.conclusion }}"
-          echo "Static Analysis Status - Golangci-Lint: ${{ steps.static-analysis-golangci-lint.conclusion }}"
          echo "Unit Test Status: ${{ steps.unit.outputs.conclusion }}"
          echo "Integration Test Status: ${{ steps.integration.outputs.conclusion }}"
          echo "Acceptance Test (Linux) Status: ${{ steps.acceptance-linux.outputs.conclusion }}"
@@ -103,8 +92,7 @@ jobs:

  release:
    needs: [quality-gate]
-    # due to our code signing process, it's vital that we run our release steps on macOS
-    runs-on: macos-latest
+    runs-on: macos-latest # Due to our code signing process, it's vital that we run our release steps on macOS.
    steps:
      - uses: docker-practice/actions-setup-docker@v1

@@ -136,29 +124,41 @@ jobs:
        if: steps.tool-cache.outputs.cache-hit != 'true' || steps.go-cache.outputs.cache-hit != 'true'
        run: make bootstrap

+      - name: Import GPG key
+        id: import_gpg
+        uses: crazy-max/ghaction-import-gpg@v2
+        env:
+          GPG_PRIVATE_KEY: ${{ secrets.SIGNING_GPG_PRIVATE_KEY }}
+          PASSPHRASE: ${{ secrets.SIGNING_GPG_PASSPHRASE }}
+
+      - name: GPG signing info
+        run: |
+          echo "fingerprint: ${{ steps.import_gpg.outputs.fingerprint }}"
+          echo "keyid:       ${{ steps.import_gpg.outputs.keyid }}"
+          echo "name:        ${{ steps.import_gpg.outputs.name }}"
+          echo "email:       ${{ steps.import_gpg.outputs.email }}"
+
      - name: Build & publish release artifacts
        run: make release
        env:
          DOCKER_USERNAME: ${{ secrets.TOOLBOX_DOCKER_USER }}
          DOCKER_PASSWORD: ${{ secrets.TOOLBOX_DOCKER_PASS }}
-          # we use a different token than GITHUB_SECRETS to additionally allow updating the homebrew repos
          GITHUB_TOKEN: ${{ secrets.ANCHORE_GIT_READ_TOKEN }}
+          GPG_PRIVATE_KEY: ${{ secrets.SIGNING_GPG_PRIVATE_KEY }}
+          PASSPHRASE: ${{ secrets.SIGNING_GPG_PASSPHRASE }}
+          SIGNING_FINGERPRINT: ${{ steps.import_gpg.outputs.fingerprint }}
          AWS_ACCESS_KEY_ID: ${{ secrets.TOOLBOX_AWS_ACCESS_KEY_ID }}
          AWS_SECRET_ACCESS_KEY: ${{ secrets.TOOLBOX_AWS_SECRET_ACCESS_KEY }}
-          # used during macOS code signing
-          APPLE_DEVELOPER_ID_CERT: ${{ secrets.APPLE_DEVELOPER_ID_CERT }}
-          APPLE_DEVELOPER_ID_CERT_PASS: ${{ secrets.APPLE_DEVELOPER_ID_CERT_PASS }}
-          # used during macOS notarization
-          AC_USERNAME: ${{ secrets.ENG_CI_APPLE_ID }}
-          AC_PASSWORD: ${{ secrets.ENG_CI_APPLE_ID_PASS }}
+          APPLE_DEVELOPER_ID_CERT: ${{ secrets.APPLE_DEVELOPER_ID_CERT }} # Used during macOS code signing.
+          APPLE_DEVELOPER_ID_CERT_PASS: ${{ secrets.APPLE_DEVELOPER_ID_CERT_PASS }} # Used during macOS code signing.
+          AC_USERNAME: ${{ secrets.ENG_CI_APPLE_ID }} # Used during macOS notarization.
+          AC_PASSWORD: ${{ secrets.ENG_CI_APPLE_ID_PASS }} # Used during macOS notarization.

      - uses: anchore/sbom-action@v0
-        continue-on-error: true
        with:
          artifact-name: sbom.spdx.json

      - uses: 8398a7/action-slack@v3
-        continue-on-error: true
        with:
          status: ${{ job.status }}
          fields: repo,workflow,action,eventName
@@ -2,54 +2,12 @@ name: "Validations"
 on:
  workflow_dispatch:
  push:
-    branches:
-      - main
  pull_request:

 env:
-  GO_VERSION: "1.18.x"
-  GO_STABLE_VERSION: true
+  GO_VERSION: "1.16.x"

 jobs:
-# TODO: remove this job once golanci-lint is compatible with g01.18+
-  Static-Analysis-Golanci-lint:
-    name: "Static analysis - golangci-lint"
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/setup-go@v2
-        with:
-          go-version: "1.17" # NOTE: please use GO_VERSION once golangci supports go1.18+
-          stable: ${{ env.GO_STABLE_VERSION }}
-
-      - uses: actions/checkout@v2
-
-      - name: Restore tool cache
-        id: tool-cache
-        uses: actions/cache@v2.1.3
-        with:
-          path: ${{ github.workspace }}/.tmp
-          key: ${{ runner.os }}-tool-${{ hashFiles('Makefile') }}
-
-      - name: Restore go cache
-        id: go-cache
-        uses: actions/cache@v2.1.3
-        with:
-          path: ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ env.GO_VERSION }}-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-${{ env.GO_VERSION }}-
-
-      - name: (cache-miss) Bootstrap all project dependencies
-        if: steps.tool-cache.outputs.cache-hit != 'true' || steps.go-cache.outputs.cache-hit != 'true'
-        run: make bootstrap
-
-      - name: Bootstrap CI environment dependencies
-        run: make ci-bootstrap
-
-      - name: Run static analysis
-        run: make static-analysis-golanci-lint
-
-

  Static-Analysis:
    # Note: changing this job name requires making the same update in the .github/workflows/release.yaml pipeline
@@ -59,7 +17,6 @@ jobs:
      - uses: actions/setup-go@v2
        with:
          go-version: ${{ env.GO_VERSION }}
-          stable: ${{ env.GO_STABLE_VERSION }}

      - uses: actions/checkout@v2

@@ -97,7 +54,6 @@ jobs:
      - uses: actions/setup-go@v2
        with:
          go-version: ${{ env.GO_VERSION }}
-          stable: ${{ env.GO_STABLE_VERSION }}

      - uses: actions/checkout@v2

@@ -134,16 +90,6 @@ jobs:
          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/packages.fingerprint' ) }}

-      - name: Build cache key for go binary test-fixture blobs (for unit tests)
-        run: make go-binaries-fingerprint
-
-      - name: Restore Go binary test-fixture cache
-        id: unit-go-binary-cache
-        uses: actions/cache@v2.1.3
-        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: Run unit tests
        run: make unit

@@ -160,7 +106,6 @@ jobs:
      - uses: actions/setup-go@v2
        with:
          go-version: ${{ env.GO_VERSION }}
-          stable: ${{ env.GO_STABLE_VERSION }}

      - uses: actions/checkout@v2

@@ -212,7 +157,6 @@ jobs:
      - uses: actions/setup-go@v2
        with:
          go-version: ${{ env.GO_VERSION }}
-          stable: ${{ env.GO_STABLE_VERSION }}

      - uses: actions/checkout@v2

@@ -285,7 +229,6 @@ jobs:
      - uses: actions/setup-go@v2
        with:
          go-version: ${{ env.GO_VERSION }}
-          stable: ${{ env.GO_STABLE_VERSION }}

      - uses: actions/checkout@v2

@@ -333,30 +276,8 @@ jobs:
          name: artifacts
          path: snapshot

-      - name: Run comparison tests (Linux)
-        run: make compare-linux
-
-      - name: Build key for image cache
-        run: make install-fingerprint
-
-      - name: Restore install.sh test image cache
-        id: install-test-image-cache
-        uses: actions/cache@v2.1.3
-        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
-
-      - name: Run install.sh tests (Linux)
-        run: make install-test
-
-      - name: (cache-miss) Create test image cache
-        if: steps.install-test-image-cache.outputs.cache-hit != 'true'
-        run: make install-test-cache-save
-
+      - name: Run Acceptance Tests (Linux)
+        run: make acceptance-linux

  Acceptance-Mac:
    # Note: changing this job name requires making the same update in the .github/workflows/release.yaml pipeline
@@ -371,18 +292,15 @@ jobs:
          name: artifacts
          path: snapshot

-      - name: Restore docker image cache for compare testing
-        id: mac-compare-testing-cache
+      - name: Restore docker image cache
+        id: go-cache
        uses: actions/cache@v2.1.3
        with:
          path: image.tar
-          key: ${{ runner.os }}-${{ hashFiles('test/compare/mac.sh') }}
+          key: ${{ runner.os }}-${{ hashFiles('test/acceptance/mac.sh') }}

-      - name: Run comparison tests (Mac)
-        run: make compare-mac
-
-      - name: Run install.sh tests (Mac)
-        run: make install-test-ci-mac
+      - name: Run Acceptance Tests (Mac)
+        run: make acceptance-mac

  Cli-Linux:
    # Note: changing this job name requires making the same update in the .github/workflows/release.yaml pipeline
@@ -393,7 +311,6 @@ jobs:
      - uses: actions/setup-go@v2
        with:
          go-version: ${{ env.GO_VERSION }}
-          stable: ${{ env.GO_STABLE_VERSION }}

      - uses: actions/checkout@v2

@@ -406,16 +323,9 @@ jobs:
          restore-keys: |
            ${{ runner.os }}-go-${{ env.GO_VERSION }}-

-      - name: Restore tool cache
-        id: tool-cache
-        uses: actions/cache@v2.1.3
-        with:
-          path: ${{ github.workspace }}/.tmp
-          key: ${{ runner.os }}-tool-${{ hashFiles('Makefile') }}
-
-      - name: (cache-miss) Bootstrap all project dependencies
-        if: steps.tool-cache.outputs.cache-hit != 'true' || steps.go-cache.outputs.cache-hit != 'true'
-        run: make bootstrap
+      - name: (cache-miss) Bootstrap go dependencies
+        if: steps.go-cache.outputs.cache-hit != 'true'
+        run: make bootstrap-go

      - name: Build key for tar cache
        run: make cli-fingerprint
@@ -18,7 +18,6 @@ CHANGELOG.md
 .images
 .tmp/
 coverage.txt
-bin/

 # Binaries for programs and plugins
 *.exe
@@ -36,8 +35,4 @@ bin/
 # macOS Finder metadata
 .DS_STORE

-*.profile
-
-# attestation
-cosign.key
-cosign.pub
+*.profile
@@ -1,77 +1,100 @@
 release:
+  # If set to auto, will mark the release as not ready for production in case there is an indicator for this in the
+  # tag e.g. v1.0.0-rc1 .If set to true, will mark the release as not ready for production.
  prerelease: auto
+
+  # If set to true, will not auto-publish the release. This is done to allow us to review the changelog before publishing.
  draft: true

-env:
-  # required to support multi architecture docker builds
-  - DOCKER_CLI_EXPERIMENTAL=enabled
-
-before:
-  hooks:
-    - ./.github/scripts/apple-signing/setup.sh {{ .IsSnapshot }}
-
 builds:
-  - id: linux-build
-    binary: syft
+  - binary: syft
+    id: syft
+    env:
+      - CGO_ENABLED=0
    goos:
      - linux
    goarch:
      - amd64
      - arm64
-    # set the modified timestamp on the output binary to the git timestamp to ensure a reproducible build
-    mod_timestamp: &build-timestamp '{{ .CommitTimestamp }}'
-    env: &build-env
-      - CGO_ENABLED=0
-    ldflags: &build-ldflags |
+    # Set the modified timestamp on the output binary to the git timestamp (to ensure a reproducible build)
+    mod_timestamp: '{{ .CommitTimestamp }}'
+    ldflags: |
      -w
      -s
      -extldflags '-static'
      -X github.com/anchore/syft/internal/version.version={{.Version}}
      -X github.com/anchore/syft/internal/version.gitCommit={{.Commit}}
      -X github.com/anchore/syft/internal/version.buildDate={{.Date}}
-      -X github.com/anchore/syft/internal/version.gitDescription={{.Summary}}
+      -X github.com/anchore/syft/internal/version.gitTreeState={{.Env.BUILD_GIT_TREE_STATE}}

-  - id: darwin-build
-    binary: syft
+  - binary: syft
+    id: syft-win
+    env:
+      - CGO_ENABLED=0
+    goos:
+      - windows
+    goarch:
+      - amd64
+    # Set the modified timestamp on the output binary to the git timestamp (to ensure a reproducible build)
+    mod_timestamp: '{{ .CommitTimestamp }}'
+    ldflags: |
+      -w
+      -s
+      -extldflags '-static'
+      -X github.com/anchore/syft/internal/version.version={{.Version}}
+      -X github.com/anchore/syft/internal/version.gitCommit={{.Commit}}
+      -X github.com/anchore/syft/internal/version.buildDate={{.Date}}
+      -X github.com/anchore/syft/internal/version.gitTreeState={{.Env.BUILD_GIT_TREE_STATE}}
+
+    # For more info on this macOS build, see: https://github.com/mitchellh/gon#usage-with-goreleaser
+  - binary: syft
+    id: syft-macos
+    env:
+      - CGO_ENABLED=0
    goos:
      - darwin
    goarch:
      - amd64
      - arm64
-    mod_timestamp: *build-timestamp
-    env: *build-env
-    ldflags: *build-ldflags
-    hooks:
-      post:
-        # we must have signing as a build hook instead of the signs section. The signs section must register a new
-        # asset, where we want to replace an existing asset. A post-build hook has the advantage of not needing to
-        # unpackage and repackage a tar.gz with a signed binary
-        - ./.github/scripts/apple-signing/sign.sh "{{ .Path }}" "{{ .IsSnapshot }}" "{{ .Target }}"
-
-  - id: windows-build
-    binary: syft
-    goos:
-      - windows
-    goarch:
-      - amd64
-    mod_timestamp: *build-timestamp
-    env: *build-env
-    ldflags: *build-ldflags
+    # Set the modified timestamp on the output binary to the git timestamp (to ensure a reproducible build)
+    mod_timestamp: '{{ .CommitTimestamp }}'
+    ldflags: |
+      -w
+      -s
+      -extldflags '-static'
+      -X github.com/anchore/syft/internal/version.version={{.Version}}
+      -X github.com/anchore/syft/internal/version.gitCommit={{.Commit}}
+      -X github.com/anchore/syft/internal/version.buildDate={{.Date}}
+      -X github.com/anchore/syft/internal/version.gitTreeState={{.Env.BUILD_GIT_TREE_STATE}}

 archives:
-  - id: linux-archives
+  - format: tar.gz
    builds:
-      - linux-build
+      - syft # i.e. Linux only
+  - format: zip # This is a hack for syft-macos! We don't actually intend to use _this_ ZIP file, we just need goreleaser to consider the ZIP file produced by gon (which will have the same file name) to be an artifact so we can use it downstream in publishing (e.g. to a homebrew tap)
+    id: syft-zip
+    builds:
+      - syft-macos
+      - syft-win

-  # note: the signing process is depending on tar.gz archives. If this format changes then .github/scripts/apple-signing/*.sh will need to be adjusted
-  - id: darwin-archives
-    builds:
-      - darwin-build
-
-  - id: windows-archives
-    format: zip
-    builds:
-      - windows-build
+signs:
+  - artifacts: checksum
+    cmd: sh
+    args:
+      - '-c'
+      # we should not include the zip artifact, as the artifact is mutated throughout the next macOS notarization step
+      # note: sed -i is not portable
+      - 'sed "/.*\.zip/d" ${artifact} > tmpfile && mv tmpfile ${artifact} && gpg --output ${signature} --detach-sign ${artifact}'
+  - id: syft-macos-signing
+    ids:
+      - syft-macos
+    cmd: ./.github/scripts/mac-sign-and-notarize.sh
+    signature: "syft_${VERSION}_darwin_amd64.dmg" # This is somewhat unintuitive. This gets the DMG file recognized as an artifact. In fact, both a DMG and a ZIP file are being produced by this signing step.
+    args:
+      - "{{ .IsSnapshot }}"
+      - "gon.hcl"
+      - "./dist/syft_{{ .Version }}_darwin_amd64"
+    artifacts: all

 nfpms:
  - license: "Apache 2.0"
@@ -86,12 +109,8 @@ brews:
  - tap:
      owner: anchore
      name: homebrew-syft
-    ids:
-      - darwin-archives
-      - linux-archives
    homepage: *website
    description: *description
-    license: "Apache License 2.0"

 dockers:
  - image_templates:
@@ -125,9 +144,17 @@ dockers:
 docker_manifests:
  - name_template: anchore/syft:{{ .Tag }}
    image_templates:
+      - anchore/syft:{{ .Tag }}-amd64
+      - anchore/syft:v{{ .Major }}-amd64
      - anchore/syft:v{{ .Major }}.{{ .Minor }}-amd64
+      - anchore/syft:{{ .Tag }}-arm64v8
+      - anchore/syft:v{{ .Major }}-arm64v8
      - anchore/syft:v{{ .Major }}.{{ .Minor }}-arm64v8
  - name_template: anchore/syft:latest
    image_templates:
+      - anchore/syft:{{ .Tag }}-amd64
+      - anchore/syft:v{{ .Major }}-amd64
      - anchore/syft:v{{ .Major }}.{{ .Minor }}-amd64
+      - anchore/syft:{{ .Tag }}-arm64v8
+      - anchore/syft:v{{ .Major }}-arm64v8
      - anchore/syft:v{{ .Major }}.{{ .Minor }}-arm64v8
@@ -1,179 +0,0 @@
-# Developing
-
-## Getting started
-
-In order to test and develop in this repo you will need the following dependencies installed:
- docker
- make
-
-After cloning do the following:
-1. run `make bootstrap` to download go mod dependencies, create the `/.tmp` dir, and download helper utilities.
-2. run `make` to run linting, tests, and other verifications to make certain everything is working alright.
-
-Checkout `make help` to see what other actions you can take.
-
-The main make tasks for common static analysis and testing are `lint`, `lint-fix`, `unit`, `integration`, and `cli`.
-
-## Levels of testing
-
- `unit`: The default level of test which is distributed throughout the repo are unit tests. Any `_test.go` file that 
-  does not reside somewhere within the `/test` directory is a unit test. Other forms of testing should be organized in 
-  the `/test` directory. These tests should focus on correctness of functionality in depth. % Test coverage metrics 
-  only considers unit tests and no other forms of testing.
-
- `integration`: located within `test/integration`, these tests focus on the behavior surfaced by the common library 
-  entrypoints from the `syft` package and make light assertions about the results surfaced. Additionally, these tests
-  tend to make diversity assertions for enum-like objects, ensuring that as enum values are added to a definition
-  that integration tests will automatically fail if no test attempts to use that enum value. For more details see 
-  the "Data diversity and freshness assertions" section below.
-
- `cli`: located with in `test/cli`, these are tests that test the correctness of application behavior from a 
-  snapshot build. This should be used in cases where a unit or integration test will not do or if you are looking
-  for in-depth testing of code in the `cmd/` package (such as testing the proper behavior of application configuration,
-  CLI switches, and glue code before syft library calls).
-
- `acceptance`: located within `test/compare` and `test/install`, these are smoke-like tests that ensure that application  
-  packaging and installation works as expected. For example, during release we provide RPM packages as a download 
-  artifact. We also have an accompanying RPM acceptance test that installs the RPM from a snapshot build and ensures the 
-  output of a syft invocation matches canned expected output. New acceptance tests should be added for each release artifact
-  and architecture supported (when possible).
-
-### Data diversity and freshness assertions
-
-It is important that tests against the codebase are flexible enough to begin failing when they do not cover "enough"
-of the objects under test. "Cover" in this case does not mean that some percentage of the code has been executed 
-during testing, but instead that there is enough diversity of data input reflected in testing relative to the
-definitions available.
-
-For instance, consider an enum-like value like so:
-```go
-type Language string
-
-const (
-  Java            Language = "java"
-  JavaScript      Language = "javascript"
-  Python          Language = "python"
-  Ruby            Language = "ruby"
-  Go              Language = "go"
-)
-```
-
-Say we have a test that exercises all the languages defined today:
-
-```go
-func TestCatalogPackages(t *testing.T) {
-  testTable := []struct {
-    // ... the set of test cases that test all languages
-  }
-  for _, test := range cases {
-    t.Run(test.name, func (t *testing.T) {
-      // use inputFixturePath and assert that syft.CatalogPackages() returns the set of expected Package objects
-      // ...
-    })
-  }
-}
-```
-
-Where each test case has a `inputFixturePath` that would result with packages from each language. This test is
-brittle since it does not assert that all languages were exercised directly and future modifications (such as 
-adding a new language) won't be covered by any test cases.
-
-To address this the enum-like object should have a definition of all objects that can be used in testing:
-
-```go
-type Language string
-
-// const( Java Language = ..., ... )
-
-var AllLanguages = []Language{
-	Java,
-	JavaScript,
-	Python,
-	Ruby,
-	Go,
-	Rust,
-}
-```
-
-Allowing testing to automatically fail when adding a new language:
-
-```go
-func TestCatalogPackages(t *testing.T) {
-  testTable := []struct {
-  	// ... the set of test cases that (hopefully) covers all languages
-  }
-
-  // new stuff...
-  observedLanguages := strset.New()
-  
-  for _, test := range cases {
-    t.Run(test.name, func (t *testing.T) {
-      // use inputFixturePath and assert that syft.CatalogPackages() returns the set of expected Package objects
-    	// ...
-    	
-    	// new stuff...
-    	for _, actualPkg := range actual {
-        observedLanguages.Add(string(actualPkg.Language))
-    	}
-    	
-    })
-  }
-
-   // new stuff...
-  for _, expectedLanguage := range pkg.AllLanguages {
-    if 	!observedLanguages.Contains(expectedLanguage) {
-      t.Errorf("failed to test language=%q", expectedLanguage)	
-    }
-  }
-}
-```
-
-This is a better test since it will fail when someone adds a new language but fails to write a test case that should
-exercise that new language. This method is ideal for integration-level testing, where testing correctness in depth 
-is not needed (that is what unit tests are for) but instead testing in breadth to ensure that units are well integrated.
-
-A similar case can be made for data freshness; if the quality of the results will be diminished if the input data
-is not kept up to date then a test should be written (when possible) to assert any input data is not stale.
-
-An example of this is the static list of licenses that is stored in `internal/spdxlicense` for use by the SPDX 
-presenters. This list is updated and published periodically by an external group and syft can grab and update this
-list by running `go generate ./...` from the root of the repo.
-
-An integration test has been written to grabs the latest license list version externally and compares that version
-with the version generated in the codebase. If they differ, the test fails, indicating to someone that there is an
-action needed to update it.
-
-**_The key takeaway is to try and write tests that fail when data assumptions change and not just when code changes.**_
-
-### Snapshot tests
-
-The format objects make a lot of use of "snapshot" testing, where you save the expected output bytes from a call into the
-git repository and during testing make a comparison of the actual bytes from the subject under test with the golden
-copy saved in the repo. The "golden" files are stored in the `test-fixtures/snapshot` directory relative to the go 
-package under test and should always be updated by invoking `go test` on the specific test file with a specific CLI 
-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. For instance, at the time of this writing 
-the CycloneDX presenter snapshots can be updated by running:
-
-```bash
-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.
-
-Snapshot testing is only as good as the manual verification of the golden snapshot file saved to the repo! Be careful 
-and diligent when updating these files.
-
-## Architecture
-
-TODO: outline:
- analysis creates a static SBOM which can be encoded and decoded.
- format objects, should strive to not add or enrich data in encoding that could otherwise be done during analysis
- pkg.Catalogers
- file catalogers
- source.Source
- file.Resolvers
- logger abstraction 
- events / bus abstraction 
@@ -16,17 +16,13 @@ ARG BUILD_VERSION
 ARG VCS_REF
 ARG VCS_URL

-LABEL org.opencontainers.image.created=$BUILD_DATE
-LABEL org.opencontainers.image.title="syft"
-LABEL org.opencontainers.image.description="CLI tool and library for generating a Software Bill of Materials from container images and filesystems"
-LABEL org.opencontainers.image.source=$VCS_URL
-LABEL org.opencontainers.image.revision=$VCS_REF
-LABEL org.opencontainers.image.vendor="Anchore, Inc."
-LABEL org.opencontainers.image.version=$BUILD_VERSION
-LABEL org.opencontainers.image.licenses="Apache-2.0"
-LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/anchore/syft/main/README.md"
-LABEL io.artifacthub.package.logo-url="https://user-images.githubusercontent.com/5199289/136844524-1527b09f-c5cb-4aa9-be54-5aa92a6086c1.png"
-LABEL io.artifacthub.package.license="Apache-2.0"
-      
+LABEL org.label-schema.schema-version="1.0"
+LABEL org.label-schema.build-date=$BUILD_DATE
+LABEL org.label-schema.name="syft"
+LABEL org.label-schema.description="CLI tool and library for generating a Software Bill of Materials from container images and filesystems"
+LABEL org.label-schema.vcs-url=$VCS_URL
+LABEL org.label-schema.vcs-ref=$VCS_REF
+LABEL org.label-schema.vendor="Anchore, Inc."
+LABEL org.label-schema.version=$BUILD_VERSION

 ENTRYPOINT ["/syft"]
@@ -3,14 +3,9 @@ TEMPDIR = ./.tmp
 RESULTSDIR = test/results
 COVER_REPORT = $(RESULTSDIR)/unit-coverage-details.txt
 COVER_TOTAL = $(RESULTSDIR)/unit-coverage-summary.txt
-LINTCMD = $(TEMPDIR)/golangci-lint run --tests=false --timeout=4m --config .golangci.yaml
-RELEASE_CMD=$(TEMPDIR)/goreleaser release --rm-dist
-SNAPSHOT_CMD=$(RELEASE_CMD) --skip-publish --snapshot
-VERSION=$(shell git describe --dirty --always --tags)
-COMPARE_TEST_IMAGE = centos:8.2.2004
-COMPARE_DIR = ./test/compare
-
-# formatting variables
+LINTCMD = $(TEMPDIR)/golangci-lint run --tests=false --timeout=2m --config .golangci.yaml
+ACC_TEST_IMAGE = centos:8.2.2004
+ACC_DIR = ./test/acceptance
 BOLD := $(shell tput -T linux bold)
 PURPLE := $(shell tput -T linux setaf 5)
 GREEN := $(shell tput -T linux setaf 2)
@@ -19,20 +14,32 @@ RED := $(shell tput -T linux setaf 1)
 RESET := $(shell tput -T linux sgr0)
 TITLE := $(BOLD)$(PURPLE)
 SUCCESS := $(BOLD)$(GREEN)
-
 # the quality gate lower threshold for unit test total % coverage (by function statements)
 COVERAGE_THRESHOLD := 62
-
 # CI cache busting values; change these if you want CI to not use previous stored cache
-INTEGRATION_CACHE_BUSTER="894d8ca"
-CLI_CACHE_BUSTER="e5cdfd8"
+INTEGRATION_CACHE_BUSTER="88738d2f"
+CLI_CACHE_BUSTER="9a2c03cf"
 BOOTSTRAP_CACHE="c7afb99ad"

 ## Build variables
 DISTDIR=./dist
 SNAPSHOTDIR=./snapshot
-OS=$(shell uname | tr '[:upper:]' '[:lower:]')
-SNAPSHOT_BIN=$(shell realpath $(shell pwd)/$(SNAPSHOTDIR)/$(OS)-build_$(OS)_amd64/$(BIN))
+GITTREESTATE=$(if $(shell git status --porcelain),dirty,clean)
+OS := $(shell uname)
+
+ifeq ($(OS),Darwin)
+	SNAPSHOT_CMD=$(shell realpath $(shell pwd)/$(SNAPSHOTDIR)/$(BIN)-macos_darwin_amd64/$(BIN))
+else
+	SNAPSHOT_CMD=$(shell realpath $(shell pwd)/$(SNAPSHOTDIR)/$(BIN)_linux_amd64/$(BIN))
+endif
+
+ifeq "$(strip $(VERSION))" ""
+ override VERSION = $(shell git describe --always --tags --dirty)
+endif
+
+# used to generate the changelog from the second to last tag to the current tag (used in the release pipeline when the release tag is in place)
+LAST_TAG := $(shell git describe --abbrev=0 --tags $(shell git rev-list --tags --max-count=1))
+SECOND_TO_LAST_TAG := $(shell git describe --abbrev=0 --tags $(shell git rev-list --tags --skip=1 --max-count=1))

 ## Variable assertions

@@ -44,8 +51,8 @@ ifndef RESULTSDIR
 	$(error RESULTSDIR is not set)
 endif

-ifndef COMPARE_DIR
-	$(error COMPARE_DIR is not set)
+ifndef ACC_DIR
+	$(error ACC_DIR is not set)
 endif

 ifndef DISTDIR
@@ -56,10 +63,6 @@ ifndef SNAPSHOTDIR
 	$(error SNAPSHOTDIR is not set)
 endif

-ifndef VERSION
-	$(error VERSION is not set)
-endif
-
 ifndef REF_NAME
 	REF_NAME = $(VERSION)
 endif
@@ -68,22 +71,14 @@ define title
    @printf '$(TITLE)$(1)$(RESET)\n'
 endef

-define safe_rm_rf
-	bash -c 'test -z "$(1)" && false || rm -rf $(1)'
-endef
-
-define safe_rm_rf_children
-	bash -c 'test -z "$(1)" && false || rm -rf $(1)/*'
-endef
-
 ## Tasks

 .PHONY: all
-all: clean static-analysis test ## Run all linux-based checks (linting, license check, unit, integration, and linux compare tests)
+all: clean static-analysis test ## Run all linux-based checks (linting, license check, unit, integration, and linux acceptance tests)
 	@printf '$(SUCCESS)All checks pass!$(RESET)\n'

 .PHONY: test
-test: unit validate-cyclonedx-schema integration benchmark compare-linux cli ## Run all tests (currently unit, integration, linux compare, and cli tests)
+test: unit validate-cyclonedx-schema integration benchmark acceptance-linux cli ## Run all tests (currently unit, integration, linux acceptance, and cli tests)

 .PHONY: help
 help:
@@ -107,11 +102,9 @@ $(TEMPDIR):
 bootstrap-tools: $(TEMPDIR)
 	GO111MODULE=off GOBIN=$(shell realpath $(TEMPDIR)) go get -u golang.org/x/perf/cmd/benchstat
 	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(TEMPDIR)/ v1.42.1
-	curl -sSfL https://raw.githubusercontent.com/wagoodman/go-bouncer/master/bouncer.sh | sh -s -- -b $(TEMPDIR)/ v0.3.0
-	curl -sSfL https://raw.githubusercontent.com/anchore/chronicle/main/install.sh | sh -s -- -b $(TEMPDIR)/ v0.3.0
-	.github/scripts/goreleaser-install.sh -d -b $(TEMPDIR)/ v1.4.1
-	GOBIN="$(shell realpath $(TEMPDIR))" go install github.com/neilpa/yajsv@v1.4.0
-	GOBIN="$(shell realpath $(TEMPDIR))" go install github.com/sigstore/cosign/cmd/cosign@v1.5.1
+	curl -sSfL https://raw.githubusercontent.com/wagoodman/go-bouncer/master/bouncer.sh | sh -s -- -b $(TEMPDIR)/ v0.2.0
+	curl -sSfL https://raw.githubusercontent.com/anchore/chronicle/main/install.sh | sh -s -- -b $(TEMPDIR)/ v0.2.0-beta
+	.github/scripts/goreleaser-install.sh -b $(TEMPDIR)/ v0.177.0

 .PHONY: bootstrap-go
 bootstrap-go:
@@ -122,12 +115,7 @@ bootstrap: $(RESULTSDIR) bootstrap-go bootstrap-tools ## Download and install al
 	$(call title,Bootstrapping dependencies)

 .PHONY: static-analysis
-static-analysis: check-go-mod-tidy check-licenses
-
- # NOTE: isolating golanci-lint so it runs over go1.17 in CI, since it is not compatible with
- # go1.18+
-.PHONY: static-analysis-golanci-lint
-static-analysis-golanci-lint: lint
+static-analysis: lint check-go-mod-tidy check-licenses

 .PHONY: lint
 lint: ## Run gofmt + golangci lint checks
@@ -151,7 +139,7 @@ lint-fix: ## Auto-format all source code + run golangci lint fixers
 	go mod tidy

 .PHONY: check-licenses
-check-licenses: ## Ensure transitive dependencies are compliant with the current license policy
+check-licenses:
 	$(TEMPDIR)/bouncer check

 check-go-mod-tidy:
@@ -182,48 +170,20 @@ benchmark: $(RESULTSDIR) ## Run benchmark tests and compare against the baseline
 show-benchstat:
 	@cat $(RESULTSDIR)/benchstat.txt

-# note: this is used by CI to determine if the install test fixture cache (docker image tars) should be busted
-install-fingerprint:
-	cd test/install && \
-		make cache.fingerprint
-
-install-test: $(SNAPSHOTDIR)
-	cd test/install && \
-		make
-
-install-test-cache-save: $(SNAPSHOTDIR)
-	cd test/install && \
-		make save
-
-install-test-cache-load: $(SNAPSHOTDIR)
-	cd test/install && \
-		make load
-
-install-test-ci-mac: $(SNAPSHOTDIR)
-	cd test/install && \
-		make ci-test-mac
-
 .PHONY: integration
 integration: ## Run integration tests
 	$(call title,Running integration tests)
+
 	go test -v ./test/integration

 # note: this is used by CI to determine if the integration test fixture cache (docker image tars) should be busted
 integration-fingerprint:
-	$(call title,Integration test fixture fingerprint)
-	find test/integration/test-fixtures/image-* -type f -exec md5sum {} + | awk '{print $1}' | sort | tee /dev/stderr | md5sum | tee test/integration/test-fixtures/cache.fingerprint && echo "$(INTEGRATION_CACHE_BUSTER)" >> test/integration/test-fixtures/cache.fingerprint
+	find test/integration/test-fixtures/image-* -type f -exec md5sum {} + | awk '{print $1}' | sort | md5sum | tee test/integration/test-fixtures/cache.fingerprint && echo "$(INTEGRATION_CACHE_BUSTER)" >> test/integration/test-fixtures/cache.fingerprint

 .PHONY: java-packages-fingerprint
 java-packages-fingerprint:
-	$(call title,Java test fixture fingerprint)
-	cd syft/pkg/cataloger/java/test-fixtures/java-builds && \
-		make packages.fingerprint
-
-.PHONY: go-binaries-fingerprint
-go-binaries-fingerprint:
-	$(call title,Go binaries test fixture fingerprint)
-	cd syft/pkg/cataloger/golang/test-fixtures/archs && \
-		make binaries.fingerprint
+	@cd syft/pkg/cataloger/java/test-fixtures/java-builds && \
+	make packages.fingerprint

 .PHONY: fixtures
 fixtures:
@@ -234,137 +194,127 @@ fixtures:
 generate-json-schema:  ## Generate a new json schema
 	cd schema/json && go run generate.go

-.PHONY: generate-license-list
-generate-license-list: ## Generate an updated spdx license list
-	go generate ./internal/spdxlicense/...
-	gofmt -s -w ./internal/spdxlicense
-
 .PHONY: build
 build: $(SNAPSHOTDIR) ## Build release snapshot binaries and packages

 $(SNAPSHOTDIR): ## Build snapshot release binaries and packages
 	$(call title,Building snapshot artifacts)
-
 	# create a config with the dist dir overridden
 	echo "dist: $(SNAPSHOTDIR)" > $(TEMPDIR)/goreleaser.yaml
 	cat .goreleaser.yaml >> $(TEMPDIR)/goreleaser.yaml

 	# build release snapshots
-	bash -c "SKIP_SIGNING=true $(SNAPSHOT_CMD) --skip-sign --config $(TEMPDIR)/goreleaser.yaml"
-
-.PHONY: snapshot-with-signing
-snapshot-with-signing: ## Build snapshot release binaries and packages (with dummy signing)
-	$(call title,Building snapshot artifacts (+ signing))
-
-	# create a config with the dist dir overridden
-	echo "dist: $(SNAPSHOTDIR)" > $(TEMPDIR)/goreleaser.yaml
-	cat .goreleaser.yaml >> $(TEMPDIR)/goreleaser.yaml
-
-	rm -f .github/scripts/apple-signing/log/*.txt
-
-	# build release snapshots
-	bash -c "$(SNAPSHOT_CMD) --config $(TEMPDIR)/goreleaser.yaml || (cat .github/scripts/apple-signing/log/*.txt && false)"
-
-	# remove the keychain with the trusted self-signed cert automatically
-	.github/scripts/apple-signing/cleanup.sh
+	# DOCKER_CLI_EXPERIMENTAL needed to support multi architecture builds for goreleaser
+	BUILD_GIT_TREE_STATE=$(GITTREESTATE) \
+	DOCKER_CLI_EXPERIMENTAL=enabled \
+	$(TEMPDIR)/goreleaser release --skip-publish --skip-sign --rm-dist --snapshot --config $(TEMPDIR)/goreleaser.yaml

 # note: we cannot clean the snapshot directory since the pipeline builds the snapshot separately
-.PHONY: compare-mac
-compare-mac: $(RESULTSDIR) $(SNAPSHOTDIR) ## Run compare tests on build snapshot binaries and packages (Mac)
-	$(call title,Running compare test: Run on Mac)
-	$(COMPARE_DIR)/mac.sh \
+.PHONY: acceptance-mac
+acceptance-mac: $(RESULTSDIR) $(SNAPSHOTDIR) ## Run acceptance tests on build snapshot binaries and packages (Mac)
+	$(call title,Running acceptance test: Run on Mac)
+	$(ACC_DIR)/mac.sh \
 			$(SNAPSHOTDIR) \
-			$(COMPARE_DIR) \
-			$(COMPARE_TEST_IMAGE) \
+			$(ACC_DIR) \
+			$(ACC_TEST_IMAGE) \
 			$(RESULTSDIR)

 # note: we cannot clean the snapshot directory since the pipeline builds the snapshot separately
-.PHONY: compare-linux
-compare-linux: compare-test-deb-package-install compare-test-rpm-package-install ## Run compare tests on build snapshot binaries and packages (Linux)
+.PHONY: acceptance-linux
+acceptance-linux: acceptance-test-deb-package-install acceptance-test-rpm-package-install ## Run acceptance tests on build snapshot binaries and packages (Linux)

-.PHONY: compare-test-deb-package-install
-compare-test-deb-package-install: $(RESULTSDIR) $(SNAPSHOTDIR)
-	$(call title,Running compare test: DEB install)
-	$(COMPARE_DIR)/deb.sh \
+.PHONY: acceptance-test-deb-package-install
+acceptance-test-deb-package-install: $(RESULTSDIR) $(SNAPSHOTDIR)
+	$(call title,Running acceptance test: DEB install)
+	$(ACC_DIR)/deb.sh \
 			$(SNAPSHOTDIR) \
-			$(COMPARE_DIR) \
-			$(COMPARE_TEST_IMAGE) \
+			$(ACC_DIR) \
+			$(ACC_TEST_IMAGE) \
 			$(RESULTSDIR)

-.PHONY: compare-test-rpm-package-install
-compare-test-rpm-package-install: $(RESULTSDIR) $(SNAPSHOTDIR)
-	$(call title,Running compare test: RPM install)
-	$(COMPARE_DIR)/rpm.sh \
+.PHONY: acceptance-test-rpm-package-install
+acceptance-test-rpm-package-install: $(RESULTSDIR) $(SNAPSHOTDIR)
+	$(call title,Running acceptance test: RPM install)
+	$(ACC_DIR)/rpm.sh \
 			$(SNAPSHOTDIR) \
-			$(COMPARE_DIR) \
-			$(COMPARE_TEST_IMAGE) \
+			$(ACC_DIR) \
+			$(ACC_TEST_IMAGE) \
 			$(RESULTSDIR)

 # note: this is used by CI to determine if the integration test fixture cache (docker image tars) should be busted
 cli-fingerprint:
-	$(call title,CLI test fixture fingerprint)
 	find test/cli/test-fixtures/image-* -type f -exec md5sum {} + | awk '{print $1}' | sort | md5sum | tee test/cli/test-fixtures/cache.fingerprint && echo "$(CLI_CACHE_BUSTER)" >> test/cli/test-fixtures/cache.fingerprint

 .PHONY: cli
 cli: $(SNAPSHOTDIR) ## Run CLI tests
-	chmod 755 "$(SNAPSHOT_BIN)"
-	$(SNAPSHOT_BIN) version
-	SYFT_BINARY_LOCATION='$(SNAPSHOT_BIN)' \
+	chmod 755 "$(SNAPSHOT_CMD)"
+	$(SNAPSHOT_CMD) version
+	SYFT_BINARY_LOCATION='$(SNAPSHOT_CMD)' \
 		go test -count=1 -v ./test/cli

-.PHONY: changelog
-changelog: clean-changelog CHANGELOG.md
+.PHONY: changelog-release
+changelog-release:
+	$(TEMPDIR)/chronicle --since-tag $(SECOND_TO_LAST_TAG) --until-tag $(LAST_TAG) -vv > CHANGELOG.md
+
+	@printf '\n$(BOLD)$(CYAN)Release $(VERSION) Changelog$(RESET)\n\n'
+	@cat CHANGELOG.md
+
+.PHONY: changelog-unreleased
+changelog-unreleased: ## show the current changelog that will be produced on the next release (note: requires GITHUB_TOKEN set)
+	$(TEMPDIR)/chronicle --since-tag $(LAST_TAG) -vv > CHANGELOG.md
+
+	@printf '\n$(BOLD)$(CYAN)Unreleased Changes (closed PRs and issues will not be in the final changelog)$(RESET)\n'
+
 	@docker run -it --rm \
 		-v $(shell pwd)/CHANGELOG.md:/CHANGELOG.md \
 		rawkode/mdv \
 			-t 748.5989 \
 			/CHANGELOG.md

-CHANGELOG.md:
-	$(TEMPDIR)/chronicle -vv > CHANGELOG.md
-
 .PHONY: release
-release: clean-dist CHANGELOG.md  ## Build and publish final binaries and packages. Intended to be run only on macOS.
+release: clean-dist changelog-release ## Build and publish final binaries and packages. Intended to be run only on macOS.
 	$(call title,Publishing release artifacts)

+	# Prepare for macOS-specific signing process
+	.github/scripts/mac-prepare-for-signing.sh
+
+	# login to docker
+	# note: the previous step creates a new keychain, so it is important to reauth into docker.io
+	@echo $${DOCKER_PASSWORD} | docker login docker.io -u $${DOCKER_USERNAME}  --password-stdin
+
 	# create a config with the dist dir overridden
 	echo "dist: $(DISTDIR)" > $(TEMPDIR)/goreleaser.yaml
 	cat .goreleaser.yaml >> $(TEMPDIR)/goreleaser.yaml

-	rm -f .github/scripts/apple-signing/log/*.txt
-
-	# note: notarization cannot be done in parallel, thus --parallelism 1
+	# release (note the version transformation from v0.7.0 --> 0.7.0)
+	# DOCKER_CLI_EXPERIMENTAL needed to support multi architecture builds for goreleaser
 	bash -c "\
-		$(RELEASE_CMD) \
+		BUILD_GIT_TREE_STATE=$(GITTREESTATE) \
+		VERSION=$(VERSION:v%=%) \
+		DOCKER_CLI_EXPERIMENTAL=enabled \
+		$(TEMPDIR)/goreleaser \
+			--rm-dist \
 			--config $(TEMPDIR)/goreleaser.yaml \
-			--parallelism 1 \
-			--release-notes <(cat CHANGELOG.md)\
-				 || (cat .github/scripts/apple-signing/log/*.txt && false)"
+			--release-notes <(cat CHANGELOG.md)"

-	cat .github/scripts/apple-signing/log/*.txt
+	# verify checksum signatures
+	.github/scripts/verify-signature.sh "$(DISTDIR)"

-	# TODO: turn this into a post-release hook
 	# upload the version file that supports the application version update check (excluding pre-releases)
 	.github/scripts/update-version-file.sh "$(DISTDIR)" "$(VERSION)"


 .PHONY: clean
 clean: clean-dist clean-snapshot clean-test-image-cache ## Remove previous builds, result reports, and test cache
-	$(call safe_rm_rf_children,$(RESULTSDIR))
+	rm -rf $(RESULTSDIR)/*

 .PHONY: clean-snapshot
 clean-snapshot:
-	$(call safe_rm_rf,$(SNAPSHOTDIR))
-	rm -f $(TEMPDIR)/goreleaser.yaml
+	rm -rf $(SNAPSHOTDIR) $(TEMPDIR)/goreleaser.yaml

 .PHONY: clean-dist
-clean-dist: clean-changelog
-	$(call safe_rm_rf,$(DISTDIR))
-	rm -f $(TEMPDIR)/goreleaser.yaml
-
-.PHONY: clean-changelog
-clean-changelog:
-	rm -f CHANGELOG.md
+clean-dist:
+	rm -rf $(DISTDIR) $(TEMPDIR)/goreleaser.yaml

 clean-test-image-cache: clean-test-image-tar-cache clean-test-image-docker-cache

@@ -11,26 +11,11 @@

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

-### Join our Virtual OSS Meetup!
-
-You are invited to join us on March 23rd, 11AM-Noon PT for our virtual open source meetup.  
-
-Hosts Priyanka “Pinky” Ravi of Weaveworks and Dan Luhring from Anchore OSS will explore how open source project Flux is utilizing Syft-generated SBOMs to secure the software supply chain.
-
-[Register here!](https://get.anchore.com/anchore-oss-meetup-mar-23-2022/)
-
-### Join our community meetings!
-
- Calendar: https://calendar.google.com/calendar/u/0/r?cid=Y182OTM4dGt0MjRtajI0NnNzOThiaGtnM29qNEBncm91cC5jYWxlbmRhci5nb29nbGUuY29t
- Agenda: https://docs.google.com/document/d/1ZtSAa6fj2a6KRWviTn3WoJm09edvrNUp4Iz_dOjjyY8/edit?usp=sharing (join [this group](https://groups.google.com/g/anchore-oss-community) for write access)
- All are welcome!
-
 ![syft-demo](https://user-images.githubusercontent.com/590471/90277200-2a253000-de33-11ea-893f-32c219eea11a.gif)

 ## Features
 - Catalog container images and filesystems to discover packages and libraries.
- Generate in-toto attestations where an SBOM is included as the payload.
- Supports packages and libraries from various ecosystems (APK, DEB, RPM, Ruby Bundles, Python Wheel/Egg/requirements.txt, JavaScript NPM/Yarn, Java JAR/EAR/WAR/PAR/SAR, Jenkins plugins JPI/HPI, Go modules, PHP Composer)
+- Supports packages and libraries from various ecosystems (APK, DEB, RPM, Ruby Bundles, Python Wheel/Egg/requirements.txt, JavaScript NPM/Yarn, Java JAR/EAR/WAR, Jenkins plugins JPI/HPI, Go modules)
 - Linux distribution identification (supports Alpine, BusyBox, CentOS/RedHat, Debian/Ubuntu flavored distributions)
 - Supports Docker and OCI image formats
 - Direct support for [Grype](https://github.com/anchore/grype), a fast and powerful vulnerability matcher.
@@ -40,14 +25,12 @@ If you encounter an issue, please [let us know using the issue tracker](https://

 ## Installation

-**Note**: Currently, Syft is built only for Linux, macOS and Windows.
-
 ### Recommended
 ```bash
 curl -sSfL https://raw.githubusercontent.com/anchore/syft/main/install.sh | sh -s -- -b /usr/local/bin
 ```

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

 ```
 curl -sSfL https://raw.githubusercontent.com/anchore/syft/main/install.sh | sh -s -- -b <DESTINATION_DIR> <RELEASE_VERSION>
@@ -59,26 +42,11 @@ brew tap anchore/syft
 brew install syft
 ```

-### Nix
-
-**Note**: nix packaging of Syft is [community maintained](https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/admin/syft/default.nix)
-
-Also syft is currently only in the [unstable channel](https://nixos.wiki/wiki/Nix_channels#The_official_channels) awaiting the `22.05` release
-
-```bash
-nix-env -i syft
-```
-
-... or, just try it out in an ephemeral nix shell
-
-```bash
-nix-shell -p syft
-```
+**Note**: Currently, Syft is built only for macOS and Linux.

 ## Getting started

-#### SBOM
-To generate an SBOM for an OCI image:
+To generate an SBOM for a Docker or OCI image:
 ```
 syft <image>
 ```
@@ -95,17 +63,6 @@ To include software from all image layers in the SBOM, regardless of its presenc
 syft packages <image> --scope all-layers
 ```

-#### SBOM Attestation
-To generate an attested SBOM for an OCI image as the predicate of an in-toto attestation
-```
-syft attest --output [FORMAT] --key [KEY] [SOURCE] [flags]
-```
-
-The above output is in the form of the [DSSE envelope](https://github.com/secure-systems-lab/dsse/blob/master/envelope.md#dsse-envelope).
-The payload is a base64 encoded `in-toto` statement with the SBOM as the predicate, the payload type is `application/vnd.in-toto+json`, and the signatures array is populated
-with the contents needed for public key verification. For details on workflows using this command see [here](#adding-an-sbom-to-an-image-as-an-attestation-using-syft).
-
-
 ### Supported sources

 Syft can generate a SBOM from a variety of sources:
@@ -122,7 +79,6 @@ Sources can be explicitly provided with a scheme:

 ```
 docker:yourrepo/yourimage:tag          use images from the Docker daemon
-podman:yourrepo/yourimage:tag          use images from the Podman daemon
 docker-archive:path/to/yourimage.tar   use a tarball from disk for archives created from "docker save"
 oci-archive:path/to/yourimage.tar      use a tarball from disk for OCI archives (from Skopeo or otherwise)
 oci-dir:path/to/yourimage              read directly from a path on disk for OCI layout directories (from Skopeo or otherwise)
@@ -131,27 +87,9 @@ file:path/to/yourproject/file          read directly from a path on disk (any si
 registry:yourrepo/yourimage:tag        pull image directly from a registry (no container runtime required)
 ```

-### Excluding file paths
-
-Syft can exclude files and paths from being scanned within a source by using glob expressions
-with one or more `--exclude` parameters:
-```
-syft <source> --exclude './out/**/*.json' --exclude /etc
-```
-**Note:** in the case of _image scanning_, since the entire filesystem is scanned it is
-possible to use absolute paths like `/etc` or `/usr/**/*.txt` whereas _directory scans_
-exclude files _relative to the specified directory_. For example: scanning `/usr/foo` with
-`--exclude ./package.json` would exclude `/usr/foo/package.json` and `--exclude '**/package.json'`
-would exclude all `package.json` files under `/usr/foo`. For _directory scans_,
-it is required to begin path expressions with `./`, `*/`, or `**/`, all of which
-will be resolved _relative to the specified scan directory_. Keep in mind, your shell
-may attempt to expand wildcards, so put those parameters in single quotes, like:
-`'**/*.json'`.
-
 ### Output formats

-The output format for Syft is configurable as well using the
-`-o` (or `--output`) option:
+The output format for Syft is configurable as well:

 ```
 syft packages <image> -o <format>
@@ -160,21 +98,11 @@ syft packages <image> -o <format>
 Where the `formats` available are:
 - `json`: Use this to get as much information out of Syft as possible!
 - `text`: A row-oriented, human-and-machine-friendly output.
- `cyclonedx`: A XML report conforming to the [CycloneDX 1.3 specification](https://cyclonedx.org/specification/overview/).
- `cyclonedx-json`: A JSON report conforming to the [CycloneDX 1.3 specification](https://cyclonedx.org/specification/overview/).
+- `cyclonedx`: A XML report conforming to the [CycloneDX 1.2 specification](https://cyclonedx.org/specification/overview/).
 - `spdx`: A tag-value formatted report conforming to the [SPDX 2.2 specification](https://spdx.github.io/spdx-spec/).
 - `spdx-json`: A JSON report conforming to the [SPDX 2.2 JSON Schema](https://github.com/spdx/spdx-spec/blob/v2.2/schemas/spdx-schema.json).
 - `table`: A columnar summary (default).

-#### Multiple outputs
-
-Syft can also output _multiple_ files in differing formats by appending
-`=<file>` to the option, for example to output Syft JSON and SPDX JSON:
-
-```shell
-syft packages <image> -o json=sbom.syft.json -o spdx-json=sbom.spdx.json
-```
-
 ## Private Registry Authentication

 ### Local Docker Credentials
@@ -230,8 +158,6 @@ The `volumeMounts` section mounts our secret to `/config`. The `volumes` section
    
    apiVersion: v1
    kind: Pod
-    metadata:
-      name: syft-k8s-usage
    spec:
      containers:
        - image: anchore/syft:latest
@@ -271,12 +197,8 @@ Configuration search paths:
 Configuration options (example values are the default):

 ```yaml
-# the output format(s) of the SBOM report (options: table, text, json, spdx, ...)
-# same as -o, --output, and SYFT_OUTPUT env var
-# to specify multiple output files in differing formats, use a list:
-# output:
-#   - "json=<syft-json-output-file>"
-#   - "spdx-json=<spdx-json-output-file>"
+# the output format of the SBOM report (options: table, text, json)
+# same as -o ; SYFT_OUTPUT env var
 output: "table"

 # suppress all output (except for the SBOM report)
@@ -290,26 +212,8 @@ file: ""
 # same as SYFT_CHECK_FOR_APP_UPDATE env var
 check-for-app-update: true

-# a list of globs to exclude from scanning. same as --exclude ; for example:
-# exclude:
-#   - "/etc/**"
-#   - "./out/**/*.json"
-exclude:
-
 # cataloging packages is exposed through the packages and power-user subcommands
 package:
-
-  # search within archives that do contain a file index to search against (zip)
-  # note: for now this only applies to the java package cataloger
-  # SYFT_PACKAGE_SEARCH_INDEXED_ARCHIVES env var
-  search-indexed-archives: true
-
-  # search within archives that do not contain a file index to search against (tar, tar.gz, tar.bz2, etc)
-  # note: enabling this may result in a performance impact since all discovered compressed tars will be decompressed
-  # note: for now this only applies to the java package cataloger
-  # SYFT_PACKAGE_SEARCH_UNINDEXED_ARCHIVES env var
-  search-unindexed-archives: false
-
  cataloger:
    # enable/disable cataloging of packages
    # SYFT_PACKAGE_CATALOGER_ENABLED env var
@@ -406,9 +310,9 @@ registry:

  # credentials for specific registries
  auth:
-      # the URL to the registry (e.g. "docker.io", "localhost:5000", etc.)
+    - # the URL to the registry (e.g. "docker.io", "localhost:5000", etc.)
      # SYFT_REGISTRY_AUTH_AUTHORITY env var
-    - authority: ""
+      authority: ""
      # SYFT_REGISTRY_AUTH_USERNAME env var
      username: ""
      # SYFT_REGISTRY_AUTH_PASSWORD env var
@@ -416,17 +320,7 @@ registry:
      # note: token and username/password are mutually exclusive
      # SYFT_REGISTRY_AUTH_TOKEN env var
      token: ""
-      # - ... # note, more credentials can be provided via config file only
-
-# generate an attested SBOM
-attest:
-  # path to the private key file to use for attestation
-  # SYFT_ATTEST_KEY env var
-  key: "cosign.key"
-
-  # password to decrypt to given private key
-  # SYFT_ATTEST_PASSWORD env var, additionally responds to COSIGN_PASSWORD
-  password: ""
+    - ... # note, more credentials can be provided via config file only

 log:
  # use structured logging
@@ -462,38 +356,5 @@ anchore:
  # (feature-preview) path to dockerfile to be uploaded with the syft results to Anchore Enterprise (supported on Enterprise 3.0+)
  # same as -d ; SYFT_ANCHORE_DOCKERFILE env var
  dockerfile: ""
+
 ```
-
-### Adding an SBOM to an image as an attestation using Syft
-
-`syft attest --output [FORMAT] --key [KEY] [SOURCE] [flags]`
-
-SBOMs themselves can serve as input to different analysis tools. The Anchore organization offers the vulnerability scanner
-[grype](https://github.com/anchore/grype) as one such tool.
-One of the foundational approaches to "trust" between tools is for producers to use the artifacts generated by syft as attestations to their images.
-The DSSE output of `syft attest` can be used with the [cosign](https://github.com/sigstore/cosign) tool to attach an attestation to an image.
-
-#### Example attest
-Note for the following example replace `docker.io/image:latest` with an image you own. You should also have push access to 
-its remote reference. Replace $MY_PRIVATE_KEY with a private key you own or have generated with cosign.
-
-```bash
-syft attest --key $MY_PRIVATE_KEY docker.io/image:latest > image_latest_sbom_attestation.json
-cosign attach attestation --attestation image_latest_sbom_attestation.json docker.io/image:latest
-```
-
-Verify the new attestation exists on your image
-```bash
-cosign verify-attestation -key $MY_PUBLIC_KEY docker.io/image:latest | jq '.payload | @base64d | .payload | fromjson | .predicate'
-```
-
-You should see this output along with the attached SBOM.
-```
-Verification for docker.io/image:latest --
-The following checks were performed on each of these signatures:
-  - The cosign claims were validated
-  - The signatures were verified against the specified public key
-  - Any certificates were verified against the Fulcio roots.
-```
-
-Consumers of your image can now trust that the SBOM associated with your image is correct and from a trusted source.
@@ -1,5 +0,0 @@
-# See documentation here: https://github.com/artifacthub/hub/blob/v1.6.0/docs/metadata/artifacthub-repo.yml
-
-owners:
-  - name: wagoodman
-    email: wagoodman@gmail.com
@@ -1,322 +0,0 @@
-package cmd
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"fmt"
-	"io"
-	"os"
-	"strings"
-
-	"github.com/anchore/syft/internal/formats/cyclonedxjson"
-	"github.com/anchore/syft/internal/formats/spdx22json"
-	"github.com/anchore/syft/internal/formats/syftjson"
-
-	"github.com/anchore/stereoscope"
-	"github.com/anchore/stereoscope/pkg/image"
-	"github.com/anchore/syft/internal"
-	"github.com/anchore/syft/internal/bus"
-	"github.com/anchore/syft/internal/log"
-	"github.com/anchore/syft/internal/ui"
-	"github.com/anchore/syft/syft"
-	"github.com/anchore/syft/syft/event"
-	"github.com/anchore/syft/syft/sbom"
-	"github.com/anchore/syft/syft/source"
-	"github.com/in-toto/in-toto-golang/in_toto"
-	"github.com/pkg/errors"
-	"github.com/pkg/profile"
-	"github.com/sigstore/cosign/cmd/cosign/cli/sign"
-	"github.com/sigstore/cosign/pkg/cosign"
-	"github.com/sigstore/cosign/pkg/cosign/attestation"
-	"github.com/sigstore/sigstore/pkg/signature/dsse"
-	"github.com/spf13/cobra"
-	"github.com/spf13/pflag"
-	"github.com/spf13/viper"
-	"github.com/wagoodman/go-partybus"
-
-	signatureoptions "github.com/sigstore/sigstore/pkg/signature/options"
-)
-
-const (
-	attestExample = `  {{.appName}} {{.command}} --output [FORMAT] --key [KEY] alpine:latest
-
-  Supports the following image sources:
-    {{.appName}} {{.command}} --key [KEY] yourrepo/yourimage:tag     defaults to using images from a Docker daemon. If Docker is not present, the image is pulled directly from the registry.
-    {{.appName}} {{.command}} --key [KEY] path/to/a/file/or/dir      only for OCI tar or OCI directory
-
-`
-	attestSchemeHelp = "\n" + indent + schemeHelpHeader + "\n" + imageSchemeHelp
-
-	attestHelp = attestExample + attestSchemeHelp
-
-	intotoJSONDsseType = `application/vnd.in-toto+json`
-)
-
-var attestFormats = []sbom.FormatID{
-	syftjson.ID,
-	spdx22json.ID,
-	cyclonedxjson.ID,
-}
-
-var (
-	attestCmd = &cobra.Command{
-		Use:   "attest --output [FORMAT] --key [KEY] [SOURCE]",
-		Short: "Generate a package SBOM as an attestation for the given [SOURCE] container image",
-		Long:  "Generate a packaged-based Software Bill Of Materials (SBOM) from a container image as the predicate of an in-toto attestation",
-		Example: internal.Tprintf(attestHelp, map[string]interface{}{
-			"appName": internal.ApplicationName,
-			"command": "attest",
-		}),
-		Args:          validateInputArgs,
-		SilenceUsage:  true,
-		SilenceErrors: true,
-		PreRunE: func(cmd *cobra.Command, args []string) (err error) {
-			if appConfig.Dev.ProfileCPU && appConfig.Dev.ProfileMem {
-				return fmt.Errorf("cannot profile CPU and memory simultaneously")
-			}
-			return nil
-		},
-		RunE: func(cmd *cobra.Command, args []string) error {
-			if appConfig.Dev.ProfileCPU {
-				defer profile.Start(profile.CPUProfile).Stop()
-			} else if appConfig.Dev.ProfileMem {
-				defer profile.Start(profile.MemProfile).Stop()
-			}
-
-			return attestExec(cmd.Context(), cmd, args)
-		},
-	}
-)
-
-func fetchPassword(_ bool) (b []byte, err error) {
-	potentiallyPipedInput, err := internal.IsPipedInput()
-	if err != nil {
-		log.Warnf("unable to determine if there is piped input: %+v", err)
-	}
-	switch {
-	case appConfig.Attest.Password != "":
-		return []byte(appConfig.Attest.Password), nil
-	case potentiallyPipedInput:
-		// handle piped in passwords
-		pwBytes, err := io.ReadAll(os.Stdin)
-		if err != nil {
-			return nil, fmt.Errorf("unable to get password from stdin: %w", err)
-		}
-		// be resilient to input that may have newline characters (in case someone is using echo without -n)
-		cleanPw := strings.TrimRight(string(pwBytes), "\n")
-		return []byte(cleanPw), nil
-	case internal.IsTerminal():
-		return cosign.GetPassFromTerm(false)
-	}
-	return nil, errors.New("no method available to fetch password")
-}
-
-func selectPassFunc(keypath string) (cosign.PassFunc, error) {
-	keyContents, err := os.ReadFile(keypath)
-	if err != nil {
-		return nil, err
-	}
-
-	var fn cosign.PassFunc = func(bool) (b []byte, err error) { return nil, nil }
-
-	_, err = cosign.LoadPrivateKey(keyContents, nil)
-	if err != nil {
-		fn = fetchPassword
-	}
-
-	return fn, nil
-}
-
-func attestExec(ctx context.Context, _ *cobra.Command, args []string) error {
-	// can only be an image for attestation or OCI DIR
-	userInput := args[0]
-	si, err := source.ParseInput(userInput, appConfig.Platform, false)
-	if err != nil {
-		return fmt.Errorf("could not generate source input for attest command: %w", err)
-	}
-
-	switch si.Scheme {
-	case source.ImageScheme, source.UnknownScheme:
-		// at this point we know that it cannot be dir: or file: schemes, so we will assume that the unknown scheme could represent an image
-		si.Scheme = source.ImageScheme
-	default:
-		return fmt.Errorf("attest command can only be used with image sources but discovered %q when given %q", si.Scheme, userInput)
-	}
-
-	// if the original detection was from a local daemon we want to short circuit
-	// that and attempt to generate the image source from a registry source instead
-	switch si.ImageSource {
-	case image.UnknownSource, image.OciRegistrySource:
-		si.ImageSource = image.OciRegistrySource
-	default:
-		return fmt.Errorf("attest command can only be used with image sources fetch directly from the registry, but discovered an image source of %q when given %q", si.ImageSource, userInput)
-	}
-
-	if len(appConfig.Outputs) > 1 {
-		return fmt.Errorf("unable to generate attestation for more than one output")
-	}
-
-	format := syft.FormatByName(appConfig.Outputs[0])
-	predicateType := formatPredicateType(format)
-	if predicateType == "" {
-		return fmt.Errorf("could not produce attestation predicate for given format: %q. Available formats: %+v", formatAliases(format.ID()), formatAliases(attestFormats...))
-	}
-
-	passFunc, err := selectPassFunc(appConfig.Attest.Key)
-	if err != nil {
-		return err
-	}
-
-	ko := sign.KeyOpts{
-		KeyRef:   appConfig.Attest.Key,
-		PassFunc: passFunc,
-	}
-
-	sv, err := sign.SignerFromKeyOpts(ctx, "", ko)
-	if err != nil {
-		return err
-	}
-	defer sv.Close()
-
-	return eventLoop(
-		attestationExecWorker(*si, format, predicateType, sv),
-		setupSignals(),
-		eventSubscription,
-		stereoscope.Cleanup,
-		ui.Select(isVerbose(), appConfig.Quiet)...,
-	)
-}
-
-func attestationExecWorker(sourceInput source.Input, format sbom.Format, predicateType string, sv *sign.SignerVerifier) <-chan error {
-	errs := make(chan error)
-	go func() {
-		defer close(errs)
-
-		src, cleanup, err := source.NewFromRegistry(sourceInput, appConfig.Registry.ToOptions(), appConfig.Exclusions)
-		if cleanup != nil {
-			defer cleanup()
-		}
-		if err != nil {
-			errs <- fmt.Errorf("failed to construct source from user input %q: %w", sourceInput.UserInput, err)
-			return
-		}
-
-		s, err := generateSBOM(src, errs)
-		if err != nil {
-			errs <- err
-			return
-		}
-
-		sbomBytes, err := syft.Encode(*s, format)
-		if err != nil {
-			errs <- err
-			return
-		}
-
-		err = generateAttestation(sbomBytes, src, sv, predicateType)
-		if err != nil {
-			errs <- err
-			return
-		}
-	}()
-	return errs
-}
-
-func formatPredicateType(format sbom.Format) string {
-	switch format.ID() {
-	case spdx22json.ID:
-		return in_toto.PredicateSPDX
-	case cyclonedxjson.ID:
-		// Tentative see https://github.com/in-toto/attestation/issues/82
-		return "https://cyclonedx.org/bom"
-	case syftjson.ID:
-		return "https://syft.dev/bom"
-	default:
-		return ""
-	}
-}
-
-func findValidDigest(digests []string) string {
-	// since we are only using the OCI repo provider for this source we are safe that this is only 1 value
-	// see https://github.com/anchore/stereoscope/blob/25ebd49a842b5ac0a20c2e2b4b81335b64ad248c/pkg/image/oci/registry_provider.go#L57-L63
-	split := strings.Split(digests[0], "sha256:")
-	return split[1]
-}
-
-func generateAttestation(predicate []byte, src *source.Source, sv *sign.SignerVerifier, predicateType string) error {
-	switch len(src.Image.Metadata.RepoDigests) {
-	case 0:
-		return fmt.Errorf("cannot generate attestation since no repo digests were found; make sure you're passing an OCI registry source for the attest command")
-	case 1:
-	default:
-		return fmt.Errorf("cannot generate attestation since multiple repo digests were found for the image: %+v", src.Image.Metadata.RepoDigests)
-	}
-
-	wrapped := dsse.WrapSigner(sv, intotoJSONDsseType)
-
-	sh, err := attestation.GenerateStatement(attestation.GenerateOpts{
-		Predicate: bytes.NewBuffer(predicate),
-		Type:      predicateType,
-		Digest:    findValidDigest(src.Image.Metadata.RepoDigests),
-	})
-	if err != nil {
-		return err
-	}
-
-	payload, err := json.Marshal(sh)
-	if err != nil {
-		return err
-	}
-
-	signedPayload, err := wrapped.SignMessage(bytes.NewReader(payload), signatureoptions.WithContext(context.Background()))
-	if err != nil {
-		return errors.Wrap(err, "unable to sign SBOM")
-	}
-
-	bus.Publish(partybus.Event{
-		Type: event.Exit,
-		Value: func() error {
-			_, err := os.Stdout.Write(signedPayload)
-			return err
-		},
-	})
-
-	return nil
-}
-
-func init() {
-	setAttestFlags(attestCmd.Flags())
-	if err := bindAttestConfigOptions(attestCmd.Flags()); err != nil {
-		panic(err)
-	}
-	rootCmd.AddCommand(attestCmd)
-}
-
-func setAttestFlags(flags *pflag.FlagSet) {
-	// key options
-	flags.StringP("key", "", "cosign.key",
-		"path to the private key file to use for attestation",
-	)
-
-	// in-toto attestations only support JSON predicates, so not all SBOM formats that syft can output are supported
-	flags.StringP(
-		"output", "o", formatAliases(syftjson.ID)[0],
-		fmt.Sprintf("the SBOM format encapsulated within the attestation, available options=%v", formatAliases(attestFormats...)),
-	)
-
-	flags.StringP(
-		"platform", "", "",
-		"an optional platform specifier for container image sources (e.g. 'linux/arm64', 'linux/arm64/v8', 'arm64', 'linux')",
-	)
-}
-
-func bindAttestConfigOptions(flags *pflag.FlagSet) error {
-	// note: output is not included since this configuration option is shared between multiple subcommands
-
-	if err := viper.BindPFlag("attest.key", flags.Lookup("key")); err != nil {
-		return err
-	}
-
-	return nil
-}
@@ -11,7 +11,6 @@ import (

 func checkForApplicationUpdate() {
 	if appConfig.CheckForAppUpdate {
-		log.Debugf("checking if new vesion of %s is available", internal.ApplicationName)
 		isAvailable, newVersion, err := version.IsUpdateAvailable()
 		if err != nil {
 			// this should never stop the application
@@ -1,21 +1,17 @@
 package cmd

 import (
-	"encoding/json"
 	"fmt"
 	"os"
-	"sort"

-	"github.com/spf13/pflag"
+	"github.com/spf13/cobra"

 	"github.com/anchore/stereoscope"
 	"github.com/anchore/syft/internal/config"
 	"github.com/anchore/syft/internal/log"
 	"github.com/anchore/syft/internal/logger"
-	"github.com/anchore/syft/internal/version"
 	"github.com/anchore/syft/syft"
 	"github.com/gookit/color"
-	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	"github.com/wagoodman/go-partybus"
 )
@@ -32,8 +28,6 @@ func init() {
 		initAppConfig,
 		initLogging,
 		logAppConfig,
-		checkForApplicationUpdate,
-		logAppVersion,
 		initEventBus,
 	)
 }
@@ -54,14 +48,7 @@ func initCmdAliasBindings() {
 		panic(err)
 	}

-	// enable all cataloger by default if power-user command is run
-	if activeCmd == powerUserCmd {
-		config.PowerUserCatalogerEnabledDefault()
-	}
-
-	// set bindings based on the packages alias
-	switch activeCmd {
-	case packagesCmd, rootCmd:
+	if activeCmd == packagesCmd || activeCmd == rootCmd {
 		// note: we need to lazily bind config options since they are shared between both the root command
 		// and the packages command. Otherwise there will be global viper state that is in contention.
 		// See for more details: https://github.com/spf13/viper/issues/233 . Additionally, the bindings must occur BEFORE
@@ -71,17 +58,7 @@ func initCmdAliasBindings() {
 		if err = bindPackagesConfigOptions(activeCmd.Flags()); err != nil {
 			panic(err)
 		}
-	case attestCmd:
-		// the --output and --platform options are independently defined flags, but a shared config option
-		if err = bindSharedConfigOption(attestCmd.Flags()); err != nil {
-			panic(err)
-		}
-		// even though the root command or packages command is NOT being run, we still need default bindings
-		// such that application config parsing passes.
-		if err = bindExclusivePackagesConfigOptions(packagesCmd.Flags()); err != nil {
-			panic(err)
-		}
-	default:
+	} else {
 		// even though the root command or packages command is NOT being run, we still need default bindings
 		// such that application config parsing passes.
 		if err = bindPackagesConfigOptions(packagesCmd.Flags()); err != nil {
@@ -90,18 +67,6 @@ func initCmdAliasBindings() {
 	}
 }

-func bindSharedConfigOption(flags *pflag.FlagSet) error {
-	if err := viper.BindPFlag("output", flags.Lookup("output")); err != nil {
-		return err
-	}
-
-	if err := viper.BindPFlag("platform", flags.Lookup("platform")); err != nil {
-		return err
-	}
-
-	return nil
-}
-
 func initAppConfig() {
 	cfg, err := config.LoadApplicationConfig(viper.GetViper(), persistentOpts)
 	if err != nil {
@@ -139,33 +104,3 @@ func initEventBus() {
 	stereoscope.SetBus(eventBus)
 	syft.SetBus(eventBus)
 }
-
-func logAppVersion() {
-	versionInfo := version.FromBuild()
-	log.Infof("syft version: %s", versionInfo.Version)
-
-	var fields map[string]interface{}
-	bytes, err := json.Marshal(versionInfo)
-	if err != nil {
-		return
-	}
-	err = json.Unmarshal(bytes, &fields)
-	if err != nil {
-		return
-	}
-
-	keys := make([]string, 0, len(fields))
-	for k := range fields {
-		keys = append(keys, k)
-	}
-	sort.Strings(keys)
-
-	for idx, field := range keys {
-		value := fields[field]
-		branch := "├──"
-		if idx == len(fields)-1 {
-			branch = "└──"
-		}
-		log.Debugf("  %s %s: %s", branch, field, value)
-	}
-}
@@ -14,7 +14,7 @@ import (
 // eventLoop listens to worker errors (from execution path), worker events (from a partybus subscription), and
 // signal interrupts. Is responsible for handling each event relative to a given UI an to coordinate eventing until
 // an eventual graceful exit.
-// nolint:funlen
+// nolint:gocognit,funlen
 func eventLoop(workerErrs <-chan error, signals <-chan os.Signal, subscription *partybus.Subscription, cleanupFn func(), uxs ...ui.UI) error {
 	defer cleanupFn()
 	events := subscription.Events()
@@ -41,7 +41,9 @@ func eventLoop(workerErrs <-chan error, signals <-chan os.Signal, subscription *
 			if err != nil {
 				// capture the error from the worker and unsubscribe to complete a graceful shutdown
 				retErr = multierror.Append(retErr, err)
-				_ = subscription.Unsubscribe()
+				if err := subscription.Unsubscribe(); err != nil {
+					retErr = multierror.Append(retErr, err)
+				}
 				// the worker has exited, we may have been mid-handling events for the UI which should now be
 				// ignored, in which case forcing a teardown of the UI irregardless of the state is required.
 				forceTeardown = true
@@ -50,7 +50,7 @@ func Test_eventLoop_gracefulExit(t *testing.T) {
 		t.Cleanup(testBus.Close)

 		finalEvent := partybus.Event{
-			Type: event.Exit,
+			Type: event.PresenterReady,
 		}

 		worker := func() <-chan error {
@@ -182,7 +182,7 @@ func Test_eventLoop_unsubscribeError(t *testing.T) {
 		t.Cleanup(testBus.Close)

 		finalEvent := partybus.Event{
-			Type: event.Exit,
+			Type: event.PresenterReady,
 		}

 		worker := func() <-chan error {
@@ -251,8 +251,8 @@ func Test_eventLoop_handlerError(t *testing.T) {
 		t.Cleanup(testBus.Close)

 		finalEvent := partybus.Event{
-			Type:  event.Exit,
-			Error: fmt.Errorf("an exit error occured"),
+			Type:  event.PresenterReady,
+			Error: fmt.Errorf("unable to create presenter"),
 		}

 		worker := func() <-chan error {
@@ -376,7 +376,7 @@ func Test_eventLoop_uiTeardownError(t *testing.T) {
 		t.Cleanup(testBus.Close)

 		finalEvent := partybus.Event{
-			Type: event.Exit,
+			Type: event.PresenterReady,
 		}

 		worker := func() <-chan error {
@@ -1,32 +0,0 @@
-package cmd
-
-import (
-	"github.com/anchore/syft/syft"
-	"github.com/anchore/syft/syft/sbom"
-)
-
-func formatAliases(ids ...sbom.FormatID) (aliases []string) {
-	for _, id := range ids {
-		switch id {
-		case syft.JSONFormatID:
-			aliases = append(aliases, "syft-json")
-		case syft.TextFormatID:
-			aliases = append(aliases, "text")
-		case syft.TableFormatID:
-			aliases = append(aliases, "table")
-		case syft.SPDXJSONFormatID:
-			aliases = append(aliases, "spdx-json")
-		case syft.SPDXTagValueFormatID:
-			aliases = append(aliases, "spdx-tag-value")
-		case syft.CycloneDxXMLFormatID:
-			aliases = append(aliases, "cyclonedx-xml")
-		case syft.CycloneDxJSONFormatID:
-			aliases = append(aliases, "cyclonedx-json")
-		case syft.GitHubID:
-			aliases = append(aliases, "github", "github-json")
-		default:
-			aliases = append(aliases, string(id))
-		}
-	}
-	return aliases
-}
@@ -1,64 +0,0 @@
-package cmd
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/anchore/syft/internal/formats/table"
-
-	"github.com/anchore/syft/syft"
-
-	"github.com/anchore/syft/syft/sbom"
-	"github.com/hashicorp/go-multierror"
-)
-
-// makeWriter creates a sbom.Writer for output or returns an error. this will either return a valid writer
-// or an error but neither both and if there is no error, sbom.Writer.Close() should be called
-func makeWriter(outputs []string, defaultFile string) (sbom.Writer, error) {
-	outputOptions, err := parseOptions(outputs, defaultFile)
-	if err != nil {
-		return nil, err
-	}
-
-	writer, err := sbom.NewWriter(outputOptions...)
-	if err != nil {
-		return nil, err
-	}
-
-	return writer, nil
-}
-
-// parseOptions utility to parse command-line option strings and retain the existing behavior of default format and file
-func parseOptions(outputs []string, defaultFile string) (out []sbom.WriterOption, errs error) {
-	// always should have one option -- we generally get the default of "table", but just make sure
-	if len(outputs) == 0 {
-		outputs = append(outputs, string(table.ID))
-	}
-
-	for _, name := range outputs {
-		name = strings.TrimSpace(name)
-
-		// split to at most two parts for <format>=<file>
-		parts := strings.SplitN(name, "=", 2)
-
-		// the format name is the first part
-		name = parts[0]
-
-		// default to the --file or empty string if not specified
-		file := defaultFile
-
-		// If a file is specified as part of the output formatName, use that
-		if len(parts) > 1 {
-			file = parts[1]
-		}
-
-		format := syft.FormatByName(name)
-		if format == nil {
-			errs = multierror.Append(errs, fmt.Errorf("bad output format: '%s'", name))
-			continue
-		}
-
-		out = append(out, sbom.NewWriterOption(format, file))
-	}
-	return out, errs
-}
@@ -1,78 +0,0 @@
-package cmd
-
-import (
-	"fmt"
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestOutputWriterConfig(t *testing.T) {
-	tmp := t.TempDir() + "/"
-
-	tests := []struct {
-		outputs  []string
-		file     string
-		err      bool
-		expected []string
-	}{
-		{
-			outputs:  []string{},
-			expected: []string{""},
-		},
-		{
-			outputs:  []string{"json"},
-			expected: []string{""},
-		},
-		{
-			file:     "test-1.json",
-			expected: []string{"test-1.json"},
-		},
-		{
-			outputs:  []string{"json=test-2.json"},
-			expected: []string{"test-2.json"},
-		},
-		{
-			outputs:  []string{"json=test-3-1.json", "spdx-json=test-3-2.json"},
-			expected: []string{"test-3-1.json", "test-3-2.json"},
-		},
-		{
-			outputs:  []string{"text", "json=test-4.json"},
-			expected: []string{"", "test-4.json"},
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(fmt.Sprintf("%s/%s", test.outputs, test.file), func(t *testing.T) {
-			outputs := test.outputs
-			for i, val := range outputs {
-				outputs[i] = strings.Replace(val, "=", "="+tmp, 1)
-			}
-
-			file := test.file
-			if file != "" {
-				file = tmp + file
-			}
-
-			_, err := makeWriter(test.outputs, file)
-
-			if test.err {
-				assert.Error(t, err)
-				return
-			} else {
-				assert.NoError(t, err)
-			}
-
-			for _, expected := range test.expected {
-				if expected != "" {
-					assert.FileExists(t, tmp+expected)
-				} else if file != "" {
-					assert.FileExists(t, file)
-				} else {
-					assert.NoFileExists(t, expected)
-				}
-			}
-		})
-	}
-}
@@ -10,14 +10,14 @@ import (
 	"github.com/anchore/syft/internal"
 	"github.com/anchore/syft/internal/anchore"
 	"github.com/anchore/syft/internal/bus"
-	"github.com/anchore/syft/internal/formats/table"
+	"github.com/anchore/syft/internal/formats"
 	"github.com/anchore/syft/internal/log"
 	"github.com/anchore/syft/internal/ui"
-	"github.com/anchore/syft/internal/version"
 	"github.com/anchore/syft/syft"
-	"github.com/anchore/syft/syft/artifact"
+	"github.com/anchore/syft/syft/distro"
 	"github.com/anchore/syft/syft/event"
-	"github.com/anchore/syft/syft/pkg/cataloger"
+	"github.com/anchore/syft/syft/format"
+	"github.com/anchore/syft/syft/pkg"
 	"github.com/anchore/syft/syft/sbom"
 	"github.com/anchore/syft/syft/source"
 	"github.com/pkg/profile"
@@ -28,48 +28,49 @@ import (
 )

 const (
-	packagesExample = `  {{.appName}} {{.command}} alpine:latest                    a summary of discovered packages
-  {{.appName}} {{.command}} alpine:latest -o json            show all possible cataloging details
-  {{.appName}} {{.command}} alpine:latest -o cyclonedx       show a CycloneDX formatted SBOM
-  {{.appName}} {{.command}} alpine:latest -o cyclonedx-json  show a CycloneDX JSON formatted SBOM
-  {{.appName}} {{.command}} alpine:latest -o spdx            show a SPDX 2.2 Tag-Value formatted SBOM
-  {{.appName}} {{.command}} alpine:latest -o spdx-json       show a SPDX 2.2 JSON formatted SBOM
-  {{.appName}} {{.command}} alpine:latest -vv                show verbose debug information
+	packagesExample = `  {{.appName}} {{.command}} alpine:latest                a summary of discovered packages
+  {{.appName}} {{.command}} alpine:latest -o json        show all possible cataloging details
+  {{.appName}} {{.command}} alpine:latest -o cyclonedx   show a CycloneDX formatted SBOM
+  {{.appName}} {{.command}} alpine:latest -o spdx        show a SPDX 2.2 tag-value formatted SBOM
+  {{.appName}} {{.command}} alpine:latest -o spdx-json   show a SPDX 2.2 JSON formatted SBOM
+  {{.appName}} {{.command}} alpine:latest -vv            show verbose debug information

  Supports the following image sources:
    {{.appName}} {{.command}} yourrepo/yourimage:tag     defaults to using images from a Docker daemon. If Docker is not present, the image is pulled directly from the registry.
    {{.appName}} {{.command}} path/to/a/file/or/dir      a Docker tar, OCI tar, OCI directory, or generic filesystem directory
-`

-	schemeHelpHeader = "You can also explicitly specify the scheme to use:"
-	imageSchemeHelp  = `    {{.appName}} {{.command}} docker:yourrepo/yourimage:tag          explicitly use the Docker daemon
-    {{.appName}} {{.command}} podman:yourrepo/yourimage:tag        	 explicitly use the Podman daemon
-    {{.appName}} {{.command}} registry:yourrepo/yourimage:tag        pull image directly from a registry (no container runtime required)
+  You can also explicitly specify the scheme to use:
+    {{.appName}} {{.command}} docker:yourrepo/yourimage:tag          explicitly use the Docker daemon
    {{.appName}} {{.command}} docker-archive:path/to/yourimage.tar   use a tarball from disk for archives created from "docker save"
    {{.appName}} {{.command}} oci-archive:path/to/yourimage.tar      use a tarball from disk for OCI archives (from Skopeo or otherwise)
    {{.appName}} {{.command}} oci-dir:path/to/yourimage              read directly from a path on disk for OCI layout directories (from Skopeo or otherwise)
-`
-	nonImageSchemeHelp = `    {{.appName}} {{.command}} dir:path/to/yourproject                read directly from a path on disk (any directory)
+    {{.appName}} {{.command}} dir:path/to/yourproject                read directly from a path on disk (any directory)
    {{.appName}} {{.command}} file:path/to/yourproject/file          read directly from a path on disk (any single file)
+    {{.appName}} {{.command}} registry:yourrepo/yourimage:tag        pull image directly from a registry (no container runtime required)
 `
-	packagesSchemeHelp = "\n" + indent + schemeHelpHeader + "\n" + imageSchemeHelp + nonImageSchemeHelp
-
-	packagesHelp = packagesExample + packagesSchemeHelp
 )

 var (
-	packagesCmd = &cobra.Command{
+	packagesPresenterOpt format.Option
+	packagesCmd          = &cobra.Command{
 		Use:   "packages [SOURCE]",
 		Short: "Generate a package SBOM",
 		Long:  "Generate a packaged-based Software Bill Of Materials (SBOM) from container images and filesystems",
-		Example: internal.Tprintf(packagesHelp, map[string]interface{}{
+		Example: internal.Tprintf(packagesExample, map[string]interface{}{
 			"appName": internal.ApplicationName,
 			"command": "packages",
 		}),
 		Args:          validateInputArgs,
 		SilenceUsage:  true,
 		SilenceErrors: true,
-		PreRunE: func(cmd *cobra.Command, args []string) (err error) {
+		PreRunE: func(cmd *cobra.Command, args []string) error {
+			// set the presenter
+			presenterOption := format.ParseOption(appConfig.Output)
+			if presenterOption == format.UnknownFormatOption {
+				return fmt.Errorf("bad --output value '%s'", appConfig.Output)
+			}
+			packagesPresenterOpt = presenterOption
+
 			if appConfig.Dev.ProfileCPU && appConfig.Dev.ProfileMem {
 				return fmt.Errorf("cannot profile CPU and memory simultaneously")
 			}
@@ -96,23 +97,19 @@ func init() {

 func setPackageFlags(flags *pflag.FlagSet) {
 	// Formatting & Input options //////////////////////////////////////////////
+
 	flags.StringP(
-		"scope", "s", cataloger.DefaultSearchConfig().Scope.String(),
+		"scope", "s", source.SquashedScope.String(),
 		fmt.Sprintf("selection of layers to catalog, options=%v", source.AllScopes))

-	flags.StringArrayP(
-		"output", "o", formatAliases(table.ID),
-		fmt.Sprintf("report output format, options=%v", formatAliases(syft.FormatIDs()...)),
+	flags.StringP(
+		"output", "o", string(format.TableOption),
+		fmt.Sprintf("report output formatter, options=%v", format.AllOptions),
 	)

 	flags.StringP(
 		"file", "", "",
-		"file to write the default report output to (default is STDOUT)",
-	)
-
-	flags.StringP(
-		"platform", "", "",
-		"an optional platform specifier for container image sources (e.g. 'linux/arm64', 'linux/arm64/v8', 'arm64', 'linux')",
+		"file to write the report output to (default is STDOUT)",
 	)

 	// Upload options //////////////////////////////////////////////////////////
@@ -136,11 +133,6 @@ func setPackageFlags(flags *pflag.FlagSet) {
 		"include dockerfile for upload to Anchore Enterprise",
 	)

-	flags.StringArrayP(
-		"exclude", "", nil,
-		"exclude paths from being scanned using a glob expression",
-	)
-
 	flags.Bool(
 		"overwrite-existing-image", false,
 		"overwrite an existing image during the upload to Anchore Enterprise",
@@ -153,30 +145,17 @@ func setPackageFlags(flags *pflag.FlagSet) {
 }

 func bindPackagesConfigOptions(flags *pflag.FlagSet) error {
-	if err := bindExclusivePackagesConfigOptions(flags); err != nil {
-		return err
-	}
-	if err := bindSharedConfigOption(flags); err != nil {
-		return err
-	}
-	return nil
-}
-
-// NOTE(alex): Write a helper for the binding operation, which can be used to perform the binding but also double check that the intended effect was had or else return an error. Another thought is to somehow provide zero-valued defaults for all values in our config struct (maybe with reflection?). There may be a mechanism that already exists in viper that protects against this that I'm not aware of. ref: https://github.com/anchore/syft/pull/805#discussion_r801931192
-func bindExclusivePackagesConfigOptions(flags *pflag.FlagSet) error {
 	// Formatting & Input options //////////////////////////////////////////////

-	// note: output is not included since this configuration option is shared between multiple subcommands
-
 	if err := viper.BindPFlag("package.cataloger.scope", flags.Lookup("scope")); err != nil {
 		return err
 	}

-	if err := viper.BindPFlag("file", flags.Lookup("file")); err != nil {
+	if err := viper.BindPFlag("output", flags.Lookup("output")); err != nil {
 		return err
 	}

-	if err := viper.BindPFlag("exclude", flags.Lookup("exclude")); err != nil {
+	if err := viper.BindPFlag("file", flags.Lookup("file")); err != nil {
 		return err
 	}

@@ -222,30 +201,26 @@ func validateInputArgs(cmd *cobra.Command, args []string) error {
 }

 func packagesExec(_ *cobra.Command, args []string) error {
-	writer, err := makeWriter(appConfig.Outputs, appConfig.File)
+	// could be an image or a directory, with or without a scheme
+	userInput := args[0]
+
+	reporter, closer, err := reportWriter()
+	defer func() {
+		if err := closer(); err != nil {
+			log.Warnf("unable to write to report destination: %+v", err)
+		}
+	}()
+
 	if err != nil {
 		return err
 	}

-	defer func() {
-		if err := writer.Close(); err != nil {
-			log.Warnf("unable to write to report destination: %w", err)
-		}
-	}()
-
-	// could be an image or a directory, with or without a scheme
-	userInput := args[0]
-	si, err := source.ParseInput(userInput, appConfig.Platform, true)
-	if err != nil {
-		return fmt.Errorf("could not generate source input for packages command: %w", err)
-	}
-
 	return eventLoop(
-		packagesExecWorker(*si, writer),
+		packagesExecWorker(userInput),
 		setupSignals(),
 		eventSubscription,
 		stereoscope.Cleanup,
-		ui.Select(isVerbose(), appConfig.Quiet)...,
+		ui.Select(isVerbose(), appConfig.Quiet, reporter)...,
 	)
 }

@@ -260,87 +235,57 @@ func isVerbose() (result bool) {
 	return appConfig.CliOptions.Verbosity > 0 || isPipedInput
 }

-func generateSBOM(src *source.Source, errs chan error) (*sbom.SBOM, error) {
-	tasks, err := tasks()
-	if err != nil {
-		return nil, err
-	}
-
-	s := sbom.SBOM{
-		Source: src.Metadata,
-		Descriptor: sbom.Descriptor{
-			Name:          internal.ApplicationName,
-			Version:       version.FromBuild().Version,
-			Configuration: appConfig,
-		},
-	}
-
-	buildRelationships(&s, src, tasks, errs)
-
-	return &s, nil
-}
-
-func buildRelationships(s *sbom.SBOM, src *source.Source, tasks []task, errs chan error) {
-	var relationships []<-chan artifact.Relationship
-	for _, task := range tasks {
-		c := make(chan artifact.Relationship)
-		relationships = append(relationships, c)
-		go runTask(task, &s.Artifacts, src, c, errs)
-	}
-
-	s.Relationships = append(s.Relationships, mergeRelationships(relationships...)...)
-}
-
-func packagesExecWorker(si source.Input, writer sbom.Writer) <-chan error {
+func packagesExecWorker(userInput string) <-chan error {
 	errs := make(chan error)
 	go func() {
 		defer close(errs)

-		src, cleanup, err := source.New(si, appConfig.Registry.ToOptions(), appConfig.Exclusions)
-		if cleanup != nil {
-			defer cleanup()
-		}
-		if err != nil {
-			errs <- fmt.Errorf("failed to construct source from user input %q: %w", si.UserInput, err)
+		f := formats.ByOption(packagesPresenterOpt)
+		if f == nil {
+			errs <- fmt.Errorf("unknown format: %s", packagesPresenterOpt)
 			return
 		}

-		s, err := generateSBOM(src, errs)
+		checkForApplicationUpdate()
+
+		src, cleanup, err := source.New(userInput, appConfig.Registry.ToOptions())
 		if err != nil {
-			errs <- err
+			errs <- fmt.Errorf("failed to determine image source: %w", err)
 			return
 		}
+		defer cleanup()

-		if s == nil {
-			errs <- fmt.Errorf("no SBOM produced for %q", si.UserInput)
+		catalog, relationships, d, err := syft.CatalogPackages(src, appConfig.Package.Cataloger.ScopeOpt)
+		if err != nil {
+			errs <- fmt.Errorf("failed to catalog input: %w", err)
+			return
 		}

 		if appConfig.Anchore.Host != "" {
-			if err := runPackageSbomUpload(src, *s); err != nil {
+			if err := runPackageSbomUpload(src, src.Metadata, catalog, d); err != nil {
 				errs <- err
 				return
 			}
 		}

+		sbomResult := sbom.SBOM{
+			Artifacts: sbom.Artifacts{
+				PackageCatalog: catalog,
+				Distro:         d,
+			},
+			Relationships: relationships,
+			Source:        src.Metadata,
+		}
+
 		bus.Publish(partybus.Event{
-			Type:  event.Exit,
-			Value: func() error { return writer.Write(*s) },
+			Type:  event.PresenterReady,
+			Value: f.Presenter(sbomResult),
 		})
 	}()
 	return errs
 }

-func mergeRelationships(cs ...<-chan artifact.Relationship) (relationships []artifact.Relationship) {
-	for _, c := range cs {
-		for n := range c {
-			relationships = append(relationships, n)
-		}
-	}
-
-	return relationships
-}
-
-func runPackageSbomUpload(src *source.Source, s sbom.SBOM) error {
+func runPackageSbomUpload(src *source.Source, s source.Metadata, catalog *pkg.Catalog, d *distro.Distro) error {
 	log.Infof("uploading results to %s", appConfig.Anchore.Host)

 	if src.Metadata.Scheme != source.ImageScheme {
@@ -375,7 +320,9 @@ func runPackageSbomUpload(src *source.Source, s sbom.SBOM) error {

 	importCfg := anchore.ImportConfig{
 		ImageMetadata:           src.Image.Metadata,
-		SBOM:                    s,
+		SourceMetadata:          s,
+		Catalog:                 catalog,
+		Distro:                  d,
 		Dockerfile:              dockerfileContents,
 		OverwriteExistingUpload: appConfig.Anchore.OverwriteExistingImage,
 		Timeout:                 appConfig.Anchore.ImportTimeout,
@@ -384,6 +331,5 @@ func runPackageSbomUpload(src *source.Source, s sbom.SBOM) error {
 	if err := c.Import(context.Background(), importCfg); err != nil {
 		return fmt.Errorf("failed to upload results to host=%s: %+v", appConfig.Anchore.Host, err)
 	}
-
 	return nil
 }
@@ -2,20 +2,20 @@ package cmd

 import (
 	"fmt"
-	"os"
+	"sync"
+
+	"github.com/anchore/syft/syft/artifact"
+
+	"github.com/anchore/syft/syft/sbom"

 	"github.com/anchore/stereoscope"
 	"github.com/anchore/syft/internal"
 	"github.com/anchore/syft/internal/bus"
-	"github.com/anchore/syft/internal/formats/syftjson"
 	"github.com/anchore/syft/internal/log"
+	"github.com/anchore/syft/internal/presenter/poweruser"
 	"github.com/anchore/syft/internal/ui"
-	"github.com/anchore/syft/internal/version"
-	"github.com/anchore/syft/syft/artifact"
 	"github.com/anchore/syft/syft/event"
-	"github.com/anchore/syft/syft/sbom"
 	"github.com/anchore/syft/syft/source"
-	"github.com/gookit/color"
 	"github.com/pkg/profile"
 	"github.com/spf13/cobra"
 	"github.com/wagoodman/go-partybus"
@@ -23,9 +23,7 @@ import (

 const powerUserExample = `  {{.appName}} {{.command}} <image>

-  DEPRECATED - THIS COMMAND WILL BE REMOVED in v1.0.0
-
-  Only image sources are supported (e.g. docker: , podman: , docker-archive: , oci: , etc.), the directory source (dir:) is not supported.
+  Only image sources are supported (e.g. docker: , docker-archive: , oci: , etc.), the directory source (dir:) is not supported.

  All behavior is controlled via application configuration and environment variables (see https://github.com/anchore/syft#configuration)
 `
@@ -73,88 +71,100 @@ func powerUserExec(_ *cobra.Command, args []string) error {
 	// could be an image or a directory, with or without a scheme
 	userInput := args[0]

-	writer, err := sbom.NewWriter(
-		sbom.NewWriterOption(
-			syftjson.Format(),
-			appConfig.File,
-		),
-	)
+	reporter, closer, err := reportWriter()
+	defer func() {
+		if err := closer(); err != nil {
+			log.Warnf("unable to write to report destination: %+v", err)
+		}
+	}()
+
 	if err != nil {
 		return err
 	}

-	defer func() {
-		if err := writer.Close(); err != nil {
-			log.Warnf("unable to write to report destination: %+v", err)
-		}
-
-		// inform user at end of run that command will be removed
-		deprecated := color.Style{color.Red, color.OpBold}.Sprint("DEPRECATED: This command will be removed in v1.0.0")
-		fmt.Fprintln(os.Stderr, deprecated)
-	}()
-
 	return eventLoop(
-		powerUserExecWorker(userInput, writer),
+		powerUserExecWorker(userInput),
 		setupSignals(),
 		eventSubscription,
 		stereoscope.Cleanup,
-		ui.Select(isVerbose(), appConfig.Quiet)...,
+		ui.Select(isVerbose(), appConfig.Quiet, reporter)...,
 	)
 }
-func powerUserExecWorker(userInput string, writer sbom.Writer) <-chan error {
+func powerUserExecWorker(userInput string) <-chan error {
 	errs := make(chan error)
 	go func() {
 		defer close(errs)

-		appConfig.Secrets.Cataloger.Enabled = true
-		appConfig.FileMetadata.Cataloger.Enabled = true
-		appConfig.FileContents.Cataloger.Enabled = true
-		appConfig.FileClassification.Cataloger.Enabled = true
-		tasks, err := tasks()
+		tasks, err := powerUserTasks()
 		if err != nil {
 			errs <- err
 			return
 		}

-		si, err := source.ParseInput(userInput, appConfig.Platform, true)
-		if err != nil {
-			errs <- err
-			return
-		}
+		checkForApplicationUpdate()

-		src, cleanup, err := source.New(*si, appConfig.Registry.ToOptions(), appConfig.Exclusions)
+		src, cleanup, err := source.New(userInput, appConfig.Registry.ToOptions())
 		if err != nil {
 			errs <- err
 			return
 		}
-		if cleanup != nil {
-			defer cleanup()
-		}
+		defer cleanup()

 		s := sbom.SBOM{
 			Source: src.Metadata,
-			Descriptor: sbom.Descriptor{
-				Name:          internal.ApplicationName,
-				Version:       version.FromBuild().Version,
-				Configuration: appConfig,
-			},
 		}

-		var relationships []<-chan artifact.Relationship
+		var results []<-chan artifact.Relationship
 		for _, task := range tasks {
 			c := make(chan artifact.Relationship)
-			relationships = append(relationships, c)
+			results = append(results, c)

 			go runTask(task, &s.Artifacts, src, c, errs)
 		}

-		s.Relationships = append(s.Relationships, mergeRelationships(relationships...)...)
+		for relationship := range mergeResults(results...) {
+			s.Relationships = append(s.Relationships, relationship)
+		}

 		bus.Publish(partybus.Event{
-			Type:  event.Exit,
-			Value: func() error { return writer.Write(s) },
+			Type:  event.PresenterReady,
+			Value: poweruser.NewJSONPresenter(s, *appConfig),
 		})
 	}()
-
 	return errs
 }
+
+func runTask(t powerUserTask, a *sbom.Artifacts, src *source.Source, c chan<- artifact.Relationship, errs chan<- error) {
+	defer close(c)
+
+	relationships, err := t(a, src)
+	if err != nil {
+		errs <- err
+		return
+	}
+
+	for _, relationship := range relationships {
+		c <- relationship
+	}
+}
+
+func mergeResults(cs ...<-chan artifact.Relationship) <-chan artifact.Relationship {
+	var wg sync.WaitGroup
+	var results = make(chan artifact.Relationship)
+
+	wg.Add(len(cs))
+	for _, c := range cs {
+		go func(c <-chan artifact.Relationship) {
+			for n := range c {
+				results <- n
+			}
+			wg.Done()
+		}(c)
+	}
+
+	go func() {
+		wg.Wait()
+		close(results)
+	}()
+	return results
+}
@@ -4,25 +4,27 @@ import (
 	"crypto"
 	"fmt"

-	"github.com/anchore/syft/syft"
 	"github.com/anchore/syft/syft/artifact"
-	"github.com/anchore/syft/syft/file"
+
 	"github.com/anchore/syft/syft/sbom"
+
+	"github.com/anchore/syft/syft"
+	"github.com/anchore/syft/syft/file"
 	"github.com/anchore/syft/syft/source"
 )

-type task func(*sbom.Artifacts, *source.Source) ([]artifact.Relationship, error)
+type powerUserTask func(*sbom.Artifacts, *source.Source) ([]artifact.Relationship, error)

-func tasks() ([]task, error) {
-	var tasks []task
+func powerUserTasks() ([]powerUserTask, error) {
+	var tasks []powerUserTask

-	generators := []func() (task, error){
-		generateCatalogPackagesTask,
-		generateCatalogFileMetadataTask,
-		generateCatalogFileDigestsTask,
-		generateCatalogSecretsTask,
-		generateCatalogFileClassificationsTask,
-		generateCatalogContentsTask,
+	generators := []func() (powerUserTask, error){
+		catalogPackagesTask,
+		catalogFileMetadataTask,
+		catalogFileDigestsTask,
+		catalogSecretsTask,
+		catalogFileClassificationsTask,
+		catalogContentsTask,
 	}

 	for _, generator := range generators {
@@ -30,7 +32,6 @@ func tasks() ([]task, error) {
 		if err != nil {
 			return nil, err
 		}
-
 		if task != nil {
 			tasks = append(tasks, task)
 		}
@@ -39,19 +40,19 @@ func tasks() ([]task, error) {
 	return tasks, nil
 }

-func generateCatalogPackagesTask() (task, error) {
+func catalogPackagesTask() (powerUserTask, error) {
 	if !appConfig.Package.Cataloger.Enabled {
 		return nil, nil
 	}

 	task := func(results *sbom.Artifacts, src *source.Source) ([]artifact.Relationship, error) {
-		packageCatalog, relationships, theDistro, err := syft.CatalogPackages(src, appConfig.Package.ToConfig())
+		packageCatalog, relationships, theDistro, err := syft.CatalogPackages(src, appConfig.Package.Cataloger.ScopeOpt)
 		if err != nil {
 			return nil, err
 		}

 		results.PackageCatalog = packageCatalog
-		results.LinuxDistribution = theDistro
+		results.Distro = theDistro

 		return relationships, nil
 	}
@@ -59,7 +60,7 @@ func generateCatalogPackagesTask() (task, error) {
 	return task, nil
 }

-func generateCatalogFileMetadataTask() (task, error) {
+func catalogFileMetadataTask() (powerUserTask, error) {
 	if !appConfig.FileMetadata.Cataloger.Enabled {
 		return nil, nil
 	}
@@ -83,7 +84,7 @@ func generateCatalogFileMetadataTask() (task, error) {
 	return task, nil
 }

-func generateCatalogFileDigestsTask() (task, error) {
+func catalogFileDigestsTask() (powerUserTask, error) {
 	if !appConfig.FileMetadata.Cataloger.Enabled {
 		return nil, nil
 	}
@@ -129,7 +130,7 @@ func generateCatalogFileDigestsTask() (task, error) {
 	return task, nil
 }

-func generateCatalogSecretsTask() (task, error) {
+func catalogSecretsTask() (powerUserTask, error) {
 	if !appConfig.Secrets.Cataloger.Enabled {
 		return nil, nil
 	}
@@ -161,7 +162,7 @@ func generateCatalogSecretsTask() (task, error) {
 	return task, nil
 }

-func generateCatalogFileClassificationsTask() (task, error) {
+func catalogFileClassificationsTask() (powerUserTask, error) {
 	if !appConfig.FileClassification.Cataloger.Enabled {
 		return nil, nil
 	}
@@ -189,7 +190,7 @@ func generateCatalogFileClassificationsTask() (task, error) {
 	return task, nil
 }

-func generateCatalogContentsTask() (task, error) {
+func catalogContentsTask() (powerUserTask, error) {
 	if !appConfig.FileContents.Cataloger.Enabled {
 		return nil, nil
 	}
@@ -215,17 +216,3 @@ func generateCatalogContentsTask() (task, error) {

 	return task, nil
 }
-
-func runTask(t task, a *sbom.Artifacts, src *source.Source, c chan<- artifact.Relationship, errs chan<- error) {
-	defer close(c)
-
-	relationships, err := t(a, src)
-	if err != nil {
-		errs <- err
-		return
-	}
-
-	for _, relationship := range relationships {
-		c <- relationship
-	}
-}
@@ -0,0 +1,33 @@
+package cmd
+
+import (
+	"fmt"
+	"io"
+	"os"
+	"strings"
+
+	"github.com/anchore/syft/internal/log"
+)
+
+func reportWriter() (io.Writer, func() error, error) {
+	nop := func() error { return nil }
+	path := strings.TrimSpace(appConfig.File)
+
+	switch len(path) {
+	case 0:
+		return os.Stdout, nop, nil
+
+	default:
+		reportFile, err := os.OpenFile(path, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0644)
+
+		if err != nil {
+			return nil, nop, fmt.Errorf("unable to create report file: %w", err)
+		}
+
+		return reportFile, func() error {
+			log.Infof("report written to file=%q", path)
+
+			return reportFile.Close()
+		}, nil
+	}
+}
@@ -4,9 +4,7 @@ import (
 	"fmt"
 	"os"

-	"github.com/anchore/syft/internal"
 	"github.com/anchore/syft/internal/config"
-	"github.com/anchore/syft/internal/version"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )
@@ -24,16 +22,12 @@ var rootCmd = &cobra.Command{
 	PreRunE:           packagesCmd.PreRunE,
 	RunE:              packagesCmd.RunE,
 	ValidArgsFunction: packagesCmd.ValidArgsFunction,
-	Version:           version.FromBuild().Version,
 }

-const indent = "  "
-
 func init() {
 	// set universal flags
 	rootCmd.PersistentFlags().StringVarP(&persistentOpts.ConfigPath, "config", "c", "", "application config file")
-	// setting the version template to just print out the string since we already have a templatized version string
-	rootCmd.SetVersionTemplate(fmt.Sprintf("%s {{.Version}}\n", internal.ApplicationName))
+
 	flag := "quiet"
 	rootCmd.PersistentFlags().BoolP(
 		flag, "q", false,
@@ -11,7 +11,7 @@ import (
 	"github.com/spf13/cobra"
 )

-var versionCmdOutputFormat string
+var outputFormat string

 var versionCmd = &cobra.Command{
 	Use:   "version",
@@ -20,24 +20,23 @@ var versionCmd = &cobra.Command{
 }

 func init() {
-	versionCmd.Flags().StringVarP(&versionCmdOutputFormat, "output", "o", "text", "format to show version information (available=[text, json])")
+	versionCmd.Flags().StringVarP(&outputFormat, "output", "o", "text", "format to show version information (available=[text, json])")
 	rootCmd.AddCommand(versionCmd)
 }

 func printVersion(_ *cobra.Command, _ []string) {
 	versionInfo := version.FromBuild()

-	switch versionCmdOutputFormat {
+	switch outputFormat {
 	case "text":
-		fmt.Println("Application:       ", internal.ApplicationName)
-		fmt.Println("Version:           ", versionInfo.Version)
-		fmt.Println("JsonSchemaVersion: ", internal.JSONSchemaVersion)
-		fmt.Println("BuildDate:         ", versionInfo.BuildDate)
-		fmt.Println("GitCommit:         ", versionInfo.GitCommit)
-		fmt.Println("GitDescription:    ", versionInfo.GitDescription)
-		fmt.Println("Platform:          ", versionInfo.Platform)
-		fmt.Println("GoVersion:         ", versionInfo.GoVersion)
-		fmt.Println("Compiler:          ", versionInfo.Compiler)
+		fmt.Println("Application:  ", internal.ApplicationName)
+		fmt.Println("Version:      ", versionInfo.Version)
+		fmt.Println("BuildDate:    ", versionInfo.BuildDate)
+		fmt.Println("GitCommit:    ", versionInfo.GitCommit)
+		fmt.Println("GitTreeState: ", versionInfo.GitTreeState)
+		fmt.Println("Platform:     ", versionInfo.Platform)
+		fmt.Println("GoVersion:    ", versionInfo.GoVersion)
+		fmt.Println("Compiler:     ", versionInfo.Compiler)

 	case "json":
 		enc := json.NewEncoder(os.Stdout)
@@ -55,7 +54,7 @@ func printVersion(_ *cobra.Command, _ []string) {
 			os.Exit(1)
 		}
 	default:
-		fmt.Printf("unsupported output format: %s\n", versionCmdOutputFormat)
+		fmt.Printf("unsupported output format: %s\n", outputFormat)
 		os.Exit(1)
 	}
 }
@@ -1,330 +1,53 @@
 module github.com/anchore/syft

-go 1.17
+go 1.16

 require (
-	github.com/CycloneDX/cyclonedx-go v0.5.0
 	github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d
-	github.com/acobaugh/osrelease v0.1.0
 	github.com/adrg/xdg v0.2.1
 	github.com/alecthomas/jsonschema v0.0.0-20210301060011-54c507b6f074
 	github.com/anchore/client-go v0.0.0-20210222170800-9c70f9b80bcf
-	github.com/anchore/go-macholibre v0.0.0-20220308212642-53e6d0aaf6fb
+	github.com/anchore/go-presenter v0.0.0-20211102174526-0dbf20f6c7fa
 	github.com/anchore/go-rpmdb v0.0.0-20210914181456-a9c52348da63
 	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.20220314153042-1bcd40e5206b
-	github.com/anchore/stereoscope v0.0.0-20220315185520-25183ec78f40
+	github.com/anchore/packageurl-go v0.0.0-20210922164639-b3fa992ebd29
+	github.com/anchore/stereoscope v0.0.0-20211024152658-003132a67c10
 	github.com/antihax/optional v1.0.0
-	github.com/bmatcuk/doublestar/v4 v4.0.2
+	github.com/bmatcuk/doublestar/v2 v2.0.4
+	github.com/docker/docker v17.12.0-ce-rc1.0.20200309214505-aa6a9891b09c+incompatible
 	github.com/dustin/go-humanize v1.0.0
 	github.com/facebookincubator/nvdtools v0.1.4
-	github.com/go-test/deep v1.0.8
-	github.com/google/go-cmp v0.5.7
-	github.com/google/uuid v1.3.0
-	github.com/gookit/color v1.4.2
-	github.com/hashicorp/go-multierror v1.1.1
-	github.com/in-toto/in-toto-golang v0.3.4-0.20211211042327-af1f9fb822bf
+	github.com/go-test/deep v1.0.7
+	github.com/google/go-cmp v0.4.1
+	github.com/google/uuid v1.2.0
+	github.com/gookit/color v1.2.7
+	github.com/hashicorp/go-multierror v1.1.0
+	github.com/hashicorp/go-version v1.2.0
 	github.com/jinzhu/copier v0.3.2
-	github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
-	github.com/mholt/archiver/v3 v3.5.1
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/mitchellh/hashstructure/v2 v2.0.2
-	github.com/mitchellh/mapstructure v1.4.3
-	github.com/olekukonko/tablewriter v0.0.5
-	github.com/pelletier/go-toml v1.9.4
+	github.com/mitchellh/mapstructure v1.3.1
+	github.com/olekukonko/tablewriter v0.0.4
+	github.com/pelletier/go-toml v1.8.1
 	github.com/pkg/profile v1.5.0
 	github.com/scylladb/go-set v1.0.2
-	github.com/sergi/go-diff v1.2.0
-	github.com/sigstore/sigstore v1.1.1-0.20220217212907-e48ca03a5ba7
+	github.com/sergi/go-diff v1.1.0
 	github.com/sirupsen/logrus v1.8.1
-	github.com/spdx/tools-golang v0.2.0
-	github.com/spf13/afero v1.8.0
-	github.com/spf13/cobra v1.3.0
+	github.com/spdx/tools-golang v0.1.0
+	github.com/spf13/afero v1.2.2
+	github.com/spf13/cobra v1.0.1-0.20200909172742-8a63648dd905
 	github.com/spf13/pflag v1.0.5
-	github.com/spf13/viper v1.10.1
+	github.com/spf13/viper v1.7.0
 	github.com/stretchr/testify v1.7.0
 	github.com/vifraa/gopom v0.1.0
 	github.com/wagoodman/go-partybus v0.0.0-20210627031916-db1f5573bbc5
 	github.com/wagoodman/go-progress v0.0.0-20200731105512-1020f39e6240
-	github.com/wagoodman/jotframe v0.0.0-20211129225309-56b0d0a4aebb
+	github.com/wagoodman/jotframe v0.0.0-20200730190914-3517092dd163
 	github.com/x-cray/logrus-prefixed-formatter v0.5.2
 	github.com/xeipuuv/gojsonschema v1.2.0
-	golang.org/x/mod v0.5.1
-	golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd
-	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211
+	golang.org/x/mod v0.3.0
+	golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d
+	golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1
 	gopkg.in/yaml.v2 v2.4.0
 )
-
-require (
-	github.com/docker/docker v20.10.12+incompatible
-	github.com/sigstore/cosign v1.6.0
-)
-
-require (
-	bitbucket.org/creachadair/shell v0.0.6 // indirect
-	cloud.google.com/go v0.100.2 // indirect
-	cloud.google.com/go/compute v1.3.0 // indirect
-	cloud.google.com/go/iam v0.1.1 // indirect
-	cloud.google.com/go/kms v1.3.0 // indirect
-	cloud.google.com/go/storage v1.21.0 // indirect
-	github.com/Azure/azure-sdk-for-go v61.5.0+incompatible // indirect
-	github.com/Azure/go-autorest v14.2.0+incompatible // indirect
-	github.com/Azure/go-autorest/autorest v0.11.24 // indirect
-	github.com/Azure/go-autorest/autorest/adal v0.9.18 // indirect
-	github.com/Azure/go-autorest/autorest/azure/auth v0.5.11 // indirect
-	github.com/Azure/go-autorest/autorest/azure/cli v0.4.5 // indirect
-	github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
-	github.com/Azure/go-autorest/autorest/to v0.4.0 // indirect
-	github.com/Azure/go-autorest/autorest/validation v0.3.1 // indirect
-	github.com/Azure/go-autorest/logger v0.2.1 // indirect
-	github.com/Azure/go-autorest/tracing v0.6.0 // indirect
-	github.com/PaesslerAG/gval v1.0.0 // indirect
-	github.com/PaesslerAG/jsonpath v0.1.1 // indirect
-	github.com/PuerkitoBio/purell v1.1.1 // indirect
-	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
-	github.com/ReneKroon/ttlcache/v2 v2.11.0 // indirect
-	github.com/ThalesIgnite/crypto11 v1.2.5 // indirect
-	github.com/armon/go-metrics v0.3.10 // indirect
-	github.com/armon/go-radix v1.0.0 // indirect
-	github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
-	github.com/aws/aws-sdk-go v1.43.0 // indirect
-	github.com/aws/aws-sdk-go-v2 v1.13.0 // indirect
-	github.com/aws/aws-sdk-go-v2/config v1.13.1 // indirect
-	github.com/aws/aws-sdk-go-v2/credentials v1.8.0 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.10.0 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.4 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.2.0 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/ini v1.3.5 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ecr v1.14.0 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.11.0 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.7.0 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.9.0 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sts v1.14.0 // indirect
-	github.com/aws/smithy-go v1.10.0 // indirect
-	github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20220216180153-3d7835abdf40 // indirect
-	github.com/benbjohnson/clock v1.1.0 // indirect
-	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/bgentry/speakeasy v0.1.0 // indirect
-	github.com/blang/semver v3.5.1+incompatible // indirect
-	github.com/cenkalti/backoff/v3 v3.2.2 // indirect
-	github.com/census-instrumentation/opencensus-proto v0.3.0 // indirect
-	github.com/cespare/xxhash/v2 v2.1.2 // indirect
-	github.com/chrismellard/docker-credential-acr-env v0.0.0-20220119192733-fe33c00cee21 // indirect
-	github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4 // indirect
-	github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490 // indirect
-	github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be // indirect
-	github.com/coreos/go-oidc/v3 v3.1.0 // indirect
-	github.com/coreos/go-semver v0.3.0 // indirect
-	github.com/coreos/go-systemd/v22 v22.3.2 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect
-	github.com/cyberphone/json-canonicalization v0.0.0-20210823021906-dc406ceaf94b // indirect
-	github.com/dimchansky/utfbom v1.1.1 // indirect
-	github.com/envoyproxy/go-control-plane v0.10.1 // indirect
-	github.com/envoyproxy/protoc-gen-validate v0.6.2 // indirect
-	github.com/fatih/color v1.13.0 // indirect
-	github.com/form3tech-oss/jwt-go v3.2.5+incompatible // indirect
-	github.com/fullstorydev/grpcurl v1.8.2 // indirect
-	github.com/ghodss/yaml v1.0.0 // indirect
-	github.com/go-chi/chi v4.1.2+incompatible // indirect
-	github.com/go-logr/logr v1.2.2 // indirect
-	github.com/go-openapi/analysis v0.21.2 // indirect
-	github.com/go-openapi/errors v0.20.2 // indirect
-	github.com/go-openapi/jsonpointer v0.19.5 // indirect
-	github.com/go-openapi/jsonreference v0.19.6 // indirect
-	github.com/go-openapi/loads v0.21.1 // indirect
-	github.com/go-openapi/runtime v0.23.1 // indirect
-	github.com/go-openapi/spec v0.20.4 // indirect
-	github.com/go-openapi/strfmt v0.21.2 // indirect
-	github.com/go-openapi/swag v0.21.1 // indirect
-	github.com/go-openapi/validate v0.21.0 // indirect
-	github.com/go-piv/piv-go v1.9.0 // indirect
-	github.com/go-playground/locales v0.14.0 // indirect
-	github.com/go-playground/universal-translator v0.18.0 // indirect
-	github.com/go-playground/validator/v10 v10.10.0 // indirect
-	github.com/go-stack/stack v1.8.1 // indirect
-	github.com/golang-jwt/jwt/v4 v4.2.0 // indirect
-	github.com/golang/glog v1.0.0 // indirect
-	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/mock v1.6.0 // indirect
-	github.com/google/btree v1.0.1 // indirect
-	github.com/google/certificate-transparency-go v1.1.2 // indirect
-	github.com/google/go-github/v42 v42.0.0 // indirect
-	github.com/google/go-querystring v1.1.0 // indirect
-	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/google/trillian v1.4.0 // indirect
-	github.com/googleapis/gax-go/v2 v2.1.1 // indirect
-	github.com/googleapis/gnostic v0.5.5 // indirect
-	github.com/gorilla/websocket v1.4.2 // indirect
-	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
-	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
-	github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
-	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
-	github.com/hashicorp/go-hclog v1.1.0 // indirect
-	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
-	github.com/hashicorp/go-plugin v1.4.3 // indirect
-	github.com/hashicorp/go-retryablehttp v0.7.0 // indirect
-	github.com/hashicorp/go-rootcerts v1.0.2 // indirect
-	github.com/hashicorp/go-secure-stdlib/mlock v0.1.2 // indirect
-	github.com/hashicorp/go-secure-stdlib/parseutil v0.1.2 // indirect
-	github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
-	github.com/hashicorp/go-sockaddr v1.0.2 // indirect
-	github.com/hashicorp/go-uuid v1.0.2 // indirect
-	github.com/hashicorp/go-version v1.4.0 // indirect
-	github.com/hashicorp/golang-lru v0.5.4 // indirect
-	github.com/hashicorp/vault/api v1.4.1 // indirect
-	github.com/hashicorp/vault/sdk v0.4.1 // indirect
-	github.com/hashicorp/yamux v0.0.0-20211028200310-0bc27b27de87 // indirect
-	github.com/imdario/mergo v0.3.12 // indirect
-	github.com/jedisct1/go-minisign v0.0.0-20210703085342-c1f07ee84431 // indirect
-	github.com/jhump/protoreflect v1.9.0 // indirect
-	github.com/jmespath/go-jmespath v0.4.0 // indirect
-	github.com/jonboulle/clockwork v0.2.2 // indirect
-	github.com/josharian/intern v1.0.0 // indirect
-	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/leodido/go-urn v1.2.1 // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
-	github.com/miekg/pkcs11 v1.1.1 // indirect
-	github.com/mitchellh/copystructure v1.2.0 // indirect
-	github.com/mitchellh/go-testing-interface v1.14.1 // indirect
-	github.com/mitchellh/reflectwalk v1.0.2 // indirect
-	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/oklog/run v1.1.0 // indirect
-	github.com/oklog/ulid v1.3.1 // indirect
-	github.com/opentracing/opentracing-go v1.2.0 // indirect
-	github.com/pierrec/lz4 v2.6.1+incompatible // indirect
-	github.com/prometheus/client_golang v1.11.0 // indirect
-	github.com/prometheus/client_model v0.2.0 // indirect
-	github.com/prometheus/common v0.32.1 // indirect
-	github.com/prometheus/procfs v0.7.3 // indirect
-	github.com/rivo/uniseg v0.2.0 // indirect
-	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/ryanuber/go-glob v1.0.0 // indirect
-	github.com/sassoftware/relic v0.0.0-20210427151427-dfb082b79b74 // indirect
-	github.com/secure-systems-lab/go-securesystemslib v0.3.1 // indirect
-	github.com/segmentio/ksuid v1.0.4 // indirect
-	github.com/shibumi/go-pathspec v1.3.0 // indirect
-	github.com/sigstore/fulcio v0.1.2-0.20220114150912-86a2036f9bc7 // indirect
-	github.com/sigstore/rekor v0.4.1-0.20220114213500-23f583409af3 // indirect
-	github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 // indirect
-	github.com/soheilhy/cmux v0.1.5 // indirect
-	github.com/spiffe/go-spiffe/v2 v2.0.0-beta.12 // indirect
-	github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
-	github.com/tent/canonical-json-go v0.0.0-20130607151641-96e4ba3a7613 // indirect
-	github.com/thales-e-security/pool v0.0.2 // indirect
-	github.com/theupdateframework/go-tuf v0.0.0-20220211205608-f0c3294f63b9 // indirect
-	github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 // indirect
-	github.com/urfave/cli v1.22.5 // indirect
-	github.com/xanzy/go-gitlab v0.56.0 // indirect
-	github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
-	github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
-	github.com/zeebo/errs v1.2.2 // indirect
-	go.etcd.io/bbolt v1.3.6 // indirect
-	go.etcd.io/etcd/api/v3 v3.5.1 // indirect
-	go.etcd.io/etcd/client/pkg/v3 v3.5.1 // indirect
-	go.etcd.io/etcd/client/v2 v2.305.1 // indirect
-	go.etcd.io/etcd/client/v3 v3.5.0 // indirect
-	go.etcd.io/etcd/etcdctl/v3 v3.5.0 // indirect
-	go.etcd.io/etcd/etcdutl/v3 v3.5.0 // indirect
-	go.etcd.io/etcd/pkg/v3 v3.5.0 // indirect
-	go.etcd.io/etcd/raft/v3 v3.5.0 // indirect
-	go.etcd.io/etcd/server/v3 v3.5.0 // indirect
-	go.etcd.io/etcd/tests/v3 v3.5.0 // indirect
-	go.etcd.io/etcd/v3 v3.5.0 // indirect
-	go.mongodb.org/mongo-driver v1.8.3 // indirect
-	go.opencensus.io v0.23.0 // indirect
-	go.opentelemetry.io/contrib v1.3.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0 // indirect
-	go.opentelemetry.io/otel v0.20.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp v0.20.0 // indirect
-	go.opentelemetry.io/otel/metric v0.20.0 // indirect
-	go.opentelemetry.io/otel/sdk v0.20.0 // indirect
-	go.opentelemetry.io/otel/sdk/export/metric v0.20.0 // indirect
-	go.opentelemetry.io/otel/sdk/metric v0.20.0 // indirect
-	go.opentelemetry.io/otel/trace v0.20.0 // indirect
-	go.opentelemetry.io/proto/otlp v0.12.0 // indirect
-	go.uber.org/atomic v1.9.0 // indirect
-	go.uber.org/multierr v1.7.0 // indirect
-	go.uber.org/zap v1.21.0 // indirect
-	golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 // indirect
-	golang.org/x/tools v0.1.8 // indirect
-	google.golang.org/api v0.70.0 // indirect
-	google.golang.org/protobuf v1.27.1 // indirect
-	gopkg.in/cheggaaa/pb.v1 v1.0.28 // indirect
-	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
-	gopkg.in/square/go-jose.v2 v2.6.0 // indirect
-	k8s.io/api v0.23.3 // indirect
-	k8s.io/apimachinery v0.23.3 // indirect
-	k8s.io/client-go v0.23.3 // indirect
-	k8s.io/klog/v2 v2.40.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20220124234850-424119656bbf // indirect
-	k8s.io/utils v0.0.0-20220127004650-9b3446523e65 // indirect
-	knative.dev/pkg v0.0.0-20220202132633-df430fa0dd96 // indirect
-	sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
-	sigs.k8s.io/release-utils v0.4.1-0.20220207182343-6dadf2228617 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
-	sigs.k8s.io/yaml v1.3.0 // indirect
-)
-
-require (
-	github.com/Microsoft/go-winio v0.5.1 // indirect
-	// 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/andybalholm/brotli v1.0.4 // indirect
-	github.com/containerd/containerd v1.5.10 // indirect
-	github.com/containerd/stargz-snapshotter/estargz v0.10.1 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/docker/cli v20.10.12+incompatible // indirect
-	github.com/docker/distribution v2.8.0+incompatible // indirect
-	github.com/docker/docker-credential-helpers v0.6.4 // indirect
-	github.com/docker/go-connections v0.4.0 // indirect
-	github.com/docker/go-units v0.4.0 // indirect
-	github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 // indirect
-	github.com/fsnotify/fsnotify v1.5.1 // indirect
-	github.com/gabriel-vasile/mimetype v1.4.0 // indirect
-	github.com/go-restruct/restruct v1.2.0-alpha // indirect
-	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/golang/snappy v0.0.4 // indirect
-	github.com/google/go-containerregistry v0.8.1-0.20220209165246-a44adc326839 // indirect
-	github.com/hashicorp/errwrap v1.1.0 // indirect
-	github.com/hashicorp/hcl v1.0.0 // indirect
-	github.com/iancoleman/orderedmap v0.0.0-20190318233801-ac98e3ecb4b0 // indirect
-	github.com/inconshreveable/mousetrap v1.0.0 // indirect
-	github.com/klauspost/compress v1.14.2 // indirect
-	github.com/klauspost/pgzip v1.2.5 // indirect
-	github.com/logrusorgru/aurora v0.0.0-20200102142835-e9ef32dff381 // indirect
-	github.com/magiconair/properties v1.8.5 // indirect
-	github.com/mattn/go-colorable v0.1.12 // indirect
-	github.com/mattn/go-isatty v0.0.14 // indirect
-	github.com/mattn/go-runewidth v0.0.13 // indirect
-	github.com/nwaples/rardecode v1.1.0 // indirect
-	github.com/opencontainers/go-digest v1.0.0 // indirect
-	github.com/opencontainers/image-spec v1.0.3-0.20220114050600-8b9d41f48198 // indirect
-	github.com/pierrec/lz4/v4 v4.1.2 // indirect
-	github.com/pkg/errors v0.9.1
-	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/spf13/cast v1.4.1 // indirect
-	github.com/spf13/jwalterweatherman v1.1.0 // indirect
-	github.com/stretchr/objx v0.3.0 // indirect
-	github.com/subosito/gotenv v1.2.0 // indirect
-	github.com/ulikunitz/xz v0.5.10 // indirect
-	github.com/vbatts/tar-split v0.11.2 // 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
-	golang.org/x/crypto v0.0.0-20220213190939-1e6e3497d506 // indirect
-	golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
-	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
-	golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
-	golang.org/x/text v0.3.7 // indirect
-	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20220218161850-94dd64e39d7c // indirect
-	google.golang.org/grpc v1.44.0 // indirect
-	gopkg.in/ini.v1 v1.66.2 // indirect
-	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
-)
@@ -0,0 +1,15 @@
+source = ["./dist/syft-macos_darwin_amd64/syft"] # The 'dist' directory path should ideally reference an env var, where the source of truth is the Makefile. I wasn't able to figure out how to solve this.
+bundle_id = "com.anchore.toolbox.syft"
+
+sign {
+  application_identity = "Developer ID Application: ANCHORE, INC. (9MJHKYX5AT)"
+}
+
+dmg {
+  output_path = "./dist/output.dmg"
+  volume_name = "Syft"
+}
+
+zip {
+  output_path = "./dist/output.zip"
+}
@@ -1,134 +1,195 @@
 #!/bin/sh
-# note: we require errors to propagate (don't set -e)
-set -u
-
-PROJECT_NAME="syft"
-OWNER=anchore
-REPO="${PROJECT_NAME}"
-GITHUB_DOWNLOAD_PREFIX=https://github.com/${OWNER}/${REPO}/releases/download
-INSTALL_SH_BASE_URL=https://raw.githubusercontent.com/${OWNER}/${PROJECT_NAME}
-PROGRAM_ARGS=$@
-
-# do not change the name of this parameter (this must always be backwards compatible)
-DOWNLOAD_TAG_INSTALL_SCRIPT=${DOWNLOAD_TAG_INSTALL_SCRIPT:-true}
-
+set -e
+# Code generated by godownloader on 2020-08-10T20:55:46Z.
 #
-# usage [script-name]
-#
-usage() (
+
+usage() {
  this=$1
  cat <<EOF
 $this: download go binaries for anchore/syft

-Usage: $this [-b] dir [-d] [tag]
-  -b  the installation directory (dDefaults to ./bin)
-  -d  turns on debug logging
-  -dd turns on trace logging
-  [tag] the specific release to use (if missing, then the latest will be used)
+Usage: $this [-b] bindir [-d] [tag]
+  -b sets bindir or installation directory, Defaults to ./bin
+  -d turns on debug logging
+   [tag] is a tag from
+   https://github.com/anchore/syft/releases
+   If tag is missing, then the latest will be used.
+
+ Generated by godownloader
+  https://github.com/goreleaser/godownloader
+
 EOF
  exit 2
-)
+}

+parse_args() {
+  #BINDIR is ./bin unless set be ENV
+  # over-ridden by flag below

-# ------------------------------------------------------------------------
-# https://github.com/client9/shlib - portable posix shell functions
-# Public domain - http://unlicense.org
-# https://github.com/client9/shlib/blob/master/LICENSE.md
-# but credit (and pull requests) appreciated.
-# ------------------------------------------------------------------------
+  BINDIR=${BINDIR:-./bin}
+  while getopts "b:dh?x" arg; do
+    case "$arg" in
+      b) BINDIR="$OPTARG" ;;
+      d) log_set_priority 10 ;;
+      h | \?) usage "$0" ;;
+      x) set -x ;;
+    esac
+  done
+  shift $((OPTIND - 1))
+  TAG=$1
+}
+# this function wraps all the destructive operations
+# if a curl|bash cuts off the end of the script due to
+# network, either nothing will happen or will syntax error
+# out preventing half-done work
+execute() {
+  tmpdir=$(mktemp -d)
+  log_debug "downloading files into ${tmpdir}"
+  http_download "${tmpdir}/${ARCHIVE}" "${ARCHIVE_URL}"
+  http_download "${tmpdir}/${CHECKSUM}" "${CHECKSUM_URL}"

-is_command() (
+  # macOS has its own secure verification mechanism, and checksums.txt is not used.
+  if [ "$OS" != "darwin" ]; then
+    hash_sha256_verify "${tmpdir}/${ARCHIVE}" "${tmpdir}/${CHECKSUM}"
+  fi
+
+  srcdir="${tmpdir}"
+  (cd "${tmpdir}" && unpack "${ARCHIVE}")
+  test ! -d "${BINDIR}" && install -d "${BINDIR}"
+  for binexe in $BINARIES; do
+    if [ "$OS" = "windows" ]; then
+      binexe="${binexe}.exe"
+    fi
+    install "${srcdir}/${binexe}" "${BINDIR}/"
+    log_info "installed ${BINDIR}/${binexe}"
+  done
+  rm -rf "${tmpdir}"
+}
+get_binaries() {
+  case "$PLATFORM" in
+    darwin/amd64) BINARIES="syft" ;;
+    linux/amd64) BINARIES="syft" ;;
+    windows/amd64) BINARIES="syft" ;;
+    *)
+      log_crit "platform $PLATFORM is not supported.  Make sure this script is up-to-date and file request at https://github.com/${PREFIX}/issues/new"
+      exit 1
+      ;;
+  esac
+}
+tag_to_version() {
+  if [ -z "${TAG}" ]; then
+    log_info "checking GitHub for latest tag"
+  else
+    log_info "checking GitHub for tag '${TAG}'"
+  fi
+  REALTAG=$(github_release "$OWNER/$REPO" "${TAG}") && true
+  if test -z "$REALTAG"; then
+    log_crit "unable to find '${TAG}' - use 'latest' or see https://github.com/${PREFIX}/releases for details"
+    exit 1
+  fi
+  # if version starts with 'v', remove it
+  TAG="$REALTAG"
+  VERSION=${TAG#v}
+}
+adjust_format() {
+  # change format (tar.gz or zip) based on OS
+  case ${OS} in
+    darwin) FORMAT=dmg ;;
+    windows) FORMAT=zip ;;
+  esac
+  true
+}
+adjust_os() {
+  # adjust archive name based on OS
+  true
+}
+adjust_arch() {
+  # adjust archive name based on ARCH
+  true
+}
+
+cat /dev/null <<EOF
+------------------------------------------------------------------------
+https://github.com/client9/shlib - portable posix shell functions
+Public domain - http://unlicense.org
+https://github.com/client9/shlib/blob/master/LICENSE.md
+but credit (and pull requests) appreciated.
+------------------------------------------------------------------------
+EOF
+is_command() {
  command -v "$1" >/dev/null
-)
-
-echo_stderr() (
+}
+echoerr() {
  echo "$@" 1>&2
-)
-
-_logp=2
+}
+log_prefix() {
+  echo "$0"
+}
+_logp=6
 log_set_priority() {
  _logp="$1"
 }
-
-log_priority() (
+log_priority() {
  if test -z "$1"; then
    echo "$_logp"
    return
  fi
  [ "$1" -le "$_logp" ]
-)
-
-init_colors() {
-  RED=''
-  BLUE=''
-  PURPLE=''
-  BOLD=''
-  RESET=''
-  # check if stdout is a terminal
-  if test -t 1 && is_command tput; then
-      # see if it supports colors
-      ncolors=$(tput colors)
-      if test -n "$ncolors" && test $ncolors -ge 8; then
-        RED='\033[0;31m'
-        BLUE='\033[0;34m'
-        PURPLE='\033[0;35m'
-        BOLD='\033[1m'
-        RESET='\033[0m'
-      fi
-  fi
 }
-
-init_colors
-
-log_tag() (
+log_tag() {
  case $1 in
-    0) echo "${RED}${BOLD}[error]${RESET}" ;;
-    1) echo "${RED}[warn]${RESET}" ;;
-    2) echo "[info]${RESET}" ;;
-    3) echo "${BLUE}[debug]${RESET}" ;;
-    4) echo "${PURPLE}[trace]${RESET}" ;;
-    *) echo "[$1]" ;;
+    0) echo "emerg" ;;
+    1) echo "alert" ;;
+    2) echo "crit" ;;
+    3) echo "err" ;;
+    4) echo "warning" ;;
+    5) echo "notice" ;;
+    6) echo "info" ;;
+    7) echo "debug" ;;
+    *) echo "$1" ;;
  esac
-)
-
-
-log_trace_priority=4
-log_trace() (
-  priority=$log_trace_priority
-  log_priority "$priority" || return 0
-  echo_stderr "$(log_tag $priority)" "${@}" "${RESET}"
-)
-
-log_debug_priority=3
-log_debug() (
-  priority=$log_debug_priority
-  log_priority "$priority" || return 0
-  echo_stderr "$(log_tag $priority)" "${@}" "${RESET}"
-)
-
-log_info_priority=2
-log_info() (
-  priority=$log_info_priority
-  log_priority "$priority" || return 0
-  echo_stderr "$(log_tag $priority)" "${@}" "${RESET}"
-)
-
-log_warn_priority=1
-log_warn() (
-  priority=$log_warn_priority
-  log_priority "$priority" || return 0
-  echo_stderr "$(log_tag $priority)" "${@}" "${RESET}"
-)
-
-log_err_priority=0
-log_err() (
-  priority=$log_err_priority
-  log_priority "$priority" || return 0
-  echo_stderr "$(log_tag $priority)" "${@}" "${RESET}"
-)
-
-uname_os_check() (
-  os=$1
+}
+log_debug() {
+  log_priority 7 || return 0
+  echoerr "$(log_prefix)" "$(log_tag 7)" "$@"
+}
+log_info() {
+  log_priority 6 || return 0
+  echoerr "$(log_prefix)" "$(log_tag 6)" "$@"
+}
+log_err() {
+  log_priority 3 || return 0
+  echoerr "$(log_prefix)" "$(log_tag 3)" "$@"
+}
+log_crit() {
+  log_priority 2 || return 0
+  echoerr "$(log_prefix)" "$(log_tag 2)" "$@"
+}
+uname_os() {
+  os=$(uname -s | tr '[:upper:]' '[:lower:]')
+  case "$os" in
+    cygwin_nt*) os="windows" ;;
+    mingw*) os="windows" ;;
+    msys_nt*) os="windows" ;;
+  esac
+  echo "$os"
+}
+uname_arch() {
+  arch=$(uname -m)
+  case $arch in
+    x86_64) arch="amd64" ;;
+    x86) arch="386" ;;
+    i686) arch="386" ;;
+    i386) arch="386" ;;
+    aarch64) arch="arm64" ;;
+    armv5*) arch="armv5" ;;
+    armv6*) arch="armv6" ;;
+    armv7*) arch="armv7" ;;
+  esac
+  echo ${arch}
+}
+uname_os_check() {
+  os=$(uname_os)
  case "$os" in
    darwin) return 0 ;;
    dragonfly) return 0 ;;
@@ -142,12 +203,11 @@ uname_os_check() (
    solaris) return 0 ;;
    windows) return 0 ;;
  esac
-  log_err "uname_os_check '$(uname -s)' got converted to '$os' which is not a GOOS value. Please file bug at https://github.com/client9/shlib"
+  log_crit "uname_os_check '$(uname -s)' got converted to '$os' which is not a GOOS value. Please file bug at https://github.com/client9/shlib"
  return 1
-)
-
-uname_arch_check() (
-  arch=$1
+}
+uname_arch_check() {
+  arch=$(uname_arch)
  case "$arch" in
    386) return 0 ;;
    amd64) return 0 ;;
@@ -164,72 +224,56 @@ uname_arch_check() (
    s390x) return 0 ;;
    amd64p32) return 0 ;;
  esac
-  log_err "uname_arch_check '$(uname -m)' got converted to '$arch' which is not a GOARCH value.  Please file bug report at https://github.com/client9/shlib"
+  log_crit "uname_arch_check '$(uname -m)' got converted to '$arch' which is not a GOARCH value.  Please file bug report at https://github.com/client9/shlib"
  return 1
-)
-
-unpack() (
+}
+unpack() {
  archive=$1
-
-  log_trace "unpack(archive=${archive})"
-
  case "${archive}" in
    *.tar.gz | *.tgz) tar --no-same-owner -xzf "${archive}" ;;
    *.tar) tar --no-same-owner -xf "${archive}" ;;
-    *.zip) unzip -q "${archive}" ;;
+    *.zip) unzip "${archive}" ;;
    *.dmg) extract_from_dmg "${archive}" ;;
    *)
      log_err "unpack unknown archive format for ${archive}"
      return 1
      ;;
  esac
-)
-
-extract_from_dmg() (
+}
+extract_from_dmg() {
  dmg_file=$1
-
  mount_point="/Volumes/tmp-dmg"
  hdiutil attach -quiet -nobrowse -mountpoint "${mount_point}" "${dmg_file}"
-  cp -fR "${mount_point}/." ./
+  cp -fR "${mount_point}/" ./
  hdiutil detach -quiet -force "${mount_point}"
-)
-
-http_download_curl() (
+}
+http_download_curl() {
  local_file=$1
  source_url=$2
  header=$3
-
-  log_trace "http_download_curl(local_file=$local_file, source_url=$source_url, header=$header)"
-
  if [ -z "$header" ]; then
    code=$(curl -w '%{http_code}' -sL -o "$local_file" "$source_url")
  else
    code=$(curl -w '%{http_code}' -sL -H "$header" -o "$local_file" "$source_url")
  fi
-
  if [ "$code" != "200" ]; then
-    log_err "received HTTP status=$code for url='$source_url'"
+    log_debug "http_download_curl received HTTP status $code"
    return 1
  fi
  return 0
-)
-
-http_download_wget() (
+}
+http_download_wget() {
  local_file=$1
  source_url=$2
  header=$3
-
-  log_trace "http_download_wget(local_file=$local_file, source_url=$source_url, header=$header)"
-
  if [ -z "$header" ]; then
    wget -q -O "$local_file" "$source_url"
  else
    wget -q --header "$header" -O "$local_file" "$source_url"
  fi
-)
-
-http_download() (
-  log_debug "http_download(url=$2)"
+}
+http_download() {
+  log_debug "http_download $2"
  if is_command curl; then
    http_download_curl "$@"
    return
@@ -237,19 +281,28 @@ http_download() (
    http_download_wget "$@"
    return
  fi
-  log_err "http_download unable to find wget or curl"
+  log_crit "http_download unable to find wget or curl"
  return 1
-)
-
-http_copy() (
+}
+http_copy() {
  tmp=$(mktemp)
  http_download "${tmp}" "$1" "$2" || return 1
  body=$(cat "$tmp")
  rm -f "${tmp}"
  echo "$body"
-)
-
-hash_sha256() (
+}
+github_release() {
+  owner_repo=$1
+  version=$2
+  test -z "$version" && version="latest"
+  giturl="https://github.com/${owner_repo}/releases/${version}"
+  json=$(http_copy "$giturl" "Accept:application/json")
+  test -z "$json" && return 1
+  version=$(echo "$json" | tr -s '\n' ' ' | sed 's/.*"tag_name":"//' | sed 's/".*//')
+  test -z "$version" && return 1
+  echo "$version"
+}
+hash_sha256() {
  TARGET=${1:-/dev/stdin}
  if is_command gsha256sum; then
    hash=$(gsha256sum "$TARGET") || return 1
@@ -264,12 +317,11 @@ hash_sha256() (
    hash=$(openssl -dst openssl dgst -sha256 "$TARGET") || return 1
    echo "$hash" | cut -d ' ' -f a
  else
-    log_err "hash_sha256 unable to find command to compute sha-256 hash"
+    log_crit "hash_sha256 unable to find command to compute sha-256 hash"
    return 1
  fi
-)
-
-hash_sha256_verify() (
+}
+hash_sha256_verify() {
  TARGET=$1
  checksums=$2
  if [ -z "$checksums" ]; then
@@ -287,413 +339,51 @@ hash_sha256_verify() (
    log_err "hash_sha256_verify checksum for '$TARGET' did not verify ${want} vs $got"
    return 1
  fi
-)
-
-# ------------------------------------------------------------------------
-# End of functions from https://github.com/client9/shlib
-# ------------------------------------------------------------------------
-
-# asset_file_exists [path]
-#
-# returns 1 if the given file does not exist
-#
-asset_file_exists() (
-  path="$1"
-  if [ ! -f "${path}" ]; then
-      return 1
-  fi
-)
-
-
-# github_release_json [owner] [repo] [version]
-#
-# outputs release json string
-#
-github_release_json() (
-  owner=$1
-  repo=$2
-  version=$3
-  test -z "$version" && version="latest"
-  giturl="https://github.com/${owner}/${repo}/releases/${version}"
-  json=$(http_copy "$giturl" "Accept:application/json")
-
-  log_trace "github_release_json(owner=${owner}, repo=${repo}, version=${version}) returned '${json}'"
-
-  test -z "$json" && return 1
-  echo "${json}"
-)
-
-# extract_value [key-value-pair]
-#
-# outputs value from a colon delimited key-value pair
-#
-extract_value() (
-  key_value="$1"
-  IFS=':' read -r _ value << EOF
-${key_value}
+}
+cat /dev/null <<EOF
+------------------------------------------------------------------------
+End of functions from https://github.com/client9/shlib
+------------------------------------------------------------------------
 EOF
-  echo "$value"
-)

-# extract_json_value [json] [key]
-#
-# outputs value of the key from the given json string
-#
-extract_json_value() (
-  json="$1"
-  key="$2"
-  key_value=$(echo "${json}" | grep  -o "\"$key\":[^,]*[,}]" | tr -d '",}')
+PROJECT_NAME="syft"
+OWNER=anchore
+REPO="syft"
+BINARY=syft
+FORMAT=tar.gz
+OS=$(uname_os)
+ARCH=$(uname_arch)
+PREFIX="$OWNER/$REPO"

-  extract_value "$key_value"
-)
+# use in logging routines
+log_prefix() {
+	echo "$PREFIX"
+}
+PLATFORM="${OS}/${ARCH}"
+GITHUB_DOWNLOAD=https://github.com/${OWNER}/${REPO}/releases/download

-# github_release_tag [release-json]
-#
-# outputs release tag string
-#
-github_release_tag() (
-  json="$1"
-  tag=$(extract_json_value "${json}" "tag_name")
-  test -z "$tag" && return 1
-  echo "$tag"
-)
+uname_os_check "$OS"
+uname_arch_check "$ARCH"

-# download_github_release_checksums [release-url-prefix] [name] [version] [output-dir]
-#
-# outputs path to the downloaded checksums file
-#
-download_github_release_checksums() (
-  download_url="$1"
-  name="$2"
-  version="$3"
-  output_dir="$4"
+parse_args "$@"

-  log_trace "download_github_release_checksums(url=${download_url}, name=${name}, version=${version}, output_dir=${output_dir})"
+get_binaries

-  checksum_filename=${name}_${version}_checksums.txt
-  checksum_url=${download_url}/${checksum_filename}
-  output_path="${output_dir}/${checksum_filename}"
+tag_to_version

-  http_download "${output_path}" "${checksum_url}" ""
-  asset_file_exists "${output_path}"
+adjust_format

-  log_trace "download_github_release_checksums() returned '${output_path}'"
+adjust_os

-  echo "${output_path}"
-)
+adjust_arch

-# search_for_asset [checksums-file-path] [name] [os] [arch] [format]
-#
-# outputs name of the asset to download
-#
-search_for_asset() (
-  checksum_path="$1"
-  name="$2"
-  os="$3"
-  arch="$4"
-  format="$5"
+log_info "found version: ${VERSION} for ${TAG}/${OS}/${ARCH}"

-  log_trace "search_for_asset(checksum-path=${checksum_path}, name=${name}, os=${os}, arch=${arch}, format=${format})"
+NAME=${PROJECT_NAME}_${VERSION}_${OS}_${ARCH}
+ARCHIVE=${NAME}.${FORMAT}
+ARCHIVE_URL=${GITHUB_DOWNLOAD}/${TAG}/${ARCHIVE}
+CHECKSUM=${PROJECT_NAME}_${VERSION}_checksums.txt
+CHECKSUM_URL=${GITHUB_DOWNLOAD}/${TAG}/${CHECKSUM}

-  asset_glob="${name}_.*_${os}_${arch}.${format}"
-  output_path=$(grep -o "${asset_glob}" "${checksum_path}" || true)

-  log_trace "search_for_asset() returned '${output_path}'"
-
-  echo "${output_path}"
-)
-
-# uname_os
-#
-# outputs an adjusted os value
-#
-uname_os() (
-  os=$(uname -s | tr '[:upper:]' '[:lower:]')
-  case "$os" in
-    cygwin_nt*) os="windows" ;;
-    mingw*) os="windows" ;;
-    msys_nt*) os="windows" ;;
-  esac
-
-  uname_os_check "$os"
-
-  log_trace "uname_os() returned '${os}'"
-
-  echo "$os"
-)
-
-# uname_arch
-#
-# outputs an adjusted architecture value
-#
-uname_arch() (
-  arch=$(uname -m)
-  case $arch in
-    x86_64) arch="amd64" ;;
-    x86) arch="386" ;;
-    i686) arch="386" ;;
-    i386) arch="386" ;;
-    aarch64) arch="arm64" ;;
-    armv5*) arch="armv5" ;;
-    armv6*) arch="armv6" ;;
-    armv7*) arch="armv7" ;;
-  esac
-
-  uname_arch_check "${arch}"
-
-  log_trace "uname_arch() returned '${arch}'"
-
-  echo "${arch}"
-)
-
-# get_release_tag [owner] [repo] [tag]
-#
-# outputs tag string
-#
-get_release_tag() (
-  owner="$1"
-  repo="$2"
-  tag="$3"
-
-  log_trace "get_release_tag(owner=${owner}, repo=${repo}, tag=${tag})"
-
-  json=$(github_release_json "${owner}" "${repo}" "${tag}")
-  real_tag=$(github_release_tag "${json}")
-  if test -z "${real_tag}"; then
-    return 1
-  fi
-
-  log_trace "get_release_tag() returned '${real_tag}'"
-
-  echo "${real_tag}"
-)
-
-# tag_to_version [tag]
-#
-# outputs version string
-#
-tag_to_version() (
-  tag="$1"
-  value="${tag#v}"
-
-  log_trace "tag_to_version(tag=${tag}) returned '${value}'"
-
-  echo "$value"
-)
-
-# get_binary_name [os] [arch] [default-name]
-#
-# outputs a the binary string name
-#
-get_binary_name() (
-  os="$1"
-  arch="$2"
-  binary="$3"
-  original_binary="${binary}"
-
-  case "${os}" in
-    windows) binary="${binary}.exe" ;;
-  esac
-
-  log_trace "get_binary_name(os=${os}, arch=${arch}, binary=${original_binary}) returned '${binary}'"
-
-  echo "${binary}"
-)
-
-
-# get_format_name [os] [arch] [default-format]
-#
-# outputs an adjusted file format
-#
-get_format_name() (
-  os="$1"
-  arch="$2"
-  format="$3"
-  original_format="${format}"
-
-  case ${os} in
-    windows) format=zip ;;
-  esac
-
-  log_trace "get_format_name(os=${os}, arch=${arch}, format=${original_format}) returned '${format}'"
-
-  echo "${format}"
-)
-
-# download_and_install_asset [release-url-prefix] [download-path] [install-path] [name] [os] [arch] [version] [format] [binary]
-#
-# attempts to download the archive and install it to the given path.
-#
-download_and_install_asset() (
-  download_url="$1"
-  download_path="$2"
-  install_path=$3
-  name="$4"
-  os="$5"
-  arch="$6"
-  version="$7"
-  format="$8"
-  binary="$9"
-
-  asset_filepath=$(download_asset "${download_url}" "${download_path}" "${name}" "${os}" "${arch}" "${version}" "${format}")
-
-  # don't continue if we couldn't download an asset
-  if [ -z "${asset_filepath}" ]; then
-      log_err "could not find release asset for os='${os}' arch='${arch}' format='${format}' "
-      return 1
-  fi
-
-  install_asset "${asset_filepath}" "${install_path}" "${binary}"
-)
-
-# download_asset [release-url-prefix] [download-path] [name] [os] [arch] [version] [format] [binary]
-#
-# outputs the path to the downloaded asset asset_filepath
-#
-download_asset() (
-  download_url="$1"
-  destination="$2"
-  name="$3"
-  os="$4"
-  arch="$5"
-  version="$6"
-  format="$7"
-
-  log_trace "download_asset(url=${download_url}, destination=${destination}, name=${name}, os=${os}, arch=${arch}, version=${version}, format=${format})"
-
-  checksums_filepath=$(download_github_release_checksums "${download_url}" "${name}" "${version}" "${destination}")
-
-  log_trace "checksums content:\n$(cat ${checksums_filepath})"
-
-  asset_filename=$(search_for_asset "${checksums_filepath}" "${name}" "${os}" "${arch}" "${format}")
-
-  # don't continue if we couldn't find a matching asset from the checksums file
-  if [ -z "${asset_filename}" ]; then
-      return 1
-  fi
-
-  asset_url="${download_url}/${asset_filename}"
-  asset_filepath="${destination}/${asset_filename}"
-  http_download "${asset_filepath}" "${asset_url}" ""
-
-  hash_sha256_verify "${asset_filepath}" "${checksums_filepath}"
-
-  log_trace "download_asset_by_checksums_file() returned '${asset_filepath}'"
-
-  echo "${asset_filepath}"
-)
-
-# install_asset [asset-path] [destination-path] [binary]
-#
-install_asset() (
-  asset_filepath="$1"
-  destination="$2"
-  binary="$3"
-
-  log_trace "install_asset(asset=${asset_filepath}, destination=${destination}, binary=${binary})"
-
-  # don't continue if we don't have anything to install
-  if [ -z "${asset_filepath}" ]; then
-      return
-  fi
-
-  archive_dir=$(dirname "${asset_filepath}")
-
-  # unarchive the downloaded archive to the temp dir
-  (cd "${archive_dir}" && unpack "${asset_filepath}")
-
-  # create the destination dir
-  test ! -d "${destination}" && install -d "${destination}"
-
-  # install the binary to the destination dir
-  install "${archive_dir}/${binary}" "${destination}/"
-)
-
-main() (
-  # parse arguments
-
-  # note: never change default install directory (this must always be backwards compatible)
-  install_dir=${install_dir:-./bin}
-
-  # note: never change the program flags or arguments (this must always be backwards compatible)
-  while getopts "b:dh?x" arg; do
-    case "$arg" in
-      b) install_dir="$OPTARG" ;;
-      d)
-        if [ "$_logp" = "$log_info_priority" ]; then
-          # -d == debug
-          log_set_priority $log_debug_priority
-        else
-          # -dd (or -ddd...) == trace
-          log_set_priority $log_trace_priority
-        fi
-        ;;
-      h | \?) usage "$0" ;;
-      x) set -x ;;
-    esac
-  done
-  shift $((OPTIND - 1))
-  set +u
-  tag=$1
-
-  if [ -z "${tag}" ]; then
-    log_debug "checking github for the current release tag"
-    tag=""
-  else
-    log_debug "checking github for release tag='${tag}'"
-  fi
-  set -u
-
-  tag=$(get_release_tag "${OWNER}" "${REPO}" "${tag}")
-
-  if [ "$?" != "0" ]; then
-      log_err "unable to find tag='${tag}'"
-      log_err "do not specify a version or select a valid version from https://github.com/${OWNER}/${REPO}/releases"
-      return 1
-  fi
-
-  # run the application
-
-  version=$(tag_to_version "${tag}")
-  os=$(uname_os)
-  arch=$(uname_arch)
-  format=$(get_format_name "${os}" "${arch}" "tar.gz")
-  binary=$(get_binary_name "${os}" "${arch}" "${PROJECT_NAME}")
-  download_url="${GITHUB_DOWNLOAD_PREFIX}/${tag}"
-
-  # we always use the install.sh script that is associated with the tagged release. Why? the latest install.sh is not
-  # guaranteed to be able to install every version of the application. We use the DOWNLOAD_TAG_INSTALL_SCRIPT env var
-  # to indicate if we should continue processing with the existing script or to download the script from the given tag.
-  if [ "${DOWNLOAD_TAG_INSTALL_SCRIPT}" = "true" ]; then
-      export DOWNLOAD_TAG_INSTALL_SCRIPT=false
-      log_info "fetching release script for tag='${tag}'"
-      http_copy "${INSTALL_SH_BASE_URL}/${tag}/install.sh" "" | sh -s -- ${PROGRAM_ARGS}
-      exit $?
-  fi
-
-  log_info "using release tag='${tag}' version='${version}' os='${os}' arch='${arch}'"
-
-  download_dir=$(mktemp -d)
-  trap 'rm -rf -- "$download_dir"' EXIT
-
-  log_debug "downloading files into ${download_dir}"
-
-  download_and_install_asset "${download_url}" "${download_dir}" "${install_dir}" "${PROJECT_NAME}" "${os}" "${arch}" "${version}" "${format}" "${binary}"
-
-  # don't continue if we couldn't install the asset
-  if [ "$?" != "0" ]; then
-      log_err "failed to install ${PROJECT_NAME}"
-      return 1
-  fi
-
-  log_info "installed ${install_dir}/${binary}"
-)
-
-# entrypoint
-
-set +u
-if [ -z "${TEST_INSTALL_SH}" ]; then
-  set -u
-  main "$@"
-fi
-set -u
+execute
@@ -6,19 +6,24 @@ import (
 	"fmt"
 	"time"

+	"github.com/antihax/optional"
+
 	"github.com/anchore/client-go/pkg/external"
 	"github.com/anchore/stereoscope/pkg/image"
 	"github.com/anchore/syft/internal/bus"
+	"github.com/anchore/syft/syft/distro"
 	"github.com/anchore/syft/syft/event"
-	"github.com/anchore/syft/syft/sbom"
-	"github.com/antihax/optional"
+	"github.com/anchore/syft/syft/pkg"
+	"github.com/anchore/syft/syft/source"
 	"github.com/wagoodman/go-partybus"
 	"github.com/wagoodman/go-progress"
 )

 type ImportConfig struct {
 	ImageMetadata           image.Metadata
-	SBOM                    sbom.SBOM
+	SourceMetadata          source.Metadata
+	Catalog                 *pkg.Catalog
+	Distro                  *distro.Distro
 	Dockerfile              []byte
 	OverwriteExistingUpload bool
 	Timeout                 uint
@@ -68,19 +73,19 @@ func (c *Client) Import(ctx context.Context, cfg ImportConfig) error {
 	prog.N++
 	sessionID := startOperation.Uuid

-	packageDigest, err := importPackageSBOM(authedCtx, c.client.ImportsApi, sessionID, cfg.SBOM, stage)
+	packageDigest, err := importPackageSBOM(authedCtx, c.client.ImportsApi, sessionID, cfg.SourceMetadata, cfg.Catalog, cfg.Distro, stage)
 	if err != nil {
 		return fmt.Errorf("failed to import Package SBOM: %w", err)
 	}
 	prog.N++

-	manifestDigest, err := importManifest(authedCtx, c.client.ImportsApi, sessionID, cfg.SBOM.Source.ImageMetadata.RawManifest, stage)
+	manifestDigest, err := importManifest(authedCtx, c.client.ImportsApi, sessionID, cfg.ImageMetadata.RawManifest, stage)
 	if err != nil {
 		return fmt.Errorf("failed to import Manifest: %w", err)
 	}
 	prog.N++

-	configDigest, err := importConfig(authedCtx, c.client.ImportsApi, sessionID, cfg.SBOM.Source.ImageMetadata.RawConfig, stage)
+	configDigest, err := importConfig(authedCtx, c.client.ImportsApi, sessionID, cfg.ImageMetadata.RawConfig, stage)
 	if err != nil {
 		return fmt.Errorf("failed to import Config: %w", err)
 	}
@@ -8,93 +8,55 @@ import (
 	"fmt"
 	"net/http"

-	"github.com/anchore/client-go/pkg/external"
-	"github.com/anchore/syft/internal/formats/syftjson"
-	syftjsonModel "github.com/anchore/syft/internal/formats/syftjson/model"
-	"github.com/anchore/syft/internal/log"
 	"github.com/anchore/syft/syft/sbom"
+
+	"github.com/anchore/syft/internal/formats/syftjson"
+
 	"github.com/wagoodman/go-progress"
+
+	"github.com/anchore/syft/syft/distro"
+	"github.com/anchore/syft/syft/source"
+
+	"github.com/anchore/client-go/pkg/external"
+	"github.com/anchore/syft/internal/log"
+	"github.com/anchore/syft/syft/pkg"
 )

 type packageSBOMImportAPI interface {
 	ImportImagePackages(context.Context, string, external.ImagePackageManifest) (external.ImageImportContentResponse, *http.Response, error)
 }

-// importSBOM mirrors all elements found on the syftjson model format object relative to the anchore engine import schema.
-type importSBOM struct {
-	Artifacts             []syftjsonModel.Package      `json:"artifacts"` // Artifacts is the list of packages discovered and placed into the catalog
-	ArtifactRelationships []syftjsonModel.Relationship `json:"artifactRelationships"`
-	Files                 []syftjsonModel.File         `json:"files,omitempty"`   // note: must have omitempty
-	Secrets               []syftjsonModel.Secrets      `json:"secrets,omitempty"` // note: must have omitempty
-	Source                syftjsonModel.Source         `json:"source"`            // Source represents the original object that was cataloged
-	Distro                external.ImportDistribution  `json:"distro"`            // Distro represents the Linux distribution that was detected from the source
-	Descriptor            syftjsonModel.Descriptor     `json:"descriptor"`        // Descriptor is a block containing self-describing information about syft
-	Schema                syftjsonModel.Schema         `json:"schema"`            // Schema is a block reserved for defining the version for the shape of this JSON document and where to find the schema document to validate the shape
-}
-
-// toImportSBOMModel transforms the current sbom shape into what is needed for the current anchore import api shape.
-func toImportSBOMModel(s sbom.SBOM) importSBOM {
-	m := syftjson.ToFormatModel(s)
-
-	var idLike string
-	if len(m.Distro.IDLike) > 0 {
-		idLike = m.Distro.IDLike[0]
-	}
-
-	var version = m.Distro.VersionID // note: version is intentionally not used as the default
-	if version == "" {
-		version = m.Distro.Version
-	}
-
-	var name = m.Distro.ID // note: name is intentionally not used as the default
-	if name == "" {
-		name = m.Distro.Name
-	}
-
-	return importSBOM{
-		Artifacts:             m.Artifacts,
-		ArtifactRelationships: m.ArtifactRelationships,
-		Files:                 m.Files,
-		Secrets:               m.Secrets,
-		Source:                m.Source,
-		Distro: external.ImportDistribution{
-			Name:    name,
-			Version: version,
-			IdLike:  idLike,
-		},
-		Descriptor: m.Descriptor,
-		Schema:     m.Schema,
-	}
-}
-
-func packageSbomModel(s sbom.SBOM) (*external.ImagePackageManifest, error) {
+func packageSbomModel(srcMetadata source.Metadata, catalog *pkg.Catalog, d *distro.Distro) (*external.ImagePackageManifest, error) {
 	var buf bytes.Buffer

-	doc := toImportSBOMModel(s)
+	// TODO: once the top-level API is refactored and SBOMs are the unit of work, then this function will be passed an SBOM and there would be no more need to create an SBOM object here.
+	s := sbom.SBOM{
+		Artifacts: sbom.Artifacts{
+			PackageCatalog: catalog,
+			Distro:         d,
+		},
+		Source: srcMetadata,
+	}

-	enc := json.NewEncoder(&buf)
-	// prevent > and < from being escaped in the payload
-	enc.SetEscapeHTML(false)
-	enc.SetIndent("", " ")
-
-	if err := enc.Encode(&doc); err != nil {
-		return nil, fmt.Errorf("unable to encode import JSON model: %w", err)
+	err := syftjson.Format().Presenter(s).Present(&buf)
+	if err != nil {
+		return nil, fmt.Errorf("unable to serialize results: %w", err)
 	}

 	// the model is 1:1 the JSON output of today. As the schema changes, this will need to be converted into individual mappings.
 	var model external.ImagePackageManifest
-	if err := json.Unmarshal(buf.Bytes(), &model); err != nil {
-		return nil, fmt.Errorf("unable to convert JSON output to import model: %w", err)
+	if err = json.Unmarshal(buf.Bytes(), &model); err != nil {
+		return nil, fmt.Errorf("unable to convert JSON presenter output to import model: %w", err)
 	}

 	return &model, nil
 }

-func importPackageSBOM(ctx context.Context, api packageSBOMImportAPI, sessionID string, s sbom.SBOM, stage *progress.Stage) (string, error) {
+func importPackageSBOM(ctx context.Context, api packageSBOMImportAPI, sessionID string, s source.Metadata, catalog *pkg.Catalog, d *distro.Distro, stage *progress.Stage) (string, error) {
 	log.Debug("importing package SBOM")
 	stage.Current = "package SBOM"

-	model, err := packageSbomModel(s)
+	model, err := packageSbomModel(s, catalog, d)
 	if err != nil {
 		return "", fmt.Errorf("unable to create PackageSBOM model: %w", err)
 	}
@@ -1,6 +1,7 @@
 package anchore

 import (
+	"bytes"
 	"context"
 	"encoding/json"
 	"fmt"
@@ -8,17 +9,16 @@ import (
 	"strings"
 	"testing"

+	"github.com/anchore/syft/syft/sbom"
+
 	"github.com/anchore/client-go/pkg/external"
 	"github.com/anchore/syft/internal/formats/syftjson"
-	"github.com/anchore/syft/syft/artifact"
-	"github.com/anchore/syft/syft/linux"
+	syftjsonModel "github.com/anchore/syft/internal/formats/syftjson/model"
+	"github.com/anchore/syft/syft/distro"
 	"github.com/anchore/syft/syft/pkg"
-	"github.com/anchore/syft/syft/sbom"
 	"github.com/anchore/syft/syft/source"
 	"github.com/docker/docker/pkg/ioutils"
 	"github.com/go-test/deep"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 	"github.com/wagoodman/go-progress"
 )

@@ -29,6 +29,98 @@ func must(c pkg.CPE, e error) pkg.CPE {
 	return c
 }

+// this test is tailored towards the assumption that the import doc shape and the syft json shape are the same.
+// TODO: replace this as the document shapes diverge.
+func TestPackageSbomToModel(t *testing.T) {
+
+	m := source.Metadata{
+		Scheme: source.ImageScheme,
+		ImageMetadata: source.ImageMetadata{
+			UserInput: "user-in",
+			Layers: []source.LayerMetadata{
+				{
+					MediaType: "layer-metadata-type!",
+					Digest:    "layer-digest",
+					Size:      20,
+				},
+			},
+			Size:           10,
+			ManifestDigest: "sha256:digest!",
+			MediaType:      "mediatype!",
+			Tags:           nil,
+		},
+	}
+
+	d, _ := distro.NewDistro(distro.CentOS, "8.0", "")
+
+	p := pkg.Package{
+		Name:    "name",
+		Version: "version",
+		FoundBy: "foundBy",
+		Locations: []source.Location{
+			{
+				RealPath:     "path",
+				FileSystemID: "layerID",
+			},
+		},
+		Licenses: []string{"license"},
+		Language: pkg.Python,
+		Type:     pkg.PythonPkg,
+		CPEs: []pkg.CPE{
+			must(pkg.NewCPE("cpe:2.3:*:some:package:1:*:*:*:*:*:*:*")),
+		},
+		PURL: "purl",
+	}
+
+	c := pkg.NewCatalog(p)
+
+	model, err := packageSbomModel(m, c, &d)
+	if err != nil {
+		t.Fatalf("unable to generate model from source material: %+v", err)
+	}
+
+	var modelJSON []byte
+
+	modelJSON, err = json.Marshal(&model)
+	if err != nil {
+		t.Fatalf("unable to marshal model: %+v", err)
+	}
+
+	s := sbom.SBOM{
+		Artifacts: sbom.Artifacts{
+			PackageCatalog: c,
+			Distro:         &d,
+		},
+		Source: m,
+	}
+
+	var buf bytes.Buffer
+	pres := syftjson.Format().Presenter(s)
+	if err := pres.Present(&buf); err != nil {
+		t.Fatalf("unable to get expected json: %+v", err)
+	}
+
+	// unmarshal expected result
+	var expectedDoc syftjsonModel.Document
+	if err := json.Unmarshal(buf.Bytes(), &expectedDoc); err != nil {
+		t.Fatalf("unable to parse json doc: %+v", err)
+	}
+
+	// unmarshal actual result
+	var actualDoc syftjsonModel.Document
+	if err := json.Unmarshal(modelJSON, &actualDoc); err != nil {
+		t.Fatalf("unable to parse json doc: %+v", err)
+	}
+
+	for _, d := range deep.Equal(actualDoc, expectedDoc) {
+		if strings.HasSuffix(d, "<nil slice> != []") {
+			// do not consider nil vs empty collection semantics as a "difference"
+			continue
+		}
+		t.Errorf("diff: %+v", d)
+	}
+}
+
 type mockPackageSBOMImportAPI struct {
 	sessionID      string
 	model          external.ImagePackageManifest
@@ -49,82 +141,63 @@ func (m *mockPackageSBOMImportAPI) ImportImagePackages(ctx context.Context, sess
 	return external.ImageImportContentResponse{Digest: m.responseDigest}, m.httpResponse, m.err
 }

-func sbomFixture() sbom.SBOM {
-	return sbom.SBOM{
-		Artifacts: sbom.Artifacts{
-			PackageCatalog: pkg.NewCatalog(pkg.Package{
-				Name:    "name",
-				Version: "version",
-				FoundBy: "foundBy",
-				Locations: []source.Location{
-					{
-						Coordinates: source.Coordinates{
-							RealPath:     "path",
-							FileSystemID: "layerID",
-						},
-					},
-				},
-				Licenses: []string{"license"},
-				Language: pkg.Python,
-				Type:     pkg.PythonPkg,
-				CPEs: []pkg.CPE{
-					must(pkg.NewCPE("cpe:2.3:*:some:package:1:*:*:*:*:*:*:*")),
-				},
-				PURL:         "purl",
-				MetadataType: pkg.PythonPackageMetadataType,
-				Metadata: pkg.PythonPackageMetadata{
-					Name:        "p-name",
-					Version:     "p-version",
-					License:     "p-license",
-					Author:      "p-author",
-					AuthorEmail: "p-email",
-					Platform:    "p-platform",
-					Files: []pkg.PythonFileRecord{
-						{
-							Path: "p-path",
-							Digest: &pkg.PythonFileDigest{
-								Algorithm: "p-alg",
-								Value:     "p-digest",
-							},
-							Size: "p-size",
-						},
-					},
-					SitePackagesRootPath: "p-site-packages-root",
-					TopLevelPackages:     []string{"top-level"},
-				},
-			}),
-			LinuxDistribution: &linux.Release{
-				ID:        "centos",
-				Version:   "8.0",
-				VersionID: "8.0",
-				IDLike:    []string{"rhel"},
-			},
-		},
-		Relationships: []artifact.Relationship{
+func TestPackageSbomImport(t *testing.T) {
+
+	catalog := pkg.NewCatalog(pkg.Package{
+		Name:    "name",
+		Version: "version",
+		FoundBy: "foundBy",
+		Locations: []source.Location{
 			{
-				From: source.NewLocation("/place1"),
-				To:   source.NewLocation("/place2"),
-				Type: artifact.ContainsRelationship,
+				RealPath:     "path",
+				FileSystemID: "layerID",
 			},
 		},
-		Source: source.Metadata{
-			Scheme: source.ImageScheme,
-			ImageMetadata: source.ImageMetadata{
-				UserInput:      "user-in",
-				Layers:         nil,
-				Size:           10,
-				ManifestDigest: "sha256:digest!",
-				MediaType:      "mediatype!",
-				Tags:           nil,
+		Licenses: []string{"license"},
+		Language: pkg.Python,
+		Type:     pkg.PythonPkg,
+		CPEs: []pkg.CPE{
+			must(pkg.NewCPE("cpe:2.3:*:some:package:1:*:*:*:*:*:*:*")),
+		},
+		PURL:         "purl",
+		MetadataType: pkg.PythonPackageMetadataType,
+		Metadata: pkg.PythonPackageMetadata{
+			Name:        "p-name",
+			Version:     "p-version",
+			License:     "p-license",
+			Author:      "p-author",
+			AuthorEmail: "p-email",
+			Platform:    "p-platform",
+			Files: []pkg.PythonFileRecord{
+				{
+					Path: "p-path",
+					Digest: &pkg.PythonFileDigest{
+						Algorithm: "p-alg",
+						Value:     "p-digest",
+					},
+					Size: "p-size",
+				},
 			},
+			SitePackagesRootPath: "p-site-packages-root",
+			TopLevelPackages:     []string{"top-level"},
+		},
+	})
+
+	m := source.Metadata{
+		Scheme: source.ImageScheme,
+		ImageMetadata: source.ImageMetadata{
+			UserInput:      "user-in",
+			Layers:         nil,
+			Size:           10,
+			ManifestDigest: "sha256:digest!",
+			MediaType:      "mediatype!",
+			Tags:           nil,
 		},
 	}

-}
+	d, _ := distro.NewDistro(distro.CentOS, "8.0", "")

-func TestPackageSbomImport(t *testing.T) {
-	sbomResult := sbomFixture()
-	theModel, err := packageSbomModel(sbomResult)
+	theModel, err := packageSbomModel(m, catalog, &d)
 	if err != nil {
 		t.Fatalf("could not get sbom model: %+v", err)
 	}
@@ -163,7 +236,7 @@ func TestPackageSbomImport(t *testing.T) {
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {

-			digest, err := importPackageSBOM(context.TODO(), test.api, sessionID, sbomResult, &progress.Stage{})
+			digest, err := importPackageSBOM(context.TODO(), test.api, sessionID, m, catalog, &d, &progress.Stage{})

 			// validate error handling
 			if err != nil && !test.expectsError {
@@ -188,210 +261,3 @@ func TestPackageSbomImport(t *testing.T) {
 		})
 	}
 }
-
-type modelAssertion func(t *testing.T, model *external.ImagePackageManifest)
-
-func Test_packageSbomModel(t *testing.T) {
-	fix := sbomFixture()
-
-	tests := []struct {
-		name   string
-		sbom   sbom.SBOM
-		traits []modelAssertion
-	}{
-		{
-			name: "distro: has single distro id-like",
-			sbom: sbom.SBOM{
-				Artifacts: sbom.Artifacts{
-					LinuxDistribution: &linux.Release{
-						Name: "centos-name",
-						ID:   "centos-id",
-						IDLike: []string{
-							"centos-id-like-1",
-						},
-						Version:   "version",
-						VersionID: "version-id",
-					},
-				},
-			},
-			traits: []modelAssertion{
-				hasDistroInfo("centos-id", "version-id", "centos-id-like-1"),
-			},
-		},
-		{
-			name: "distro: has multiple distro id-like",
-			sbom: sbom.SBOM{
-				Artifacts: sbom.Artifacts{
-					LinuxDistribution: &linux.Release{
-						Name: "centos-name",
-						ID:   "centos-id",
-						IDLike: []string{
-							"centos-id-like-1",
-							"centos-id-like-2",
-						},
-						Version:   "version",
-						VersionID: "version-id",
-					},
-				},
-			},
-			traits: []modelAssertion{
-				hasDistroInfo("centos-id", "version-id", "centos-id-like-1"),
-			},
-		},
-		{
-			name: "distro: has no distro id-like",
-			sbom: sbom.SBOM{
-				Artifacts: sbom.Artifacts{
-					LinuxDistribution: &linux.Release{
-						Name:      "centos-name",
-						ID:        "centos-id",
-						IDLike:    []string{},
-						Version:   "version",
-						VersionID: "version-id",
-					},
-				},
-			},
-			traits: []modelAssertion{
-				hasDistroInfo("centos-id", "version-id", ""),
-			},
-		},
-		{
-			name: "distro: has no version-id",
-			sbom: sbom.SBOM{
-				Artifacts: sbom.Artifacts{
-					LinuxDistribution: &linux.Release{
-						Name:      "centos-name",
-						ID:        "centos-id",
-						IDLike:    []string{},
-						Version:   "version",
-						VersionID: "",
-					},
-				},
-			},
-			traits: []modelAssertion{
-				hasDistroInfo("centos-id", "version", ""),
-			},
-		},
-		{
-			name: "distro: has no id",
-			sbom: sbom.SBOM{
-				Artifacts: sbom.Artifacts{
-					LinuxDistribution: &linux.Release{
-						Name:      "centos-name",
-						ID:        "",
-						IDLike:    []string{},
-						Version:   "version",
-						VersionID: "version-id",
-					},
-				},
-			},
-			traits: []modelAssertion{
-				hasDistroInfo("centos-name", "version-id", ""),
-			},
-		},
-		{
-			name: "should have expected packages",
-			sbom: fix,
-			traits: []modelAssertion{
-				func(t *testing.T, model *external.ImagePackageManifest) {
-					require.Len(t, model.Artifacts, 1)
-
-					modelPkg := model.Artifacts
-					modelBytes, err := json.Marshal(&modelPkg)
-					require.NoError(t, err)
-
-					fixPkg := syftjson.ToFormatModel(fix).Artifacts
-					fixBytes, err := json.Marshal(&fixPkg)
-					require.NoError(t, err)
-
-					assert.JSONEq(t, string(fixBytes), string(modelBytes))
-				},
-			},
-		},
-		{
-			name: "should have expected relationships",
-			sbom: fix,
-			traits: []modelAssertion{
-				func(t *testing.T, model *external.ImagePackageManifest) {
-					modelPkg := model.ArtifactRelationships
-					modelBytes, err := json.Marshal(&modelPkg)
-					require.NoError(t, err)
-
-					fixPkg := syftjson.ToFormatModel(fix).ArtifactRelationships
-					fixBytes, err := json.Marshal(&fixPkg)
-					require.NoError(t, err)
-
-					assert.JSONEq(t, string(fixBytes), string(modelBytes))
-				},
-			},
-		},
-		{
-			name: "should have expected schema",
-			sbom: fix,
-			traits: []modelAssertion{
-				func(t *testing.T, model *external.ImagePackageManifest) {
-					modelPkg := model.Schema
-					modelBytes, err := json.Marshal(&modelPkg)
-					require.NoError(t, err)
-
-					fixPkg := syftjson.ToFormatModel(fix).Schema
-					fixBytes, err := json.Marshal(&fixPkg)
-					require.NoError(t, err)
-
-					assert.JSONEq(t, string(fixBytes), string(modelBytes))
-				},
-			},
-		},
-		{
-			name: "should have expected descriptor",
-			sbom: fix,
-			traits: []modelAssertion{
-				func(t *testing.T, model *external.ImagePackageManifest) {
-					modelPkg := model.Descriptor
-					modelBytes, err := json.Marshal(&modelPkg)
-					require.NoError(t, err)
-
-					fixPkg := syftjson.ToFormatModel(fix).Descriptor
-					fixBytes, err := json.Marshal(&fixPkg)
-					require.NoError(t, err)
-
-					assert.JSONEq(t, string(fixBytes), string(modelBytes))
-				},
-			},
-		},
-		{
-			name: "should have expected source",
-			sbom: fix,
-			traits: []modelAssertion{
-				func(t *testing.T, model *external.ImagePackageManifest) {
-					modelPkg := model.Source
-					modelBytes, err := json.Marshal(&modelPkg)
-					require.NoError(t, err)
-
-					fixPkg := syftjson.ToFormatModel(fix).Source
-					fixBytes, err := json.Marshal(&fixPkg)
-					require.NoError(t, err)
-
-					assert.JSONEq(t, string(fixBytes), string(modelBytes))
-				},
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got, err := packageSbomModel(tt.sbom)
-			require.NoError(t, err)
-			for _, fn := range tt.traits {
-				fn(t, got)
-			}
-		})
-	}
-}
-
-func hasDistroInfo(name, version, idLike string) modelAssertion {
-	return func(t *testing.T, model *external.ImagePackageManifest) {
-		assert.Equal(t, name, model.Distro.Name)
-		assert.Equal(t, version, model.Distro.Version)
-		assert.Equal(t, idLike, model.Distro.IdLike)
-	}
-}
@@ -17,8 +17,6 @@ import (

 var ErrApplicationConfigNotFound = fmt.Errorf("application config not found")

-var catalogerEnabledDefault = false
-
 type defaultValueLoader interface {
 	loadDefaultValues(*viper.Viper)
 }
@@ -30,7 +28,7 @@ type parser interface {
 // Application is the main syft application configuration.
 type Application struct {
 	ConfigPath         string             `yaml:",omitempty" json:"configPath"`                                                         // the location where the application config was read from (either from -c or discovered while loading)
-	Outputs            []string           `yaml:"output" json:"output" mapstructure:"output"`                                           // -o, the format to use for output
+	Output             string             `yaml:"output" json:"output" mapstructure:"output"`                                           // -o, the Presenter hint string to use for report formatting
 	File               string             `yaml:"file" json:"file" mapstructure:"file"`                                                 // --file, the file to write report output to
 	Quiet              bool               `yaml:"quiet" json:"quiet" mapstructure:"quiet"`                                              // -q, indicates to not show any status output to stderr (ETUI or logging UI)
 	CheckForAppUpdate  bool               `yaml:"check-for-app-update" json:"check-for-app-update" mapstructure:"check-for-app-update"` // whether to check for an application update on start up or not
@@ -38,20 +36,12 @@ type Application struct {
 	CliOptions         CliOnlyOptions     `yaml:"-" json:"-"`                                                                           // all options only available through the CLI (not via env vars or config)
 	Dev                development        `yaml:"dev" json:"dev" mapstructure:"dev"`
 	Log                logging            `yaml:"log" json:"log" mapstructure:"log"` // all logging-related options
-	Package            pkg                `yaml:"package" json:"package" mapstructure:"package"`
+	Package            packages           `yaml:"package" json:"package" mapstructure:"package"`
 	FileMetadata       FileMetadata       `yaml:"file-metadata" json:"file-metadata" mapstructure:"file-metadata"`
 	FileClassification fileClassification `yaml:"file-classification" json:"file-classification" mapstructure:"file-classification"`
 	FileContents       fileContents       `yaml:"file-contents" json:"file-contents" mapstructure:"file-contents"`
 	Secrets            secrets            `yaml:"secrets" json:"secrets" mapstructure:"secrets"`
 	Registry           registry           `yaml:"registry" json:"registry" mapstructure:"registry"`
-	Exclusions         []string           `yaml:"exclude" json:"exclude" mapstructure:"exclude"`
-	Attest             attest             `yaml:"attest" json:"attest" mapstructure:"attest"`
-	Platform           string             `yaml:"platform" json:"platform" mapstructure:"platform"`
-}
-
-// PowerUserCatalogerEnabledDefault switches all catalogers to be enabled when running power-user command
-func PowerUserCatalogerEnabledDefault() {
-	catalogerEnabledDefault = true
 }

 func newApplicationConfig(v *viper.Viper, cliOpts CliOnlyOptions) *Application {
@@ -104,7 +94,6 @@ func (cfg *Application) parseConfigValues() error {
 	for _, optionFn := range []func() error{
 		cfg.parseUploadOptions,
 		cfg.parseLogLevelOption,
-		cfg.parseFile,
 	} {
 		if err := optionFn(); err != nil {
 			return err
@@ -127,17 +116,6 @@ func (cfg *Application) parseConfigValues() error {
 	return nil
 }

-func (cfg *Application) parseFile() error {
-	if cfg.File != "" {
-		expandedPath, err := homedir.Expand(cfg.File)
-		if err != nil {
-			return fmt.Errorf("unable to expand file path=%q: %w", cfg.File, err)
-		}
-		cfg.File = expandedPath
-	}
-	return nil
-}
-
 func (cfg *Application) parseUploadOptions() error {
 	if cfg.Anchore.Host == "" && cfg.Anchore.Dockerfile != "" {
 		return fmt.Errorf("cannot provide dockerfile option without enabling upload")
@@ -178,10 +156,6 @@ func (cfg *Application) parseLogLevelOption() error {
 		}
 	}

-	if cfg.Log.Level == "" {
-		cfg.Log.Level = cfg.Log.LevelOpt.String()
-	}
-
 	return nil
 }

@@ -1,52 +0,0 @@
-package config
-
-import (
-	"github.com/docker/docker/pkg/homedir"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"path/filepath"
-	"testing"
-)
-
-func TestApplication_parseFile(t *testing.T) {
-	tests := []struct {
-		name     string
-		config   Application
-		expected string
-		wantErr  require.ErrorAssertionFunc
-	}{
-		{
-			name: "expand home dir",
-			config: Application{
-				File: "~/place.txt",
-			},
-			expected: filepath.Join(homedir.Get(), "place.txt"),
-		},
-		{
-			name: "passthrough other paths",
-			config: Application{
-				File: "/other/place.txt",
-			},
-			expected: "/other/place.txt",
-		},
-		{
-			name: "no path",
-			config: Application{
-				File: "",
-			},
-			expected: "",
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			cfg := tt.config
-
-			if tt.wantErr == nil {
-				tt.wantErr = require.NoError
-			}
-
-			tt.wantErr(t, cfg.parseFile())
-			assert.Equal(t, tt.expected, cfg.File)
-		})
-	}
-}
@@ -1,38 +0,0 @@
-package config
-
-import (
-	"fmt"
-	"os"
-
-	"github.com/mitchellh/go-homedir"
-	"github.com/spf13/viper"
-)
-
-type attest struct {
-	Key string `yaml:"key" json:"key" mapstructure:"key"` // same as --key, file path to the private key
-	// IMPORTANT: do not show the password in any YAML/JSON output (sensitive information)
-	Password string `yaml:"-" json:"-" mapstructure:"password"` // password for the private key
-}
-
-func (cfg *attest) parseConfigValues() error {
-	if cfg.Key != "" {
-		expandedPath, err := homedir.Expand(cfg.Key)
-		if err != nil {
-			return fmt.Errorf("unable to expand key path=%q: %w", cfg.Key, err)
-		}
-		cfg.Key = expandedPath
-	}
-
-	if cfg.Password == "" {
-		// we allow for configuration via syft config/env vars and additionally interop with known cosign config env vars
-		if pw, ok := os.LookupEnv("COSIGN_PASSWORD"); ok {
-			cfg.Password = pw
-		}
-	}
-
-	return nil
-}
-
-func (cfg attest) loadDefaultValues(v *viper.Viper) {
-	v.SetDefault("attest.password", "")
-}
@@ -3,8 +3,6 @@ package config
 import (
 	"fmt"

-	"github.com/spf13/viper"
-
 	"github.com/anchore/syft/syft/source"
 )

@@ -14,10 +12,6 @@ type catalogerOptions struct {
 	ScopeOpt source.Scope `yaml:"-" json:"-"`
 }

-func (cfg catalogerOptions) loadDefaultValues(v *viper.Viper) {
-	v.SetDefault("package.cataloger.enabled", true)
-}
-
 func (cfg *catalogerOptions) parseConfigValues() error {
 	scopeOption := source.ParseScope(cfg.Scope)
 	if scopeOption == source.UnknownScope {
@@ -10,7 +10,7 @@ type fileClassification struct {
 }

 func (cfg fileClassification) loadDefaultValues(v *viper.Viper) {
-	v.SetDefault("file-classification.cataloger.enabled", catalogerEnabledDefault)
+	v.SetDefault("file-classification.cataloger.enabled", true)
 	v.SetDefault("file-classification.cataloger.scope", source.SquashedScope)
 }

@@ -13,7 +13,7 @@ type fileContents struct {
 }

 func (cfg fileContents) loadDefaultValues(v *viper.Viper) {
-	v.SetDefault("file-contents.cataloger.enabled", catalogerEnabledDefault)
+	v.SetDefault("file-contents.cataloger.enabled", true)
 	v.SetDefault("file-contents.cataloger.scope", source.SquashedScope)
 	v.SetDefault("file-contents.skip-files-above-size", 1*file.MB)
 	v.SetDefault("file-contents.globs", []string{})
@@ -11,7 +11,7 @@ type FileMetadata struct {
 }

 func (cfg FileMetadata) loadDefaultValues(v *viper.Viper) {
-	v.SetDefault("file-metadata.cataloger.enabled", catalogerEnabledDefault)
+	v.SetDefault("file-metadata.cataloger.enabled", true)
 	v.SetDefault("file-metadata.cataloger.scope", source.SquashedScope)
 	v.SetDefault("file-metadata.digests", []string{"sha256"})
 }
@@ -1,9 +1,6 @@
 package config

 import (
-	"fmt"
-
-	"github.com/mitchellh/go-homedir"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/viper"
 )
@@ -16,18 +13,6 @@ type logging struct {
 	FileLocation string       `yaml:"file" json:"file-location" mapstructure:"file"`          // the file path to write logs to
 }

-func (cfg *logging) parseConfigValues() error {
-	if cfg.FileLocation != "" {
-		expandedPath, err := homedir.Expand(cfg.FileLocation)
-		if err != nil {
-			return fmt.Errorf("unable to expand log file path=%q: %w", cfg.FileLocation, err)
-		}
-		cfg.FileLocation = expandedPath
-	}
-	return nil
-}
-
 func (cfg logging) loadDefaultValues(v *viper.Viper) {
 	v.SetDefault("log.structured", false)
-	v.SetDefault("log.file", "")
 }
@@ -0,0 +1,15 @@
+package config
+
+import "github.com/spf13/viper"
+
+type packages struct {
+	Cataloger catalogerOptions `yaml:"cataloger" json:"cataloger" mapstructure:"cataloger"`
+}
+
+func (cfg packages) loadDefaultValues(v *viper.Viper) {
+	v.SetDefault("package.cataloger.enabled", true)
+}
+
+func (cfg *packages) parseConfigValues() error {
+	return cfg.Cataloger.parseConfigValues()
+}
@@ -1,33 +0,0 @@
-package config
-
-import (
-	"github.com/anchore/syft/syft/pkg/cataloger"
-	"github.com/spf13/viper"
-)
-
-type pkg struct {
-	Cataloger               catalogerOptions `yaml:"cataloger" json:"cataloger" mapstructure:"cataloger"`
-	SearchUnindexedArchives bool             `yaml:"search-unindexed-archives" json:"search-unindexed-archives" mapstructure:"search-unindexed-archives"`
-	SearchIndexedArchives   bool             `yaml:"search-indexed-archives" json:"search-indexed-archives" mapstructure:"search-indexed-archives"`
-}
-
-func (cfg pkg) loadDefaultValues(v *viper.Viper) {
-	cfg.Cataloger.loadDefaultValues(v)
-	c := cataloger.DefaultSearchConfig()
-	v.SetDefault("package.search-unindexed-archives", c.IncludeUnindexedArchives)
-	v.SetDefault("package.search-indexed-archives", c.IncludeIndexedArchives)
-}
-
-func (cfg *pkg) parseConfigValues() error {
-	return cfg.Cataloger.parseConfigValues()
-}
-
-func (cfg pkg) ToConfig() cataloger.Config {
-	return cataloger.Config{
-		Search: cataloger.SearchConfig{
-			IncludeIndexedArchives:   cfg.SearchIndexedArchives,
-			IncludeUnindexedArchives: cfg.SearchUnindexedArchives,
-			Scope:                    cfg.Cataloger.ScopeOpt,
-		},
-	}
-}
@@ -2,9 +2,8 @@ package config

 import (
 	"fmt"
-	"testing"
-
 	"github.com/anchore/stereoscope/pkg/image"
+	"testing"

 	"github.com/stretchr/testify/assert"
 )
@@ -15,7 +15,7 @@ type secrets struct {
 }

 func (cfg secrets) loadDefaultValues(v *viper.Viper) {
-	v.SetDefault("secrets.cataloger.enabled", catalogerEnabledDefault)
+	v.SetDefault("secrets.cataloger.enabled", true)
 	v.SetDefault("secrets.cataloger.scope", source.AllLayersScope)
 	v.SetDefault("secrets.reveal-values", false)
 	v.SetDefault("secrets.skip-files-above-size", 1*file.MB)
@@ -4,7 +4,7 @@ const (
 	// ApplicationName is the non-capitalized name of the application (do not change this)
 	ApplicationName = "syft"

-	// JSONSchemaVersion is the current schema version output by the JSON encoder
+	// JSONSchemaVersion is the current schema version output by the JSON presenter
 	// This is roughly following the "SchemaVer" guidelines for versioning the JSON schema. Please see schema/json/README.md for details on how to increment.
-	JSONSchemaVersion = "3.1.1"
+	JSONSchemaVersion = "1.1.0"
 )
@@ -16,13 +16,12 @@ func CloseAndLogError(closer io.Closer, location string) {
 }

 type ErrPath struct {
-	Context string
-	Path    string
-	Err     error
+	Path string
+	Err  error
 }

 func (e ErrPath) Error() string {
-	return fmt.Sprintf("%s unable to observe contents of %+v: %v", e.Context, e.Path, e.Err)
+	return fmt.Sprintf("unable to observe contents of %+v: %v", e.Path, e.Err)
 }

 func IsErrPath(err error) bool {
@@ -1,19 +0,0 @@
-package file
-
-import (
-	"errors"
-	"fmt"
-	"io"
-)
-
-const perFileReadLimit = 2 * GB
-
-// safeCopy limits the copy from the reader. This is useful when extracting files from archives to
-// protect against decompression bomb attacks.
-func safeCopy(writer io.Writer, reader io.Reader) error {
-	numBytes, err := io.Copy(writer, io.LimitReader(reader, perFileReadLimit))
-	if numBytes >= perFileReadLimit || errors.Is(err, io.EOF) {
-		return fmt.Errorf("zip read limit hit (potential decompression bomb attack)")
-	}
-	return nil
-}
@@ -1,64 +0,0 @@
-package file
-
-import (
-	"fmt"
-	"io/ioutil"
-	"path/filepath"
-
-	"github.com/bmatcuk/doublestar/v4"
-	"github.com/mholt/archiver/v3"
-)
-
-// ExtractGlobsFromTarToUniqueTempFile extracts paths matching the given globs within the given archive to a temporary directory, returning file openers for each file extracted.
-func ExtractGlobsFromTarToUniqueTempFile(archivePath, dir string, globs ...string) (map[string]Opener, error) {
-	results := make(map[string]Opener)
-
-	// don't allow for full traversal, only select traversal from given paths
-	if len(globs) == 0 {
-		return results, nil
-	}
-
-	visitor := func(file archiver.File) error {
-		defer file.Close()
-
-		// ignore directories
-		if file.FileInfo.IsDir() {
-			return nil
-		}
-
-		// ignore any filename that doesn't match the given globs...
-		if !matchesAnyGlob(file.Name(), globs...) {
-			return nil
-		}
-
-		// we have a file we want to extract....
-		tempfilePrefix := filepath.Base(filepath.Clean(file.Name())) + "-"
-		tempFile, err := ioutil.TempFile(dir, tempfilePrefix)
-		if err != nil {
-			return fmt.Errorf("unable to create temp file: %w", err)
-		}
-		// we shouldn't try and keep the tempfile open as the returned result may have several files, which takes up
-		// resources (leading to "too many open files"). Instead we'll return a file opener to the caller which
-		// provides a ReadCloser. It is up to the caller to handle closing the file explicitly.
-		defer tempFile.Close()
-
-		if err := safeCopy(tempFile, file.ReadCloser); err != nil {
-			return fmt.Errorf("unable to copy source=%q for tar=%q: %w", file.Name(), archivePath, err)
-		}
-
-		results[file.Name()] = Opener{path: tempFile.Name()}
-
-		return nil
-	}
-
-	return results, archiver.Walk(archivePath, visitor)
-}
-
-func matchesAnyGlob(name string, globs ...string) bool {
-	for _, glob := range globs {
-		if matches, err := doublestar.PathMatch(glob, name); err == nil && matches {
-			return true
-		}
-	}
-	return false
-}
@@ -1,6 +1,3 @@
-//go:build !windows
-// +build !windows
-
 package file

 import (
@@ -3,7 +3,9 @@ package file
 import (
 	"archive/zip"
 	"bytes"
+	"errors"
 	"fmt"
+	"io"
 	"io/ioutil"
 	"os"
 	"path/filepath"
@@ -20,6 +22,8 @@ const (
 	GB
 )

+const perFileReadLimit = 2 * GB
+
 type errZipSlipDetected struct {
 	Prefix   string
 	JoinArgs []string
@@ -106,10 +110,21 @@ func ExtractFromZipToUniqueTempFile(archivePath, dir string, paths ...string) (m
 			return fmt.Errorf("unable to extract directories, only files: %s", file.Name)
 		}

-		if err := safeCopy(tempFile, zippedFile); err != nil {
+		// limit the zip reader on each file read to prevent decompression bomb attacks
+		numBytes, err := io.Copy(tempFile, io.LimitReader(zippedFile, perFileReadLimit))
+		if numBytes >= perFileReadLimit || errors.Is(err, io.EOF) {
+			return fmt.Errorf("zip read limit hit (potential decompression bomb attack)")
+		}
+		if err != nil {
 			return fmt.Errorf("unable to copy source=%q for zip=%q: %w", file.Name, archivePath, err)
 		}

+		// the file pointer is at the end due to the copy operation, reset back to the beginning
+		_, err = tempFile.Seek(0, io.SeekStart)
+		if err != nil {
+			return fmt.Errorf("unable to reset file pointer (%s): %w", tempFile.Name(), err)
+		}
+
 		results[file.Name] = Opener{path: tempFile.Name()}

 		return nil
@@ -138,7 +153,13 @@ func ContentsFromZip(archivePath string, paths ...string) (map[string]string, er
 		}

 		var buffer bytes.Buffer
-		if err := safeCopy(&buffer, zippedFile); err != nil {
+
+		// limit the zip reader on each file read to prevent decompression bomb attacks
+		numBytes, err := io.Copy(&buffer, io.LimitReader(zippedFile, perFileReadLimit))
+		if numBytes >= perFileReadLimit || errors.Is(err, io.EOF) {
+			return fmt.Errorf("zip read limit hit (potential decompression bomb attack)")
+		}
+		if err != nil {
 			return fmt.Errorf("unable to copy source=%q for zip=%q: %w", file.Name, archivePath, err)
 		}

@@ -207,7 +228,12 @@ func extractSingleFile(file *zip.File, expandedFilePath, archivePath string) err
 			return fmt.Errorf("unable to create dest file=%q from zip=%q: %w", expandedFilePath, archivePath, err)
 		}

-		if err := safeCopy(outputFile, zippedFile); err != nil {
+		// limit the zip reader on each file read to prevent decompression bomb attacks
+		numBytes, err := io.Copy(outputFile, io.LimitReader(zippedFile, perFileReadLimit))
+		if numBytes >= perFileReadLimit || errors.Is(err, io.EOF) {
+			return fmt.Errorf("zip read limit hit (potential decompression bomb attack)")
+		}
+		if err != nil {
 			return fmt.Errorf("unable to copy source=%q to dest=%q for zip=%q: %w", file.Name, outputFile.Name(), archivePath, err)
 		}

@@ -1,6 +1,3 @@
-//go:build !windows
-// +build !windows
-
 package file

 import (
@@ -1,6 +1,3 @@
-//go:build !windows
-// +build !windows
-
 package file

 import (
@@ -1,47 +0,0 @@
-package cyclonedxhelpers
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/anchore/syft/syft/pkg"
-)
-
-func encodeAuthor(p pkg.Package) string {
-	if hasMetadata(p) {
-		switch metadata := p.Metadata.(type) {
-		case pkg.NpmPackageJSONMetadata:
-			return metadata.Author
-		case pkg.PythonPackageMetadata:
-			author := metadata.Author
-			if metadata.AuthorEmail != "" {
-				if author == "" {
-					return metadata.AuthorEmail
-				}
-				author += fmt.Sprintf(" <%s>", metadata.AuthorEmail)
-			}
-			return author
-		case pkg.GemMetadata:
-			if len(metadata.Authors) > 0 {
-				return strings.Join(metadata.Authors, ",")
-			}
-			return ""
-		}
-	}
-	return ""
-}
-
-func decodeAuthor(author string, metadata interface{}) {
-	switch meta := metadata.(type) {
-	case *pkg.NpmPackageJSONMetadata:
-		meta.Author = author
-	case *pkg.PythonPackageMetadata:
-		parts := strings.SplitN(author, " <", 2)
-		meta.Author = parts[0]
-		if len(parts) > 1 {
-			meta.AuthorEmail = strings.TrimSuffix(parts[1], ">")
-		}
-	case *pkg.GemMetadata:
-		meta.Authors = strings.Split(author, ",")
-	}
-}
@@ -1,87 +0,0 @@
-package cyclonedxhelpers
-
-import (
-	"testing"
-
-	"github.com/anchore/syft/syft/pkg"
-	"github.com/stretchr/testify/assert"
-)
-
-func Test_encodeAuthor(t *testing.T) {
-	tests := []struct {
-		name     string
-		input    pkg.Package
-		expected string
-	}{
-		{
-			// note: since this is an optional field, no value is preferred over NONE or NOASSERTION
-			name:     "no metadata",
-			input:    pkg.Package{},
-			expected: "",
-		},
-		{
-			name: "from gem",
-			input: pkg.Package{
-				Metadata: pkg.GemMetadata{
-					Authors: []string{
-						"auth1",
-						"auth2",
-					},
-				},
-			},
-			expected: "auth1,auth2",
-		},
-		{
-			name: "from npm",
-			input: pkg.Package{
-				Metadata: pkg.NpmPackageJSONMetadata{
-					Author: "auth",
-				},
-			},
-			expected: "auth",
-		},
-		{
-			name: "from python - just name",
-			input: pkg.Package{
-				Metadata: pkg.PythonPackageMetadata{
-					Author: "auth",
-				},
-			},
-			expected: "auth",
-		},
-		{
-			name: "from python - just email",
-			input: pkg.Package{
-				Metadata: pkg.PythonPackageMetadata{
-					AuthorEmail: "auth@auth.gov",
-				},
-			},
-			expected: "auth@auth.gov",
-		},
-		{
-			name: "from python - both name and email",
-			input: pkg.Package{
-				Metadata: pkg.PythonPackageMetadata{
-					Author:      "auth",
-					AuthorEmail: "auth@auth.gov",
-				},
-			},
-			expected: "auth <auth@auth.gov>",
-		},
-		{
-			// note: since this is an optional field, no value is preferred over NONE or NOASSERTION
-			name: "empty",
-			input: pkg.Package{
-				Metadata: pkg.NpmPackageJSONMetadata{
-					Author: "",
-				},
-			},
-			expected: "",
-		},
-	}
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			assert.Equal(t, test.expected, encodeAuthor(test.input))
-		})
-	}
-}
@@ -1,103 +0,0 @@
-package cyclonedxhelpers
-
-import (
-	"reflect"
-
-	"github.com/CycloneDX/cyclonedx-go"
-
-	"github.com/anchore/syft/internal/formats/common"
-	"github.com/anchore/syft/syft/pkg"
-	"github.com/anchore/syft/syft/source"
-)
-
-func encodeComponent(p pkg.Package) cyclonedx.Component {
-	props := encodeProperties(p, "syft:package")
-	props = append(props, encodeCPEs(p)...)
-	if len(p.Locations) > 0 {
-		props = append(props, encodeProperties(p.Locations, "syft:location")...)
-	}
-	if hasMetadata(p) {
-		props = append(props, encodeProperties(p.Metadata, "syft:metadata")...)
-	}
-
-	var properties *[]cyclonedx.Property
-	if len(props) > 0 {
-		properties = &props
-	}
-
-	return cyclonedx.Component{
-		Type:               cyclonedx.ComponentTypeLibrary,
-		Name:               p.Name,
-		Group:              encodeGroup(p),
-		Version:            p.Version,
-		PackageURL:         p.PURL,
-		Licenses:           encodeLicenses(p),
-		CPE:                encodeSingleCPE(p),
-		Author:             encodeAuthor(p),
-		Publisher:          encodePublisher(p),
-		Description:        encodeDescription(p),
-		ExternalReferences: encodeExternalReferences(p),
-		Properties:         properties,
-	}
-}
-
-func hasMetadata(p pkg.Package) bool {
-	return p.Metadata != nil
-}
-
-func decodeComponent(c *cyclonedx.Component) *pkg.Package {
-	values := map[string]string{}
-	if c.Properties != nil {
-		for _, p := range *c.Properties {
-			values[p.Name] = p.Value
-		}
-	}
-
-	p := &pkg.Package{
-		Name:      c.Name,
-		Version:   c.Version,
-		Locations: decodeLocations(values),
-		Licenses:  decodeLicenses(c),
-		CPEs:      decodeCPEs(c),
-		PURL:      c.PackageURL,
-	}
-
-	common.DecodeInto(p, values, "syft:package", CycloneDXFields)
-
-	p.Metadata = decodePackageMetadata(values, c, p.MetadataType)
-
-	if p.Type == "" {
-		p.Type = pkg.TypeFromPURL(p.PURL)
-	}
-
-	return p
-}
-
-func decodeLocations(vals map[string]string) []source.Location {
-	v := common.Decode(reflect.TypeOf([]source.Location{}), vals, "syft:location", CycloneDXFields)
-	out, _ := v.([]source.Location)
-	return out
-}
-
-func decodePackageMetadata(vals map[string]string, c *cyclonedx.Component, typ pkg.MetadataType) interface{} {
-	if typ != "" && c.Properties != nil {
-		metaTyp, ok := pkg.MetadataTypeByName[typ]
-		if !ok {
-			return nil
-		}
-		metaPtrTyp := reflect.PtrTo(metaTyp)
-		metaPtr := common.Decode(metaPtrTyp, vals, "syft:metadata", CycloneDXFields)
-
-		// Map all explicit metadata properties
-		decodeAuthor(c.Author, metaPtr)
-		decodeGroup(c.Group, metaPtr)
-		decodePublisher(c.Publisher, metaPtr)
-		decodeDescription(c.Description, metaPtr)
-		decodeExternalReferences(c, metaPtr)
-
-		// return the actual interface{} -> struct ... not interface{} -> *struct
-		return common.PtrToStruct(metaPtr)
-	}
-
-	return nil
-}
@@ -1,141 +0,0 @@
-package cyclonedxhelpers
-
-import (
-	"testing"
-
-	"github.com/CycloneDX/cyclonedx-go"
-	"github.com/stretchr/testify/assert"
-
-	"github.com/anchore/syft/syft/pkg"
-	"github.com/anchore/syft/syft/source"
-)
-
-func Test_encodeComponentProperties(t *testing.T) {
-	epoch := 2
-	tests := []struct {
-		name     string
-		input    pkg.Package
-		expected *[]cyclonedx.Property
-	}{
-		{
-			name:     "no metadata",
-			input:    pkg.Package{},
-			expected: nil,
-		},
-		{
-			name: "from apk",
-			input: pkg.Package{
-				FoundBy: "cataloger",
-				Locations: []source.Location{
-					{Coordinates: source.Coordinates{RealPath: "test"}},
-				},
-				Metadata: pkg.ApkMetadata{
-					Package:          "libc-utils",
-					OriginPackage:    "libc-dev",
-					Maintainer:       "Natanael Copa <ncopa@alpinelinux.org>",
-					Version:          "0.7.2-r0",
-					License:          "BSD",
-					Architecture:     "x86_64",
-					URL:              "http://alpinelinux.org",
-					Description:      "Meta package to pull in correct libc",
-					Size:             0,
-					InstalledSize:    4096,
-					PullDependencies: "musl-utils",
-					PullChecksum:     "Q1p78yvTLG094tHE1+dToJGbmYzQE=",
-					GitCommitOfAport: "97b1c2842faa3bfa30f5811ffbf16d5ff9f1a479",
-					Files:            []pkg.ApkFileRecord{},
-				},
-			},
-			expected: &[]cyclonedx.Property{
-				{Name: "syft:package:foundBy", Value: "cataloger"},
-				{Name: "syft:location:0:path", Value: "test"},
-				{Name: "syft:metadata:gitCommitOfApkPort", Value: "97b1c2842faa3bfa30f5811ffbf16d5ff9f1a479"},
-				{Name: "syft:metadata:installedSize", Value: "4096"},
-				{Name: "syft:metadata:originPackage", Value: "libc-dev"},
-				{Name: "syft:metadata:pullChecksum", Value: "Q1p78yvTLG094tHE1+dToJGbmYzQE="},
-				{Name: "syft:metadata:pullDependencies", Value: "musl-utils"},
-				{Name: "syft:metadata:size", Value: "0"},
-			},
-		},
-		{
-			name: "from dpkg",
-			input: pkg.Package{
-				MetadataType: pkg.DpkgMetadataType,
-				Metadata: pkg.DpkgMetadata{
-					Package:       "tzdata",
-					Version:       "2020a-0+deb10u1",
-					Source:        "tzdata-dev",
-					SourceVersion: "1.0",
-					Architecture:  "all",
-					InstalledSize: 3036,
-					Maintainer:    "GNU Libc Maintainers <debian-glibc@lists.debian.org>",
-					Files:         []pkg.DpkgFileRecord{},
-				},
-			},
-			expected: &[]cyclonedx.Property{
-				{Name: "syft:package:metadataType", Value: "DpkgMetadata"},
-				{Name: "syft:metadata:installedSize", Value: "3036"},
-				{Name: "syft:metadata:source", Value: "tzdata-dev"},
-				{Name: "syft:metadata:sourceVersion", Value: "1.0"},
-			},
-		},
-		{
-			name: "from go bin",
-			input: pkg.Package{
-				Name:         "golang.org/x/net",
-				Version:      "v0.0.0-20211006190231-62292e806868",
-				Language:     pkg.Go,
-				Type:         pkg.GoModulePkg,
-				MetadataType: pkg.GolangBinMetadataType,
-				Metadata: pkg.GolangBinMetadata{
-					GoCompiledVersion: "1.17",
-					Architecture:      "amd64",
-					H1Digest:          "h1:KlOXYy8wQWTUJYFgkUI40Lzr06ofg5IRXUK5C7qZt1k=",
-				},
-			},
-			expected: &[]cyclonedx.Property{
-				{Name: "syft:package:language", Value: pkg.Go.String()},
-				{Name: "syft:package:metadataType", Value: "GolangBinMetadata"},
-				{Name: "syft:package:type", Value: "go-module"},
-				{Name: "syft:metadata:architecture", Value: "amd64"},
-				{Name: "syft:metadata:goCompiledVersion", Value: "1.17"},
-				{Name: "syft:metadata:h1Digest", Value: "h1:KlOXYy8wQWTUJYFgkUI40Lzr06ofg5IRXUK5C7qZt1k="},
-			},
-		},
-		{
-			name: "from rpm",
-			input: pkg.Package{
-				Name:         "dive",
-				Version:      "0.9.2-1",
-				Type:         pkg.RpmPkg,
-				MetadataType: pkg.RpmdbMetadataType,
-				Metadata: pkg.RpmdbMetadata{
-					Name:      "dive",
-					Epoch:     &epoch,
-					Arch:      "x86_64",
-					Release:   "1",
-					Version:   "0.9.2",
-					SourceRpm: "dive-0.9.2-1.src.rpm",
-					Size:      12406784,
-					License:   "MIT",
-					Vendor:    "",
-					Files:     []pkg.RpmdbFileRecord{},
-				},
-			},
-			expected: &[]cyclonedx.Property{
-				{Name: "syft:package:metadataType", Value: "RpmdbMetadata"},
-				{Name: "syft:package:type", Value: "rpm"},
-				{Name: "syft:metadata:epoch", Value: "2"},
-				{Name: "syft:metadata:release", Value: "1"},
-				{Name: "syft:metadata:size", Value: "12406784"},
-				{Name: "syft:metadata:sourceRpm", Value: "dive-0.9.2-1.src.rpm"},
-			},
-		},
-	}
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			c := encodeComponent(test.input)
-			assert.Equal(t, test.expected, c.Properties)
-		})
-	}
-}
@@ -1,57 +0,0 @@
-package cyclonedxhelpers
-
-import (
-	"github.com/CycloneDX/cyclonedx-go"
-
-	"github.com/anchore/syft/internal/log"
-	"github.com/anchore/syft/syft/pkg"
-)
-
-func encodeSingleCPE(p pkg.Package) string {
-	// Since the CPEs in a package are sorted by specificity
-	// we can extract the first CPE as the one to output in cyclonedx
-	if len(p.CPEs) > 0 {
-		return pkg.CPEString(p.CPEs[0])
-	}
-	return ""
-}
-
-func encodeCPEs(p pkg.Package) (out []cyclonedx.Property) {
-	for i, c := range p.CPEs {
-		// first CPE is "most specific" and already encoded as the component CPE
-		if i == 0 {
-			continue
-		}
-		out = append(out, cyclonedx.Property{
-			Name:  "syft:cpe23",
-			Value: pkg.CPEString(c),
-		})
-	}
-	return
-}
-
-func decodeCPEs(c *cyclonedx.Component) (out []pkg.CPE) {
-	if c.CPE != "" {
-		cp, err := pkg.NewCPE(c.CPE)
-		if err != nil {
-			log.Warnf("invalid CPE: %s", c.CPE)
-		} else {
-			out = append(out, cp)
-		}
-	}
-
-	if c.Properties != nil {
-		for _, p := range *c.Properties {
-			if p.Name == "syft:cpe23" {
-				cp, err := pkg.NewCPE(p.Value)
-				if err != nil {
-					log.Warnf("invalid CPE: %s", p.Value)
-				} else {
-					out = append(out, cp)
-				}
-			}
-		}
-	}
-
-	return
-}
@@ -1,58 +0,0 @@
-package cyclonedxhelpers
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-
-	"github.com/anchore/syft/syft/pkg"
-)
-
-func Test_encodeCPE(t *testing.T) {
-	testCPE := pkg.MustCPE("cpe:2.3:a:name:name:3.2:*:*:*:*:*:*:*")
-	testCPE2 := pkg.MustCPE("cpe:2.3:a:name:name2:3.2:*:*:*:*:*:*:*")
-	tests := []struct {
-		name     string
-		input    pkg.Package
-		expected string
-	}{
-		{
-			// note: since this is an optional field, no value is preferred over NONE or NOASSERTION
-			name: "no metadata",
-			input: pkg.Package{
-				CPEs: []pkg.CPE{},
-			},
-			expected: "",
-		},
-		{
-			name: "single CPE",
-			input: pkg.Package{
-				CPEs: []pkg.CPE{
-					testCPE,
-				},
-			},
-			expected: "cpe:2.3:a:name:name:3.2:*:*:*:*:*:*:*",
-		},
-		{
-			name: "multiple CPEs",
-			input: pkg.Package{
-				CPEs: []pkg.CPE{
-					testCPE2,
-					testCPE,
-				},
-			},
-			expected: "cpe:2.3:a:name:name2:3.2:*:*:*:*:*:*:*",
-		},
-		{
-			// note: since this is an optional field, no value is preferred over NONE or NOASSERTION
-			name:     "empty",
-			input:    pkg.Package{},
-			expected: "",
-		},
-	}
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			assert.Equal(t, test.expected, encodeSingleCPE(test.input))
-		})
-	}
-}
@@ -1,231 +0,0 @@
-package cyclonedxhelpers
-
-import (
-	"fmt"
-	"io"
-
-	"github.com/CycloneDX/cyclonedx-go"
-
-	"github.com/anchore/syft/internal/formats/common"
-	"github.com/anchore/syft/syft/artifact"
-	"github.com/anchore/syft/syft/linux"
-	"github.com/anchore/syft/syft/pkg"
-	"github.com/anchore/syft/syft/sbom"
-	"github.com/anchore/syft/syft/source"
-)
-
-func GetValidator(format cyclonedx.BOMFileFormat) sbom.Validator {
-	return func(reader io.Reader) error {
-		bom := &cyclonedx.BOM{}
-		err := cyclonedx.NewBOMDecoder(reader, format).Decode(bom)
-		if err != nil {
-			return err
-		}
-		// random JSON does not necessarily cause an error (e.g. SPDX)
-		if (cyclonedx.BOM{} == *bom) {
-			return fmt.Errorf("not a valid CycloneDX document")
-		}
-		return nil
-	}
-}
-
-func GetDecoder(format cyclonedx.BOMFileFormat) sbom.Decoder {
-	return func(reader io.Reader) (*sbom.SBOM, error) {
-		bom := &cyclonedx.BOM{}
-		err := cyclonedx.NewBOMDecoder(reader, format).Decode(bom)
-		if err != nil {
-			return nil, err
-		}
-		s, err := toSyftModel(bom)
-		if err != nil {
-			return nil, err
-		}
-		return s, nil
-	}
-}
-
-func toSyftModel(bom *cyclonedx.BOM) (*sbom.SBOM, error) {
-	meta := source.Metadata{}
-	if bom.Metadata != nil && bom.Metadata.Component != nil {
-		meta = decodeMetadata(bom.Metadata.Component)
-	}
-	s := &sbom.SBOM{
-		Artifacts: sbom.Artifacts{
-			PackageCatalog:    pkg.NewCatalog(),
-			LinuxDistribution: linuxReleaseFromComponents(*bom.Components),
-		},
-		Source: meta,
-		//Descriptor:    sbom.Descriptor{},
-	}
-
-	idMap := make(map[string]interface{})
-
-	if err := collectBomPackages(bom, s, idMap); err != nil {
-		return nil, err
-	}
-
-	collectRelationships(bom, s, idMap)
-
-	return s, nil
-}
-
-func collectBomPackages(bom *cyclonedx.BOM, s *sbom.SBOM, idMap map[string]interface{}) error {
-	if bom.Components == nil {
-		return fmt.Errorf("no components are defined in the CycloneDX BOM")
-	}
-	for i := range *bom.Components {
-		collectPackages(&(*bom.Components)[i], s, idMap)
-	}
-	return nil
-}
-
-func collectPackages(component *cyclonedx.Component, s *sbom.SBOM, idMap map[string]interface{}) {
-	switch component.Type {
-	case cyclonedx.ComponentTypeOS:
-	case cyclonedx.ComponentTypeContainer:
-	case cyclonedx.ComponentTypeApplication, cyclonedx.ComponentTypeFramework, cyclonedx.ComponentTypeLibrary:
-		p := decodeComponent(component)
-		idMap[component.BOMRef] = p
-		// TODO there must be a better way than needing to call this manually:
-		p.SetID()
-		s.Artifacts.PackageCatalog.Add(*p)
-	}
-
-	if component.Components != nil {
-		for i := range *component.Components {
-			collectPackages(&(*component.Components)[i], s, idMap)
-		}
-	}
-}
-
-func linuxReleaseFromComponents(components []cyclonedx.Component) *linux.Release {
-	for i := range components {
-		component := &components[i]
-		if component.Type == cyclonedx.ComponentTypeOS {
-			return linuxReleaseFromOSComponent(component)
-		}
-	}
-	return nil
-}
-
-func linuxReleaseFromOSComponent(component *cyclonedx.Component) *linux.Release {
-	if component == nil {
-		return nil
-	}
-
-	var name string
-	var version string
-	if component.SWID != nil {
-		name = component.SWID.Name
-		version = component.SWID.Version
-	}
-	if name == "" {
-		name = component.Name
-	}
-	if name == "" {
-		name = getPropertyValue(component, "id")
-	}
-	if version == "" {
-		version = component.Version
-	}
-	if version == "" {
-		version = getPropertyValue(component, "versionID")
-	}
-
-	rel := &linux.Release{
-		CPEName:    component.CPE,
-		PrettyName: name,
-		Name:       name,
-		ID:         name,
-		IDLike:     []string{name},
-		Version:    version,
-		VersionID:  version,
-	}
-	if component.ExternalReferences != nil {
-		for _, ref := range *component.ExternalReferences {
-			switch ref.Type {
-			case cyclonedx.ERTypeIssueTracker:
-				rel.BugReportURL = ref.URL
-			case cyclonedx.ERTypeWebsite:
-				rel.HomeURL = ref.URL
-			case cyclonedx.ERTypeOther:
-				switch ref.Comment {
-				case "support":
-					rel.SupportURL = ref.URL
-				case "privacyPolicy":
-					rel.PrivacyPolicyURL = ref.URL
-				}
-			}
-		}
-	}
-
-	if component.Properties != nil {
-		values := map[string]string{}
-		for _, p := range *component.Properties {
-			values[p.Name] = p.Value
-		}
-		common.DecodeInto(&rel, values, "syft:distro", CycloneDXFields)
-	}
-
-	return rel
-}
-
-func getPropertyValue(component *cyclonedx.Component, name string) string {
-	if component.Properties != nil {
-		for _, p := range *component.Properties {
-			if p.Name == name {
-				return p.Value
-			}
-		}
-	}
-	return ""
-}
-
-func collectRelationships(bom *cyclonedx.BOM, s *sbom.SBOM, idMap map[string]interface{}) {
-	if bom.Dependencies == nil {
-		return
-	}
-	for _, d := range *bom.Dependencies {
-		from, fromOk := idMap[d.Ref].(artifact.Identifiable)
-		if fromOk {
-			if d.Dependencies == nil {
-				continue
-			}
-			for _, t := range *d.Dependencies {
-				to, toOk := idMap[t.Ref].(artifact.Identifiable)
-				if toOk {
-					s.Relationships = append(s.Relationships, artifact.Relationship{
-						From: from,
-						To:   to,
-						Type: artifact.DependencyOfRelationship, // FIXME this information is lost
-					})
-				}
-			}
-		}
-	}
-}
-
-func decodeMetadata(component *cyclonedx.Component) source.Metadata {
-	switch component.Type {
-	case cyclonedx.ComponentTypeContainer:
-		return source.Metadata{
-			Scheme: source.ImageScheme,
-			ImageMetadata: source.ImageMetadata{
-				UserInput:      component.Name,
-				ID:             component.BOMRef,
-				ManifestDigest: component.Version,
-			},
-		}
-	case cyclonedx.ComponentTypeFile:
-		return source.Metadata{
-			Scheme: source.FileScheme, // or source.DirectoryScheme
-			Path:   component.Name,
-			ImageMetadata: source.ImageMetadata{
-				UserInput:      component.Name,
-				ID:             component.BOMRef,
-				ManifestDigest: component.Version,
-			},
-		}
-	}
-	return source.Metadata{}
-}
@@ -1,275 +0,0 @@
-package cyclonedxhelpers
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/CycloneDX/cyclonedx-go"
-	"github.com/stretchr/testify/assert"
-)
-
-func Test_decode(t *testing.T) {
-	type expected struct {
-		os       string
-		pkg      string
-		ver      string
-		relation string
-		purl     string
-		cpe      string
-	}
-	tests := []struct {
-		name     string
-		input    cyclonedx.BOM
-		expected []expected
-	}{
-		{
-			name: "basic mapping from cyclonedx",
-			input: cyclonedx.BOM{
-				Metadata: nil,
-				Components: &[]cyclonedx.Component{
-					{
-						BOMRef:      "p1",
-						Type:        cyclonedx.ComponentTypeLibrary,
-						Name:        "package-1",
-						Version:     "1.0.1",
-						Description: "",
-						Hashes:      nil,
-						Licenses: &cyclonedx.Licenses{
-							{
-								License: &cyclonedx.License{
-									ID: "MIT",
-								},
-							},
-						},
-						CPE:        "cpe:2.3:*:some:package:1:*:*:*:*:*:*:*",
-						PackageURL: "pkg:some/package-1@1.0.1?arch=arm64&upstream=upstream1&distro=alpine-1",
-						ExternalReferences: &[]cyclonedx.ExternalReference{
-							{
-								URL:     "",
-								Comment: "",
-								Hashes:  nil,
-								Type:    "",
-							},
-						},
-						Properties: &[]cyclonedx.Property{
-							{
-								Name:  "foundBy",
-								Value: "the-cataloger-1",
-							},
-							{
-								Name:  "language",
-								Value: "python",
-							},
-							{
-								Name:  "type",
-								Value: "python",
-							},
-							{
-								Name:  "metadataType",
-								Value: "PythonPackageMetadata",
-							},
-							{
-								Name:  "path",
-								Value: "/some/path/pkg1",
-							},
-						},
-						Components: nil,
-						Evidence:   nil,
-					},
-					{
-						BOMRef:  "p2",
-						Type:    cyclonedx.ComponentTypeLibrary,
-						Name:    "package-2",
-						Version: "2.0.2",
-						Hashes:  nil,
-						Licenses: &cyclonedx.Licenses{
-							{
-								License: &cyclonedx.License{
-									ID: "MIT",
-								},
-							},
-						},
-						CPE:        "cpe:2.3:*:another:package:2:*:*:*:*:*:*:*",
-						PackageURL: "pkg:alpine/alpine-baselayout@3.2.0-r16?arch=x86_64&upstream=alpine-baselayout&distro=alpine-3.14.2",
-						Properties: &[]cyclonedx.Property{
-
-							{
-								Name:  "foundBy",
-								Value: "apkdb-cataloger",
-							},
-							{
-								Name:  "type",
-								Value: "apk",
-							},
-							{
-								Name:  "metadataType",
-								Value: "ApkMetadata",
-							},
-							{
-								Name:  "path",
-								Value: "/lib/apk/db/installed",
-							},
-							{
-								Name:  "layerID",
-								Value: "sha256:9fb3aa2f8b8023a4bebbf92aa567caf88e38e969ada9f0ac12643b2847391635",
-							},
-							{
-								Name:  "originPackage",
-								Value: "zlib",
-							},
-							{
-								Name:  "size",
-								Value: "51213",
-							},
-							{
-								Name:  "installedSize",
-								Value: "110592",
-							},
-							{
-								Name:  "pullDependencies",
-								Value: "so:libc.musl-x86_64.so.1",
-							},
-							{
-								Name:  "pullChecksum",
-								Value: "Q1uss4DfpvL16Nw2YUTwmzGBABz3Y=",
-							},
-							{
-								Name:  "gitCommitOfApkPort",
-								Value: "d2bfb22c8e8f67ad7d8d02704f35ec4d2a19f9b9",
-							},
-						},
-					},
-					{
-						Type:    cyclonedx.ComponentTypeOS,
-						Name:    "debian",
-						Version: "1.2.3",
-						Hashes:  nil,
-						Licenses: &cyclonedx.Licenses{
-							{
-								License: &cyclonedx.License{
-									ID: "MIT",
-								},
-							},
-						},
-						Properties: &[]cyclonedx.Property{
-							{
-								Name:  "prettyName",
-								Value: "debian",
-							},
-							{
-								Name:  "id",
-								Value: "debian",
-							},
-							{
-								Name:  "versionID",
-								Value: "1.2.3",
-							},
-						},
-						Components: nil,
-						Evidence:   nil,
-					},
-				},
-				Dependencies: &[]cyclonedx.Dependency{
-					{
-						Ref: "p1",
-						Dependencies: &[]cyclonedx.Dependency{
-							{
-								Ref: "p2",
-							},
-						},
-					},
-				},
-			},
-			expected: []expected{
-				{
-					os:  "debian",
-					ver: "1.2.3",
-				},
-				{
-					pkg:      "package-1",
-					ver:      "1.0.1",
-					cpe:      "cpe:2.3:*:some:package:1:*:*:*:*:*:*:*",
-					purl:     "pkg:some/package-1@1.0.1?arch=arm64&upstream=upstream1&distro=alpine-1",
-					relation: "package-2",
-				},
-				{
-					pkg:  "package-2",
-					ver:  "2.0.2",
-					purl: "pkg:alpine/alpine-baselayout@3.2.0-r16?arch=x86_64&upstream=alpine-baselayout&distro=alpine-3.14.2",
-				},
-			},
-		},
-	}
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			sbom, err := toSyftModel(&test.input)
-			assert.NoError(t, err)
-
-		test:
-			for _, e := range test.expected {
-				if e.os != "" {
-					assert.Equal(t, e.os, sbom.Artifacts.LinuxDistribution.ID)
-					assert.Equal(t, e.ver, sbom.Artifacts.LinuxDistribution.VersionID)
-				}
-				if e.pkg != "" {
-					for p := range sbom.Artifacts.PackageCatalog.Enumerate() {
-						if e.pkg != p.Name {
-							continue
-						}
-
-						assert.Equal(t, e.ver, p.Version)
-
-						if e.cpe != "" {
-							foundCPE := false
-							for _, c := range p.CPEs {
-								cstr := c.BindToFmtString()
-								if e.cpe == cstr {
-									foundCPE = true
-									break
-								}
-							}
-							if !foundCPE {
-								assert.Fail(t, fmt.Sprintf("CPE not found in package: %s", e.cpe))
-							}
-						}
-
-						if e.purl != "" {
-							assert.Equal(t, e.purl, p.PURL)
-						}
-
-						if e.relation != "" {
-							foundRelation := false
-							for _, r := range sbom.Relationships {
-								p := sbom.Artifacts.PackageCatalog.Package(r.To.ID())
-								if e.relation == p.Name {
-									foundRelation = true
-									break
-								}
-							}
-							if !foundRelation {
-								assert.Fail(t, fmt.Sprintf("relation not found: %s", e.relation))
-							}
-						}
-						continue test
-					}
-					assert.Fail(t, fmt.Sprintf("package should be present: %s", e.pkg))
-				}
-			}
-		})
-	}
-}
-
-func Test_missingDataDecode(t *testing.T) {
-	bom := &cyclonedx.BOM{
-		Metadata:   nil,
-		Components: &[]cyclonedx.Component{},
-	}
-
-	_, err := toSyftModel(bom)
-	assert.NoError(t, err)
-
-	bom.Metadata = &cyclonedx.Metadata{}
-
-	_, err = toSyftModel(bom)
-	assert.NoError(t, err)
-}
@@ -1,24 +0,0 @@
-package cyclonedxhelpers
-
-import "github.com/anchore/syft/syft/pkg"
-
-func encodeDescription(p pkg.Package) string {
-	if hasMetadata(p) {
-		switch metadata := p.Metadata.(type) {
-		case pkg.ApkMetadata:
-			return metadata.Description
-		case pkg.NpmPackageJSONMetadata:
-			return metadata.Description
-		}
-	}
-	return ""
-}
-
-func decodeDescription(description string, metadata interface{}) {
-	switch meta := metadata.(type) {
-	case *pkg.ApkMetadata:
-		meta.Description = description
-	case *pkg.NpmPackageJSONMetadata:
-		meta.Description = description
-	}
-}
@@ -1,56 +0,0 @@
-package cyclonedxhelpers
-
-import (
-	"testing"
-
-	"github.com/anchore/syft/syft/pkg"
-	"github.com/stretchr/testify/assert"
-)
-
-func Test_encodeDescription(t *testing.T) {
-	tests := []struct {
-		name     string
-		input    pkg.Package
-		expected string
-	}{
-		{
-			// note: since this is an optional field, no value is preferred over NONE or NOASSERTION
-			name:     "no metadata",
-			input:    pkg.Package{},
-			expected: "",
-		},
-		{
-			name: "from apk",
-			input: pkg.Package{
-				Metadata: pkg.ApkMetadata{
-					Description: "a description!",
-				},
-			},
-			expected: "a description!",
-		},
-		{
-			name: "from npm",
-			input: pkg.Package{
-				Metadata: pkg.NpmPackageJSONMetadata{
-					Description: "a description!",
-				},
-			},
-			expected: "a description!",
-		},
-		{
-			// note: since this is an optional field, no value is preferred over NONE or NOASSERTION
-			name: "empty",
-			input: pkg.Package{
-				Metadata: pkg.NpmPackageJSONMetadata{
-					Homepage: "",
-				},
-			},
-			expected: "",
-		},
-	}
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			assert.Equal(t, test.expected, encodeDescription(test.input))
-		})
-	}
-}
@@ -1,114 +0,0 @@
-package cyclonedxhelpers
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/CycloneDX/cyclonedx-go"
-	"github.com/anchore/syft/syft/pkg"
-)
-
-func encodeExternalReferences(p pkg.Package) *[]cyclonedx.ExternalReference {
-	refs := []cyclonedx.ExternalReference{}
-	if hasMetadata(p) {
-		switch metadata := p.Metadata.(type) {
-		case pkg.ApkMetadata:
-			if metadata.URL != "" {
-				refs = append(refs, cyclonedx.ExternalReference{
-					URL:  metadata.URL,
-					Type: cyclonedx.ERTypeDistribution,
-				})
-			}
-		case pkg.CargoPackageMetadata:
-			if metadata.Source != "" {
-				refs = append(refs, cyclonedx.ExternalReference{
-					URL:  metadata.Source,
-					Type: cyclonedx.ERTypeDistribution,
-				})
-			}
-		case pkg.NpmPackageJSONMetadata:
-			if metadata.URL != "" {
-				refs = append(refs, cyclonedx.ExternalReference{
-					URL:  metadata.URL,
-					Type: cyclonedx.ERTypeDistribution,
-				})
-			}
-			if metadata.Homepage != "" {
-				refs = append(refs, cyclonedx.ExternalReference{
-					URL:  metadata.Homepage,
-					Type: cyclonedx.ERTypeWebsite,
-				})
-			}
-		case pkg.GemMetadata:
-			if metadata.Homepage != "" {
-				refs = append(refs, cyclonedx.ExternalReference{
-					URL:  metadata.Homepage,
-					Type: cyclonedx.ERTypeWebsite,
-				})
-			}
-		case pkg.PythonPackageMetadata:
-			if metadata.DirectURLOrigin != nil && metadata.DirectURLOrigin.URL != "" {
-				ref := cyclonedx.ExternalReference{
-					URL:  metadata.DirectURLOrigin.URL,
-					Type: cyclonedx.ERTypeVCS,
-				}
-				if metadata.DirectURLOrigin.CommitID != "" {
-					ref.Comment = fmt.Sprintf("commit: %s", metadata.DirectURLOrigin.CommitID)
-				}
-				refs = append(refs, ref)
-			}
-		}
-	}
-	if len(refs) > 0 {
-		return &refs
-	}
-	return nil
-}
-
-func decodeExternalReferences(c *cyclonedx.Component, metadata interface{}) {
-	if c.ExternalReferences == nil {
-		return
-	}
-	switch meta := metadata.(type) {
-	case *pkg.ApkMetadata:
-		meta.URL = refURL(c, cyclonedx.ERTypeDistribution)
-	case *pkg.CargoPackageMetadata:
-		meta.Source = refURL(c, cyclonedx.ERTypeDistribution)
-	case *pkg.NpmPackageJSONMetadata:
-		meta.URL = refURL(c, cyclonedx.ERTypeDistribution)
-		meta.Homepage = refURL(c, cyclonedx.ERTypeWebsite)
-	case *pkg.GemMetadata:
-		meta.Homepage = refURL(c, cyclonedx.ERTypeWebsite)
-	case *pkg.PythonPackageMetadata:
-		if meta.DirectURLOrigin == nil {
-			meta.DirectURLOrigin = &pkg.PythonDirectURLOriginInfo{}
-		}
-		meta.DirectURLOrigin.URL = refURL(c, cyclonedx.ERTypeVCS)
-		meta.DirectURLOrigin.CommitID = strings.TrimPrefix(refComment(c, cyclonedx.ERTypeVCS), "commit: ")
-	}
-}
-
-func findExternalRef(c *cyclonedx.Component, typ cyclonedx.ExternalReferenceType) *cyclonedx.ExternalReference {
-	if c.ExternalReferences != nil {
-		for _, r := range *c.ExternalReferences {
-			if r.Type == typ {
-				return &r
-			}
-		}
-	}
-	return nil
-}
-
-func refURL(c *cyclonedx.Component, typ cyclonedx.ExternalReferenceType) string {
-	if r := findExternalRef(c, typ); r != nil {
-		return r.URL
-	}
-	return ""
-}
-
-func refComment(c *cyclonedx.Component, typ cyclonedx.ExternalReferenceType) string {
-	if r := findExternalRef(c, typ); r != nil {
-		return r.Comment
-	}
-	return ""
-}
@@ -1,133 +0,0 @@
-package cyclonedxhelpers
-
-import (
-	"testing"
-
-	"github.com/CycloneDX/cyclonedx-go"
-	"github.com/anchore/syft/syft/pkg"
-	"github.com/stretchr/testify/assert"
-)
-
-func Test_encodeExternalReferences(t *testing.T) {
-	tests := []struct {
-		name     string
-		input    pkg.Package
-		expected *[]cyclonedx.ExternalReference
-	}{
-		{
-			name:     "no metadata",
-			input:    pkg.Package{},
-			expected: nil,
-		},
-		{
-			name: "from apk",
-			input: pkg.Package{
-				Metadata: pkg.ApkMetadata{
-					URL: "http://a-place.gov",
-				},
-			},
-			expected: &[]cyclonedx.ExternalReference{
-				{URL: "http://a-place.gov", Type: cyclonedx.ERTypeDistribution},
-			},
-		},
-		{
-			name: "from npm",
-			input: pkg.Package{
-				Metadata: pkg.NpmPackageJSONMetadata{
-					URL: "http://a-place.gov",
-				},
-			},
-			expected: &[]cyclonedx.ExternalReference{
-				{URL: "http://a-place.gov", Type: cyclonedx.ERTypeDistribution},
-			},
-		},
-		{
-			name: "from cargo lock",
-			input: pkg.Package{
-				Name:         "ansi_term",
-				Version:      "0.12.1",
-				Language:     pkg.Rust,
-				Type:         pkg.RustPkg,
-				MetadataType: pkg.RustCargoPackageMetadataType,
-				Licenses:     nil,
-				Metadata: pkg.CargoPackageMetadata{
-					Name:     "ansi_term",
-					Version:  "0.12.1",
-					Source:   "registry+https://github.com/rust-lang/crates.io-index",
-					Checksum: "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2",
-					Dependencies: []string{
-						"winapi",
-					},
-				},
-			},
-			expected: &[]cyclonedx.ExternalReference{
-				{URL: "registry+https://github.com/rust-lang/crates.io-index", Type: cyclonedx.ERTypeDistribution},
-			},
-		},
-		{
-			name: "from npm with homepage",
-			input: pkg.Package{
-				Metadata: pkg.NpmPackageJSONMetadata{
-					URL:      "http://a-place.gov",
-					Homepage: "http://homepage",
-				},
-			},
-			expected: &[]cyclonedx.ExternalReference{
-				{URL: "http://a-place.gov", Type: cyclonedx.ERTypeDistribution},
-				{URL: "http://homepage", Type: cyclonedx.ERTypeWebsite},
-			},
-		},
-		{
-			name: "from gem",
-			input: pkg.Package{
-				Metadata: pkg.GemMetadata{
-					Homepage: "http://a-place.gov",
-				},
-			},
-			expected: &[]cyclonedx.ExternalReference{
-				{URL: "http://a-place.gov", Type: cyclonedx.ERTypeWebsite},
-			},
-		},
-		{
-			name: "from python direct url",
-			input: pkg.Package{
-				Metadata: pkg.PythonPackageMetadata{
-					DirectURLOrigin: &pkg.PythonDirectURLOriginInfo{
-						URL: "http://a-place.gov",
-					},
-				},
-			},
-			expected: &[]cyclonedx.ExternalReference{
-				{URL: "http://a-place.gov", Type: cyclonedx.ERTypeVCS},
-			},
-		},
-		{
-			name: "from python direct url with commit",
-			input: pkg.Package{
-				Metadata: pkg.PythonPackageMetadata{
-					DirectURLOrigin: &pkg.PythonDirectURLOriginInfo{
-						URL:      "http://a-place.gov",
-						CommitID: "test",
-					},
-				},
-			},
-			expected: &[]cyclonedx.ExternalReference{
-				{URL: "http://a-place.gov", Type: cyclonedx.ERTypeVCS, Comment: "commit: test"},
-			},
-		},
-		{
-			name: "empty",
-			input: pkg.Package{
-				Metadata: pkg.NpmPackageJSONMetadata{
-					URL: "",
-				},
-			},
-			expected: nil,
-		},
-	}
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			assert.Equal(t, test.expected, encodeExternalReferences(test.input))
-		})
-	}
-}
@@ -1,182 +0,0 @@
-package cyclonedxhelpers
-
-import (
-	"time"
-
-	"github.com/CycloneDX/cyclonedx-go"
-	"github.com/google/uuid"
-
-	"github.com/anchore/syft/internal"
-	"github.com/anchore/syft/internal/log"
-	"github.com/anchore/syft/internal/version"
-	"github.com/anchore/syft/syft/artifact"
-	"github.com/anchore/syft/syft/linux"
-	"github.com/anchore/syft/syft/sbom"
-	"github.com/anchore/syft/syft/source"
-)
-
-func ToFormatModel(s sbom.SBOM) *cyclonedx.BOM {
-	cdxBOM := cyclonedx.NewBOM()
-	versionInfo := version.FromBuild()
-
-	// NOTE(jonasagx): cycloneDX requires URN uuids (URN returns the RFC 2141 URN form of uuid):
-	// https://github.com/CycloneDX/specification/blob/master/schema/bom-1.3-strict.schema.json#L36
-	// "pattern": "^urn:uuid:[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$"
-	cdxBOM.SerialNumber = uuid.New().URN()
-	cdxBOM.Metadata = toBomDescriptor(internal.ApplicationName, versionInfo.Version, s.Source)
-
-	packages := s.Artifacts.PackageCatalog.Sorted()
-	components := make([]cyclonedx.Component, len(packages))
-	for i, p := range packages {
-		components[i] = encodeComponent(p)
-	}
-	components = append(components, toOSComponent(s.Artifacts.LinuxDistribution)...)
-	cdxBOM.Components = &components
-
-	dependencies := toDependencies(s.Relationships)
-	if len(dependencies) > 0 {
-		cdxBOM.Dependencies = &dependencies
-	}
-
-	return cdxBOM
-}
-
-func toOSComponent(distro *linux.Release) []cyclonedx.Component {
-	if distro == nil {
-		return []cyclonedx.Component{}
-	}
-	eRefs := &[]cyclonedx.ExternalReference{}
-	if distro.BugReportURL != "" {
-		*eRefs = append(*eRefs, cyclonedx.ExternalReference{
-			URL:  distro.BugReportURL,
-			Type: cyclonedx.ERTypeIssueTracker,
-		})
-	}
-	if distro.HomeURL != "" {
-		*eRefs = append(*eRefs, cyclonedx.ExternalReference{
-			URL:  distro.HomeURL,
-			Type: cyclonedx.ERTypeWebsite,
-		})
-	}
-	if distro.SupportURL != "" {
-		*eRefs = append(*eRefs, cyclonedx.ExternalReference{
-			URL:     distro.SupportURL,
-			Type:    cyclonedx.ERTypeOther,
-			Comment: "support",
-		})
-	}
-	if distro.PrivacyPolicyURL != "" {
-		*eRefs = append(*eRefs, cyclonedx.ExternalReference{
-			URL:     distro.PrivacyPolicyURL,
-			Type:    cyclonedx.ERTypeOther,
-			Comment: "privacyPolicy",
-		})
-	}
-	if len(*eRefs) == 0 {
-		eRefs = nil
-	}
-	props := encodeProperties(distro, "syft:distro")
-	var properties *[]cyclonedx.Property
-	if len(props) > 0 {
-		properties = &props
-	}
-	return []cyclonedx.Component{
-		{
-			Type: cyclonedx.ComponentTypeOS,
-			// FIXME is it idiomatic to be using SWID here for specific name and version information?
-			SWID: &cyclonedx.SWID{
-				TagID:   distro.ID,
-				Name:    distro.ID,
-				Version: distro.VersionID,
-			},
-			Description: distro.PrettyName,
-			Name:        distro.ID,
-			Version:     distro.VersionID,
-			// TODO should we add a PURL?
-			CPE:                distro.CPEName,
-			ExternalReferences: eRefs,
-			Properties:         properties,
-		},
-	}
-}
-
-// NewBomDescriptor returns a new BomDescriptor tailored for the current time and "syft" tool details.
-func toBomDescriptor(name, version string, srcMetadata source.Metadata) *cyclonedx.Metadata {
-	return &cyclonedx.Metadata{
-		Timestamp: time.Now().Format(time.RFC3339),
-		Tools: &[]cyclonedx.Tool{
-			{
-				Vendor:  "anchore",
-				Name:    name,
-				Version: version,
-			},
-		},
-		Component: toBomDescriptorComponent(srcMetadata),
-	}
-}
-
-// used to indicate that a relationship listed under the syft artifact package can be represented as a cyclonedx dependency.
-// NOTE: CycloneDX provides the ability to describe components and their dependency on other components.
-// The dependency graph is capable of representing both direct and transitive relationships.
-// If a relationship is either direct or transitive it can be included in this function.
-// An example of a relationship to not include would be: OwnershipByFileOverlapRelationship.
-func isExpressiblePackageRelationship(ty artifact.RelationshipType) bool {
-	switch ty {
-	case artifact.RuntimeDependencyOfRelationship:
-		return true
-	case artifact.DevDependencyOfRelationship:
-		return true
-	case artifact.BuildDependencyOfRelationship:
-		return true
-	case artifact.DependencyOfRelationship:
-		return true
-	}
-	return false
-}
-
-func toDependencies(relationships []artifact.Relationship) []cyclonedx.Dependency {
-	result := make([]cyclonedx.Dependency, 0)
-	for _, r := range relationships {
-		exists := isExpressiblePackageRelationship(r.Type)
-		if !exists {
-			log.Warnf("unable to convert relationship from CycloneDX 1.3 JSON, dropping: %+v", r)
-			continue
-		}
-
-		innerDeps := []cyclonedx.Dependency{}
-		innerDeps = append(innerDeps, cyclonedx.Dependency{Ref: string(r.From.ID())})
-		result = append(result, cyclonedx.Dependency{
-			Ref:          string(r.To.ID()),
-			Dependencies: &innerDeps,
-		})
-	}
-	return result
-}
-
-func toBomDescriptorComponent(srcMetadata source.Metadata) *cyclonedx.Component {
-	switch srcMetadata.Scheme {
-	case source.ImageScheme:
-		bomRef, err := artifact.IDByHash(srcMetadata.ImageMetadata.ID)
-		if err != nil {
-			log.Warnf("unable to get fingerprint of image metadata=%s: %+v", srcMetadata.ImageMetadata.ID, err)
-		}
-		return &cyclonedx.Component{
-			BOMRef:  string(bomRef),
-			Type:    cyclonedx.ComponentTypeContainer,
-			Name:    srcMetadata.ImageMetadata.UserInput,
-			Version: srcMetadata.ImageMetadata.ManifestDigest,
-		}
-	case source.DirectoryScheme, source.FileScheme:
-		bomRef, err := artifact.IDByHash(srcMetadata.Path)
-		if err != nil {
-			log.Warnf("unable to get fingerprint of source metadata path=%s: %+v", srcMetadata.Path, err)
-		}
-		return &cyclonedx.Component{
-			BOMRef: string(bomRef),
-			Type:   cyclonedx.ComponentTypeFile,
-			Name:   srcMetadata.Path,
-		}
-	}
-
-	return nil
-}
@@ -1,21 +0,0 @@
-package cyclonedxhelpers
-
-import "github.com/anchore/syft/syft/pkg"
-
-func encodeGroup(p pkg.Package) string {
-	if hasMetadata(p) {
-		if metadata, ok := p.Metadata.(pkg.JavaMetadata); ok && metadata.PomProperties != nil {
-			return metadata.PomProperties.GroupID
-		}
-	}
-	return ""
-}
-
-func decodeGroup(group string, metadata interface{}) {
-	if meta, ok := metadata.(*pkg.JavaMetadata); ok {
-		if meta.PomProperties == nil {
-			meta.PomProperties = &pkg.PomProperties{}
-		}
-		meta.PomProperties.GroupID = group
-	}
-}
@@ -1,52 +0,0 @@
-package cyclonedxhelpers
-
-import (
-	"testing"
-
-	"github.com/anchore/syft/syft/pkg"
-	"github.com/stretchr/testify/assert"
-)
-
-func Test_encodeGroup(t *testing.T) {
-	tests := []struct {
-		name     string
-		input    pkg.Package
-		expected string
-	}{
-		{
-			name:     "no metadata",
-			input:    pkg.Package{},
-			expected: "",
-		},
-		{
-			name: "metadata is not Java",
-			input: pkg.Package{
-				Metadata: pkg.NpmPackageJSONMetadata{},
-			},
-			expected: "",
-		},
-		{
-			name: "metadata is Java but pom properties is empty",
-			input: pkg.Package{
-				Metadata: pkg.JavaMetadata{},
-			},
-			expected: "",
-		},
-		{
-			name: "metadata is Java and contains pomProperties",
-			input: pkg.Package{
-				Metadata: pkg.JavaMetadata{
-					PomProperties: &pkg.PomProperties{
-						GroupID: "test",
-					},
-				},
-			},
-			expected: "test",
-		},
-	}
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			assert.Equal(t, test.expected, encodeGroup(test.input))
-		})
-	}
-}
@@ -1,33 +0,0 @@
-package cyclonedxhelpers
-
-import (
-	"github.com/CycloneDX/cyclonedx-go"
-	"github.com/anchore/syft/internal/spdxlicense"
-	"github.com/anchore/syft/syft/pkg"
-)
-
-func encodeLicenses(p pkg.Package) *cyclonedx.Licenses {
-	lc := cyclonedx.Licenses{}
-	for _, licenseName := range p.Licenses {
-		if value, exists := spdxlicense.ID(licenseName); exists {
-			lc = append(lc, cyclonedx.LicenseChoice{
-				License: &cyclonedx.License{
-					ID: value,
-				},
-			})
-		}
-	}
-	if len(lc) > 0 {
-		return &lc
-	}
-	return nil
-}
-
-func decodeLicenses(c *cyclonedx.Component) (out []string) {
-	if c.Licenses != nil {
-		for _, l := range *c.Licenses {
-			out = append(out, l.License.ID)
-		}
-	}
-	return
-}
@@ -1,83 +0,0 @@
-package cyclonedxhelpers
-
-import (
-	"testing"
-
-	"github.com/CycloneDX/cyclonedx-go"
-	"github.com/anchore/syft/syft/pkg"
-	"github.com/stretchr/testify/assert"
-)
-
-func Test_encodeLicense(t *testing.T) {
-	tests := []struct {
-		name     string
-		input    pkg.Package
-		expected *cyclonedx.Licenses
-	}{
-		{
-			name:     "no licenses",
-			input:    pkg.Package{},
-			expected: nil,
-		},
-		{
-			name: "no SPDX licenses",
-			input: pkg.Package{
-				Licenses: []string{
-					"made-up",
-				},
-			},
-			expected: nil,
-		},
-		{
-			name: "with SPDX license",
-			input: pkg.Package{
-				Licenses: []string{
-					"MIT",
-				},
-			},
-			expected: &cyclonedx.Licenses{
-				{License: &cyclonedx.License{ID: "MIT"}},
-			},
-		},
-		{
-			name: "with SPDX license expression",
-			input: pkg.Package{
-				Licenses: []string{
-					"MIT",
-					"GPL-3.0",
-				},
-			},
-			expected: &cyclonedx.Licenses{
-				{License: &cyclonedx.License{ID: "MIT"}},
-				{License: &cyclonedx.License{ID: "GPL-3.0"}},
-			},
-		},
-		{
-			name: "cap insensitive",
-			input: pkg.Package{
-				Licenses: []string{
-					"gpl-3.0",
-				},
-			},
-			expected: &cyclonedx.Licenses{
-				{License: &cyclonedx.License{ID: "GPL-3.0"}},
-			},
-		},
-		{
-			name: "debian to spdx conversion",
-			input: pkg.Package{
-				Licenses: []string{
-					"GPL-2",
-				},
-			},
-			expected: &cyclonedx.Licenses{
-				{License: &cyclonedx.License{ID: "GPL-2.0"}},
-			},
-		},
-	}
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			assert.Equal(t, test.expected, encodeLicenses(test.input))
-		})
-	}
-}
@@ -1,21 +0,0 @@
-package cyclonedxhelpers
-
-import (
-	"github.com/CycloneDX/cyclonedx-go"
-
-	"github.com/anchore/syft/internal/formats/common"
-)
-
-var (
-	CycloneDXFields = common.RequiredTag("cyclonedx")
-)
-
-func encodeProperties(obj interface{}, prefix string) (out []cyclonedx.Property) {
-	for _, p := range common.Sorted(common.Encode(obj, prefix, CycloneDXFields)) {
-		out = append(out, cyclonedx.Property{
-			Name:  p.Name,
-			Value: p.Value,
-		})
-	}
-	return
-}
@@ -1,30 +0,0 @@
-package cyclonedxhelpers
-
-import (
-	"github.com/anchore/syft/syft/pkg"
-)
-
-func encodePublisher(p pkg.Package) string {
-	if hasMetadata(p) {
-		switch metadata := p.Metadata.(type) {
-		case pkg.ApkMetadata:
-			return metadata.Maintainer
-		case pkg.RpmdbMetadata:
-			return metadata.Vendor
-		case pkg.DpkgMetadata:
-			return metadata.Maintainer
-		}
-	}
-	return ""
-}
-
-func decodePublisher(publisher string, metadata interface{}) {
-	switch meta := metadata.(type) {
-	case *pkg.ApkMetadata:
-		meta.Maintainer = publisher
-	case *pkg.RpmdbMetadata:
-		meta.Vendor = publisher
-	case *pkg.DpkgMetadata:
-		meta.Maintainer = publisher
-	}
-}
@@ -1,65 +0,0 @@
-package cyclonedxhelpers
-
-import (
-	"testing"
-
-	"github.com/anchore/syft/syft/pkg"
-	"github.com/stretchr/testify/assert"
-)
-
-func Test_encodePublisher(t *testing.T) {
-	tests := []struct {
-		name     string
-		input    pkg.Package
-		expected string
-	}{
-		{
-			// note: since this is an optional field, no value is preferred over NONE or NOASSERTION
-			name:     "no metadata",
-			input:    pkg.Package{},
-			expected: "",
-		},
-		{
-			name: "from apk",
-			input: pkg.Package{
-				Metadata: pkg.ApkMetadata{
-					Maintainer: "auth",
-				},
-			},
-			expected: "auth",
-		},
-		{
-			name: "from rpm",
-			input: pkg.Package{
-				Metadata: pkg.RpmdbMetadata{
-					Vendor: "auth",
-				},
-			},
-			expected: "auth",
-		},
-		{
-			name: "from dpkg",
-			input: pkg.Package{
-				Metadata: pkg.DpkgMetadata{
-					Maintainer: "auth",
-				},
-			},
-			expected: "auth",
-		},
-		{
-			// note: since this is an optional field, no value is preferred over NONE or NOASSERTION
-			name: "empty",
-			input: pkg.Package{
-				Metadata: pkg.NpmPackageJSONMetadata{
-					Author: "",
-				},
-			},
-			expected: "",
-		},
-	}
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			assert.Equal(t, test.expected, encodePublisher(test.input))
-		})
-	}
-}
@@ -1,322 +0,0 @@
-package common
-
-import (
-	"fmt"
-	"reflect"
-	"sort"
-	"strconv"
-	"strings"
-
-	"github.com/anchore/syft/internal/log"
-)
-
-// FieldName return a flag to indicate this is a valid field and a name to use
-type FieldName func(field reflect.StructField) (string, bool)
-
-// OptionalTag given a tag name, will return the defined tag or fall back to lower camel case field name
-func OptionalTag(tag string) FieldName {
-	return func(f reflect.StructField) (string, bool) {
-		if n, ok := f.Tag.Lookup(tag); ok {
-			return n, true
-		}
-		return lowerFirst(f.Name), true
-	}
-}
-
-// TrimOmitempty trims `,omitempty` from the name
-func TrimOmitempty(fn FieldName) FieldName {
-	return func(f reflect.StructField) (string, bool) {
-		if v, ok := fn(f); ok {
-			return strings.TrimSuffix(v, ",omitempty"), true
-		}
-		return "", false
-	}
-}
-
-// RequiredTag based on the given tag, only use a field if present
-func RequiredTag(tag string) FieldName {
-	return func(f reflect.StructField) (string, bool) {
-		if n, ok := f.Tag.Lookup(tag); ok {
-			return n, true
-		}
-		return "", false
-	}
-}
-
-var (
-	// OptionalJSONTag uses field names defined in json tags, if available
-	OptionalJSONTag = TrimOmitempty(OptionalTag("json"))
-)
-
-// lowerFirst converts the first character of the string to lower case
-func lowerFirst(s string) string {
-	return strings.ToLower(s[0:1]) + s[1:]
-}
-
-// Encode recursively encodes the object's properties as an ordered set of NameValue pairs
-func Encode(obj interface{}, prefix string, fn FieldName) map[string]string {
-	if obj == nil {
-		return nil
-	}
-	props := map[string]string{}
-	encode(props, reflect.ValueOf(obj), prefix, fn)
-	return props
-}
-
-// NameValue a simple type to store stringified name/value pairs
-type NameValue struct {
-	Name  string
-	Value string
-}
-
-// Sorted returns a sorted set of NameValue pairs
-func Sorted(values map[string]string) (out []NameValue) {
-	var keys []string
-	for k := range values {
-		keys = append(keys, k)
-	}
-	sort.Strings(keys)
-	for _, k := range keys {
-		out = append(out, NameValue{
-			Name:  k,
-			Value: values[k],
-		})
-	}
-	return
-}
-
-func encode(out map[string]string, value reflect.Value, prefix string, fn FieldName) {
-	if !value.IsValid() || value.Type() == nil {
-		return
-	}
-
-	typ := value.Type()
-
-	switch typ.Kind() {
-	case reflect.Ptr:
-		if value.IsNil() {
-			return
-		}
-		value = value.Elem()
-		encode(out, value, prefix, fn)
-	case reflect.String:
-		v := value.String()
-		if v != "" {
-			out[prefix] = v
-		}
-	case reflect.Bool:
-		v := value.Bool()
-		out[prefix] = strconv.FormatBool(v)
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		v := value.Int()
-		out[prefix] = strconv.FormatInt(v, 10)
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
-		v := value.Uint()
-		out[prefix] = strconv.FormatUint(v, 10)
-	case reflect.Float32, reflect.Float64:
-		v := value.Float()
-		out[prefix] = fmt.Sprintf("%f", v)
-	case reflect.Array, reflect.Slice:
-		for idx := 0; idx < value.Len(); idx++ {
-			encode(out, value.Index(idx), fmt.Sprintf("%s:%d", prefix, idx), fn)
-		}
-	case reflect.Struct:
-		for i := 0; i < typ.NumField(); i++ {
-			pv := value.Field(i)
-			f := typ.Field(i)
-			name, ok := fieldName(f, prefix, fn)
-			if !ok {
-				continue
-			}
-			encode(out, pv, name, fn)
-		}
-	default:
-		log.Warnf("skipping encoding of unsupported property: %s", prefix)
-	}
-}
-
-// fieldName gets the name of the field using the provided FieldName function
-func fieldName(f reflect.StructField, prefix string, fn FieldName) (string, bool) {
-	name, ok := fn(f)
-	if !ok {
-		return "", false
-	}
-	if name == "" {
-		return prefix, true
-	}
-	if prefix != "" {
-		name = fmt.Sprintf("%s:%s", prefix, name)
-	}
-	return name, true
-}
-
-// Decode based on the given type, applies all values to hydrate a new instance
-func Decode(typ reflect.Type, values map[string]string, prefix string, fn FieldName) interface{} {
-	isPtr := false
-	for typ.Kind() == reflect.Ptr {
-		typ = typ.Elem()
-		isPtr = true
-	}
-
-	isSlice := false
-	if typ.Kind() == reflect.Slice {
-		typ = reflect.PtrTo(typ)
-		isSlice = true
-	}
-
-	v := reflect.New(typ)
-
-	decode(values, v, prefix, fn)
-
-	switch {
-	case isSlice && isPtr:
-		return v.Elem().Interface()
-	case isSlice:
-		return PtrToStruct(v.Elem().Interface())
-	case isPtr:
-		return v.Interface()
-	}
-	return v.Elem().Interface()
-}
-
-// DecodeInto decodes all values to hydrate the given object instance
-func DecodeInto(obj interface{}, values map[string]string, prefix string, fn FieldName) {
-	value := reflect.ValueOf(obj)
-
-	for value.Type().Kind() == reflect.Ptr {
-		value = value.Elem()
-	}
-
-	decode(values, value, prefix, fn)
-}
-
-// nolint: funlen, gocognit, gocyclo
-func decode(vals map[string]string, value reflect.Value, prefix string, fn FieldName) bool {
-	if !value.IsValid() || value.Type() == nil {
-		return false
-	}
-
-	typ := value.Type()
-
-	incoming, valid := vals[prefix]
-	switch typ.Kind() {
-	case reflect.Ptr:
-		t := typ.Elem()
-		v := value
-		if v.IsNil() {
-			v = reflect.New(t)
-		}
-		if decode(vals, v.Elem(), prefix, fn) && value.CanSet() {
-			o := v.Interface()
-			log.Infof("%v", o)
-			value.Set(v)
-		} else {
-			return false
-		}
-	case reflect.String:
-		if valid {
-			value.SetString(incoming)
-		} else {
-			return false
-		}
-	case reflect.Bool:
-		if !valid {
-			return false
-		}
-		if b, err := strconv.ParseBool(incoming); err == nil {
-			value.SetBool(b)
-		} else {
-			return false
-		}
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		if !valid {
-			return false
-		}
-		if i, err := strconv.ParseInt(incoming, 10, 64); err == nil {
-			value.SetInt(i)
-		} else {
-			return false
-		}
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
-		if !valid {
-			return false
-		}
-		if i, err := strconv.ParseUint(incoming, 10, 64); err == nil {
-			value.SetUint(i)
-		} else {
-			return false
-		}
-	case reflect.Float32, reflect.Float64:
-		if !valid {
-			return false
-		}
-		if i, err := strconv.ParseFloat(incoming, 64); err == nil {
-			value.SetFloat(i)
-		} else {
-			return false
-		}
-	case reflect.Array, reflect.Slice:
-		values := false
-		t := typ.Elem()
-		slice := reflect.MakeSlice(typ, 0, 0)
-		for idx := 0; ; idx++ {
-			// test for index
-			str := fmt.Sprintf("%s:%d", prefix, idx)
-			// create new placeholder and decode values
-			newType := t
-			if t.Kind() == reflect.Ptr {
-				newType = t.Elem()
-			}
-			v := reflect.New(newType)
-			if decode(vals, v.Elem(), str, fn) {
-				// append to slice
-				if t.Kind() != reflect.Ptr {
-					v = v.Elem()
-				}
-				slice = reflect.Append(slice, v)
-				values = true
-			} else {
-				break
-			}
-		}
-		if values {
-			value.Set(slice)
-		} else {
-			return false
-		}
-	case reflect.Struct:
-		values := false
-		for i := 0; i < typ.NumField(); i++ {
-			f := typ.Field(i)
-			v := value.Field(i)
-
-			name, ok := fieldName(f, prefix, fn)
-			if !ok {
-				continue
-			}
-
-			if decode(vals, v, name, fn) {
-				values = true
-			}
-		}
-		return values
-	default:
-		log.Warnf("unable to set field: %s", prefix)
-		return false
-	}
-	return true
-}
-
-func PtrToStruct(ptr interface{}) interface{} {
-	v := reflect.ValueOf(ptr)
-	if v.IsZero() {
-		return nil
-	}
-	switch v.Type().Kind() {
-	case reflect.Ptr:
-		return PtrToStruct(v.Elem().Interface())
-	case reflect.Interface:
-		return PtrToStruct(v.Elem().Interface())
-	}
-	return v.Interface()
-}
@@ -1,143 +0,0 @@
-package common
-
-import (
-	"reflect"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-type T1 struct {
-	Name     string
-	Val      int
-	ValU     uint
-	Flag     bool `json:"bool_flag"`
-	Float    float64
-	T2       T2
-	T2Ptr    *T2
-	T2Arr    []T2
-	T2PtrArr []*T2
-	StrArr   []string
-	IntArr   []int
-	FloatArr []float64
-	BoolArr  []bool
-	T3Arr    []T3
-}
-
-type T2 struct {
-	Name string
-}
-
-type T3 struct {
-	T4Arr []T4
-}
-
-type T4 struct {
-	Typ    string
-	IntPtr *int
-}
-
-func Test_EncodeDecodeCycle(t *testing.T) {
-	val := 99
-
-	tests := []struct {
-		name  string
-		value interface{}
-	}{
-		{
-			name: "all values",
-			value: T1{
-				Name:  "name",
-				Val:   10,
-				ValU:  16,
-				Flag:  true,
-				Float: 1.2,
-				T2: T2{
-					Name: "embedded t2",
-				},
-				T2Ptr: &T2{
-					"t2 ptr",
-				},
-				T2Arr: []T2{
-					{"t2 elem 0"},
-					{"t2 elem 1"},
-				},
-				T2PtrArr: []*T2{
-					{"t2 ptr v1"},
-					{"t2 ptr v2"},
-				},
-				StrArr:   []string{"s 1", "s 2", "s 3"},
-				IntArr:   []int{9, 12, -1},
-				FloatArr: []float64{-23.99, 15.234321, 39912342314},
-				BoolArr:  []bool{false, true, true, true, false},
-				T3Arr: []T3{
-					{
-						T4Arr: []T4{
-							{
-								Typ: "t4 nested typ 1",
-							},
-							{
-								Typ:    "t4 nested typ 2",
-								IntPtr: &val,
-							},
-						},
-					},
-				},
-			},
-		},
-		{
-			name: "nil values",
-			value: T1{
-				Name:     "t1 test",
-				Val:      0,
-				ValU:     0,
-				Flag:     false,
-				Float:    0,
-				T2:       T2{},
-				T2Ptr:    nil,
-				T2Arr:    nil,
-				T2PtrArr: nil,
-				StrArr:   nil,
-				IntArr:   nil,
-				FloatArr: nil,
-				BoolArr:  nil,
-				T3Arr:    nil,
-			},
-		},
-		{
-			name: "array values",
-			value: []T2{
-				{"t2 elem 0"},
-				{"t2 elem 1"},
-			},
-		},
-		{
-			name: "array ptr",
-			value: &[]T2{
-				{"t2 elem 0"},
-				{"t2 elem 1"},
-			},
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			vals := Encode(test.value, "props", OptionalJSONTag)
-
-			typ := reflect.TypeOf(test.value)
-
-			if typ.Kind() != reflect.Slice && typ.Kind() != reflect.Ptr {
-				assert.NotEmpty(t, vals["props:bool_flag"])
-
-				t2 := T1{}
-				DecodeInto(&t2, vals, "props", OptionalJSONTag)
-
-				assert.EqualValues(t, test.value, t2)
-			}
-
-			t3 := Decode(typ, vals, "props", OptionalJSONTag)
-
-			assert.EqualValues(t, test.value, t3)
-		})
-	}
-}
@@ -1,25 +1,26 @@
 package spdxhelpers

 import (
-	"fmt"
 	"path"
 	"strings"

 	"github.com/anchore/syft/syft/source"
+	"github.com/google/uuid"
 )

-func DocumentName(srcMetadata source.Metadata) (string, error) {
+func DocumentName(srcMetadata source.Metadata) string {
 	switch srcMetadata.Scheme {
 	case source.ImageScheme:
-		return cleanName(srcMetadata.ImageMetadata.UserInput), nil
-	case source.DirectoryScheme, source.FileScheme:
-		return cleanName(srcMetadata.Path), nil
+		return cleanSPDXName(srcMetadata.ImageMetadata.UserInput)
+	case source.DirectoryScheme:
+		return cleanSPDXName(srcMetadata.Path)
 	}

-	return "", fmt.Errorf("unable to determine document name from scheme=%q", srcMetadata.Scheme)
+	// TODO: is this alright?
+	return uuid.Must(uuid.NewRandom()).String()
 }

-func cleanName(name string) string {
+func cleanSPDXName(name string) string {
 	// remove # according to specification
 	name = strings.ReplaceAll(name, "#", "-")

@@ -1,73 +0,0 @@
-package spdxhelpers
-
-import (
-	"fmt"
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/anchore/syft/syft/source"
-	"github.com/scylladb/go-set/strset"
-	"github.com/stretchr/testify/assert"
-)
-
-func Test_DocumentName(t *testing.T) {
-	allSchemes := strset.New()
-	for _, s := range source.AllSchemes {
-		allSchemes.Add(string(s))
-	}
-	testedSchemes := strset.New()
-
-	tests := []struct {
-		name        string
-		inputName   string
-		srcMetadata source.Metadata
-		expected    string
-	}{
-		{
-			name:      "image",
-			inputName: "my-name",
-			srcMetadata: source.Metadata{
-				Scheme: source.ImageScheme,
-				ImageMetadata: source.ImageMetadata{
-					UserInput:      "image-repo/name:tag",
-					ID:             "id",
-					ManifestDigest: "digest",
-				},
-			},
-			expected: "image-repo/name-tag",
-		},
-		{
-			name:      "directory",
-			inputName: "my-name",
-			srcMetadata: source.Metadata{
-				Scheme: source.DirectoryScheme,
-				Path:   "some/path/to/place",
-			},
-			expected: "some/path/to/place",
-		},
-		{
-			name:      "file",
-			inputName: "my-name",
-			srcMetadata: source.Metadata{
-				Scheme: source.FileScheme,
-				Path:   "some/path/to/place",
-			},
-			expected: "some/path/to/place",
-		},
-	}
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			actual, err := DocumentName(test.srcMetadata)
-			require.NoError(t, err)
-			assert.True(t, strings.HasPrefix(actual, test.expected), fmt.Sprintf("actual name %q", actual))
-
-			// track each scheme tested (passed or not)
-			testedSchemes.Add(string(test.srcMetadata.Scheme))
-		})
-	}
-
-	// assert all possible schemes were under test
-	assert.ElementsMatch(t, allSchemes.List(), testedSchemes.List(), "not all source.Schemes are under test")
-}
@@ -2,21 +2,13 @@ package spdxhelpers

 import (
 	"fmt"
-	"net/url"
 	"path"

-	"github.com/anchore/syft/internal"
 	"github.com/anchore/syft/syft/source"
 	"github.com/google/uuid"
 )

-func DocumentNameAndNamespace(srcMetadata source.Metadata) (string, string, error) {
-	name, err := DocumentName(srcMetadata)
-	if err != nil {
-		return "", "", err
-	}
-	return name, DocumentNamespace(name, srcMetadata), nil
-}
+const SyftDocumentNamespace = "https://anchore.com/syft"

 func DocumentNamespace(name string, srcMetadata source.Metadata) string {
 	input := "unknown-source-type"
@@ -25,8 +17,6 @@ func DocumentNamespace(name string, srcMetadata source.Metadata) string {
 		input = "image"
 	case source.DirectoryScheme:
 		input = "dir"
-	case source.FileScheme:
-		input = "file"
 	}

 	uniqueID := uuid.Must(uuid.NewRandom())
@@ -35,11 +25,5 @@ func DocumentNamespace(name string, srcMetadata source.Metadata) string {
 		identifier = path.Join(input, fmt.Sprintf("%s-%s", name, uniqueID.String()))
 	}

-	u := url.URL{
-		Scheme: "https",
-		Host:   "anchore.com",
-		Path:   path.Join(internal.ApplicationName, identifier),
-	}
-
-	return u.String()
+	return path.Join(SyftDocumentNamespace, identifier)
 }
@@ -1,71 +0,0 @@
-package spdxhelpers
-
-import (
-	"fmt"
-	"strings"
-	"testing"
-
-	"github.com/anchore/syft/syft/source"
-	"github.com/scylladb/go-set/strset"
-	"github.com/stretchr/testify/assert"
-)
-
-func Test_documentNamespace(t *testing.T) {
-	allSchemes := strset.New()
-	for _, s := range source.AllSchemes {
-		allSchemes.Add(string(s))
-	}
-	testedSchemes := strset.New()
-
-	tests := []struct {
-		name        string
-		inputName   string
-		srcMetadata source.Metadata
-		expected    string
-	}{
-		{
-			name:      "image",
-			inputName: "my-name",
-			srcMetadata: source.Metadata{
-				Scheme: source.ImageScheme,
-				ImageMetadata: source.ImageMetadata{
-					UserInput:      "image-repo/name:tag",
-					ID:             "id",
-					ManifestDigest: "digest",
-				},
-			},
-			expected: "https://anchore.com/syft/image/my-name-",
-		},
-		{
-			name:      "directory",
-			inputName: "my-name",
-			srcMetadata: source.Metadata{
-				Scheme: source.DirectoryScheme,
-				Path:   "some/path/to/place",
-			},
-			expected: "https://anchore.com/syft/dir/my-name-",
-		},
-		{
-			name:      "file",
-			inputName: "my-name",
-			srcMetadata: source.Metadata{
-				Scheme: source.FileScheme,
-				Path:   "some/path/to/place",
-			},
-			expected: "https://anchore.com/syft/file/my-name-",
-		},
-	}
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			actual := DocumentNamespace(test.inputName, test.srcMetadata)
-			// note: since the namespace ends with a UUID we check the prefix
-			assert.True(t, strings.HasPrefix(actual, test.expected), fmt.Sprintf("actual namespace %q", actual))
-
-			// track each scheme tested (passed or not)
-			testedSchemes.Add(string(test.srcMetadata.Scheme))
-		})
-	}
-
-	// assert all possible schemes were under test
-	assert.ElementsMatch(t, allSchemes.List(), testedSchemes.List(), "not all source.Schemes are under test")
-}
@@ -2,9 +2,6 @@ package spdxhelpers

 import "github.com/anchore/syft/syft/pkg"

-const NONE = "NONE"
-const NOASSERTION = "NOASSERTION"
-
 func DownloadLocation(p pkg.Package) string {
 	// 3.7: Package Download Location
 	// Cardinality: mandatory, one
@@ -22,5 +19,5 @@ func DownloadLocation(p pkg.Package) string {
 			return NoneIfEmpty(metadata.URL)
 		}
 	}
-	return NOASSERTION
+	return "NOASSERTION"
 }
@@ -16,7 +16,7 @@ func Test_DownloadLocation(t *testing.T) {
 		{
 			name:     "no metadata",
 			input:    pkg.Package{},
-			expected: NOASSERTION,
+			expected: "NOASSERTION",
 		},
 		{
 			name: "from apk",
@@ -43,7 +43,7 @@ func Test_DownloadLocation(t *testing.T) {
 					URL: "",
 				},
 			},
-			expected: NONE,
+			expected: "NONE",
 		},
 	}
 	for _, test := range tests {
@@ -1,26 +1,51 @@
 package spdxhelpers

 import (
+	"github.com/anchore/syft/internal/formats/spdx22json/model"
+	"github.com/anchore/syft/internal/log"
 	"github.com/anchore/syft/syft/pkg"
 )

-func ExternalRefs(p pkg.Package) (externalRefs []ExternalRef) {
-	externalRefs = make([]ExternalRef, 0)
+func ExternalRefs(p pkg.Package) (externalRefs []model.ExternalRef) {
+	externalRefs = make([]model.ExternalRef, 0)

 	for _, c := range p.CPEs {
-		externalRefs = append(externalRefs, ExternalRef{
-			ReferenceCategory: SecurityReferenceCategory,
-			ReferenceLocator:  pkg.CPEString(c),
-			ReferenceType:     Cpe23ExternalRefType,
+		externalRefs = append(externalRefs, model.ExternalRef{
+			ReferenceCategory: model.SecurityReferenceCategory,
+			ReferenceLocator:  c.BindToFmtString(),
+			ReferenceType:     model.Cpe23ExternalRefType,
 		})
 	}

 	if p.PURL != "" {
-		externalRefs = append(externalRefs, ExternalRef{
-			ReferenceCategory: PackageManagerReferenceCategory,
+		externalRefs = append(externalRefs, model.ExternalRef{
+			ReferenceCategory: model.PackageManagerReferenceCategory,
 			ReferenceLocator:  p.PURL,
-			ReferenceType:     PurlExternalRefType,
+			ReferenceType:     model.PurlExternalRefType,
 		})
 	}
 	return externalRefs
 }
+
+func ExtractPURL(refs []model.ExternalRef) string {
+	for _, r := range refs {
+		if r.ReferenceType == model.PurlExternalRefType {
+			return r.ReferenceLocator
+		}
+	}
+	return ""
+}
+
+func ExtractCPEs(refs []model.ExternalRef) (cpes []pkg.CPE) {
+	for _, r := range refs {
+		if r.ReferenceType == model.Cpe23ExternalRefType {
+			cpe, err := pkg.NewCPE(r.ReferenceLocator)
+			if err != nil {
+				log.Warnf("unable to extract SPDX CPE=%q: %+v", r.ReferenceLocator, err)
+				continue
+			}
+			cpes = append(cpes, cpe)
+		}
+	}
+	return cpes
+}
@@ -3,6 +3,7 @@ package spdxhelpers
 import (
 	"testing"

+	"github.com/anchore/syft/internal/formats/spdx22json/model"
 	"github.com/anchore/syft/syft/pkg"
 	"github.com/stretchr/testify/assert"
 )
@@ -12,7 +13,7 @@ func Test_ExternalRefs(t *testing.T) {
 	tests := []struct {
 		name     string
 		input    pkg.Package
-		expected []ExternalRef
+		expected []model.ExternalRef
 	}{
 		{
 			name: "cpe + purl",
@@ -22,16 +23,16 @@ func Test_ExternalRefs(t *testing.T) {
 				},
 				PURL: "a-purl",
 			},
-			expected: []ExternalRef{
+			expected: []model.ExternalRef{
 				{
-					ReferenceCategory: SecurityReferenceCategory,
-					ReferenceLocator:  pkg.CPEString(testCPE),
-					ReferenceType:     Cpe23ExternalRefType,
+					ReferenceCategory: model.SecurityReferenceCategory,
+					ReferenceLocator:  testCPE.BindToFmtString(),
+					ReferenceType:     model.Cpe23ExternalRefType,
 				},
 				{
-					ReferenceCategory: PackageManagerReferenceCategory,
+					ReferenceCategory: model.PackageManagerReferenceCategory,
 					ReferenceLocator:  "a-purl",
-					ReferenceType:     PurlExternalRefType,
+					ReferenceType:     model.PurlExternalRefType,
 				},
 			},
 		},
@@ -1,17 +0,0 @@
-package spdxhelpers
-
-type FileType string
-
-const (
-	DocumentationFileType FileType = "DOCUMENTATION" // if the file serves as documentation
-	ImageFileType         FileType = "IMAGE"         // if the file is associated with a picture image file (MIME type of image/*, e.g., .jpg, .gif)
-	VideoFileType         FileType = "VIDEO"         // if the file is associated with a video file type (MIME type of video/*)
-	ArchiveFileType       FileType = "ARCHIVE"       // if the file represents an archive (.tar, .jar, etc.)
-	SpdxFileType          FileType = "SPDX"          // if the file is an SPDX document
-	ApplicationFileType   FileType = "APPLICATION"   // if the file is associated with a specific application type (MIME type of application/*)
-	SourceFileType        FileType = "SOURCE"        // if the file is human readable source code (.c, .html, etc.)
-	BinaryFileType        FileType = "BINARY"        // if the file is a compiled object, target image or binary executable (.o, .a, etc.)
-	TextFileType          FileType = "TEXT"          // if the file is human readable text file (MIME type of text/*)
-	AudioFileType         FileType = "AUDIO"         // if the file is associated with an audio file (MIME type of audio/* , e.g. .mp3)
-	OtherFileType         FileType = "OTHER"         // if the file doesn't fit into the above categories (generated artifacts, data files, etc.)
-)
@@ -0,0 +1,51 @@
+package spdxhelpers
+
+import (
+	"crypto/sha256"
+	"fmt"
+	"path/filepath"
+
+	"github.com/anchore/syft/internal/formats/spdx22json/model"
+	"github.com/anchore/syft/syft/pkg"
+)
+
+func Files(packageSpdxID string, p pkg.Package) (files []model.File, fileIDs []string, relationships []model.Relationship) {
+	files = make([]model.File, 0)
+	fileIDs = make([]string, 0)
+	relationships = make([]model.Relationship, 0)
+
+	if !hasMetadata(p) {
+		return files, fileIDs, relationships
+	}
+
+	pkgFileOwner, ok := p.Metadata.(pkg.FileOwner)
+	if !ok {
+		return files, fileIDs, relationships
+	}
+
+	for _, ownedFilePath := range pkgFileOwner.OwnedFiles() {
+		baseFileName := filepath.Base(ownedFilePath)
+		pathHash := sha256.Sum256([]byte(ownedFilePath))
+		fileSpdxID := model.ElementID(fmt.Sprintf("File-%s-%x", p.Name, pathHash)).String()
+
+		fileIDs = append(fileIDs, fileSpdxID)
+
+		files = append(files, model.File{
+			FileName: ownedFilePath,
+			Item: model.Item{
+				Element: model.Element{
+					SPDXID: fileSpdxID,
+					Name:   baseFileName,
+				},
+			},
+		})
+
+		relationships = append(relationships, model.Relationship{
+			SpdxElementID:      packageSpdxID,
+			RelationshipType:   model.ContainsRelationship,
+			RelatedSpdxElement: fileSpdxID,
+		})
+	}
+
+	return files, fileIDs, relationships
+}
@@ -18,7 +18,7 @@ func License(p pkg.Package) string {
 	//   (iii) the SPDX file creator has intentionally provided no information (no meaning should be implied by doing so).

 	if len(p.Licenses) == 0 {
-		return NONE
+		return "NONE"
 	}

 	// take all licenses and assume an AND expression; for information about license expressions see https://spdx.github.io/spdx-spec/appendix-IV-SPDX-license-expressions/
@@ -30,7 +30,7 @@ func License(p pkg.Package) string {
 	}

 	if len(parsedLicenses) == 0 {
-		return NOASSERTION
+		return "NOASSERTION"
 	}

 	return strings.Join(parsedLicenses, " AND ")
@@ -16,7 +16,7 @@ func Test_License(t *testing.T) {
 		{
 			name:     "no licenses",
 			input:    pkg.Package{},
-			expected: NONE,
+			expected: "NONE",
 		},
 		{
 			name: "no SPDX licenses",
@@ -25,7 +25,7 @@ func Test_License(t *testing.T) {
 					"made-up",
 				},
 			},
-			expected: NOASSERTION,
+			expected: "NOASSERTION",
 		},
 		{
 			name: "with SPDX license",
@@ -6,7 +6,7 @@ import (

 func NoneIfEmpty(value string) string {
 	if strings.TrimSpace(value) == "" {
-		return NONE
+		return "NONE"
 	}
 	return value
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Alex Goodman	ecf11f0e3d	[WIP] migrate helper functions for spdx Signed-off-by: Alex Goodman <alex.goodman@anchore.com>	2021-11-10 14:32:44 -05:00
Alex Goodman	628c2e44a5	add test reminders to put new relationships under test Signed-off-by: Alex Goodman <alex.goodman@anchore.com>	2021-11-10 13:34:41 -05:00
Alex Goodman	aba0de6e65	update ownership-by-file-overlap relationship description Signed-off-by: Alex Goodman <alex.goodman@anchore.com>	2021-11-10 11:15:18 -05:00
Alex Goodman	cb0278f3bc	hoist up package relationship discovery to analysis stage Signed-off-by: Alex Goodman <alex.goodman@anchore.com>	2021-11-10 11:05:01 -05:00
Alex Goodman	b519340b86	enable source.Location to be identifiable Signed-off-by: Alex Goodman <alex.goodman@anchore.com>	2021-11-10 09:05:33 -05:00
Alex Goodman	2356539ebe	use zero value for nils in ID generation Signed-off-by: Alex Goodman <alex.goodman@anchore.com>	2021-11-09 17:26:38 -05:00
Alex Goodman	1537e73083	rename Identity() to ID() Signed-off-by: Alex Goodman <alex.goodman@anchore.com>	2021-11-09 17:23:48 -05:00
Alex Goodman	52adfcbd44	stabilize package ID relative to encode-decode format cycles Signed-off-by: Alex Goodman <alex.goodman@anchore.com>	2021-11-09 16:53:16 -05:00
Alex Goodman	a3f0d659da	adjust spdx helpers to use copy of packages Signed-off-by: Alex Goodman <alex.goodman@anchore.com>	2021-11-09 10:53:55 -05:00
Alex Goodman	8a0fa5d3ad	remove catalog ID assignment Signed-off-by: Alex Goodman <alex.goodman@anchore.com>	2021-11-09 10:49:37 -05:00
Alex Goodman	253faf5652	fix linting Signed-off-by: Alex Goodman <alex.goodman@anchore.com>	2021-11-08 16:50:35 -05:00
Alex Goodman	69d2b1ba3c	add artifact.Identifiable by Identity() method Signed-off-by: Alex Goodman <alex.goodman@anchore.com>	2021-11-08 16:46:14 -05:00
Alex Goodman	b08a11e46d	fix more tests Signed-off-by: Alex Goodman <alex.goodman@anchore.com>	2021-11-08 16:46:12 -05:00
Alex Goodman	fef951c29b	return relationships from tasks Signed-off-by: Alex Goodman <alex.goodman@anchore.com>	2021-11-08 16:44:34 -05:00
Alex Goodman	a906b9a03a	migrate pkg.ID and pkg.Relationship to artifact package Signed-off-by: Alex Goodman <alex.goodman@anchore.com>	2021-11-08 16:43:20 -05:00