Changing the field name from extraHeaders to Headers

Author: alanprot

config/http_config.go

@@ -178,7 +178,7 @@ type HTTPClientConfig struct {
 	// marshalled configuration when set to false.
 	FollowRedirects bool `yaml:"follow_redirects" json:"follow_redirects"`
 	// Extra Headers to be added on the Http Request
-	ExtraHeaders map[string]string `yaml:"extra_headers,omitempty" json:"extra_headers,omitempty"`
+	Headers map[string]string `yaml:"headers,omitempty" json:"headers,omitempty"`
 }
 
 // SetDirectory joins any relative file paths with dir.
@@ -420,8 +420,8 @@ func NewRoundTripperFromConfig(cfg HTTPClientConfig, name string, optFuncs ...HT
 			rt = NewBasicAuthRoundTripper(cfg.BasicAuth.Username, cfg.BasicAuth.Password, cfg.BasicAuth.PasswordFile, rt)
 		}
 
-		if cfg.ExtraHeaders != nil && len(cfg.ExtraHeaders) > 0 {
-			rt = NewExtraHeadersRoundTripper(cfg.ExtraHeaders, rt)
+		if cfg.Headers != nil && len(cfg.Headers) > 0 {
+			rt = NewExtraHeadersRoundTripper(cfg.Headers, rt)
 		}
 
 		if cfg.OAuth2 != nil {

config/http_config_test.go

@@ -68,7 +68,7 @@ const (
 	ExpectedPassword                  = "42"
 )
 
-var expectedExtraHeaders = map[string]string{"Header1": "Value1", "Header2": "Value2"}
+var expectedHeaders = map[string]string{"Header1": "Value1", "Header2": "Value2"}
 
 var invalidHTTPClientConfigs = []struct {
 	httpClientConfigFile string
@@ -202,7 +202,7 @@ func TestNewClientFromConfig(t *testing.T) {
 		},
 		{
 			clientConfig: HTTPClientConfig{
-				ExtraHeaders: expectedExtraHeaders,
+				Headers: expectedHeaders,
 				TLSConfig: TLSConfig{
 					CAFile:             TLSCAChainPath,
 					CertFile:           ClientCertificatePath,
@@ -211,9 +211,9 @@ func TestNewClientFromConfig(t *testing.T) {
 					InsecureSkipVerify: false},
 			},
 			handler: func(w http.ResponseWriter, r *http.Request) {
-				for key, value := range expectedExtraHeaders {
+				for key, value := range expectedHeaders {
 					if r.Header.Get(key) != value {
-						fmt.Fprintf(w, "The received Headers (%s) does not contain all expected headers (%s).", r.Header, expectedExtraHeaders)
+						fmt.Fprintf(w, "The received Headers (%s) does not contain all expected headers (%s).", r.Header, expectedHeaders)
 						return
 					}
 				}