Allow for indices to be recreated where mappings are not strict supersets

Author: coro

es/resource_elasticsearch_index.go

@@ -419,6 +419,7 @@ func resourceElasticsearchIndex() *schema.Resource {
 		Update:      resourceElasticsearchIndexUpdate,
 		Delete:      resourceElasticsearchIndexDelete,
 		Schema:      configSchema,
+                CustomizeDiff: verifyIndexMappingUpdates,
 		Importer: &schema.ResourceImporter{
 			StateContext: schema.ImportStatePassthroughContext,
 		},
@@ -679,25 +680,15 @@ func resourceElasticsearchIndexUpdate(d *schema.ResourceData, meta interface{})
     }
   }
 
-  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 {
+  mappings := d.Get("mappings")
+  if err = updateIndexMappings(d, meta, mappings.(string)); err != nil {
     return err
   }
 
@@ -758,6 +749,15 @@ func updateIndexMappings(d *schema.ResourceData, meta interface{}, mapping strin
   return err
 }
 
+func verifyIndexMappingUpdates(ctx context.Context, resourceDiff *schema.ResourceDiff, meta interface{}) error {
+  oldMapping, newMapping := resourceDiff.GetChange("mappings")
+  difference, _ := jsondiff.Compare([]byte(newMapping.(string)), []byte(oldMapping.(string)), &jsondiff.Options{})
+  if difference == jsondiff.NoMatch {
+    return resourceDiff.ForceNew("mappings")
+  }
+  return nil
+}
+
 func getWriteIndexByAlias(alias string, d *schema.ResourceData, meta interface{}) string {
 	var (
 		index   = d.Id()

es/resource_elasticsearch_index_test.go

@@ -191,6 +191,22 @@ resource "elasticsearch_index" "test_mapping" {
 }
 EOF
 }
+`
+	testAccElasticsearchRemovedMapping = `
+resource "elasticsearch_index" "test_mapping" {
+  name               = "terraform-test"
+  number_of_replicas = "1"
+  include_type_name  = false
+  mappings           = <<EOF
+{
+  "properties": {
+    "name": {
+      "type": "text"
+    }
+  }
+}
+EOF
+}
 `
 	testAccElasticsearchIndexUpdateForceDestroy = `
 resource "elasticsearch_index" "test" {
@@ -551,6 +567,26 @@ func TestAccElasticsearchIndex_mapping(t *testing.T) {
           }),
         ),
       },
+      {
+        Config: testAccElasticsearchRemovedMapping,
+        Check: resource.ComposeTestCheckFunc(
+          checkElasticsearchIndexRecreated("elasticsearch_index.test_mapping", &initialUUID),
+          checkElasticsearchIndexMapping("terraform-test", func(s *terraform.State, mapping map[string]interface{}) error {
+            g.Expect(mapping).To(MatchAllKeys(Keys{
+              "terraform-test": MatchAllKeys(Keys{
+                "mappings": MatchAllKeys(Keys{
+                  "properties": MatchAllKeys(Keys{
+                    "name": MatchAllKeys(Keys{
+                      "type": Equal("text"),
+                    }),
+                  }),
+                }),
+              }),
+            }))
+            return nil
+          }),
+        ),
+      },
     },
   })
 }