make sure provider doesn't fail on read if property or action doesn't…

… exit
jgramoll · Aug 6, 2019 · 352126c · 352126c
1 parent 5139baf
commit 352126c
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -189,5 +189,5 @@ go mod vendor
 go clean
 go build
 rm ~/.terraform.d/plugins/$(uname | tr '[:upper:]' '[:lower:]')_amd64/terraform-provider-jenkins_v1.0.0
-ln  ./terraform-provider-jenkins ~/.terraform.d/plugins/$(uname | tr '[:upper:]' '[:lower:]')_amd64/terraform-provider-jenkins_v1.0.0 
+ln  ./terraform-provider-jenkins ~/.terraform.d/plugins/$(uname | tr '[:upper:]' '[:lower:]')_amd64/terraform-provider-jenkins_v1.0.0
 ```
diff --git a/provider/job_action_resource.go b/provider/job_action_resource.go
@@ -97,7 +97,9 @@ func resourceJobActionRead(d *schema.ResourceData, m interface{}, createJobActio
 	}
 	clientAction, err := j.GetAction(actionId)
 	if err != nil {
-		return err
+		log.Println("[WARN] No Job Action found:", err)
+		d.SetId("")
+		return nil
 	}
 	action, err := createJobAction().fromClientAction(clientAction)
 	if err != nil {

diff --git a/provider/job_build_discarder_property_strategy_resource.go b/provider/job_build_discarder_property_strategy_resource.go
@@ -103,7 +103,9 @@ func resourceJobPropertyStrategyRead(d *schema.ResourceData, m interface{}, crea
 
 	property, err := j.GetProperty(propertyId)
 	if err != nil {
-		return err
+		log.Println("[WARN] No Job Property found:", err)
+		d.SetId("")
+		return nil
 	}
 	discardProperty := property.(*client.JobBuildDiscarderProperty)
 	if discardProperty.Strategy.Item == nil {

diff --git a/provider/job_gerrit_branch_resource.go b/provider/job_gerrit_branch_resource.go
@@ -199,7 +199,9 @@ func resourceJobGerritBranchRead(d *schema.ResourceData, m interface{}) error {
 
 	property, err := j.GetProperty(propertyId)
 	if err != nil {
-		return err
+		log.Println("[WARN] No Job Property found:", err)
+		d.SetId("")
+		return nil
 	}
 	triggerInterface, err := property.(*client.JobPipelineTriggersProperty).GetTrigger(triggerId)
 	if err != nil {

diff --git a/provider/job_gerrit_project_resource.go b/provider/job_gerrit_project_resource.go
@@ -188,7 +188,9 @@ func resourceJobGerritProjectRead(d *schema.ResourceData, m interface{}) error {
 
 	property, err := j.GetProperty(propertyId)
 	if err != nil {
-		return err
+		log.Println("[WARN] No Job Property found:", err)
+		d.SetId("")
+		return nil
 	}
 	triggerInterface, err := property.(*client.JobPipelineTriggersProperty).GetTrigger(triggerId)
 	if err != nil {

diff --git a/provider/job_trigger_resource.go b/provider/job_trigger_resource.go
@@ -108,7 +108,7 @@ func resourceJobTriggerRead(d *schema.ResourceData, m interface{}, createJobTrig
 	}
 	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
 	}