Test node fixing

wallarm/resource_application.go

@@ -101,15 +101,18 @@ func resourceWallarmAppRead(d *schema.ResourceData, m interface{}) error {
 	if err != nil {
 		return err
 	}
-
+	found := false
 	for _, app := range appResp.Body {
 		if app.ID == appID || app.Name == name {
-
+			found = true
 			d.Set("name", name)
 			d.Set("app_id", app.ID)
 			d.Set("client_id", clientID)
 		}
 	}
+	if !found {
+		d.SetId("")
+	}
 	return nil
 }
 

wallarm/resource_integration_email.go

@@ -131,6 +131,7 @@ func resourceWallarmEmailRead(d *schema.ResourceData, m interface{}) error {
 	clientID := retrieveClientID(d, client)
 	email, err := client.IntegrationRead(clientID, d.Get("integration_id").(int))
 	if err != nil {
+		d.SetId("")
 		return err
 	}
 

wallarm/resource_integration_insightconnect.go

@@ -141,6 +141,7 @@ func resourceWallarmInsightConnectRead(d *schema.ResourceData, m interface{}) er
 	clientID := retrieveClientID(d, client)
 	insight, err := client.IntegrationRead(clientID, d.Get("integration_id").(int))
 	if err != nil {
+		d.SetId("")
 		return err
 	}
 

wallarm/resource_integration_opsgenie.go

@@ -108,6 +108,7 @@ func resourceWallarmOpsGenieCreate(d *schema.ResourceData, m interface{}) error
 	active := d.Get("active").(bool)
 	events, err := expandWallarmEventToIntEvents(d.Get("event").(interface{}), "opsgenie")
 	if err != nil {
+		d.SetId("")
 		return err
 	}
 

wallarm/resource_integration_pagerduty.go

@@ -107,6 +107,7 @@ func resourceWallarmPagerDutyCreate(d *schema.ResourceData, m interface{}) error
 	active := d.Get("active").(bool)
 	events, err := expandWallarmEventToIntEvents(d.Get("event").(interface{}), "pager_duty")
 	if err != nil {
+		d.SetId("")
 		return err
 	}
 

wallarm/resource_integration_slack.go

@@ -101,6 +101,7 @@ func resourceWallarmSlackCreate(d *schema.ResourceData, m interface{}) error {
 	active := d.Get("active").(bool)
 	events, err := expandWallarmEventToIntEvents(d.Get("event").(interface{}), "slack")
 	if err != nil {
+		d.SetId("")
 		return err
 	}
 

wallarm/resource_integration_splunk.go

@@ -109,6 +109,7 @@ func resourceWallarmSplunkCreate(d *schema.ResourceData, m interface{}) error {
 	active := d.Get("active").(bool)
 	events, err := expandWallarmEventToIntEvents(d.Get("event").(interface{}), "splunk")
 	if err != nil {
+		d.SetId("")
 		return err
 	}
 

wallarm/resource_integration_sumologic.go

@@ -101,6 +101,7 @@ func resourceWallarmSumologicCreate(d *schema.ResourceData, m interface{}) error
 	active := d.Get("active").(bool)
 	events, err := expandWallarmEventToIntEvents(d.Get("event").(interface{}), "sumo_logic")
 	if err != nil {
+		d.SetId("")
 		return err
 	}
 

wallarm/resource_integration_webhook.go

@@ -146,6 +146,7 @@ func resourceWallarmWebhookCreate(d *schema.ResourceData, m interface{}) error {
 
 	events, err := expandWallarmEventToIntEvents(d.Get("event").(interface{}), "web_hooks")
 	if err != nil {
+		d.SetId("")
 		return err
 	}
 

wallarm/resource_node.go

@@ -108,9 +108,10 @@ func resourceWallarmNodeRead(d *schema.ResourceData, m interface{}) error {
 		return err
 	}
 
+	found := false
 	for _, node := range nodes.Body {
 		if node.Hostname == hostname {
-
+			found = true
 			if err := d.Set("hostname", node.Hostname); err != nil {
 				return err
 			}
@@ -134,6 +135,10 @@ func resourceWallarmNodeRead(d *schema.ResourceData, m interface{}) error {
 
 	}
 
+	if !found {
+		d.SetId("")
+	}
+
 	return nil
 }
 

wallarm/resource_trigger.go

@@ -265,6 +265,7 @@ func resourceWallarmTriggerRead(d *schema.ResourceData, m interface{}) error {
 		}
 	}
 
+	d.SetId("")
 	return fmt.Errorf("can't find a trigger with ID: %d", triggerID)
 }