From a2d9c2a2ebe6aefd8c2c8cec7c419f54f454eb74 Mon Sep 17 00:00:00 2001 From: Somanath Chavan Date: Thu, 12 Sep 2024 15:12:57 +0100 Subject: [PATCH] fix for context and history parameter of template assignment Signed-off-by: Somanath Chavan --- ...iam_trusted_profile_template_assignment.go | 19 +++++++++++-------- ...rusted_profile_template_assignment_test.go | 7 +++---- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/ibm/service/iamidentity/resource_ibm_iam_trusted_profile_template_assignment.go b/ibm/service/iamidentity/resource_ibm_iam_trusted_profile_template_assignment.go index ad1ae38e10..2b4a131291 100644 --- a/ibm/service/iamidentity/resource_ibm_iam_trusted_profile_template_assignment.go +++ b/ibm/service/iamidentity/resource_ibm_iam_trusted_profile_template_assignment.go @@ -6,10 +6,11 @@ package iamidentity import ( "context" "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "log" "time" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" @@ -434,14 +435,16 @@ func resourceIBMTrustedProfileTemplateAssignmentRead(context context.Context, d if err = d.Set("target", templateAssignmentResponse.Target); err != nil { return diag.FromErr(fmt.Errorf("error setting target: %s", err)) } + ctx := []map[string]interface{}{} if !core.IsNil(templateAssignmentResponse.Context) { contextMap, err := resourceIBMTrustedProfileTemplateAssignmentResponseContextToMap(templateAssignmentResponse.Context) if err != nil { return diag.FromErr(err) } - if err = d.Set("context", []map[string]interface{}{contextMap}); err != nil { - return diag.FromErr(fmt.Errorf("error setting context: %s", err)) - } + ctx = append(ctx, contextMap) + } + if err = d.Set("context", ctx); err != nil { + return diag.FromErr(fmt.Errorf("[ERROR] Error setting context: %s", err)) } if err = d.Set("account_id", templateAssignmentResponse.AccountID); err != nil { return diag.FromErr(fmt.Errorf("error setting account_id: %s", err)) @@ -462,8 +465,8 @@ func resourceIBMTrustedProfileTemplateAssignmentRead(context context.Context, d return diag.FromErr(fmt.Errorf("error setting resources: %s", err)) } } + history := []map[string]interface{}{} if !core.IsNil(templateAssignmentResponse.History) { - history := []map[string]interface{}{} for _, historyItem := range templateAssignmentResponse.History { historyItemMap, err := resourceIBMTrustedProfileTemplateAssignmentEnityHistoryRecordToMap(&historyItem) if err != nil { @@ -471,9 +474,9 @@ func resourceIBMTrustedProfileTemplateAssignmentRead(context context.Context, d } history = append(history, historyItemMap) } - if err = d.Set("history", history); err != nil { - return diag.FromErr(fmt.Errorf("error setting history: %s", err)) - } + } + if err = d.Set("history", history); err != nil { + return diag.FromErr(fmt.Errorf("[ERROR] Error setting history: %s", err)) } if !core.IsNil(templateAssignmentResponse.Href) { if err = d.Set("href", templateAssignmentResponse.Href); err != nil { diff --git a/ibm/service/iamidentity/resource_ibm_iam_trusted_profile_template_assignment_test.go b/ibm/service/iamidentity/resource_ibm_iam_trusted_profile_template_assignment_test.go index 8ceeec507a..fa8b5887b8 100644 --- a/ibm/service/iamidentity/resource_ibm_iam_trusted_profile_template_assignment_test.go +++ b/ibm/service/iamidentity/resource_ibm_iam_trusted_profile_template_assignment_test.go @@ -30,8 +30,8 @@ func TestAccIBMTrustedProfileTemplateAssignmentBasic(t *testing.T) { CheckDestroy: testAccCheckIBMTrustedProfileTemplateAssignmentResourceDestroy, Steps: []resource.TestStep{ { - Config: testAccCheckIBMTrustedProfileTemplateAssignmentConfigBasic(name, 1), - ExpectNonEmptyPlan: true, + + Config: testAccCheckIBMTrustedProfileTemplateAssignmentConfigBasic(name, 1), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckIBMTrustedProfileTemplateAssignmentExists("ibm_iam_trusted_profile_template_assignment.trusted_profile_template_assignment_instance", conf), resource.TestCheckResourceAttrSet("ibm_iam_trusted_profile_template_assignment.trusted_profile_template_assignment_instance", "id"), @@ -54,8 +54,7 @@ func TestAccIBMTrustedProfileTemplateAssignmentBasic(t *testing.T) { Config: testAccCheckIBMTrustedProfileTemplateAssignmentConfigBasic(name, 3), }, { - ExpectNonEmptyPlan: true, - Config: testAccCheckIBMTrustedProfileTemplateAssignmentConfigBasic(name, 2), + Config: testAccCheckIBMTrustedProfileTemplateAssignmentConfigBasic(name, 2), Check: resource.ComposeAggregateTestCheckFunc( resource.TestCheckResourceAttr("ibm_iam_trusted_profile_template_assignment.trusted_profile_template_assignment_instance", "template_version", "2"), ),