Release 7.0.7

Author: olivere

.edit.swp

@@ -26,7 +26,7 @@ import (
 
 const (
 	// Version is the current version of Elastic.
-	Version = "7.0.6"
+	Version = "7.0.7"
 
 	// DefaultURL is the default endpoint of Elasticsearch on the local machine.
 	// It is used e.g. when initializing a new Client without a specific URL.
@@ -97,6 +97,9 @@ var (
 
 	// noRetries is a retrier that does not retry.
 	noRetries = NewStopRetrier()
+
+	// noDeprecationLog is a no-op for logging deprecations.
+	noDeprecationLog = func(*http.Request, *http.Response) {}
 )
 
 // Doer is an interface to perform HTTP requests.
@@ -117,12 +120,13 @@ type Client struct {
 	conns   []*conn      // all connections
 	cindex  int          // index into conns
 
-	mu                        sync.RWMutex    // guards the next block
-	urls                      []string        // set of URLs passed initially to the client
-	running                   bool            // true if the client's background processes are running
-	errorlog                  Logger          // error log for critical messages
-	infolog                   Logger          // information log for e.g. response times
-	tracelog                  Logger          // trace log for debugging
+	mu                        sync.RWMutex // guards the next block
+	urls                      []string     // set of URLs passed initially to the client
+	running                   bool         // true if the client's background processes are running
+	errorlog                  Logger       // error log for critical messages
+	infolog                   Logger       // information log for e.g. response times
+	tracelog                  Logger       // trace log for debugging
+	deprecationlog            func(*http.Request, *http.Response)
 	scheme                    string          // http or https
 	healthcheckEnabled        bool            // healthchecks enabled or disabled
 	healthcheckTimeoutStartup time.Duration   // time the healthcheck waits for a response from Elasticsearch on startup
@@ -245,6 +249,7 @@ func NewSimpleClient(options ...ClientOptionFunc) (*Client, error) {
 		sendGetBodyAs:             DefaultSendGetBodyAs,
 		gzipEnabled:               DefaultGzipEnabled,
 		retrier:                   noRetries, // no retries by default
+		deprecationlog:            noDeprecationLog,
 	}
 
 	// Run the options on it
@@ -330,6 +335,7 @@ func DialContext(ctx context.Context, options ...ClientOptionFunc) (*Client, err
 		sendGetBodyAs:             DefaultSendGetBodyAs,
 		gzipEnabled:               DefaultGzipEnabled,
 		retrier:                   noRetries, // no retries by default
+		deprecationlog:            noDeprecationLog,
 	}
 
 	// Run the options on it
@@ -1386,7 +1392,7 @@ func (c *Client) PerformRequest(ctx context.Context, opt PerformRequestOptions)
 
 		// Log deprecation warnings as errors
 		if len(res.Header["Warning"]) > 0 {
-			logDeprecation((*http.Request)(req), res)
+			c.deprecationlog((*http.Request)(req), res)
 			for _, warning := range res.Header["Warning"] {
 				c.errorf("Deprecation warning: %s", warning)
 			}
@@ -1483,9 +1489,9 @@ func (c *Client) Reindex() *ReindexService {
 
 // TermVectors returns information and statistics on terms in the fields
 // of a particular document.
-func (c *Client) TermVectors(index, typ string) *TermvectorsService {
+func (c *Client) TermVectors(index string) *TermvectorsService {
 	builder := NewTermvectorsService(c)
-	builder = builder.Index(index).Type(typ)
+	builder = builder.Index(index)
 	return builder
 }
 

.golangci.yml

@@ -319,7 +319,7 @@ func setupTestClient(t logger, options ...ClientOptionFunc) (client *Client) {
 
 	// Log deprecations during tests
 	if loglevel := *logDeprecations; loglevel != "off" {
-		logDeprecation = func(req *http.Request, res *http.Response) {
+		client.deprecationlog = func(req *http.Request, res *http.Response) {
 			for _, warning := range res.Header["Warning"] {
 				if !*logTypesRemoval && strings.Contains(warning, "[types removal]") {
 					continue

client.go

@@ -325,9 +325,6 @@ func (s *TermvectorsService) Validate() error {
 	if s.index == "" {
 		invalid = append(invalid, "Index")
 	}
-	if s.typ == "" {
-		invalid = append(invalid, "Type")
-	}
 	if len(invalid) > 0 {
 		return fmt.Errorf("missing required fields: %v", invalid)
 	}

setup_test.go

@@ -46,7 +46,7 @@ func TestTermVectorsBuildURL(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		builder := client.TermVectors(test.Index, test.Type)
+		builder := client.TermVectors(test.Index).Type(test.Type)
 		if test.Id != "" {
 			builder = builder.Id(test.Id)
 		}
@@ -81,7 +81,7 @@ func TestTermVectorsWithId(t *testing.T) {
 
 	// TermVectors by specifying ID
 	field := "Message"
-	result, err := client.TermVectors(testIndexName, "_doc").
+	result, err := client.TermVectors(testIndexName).
 		Id("1").
 		Fields(field).
 		FieldStatistics(true).
@@ -115,7 +115,7 @@ func TestTermVectorsWithDoc(t *testing.T) {
 		"fullname": "keyword",
 	}
 
-	result, err := client.TermVectors(testIndexName, "_doc").
+	result, err := client.TermVectors(testIndexName).
 		Doc(doc).
 		PerFieldAnalyzer(perFieldAnalyzer).
 		FieldStatistics(true).
@@ -149,7 +149,7 @@ func TestTermVectorsWithFilter(t *testing.T) {
 		"fullname": "keyword",
 	}
 
-	result, err := client.TermVectors(testIndexName, "_doc").
+	result, err := client.TermVectors(testIndexName).
 		Doc(doc).
 		PerFieldAnalyzer(perFieldAnalyzer).
 		FieldStatistics(true).