fix: empty descriptor name and version (#1542)

Signed-off-by: Keith Zantow <kzantow@gmail.com>
anchore · Oct 6, 2023 · 8ebf295 · 8ebf295
1 parent 548da9e
commit 8ebf295
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/cmd/grype/cli/commands/root.go b/cmd/grype/cli/commands/root.go
@@ -182,6 +182,7 @@ func runGrype(app clio.Application, opts *options.Grype, userInput string) (errs
  }
 
  if err = writer.Write(models.PresenterConfig{
+ ID: app.ID(),
  Matches: *remainingMatches,
  IgnoredMatches: ignoredMatches,
  Packages: packages,

diff --git a/test/cli/cmd_test.go b/test/cli/cmd_test.go
@@ -1,8 +1,11 @@
 package cli
 
 import (
+ "encoding/json"
  "strings"
  "testing"
+
+ "github.com/stretchr/testify/require"
 )
 
 func TestCmd(t *testing.T) {
@@ -78,3 +81,20 @@ func TestCmd(t *testing.T) {
  })
  }
 }
+
+func Test_descriptorNameAndVersionSet(t *testing.T) {
+ _, output, _ := runGrype(t, nil, "-o", "json", getFixtureImage(t, "image-bare"))
+
+ parsed := map[string]any{}
+ err := json.Unmarshal([]byte(output), &parsed)
+ require.NoError(t, err)
+
+ desc, _ := parsed["descriptor"].(map[string]any)
+ require.NotNil(t, desc)
+
+ name := desc["name"]
+ require.Equal(t, "grype", name)
+
+ version := desc["version"]
+ require.NotEmpty(t, version)
+}