Allow updates to mappings on live indices

Author: coro

es/resource_elasticsearch_index.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
+	"github.com/nsf/jsondiff"
 
 	elastic7 "github.com/olivere/elastic/v7"
 	elastic6 "gopkg.in/olivere/elastic.v6"
@@ -355,7 +356,6 @@ var (
 			Type:         schema.TypeString,
 			Description:  "A JSON string defining how documents in the index, and the fields they contain, are stored and indexed. To avoid the complexities of field mapping updates, updates of this field are not allowed via this provider. See the upstream [Elasticsearch docs](https://www.elastic.co/guide/en/elasticsearch/reference/6.8/indices-put-mapping.html#updating-field-mappings) for more details.",
 			Optional:     true,
-			ForceNew:     true,
 			ValidateFunc: validation.StringIsJSON,
 		},
 		"aliases": {
@@ -670,52 +670,92 @@ func allowIndexDestroy(indexName string, d *schema.ResourceData, meta interface{
 }
 
 func resourceElasticsearchIndexUpdate(d *schema.ResourceData, meta interface{}) error {
-	settings := make(map[string]interface{})
-	for _, key := range settingsKeys {
-		schemaName := strings.Replace(key, ".", "_", -1)
-		if d.HasChange(schemaName) {
-			settings[key] = d.Get(schemaName)
-		}
-	}
-
-	// if we're not changing any settings, no-op this function
-	if len(settings) == 0 {
-		return resourceElasticsearchIndexRead(d, meta)
-	}
-
-	body := map[string]interface{}{
-		// Note you do not have to explicitly specify the `index` section inside
-		// the `settings` section
-		"settings": settings,
-	}
-
-	var (
-		name = d.Id()
-		ctx  = context.Background()
-		err  error
-	)
+  var err error
+  settings := make(map[string]interface{})
+  for _, key := range settingsKeys {
+    schemaName := strings.Replace(key, ".", "_", -1)
+    if d.HasChange(schemaName) {
+      settings[key] = d.Get(schemaName)
+    }
+  }
+
+  o, n := d.GetChange("mappings")
+  difference, _ := jsondiff.Compare([]byte(n.(string)), []byte(o.(string)), &jsondiff.Options{})
+
+  // if we're not changing any settings, no-op this function
+  if len(settings) == 0 && difference == jsondiff.FullMatch {
+    return resourceElasticsearchIndexRead(d, meta)
+  }
+
+  if len(settings) != 0 {
+    err = updateIndexSettings(d, meta, settings)
+  }
+  if err != nil {
+    return err
+  }
+
+  if difference == jsondiff.SupersetMatch {
+    err = updateIndexMappings(d, meta, n.(string))
+  }
+  if err != nil {
+    return err
+  }
+
+  return resourceElasticsearchIndexRead(d, meta.(*ProviderConf))
+}
 
-	if alias, ok := d.GetOk("rollover_alias"); ok {
-		name = getWriteIndexByAlias(alias.(string), d, meta)
-	}
+func updateIndexSettings(d *schema.ResourceData, meta interface{}, settings map[string]interface{}) error {
+  body := map[string]interface{}{
+    // Note you do not have to explicitly specify the `index` section inside
+    // the `settings` section
+    "settings": settings,
+  }
+
+  var (
+    name = d.Id()
+    ctx  = context.Background()
+    err  error
+  )
+
+  if alias, ok := d.GetOk("rollover_alias"); ok {
+    name = getWriteIndexByAlias(alias.(string), d, meta)
+  }
+
+  esClient, err := getClient(meta.(*ProviderConf))
+  if err != nil {
+    return err
+  }
+  switch client := esClient.(type) {
+  case *elastic7.Client:
+  _, err = client.IndexPutSettings(name).BodyJson(body).Do(ctx)
+  case *elastic6.Client:
+  _, err = client.IndexPutSettings(name).BodyJson(body).Do(ctx)
+  default:
+    return errors.New("Elasticsearch version not supported")
+}
+  return err
+}
 
-	esClient, err := getClient(meta.(*ProviderConf))
-	if err != nil {
-		return err
-	}
-	switch client := esClient.(type) {
-	case *elastic7.Client:
-		_, err = client.IndexPutSettings(name).BodyJson(body).Do(ctx)
-	case *elastic6.Client:
-		_, err = client.IndexPutSettings(name).BodyJson(body).Do(ctx)
-	default:
-		return errors.New("Elasticsearch version not supported")
-	}
+func updateIndexMappings(d *schema.ResourceData, meta interface{}, mapping string) error {
+  var (
+    name = d.Id()
+    ctx  = context.Background()
+    err  error
+  )
+  esClient, err := getClient(meta.(*ProviderConf))
+  if err != nil {
+    return err
+  }
+  switch client := esClient.(type) {
+  case *elastic7.Client:
+  _, err = client.PutMapping().Index(name).BodyString(mapping).Do(ctx)
+  case *elastic6.Client:
+  _, err = client.PutMapping().Index(name).BodyString(mapping).Do(ctx)
+  default:
+    return errors.New("Elasticsearch version not supported")
+}
 
-	if err == nil {
-		return resourceElasticsearchIndexRead(d, meta.(*ProviderConf))
-	}
-	return err
+  return err
 }
 
 func getWriteIndexByAlias(alias string, d *schema.ResourceData, meta interface{}) string {

es/resource_elasticsearch_index_test.go

@@ -505,9 +505,8 @@ func TestAccElasticsearchIndex_mapping(t *testing.T) {
           checkElasticsearchIndexMapping("terraform-test", func(s *terraform.State, mapping map[string]interface{}) error {
             initialUUID, err = getElasticsearchIndexUUID("elasticsearch_index.test_mapping", s)
             if err != nil {
-              return err
+              return fmt.Errorf("Failed to get index uuid: %w", err)
             }
-            fmt.Println(initialUUID)
             g.Expect(mapping).To(MatchAllKeys(Keys{
               "terraform-test": MatchAllKeys(Keys{
                 "mappings": MatchAllKeys(Keys{

go.mod

@@ -14,6 +14,7 @@ require (
 	github.com/katbyte/terrafmt v0.4.0
 	github.com/mattn/go-isatty v0.0.12 // indirect
 	github.com/mitchellh/go-homedir v1.1.0
+	github.com/nsf/jsondiff v0.0.0-20210926074059-1e845ec5d249 // indirect
 	github.com/olivere/elastic v6.2.26+incompatible
 	github.com/olivere/elastic/v7 v7.0.32
 	github.com/onsi/gomega v1.27.1 // indirect

go.sum

@@ -426,6 +426,8 @@ github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRW
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/nsf/jsondiff v0.0.0-20200515183724-f29ed568f4ce h1:RPclfga2SEJmgMmz2k+Mg7cowZ8yv4Trqw9UsJby758=
 github.com/nsf/jsondiff v0.0.0-20200515183724-f29ed568f4ce/go.mod h1:uFMI8w+ref4v2r9jz+c9i1IfIttS/OkmLfrk1jne5hs=
+github.com/nsf/jsondiff v0.0.0-20210926074059-1e845ec5d249 h1:NHrXEjTNQY7P0Zfx1aMrNhpgxHmow66XQtm0aQLY0AE=
+github.com/nsf/jsondiff v0.0.0-20210926074059-1e845ec5d249/go.mod h1:mpRZBD8SJ55OIICQ3iWH0Yz3cjzA61JdqMLoWXeB2+8=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
 github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
 github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw=