if resource is not found we should be fine

redhat-developer · Oct 28, 2022 · 82972f5 · 82972f5
1 parent 1f477b4
commit 82972f5
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/rhoas/kafka/resource_kafka.go b/rhoas/kafka/resource_kafka.go
@@ -2,11 +2,13 @@ package kafka
 
 import (
 	"context"
+	"net/http"
+	"strings"
+	"time"
+
 	kafkainstanceclient "github.com/redhat-developer/app-services-sdk-go/kafkainstance/apiv1/client"
 	"github.com/redhat-developer/terraform-provider-rhoas/rhoas/acl"
 	"github.com/redhat-developer/terraform-provider-rhoas/rhoas/localize"
-	"strings"
-	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
@@ -184,6 +186,9 @@ func kafkaDelete(ctx context.Context, d *schema.ResourceData, m interface{}) dia
 		},
 		Refresh: func() (interface{}, string, error) {
 			data, resp, err1 := factory.KafkaMgmt().GetKafkaById(ctx, d.Id()).Execute()
+			if resp.StatusCode == http.StatusNotFound {
+				return data, "deleted", nil
+			}
 			if apiErr := utils.GetAPIError(factory, resp, err1); apiErr != nil {
 				return nil, "", apiErr
 			}

diff --git a/rhoas/tests/kafka_test.go b/rhoas/tests/kafka_test.go
@@ -3,6 +3,7 @@ package tests
 import (
 	"context"
 	"fmt"
+	"net/http"
 	"regexp"
 	"testing"
 
@@ -127,6 +128,9 @@ func testAccCheckKafkaDestroy(s *terraform.State) error {
 
 		// Retrieve the kafka struct by referencing it's state ID for API lookup
 		kafka, resp, err := factory.KafkaMgmt().GetKafkaById(context.Background(), rs.Primary.ID).Execute()
+		if resp.StatusCode == http.StatusNotFound {
+			return nil
+		}
 		if apiErr := utils.GetAPIError(factory, resp, err); apiErr != nil {
 			return apiErr
 		}

diff --git a/rhoas/tests/serviceaccount_test.go b/rhoas/tests/serviceaccount_test.go
@@ -3,6 +3,7 @@ package tests
 import (
 	"context"
 	"fmt"
+	"net/http"
 	"regexp"
 	"testing"
 
@@ -188,6 +189,9 @@ func testAccCheckServiceAccountDestroy(s *terraform.State) error {
 
 		// Retrieve the service account struct by referencing it's state ID for API lookup
 		serviceAccount, resp, err := factory.ServiceAccountMgmt().GetServiceAccount(context.Background(), rs.Primary.ID).Execute()
+		if resp.StatusCode == http.StatusNotFound {
+			return nil
+		}
 		if apiErr := utils.GetAPIError(factory, resp, err); apiErr != nil {
 			return apiErr
 		}