Cleanup code

This commit cleans up a few warnings by staticcheck. It also adds a
`types-removal=true|false` (default is `false`) that, when disabled,
ignores deprecation warnings due to types removal in 7.x.

Author: olivere

bulk.go

@@ -132,9 +132,7 @@ func (s *BulkService) Pretty(pretty bool) *BulkService {
 // Add adds bulkable requests, i.e. BulkIndexRequest, BulkUpdateRequest,
 // and/or BulkDeleteRequest.
 func (s *BulkService) Add(requests ...BulkableRequest) *BulkService {
-	for _, r := range requests {
-		s.requests = append(s.requests, r)
-	}
+	s.requests = append(s.requests, requests...)
 	return s
 }
 

client.go

@@ -995,7 +995,7 @@ func (c *Client) extractHostname(scheme, address string) string {
 	if idx := strings.Index(s, "/"); idx >= 0 {
 		s = s[idx+1:]
 	}
-	if strings.Index(s, ":") < 0 {
+	if !strings.Contains(s, ":") {
 		return ""
 	}
 	return fmt.Sprintf("%s://%s", scheme, s)
@@ -1160,11 +1160,9 @@ func (c *Client) startupHealthcheck(parentCtx context.Context, timeout time.Dura
 		case <-parentCtx.Done():
 			lastErr = parentCtx.Err()
 			done = true
-			break
 		case <-time.After(1 * time.Second):
 			if time.Since(start) > timeout {
 				done = true
-				break
 			}
 		}
 	}

client_test.go

@@ -1286,7 +1286,7 @@ func TestPerformRequestWithMaxResponseSize(t *testing.T) {
 		t.Fatal("expected response to be != nil")
 	}
 
-	res, err = client.PerformRequest(context.TODO(), PerformRequestOptions{
+	_, err = client.PerformRequest(context.TODO(), PerformRequestOptions{
 		Method:          "GET",
 		Path:            "/",
 		MaxResponseSize: 100,

decoder_test.go

@@ -13,8 +13,6 @@ import (
 )
 
 type decoder struct {
-	dec json.Decoder
-
 	N int64
 }
 

highlight.go

@@ -238,7 +238,7 @@ func (hl *Highlight) Source() (interface{}, error) {
 			source["fields"] = fields
 		} else {
 			// Use a map for the fields
-			fields := make(map[string]interface{}, 0)
+			fields := make(map[string]interface{})
 			for _, field := range hl.fields {
 				src, err := field.Source()
 				if err != nil {

search_aggs_bucket_significant_terms.go

@@ -23,7 +23,7 @@ type SignificantTermsAggregation struct {
 
 func NewSignificantTermsAggregation() *SignificantTermsAggregation {
 	return &SignificantTermsAggregation{
-		subAggregations: make(map[string]Aggregation, 0),
+		subAggregations: make(map[string]Aggregation),
 	}
 }
 

search_aggs_bucket_significant_text.go

@@ -22,7 +22,7 @@ type SignificantTextAggregation struct {
 
 func NewSignificantTextAggregation() *SignificantTextAggregation {
 	return &SignificantTextAggregation{
-		subAggregations: make(map[string]Aggregation, 0),
+		subAggregations: make(map[string]Aggregation),
 	}
 }
 

search_aggs_bucket_terms.go

@@ -30,7 +30,7 @@ type TermsAggregation struct {
 
 func NewTermsAggregation() *TermsAggregation {
 	return &TermsAggregation{
-		subAggregations: make(map[string]Aggregation, 0),
+		subAggregations: make(map[string]Aggregation),
 	}
 }
 

search_aggs_test.go

@@ -1343,7 +1343,7 @@ func TestAggsCompositeIntegration(t *testing.T) {
 			t.Fatalf("expected %d; got: %d", want, have)
 		}
 		afterKey = compositeAggRes.AfterKey
-		if afterKey == nil || len(afterKey) == 0 {
+		if len(afterKey) == 0 {
 			t.Fatalf("expected after_key; got: %v", afterKey)
 		}
 		if v, found := afterKey["composite_users"]; !found {
@@ -1396,7 +1396,7 @@ func TestAggsCompositeIntegration(t *testing.T) {
 			t.Fatalf("expected %d; got: %d", want, have)
 		}
 		afterKey = compositeAggRes.AfterKey
-		if afterKey == nil || len(afterKey) == 0 {
+		if len(afterKey) == 0 {
 			t.Fatalf("expected after_key; got: %v", afterKey)
 		}
 		if v, found := afterKey["composite_users"]; !found {

setup_test.go

@@ -14,6 +14,7 @@ import (
 	"math/rand"
 	"net/http"
 	"os"
+	"strings"
 	"time"
 )
 
@@ -237,16 +238,6 @@ func (t tweet) String() string {
 	return fmt.Sprintf("tweet{User:%q,Message:%q,Retweets:%d}", t.User, t.Message, t.Retweets)
 }
 
-type comment struct {
-	User    string    `json:"user"`
-	Comment string    `json:"comment"`
-	Created time.Time `json:"created,omitempty"`
-}
-
-func (c comment) String() string {
-	return fmt.Sprintf("comment{User:%q,Comment:%q}", c.User, c.Comment)
-}
-
 type joinDoc struct {
 	Message   string      `json:"message"`
 	JoinField interface{} `json:"my_join_field,omitempty"`
@@ -273,11 +264,6 @@ type doctype struct {
 	Message string `json:"message"`
 }
 
-// queries is required for Percolate tests.
-type queries struct {
-	Query string `json:"query"`
-}
-
 func isTravis() bool {
 	return os.Getenv("TRAVIS") != ""
 }
@@ -308,6 +294,7 @@ func (d *strictDecoder) Decode(data []byte, v interface{}) error {
 
 var (
 	logDeprecations = flag.String("deprecations", "off", "log or fail on deprecation warnings")
+	logTypesRemoval = flag.Bool("types-removal", false, "log deprecation warnings regarding types removal")
 	strict          = flag.Bool("strict-decoder", false, "treat missing unknown fields in response as errors")
 )
 
@@ -319,7 +306,7 @@ func setupTestClient(t logger, options ...ClientOptionFunc) (client *Client) {
 		t.Fatal(err)
 	}
 
-	// Add a strict decoder (unless a specific decoder has been specified already)
+	// Use strict JSON decoder (unless a specific decoder has been specified already)
 	if *strict {
 		if client.decoder == nil {
 			client.decoder = &strictDecoder{}
@@ -332,6 +319,9 @@ func setupTestClient(t logger, options ...ClientOptionFunc) (client *Client) {
 	if loglevel := *logDeprecations; loglevel != "off" {
 		logDeprecation = func(req *http.Request, res *http.Response) {
 			for _, warning := range res.Header["Warning"] {
+				if !*logTypesRemoval && strings.Contains(warning, "[types removal]") {
+					continue
+				}
 				switch loglevel {
 				default:
 					t.Logf("[%s] Deprecation warning: %s", req.URL, warning)

suggester_completion.go

@@ -21,7 +21,6 @@ type CompletionSuggester struct {
 	size           *int
 	shardSize      *int
 	contextQueries []SuggesterContextQuery
-	payload        interface{}
 
 	fuzzyOptions   *FuzzyCompletionSuggesterOptions
 	regexOptions   *RegexCompletionSuggesterOptions

xpack_info.go

@@ -18,7 +18,6 @@ import (
 type XPackInfoService struct {
 	client *Client
 	pretty bool
-	name   string
 }
 
 // NewXPackInfoService creates a new XPackInfoService.

xpack_test.go

@@ -315,7 +315,7 @@ func TestXPackWatcher(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	stats, err = client.XPackWatchStats().Do(context.Background())
+	_, err = client.XPackWatchStats().Do(context.Background())
 	if err != nil {
 		t.Fatal(err)
 	}

xpack_watcher_deactivate_watch.go

@@ -20,8 +20,6 @@ type XPackWatcherDeactivateWatchService struct {
 	pretty        bool
 	watchId       string
 	masterTimeout string
-	bodyJson      interface{}
-	bodyString    string
 }
 
 // NewXPackWatcherDeactivateWatchService creates a new XPackWatcherDeactivateWatchService.