API: only set default content-type when not set

elasticsearch_internal_test.go

@@ -27,6 +27,7 @@ import (
 	"crypto/x509"
 	"encoding/base64"
 	"errors"
+	"github.com/elastic/go-elasticsearch/v8/esapi"
 	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
@@ -865,3 +866,96 @@ func TestNewTypedClient(t *testing.T) {
 		t.Fatalf("unexpected error: %s", err)
 	}
 }
+
+func TestContentTypeOverride(t *testing.T) {
+	t.Run("default JSON Content-Type", func(t *testing.T) {
+		contentType := "application/json"
+
+		tp, _ := elastictransport.New(elastictransport.Config{
+			URLs: []*url.URL{{Scheme: "http", Host: "foo"}},
+			Transport: &mockTransp{
+				RoundTripFunc: func(request *http.Request) (*http.Response, error) {
+					h := request.Header.Get("Content-Type")
+					if h != contentType {
+						t.Fatalf("unexpected content-type, wanted %s, got: %s", contentType, h)
+					}
+
+					return &http.Response{
+						Header:     http.Header{"X-Elastic-Product": []string{"Elasticsearch"}},
+						StatusCode: http.StatusOK,
+						Status:     "OK",
+						Body:       ioutil.NopCloser(strings.NewReader("")),
+					}, nil
+				},
+			},
+		})
+
+		c, _ := NewDefaultClient()
+		c.Transport = tp
+
+		_, _ = c.Search(c.Search.WithBody(strings.NewReader("")))
+	})
+	t.Run("overriden CBOR Content-Type functional options style", func(t *testing.T) {
+		contentType := "application/cbor"
+
+		tp, _ := elastictransport.New(elastictransport.Config{
+			URLs: []*url.URL{{Scheme: "http", Host: "foo"}},
+			Transport: &mockTransp{
+				RoundTripFunc: func(request *http.Request) (*http.Response, error) {
+					h := request.Header.Get("Content-Type")
+					if h != contentType {
+						t.Fatalf("unexpected content-type, wanted %s, got: %s", contentType, h)
+					}
+
+					return &http.Response{
+						Header:     http.Header{"X-Elastic-Product": []string{"Elasticsearch"}},
+						StatusCode: http.StatusOK,
+						Status:     "OK",
+						Body:       ioutil.NopCloser(strings.NewReader("")),
+					}, nil
+				},
+			},
+		})
+
+		c, _ := NewDefaultClient()
+		c.Transport = tp
+
+		_, _ = c.Search(
+			c.Search.WithHeader(map[string]string{
+				"Content-Type": contentType,
+			}),
+			c.Search.WithBody(strings.NewReader("")),
+		)
+	})
+	t.Run("overriden CBOR Content-Type direct call style", func(t *testing.T) {
+		contentType := "application/cbor"
+
+		tp, _ := elastictransport.New(elastictransport.Config{
+			URLs: []*url.URL{{Scheme: "http", Host: "foo"}},
+			Transport: &mockTransp{
+				RoundTripFunc: func(request *http.Request) (*http.Response, error) {
+					h := request.Header.Get("Content-Type")
+					if h != contentType {
+						t.Fatalf("unexpected content-type, wanted %s, got: %s", contentType, h)
+					}
+
+					return &http.Response{
+						Header:     http.Header{"X-Elastic-Product": []string{"Elasticsearch"}},
+						StatusCode: http.StatusOK,
+						Status:     "OK",
+						Body:       ioutil.NopCloser(strings.NewReader("")),
+					}, nil
+				},
+			},
+		})
+
+		c, _ := NewDefaultClient()
+		c.Transport = tp
+
+		search := esapi.SearchRequest{}
+		search.Body = strings.NewReader("")
+		search.Header = make(map[string][]string)
+		search.Header.Set("Content-Type", contentType)
+		search.Do(context.Background(), tp)
+	})
+}

internal/build/cmd/generate/commands/gensource/generator.go

@@ -30,15 +30,13 @@ import (
 )
 
 // Generator represents the "gensource" generator.
-//
 type Generator struct {
 	b bytes.Buffer
 
 	Endpoint *Endpoint
 }
 
 // Output returns the generator output.
-//
 func (g *Generator) Output() (io.Reader, error) {
 	g.genHeader()
 	g.genConstructor()
@@ -52,7 +50,6 @@ func (g *Generator) Output() (io.Reader, error) {
 }
 
 // OutputFormatted returns a formatted generator output.
-//
 func (g *Generator) OutputFormatted() (io.Reader, error) {
 	out, err := g.Output()
 	if err != nil {
@@ -825,12 +822,6 @@ func (r ` + g.Endpoint.MethodWithNamespace() + `Request) Do(ctx context.Context,
 		req.URL.RawQuery = q.Encode()
 	}` + "\n\n")
 
-	if g.Endpoint.Body != nil {
-		g.w(`if r.Body != nil {
-		req.Header[headerContentType] = headerContentTypeJSON
-	}` + "\n\n")
-	}
-
 	g.w(`if len(r.Header) > 0 {
 		if len(req.Header) == 0 {
 			req.Header = r.Header
@@ -843,6 +834,12 @@ func (r ` + g.Endpoint.MethodWithNamespace() + `Request) Do(ctx context.Context,
 		}
 	}` + "\n\n")
 
+	if g.Endpoint.Body != nil {
+		g.w(`if r.Body != nil && req.Header.Get(headerContentType) == "" {
+		req.Header[headerContentType] = headerContentTypeJSON
+	}` + "\n\n")
+	}
+
 	g.w(`if ctx != nil {
 		req = req.WithContext(ctx)
 	}` + "\n\n")