Remove/replace _type in tests (elastic#14070)

Richardjgq · Oct 15, 2019 · 58bd06d · 58bd06d
1 parent 637b0f9
commit 58bd06d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/libbeat/outputs/elasticsearch/api_integration_test.go b/libbeat/outputs/elasticsearch/api_integration_test.go
@@ -46,7 +46,7 @@ func TestIndex(t *testing.T) {
 	params := map[string]string{
 		"refresh": "true",
 	}
-	_, resp, err := client.Index(index, "test", "1", params, body)
+	_, resp, err := client.Index(index, "_doc", "1", params, body)
 	if err != nil {
 		t.Fatalf("Index() returns error: %s", err)
 	}
@@ -78,7 +78,7 @@ func TestIndex(t *testing.T) {
 		t.Errorf("Wrong number of search results: %d", result.Hits.Total.Value)
 	}
 
-	_, resp, err = client.Delete(index, "test", "1", nil)
+	_, resp, err = client.Delete(index, "_doc", "1", nil)
 	if err != nil {
 		t.Errorf("Delete() returns error: %s", err)
 	}
@@ -138,7 +138,7 @@ func TestIngest(t *testing.T) {
 	}
 
 	params := map[string]string{"refresh": "true"}
-	_, resp, err = client.Ingest(index, "test", pipeline, "1", params, obj{
+	_, resp, err = client.Ingest(index, "_doc", pipeline, "1", params, obj{
 		"testfield": "TEST",
 	})
 	if err != nil {

diff --git a/libbeat/outputs/elasticsearch/bulkapi_integration_test.go b/libbeat/outputs/elasticsearch/bulkapi_integration_test.go
@@ -37,7 +37,6 @@ func TestBulk(t *testing.T) {
 		{
 			"index": map[string]interface{}{
 				"_index": index,
-				"_type":  "type1",
 				"_id":    "1",
 			},
 		},
@@ -54,7 +53,7 @@ func TestBulk(t *testing.T) {
 	params := map[string]string{
 		"refresh": "true",
 	}
-	_, err := client.Bulk(index, "type1", params, body)
+	_, err := client.Bulk(index, "", params, body)
 	if err != nil {
 		t.Fatalf("Bulk() returned error: %s", err)
 	}
@@ -87,7 +86,7 @@ func TestEmptyBulk(t *testing.T) {
 	params := map[string]string{
 		"refresh": "true",
 	}
-	resp, err := client.Bulk(index, "type1", params, body)
+	resp, err := client.Bulk(index, "", params, body)
 	if err != nil {
 		t.Fatalf("Bulk() returned error: %s", err)
 	}
@@ -106,7 +105,6 @@ func TestBulkMoreOperations(t *testing.T) {
 		{
 			"index": map[string]interface{}{
 				"_index": index,
-				"_type":  "type1",
 				"_id":    "1",
 			},
 		},
@@ -117,15 +115,13 @@ func TestBulkMoreOperations(t *testing.T) {
 		{
 			"delete": map[string]interface{}{
 				"_index": index,
-				"_type":  "type1",
 				"_id":    "2",
 			},
 		},
 
 		{
 			"create": map[string]interface{}{
 				"_index": index,
-				"_type":  "type1",
 				"_id":    "3",
 			},
 		},
@@ -137,7 +133,6 @@ func TestBulkMoreOperations(t *testing.T) {
 			"update": map[string]interface{}{
 				"_id":    "1",
 				"_index": index,
-				"_type":  "type1",
 			},
 		},
 		{
@@ -155,7 +150,7 @@ func TestBulkMoreOperations(t *testing.T) {
 	params := map[string]string{
 		"refresh": "true",
 	}
-	resp, err := client.Bulk(index, "type1", params, body)
+	resp, err := client.Bulk(index, "", params, body)
 	if err != nil {
 		t.Fatalf("Bulk() returned error: %s [%s]", err, resp)
 	}