Merge pull request #2756 from thaJeztah/fix_overwrite_headers

silvin-lubecki · web-flow · commit b4097f7ef2e8 · 2020-09-30T15:13:12.000+02:00
Fix initializing client modifying custom HTTPHeaders
diff --git a/cli/command/cli.go b/cli/command/cli.go
@@ -308,9 +308,9 @@ func newAPIClientFromEndpoint(ep docker.Endpoint, configFile *configfile.ConfigF
 	if err != nil {
 		return nil, err
 	}
-	customHeaders := configFile.HTTPHeaders
-	if customHeaders == nil {
-		customHeaders = map[string]string{}
+	customHeaders := make(map[string]string, len(configFile.HTTPHeaders))
+	for k, v := range configFile.HTTPHeaders {
+		customHeaders[k] = v
 	}
 	customHeaders["User-Agent"] = UserAgent()
 	clientOpts = append(clientOpts, client.WithHTTPHeaders(customHeaders))
diff --git a/cli/command/cli_test.go b/cli/command/cli_test.go
@@ -45,6 +45,7 @@ func TestNewAPIClientFromFlags(t *testing.T) {
 	}
 	assert.Check(t, is.DeepEqual(expectedHeaders, apiclient.(*client.Client).CustomHTTPHeaders()))
 	assert.Check(t, is.Equal(api.DefaultVersion, apiclient.ClientVersion()))
+	assert.DeepEqual(t, configFile.HTTPHeaders, map[string]string{"My-Header": "Custom-Value"})
 }
 
 func TestNewAPIClientFromFlagsForDefaultSchema(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -308,9 +308,9 @@ func newAPIClientFromEndpoint(ep docker.Endpoint, configFile *configfile.ConfigF`
`308`	`308`	`if err != nil {`
`309`	`309`	`return nil, err`
`310`	`310`	`}`
`311`		`- customHeaders := configFile.HTTPHeaders`
`312`		`- if customHeaders == nil {`
`313`		`- customHeaders = map[string]string{}`
	`311`	`+ customHeaders := make(map[string]string, len(configFile.HTTPHeaders))`
	`312`	`+ for k, v := range configFile.HTTPHeaders {`
	`313`	`+ customHeaders[k] = v`
`314`	`314`	`}`
`315`	`315`	`customHeaders["User-Agent"] = UserAgent()`
`316`	`316`	`clientOpts = append(clientOpts, client.WithHTTPHeaders(customHeaders))`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ func TestNewAPIClientFromFlags(t *testing.T) {`
`45`	`45`	`}`
`46`	`46`	`assert.Check(t, is.DeepEqual(expectedHeaders, apiclient.(*client.Client).CustomHTTPHeaders()))`
`47`	`47`	`assert.Check(t, is.Equal(api.DefaultVersion, apiclient.ClientVersion()))`
	`48`	`+ assert.DeepEqual(t, configFile.HTTPHeaders, map[string]string{"My-Header": "Custom-Value"})`
`48`	`49`	`}`
`49`	`50`
`50`	`51`	`func TestNewAPIClientFromFlagsForDefaultSchema(t *testing.T) {`