chore: update the endpoint url

- add support for different formats of date time from the service

Signed-off-by: Owen Rumney <owen.rumney@aquasec.com>

Author: owenrumney

pkg/notification/notice.go

@@ -14,9 +14,16 @@ import (
 	"github.com/aquasecurity/trivy/pkg/version/app"
 )
 
+// flexibleTime is a custom time type that can handle
+// different date formats in JSON. It implements the
+// UnmarshalJSON method to parse the date string into a time.Time object.
+type flexibleTime struct {
+	time.Time
+}
+
 type versionInfo struct {
-	LatestVersion string    `json:"latest_version"`
-	LatestDate    time.Time `json:"latest_date"`
+	LatestVersion string       `json:"latest_version"`
+	LatestDate    flexibleTime `json:"latest_date"`
 }
 
 type announcement struct {
@@ -48,7 +55,7 @@ type VersionChecker struct {
 // to the NewVersionChecker function.
 func NewVersionChecker(opts ...Option) *VersionChecker {
 	v := &VersionChecker{
-		updatesApi:     "https://check.trivy.cloud/updates",
+		updatesApi:     "https://check.trivy.dev/updates",
 		currentVersion: app.Version(),
 	}
 
@@ -73,6 +80,7 @@ func (v *VersionChecker) RunUpdateCheck(ctx context.Context, args []string) {
 	}
 
 	go func() {
+		logger.Debug("Running version check")
 		args = getFlags(args)
 		client := &http.Client{
 			Timeout: 3 * time.Second,
@@ -109,6 +117,7 @@ func (v *VersionChecker) RunUpdateCheck(ctx context.Context, args []string) {
 		if !v.skipUpdateCheck && !v.quiet {
 			v.responseReceived = true
 		}
+		logger.Debug("Version check completed", log.String("latest_version", v.latestVersion.Trivy.LatestVersion))
 		v.done = true
 	}()
 }
@@ -120,6 +129,8 @@ func (v *VersionChecker) PrintNotices(output io.Writer) {
 		return
 	}
 
+	logger := log.WithPrefix("notification")
+	logger.Debug("Printing notices")
 	var notices []string
 
 	notices = append(notices, v.Warnings()...)
@@ -175,3 +186,29 @@ func getFlags(args []string) []string {
 	}
 	return flags
 }
+
+func (fd *flexibleTime) UnmarshalJSON(b []byte) error {
+	s := strings.Trim(string(b), `"`)
+	if s == "" {
+		return nil
+	}
+
+	// Try parsing with time component
+	layouts := []string{
+		time.RFC3339,
+		"2006-01-02",
+		time.RFC1123,
+	}
+
+	var err error
+	for _, layout := range layouts {
+		var t time.Time
+		t, err = time.Parse(layout, s)
+		if err == nil {
+			fd.Time = t
+			return nil
+		}
+	}
+
+	return fmt.Errorf("unable to parse date: %s", s)
+}

pkg/notification/notice_test.go

@@ -196,7 +196,7 @@ func (u *updatesServer) handler(w http.ResponseWriter, r *http.Request) {
 	response := updateResponse{
 		Trivy: versionInfo{
 			LatestVersion: u.expectedVersion,
-			LatestDate:    time.Now(),
+			LatestDate:    flexibleTime{Time: time.Now()},
 		},
 		Announcements: u.expectedAnnouncements,
 	}
@@ -207,3 +207,36 @@ func (u *updatesServer) handler(w http.ResponseWriter, r *http.Request) {
 	}
 	w.Write(out)
 }
+
+func TestFlexibleDate(t *testing.T) {
+	tests := []struct {
+		name     string
+		dateStr  string
+		expected time.Time
+	}{
+		{
+			name:     "RFC3339 date format",
+			dateStr:  `"2023-10-01T12:00:00Z"`,
+			expected: time.Date(2023, 10, 1, 12, 0, 0, 0, time.UTC),
+		},
+		{
+			name:     "RFC1123 date format",
+			dateStr:  `"Sun, 01 Oct 2023 12:00:00 GMT"`,
+			expected: time.Date(2023, 10, 1, 12, 0, 0, 0, time.UTC),
+		},
+		{
+			name:     "RFC3339 date only format",
+			dateStr:  `"2023-10-01"`,
+			expected: time.Date(2023, 10, 1, 0, 0, 0, 0, time.UTC),
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			var ft flexibleTime
+			err := json.Unmarshal([]byte(tt.dateStr), &ft)
+			require.NoError(t, err)
+			assert.Equal(t, tt.expected.Unix(), ft.Unix())
+		})
+	}
+}