Only PUT mappings if there is actually a change

coro · coro · commit a7501136658e · 2023-03-13T10:00:45.000Z
diff --git a/es/resource_elasticsearch_index.go b/es/resource_elasticsearch_index.go
@@ -687,9 +687,10 @@ func resourceElasticsearchIndexUpdate(d *schema.ResourceData, meta interface{})
 		return err
 	}
 
-	mappings := d.Get("mappings")
-	if err = updateIndexMappings(d, meta, mappings.(string)); err != nil {
-		return err
+	if d.HasChange("mappings") {
+		if err = updateIndexMappings(d, meta, d.Get("mappings").(string)); err != nil {
+			return err
+		}
 	}
 
 	return resourceElasticsearchIndexRead(d, meta.(*ProviderConf))
@@ -750,9 +751,12 @@ func updateIndexMappings(d *schema.ResourceData, meta interface{}, mapping strin
 }
 
 func verifyIndexMappingUpdates(ctx context.Context, resourceDiff *schema.ResourceDiff, meta interface{}) error {
+	if !resourceDiff.HasChange("mappings") {
+		return nil
+	}
 	oldMapping, newMapping := resourceDiff.GetChange("mappings")
 	difference, _ := jsondiff.Compare([]byte(newMapping.(string)), []byte(oldMapping.(string)), &jsondiff.Options{})
-	if difference == jsondiff.NoMatch {
+	if difference > jsondiff.SupersetMatch {
 		return resourceDiff.ForceNew("mappings")
 	}
 	return nil
diff --git a/go.mod b/go.mod
@@ -18,5 +18,6 @@ require (
 	github.com/olivere/elastic v6.2.26+incompatible
 	github.com/olivere/elastic/v7 v7.0.32
 	github.com/onsi/gomega v1.27.1 // indirect
+	github.com/spf13/viper v1.7.0 // indirect
 	gopkg.in/olivere/elastic.v6 v6.2.37
 )
diff --git a/go.sum b/go.sum
@@ -846,6 +846,7 @@ golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA=
 golang.org/x/tools v0.4.0/go.mod h1:UE5sM2OK9E/d67R0ANs2xJizIymRP5gJU295PvKXxjQ=
+golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -961,6 +962,7 @@ gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

Original file line number	Diff line number	Diff line change
`@@ -687,9 +687,10 @@ func resourceElasticsearchIndexUpdate(d *schema.ResourceData, meta interface{})`
`687`	`687`	`return err`
`688`	`688`	`}`
`689`	`689`
`690`		`- mappings := d.Get("mappings")`
`691`		`- if err = updateIndexMappings(d, meta, mappings.(string)); err != nil {`
`692`		`- return err`
	`690`	`+ if d.HasChange("mappings") {`
	`691`	`+ if err = updateIndexMappings(d, meta, d.Get("mappings").(string)); err != nil {`
	`692`	`+ return err`
	`693`	`+ }`
`693`	`694`	`}`
`694`	`695`
`695`	`696`	`return resourceElasticsearchIndexRead(d, meta.(*ProviderConf))`
`@@ -750,9 +751,12 @@ func updateIndexMappings(d *schema.ResourceData, meta interface{}, mapping strin`
`750`	`751`	`}`
`751`	`752`
`752`	`753`	`func verifyIndexMappingUpdates(ctx context.Context, resourceDiff *schema.ResourceDiff, meta interface{}) error {`
	`754`	`+ if !resourceDiff.HasChange("mappings") {`
	`755`	`+ return nil`
	`756`	`+ }`
`753`	`757`	`oldMapping, newMapping := resourceDiff.GetChange("mappings")`
`754`	`758`	`difference, _ := jsondiff.Compare([]byte(newMapping.(string)), []byte(oldMapping.(string)), &jsondiff.Options{})`
`755`		`- if difference == jsondiff.NoMatch {`
	`759`	`+ if difference > jsondiff.SupersetMatch {`
`756`	`760`	`return resourceDiff.ForceNew("mappings")`
`757`	`761`	`}`
`758`	`762`	`return nil`
Original file line number	Diff line number	Diff line change
`@@ -18,5 +18,6 @@ require (`
`18`	`18`	`github.com/olivere/elastic v6.2.26+incompatible`
`19`	`19`	`github.com/olivere/elastic/v7 v7.0.32`
`20`	`20`	`github.com/onsi/gomega v1.27.1 // indirect`
	`21`	`+ github.com/spf13/viper v1.7.0 // indirect`
`21`	`22`	`gopkg.in/olivere/elastic.v6 v6.2.37`
`22`	`23`	`)`