Enhancing data source filter to support netsed structure and maps

Author: parweza

provider/core_boot_volume_attachments_data_source.go

@@ -189,7 +189,7 @@ func (s *BootVolumeAttachmentsDataSourceCrud) SetData() {
 	}
 
 	if f, fOk := s.D.GetOkExists("filter"); fOk {
-		resources = ApplyFilters(f.(*schema.Set), resources)
+		resources = ApplyFilters(f.(*schema.Set), resources, BootVolumeAttachmentsDataSource().Schema["boot_volume_attachments"].Elem.(*schema.Resource).Schema)
 	}
 
 	if err := s.D.Set("boot_volume_attachments", resources); err != nil {

provider/core_boot_volumes_data_source.go

@@ -192,7 +192,7 @@ func (s *BootVolumesDataSourceCrud) SetData() {
 	}
 
 	if f, fOk := s.D.GetOkExists("filter"); fOk {
-		resources = ApplyFilters(f.(*schema.Set), resources)
+		resources = ApplyFilters(f.(*schema.Set), resources, BootVolumesDataSource().Schema["boot_volumes"].Elem.(*schema.Resource).Schema)
 	}
 
 	if err := s.D.Set("boot_volumes", resources); err != nil {

provider/core_cpes_data_source.go

@@ -137,7 +137,7 @@ func (s *CpesDataSourceCrud) SetData() {
 	}
 
 	if f, fOk := s.D.GetOkExists("filter"); fOk {
-		resources = ApplyFilters(f.(*schema.Set), resources)
+		resources = ApplyFilters(f.(*schema.Set), resources, CpesDataSource().Schema["cpes"].Elem.(*schema.Resource).Schema)
 	}
 
 	if err := s.D.Set("cpes", resources); err != nil {

provider/core_dhcp_options_data_source.go

@@ -168,7 +168,7 @@ func (s *DhcpOptionsDataSourceCrud) SetData() {
 	}
 
 	if f, fOk := s.D.GetOkExists("filter"); fOk {
-		resources = ApplyFilters(f.(*schema.Set), resources)
+		resources = ApplyFilters(f.(*schema.Set), resources, DhcpOptionsDataSource().Schema["options"].Elem.(*schema.Resource).Schema)
 	}
 
 	if err := s.D.Set("options", resources); err != nil {

provider/core_drg_attachments_data_source.go

@@ -155,7 +155,7 @@ func (s *DrgAttachmentsDataSourceCrud) SetData() {
 	}
 
 	if f, fOk := s.D.GetOkExists("filter"); fOk {
-		resources = ApplyFilters(f.(*schema.Set), resources)
+		resources = ApplyFilters(f.(*schema.Set), resources, DrgAttachmentsDataSource().Schema["drg_attachments"].Elem.(*schema.Resource).Schema)
 	}
 
 	if err := s.D.Set("drg_attachments", resources); err != nil {

provider/core_drgs_data_source.go

@@ -135,7 +135,7 @@ func (s *DrgsDataSourceCrud) SetData() {
 	}
 
 	if f, fOk := s.D.GetOkExists("filter"); fOk {
-		resources = ApplyFilters(f.(*schema.Set), resources)
+		resources = ApplyFilters(f.(*schema.Set), resources, DrgsDataSource().Schema["drgs"].Elem.(*schema.Resource).Schema)
 	}
 
 	if err := s.D.Set("drgs", resources); err != nil {

provider/core_images_data_source.go

@@ -208,7 +208,7 @@ func (s *ImagesDataSourceCrud) SetData() {
 	}
 
 	if f, fOk := s.D.GetOkExists("filter"); fOk {
-		resources = ApplyFilters(f.(*schema.Set), resources)
+		resources = ApplyFilters(f.(*schema.Set), resources, ImagesDataSource().Schema["images"].Elem.(*schema.Resource).Schema)
 	}
 
 	if err := s.D.Set("images", resources); err != nil {

provider/core_instance_console_connections_data_source.go

@@ -132,7 +132,7 @@ func (s *InstanceConsoleConnectionsDataSourceCrud) SetData() {
 	}
 
 	if f, fOk := s.D.GetOkExists("filter"); fOk {
-		resources = ApplyFilters(f.(*schema.Set), resources)
+		resources = ApplyFilters(f.(*schema.Set), resources, InstanceConsoleConnectionsDataSource().Schema["instance_console_connections"].Elem.(*schema.Resource).Schema)
 	}
 
 	if err := s.D.Set("instance_console_connections", resources); err != nil {

provider/core_instance_test.go

@@ -63,12 +63,12 @@ resource "oci_core_instance" "test_instance" {
 	extended_metadata = "${var.instance_extended_metadata}"
 	freeform_tags = "${var.instance_freeform_tags}"
 	hostname_label = "${var.instance_hostname_label}"
-	image = "${var.instance_image}"
 	ipxe_script = "${var.instance_ipxe_script}"
 	metadata = "${var.instance_metadata}"
 	source_details {
 		#Required
-		source_type = "${var.instance_source_details_source_type}"
+		source_type = "image"
+        source_id = "${var.InstanceImageOCID[var.region]}"
 	}
 	subnet_id = "${oci_core_subnet.test_subnet.id}"
 }

provider/core_instances_data_source.go

@@ -188,7 +188,7 @@ func (s *InstancesDataSourceCrud) SetData() {
 	}
 
 	if f, fOk := s.D.GetOkExists("filter"); fOk {
-		resources = ApplyFilters(f.(*schema.Set), resources)
+		resources = ApplyFilters(f.(*schema.Set), resources, InstancesDataSource().Schema["instances"].Elem.(*schema.Resource).Schema)
 	}
 
 	if err := s.D.Set("instances", resources); err != nil {