set downloader user-agent tp equal cli httpclient

Author: hdiniz

cli/globals/globals.go

@@ -16,11 +16,8 @@
 package globals
 
 import (
-	"fmt"
-	"net/http"
 	"os"
 	"path/filepath"
-	"runtime"
 
 	"github.com/arduino/arduino-cli/version"
 )
@@ -31,18 +28,3 @@ var (
 	// DefaultIndexURL is the default index url
 	DefaultIndexURL = "https://downloads.arduino.cc/packages/package_index.json"
 )
-
-// NewHTTPClientHeader returns the http.Header object that must be used by the clients inside the downloaders
-// 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/download.go

@@ -16,10 +16,11 @@
 package commands
 
 import (
+	"net/http"
 	"net/url"
 	"time"
 
-	"github.com/arduino/arduino-cli/cli/globals"
+	"github.com/arduino/arduino-cli/httpclient"
 	rpc "github.com/arduino/arduino-cli/rpc/commands"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
@@ -31,7 +32,9 @@ import (
 // current settings.
 func GetDownloaderConfig() (*downloader.Config, error) {
 	res := &downloader.Config{
-		RequestHeaders: globals.NewHTTPClientHeader(viper.GetString("network.user_agent_ext")),
+		RequestHeaders: http.Header{
+			"User-Agent": []string{httpclient.UserAgent()},
+		},
 	}
 	if viper.IsSet("network.proxy") {
 		proxy := viper.GetString("network.proxy")