fix: fixed import of ibm_cm_object (#6553)

* fix: fixed import of ibm_cm_object

* improved error handling and added acceptance tests

Author: uibm

ibm/service/catalogmanagement/resource_ibm_cm_object.go

@@ -26,7 +26,66 @@ func ResourceIBMCmObject() *schema.Resource {
 		ReadContext:   resourceIBMCmObjectRead,
 		UpdateContext: resourceIBMCmObjectUpdate,
 		DeleteContext: resourceIBMCmObjectDelete,
-		Importer:      &schema.ResourceImporter{},
+		Importer: &schema.ResourceImporter{
+			State: func(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
+
+				catalogManagementClient, err := meta.(conns.ClientSession).CatalogManagementV1()
+				if err != nil {
+					tfErr := flex.TerraformErrorf(err, err.Error(), "ibm_cm_object", "import")
+					log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
+					return nil, fmt.Errorf("error creating catalog management client during import: %w", err)
+				}
+
+				catalogOptions := &catalogmanagementv1.ListCatalogsOptions{}
+				catalogs, _, err := catalogManagementClient.ListCatalogs(catalogOptions)
+				if err != nil {
+					tfErr := flex.TerraformErrorf(err, err.Error(), "ibm_cm_object", "import")
+					log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
+					return nil, fmt.Errorf("error listing catalogs during import: %w", err)
+				}
+
+				id := d.Id()
+				found := false
+
+				for _, c := range catalogs.Resources {
+					if c.ID == nil {
+						continue
+					}
+
+					getObjectOptions := &catalogmanagementv1.GetObjectOptions{
+						CatalogIdentifier: c.ID,
+						ObjectIdentifier:  &id,
+					}
+
+					catalogObject, res, err := catalogManagementClient.GetObject(getObjectOptions)
+
+					if err != nil && res.StatusCode != 404 {
+						tfErr := flex.TerraformErrorf(err, err.Error(), "ibm_cm_object", "import")
+						log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
+						continue
+					}
+
+					if catalogObject == nil || catalogObject.CatalogID == nil {
+						continue
+					}
+
+					if err := d.Set("catalog_id", *catalogObject.CatalogID); err != nil {
+						tfErr := flex.TerraformErrorf(err, err.Error(), "ibm_cm_object", "import")
+						log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
+						return nil, fmt.Errorf("error setting catalog_id during import: %w", err)
+					}
+
+					found = true
+					break
+				}
+
+				if !found {
+					return nil, fmt.Errorf("ibm_cm_object with id %q not found in any catalog", d.Id())
+				}
+
+				return []*schema.ResourceData{d}, nil
+			},
+		},
 
 		Schema: map[string]*schema.Schema{
 			"catalog_id": &schema.Schema{

ibm/service/catalogmanagement/resource_ibm_cm_object_test.go

@@ -5,6 +5,7 @@ package catalogmanagement_test
 
 import (
 	"fmt"
+	"regexp"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
@@ -62,11 +63,55 @@ func testAccCheckIBMCmObjectConfig(name string, parentID string, label string, s
 			short_description = "%s"
 			kind = "%s"
 			tags = ["test1", "test2"]
-			data = jsonencode(local.catalog_object_data)
 		}
 	`, kind, name, parentID, label, shortDescription, kind)
 }
 
+func TestAccIBMCmObjectImport(t *testing.T) {
+	var conf catalogmanagementv1.CatalogObject
+	name := fmt.Sprintf("tf_name_%d", acctest.RandIntRange(10, 100))
+	parentID := "us-south"
+	label := fmt.Sprintf("tf_label_%d", acctest.RandIntRange(10, 100))
+	shortDescription := fmt.Sprintf("tf_short_description_%d", acctest.RandIntRange(10, 100))
+	kind := "vpe"
+
+	badID := "this-id-does-not-exist-12345"
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { acc.TestAccPreCheck(t) },
+		Providers:    acc.TestAccProviders,
+		CheckDestroy: testAccCheckIBMCmObjectDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccCheckIBMCmObjectConfig(name, parentID, label, shortDescription, kind),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					testAccCheckIBMCmObjectExists("ibm_cm_object.cm_object", conf),
+					resource.TestCheckResourceAttr("ibm_cm_object.cm_object", "name", name),
+					resource.TestCheckResourceAttr("ibm_cm_object.cm_object", "parent_id", parentID),
+					resource.TestCheckResourceAttr("ibm_cm_object.cm_object", "label", label),
+					resource.TestCheckResourceAttr("ibm_cm_object.cm_object", "short_description", shortDescription),
+					resource.TestCheckResourceAttr("ibm_cm_object.cm_object", "kind", kind),
+				),
+			},
+
+			{
+				ResourceName:  "ibm_cm_object.cm_object",
+				ImportState:   true,
+				ImportStateId: badID,
+				ExpectError: regexp.MustCompile(
+					`ibm_cm_object with id "` + badID + `" not found in any catalog`,
+				),
+			},
+
+			{
+				ResourceName:      "ibm_cm_object.cm_object",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
+
 func testAccCheckIBMCmObjectExists(n string, obj catalogmanagementv1.CatalogObject) resource.TestCheckFunc {
 
 	return func(s *terraform.State) error {