Fix search templates API

Author: olivere

CHANGELOG-5.0.md

@@ -50,6 +50,11 @@ Use the `terminate_after` parameter instead.
 
 Both of these fields were deprecated and are now [removed](https://www.elastic.co/guide/en/elasticsearch/reference/master/breaking_50_mapping_changes.html#_literal__timestamp_literal_and_literal__ttl_literal).
 
+## Search template Put/Delete API returns `acknowledged` only
+
+The response type for Put/Delete search templates has changed.
+It only returns a single `acknowledged` flag now.
+
 ## Fields has been renamed to Stored Fields
 
 The `fields` parameter has been renamed to `stored_fields`.

acknowledged_response.go

@@ -0,0 +1,11 @@
+// Copyright 2012-present Oliver Eilhard. All rights reserved.
+// Use of this source code is governed by a MIT-license.
+// See http://olivere.mit-license.org/license.txt for details.
+
+package elastic
+
+// AcknowledgedResponse is returned from various APIs. It simply indicates
+// whether the operation is ack'd or not.
+type AcknowledgedResponse struct {
+	Acknowledged bool `json:"acknowledged"`
+}

delete_template.go

@@ -83,7 +83,7 @@ func (s *DeleteTemplateService) Validate() error {
 }
 
 // Do executes the operation.
-func (s *DeleteTemplateService) Do(ctx context.Context) (*DeleteTemplateResponse, error) {
+func (s *DeleteTemplateService) Do(ctx context.Context) (*AcknowledgedResponse, error) {
 	// Check pre-conditions
 	if err := s.Validate(); err != nil {
 		return nil, err
@@ -102,18 +102,9 @@ func (s *DeleteTemplateService) Do(ctx context.Context) (*DeleteTemplateResponse
 	}
 
 	// Return operation response
-	ret := new(DeleteTemplateResponse)
+	ret := new(AcknowledgedResponse)
 	if err := s.client.decoder.Decode(res.Body, ret); err != nil {
 		return nil, err
 	}
 	return ret, nil
 }
-
-// DeleteTemplateResponse is the response of DeleteTemplateService.Do.
-type DeleteTemplateResponse struct {
-	Found   bool   `json:"found"`
-	Index   string `json:"_index"`
-	Type    string `json:"_type"`
-	Id      string `json:"_id"`
-	Version int    `json:"_version"`
-}

example_test.go

@@ -464,8 +464,8 @@ func ExamplePutTemplateService() {
 	if err != nil {
 		panic(err)
 	}
-	if resp.Created {
-		fmt.Println("search template created")
+	if resp.Acknowledged {
+		fmt.Println("search template creation acknowledged")
 	}
 }
 
@@ -494,7 +494,7 @@ func ExampleDeleteTemplateService() {
 	if err != nil {
 		panic(err)
 	}
-	if resp != nil && resp.Found {
+	if resp != nil && resp.Acknowledged {
 		fmt.Println("template deleted")
 	}
 }

get_template_test.go

@@ -32,8 +32,8 @@ func TestGetPutDeleteTemplate(t *testing.T) {
 	if putres == nil {
 		t.Fatalf("expected response; got: %v", putres)
 	}
-	if !putres.Created {
-		t.Fatalf("expected template to be created; got: %v", putres.Created)
+	if !putres.Acknowledged {
+		t.Fatalf("expected template creation to be acknowledged; got: %v", putres.Acknowledged)
 	}
 
 	// Always delete template

search_template.go put_template.go

@@ -111,7 +111,7 @@ func (s *PutTemplateService) Validate() error {
 }
 
 // Do executes the operation.
-func (s *PutTemplateService) Do(ctx context.Context) (*PutTemplateResponse, error) {
+func (s *PutTemplateService) Do(ctx context.Context) (*AcknowledgedResponse, error) {
 	// Check pre-conditions
 	if err := s.Validate(); err != nil {
 		return nil, err
@@ -138,16 +138,9 @@ func (s *PutTemplateService) Do(ctx context.Context) (*PutTemplateResponse, erro
 	}
 
 	// Return operation response
-	ret := new(PutTemplateResponse)
+	ret := new(AcknowledgedResponse)
 	if err := s.client.decoder.Decode(res.Body, ret); err != nil {
 		return nil, err
 	}
 	return ret, nil
 }
-
-// PutTemplateResponse is the response of PutTemplateService.Do.
-type PutTemplateResponse struct {
-	Id      string `json:"_id"`
-	Version int    `json:"_version"`
-	Created bool   `json:"created"`
-}

search_templates_test.go put_template_test.go

@@ -5,6 +5,8 @@
 package elastic
 
 import (
+	"log"
+	"os"
 	"testing"
 
 	"golang.org/x/net/context"
@@ -24,8 +26,8 @@ func TestSearchTemplatesLifecycle(t *testing.T) {
 	if cresp == nil {
 		t.Fatalf("expected response != nil; got: %v", cresp)
 	}
-	if !cresp.Created {
-		t.Errorf("expected created = %v; got: %v", true, cresp.Created)
+	if !cresp.Acknowledged {
+		t.Errorf("expected acknowledged = %v; got: %v", true, cresp.Acknowledged)
 	}
 
 	// Get template
@@ -48,13 +50,14 @@ func TestSearchTemplatesLifecycle(t *testing.T) {
 	if dresp == nil {
 		t.Fatalf("expected response != nil; got: %v", dresp)
 	}
-	if !dresp.Found {
-		t.Fatalf("expected found = %v; got: %v", true, dresp.Found)
+	if !dresp.Acknowledged {
+		t.Fatalf("expected acknowledged = %v; got: %v", true, dresp.Acknowledged)
 	}
 }
 
 func TestSearchTemplatesInlineQuery(t *testing.T) {
-	client := setupTestClientAndCreateIndex(t)
+	// client := setupTestClientAndCreateIndex(t)
+	client := setupTestClientAndCreateIndex(t, SetTraceLog(log.New(os.Stdout, "", 0)))
 
 	tweet1 := tweet{User: "olivere", Message: "Welcome to Golang and Elasticsearch."}
 	tweet2 := tweet{User: "olivere", Message: "Another unrelated topic."}