Skip to content

Commit 63da3d8

Browse files
cmaglieRoberto Sora
authored and
Roberto Sora
committed
Removed globals.HTTPClientHeader global (#438)
To increase thread-safery and allow adding extra headers if needed.
1 parent 39530c0 commit 63da3d8

File tree

9 files changed

+12
-14
lines changed

9 files changed

+12
-14
lines changed

Diff for: cli/core/download.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ func runDownloadCommand(cmd *cobra.Command, args []string) {
6464
Version: platformRef.Version,
6565
}
6666
_, err := core.PlatformDownload(context.Background(), platformDownloadreq, output.ProgressBar(),
67-
globals.HTTPClientHeader)
67+
globals.NewHTTPClientHeader())
6868
if err != nil {
6969
feedback.Errorf("Error downloading %s: %v", args[i], err)
7070
os.Exit(errorcodes.ErrNetwork)

Diff for: cli/core/install.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func runInstallCommand(cmd *cobra.Command, args []string) {
6565
Version: platformRef.Version,
6666
}
6767
_, err := core.PlatformInstall(context.Background(), plattformInstallReq, output.ProgressBar(),
68-
output.TaskProgress(), globals.HTTPClientHeader)
68+
output.TaskProgress(), globals.NewHTTPClientHeader())
6969
if err != nil {
7070
feedback.Errorf("Error during install: %v", err)
7171
os.Exit(errorcodes.ErrGeneric)

Diff for: cli/core/upgrade.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ func runUpgradeCommand(cmd *cobra.Command, args []string) {
9090
Architecture: platformRef.Architecture,
9191
}
9292

93-
_, err := core.PlatformUpgrade(context.Background(), r, output.ProgressBar(), output.TaskProgress(), globals.HTTPClientHeader)
93+
_, err := core.PlatformUpgrade(context.Background(), r, output.ProgressBar(), output.TaskProgress(), globals.NewHTTPClientHeader())
9494
if err == core.ErrAlreadyLatest {
9595
feedback.Printf("Platform %s is already at the latest version", platformRef)
9696
} else if err != nil {

Diff for: cli/globals/globals.go

+3-5
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ var (
3131
Debug bool
3232
// OutputFormat can be "text" or "json"
3333
OutputFormat string
34-
// HTTPClientHeader is the object that will be propagated to configure the clients inside the downloaders
35-
HTTPClientHeader = getHTTPClientHeader()
3634
// VersionInfo contains all info injected during build
3735
VersionInfo = version.NewInfo(filepath.Base(os.Args[0]))
3836
// Config FIXMEDOC
@@ -46,9 +44,9 @@ var (
4644
LogLevel string
4745
)
4846

49-
func getHTTPClientHeader() http.Header {
47+
// NewHTTPClientHeader returns the http.Header object that must be used by the clients inside the downloaders
48+
func NewHTTPClientHeader() http.Header {
5049
userAgentValue := fmt.Sprintf("%s/%s (%s; %s; %s) Commit:%s", VersionInfo.Application,
5150
VersionInfo.VersionString, runtime.GOARCH, runtime.GOOS, runtime.Version(), VersionInfo.Commit)
52-
downloaderHeaders := http.Header{"User-Agent": []string{userAgentValue}}
53-
return downloaderHeaders
51+
return http.Header{"User-Agent": []string{userAgentValue}}
5452
}

Diff for: cli/instance/instance.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func initInstance() *rpc.InitResp {
3636
logrus.Info("Initializing package manager")
3737
req := packageManagerInitReq()
3838

39-
resp, err := commands.Init(context.Background(), req, output.ProgressBar(), output.TaskProgress(), globals.HTTPClientHeader)
39+
resp, err := commands.Init(context.Background(), req, output.ProgressBar(), output.TaskProgress(), globals.NewHTTPClientHeader())
4040
if err != nil {
4141
feedback.Errorf("Error initializing package manager: %v", err)
4242
os.Exit(errorcodes.ErrGeneric)

Diff for: cli/lib/download.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ func runDownloadCommand(cmd *cobra.Command, args []string) {
6060
Version: library.Version,
6161
}
6262
_, err := lib.LibraryDownload(context.Background(), libraryDownloadReq, output.ProgressBar(),
63-
globals.HTTPClientHeader)
63+
globals.NewHTTPClientHeader())
6464
if err != nil {
6565
feedback.Errorf("Error downloading %s: %v", library, err)
6666
os.Exit(errorcodes.ErrNetwork)

Diff for: cli/lib/install.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ func runInstallCommand(cmd *cobra.Command, args []string) {
6060
Version: library.Version,
6161
}
6262
err := lib.LibraryInstall(context.Background(), libraryInstallReq, output.ProgressBar(),
63-
output.TaskProgress(), globals.HTTPClientHeader)
63+
output.TaskProgress(), globals.NewHTTPClientHeader())
6464
if err != nil {
6565
feedback.Errorf("Error installing %s: %v", library, err)
6666
os.Exit(errorcodes.ErrGeneric)

Diff for: cli/lib/upgrade.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@ func runUpgradeCommand(cmd *cobra.Command, args []string) {
5050
instance := instance.CreateInstaceIgnorePlatformIndexErrors()
5151

5252
if len(args) == 0 {
53-
err := lib.LibraryUpgradeAll(instance.Id, output.ProgressBar(), output.TaskProgress(), globals.HTTPClientHeader)
53+
err := lib.LibraryUpgradeAll(instance.Id, output.ProgressBar(), output.TaskProgress(), globals.NewHTTPClientHeader())
5454
if err != nil {
5555
feedback.Errorf("Error upgrading libraries: %v", err)
5656
os.Exit(errorcodes.ErrGeneric)
5757
}
5858
} else {
59-
err := lib.LibraryUpgrade(instance.Id, args, output.ProgressBar(), output.TaskProgress(), globals.HTTPClientHeader)
59+
err := lib.LibraryUpgrade(instance.Id, args, output.ProgressBar(), output.TaskProgress(), globals.NewHTTPClientHeader())
6060
if err != nil {
6161
feedback.Errorf("Error upgrading libraries: %v", err)
6262
os.Exit(errorcodes.ErrGeneric)

Diff for: commands/board/list.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ var (
4040
func apiByVidPid(url string) ([]*rpc.BoardListItem, error) {
4141
retVal := []*rpc.BoardListItem{}
4242
req, _ := http.NewRequest("GET", url, nil)
43-
req.Header = globals.HTTPClientHeader
43+
req.Header = globals.NewHTTPClientHeader()
4444
req.Header.Set("Content-Type", "application/json")
4545

4646
if res, err := http.DefaultClient.Do(req); err == nil {

0 commit comments

Comments
 (0)