also suppress diffs for empty properties from "" to null

Marcel Juhnke · Marcel Juhnke · commit ebe9ec2eb0cb · 2020-05-04T09:56:53.000+02:00
diff --git a/vra7/resource_configuration.go b/vra7/resource_configuration.go
@@ -26,7 +26,7 @@ func resourceConfigurationSchema(computed bool) *schema.Schema {
 					Optional: true,
 					Computed: true,
 					DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
-						if old != "" && new == "" {
+						if (old != "" && new == "") || (old == "" && new == "") {
 							return true
 						}
 						return false
@@ -89,10 +89,10 @@ func resourceConfigurationSchema(computed bool) *schema.Schema {
 	}
 }
 
-func expandResourceConfiguration(rConfigurations []interface{}) []sdk.ResourceConfigurationStruct {
-	configs := make([]sdk.ResourceConfigurationStruct, 0, len(rConfigurations))
+func expandResourceConfiguration(rConfigurations interface{}) []sdk.ResourceConfigurationStruct {
+	configs := make([]sdk.ResourceConfigurationStruct, 0, len(rConfigurations.([]interface{})))
 
-	for _, config := range rConfigurations {
+	for _, config := range rConfigurations.([]interface{}) {
 		configMap := config.(map[string]interface{})
 
 		rConfig := sdk.ResourceConfigurationStruct{

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ func resourceConfigurationSchema(computed bool) *schema.Schema {`
`26`	`26`	`Optional: true,`
`27`	`27`	`Computed: true,`
`28`	`28`	`DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {`
`29`		`- if old != "" && new == "" {`
	`29`	`+ if (old != "" && new == "") \|\| (old == "" && new == "") {`
`30`	`30`	`return true`
`31`	`31`	`}`
`32`	`32`	`return false`
`@@ -89,10 +89,10 @@ func resourceConfigurationSchema(computed bool) *schema.Schema {`
`89`	`89`	`}`
`90`	`90`	`}`
`91`	`91`
`92`		`-func expandResourceConfiguration(rConfigurations []interface{}) []sdk.ResourceConfigurationStruct {`
`93`		`- configs := make([]sdk.ResourceConfigurationStruct, 0, len(rConfigurations))`
	`92`	`+func expandResourceConfiguration(rConfigurations interface{}) []sdk.ResourceConfigurationStruct {`
	`93`	`+ configs := make([]sdk.ResourceConfigurationStruct, 0, len(rConfigurations.([]interface{})))`
`94`	`94`
`95`		`- for _, config := range rConfigurations {`
	`95`	`+ for _, config := range rConfigurations.([]interface{}) {`
`96`	`96`	`configMap := config.(map[string]interface{})`
`97`	`97`
`98`	`98`	`rConfig := sdk.ResourceConfigurationStruct{`