Reverting the changes for helm import

Author: manimaran89

spectrocloud/resource_registry_helm_import.go

@@ -5,9 +5,7 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/spectrocloud/palette-sdk-go/api/models"
 	"github.com/spectrocloud/palette-sdk-go/client"
-	"github.com/spectrocloud/palette-sdk-go/client/herr"
 )
 
 func resourceRegistryHelmImport(ctx context.Context, d *schema.ResourceData, m interface{}) ([]*schema.ResourceData, error) {
@@ -29,61 +27,42 @@ func GetCommonRegistryHelm(d *schema.ResourceData, m interface{}) (*client.V1Cli
 	// Helm registries are tenant-level resources only
 	c := getV1ClientWithResourceContext(m, "tenant")
 
-	// The import ID can be either a registry UID or a registry name
-	importID := d.Id()
-	if importID == "" {
-		return nil, fmt.Errorf("helm registry import ID or name is required")
+	// The import ID should be the registry UID
+	registryUID := d.Id()
+	if registryUID == "" {
+		return nil, fmt.Errorf("helm registry import ID is required")
 	}
 
-	// Try to get by UID first
-	registry, err := c.GetHelmRegistry(importID)
+	// Validate that the registry exists and we can access it
+	registry, err := c.GetHelmRegistry(registryUID)
 	if err != nil {
-		// If not found by UID, try by name
-		if !herr.IsNotFound(err) {
-			return nil, fmt.Errorf("unable to retrieve Helm registry '%s': %s", importID, err)
-		}
-	} else if registry != nil {
-		// Found by UID
-		if err := setHelmRegistryState(d, registry, importID); err != nil {
-			return nil, err
-		}
-		return c, nil
-	}
-
-	// Try to get by name
-	registry, nameErr := c.GetHelmRegistryByName(importID)
-	if nameErr != nil {
-		return nil, fmt.Errorf("unable to retrieve Helm registry by name or id '%s': %s", importID, nameErr)
-	}
-	if registry == nil || registry.Metadata == nil {
-		return nil, fmt.Errorf("helm registry '%s' not found", importID)
+		return nil, fmt.Errorf("unable to retrieve Helm registry: %s", err)
 	}
-	registryUID := registry.Metadata.UID
-	if registryUID == "" {
-		return nil, fmt.Errorf("helm registry with name '%s' found but has no UID", importID)
+	if registry == nil {
+		return nil, fmt.Errorf("helm registry with ID %s not found", registryUID)
 	}
 
-	if err := setHelmRegistryState(d, registry, registryUID); err != nil {
+	// Set the required fields for the resource
+	if err := d.Set("name", registry.Metadata.Name); err != nil {
 		return nil, err
 	}
-	return c, nil
-}
 
-// setHelmRegistryState sets resource state from a Helm registry and the resolved UID.
-func setHelmRegistryState(d *schema.ResourceData, registry *models.V1HelmRegistry, registryUID string) error {
-	if err := d.Set("name", registry.Metadata.Name); err != nil {
-		return err
-	}
+	// Set the endpoint URL
 	if registry.Spec != nil && registry.Spec.Endpoint != nil && *registry.Spec.Endpoint != "" {
 		if err := d.Set("endpoint", *registry.Spec.Endpoint); err != nil {
-			return err
+			return nil, err
 		}
 	}
+
+	// Set the is_private field from the registry specification
 	if registry.Spec != nil {
 		if err := d.Set("is_private", registry.Spec.IsPrivate); err != nil {
-			return err
+			return nil, err
 		}
 	}
+
+	// Set the ID to the registry ID
 	d.SetId(registryUID)
-	return nil
+
+	return c, nil
 }