[WIP] Suppress diff for configuration items in case they are not set

vra7/resource_configuration.go

@@ -11,7 +11,7 @@ import (
 
 func resourceConfigurationSchema(computed bool) *schema.Schema {
 	return &schema.Schema{
-		Type:     schema.TypeSet,
+		Type:     schema.TypeList,
 		Optional: !computed,
 		Computed: computed,
 		Elem: &schema.Resource{
@@ -25,6 +25,12 @@ func resourceConfigurationSchema(computed bool) *schema.Schema {
 					Type:     schema.TypeMap,
 					Optional: true,
 					Computed: true,
+					DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
+						if (old != "" && new == "") || (old == "" && new == "") {
+							return true
+						}
+						return false
+					},
 					Elem: &schema.Schema{
 						Type: schema.TypeString,
 					},
@@ -83,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{

vra7/resource_vra7_deployment.go

@@ -266,8 +266,8 @@ func resourceVra7DeploymentUpdate(d *schema.ResourceData, meta interface{}) erro
 
 	// get the old and new resource_configuration data
 	old, new := d.GetChange("resource_configuration")
-	oldResourceConfigList := expandResourceConfiguration(old.(*schema.Set).List())
-	newResourceConfigList := expandResourceConfiguration(new.(*schema.Set).List())
+	oldResourceConfigList := expandResourceConfiguration(old)
+	newResourceConfigList := expandResourceConfiguration(new)
 
 	if d.HasChange("resource_configuration") {
 		for _, newResourceConfig := range newResourceConfigList {
@@ -603,7 +603,7 @@ func readProviderConfiguration(d *schema.ResourceData, vraClient *sdk.APIClient)
 		Lease:                   d.Get("lease_days").(int),
 		DeploymentID:            strings.TrimSpace(d.Get("deployment_id").(string)),
 		WaitTimeout:             d.Get("wait_timeout").(int) * 60,
-		ResourceConfiguration:   expandResourceConfiguration(d.Get("resource_configuration").(*schema.Set).List()),
+		ResourceConfiguration:   expandResourceConfiguration(d.Get("resource_configuration")),
 		DeploymentDestroy:       d.Get("deployment_destroy").(bool),
 		DeploymentConfiguration: d.Get("deployment_configuration").(map[string]interface{}),
 	}