Skip to content

Commit

Permalink
fill out new version notice
Browse files Browse the repository at this point in the history
Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>
  • Loading branch information
wagoodman committed Aug 18, 2023
1 parent 487d038 commit b5e6b2f
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,7 @@ report 1!!>

<notification 2>
<notification 3>


<my app can be updated!!
...to this version>


A newer version of grype is available for download: v0.33.0 (installed version is [not provided])

---

Expand All @@ -43,4 +38,4 @@ report 1!!>

[Test_postUIEventWriter_write/quiet_only_shows_report/stderr - 1]

---
---
9 changes: 8 additions & 1 deletion cmd/grype/internal/ui/post_ui_event_writer.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"github.com/anchore/grype/grype/event"
"github.com/anchore/grype/grype/event/parsers"
"github.com/anchore/grype/internal/log"
"github.com/anchore/grype/internal/version"
)

type postUIEventWriter struct {
Expand Down Expand Up @@ -118,12 +119,18 @@ func writeAppUpdate(writer io.Writer, events ...partybus.Event) error {
style := lipgloss.NewStyle().Foreground(lipgloss.Color("13")).Italic(true)

for _, e := range events {
notice, err := parsers.ParseCLIAppUpdateAvailable(e)
newVersion, err := parsers.ParseCLIAppUpdateAvailable(e)
if err != nil {
log.WithFields("error", err).Warn("failed to parse app update notification")
continue
}

if newVersion == "" {
continue
}

notice := fmt.Sprintf("A newer version of grype is available for download: %s (installed version is %s)", newVersion, version.FromBuild().Version)

if _, err := fmt.Fprintln(writer, style.Render(notice)); err != nil {
// don't let this be fatal
log.WithFields("error", err).Warn("failed to write app update notification")
Expand Down
2 changes: 1 addition & 1 deletion cmd/grype/internal/ui/post_ui_event_writer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func Test_postUIEventWriter_write(t *testing.T) {
},
{
Type: event.CLIAppUpdateAvailable,
Value: "\n\n<my app can be updated!!\n...to this version>\n\n",
Value: "v0.33.0",
},
{
Type: event.CLINotification,
Expand Down

0 comments on commit b5e6b2f

Please sign in to comment.