Set nested objects to nil when the service returns nil

Ravi Tandon · rcohenma · commit dac53c49ea3d · 2018-08-30T15:08:29.000-07:00
diff --git a/provider/containerengine_cluster_resource.go b/provider/containerengine_cluster_resource.go
@@ -519,6 +519,8 @@ func (s *ClusterResourceCrud) SetData() error {
 
 	if s.Res.Endpoints != nil {
 		s.D.Set("endpoints", []interface{}{ClusterEndpointsToMap(s.Res.Endpoints)})
+	} else {
+		s.D.Set("endpoints", nil)
 	}
 
 	if s.Res.KubernetesVersion != nil {
@@ -532,7 +534,7 @@ func (s *ClusterResourceCrud) SetData() error {
 	if s.Res.Metadata != nil {
 		s.D.Set("metadata", []interface{}{ClusterMetadataToMap(s.Res.Metadata)})
 	} else {
-		s.D.Set("metadata", []interface{}{})
+		s.D.Set("metadata", nil)
 	}
 
 	if s.Res.Name != nil {
@@ -541,6 +543,8 @@ func (s *ClusterResourceCrud) SetData() error {
 
 	if s.Res.Options != nil {
 		s.D.Set("options", []interface{}{ClusterCreateOptionsToMap(s.Res.Options)})
+	} else {
+		s.D.Set("options", nil)
 	}
 
 	s.D.Set("state", s.Res.LifecycleState)
diff --git a/provider/containerengine_clusters_data_source.go b/provider/containerengine_clusters_data_source.go
@@ -117,6 +117,8 @@ func (s *ClustersDataSourceCrud) SetData() error {
 
 		if r.Endpoints != nil {
 			cluster["endpoints"] = []interface{}{ClusterEndpointsToMap(r.Endpoints)}
+		} else {
+			cluster["endpoints"] = nil
 		}
 
 		if r.Id != nil {
@@ -133,6 +135,8 @@ func (s *ClustersDataSourceCrud) SetData() error {
 
 		if r.Metadata != nil {
 			cluster["metadata"] = []interface{}{ClusterMetadataToMap(r.Metadata)}
+		} else {
+			cluster["metadata"] = nil
 		}
 
 		if r.Name != nil {
@@ -141,6 +145,8 @@ func (s *ClustersDataSourceCrud) SetData() error {
 
 		if r.Options != nil {
 			cluster["options"] = []interface{}{ClusterCreateOptionsToMap(r.Options)}
+		} else {
+			cluster["options"] = nil
 		}
 
 		cluster["state"] = r.LifecycleState
diff --git a/provider/core_boot_volume_resource.go b/provider/core_boot_volume_resource.go
@@ -359,6 +359,8 @@ func (s *BootVolumeResourceCrud) SetData() error {
 			sourceDetailsArray = append(sourceDetailsArray, sourceDetailsMap)
 		}
 		s.D.Set("source_details", sourceDetailsArray)
+	} else {
+		s.D.Set("source_details", nil)
 	}
 
 	s.D.Set("state", s.Res.LifecycleState)
diff --git a/provider/core_image_resource.go b/provider/core_image_resource.go
@@ -397,6 +397,8 @@ func (s *ImageResourceCrud) SetData() error {
 
 	if s.Res.LaunchOptions != nil {
 		s.D.Set("launch_options", []interface{}{LaunchOptionsToMap(s.Res.LaunchOptions)})
+	} else {
+		s.D.Set("launch_options", nil)
 	}
 
 	if s.Res.OperatingSystem != nil {
diff --git a/provider/core_images_data_source.go b/provider/core_images_data_source.go
@@ -183,6 +183,8 @@ func (s *ImagesDataSourceCrud) SetData() error {
 
 		if r.LaunchOptions != nil {
 			image["launch_options"] = []interface{}{LaunchOptionsToMap(r.LaunchOptions)}
+		} else {
+			image["launch_options"] = nil
 		}
 
 		if r.OperatingSystem != nil {
diff --git a/provider/core_instance_resource.go b/provider/core_instance_resource.go
@@ -620,6 +620,8 @@ func (s *InstanceResourceCrud) SetData() error {
 
 	if s.Res.LaunchOptions != nil {
 		s.D.Set("launch_options", []interface{}{LaunchOptionsToMap(s.Res.LaunchOptions)})
+	} else {
+		s.D.Set("launch_options", nil)
 	}
 
 	if s.Res.Metadata != nil {
@@ -658,10 +660,7 @@ func (s *InstanceResourceCrud) SetData() error {
 			return err
 		}
 	} else {
-		err := s.D.Set("source_details", []interface{}{})
-		if err != nil {
-			return err
-		}
+		s.D.Set("source_details", nil)
 	}
 
 	if bootVolume != nil && bootVolume.Id != nil {
diff --git a/provider/core_instances_data_source.go b/provider/core_instances_data_source.go
@@ -160,6 +160,8 @@ func (s *InstancesDataSourceCrud) SetData() error {
 
 		if r.LaunchOptions != nil {
 			instance["launch_options"] = []interface{}{LaunchOptionsToMap(r.LaunchOptions)}
+		} else {
+			instance["launch_options"] = nil
 		}
 
 		if r.Metadata != nil {
@@ -180,6 +182,8 @@ func (s *InstancesDataSourceCrud) SetData() error {
 				sourceDetailsArray = append(sourceDetailsArray, sourceDetailsMap)
 			}
 			instance["source_details"] = sourceDetailsArray
+		} else {
+			instance["source_details"] = nil
 		}
 
 		instance["state"] = r.LifecycleState
diff --git a/provider/core_volume_group_resource.go b/provider/core_volume_group_resource.go
@@ -360,6 +360,8 @@ func (s *VolumeGroupResourceCrud) SetData() error {
 			sourceDetailsArray = append(sourceDetailsArray, sourceDetailsMap)
 		}
 		s.D.Set("source_details", sourceDetailsArray)
+	} else {
+		s.D.Set("source_details", nil)
 	}
 
 	s.D.Set("state", s.Res.LifecycleState)
diff --git a/provider/core_volume_groups_data_source.go b/provider/core_volume_groups_data_source.go
@@ -148,6 +148,8 @@ func (s *VolumeGroupsDataSourceCrud) SetData() error {
 				sourceDetailsArray = append(sourceDetailsArray, sourceDetailsMap)
 			}
 			volumeGroup["source_details"] = sourceDetailsArray
+		} else {
+			volumeGroup["source_details"] = nil
 		}
 
 		volumeGroup["state"] = r.LifecycleState
diff --git a/provider/core_volume_resource.go b/provider/core_volume_resource.go
@@ -385,6 +385,8 @@ func (s *VolumeResourceCrud) SetData() error {
 			sourceDetailsArray = append(sourceDetailsArray, sourceDetailsMap)
 		}
 		s.D.Set("source_details", sourceDetailsArray)
+	} else {
+		s.D.Set("source_details", nil)
 	}
 
 	s.D.Set("state", s.Res.LifecycleState)
diff --git a/provider/core_volumes_data_source.go b/provider/core_volumes_data_source.go
@@ -181,6 +181,8 @@ func (s *VolumesDataSourceCrud) SetData() error {
 				sourceDetailsArray = append(sourceDetailsArray, sourceDetailsMap)
 			}
 			volume["source_details"] = sourceDetailsArray
+		} else {
+			volume["source_details"] = nil
 		}
 
 		volume["state"] = r.LifecycleState
diff --git a/provider/database_database_data_source.go b/provider/database_database_data_source.go
@@ -149,6 +149,8 @@ func (s *DatabaseDataSourceCrud) SetData() error {
 
 	if s.Res.DbBackupConfig != nil {
 		s.D.Set("db_backup_config", []interface{}{DbBackupConfigToMap(s.Res.DbBackupConfig)})
+	} else {
+		s.D.Set("db_backup_config", nil)
 	}
 
 	if s.Res.DbHomeId != nil {
diff --git a/provider/database_databases_data_source.go b/provider/database_databases_data_source.go
@@ -122,6 +122,8 @@ func (s *DatabasesDataSourceCrud) SetData() error {
 
 		if r.DbBackupConfig != nil {
 			database["db_backup_config"] = []interface{}{DbBackupConfigToMap(r.DbBackupConfig)}
+		} else {
+			database["db_backup_config"] = nil
 		}
 
 		if r.DbName != nil {
diff --git a/provider/load_balancer_backend_set_resource.go b/provider/load_balancer_backend_set_resource.go
@@ -557,7 +557,7 @@ func (s *BackendSetResourceCrud) SetData() error {
 	if s.Res.HealthChecker != nil {
 		s.D.Set("health_checker", []interface{}{HealthCheckerToMap(s.Res.HealthChecker)})
 	} else {
-		s.D.Set("health_checker", []interface{}{})
+		s.D.Set("health_checker", nil)
 	}
 
 	if s.Res.Name != nil {
@@ -571,13 +571,13 @@ func (s *BackendSetResourceCrud) SetData() error {
 	if s.Res.SessionPersistenceConfiguration != nil {
 		s.D.Set("session_persistence_configuration", []interface{}{SessionPersistenceConfigurationDetailsToMap(s.Res.SessionPersistenceConfiguration)})
 	} else {
-		s.D.Set("session_persistence_configuration", []interface{}{})
+		s.D.Set("session_persistence_configuration", nil)
 	}
 
 	if s.Res.SslConfiguration != nil {
 		s.D.Set("ssl_configuration", []interface{}{SSLConfigurationToMap(s.Res.SslConfiguration)})
 	} else {
-		s.D.Set("ssl_configuration", []interface{}{})
+		s.D.Set("ssl_configuration", nil)
 	}
 
 	return nil
diff --git a/provider/load_balancer_backend_sets_data_source.go b/provider/load_balancer_backend_sets_data_source.go
@@ -83,6 +83,8 @@ func (s *BackendSetsDataSourceCrud) SetData() error {
 
 		if r.HealthChecker != nil {
 			backendSet["health_checker"] = []interface{}{HealthCheckerToMap(r.HealthChecker)}
+		} else {
+			backendSet["health_checker"] = nil
 		}
 
 		if r.Name != nil {
@@ -96,13 +98,13 @@ func (s *BackendSetsDataSourceCrud) SetData() error {
 		if r.SessionPersistenceConfiguration != nil {
 			backendSet["session_persistence_configuration"] = []interface{}{SessionPersistenceConfigurationDetailsToMap(r.SessionPersistenceConfiguration)}
 		} else {
-			backendSet["session_persistence_configuration"] = []interface{}{}
+			backendSet["session_persistence_configuration"] = nil
 		}
 
 		if r.SslConfiguration != nil {
 			backendSet["ssl_configuration"] = []interface{}{SSLConfigurationToMap(r.SslConfiguration)}
 		} else {
-			backendSet["session_persistence_configuration"] = []interface{}{}
+			backendSet["ssl_configuration"] = nil
 		}
 
 		resources = append(resources, backendSet)

Original file line number	Diff line number	Diff line change
`@@ -117,6 +117,8 @@ func (s *ClustersDataSourceCrud) SetData() error {`
`117`	`117`
`118`	`118`	`if r.Endpoints != nil {`
`119`	`119`	`cluster["endpoints"] = []interface{}{ClusterEndpointsToMap(r.Endpoints)}`
	`120`	`+ } else {`
	`121`	`+ cluster["endpoints"] = nil`
`120`	`122`	`}`
`121`	`123`
`122`	`124`	`if r.Id != nil {`
`@@ -133,6 +135,8 @@ func (s *ClustersDataSourceCrud) SetData() error {`
`133`	`135`
`134`	`136`	`if r.Metadata != nil {`
`135`	`137`	`cluster["metadata"] = []interface{}{ClusterMetadataToMap(r.Metadata)}`
	`138`	`+ } else {`
	`139`	`+ cluster["metadata"] = nil`
`136`	`140`	`}`
`137`	`141`
`138`	`142`	`if r.Name != nil {`
`@@ -141,6 +145,8 @@ func (s *ClustersDataSourceCrud) SetData() error {`
`141`	`145`
`142`	`146`	`if r.Options != nil {`
`143`	`147`	`cluster["options"] = []interface{}{ClusterCreateOptionsToMap(r.Options)}`
	`148`	`+ } else {`
	`149`	`+ cluster["options"] = nil`
`144`	`150`	`}`
`145`	`151`
`146`	`152`	`cluster["state"] = r.LifecycleState`
Original file line number	Diff line number	Diff line change
`@@ -359,6 +359,8 @@ func (s *BootVolumeResourceCrud) SetData() error {`
`359`	`359`	`sourceDetailsArray = append(sourceDetailsArray, sourceDetailsMap)`
`360`	`360`	`}`
`361`	`361`	`s.D.Set("source_details", sourceDetailsArray)`
	`362`	`+ } else {`
	`363`	`+ s.D.Set("source_details", nil)`
`362`	`364`	`}`
`363`	`365`
`364`	`366`	`s.D.Set("state", s.Res.LifecycleState)`
Original file line number	Diff line number	Diff line change
`@@ -397,6 +397,8 @@ func (s *ImageResourceCrud) SetData() error {`
`397`	`397`
`398`	`398`	`if s.Res.LaunchOptions != nil {`
`399`	`399`	`s.D.Set("launch_options", []interface{}{LaunchOptionsToMap(s.Res.LaunchOptions)})`
	`400`	`+ } else {`
	`401`	`+ s.D.Set("launch_options", nil)`
`400`	`402`	`}`
`401`	`403`
`402`	`404`	`if s.Res.OperatingSystem != nil {`
Original file line number	Diff line number	Diff line change
`@@ -183,6 +183,8 @@ func (s *ImagesDataSourceCrud) SetData() error {`
`183`	`183`
`184`	`184`	`if r.LaunchOptions != nil {`
`185`	`185`	`image["launch_options"] = []interface{}{LaunchOptionsToMap(r.LaunchOptions)}`
	`186`	`+ } else {`
	`187`	`+ image["launch_options"] = nil`
`186`	`188`	`}`
`187`	`189`
`188`	`190`	`if r.OperatingSystem != nil {`
Original file line number	Diff line number	Diff line change
`@@ -620,6 +620,8 @@ func (s *InstanceResourceCrud) SetData() error {`
`620`	`620`
`621`	`621`	`if s.Res.LaunchOptions != nil {`
`622`	`622`	`s.D.Set("launch_options", []interface{}{LaunchOptionsToMap(s.Res.LaunchOptions)})`
	`623`	`+ } else {`
	`624`	`+ s.D.Set("launch_options", nil)`
`623`	`625`	`}`
`624`	`626`
`625`	`627`	`if s.Res.Metadata != nil {`
`@@ -658,10 +660,7 @@ func (s *InstanceResourceCrud) SetData() error {`
`658`	`660`	`return err`
`659`	`661`	`}`
`660`	`662`	`} else {`
`661`		`- err := s.D.Set("source_details", []interface{}{})`
`662`		`- if err != nil {`
`663`		`- return err`
`664`		`- }`
	`663`	`+ s.D.Set("source_details", nil)`
`665`	`664`	`}`
`666`	`665`
`667`	`666`	`if bootVolume != nil && bootVolume.Id != nil {`
Original file line number	Diff line number	Diff line change
`@@ -160,6 +160,8 @@ func (s *InstancesDataSourceCrud) SetData() error {`
`160`	`160`
`161`	`161`	`if r.LaunchOptions != nil {`
`162`	`162`	`instance["launch_options"] = []interface{}{LaunchOptionsToMap(r.LaunchOptions)}`
	`163`	`+ } else {`
	`164`	`+ instance["launch_options"] = nil`
`163`	`165`	`}`
`164`	`166`
`165`	`167`	`if r.Metadata != nil {`
`@@ -180,6 +182,8 @@ func (s *InstancesDataSourceCrud) SetData() error {`
`180`	`182`	`sourceDetailsArray = append(sourceDetailsArray, sourceDetailsMap)`
`181`	`183`	`}`
`182`	`184`	`instance["source_details"] = sourceDetailsArray`
	`185`	`+ } else {`
	`186`	`+ instance["source_details"] = nil`
`183`	`187`	`}`
`184`	`188`
`185`	`189`	`instance["state"] = r.LifecycleState`
Original file line number	Diff line number	Diff line change
`@@ -360,6 +360,8 @@ func (s *VolumeGroupResourceCrud) SetData() error {`
`360`	`360`	`sourceDetailsArray = append(sourceDetailsArray, sourceDetailsMap)`
`361`	`361`	`}`
`362`	`362`	`s.D.Set("source_details", sourceDetailsArray)`
	`363`	`+ } else {`
	`364`	`+ s.D.Set("source_details", nil)`
`363`	`365`	`}`
`364`	`366`
`365`	`367`	`s.D.Set("state", s.Res.LifecycleState)`
Original file line number	Diff line number	Diff line change
`@@ -148,6 +148,8 @@ func (s *VolumeGroupsDataSourceCrud) SetData() error {`
`148`	`148`	`sourceDetailsArray = append(sourceDetailsArray, sourceDetailsMap)`
`149`	`149`	`}`
`150`	`150`	`volumeGroup["source_details"] = sourceDetailsArray`
	`151`	`+ } else {`
	`152`	`+ volumeGroup["source_details"] = nil`
`151`	`153`	`}`
`152`	`154`
`153`	`155`	`volumeGroup["state"] = r.LifecycleState`
Original file line number	Diff line number	Diff line change
`@@ -385,6 +385,8 @@ func (s *VolumeResourceCrud) SetData() error {`
`385`	`385`	`sourceDetailsArray = append(sourceDetailsArray, sourceDetailsMap)`
`386`	`386`	`}`
`387`	`387`	`s.D.Set("source_details", sourceDetailsArray)`
	`388`	`+ } else {`
	`389`	`+ s.D.Set("source_details", nil)`
`388`	`390`	`}`
`389`	`391`
`390`	`392`	`s.D.Set("state", s.Res.LifecycleState)`