chore: update the custom headers to remove -x prefix

Remove the -x prefix as per RFC6648. While headers are case-insensitve,  making custom headers title case as per general
convention.

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

Author: owenrumney

pkg/notification/notice.go

@@ -80,16 +80,16 @@ func (v *VersionChecker) RunUpdateCheck(ctx context.Context, args []string) {
 
 		req, err := http.NewRequestWithContext(ctx, http.MethodGet, v.updatesApi, http.NoBody)
 		if err != nil {
-			logger.Warn("Failed to create a request for Trivy api" log.Err(err))
+			logger.Warn("Failed to create a request for Trivy api", log.Err(err))
 			return
 		}
 
 		// if the user hasn't disabled metrics, send the anonymous information as headers
 		if !v.disableMetrics {
-			req.Header.Set("-x-trivy-identifier", uniqueIdentifier())
-			req.Header.Set("-x-trivy-command", strings.Join(args, " "))
-			req.Header.Set("-x-trivy-os", runtime.GOOS)
-			req.Header.Set("-x-trivy-arch", runtime.GOARCH)
+			req.Header.Set("Trivy-Identifier", uniqueIdentifier())
+			req.Header.Set("Trivy-Command", strings.Join(args, " "))
+			req.Header.Set("Trivy-OS", runtime.GOOS)
+			req.Header.Set("Trivy-Arch", runtime.GOARCH)
 		}
 
 		req.Header.Set("User-Agent", fmt.Sprintf("trivy/%s", v.currentVersion))
@@ -101,7 +101,7 @@ func (v *VersionChecker) RunUpdateCheck(ctx context.Context, args []string) {
 
 		defer resp.Body.Close()
 		if err := json.NewDecoder(resp.Body).Decode(&v.latestVersion); err != nil {
-			logger.Debug(fmt.Sprintf("Failed to decode the Trivy response: %v", err))
+			logger.Debug("Failed to decode the Trivy response", log.Err(err))
 			return
 		}
 

pkg/notification/notice_test.go

@@ -97,7 +97,7 @@ func TestPrintNotices(t *testing.T) {
 
 			// check metrics are sent
 			require.NotNil(t, updates.lastRequest)
-			require.NotEmpty(t, updates.lastRequest.Header.Get("-x-trivy-identifier"))
+			require.NotEmpty(t, updates.lastRequest.Header.Get("Trivy-Identifier"))
 		})
 	}
 }
@@ -160,11 +160,11 @@ func TestCheckForNotices(t *testing.T) {
 			if tt.expectNoMetrics {
 				assert.True(t, v.disableMetrics)
 				require.NotNil(t, updates.lastRequest)
-				assert.Empty(t, updates.lastRequest.Header.Get("-x-trivy-identifier"))
+				assert.Empty(t, updates.lastRequest.Header.Get("Trivy-Identifier"))
 			} else {
 				assert.False(t, v.disableMetrics)
 				require.NotNil(t, updates.lastRequest)
-				assert.NotEmpty(t, updates.lastRequest.Header.Get("-x-trivy-identifier"))
+				assert.NotEmpty(t, updates.lastRequest.Header.Get("Trivy-Identifier"))
 			}
 
 		})