[composable index template] Fix diff on data_streams

Add covering test for this behavior

Author: phillbaker

es/resource_elasticsearch_composable_index_template.go

@@ -95,6 +95,7 @@ func resourceElasticsearchComposableIndexTemplateRead(d *schema.ResourceData, me
 
 func elastic7GetIndexTemplate(client *elastic7.Client, id string) (string, error) {
 	res, err := client.IndexGetIndexTemplate(id).Do(context.TODO())
+	log.Printf("[INFO] Index template %+v %+v", res, err)
 	if err != nil {
 		return "", err
 	}

es/resource_elasticsearch_composable_index_template_test.go

@@ -141,7 +141,7 @@ func testCheckElasticsearchComposableIndexTemplateDestroy(s *terraform.State) er
 
 		switch client := esClient.(type) {
 		case *elastic7.Client:
-			_, err = client.IndexGetTemplate(rs.Primary.ID).Do(context.TODO())
+			_, err = client.IndexGetIndexTemplate(rs.Primary.ID).Do(context.TODO())
 		default:
 			err = errors.New("/_index_template endpoint only supported on ES >= 7.8")
 		}
@@ -165,7 +165,7 @@ resource "elasticsearch_composable_index_template" "test" {
   "template": {
     "settings": {
       "index": {
-        "number_of_shards": 1
+        "number_of_shards": "1"
       }
     },
     "mappings": {
@@ -184,7 +184,8 @@ resource "elasticsearch_composable_index_template" "test" {
     }
   },
   "priority": 200,
-  "version": 3
+  "version": 3,
+  "data_stream": {}
 }
 EOF
 }

es/util.go

@@ -141,6 +141,17 @@ For legacy index templates (ES < 7.8) or /_template endpoint on ES >= 7.8 see no
 */
 func normalizeComposableIndexTemplate(tpl map[string]interface{}) {
 	delete(tpl, "version")
+
+	// data_stream accepts only the attribute "hidden", but can return additional attributes, so
+	// remove them
+	if dataStream, ok := tpl["data_stream"].(map[string]interface{}); ok {
+		for k := range dataStream {
+			if k != "hidden" {
+				delete(dataStream, k)
+			}
+		}
+	}
+
 	if innerTpl, ok := tpl["template"]; ok {
 		if innerTplMap, ok := innerTpl.(map[string]interface{}); ok {
 			if settings, ok := innerTplMap["settings"]; ok {