make sure to return nil instead of error on read

jgramoll · Aug 6, 2019 · 9083e51 · 9083e51
1 parent 352126c
commit 9083e51
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/provider/job_gerrit_trigger_event_resource.go b/provider/job_gerrit_trigger_event_resource.go
@@ -115,9 +115,9 @@ func resourceJobTriggerEventRead(d *schema.ResourceData, m interface{}, createJo
 	}
 	clientProperty, err := j.GetProperty(propertyId)
 	if err != nil {
-		log.Println("[WARN] No Property found:", err)
+		log.Println("[WARN] No Job Property found:", err)
 		d.SetId("")
-		return err
+		return nil
 	}
 	property := clientProperty.(*client.JobPipelineTriggersProperty)
 	trigger, err := property.GetTrigger(triggerId)

diff --git a/provider/job_property_resource.go b/provider/job_property_resource.go
@@ -92,7 +92,7 @@ func resourceJobPropertyRead(d *schema.ResourceData, m interface{}, createJobPro
 	if err != nil {
 		log.Println("[WARN] No Property found:", err)
 		d.SetId("")
-		return err
+		return nil
 	}
 	property, err := createJobProperty().fromClientJobProperty(clientProperty)
 	if err != nil {

diff --git a/provider/job_trigger_resource.go b/provider/job_trigger_resource.go
@@ -110,7 +110,7 @@ func resourceJobTriggerRead(d *schema.ResourceData, m interface{}, createJobTrig
 	if err != nil {
 		log.Println("[WARN] No Job Property found:", err)
 		d.SetId("")
-		return err
+		return nil
 	}
 	property := clientProperty.(*client.JobPipelineTriggersProperty)
 	clientTrigger, err := property.GetTrigger(triggerId)