[ignore] Addition of child data source model to data_source_aci_rest_managed without content_on_destroy

Author: shrsr

internal/provider/data_source_aci_rest_managed.go

@@ -37,6 +37,12 @@ type AciRestManagedDataSourceModel struct {
 	Annotation types.String `tfsdk:"annotation"`
 }
 
+type ChildAciRestManagedDataSourceModel struct {
+	Rn        types.String `tfsdk:"rn"`
+	ClassName types.String `tfsdk:"class_name"`
+	Content   types.Map    `tfsdk:"content"`
+}
+
 func (d *AciRestManagedDataSource) Metadata(ctx context.Context, req datasource.MetadataRequest, resp *datasource.MetadataResponse) {
 	tflog.Debug(ctx, "Start schema of datasource: aci_rest_managed")
 	resp.TypeName = req.ProviderTypeName + "_rest_managed"
@@ -164,13 +170,13 @@ func (d *AciRestManagedDataSource) Read(ctx context.Context, req datasource.Read
 			}
 			data.Content, _ = types.MapValue(types.StringType, content)
 
-			childList := make([]ChildAciRestManagedResourceModel, 0)
+			childList := make([]ChildAciRestManagedDataSourceModel, 0)
 			if _, ok := classReadInfo[0].(map[string]interface{})["children"]; ok {
 				for _, child := range classReadInfo[0].(map[string]interface{})["children"].([]interface{}) {
 					for childClassName, childClassDetails := range child.(map[string]interface{}) {
 						childAttributes := childClassDetails.(map[string]interface{})["attributes"].(map[string]interface{})
 						childContents := map[string]attr.Value{}
-						ChildAciRestManaged := ChildAciRestManagedResourceModel{}
+						ChildAciRestManaged := ChildAciRestManagedDataSourceModel{}
 						ChildAciRestManaged.ClassName = basetypes.NewStringValue(childClassName)
 
 						if val, ok := childAttributes["rn"]; ok {

internal/provider/resource_aci_rest_managed.go

@@ -400,10 +400,6 @@ func (r *AciRestManagedResource) Delete(ctx context.Context, req resource.Delete
 	if hasContentOnDestroy {
 		tflog.Debug(ctx, "content_on_destroy is specified, applying destroy configuration")
 
-		// Store original values
-		originalContent := data.Content
-		originalChild := data.Child
-
 		// Apply content_on_destroy to parent
 		data.Content = data.ContentOnDestroy
 
@@ -442,19 +438,12 @@ func (r *AciRestManagedResource) Delete(ctx context.Context, req resource.Delete
 		//   getAciRestManagedChildPayloads will compare and mark children not in childrenWithDestroyConfig for deletion
 		jsonPayload = getAciRestManagedCreateJsonPayload(ctx, &resp.Diagnostics, false, data, childrenWithDestroyConfig, currentChildren)
 
-		// Restore original values
-		data.Content = originalContent
-		data.Child = originalChild
-
 		if resp.Diagnostics.HasError() {
 			return
 		}
 
-		tflog.Debug(ctx, "Successfully built destroy configuration payload")
 	} else {
 		// No content_on_destroy - perform regular delete
-		tflog.Debug(ctx, "No content_on_destroy specified, performing regular delete")
-
 		jsonPayload = GetDeleteJsonPayload(ctx, &resp.Diagnostics, data.ClassName.ValueString(), data.Id.ValueString())
 		if resp.Diagnostics.HasError() {
 			return

internal/provider/resource_aci_rest_managed_test.go

@@ -7,7 +7,6 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
-	"github.com/hashicorp/terraform-plugin-testing/terraform"
 )
 
 func TestAccAciRestManaged_tenant(t *testing.T) {
@@ -981,67 +980,34 @@ func TestAccAciRestManaged_onDestroyCreate(t *testing.T) {
 }
 
 func TestAccAciRestManaged_onDestroyImport(t *testing.T) {
-
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { testAccPreCheck(t, "both", "5.2(1g)-") },
 		ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
 		Steps: []resource.TestStep{
 			{
-				Config:        testAccAciRestManagedConfig_onDestroyMinimal(),
-				ImportState:   true,
-				ImportStateId: fmt.Sprintf("uni/tn-%s:ap-web,ctx-vrf1", onDestroyTestName),
-				ResourceName:  "aci_rest_managed.tenant_with_destroy",
-				ImportStateCheck: func(states []*terraform.InstanceState) error {
-					if len(states) != 1 {
-						return fmt.Errorf("expected 1 resource state, got %d", len(states))
-					}
-
-					state := states[0]
-
-					// Validate parent
-					if state.Attributes["dn"] != "uni/tn-"+onDestroyTestName {
-						return fmt.Errorf("dn mismatch")
-					}
-
-					if state.Attributes["class_name"] != "fvTenant" {
-						return fmt.Errorf("class_name mismatch")
-					}
-
-					if state.Attributes["content.descr"] != "Decommissioned Tenant" {
-						return fmt.Errorf("content.descr mismatch: expected 'Decommissioned Tenant', got '%s'", state.Attributes["content.descr"])
-					}
-
-					// Check children count
-					childCount := 2
-					if state.Attributes["child.#"] != "2" {
-						return fmt.Errorf("expected 2 children, got %s", state.Attributes["child.#"])
-					}
-
-					// Validate each child using helper
-					if err := findAndValidateChildForRestManaged(state, childCount, "ap-web", "fvAp", map[string]string{
-						"name":  "web",
-						"descr": "Archived Web App",
-					}); err != nil {
-						return err
-					}
-
-					if err := findAndValidateChildForRestManaged(state, childCount, "ctx-vrf1", "fvCtx", map[string]string{
-						"name":  "vrf1",
-						"descr": "Archived VRF",
-					}); err != nil {
-						return err
-					}
-
-					return nil
-				},
+				Config: testAccDataSourceAciRestManagedConfig_onDestroy(),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr("data.aci_rest_managed.tenant_with_destroy", "class_name", "fvTenant"),
+					resource.TestCheckResourceAttr("data.aci_rest_managed.tenant_with_destroy", "id", "uni/tn-"+onDestroyTestName),
+					resource.TestCheckResourceAttr("data.aci_rest_managed.tenant_with_destroy", "dn", "uni/tn-"+onDestroyTestName),
+					resource.TestCheckResourceAttr("data.aci_rest_managed.tenant_with_destroy", "content.name", onDestroyTestName),
+					resource.TestCheckResourceAttr("data.aci_rest_managed.tenant_with_destroy", "content.descr", "Decommissioned Tenant"),
+					resource.TestCheckResourceAttr("data.aci_rest_managed.tenant_with_destroy", "child.0.class_name", "fvAp"),
+					resource.TestCheckResourceAttr("data.aci_rest_managed.tenant_with_destroy", "child.0.rn", "ap-web"),
+					resource.TestCheckResourceAttr("data.aci_rest_managed.tenant_with_destroy", "child.0.content.name", "web"),
+					resource.TestCheckResourceAttr("data.aci_rest_managed.tenant_with_destroy", "child.0.content.descr", "Archived Web App"),
+					resource.TestCheckResourceAttr("data.aci_rest_managed.tenant_with_destroy", "child.1.class_name", "fvCtx"),
+					resource.TestCheckResourceAttr("data.aci_rest_managed.tenant_with_destroy", "child.1.rn", "ctx-vrf1"),
+					resource.TestCheckResourceAttr("data.aci_rest_managed.tenant_with_destroy", "child.1.content.name", "vrf1"),
+					resource.TestCheckResourceAttr("data.aci_rest_managed.tenant_with_destroy", "child.1.content.descr", "Archived VRF"),
+				),
 			},
 			{
 				Config:        testAccAciRestManagedConfig_onDestroyMinimal(),
 				ImportState:   true,
 				ImportStateId: fmt.Sprintf("uni/tn-%s:ap-database", onDestroyTestName),
 				ResourceName:  "aci_rest_managed.tenant_with_destroy",
 				ExpectError:   regexp.MustCompile("Unable to find specified child 'ap-database'"),
-				Destroy:       true,
 			},
 		},
 	})
@@ -1670,6 +1636,14 @@ func testAccAciRestManagedConfig_onDestroy() string {
     `, onDestroyTestName)
 }
 
+func testAccDataSourceAciRestManagedConfig_onDestroy() string {
+	return fmt.Sprintf(`
+    data "aci_rest_managed" "tenant_with_destroy" {
+        dn = "uni/tn-%[1]s"
+    }
+    `, onDestroyTestName)
+}
+
 func testAccAciRestManagedConfig_onDestroyMinimal() string {
 	return fmt.Sprintf(`
     resource "aci_rest_managed" "tenant_with_destroy" {