Return errors on trying to use kibana saved objects on v7+.

Author: phillbaker

README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.org/phillbaker/terraform-provider-elasticsearch.svg?branch=master)](https://travis-ci.org/phillbaker/terraform-provider-elasticsearch)
 
-This is a terraform provider that lets you provision elasticsearch resources, compatible with v5 and v6 of elasticsearch. Based off of an [original PR to Terraform](https://github.com/hashicorp/terraform/pull/13238).
+This is a terraform provider that lets you provision elasticsearch resources, compatible with v5, v6 and v7 of elasticsearch. Based off of an [original PR to Terraform](https://github.com/hashicorp/terraform/pull/13238).
 
 ## Installation
 

resource_elasticsearch_kibana_object.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"context"
+	"errors"
 	"encoding/json"
 	"fmt"
 	"log"
@@ -46,8 +47,7 @@ func resourceElasticsearchKibanaObjectCreate(d *schema.ResourceData, meta interf
 	var err error
 	switch meta.(type) {
 	case *elastic7.Client:
-		client := meta.(*elastic7.Client)
-		success, err = elastic7CreateIndexIfNotExists(client, index, mapping_index)
+		err = errors.New("kibana objects not implemented post to Elastic v7")
 	case *elastic6.Client:
 		client := meta.(*elastic6.Client)
 		success, err = elastic6CreateIndexIfNotExists(client, index, mapping_index)
@@ -80,26 +80,6 @@ func resourceElasticsearchKibanaObjectCreate(d *schema.ResourceData, meta interf
 	return nil
 }
 
-func elastic7CreateIndexIfNotExists(client *elastic7.Client, index string, mapping_index string) (int, error) {
-	log.Printf("[INFO] elastic7CreateIndexIfNotExists")
-
-	// Use the IndexExists service to check if a specified index exists.
-	exists, err := client.IndexExists(index).Do(context.TODO())
-	if err != nil {
-		return INDEX_CREATION_FAILED, err
-	}
-	if !exists {
-		createIndex, err := client.CreateIndex(mapping_index).Body(`{"mappings":{}}`).Do(context.TODO())
-		if createIndex.Acknowledged {
-			return INDEX_CREATED, err
-		} else {
-			return INDEX_CREATION_FAILED, err
-		}
-	}
-
-	return INDEX_EXISTS, nil
-}
-
 func elastic6CreateIndexIfNotExists(client *elastic6.Client, index string, mapping_index string) (int, error) {
 	log.Printf("[INFO] elastic6CreateIndexIfNotExists")
 
@@ -165,14 +145,11 @@ func resourceElasticsearchKibanaObjectRead(d *schema.ResourceData, meta interfac
 	objectType := body[0]["_type"].(string)
 	index := d.Get("index").(string)
 
-	var rawMessage json.RawMessage
 	var result *json.RawMessage
 	var err error
 	switch meta.(type) {
 	case *elastic7.Client:
-		client := meta.(*elastic7.Client)
-		rawMessage, err = elastic7GetObject(client, objectType, index, id)
-		result = &rawMessage
+		err = errors.New("kibana objects not implemented post to Elastic v7")
 	case *elastic6.Client:
 		client := meta.(*elastic6.Client)
 		result, err = elastic6GetObject(client, objectType, index, id)
@@ -182,7 +159,7 @@ func resourceElasticsearchKibanaObjectRead(d *schema.ResourceData, meta interfac
 	}
 
 	if err != nil {
-		if elastic7.IsNotFound(err) || elastic6.IsNotFound(err) || elastic5.IsNotFound(err) {
+		if elastic6.IsNotFound(err) || elastic5.IsNotFound(err) {
 			log.Printf("[WARN] Kibana Object (%s) not found, removing from state", id)
 			d.SetId("")
 			return nil
@@ -197,23 +174,6 @@ func resourceElasticsearchKibanaObjectRead(d *schema.ResourceData, meta interfac
 	return nil
 }
 
-func elastic7GetObject(client *elastic7.Client, objectType string, index string, id string) (json.RawMessage, error) {
-	result, err := client.Get().
-		Index(index).
-		Type(objectType).
-		Id(id).
-		Do(context.TODO())
-
-	if err != nil {
-		return nil, err
-	}
-	if !result.Found {
-		return nil, fmt.Errorf("Object not found.")
-	}
-
-	return result.Source, nil
-}
-
 func elastic6GetObject(client *elastic6.Client, objectType string, index string, id string) (*json.RawMessage, error) {
 	result, err := client.Get().
 		Index(index).
@@ -268,8 +228,7 @@ func resourceElasticsearchKibanaObjectDelete(d *schema.ResourceData, meta interf
 	var err error
 	switch meta.(type) {
 	case *elastic7.Client:
-		client := meta.(*elastic7.Client)
-		err = elastic7DeleteIndex(client, objectType, index, id)
+		err = errors.New("kibana objects not implemented post to Elastic v7")
 	case *elastic6.Client:
 		client := meta.(*elastic6.Client)
 		err = elastic6DeleteIndex(client, objectType, index, id)
@@ -285,17 +244,6 @@ func resourceElasticsearchKibanaObjectDelete(d *schema.ResourceData, meta interf
 	return nil
 }
 
-func elastic7DeleteIndex(client *elastic7.Client, objectType string, index string, id string) error {
-	_, err := client.Delete().
-		Index(index).
-		Type(objectType).
-		Id(id).
-		Do(context.TODO())
-
-	// we'll get an error if it's not found: https://github.com/olivere/elastic/blob/v6.1.26/delete.go#L207-L210
-	return err
-}
-
 func elastic6DeleteIndex(client *elastic6.Client, objectType string, index string, id string) error {
 	_, err := client.Delete().
 		Index(index).
@@ -334,8 +282,7 @@ func resourceElasticsearchPutKibanaObject(d *schema.ResourceData, meta interface
 	var err error
 	switch meta.(type) {
 	case *elastic7.Client:
-		client := meta.(*elastic7.Client)
-		err = elastic7PutIndex(client, objectType, index, id, data)
+		err = errors.New("kibana objects not implemented post to Elastic v7")
 	case *elastic6.Client:
 		client := meta.(*elastic6.Client)
 		err = elastic6PutIndex(client, objectType, index, id, data)
@@ -351,17 +298,6 @@ func resourceElasticsearchPutKibanaObject(d *schema.ResourceData, meta interface
 	return id, nil
 }
 
-func elastic7PutIndex(client *elastic7.Client, objectType string, index string, id string, data interface{}) error {
-	_, err := client.Index().
-		Index(index).
-		Type(objectType).
-		Id(id).
-		BodyJson(&data).
-		Do(context.TODO())
-
-	return err
-}
-
 func elastic6PutIndex(client *elastic6.Client, objectType string, index string, id string, data interface{}) error {
 	_, err := client.Index().
 		Index(index).

resource_elasticsearch_kibana_object_test.go

@@ -3,19 +3,26 @@ package main
 import (
 	"context"
 	"fmt"
+	"os"
 	"testing"
 
+	elastic7 "github.com/olivere/elastic/v7"
 	elastic5 "gopkg.in/olivere/elastic.v5"
 	elastic6 "gopkg.in/olivere/elastic.v6"
-	elastic7 "github.com/olivere/elastic/v7"
 
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/terraform"
 )
 
 func TestAccElasticsearchKibanaObject(t *testing.T) {
 	resource.Test(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
+		PreCheck: func() {
+			testAccPreCheck(t)
+			// skip tests on ES > 7 until saved object API is supported
+			if v := os.Getenv("ES_VERSION"); v >= "7.0.0" {
+				t.Skip("Need to implement saved object API on ES >= 6")
+			}
+		},
 		Providers:    testAccProviders,
 		CheckDestroy: testCheckElasticsearchKibanaObjectDestroy,
 		Steps: []resource.TestStep{
@@ -44,8 +51,7 @@ func testCheckElasticsearchKibanaObjectExists(name string) resource.TestCheckFun
 		var err error
 		switch meta.(type) {
 		case *elastic7.Client:
-			client := meta.(*elastic7.Client)
-			_, err = client.Get().Index(".kibana").Type("visualization").Id("response-time-percentile").Do(context.TODO())
+			// not implemented
 		case *elastic6.Client:
 			client := meta.(*elastic6.Client)
 			_, err = client.Get().Index(".kibana").Type("visualization").Id("response-time-percentile").Do(context.TODO())
@@ -73,8 +79,7 @@ func testCheckElasticsearchKibanaObjectDestroy(s *terraform.State) error {
 		var err error
 		switch meta.(type) {
 		case *elastic7.Client:
-			client := meta.(*elastic7.Client)
-			_, err = client.Get().Index(".kibana").Type("visualization").Id("response-time-percentile").Do(context.TODO())
+			// not implemented
 		case *elastic6.Client:
 			client := meta.(*elastic6.Client)
 			_, err = client.Get().Index(".kibana").Type("visualization").Id("response-time-percentile").Do(context.TODO())