[Resource Discovery] Fix issue where singular datasources result in success even though nothing was found during discovery.

This issue was caused by the `handleMissingResourceError` that is used to nullify missing resource errors (404).
This resulted in resource discovery assuming that discovery succeeded for singular datasources and proceeding to import a non-existent resource.

This fix checks that singular data source results are not voided before proceeding to add it to discovered resource list. Voided singular data source results are considered a case of resource not found.

Author: alexng-canuck

CHANGELOG.md

@@ -9,6 +9,9 @@
 - Support for `mount_type_details`, `mount_type`, `nfs_server` and `nfs_server_export` attributes in `oci_database_backup_destination` resource
 - Support resource discovery for `ons` resources
 
+### Fixed
+- Fix issue where discovering object storage buckets without lifecycle policies, results in an error
+
 ### Notes
 - `mount_type_details` attribute needs to be set when `type` attribute is set to `NFS` in `oci_database_backup_destination` resource
 

oci/crud_helpers.go

@@ -125,7 +125,9 @@ func handleMissingResourceError(sync ResourceVoider, err *error) {
 			(strings.Contains((*err).Error(), "Load balancer") && strings.Contains((*err).Error(), " has no ")) ||
 			strings.Contains(strings.ToLower((*err).Error()), "status code: 404") { // status code: 404 is not enough because the load balancer error responses don't include it for some reason
 			log.Println("[DEBUG] Object does not exist, voiding resource and nullifying error")
-			sync.VoidState()
+			if sync != nil {
+				sync.VoidState()
+			}
 			*err = nil
 		}
 	}

oci/export_compartment.go

@@ -916,7 +916,7 @@ func findResourcesGeneric(clients *OracleClients, tfMeta *TerraformResourceAssoc
 		return results, err
 	}
 
-	if tfMeta.datasourceItemsAttr != "" {
+	if !tfMeta.DiscoversWithSingularDatasource() {
 		// Results are from a plural datasource
 		itemSchema := datasource.Schema[tfMeta.datasourceItemsAttr]
 		elemResource, ok := itemSchema.Elem.(*schema.Resource)
@@ -986,8 +986,8 @@ func findResourcesGeneric(clients *OracleClients, tfMeta *TerraformResourceAssoc
 
 			results = append(results, resource)
 		}
-	} else {
-		// Result is from a singular datasource
+	} else if d.Id() != "" {
+		// Result is from a singular datasource that hasn't had its state voided (hence d.Id() is non-empty)
 		resource, err := generateOciResourceFromResourceData(d, d, datasource.Schema, "", tfMeta, parent)
 		if err != nil {
 			return results, err
@@ -1011,6 +1011,8 @@ func findResourcesGeneric(clients *OracleClients, tfMeta *TerraformResourceAssoc
 		if discoverable {
 			results = append(results, resource)
 		}
+	} else {
+		log.Printf("[DEBUG] singular data source not able to find resource")
 	}
 
 	return results, nil

oci/export_resource_helpers.go

@@ -50,6 +50,10 @@ type TerraformResourceHints struct {
 	ignorableRequiredMissingAttributes map[string]bool
 }
 
+func (h *TerraformResourceHints) DiscoversWithSingularDatasource() bool {
+	return h.datasourceItemsAttr == ""
+}
+
 type TerraformResourceAssociation struct {
 	*TerraformResourceHints
 	datasourceQueryParams map[string]string // Mapping of data source inputs and the source attribute from a parent resource
@@ -132,7 +136,9 @@ func (ctx *resourceDiscoveryContext) printErrors() {
 		if resourceDiscoveryError.resourceGraph != nil {
 			var notFoundChildren []string
 			getNotFoundChildren(resourceDiscoveryError.resourceType, resourceDiscoveryError.resourceGraph, &notFoundChildren)
-			color.Red(fmt.Sprintf("\tFollowing child resources were not discovered due to parent error: %v", strings.Join(notFoundChildren, ", ")))
+			if len(notFoundChildren) > 0 {
+				color.Red(fmt.Sprintf("\tFollowing child resources were also not discovered due to parent error: %v", strings.Join(notFoundChildren, ", ")))
+			}
 		}
 	}
 }