reviewfix2

Author: Pawel Peksa

castai/resource_pod_mutation.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
+	"strings"
 	"time"
 
 	"github.com/hashicorp/terraform-plugin-log/tflog"
@@ -457,13 +458,17 @@ func distributionGroupSchema() map[string]*schema.Schema {
 }
 
 func podMutationStateImporter(ctx context.Context, d *schema.ResourceData, meta any) ([]*schema.ResourceData, error) {
-	organizationID, id := parseImportID(d)
-	if organizationID != "" {
-		if err := d.Set(FieldPodMutationOrganizationID, organizationID); err != nil {
-			return nil, err
-		}
+	parts := strings.Split(d.Id(), "/")
+	if len(parts) != 3 {
+		return nil, fmt.Errorf("invalid import ID %s, expected format: organization_id/cluster_id/mutation_id", d.Id())
+	}
+	if err := d.Set(FieldPodMutationOrganizationID, parts[0]); err != nil {
+		return nil, err
+	}
+	if err := d.Set(FieldPodMutationClusterID, parts[1]); err != nil {
+		return nil, err
 	}
-	d.SetId(id)
+	d.SetId(parts[2])
 	return []*schema.ResourceData{d}, nil
 }
 

castai/resource_pod_mutation_test.go

@@ -24,8 +24,8 @@ import (
 )
 
 const (
-	testOrgID     = "4e4cd9eb-82eb-407e-a926-e5fef81cab50"
-	testClusterID = "b6bfc074-a267-400f-b8f1-db0850c369b1"
+	testOrgID      = "4e4cd9eb-82eb-407e-a926-e5fef81cab50"
+	testClusterID  = "b6bfc074-a267-400f-b8f1-db0850c369b1"
 	testMutationID = "a1b2c3d4-e5f6-7890-abcd-ef1234567890"
 )
 
@@ -301,6 +301,39 @@ func TestPodMutation_UpdateContext(t *testing.T) {
 	})
 }
 
+func TestPodMutation_StateImporter(t *testing.T) {
+	t.Parallel()
+
+	t.Run("three part ID sets organization_id, cluster_id, and mutation_id", func(t *testing.T) {
+		r := require.New(t)
+		res := resourcePodMutation()
+		d := res.Data(nil)
+		d.SetId("org-123/cluster-456/mutation-789")
+
+		result, err := res.Importer.StateContext(t.Context(), d, nil)
+
+		r.NoError(err)
+		r.Len(result, 1)
+		r.Equal("mutation-789", d.Id())
+		r.Equal("org-123", d.Get(FieldPodMutationOrganizationID))
+		r.Equal("cluster-456", d.Get(FieldPodMutationClusterID))
+	})
+
+	for _, id := range []string{"mutation-789", "org-123/mutation-789", "a/b/c/d"} {
+		t.Run("invalid import ID "+id, func(t *testing.T) {
+			r := require.New(t)
+			res := resourcePodMutation()
+			d := res.Data(nil)
+			d.SetId(id)
+
+			_, err := res.Importer.StateContext(t.Context(), d, nil)
+
+			r.Error(err)
+			r.Contains(err.Error(), "invalid import ID")
+		})
+	}
+}
+
 func TestAccCloudAgnostic_ResourcePodMutation(t *testing.T) {
 	rName := fmt.Sprintf("%v-pod-mutation-%v", ResourcePrefix, acctest.RandString(8))
 	resourceName := "castai_pod_mutation.test"
@@ -343,6 +376,17 @@ func TestAccCloudAgnostic_ResourcePodMutation(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "object_filter_v2.0.namespaces.0.value", "^prod-.*$"),
 				),
 			},
+			{
+				// Test import with organization_id/cluster_id/mutation_id
+				ResourceName: resourceName,
+				ImportStateIdFunc: func(s *tfterraform.State) (string, error) {
+					rs := s.RootModule().Resources[resourceName]
+					clusterID := rs.Primary.Attributes["cluster_id"]
+					return fmt.Sprintf("%s/%s/%s", organizationID, clusterID, rs.Primary.ID), nil
+				},
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 			{
 				// Test update to zero values - verifies no drift on next plan
 				Config: testAccPodMutationConfigZeroValues(rName, clusterName, organizationID),