Add missing analysis_char_filter field (#158)

* Add missing analysis_char_filter field

* Fix elasticstack_elasticsearch_index example

* Fix index test

* Remove ForceNew from analysis settings

Author: Kanji Yomoda

docs/resources/elasticsearch_index.md

@@ -25,7 +25,7 @@ resource "elasticstack_elasticsearch_index" "my_index" {
   }
 
   alias {
-    name = "my_alias_2"
+    name   = "my_alias_2"
     filter = jsonencode({
       term = { "user.id" = "developer" }
     })
@@ -35,27 +35,18 @@ resource "elasticstack_elasticsearch_index" "my_index" {
     properties = {
       field1 = { type = "keyword" }
       field2 = { type = "text" }
-      field3 = { properties = {
-        inner_field1 = { type = "text", index = false }
-        inner_field2 = { type = "integer", index = false }
-      } }
+      field3 = {
+        properties = {
+          inner_field1 = { type = "text", index = false }
+          inner_field2 = { type = "integer", index = false }
+        }
+      }
     }
   })
 
-  settings {
-    setting {
-      name  = "index.number_of_shards"
-      value = "1"
-    }
-    setting {
-      name  = "index.number_of_replicas"
-      value = "2"
-    }
-    setting {
-      name  = "index.search.idle.after"
-      value = "20s"
-    }
-  }
+  number_of_shards   = 1
+  number_of_replicas = 2
+  search_idle_after  = "20s"
 }
 ```
 
@@ -70,6 +61,7 @@ resource "elasticstack_elasticsearch_index" "my_index" {
 
 - `alias` (Block Set) Aliases for the index. (see [below for nested schema](#nestedblock--alias))
 - `analysis_analyzer` (String) A JSON string describing the analyzers applied to the index.
+- `analysis_char_filter` (String) A JSON string describing the char_filters applied to the index.
 - `analysis_filter` (String) A JSON string describing the filters applied to the index.
 - `analysis_normalizer` (String) A JSON string describing the normalizers applied to the index.
 - `analysis_tokenizer` (String) A JSON string describing the tokenizers applied to the index.

examples/resources/elasticstack_elasticsearch_index/resource.tf

@@ -10,7 +10,7 @@ resource "elasticstack_elasticsearch_index" "my_index" {
   }
 
   alias {
-    name = "my_alias_2"
+    name   = "my_alias_2"
     filter = jsonencode({
       term = { "user.id" = "developer" }
     })
@@ -20,25 +20,16 @@ resource "elasticstack_elasticsearch_index" "my_index" {
     properties = {
       field1 = { type = "keyword" }
       field2 = { type = "text" }
-      field3 = { properties = {
-        inner_field1 = { type = "text", index = false }
-        inner_field2 = { type = "integer", index = false }
-      } }
+      field3 = {
+        properties = {
+          inner_field1 = { type = "text", index = false }
+          inner_field2 = { type = "integer", index = false }
+        }
+      }
     }
   })
 
-  settings {
-    setting {
-      name  = "index.number_of_shards"
-      value = "1"
-    }
-    setting {
-      name  = "index.number_of_replicas"
-      value = "2"
-    }
-    setting {
-      name  = "index.search.idle.after"
-      value = "20s"
-    }
-  }
+  number_of_shards   = 1
+  number_of_replicas = 2
+  search_idle_after  = "20s"
 }

internal/elasticsearch/index/index.go

@@ -376,32 +376,36 @@ func ResourceIndex() *schema.Resource {
 			Description: "Set the number of characters of the `_source` to include in the slowlog lines, `false` or `0` will skip logging the source entirely and setting it to `true` will log the entire source regardless of size. The original `_source` is reformatted by default to make sure that it fits on a single log line.",
 			Optional:    true,
 		},
+		// To change analyzer setting, the index must be closed, updated, and then reopened but it can't be handled in terraform.
+		// We raise error when they are tried to be updated instead of setting ForceNew not to have unexpected deletion.
 		"analysis_analyzer": {
 			Type:         schema.TypeString,
 			Description:  "A JSON string describing the analyzers applied to the index.",
 			Optional:     true,
-			ForceNew:     true, // To add an analyzer, the index must be closed, updated, and then reopened; we can't handle that here.
 			ValidateFunc: validation.StringIsJSON,
 		},
 		"analysis_tokenizer": {
 			Type:         schema.TypeString,
 			Description:  "A JSON string describing the tokenizers applied to the index.",
 			Optional:     true,
-			ForceNew:     true, // To add a tokenizer, the index must be closed, updated, and then reopened; we can't handle that here.
+			ValidateFunc: validation.StringIsJSON,
+		},
+		"analysis_char_filter": {
+			Type:         schema.TypeString,
+			Description:  "A JSON string describing the char_filters applied to the index.",
+			Optional:     true,
 			ValidateFunc: validation.StringIsJSON,
 		},
 		"analysis_filter": {
 			Type:         schema.TypeString,
 			Description:  "A JSON string describing the filters applied to the index.",
 			Optional:     true,
-			ForceNew:     true, // To add a filter, the index must be closed, updated, and then reopened; we can't handle that here.
 			ValidateFunc: validation.StringIsJSON,
 		},
 		"analysis_normalizer": {
 			Type:         schema.TypeString,
 			Description:  "A JSON string describing the normalizers applied to the index.",
 			Optional:     true,
-			ForceNew:     true, // To add a normalizer, the index must be closed, updated, and then reopened; we can't handle that here.
 			ValidateFunc: validation.StringIsJSON,
 		},
 		"alias": {
@@ -695,6 +699,14 @@ func resourceIndexCreate(ctx context.Context, d *schema.ResourceData, meta inter
 		}
 		analysis["tokenizer"] = tokenizer
 	}
+	if charFilterJSON, ok := d.GetOk("analysis_char_filter"); ok {
+		var filter map[string]interface{}
+		bytes := []byte(charFilterJSON.(string))
+		if err = json.Unmarshal(bytes, &filter); err != nil {
+			return diag.FromErr(err)
+		}
+		analysis["char_filter"] = filter
+	}
 	if filterJSON, ok := d.GetOk("analysis_filter"); ok {
 		var filter map[string]interface{}
 		bytes := []byte(filterJSON.(string))

internal/elasticsearch/index/index_test.go

@@ -82,7 +82,8 @@ func TestAccResourceIndexSettings(t *testing.T) {
 					resource.TestCheckResourceAttr("elasticstack_elasticsearch_index.test_settings", "routing_allocation_enable", "primaries"),
 					resource.TestCheckResourceAttr("elasticstack_elasticsearch_index.test_settings", "routing_rebalance_enable", "primaries"),
 					resource.TestCheckResourceAttr("elasticstack_elasticsearch_index.test_settings", "gc_deletes", "30s"),
-					resource.TestCheckResourceAttr("elasticstack_elasticsearch_index.test_settings", "analysis_analyzer", `{"text_en":{"filter":["lowercase","minimal_english_stemmer"],"tokenizer":"standard","type":"custom"}}`),
+					resource.TestCheckResourceAttr("elasticstack_elasticsearch_index.test_settings", "analysis_analyzer", `{"text_en":{"char_filter":"zero_width_spaces","filter":["lowercase","minimal_english_stemmer"],"tokenizer":"standard","type":"custom"}}`),
+					resource.TestCheckResourceAttr("elasticstack_elasticsearch_index.test_settings", "analysis_char_filter", `{"zero_width_spaces":{"mappings":["\\u200C=\u003e\\u0020"],"type":"mapping"}}`),
 					resource.TestCheckResourceAttr("elasticstack_elasticsearch_index.test_settings", "analysis_filter", `{"minimal_english_stemmer":{"language":"minimal_english","type":"stemmer"}}`),
 					resource.TestCheckResourceAttr("elasticstack_elasticsearch_index.test_settings", "settings.0.setting.0.name", "number_of_replicas"),
 					resource.TestCheckResourceAttr("elasticstack_elasticsearch_index.test_settings", "settings.0.setting.0.value", "2"),
@@ -240,11 +241,11 @@ resource "elasticstack_elasticsearch_index" "test_settings" {
   routing_allocation_enable = "primaries"
   routing_rebalance_enable = "primaries"
   gc_deletes = "30s"
-  analysis_analyzer = jsonencode({
-    text_en = { 
-      type = "custom" 
-      tokenizer = "standard"
-      filter = ["lowercase", "minimal_english_stemmer"]
+
+  analysis_char_filter = jsonencode({
+    zero_width_spaces = {
+      type     = "mapping"
+      mappings = ["\\u200C=>\\u0020"] 
     }
   })
   analysis_filter = jsonencode({
@@ -253,6 +254,14 @@ resource "elasticstack_elasticsearch_index" "test_settings" {
       language = "minimal_english"
     }
   })
+  analysis_analyzer = jsonencode({
+    text_en = { 
+      type = "custom" 
+      tokenizer = "standard"
+      char_filter = "zero_width_spaces"
+      filter = ["lowercase", "minimal_english_stemmer"]
+    }
+  })
 
   settings {
     setting {