Refactored function to generate user-agent

Author: cmaglie

cli/cli.go

@@ -261,7 +261,7 @@ func preRun(cmd *cobra.Command, args []string) {
 	// Configure network
 	//
 	netConf := downloader.Config{
-		RequestHeaders: globals.NewHTTPClientHeader(),
+		RequestHeaders: globals.NewHTTPClientHeader(""),
 	}
 	if viper.IsSet("network.proxy") {
 		proxy := viper.GetString("network.proxy")

cli/daemon/daemon.go

@@ -22,7 +22,6 @@ import (
 	"io/ioutil"
 	"net"
 	"os"
-	"runtime"
 	"syscall"
 
 	"github.com/arduino/arduino-cli/cli/errorcodes"
@@ -73,12 +72,7 @@ func runDaemonCommand(cmd *cobra.Command, args []string) {
 
 	// Set specific user-agent for the daemon
 	netConf := downloader.GetDefaultConfig()
-	netConf.RequestHeaders.Set("User-Agent",
-		fmt.Sprintf("%s/%s daemon (%s; %s; %s) Commit:%s",
-			globals.VersionInfo.Application,
-			globals.VersionInfo.VersionString,
-			runtime.GOARCH, runtime.GOOS,
-			runtime.Version(), globals.VersionInfo.Commit))
+	netConf.RequestHeaders = globals.NewHTTPClientHeader("daemon")
 	downloader.SetDefaultConfig(netConf)
 
 	// register the commands service

cli/globals/globals.go

@@ -33,8 +33,16 @@ var (
 )
 
 // NewHTTPClientHeader returns the http.Header object that must be used by the clients inside the downloaders
-func NewHTTPClientHeader() http.Header {
-	userAgentValue := fmt.Sprintf("%s/%s (%s; %s; %s) Commit:%s", VersionInfo.Application,
-		VersionInfo.VersionString, runtime.GOARCH, runtime.GOOS, runtime.Version(), VersionInfo.Commit)
+// and adds the subComponent if specified
+func NewHTTPClientHeader(subComponent string) http.Header {
+	if subComponent != "" {
+		subComponent = " " + subComponent
+	}
+	userAgentValue := fmt.Sprintf("%s/%s%s (%s; %s; %s) Commit:%s",
+		VersionInfo.Application,
+		VersionInfo.VersionString,
+		subComponent,
+		runtime.GOARCH, runtime.GOOS, runtime.Version(),
+		VersionInfo.Commit)
 	return http.Header{"User-Agent": []string{userAgentValue}}
 }

commands/board/list.go

@@ -51,7 +51,7 @@ func apiByVidPid(vid, pid string) ([]*rpc.BoardListItem, error) {
 	url := fmt.Sprintf("%s/%s/%s", vidPidURL, vid, pid)
 	retVal := []*rpc.BoardListItem{}
 	req, _ := http.NewRequest("GET", url, nil)
-	req.Header = globals.NewHTTPClientHeader()
+	req.Header = globals.NewHTTPClientHeader("")
 	req.Header.Set("Content-Type", "application/json")
 
 	if res, err := http.DefaultClient.Do(req); err == nil {