refactores to notes

.github/workflows/on-tag.yaml

@@ -95,7 +95,7 @@ jobs:
  GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
  run: |
  set -euo pipefail
- gh -R "$GITHUB_REPOSITORY" release download "$GITHUB_REF_NAME" -p "*.tar.gz"
+ gh -R "$GITHUB_REPOSITORY" release download "$GITHUB_REF_NAME" -p "vulctl*"
  gh -R "$GITHUB_REPOSITORY" release download "$GITHUB_REF_NAME" -p "multiple.intoto.jsonl"
  - name: Verify Assets
  env:

.version

@@ -1 +1 @@
-v0.0.10
+v0.0.11

cmd/vulctl/cli/import_test.go

@@ -16,8 +16,8 @@ func TestImport(t *testing.T) {
  assert.Error(t, err)
 
  set.String(sourceFlag.Name, "us-docker.pkg.dev/project/repo/img@sha256:f6efe...", "")
- set.String(fileFlag.Name, "../../../data/grype.json", "")
- set.String(formatFlag.Name, "grype", "")
+ set.String(fileFlag.Name, "../../../data/snyk.json", "")
+ set.String(formatFlag.Name, "snyk", "")
 
  c = cli.NewContext(newTestApp(t), set, nil)
  err = importCmd(c)

pkg/convert/convert.go

@@ -3,22 +3,19 @@ package convert
 import (
  "context"
 
- "github.com/mchmarny/vulctl/pkg/convert/grype"
  "github.com/mchmarny/vulctl/pkg/convert/snyk"
  "github.com/mchmarny/vulctl/pkg/src"
  "github.com/mchmarny/vulctl/pkg/types"
  "github.com/pkg/errors"
  aa "google.golang.org/api/containeranalysis/v1"
 )
 
-// VulnerabilityConverter is a function that converts a source to a list of occurrences.
-type VulnerabilityConverter func(ctx context.Context, s *src.Source) ([]*aa.Occurrence, error)
+// VulnerabilityConverter is a function that converts a source to a list of AA notes.
+type VulnerabilityConverter func(ctx context.Context, s *src.Source) ([]*aa.Note, error)
 
 // GetConverter returns a vulnerability converter for the given format.
 func GetConverter(format types.SourceFormat) (VulnerabilityConverter, error) {
  switch format {
- case types.SourceFormatGrypeJSON:
- return grype.Convert, nil
  case types.SourceFormatSnykJSON:
  return snyk.Convert, nil
  default: