[ignore] added errorForObjectNotFound function to the mso util.go

CiscoDevNet · May 24, 2023 · 971c9b8 · 971c9b8
1 parent 505f04d
commit 971c9b8
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/mso/resource_mso_schema.go b/mso/resource_mso_schema.go
@@ -364,12 +364,7 @@ func resourceMSOSchemaRead(d *schema.ResourceData, m interface{}) error {
 	dn := d.Id()
 	con, err := msoClient.GetViaURL(fmt.Sprintf("api/v1/schemas/" + dn))
 	if err != nil {
-		if con.S("code").String() == "404" {
-			d.SetId("")
-			return nil
-		} else {
-			return err
-		}
+		return errorForObjectNotFound(err, dn, con, d)
 	}
 
 	d.SetId(models.StripQuotes(con.S("id").String()))

diff --git a/mso/util.go b/mso/util.go
@@ -1,5 +1,13 @@
 package mso
 
+import (
+	"log"
+	"strings"
+
+	"github.com/ciscoecosystem/mso-go-client/container"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+)
+
 const version = 1
 
 func toStringList(configured interface{}) []string {
@@ -11,4 +19,17 @@ func toStringList(configured interface{}) []string {
 	return vs
 }
 
+func errorForObjectNotFound(err error, dn string, con *container.Container, d *schema.ResourceData) error {
+	if err != nil {
+		if con.S("code").String() == "404" || strings.HasSuffix(err.Error(), "not found") {
+			log.Printf("[WARN] %s, removing from state: %s", err, dn)
+			d.SetId("")
+			return nil
+		} else {
+			return err
+		}
+	}
+	return nil
+}
+
 // CHANGE TO UTILS IF YOU ADD MORE FUNCTIONS