From e91a8dbe937e7dffda19f837b09f2c8588ecbce2 Mon Sep 17 00:00:00 2001
From: Philip Reichenberger <philip@paperspace.com>
Date: Tue, 8 Sep 2020 21:16:35 -0400
Subject: [PATCH] Reset ID if not found

---
 .../resource_autoscaling_group.go             | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/terraform-provider-paperspace/resource_autoscaling_group.go b/src/terraform-provider-paperspace/resource_autoscaling_group.go
index 4994855..9278f88 100644
--- a/src/terraform-provider-paperspace/resource_autoscaling_group.go
+++ b/src/terraform-provider-paperspace/resource_autoscaling_group.go
@@ -8,6 +8,18 @@ import (
 	"github.com/paperspace/paperspace-go"
 )
 
+func resetIfNotFound(d *schema.ResourceData, err error) error {
+	paperspaceError, ok := err.(paperspace.PaperspaceError)
+	if ok {
+		if paperspaceError.Status == 404 {
+			d.SetId("")
+			return nil
+		}
+	}
+
+	return err
+}
+
 func resourceAutoscalingGroupCreate(d *schema.ResourceData, m interface{}) error {
 	var autoscalingGroup paperspace.AutoscalingGroup
 
@@ -52,15 +64,7 @@ func resourceAutoscalingGroupRead(d *schema.ResourceData, m interface{}) error {
 
 	autoscalingGroup, err := paperspaceClient.GetAutoscalingGroup(d.Id(), paperspace.AutoscalingGroupGetParams{})
 	if err != nil {
-		paperspaceError, ok := err.(paperspace.PaperspaceError)
-		if ok {
-			if paperspaceError.Status == 404 {
-				d.SetId("")
-				return nil
-			}
-		}
-
-		return err
+		return resetIfNotFound(d, err)
 	}
 
 	d.Set("name", autoscalingGroup.Name)
@@ -90,7 +94,7 @@ func resourceAutoscalingGroupUpdate(d *schema.ResourceData, m interface{}) error
 
 	err := resource.Retry(d.Timeout(schema.TimeoutCreate), func() *resource.RetryError {
 		if err := paperspaceClient.UpdateAutoscalingGroup(d.Id(), autoscalingGroupUpdateParams); err != nil {
-			return resource.RetryableError(err)
+			return resource.RetryableError(resetIfNotFound(d, err))
 		}
 
 		return resource.NonRetryableError(nil)
@@ -114,7 +118,7 @@ func resourceAutoscalingGroupDelete(d *schema.ResourceData, m interface{}) error
 
 	return resource.Retry(d.Timeout(schema.TimeoutDelete), func() *resource.RetryError {
 		if err := paperspaceClient.DeleteAutoscalingGroup(d.Id(), paperspace.AutoscalingGroupDeleteParams{}); err != nil {
-			return resource.RetryableError(err)
+			return resource.RetryableError(resetIfNotFound(d, err))
 		}
 
 		return resource.NonRetryableError(nil)