From 44d3c41c5cf70b3cb28554d1cbd7330f54e78484 Mon Sep 17 00:00:00 2001 From: Somanath Chavan Date: Thu, 6 Feb 2025 11:42:31 +0000 Subject: [PATCH] fix(identity) new error messages for TP identity --- ...urce_ibm_iam_trusted_profile_identities.go | 53 ++++++----- ...ibm_iam_trusted_profile_identities_test.go | 34 +++++++- ...source_ibm_iam_trusted_profile_identity.go | 41 ++++++--- ...e_ibm_iam_trusted_profile_identity_test.go | 6 +- ...source_ibm_iam_trusted_profile_identity.go | 87 +++++++++++-------- ...e_ibm_iam_trusted_profile_identity_test.go | 14 +-- 6 files changed, 157 insertions(+), 78 deletions(-) diff --git a/ibm/service/iamidentity/data_source_ibm_iam_trusted_profile_identities.go b/ibm/service/iamidentity/data_source_ibm_iam_trusted_profile_identities.go index d19300e1c29..a3b3a9a01e3 100644 --- a/ibm/service/iamidentity/data_source_ibm_iam_trusted_profile_identities.go +++ b/ibm/service/iamidentity/data_source_ibm_iam_trusted_profile_identities.go @@ -1,6 +1,10 @@ -// Copyright IBM Corp. 2023 All Rights Reserved. +// Copyright IBM Corp. 2025 All Rights Reserved. // Licensed under the Mozilla Public License v2.0 +/* + * IBM OpenAPI Terraform Generator Version: 3.98.0-8be2046a-20241205-162752 + */ + package iamidentity import ( @@ -13,6 +17,8 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns" + "github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex" + "github.com/IBM/go-sdk-core/v5/core" "github.com/IBM/platform-services-go-sdk/iamidentityv1" ) @@ -75,37 +81,42 @@ func DataSourceIBMIamTrustedProfileIdentities() *schema.Resource { func dataSourceIBMIamTrustedProfileIdentitiesRead(context context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { iamIdentityClient, err := meta.(conns.ClientSession).IAMIdentityV1API() if err != nil { - return diag.FromErr(err) + tfErr := flex.DiscriminatedTerraformErrorf(err, err.Error(), "(Data) ibm_iam_trusted_profile_identities", "read", "initialize-client") + log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage()) + return tfErr.GetDiag() } getProfileIdentitiesOptions := &iamidentityv1.GetProfileIdentitiesOptions{} getProfileIdentitiesOptions.SetProfileID(d.Get("profile_id").(string)) - profileIdentitiesResponse, response, err := iamIdentityClient.GetProfileIdentitiesWithContext(context, getProfileIdentitiesOptions) + profileIdentitiesResponse, _, err := iamIdentityClient.GetProfileIdentitiesWithContext(context, getProfileIdentitiesOptions) if err != nil { - log.Printf("[DEBUG] GetProfileIdentitiesWithContext failed %s\n%s", err, response) - return diag.FromErr(fmt.Errorf("GetProfileIdentitiesWithContext failed %s\n%s", err, response)) + tfErr := flex.TerraformErrorf(err, fmt.Sprintf("GetProfileIdentitiesWithContext failed: %s", err.Error()), "(Data) ibm_iam_trusted_profile_identities", "read") + log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage()) + return tfErr.GetDiag() } d.SetId(dataSourceIBMIamTrustedProfileIdentitiesID(d)) - if err = d.Set("entity_tag", profileIdentitiesResponse.EntityTag); err != nil { - return diag.FromErr(fmt.Errorf("Error setting entity_tag: %s", err)) + if !core.IsNil(profileIdentitiesResponse.EntityTag) { + if err = d.Set("entity_tag", profileIdentitiesResponse.EntityTag); err != nil { + return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting entity_tag: %s", err), "(Data) ibm_iam_trusted_profile_identities", "read", "set-entity_tag").GetDiag() + } } - identities := []map[string]interface{}{} - if profileIdentitiesResponse.Identities != nil { - for _, modelItem := range profileIdentitiesResponse.Identities { - modelMap, err := dataSourceIBMIamTrustedProfileIdentitiesProfileIdentityResponseToMap(&modelItem) + if !core.IsNil(profileIdentitiesResponse.Identities) { + identities := []map[string]interface{}{} + for _, identitiesItem := range profileIdentitiesResponse.Identities { + identitiesItemMap, err := DataSourceIBMIamTrustedProfileIdentitiesProfileIdentityResponseToMap(&identitiesItem) // #nosec G601 if err != nil { - return diag.FromErr(err) + return flex.DiscriminatedTerraformErrorf(err, err.Error(), "(Data) ibm_iam_trusted_profile_identities", "read", "identities-to-map").GetDiag() } - identities = append(identities, modelMap) + identities = append(identities, identitiesItemMap) + } + if err = d.Set("identities", identities); err != nil { + return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting identities: %s", err), "(Data) ibm_iam_trusted_profile_identities", "read", "set-identities").GetDiag() } - } - if err = d.Set("identities", identities); err != nil { - return diag.FromErr(fmt.Errorf("Error setting identities %s", err)) } return nil @@ -116,16 +127,16 @@ func dataSourceIBMIamTrustedProfileIdentitiesID(d *schema.ResourceData) string { return time.Now().UTC().String() } -func dataSourceIBMIamTrustedProfileIdentitiesProfileIdentityResponseToMap(model *iamidentityv1.ProfileIdentityResponse) (map[string]interface{}, error) { +func DataSourceIBMIamTrustedProfileIdentitiesProfileIdentityResponseToMap(model *iamidentityv1.ProfileIdentityResponse) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) - modelMap["iam_id"] = model.IamID - modelMap["identifier"] = model.Identifier - modelMap["type"] = model.Type + modelMap["iam_id"] = *model.IamID + modelMap["identifier"] = *model.Identifier + modelMap["type"] = *model.Type if model.Accounts != nil { modelMap["accounts"] = model.Accounts } if model.Description != nil { - modelMap["description"] = model.Description + modelMap["description"] = *model.Description } return modelMap, nil } diff --git a/ibm/service/iamidentity/data_source_ibm_iam_trusted_profile_identities_test.go b/ibm/service/iamidentity/data_source_ibm_iam_trusted_profile_identities_test.go index 4020f1eb8e2..a3fd6198f93 100644 --- a/ibm/service/iamidentity/data_source_ibm_iam_trusted_profile_identities_test.go +++ b/ibm/service/iamidentity/data_source_ibm_iam_trusted_profile_identities_test.go @@ -1,6 +1,10 @@ -// Copyright IBM Corp. 2023 All Rights Reserved. +// Copyright IBM Corp. 2025 All Rights Reserved. // Licensed under the Mozilla Public License v2.0 +/* + * IBM OpenAPI Terraform Generator Version: 3.98.0-8be2046a-20241205-162752 + */ + package iamidentity_test import ( @@ -10,6 +14,10 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" acc "github.com/IBM-Cloud/terraform-provider-ibm/ibm/acctest" + "github.com/IBM-Cloud/terraform-provider-ibm/ibm/service/iamidentity" + "github.com/IBM/go-sdk-core/v5/core" + "github.com/IBM/platform-services-go-sdk/iamidentityv1" + "github.com/stretchr/testify/assert" ) func TestAccIBMIamTrustedProfileIdentitiesDataSourceBasic(t *testing.T) { @@ -36,3 +44,27 @@ func testAccCheckIBMIamTrustedProfileIdentitiesDataSourceConfigBasic() string { } `, profileID) } + +func TestDataSourceIBMIamTrustedProfileIdentitiesProfileIdentityResponseToMap(t *testing.T) { + checkResult := func(result map[string]interface{}) { + model := make(map[string]interface{}) + model["iam_id"] = "testString" + model["identifier"] = "testString" + model["type"] = "user" + model["accounts"] = []string{"testString"} + model["description"] = "testString" + + assert.Equal(t, result, model) + } + + model := new(iamidentityv1.ProfileIdentityResponse) + model.IamID = core.StringPtr("testString") + model.Identifier = core.StringPtr("testString") + model.Type = core.StringPtr("user") + model.Accounts = []string{"testString"} + model.Description = core.StringPtr("testString") + + result, err := iamidentity.DataSourceIBMIamTrustedProfileIdentitiesProfileIdentityResponseToMap(model) + assert.Nil(t, err) + checkResult(result) +} diff --git a/ibm/service/iamidentity/data_source_ibm_iam_trusted_profile_identity.go b/ibm/service/iamidentity/data_source_ibm_iam_trusted_profile_identity.go index 0559a821132..ef8eca07d6f 100644 --- a/ibm/service/iamidentity/data_source_ibm_iam_trusted_profile_identity.go +++ b/ibm/service/iamidentity/data_source_ibm_iam_trusted_profile_identity.go @@ -1,6 +1,10 @@ -// Copyright IBM Corp. 2023 All Rights Reserved. +// Copyright IBM Corp. 2025 All Rights Reserved. // Licensed under the Mozilla Public License v2.0 +/* + * IBM OpenAPI Terraform Generator Version: 3.98.0-8be2046a-20241205-162752 + */ + package iamidentity import ( @@ -13,6 +17,8 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns" + "github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex" + "github.com/IBM/go-sdk-core/v5/core" "github.com/IBM/platform-services-go-sdk/iamidentityv1" ) @@ -71,7 +77,9 @@ func DataSourceIBMIamTrustedProfileIdentity() *schema.Resource { func dataSourceIBMIamTrustedProfileIdentityRead(context context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { iamIdentityClient, err := meta.(conns.ClientSession).IAMIdentityV1API() if err != nil { - return diag.FromErr(err) + tfErr := flex.DiscriminatedTerraformErrorf(err, err.Error(), "(Data) ibm_iam_trusted_profile_identity", "read", "initialize-client") + log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage()) + return tfErr.GetDiag() } getProfileIdentityOptions := &iamidentityv1.GetProfileIdentityOptions{} @@ -80,28 +88,41 @@ func dataSourceIBMIamTrustedProfileIdentityRead(context context.Context, d *sche getProfileIdentityOptions.SetIdentityType(d.Get("identity_type").(string)) getProfileIdentityOptions.SetIdentifierID(d.Get("identifier_id").(string)) - profileIdentityResponse, response, err := iamIdentityClient.GetProfileIdentityWithContext(context, getProfileIdentityOptions) + profileIdentityResponse, _, err := iamIdentityClient.GetProfileIdentityWithContext(context, getProfileIdentityOptions) if err != nil { - log.Printf("[DEBUG] GetProfileIdentityWithContext failed %s\n%s", err, response) - return diag.FromErr(fmt.Errorf("GetProfileIdentityWithContext failed %s\n%s", err, response)) + tfErr := flex.TerraformErrorf(err, fmt.Sprintf("GetProfileIdentityWithContext failed: %s", err.Error()), "(Data) ibm_iam_trusted_profile_identity", "read") + log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage()) + return tfErr.GetDiag() } d.SetId(dataSourceIBMIamTrustedProfileIdentityID(d)) if err = d.Set("iam_id", profileIdentityResponse.IamID); err != nil { - return diag.FromErr(fmt.Errorf("Error setting iam_id: %s", err)) + return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting iam_id: %s", err), "(Data) ibm_iam_trusted_profile_identity", "read", "set-iam_id").GetDiag() } if err = d.Set("identifier", profileIdentityResponse.Identifier); err != nil { - return diag.FromErr(fmt.Errorf("Error setting identifier: %s", err)) + return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting identifier: %s", err), "(Data) ibm_iam_trusted_profile_identity", "read", "set-identifier").GetDiag() } if err = d.Set("type", profileIdentityResponse.Type); err != nil { - return diag.FromErr(fmt.Errorf("Error setting type: %s", err)) + return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting type: %s", err), "(Data) ibm_iam_trusted_profile_identity", "read", "set-type").GetDiag() + } + + if !core.IsNil(profileIdentityResponse.Accounts) { + accounts := []interface{}{} + for _, accountsItem := range profileIdentityResponse.Accounts { + accounts = append(accounts, accountsItem) + } + if err = d.Set("accounts", accounts); err != nil { + return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting accounts: %s", err), "(Data) ibm_iam_trusted_profile_identity", "read", "set-accounts").GetDiag() + } } - if err = d.Set("description", profileIdentityResponse.Description); err != nil { - return diag.FromErr(fmt.Errorf("Error setting description: %s", err)) + if !core.IsNil(profileIdentityResponse.Description) { + if err = d.Set("description", profileIdentityResponse.Description); err != nil { + return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting description: %s", err), "(Data) ibm_iam_trusted_profile_identity", "read", "set-description").GetDiag() + } } return nil diff --git a/ibm/service/iamidentity/data_source_ibm_iam_trusted_profile_identity_test.go b/ibm/service/iamidentity/data_source_ibm_iam_trusted_profile_identity_test.go index 531da1d23b7..ce89e9c44c0 100644 --- a/ibm/service/iamidentity/data_source_ibm_iam_trusted_profile_identity_test.go +++ b/ibm/service/iamidentity/data_source_ibm_iam_trusted_profile_identity_test.go @@ -1,6 +1,10 @@ -// Copyright IBM Corp. 2023 All Rights Reserved. +// Copyright IBM Corp. 2025 All Rights Reserved. // Licensed under the Mozilla Public License v2.0 +/* + * IBM OpenAPI Terraform Generator Version: 3.98.0-8be2046a-20241205-162752 + */ + package iamidentity_test import ( diff --git a/ibm/service/iamidentity/resource_ibm_iam_trusted_profile_identity.go b/ibm/service/iamidentity/resource_ibm_iam_trusted_profile_identity.go index d3be0b6262c..b96b5dc96ca 100644 --- a/ibm/service/iamidentity/resource_ibm_iam_trusted_profile_identity.go +++ b/ibm/service/iamidentity/resource_ibm_iam_trusted_profile_identity.go @@ -1,6 +1,10 @@ -// Copyright IBM Corp. 2023 All Rights Reserved. +// Copyright IBM Corp. 2025 All Rights Reserved. // Licensed under the Mozilla Public License v2.0 +/* + * IBM OpenAPI Terraform Generator Version: 3.98.0-8be2046a-20241205-162752 + */ + package iamidentity import ( @@ -95,7 +99,9 @@ func ResourceIBMIamTrustedProfileIdentityValidator() *validate.ResourceValidator func resourceIBMIamTrustedProfileIdentityCreate(context context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { iamIdentityClient, err := meta.(conns.ClientSession).IAMIdentityV1API() if err != nil { - return diag.FromErr(err) + tfErr := flex.DiscriminatedTerraformErrorf(err, err.Error(), "ibm_iam_trusted_profile_identity", "create", "initialize-client") + log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage()) + return tfErr.GetDiag() } setProfileIdentityOptions := &iamidentityv1.SetProfileIdentityOptions{} @@ -116,10 +122,11 @@ func resourceIBMIamTrustedProfileIdentityCreate(context context.Context, d *sche setProfileIdentityOptions.SetDescription(d.Get("description").(string)) } - profileIdentityResponse, response, err := iamIdentityClient.SetProfileIdentityWithContext(context, setProfileIdentityOptions) + profileIdentityResponse, _, err := iamIdentityClient.SetProfileIdentityWithContext(context, setProfileIdentityOptions) if err != nil { - log.Printf("[DEBUG] SetProfileIdentityWithContext failed %s\n%s", err, response) - return diag.FromErr(fmt.Errorf("SetProfileIdentityWithContext failed %s\n%s", err, response)) + tfErr := flex.TerraformErrorf(err, fmt.Sprintf("SetProfileIdentityWithContext failed: %s", err.Error()), "ibm_iam_trusted_profile_identity", "create") + log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage()) + return tfErr.GetDiag() } d.SetId(fmt.Sprintf("%s|%s|%s", *setProfileIdentityOptions.ProfileID, *setProfileIdentityOptions.IdentityType, *profileIdentityResponse.Identifier)) @@ -130,23 +137,21 @@ func resourceIBMIamTrustedProfileIdentityCreate(context context.Context, d *sche func resourceIBMIamTrustedProfileIdentityRead(context context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { iamIdentityClient, err := meta.(conns.ClientSession).IAMIdentityV1API() if err != nil { - return diag.FromErr(err) + tfErr := flex.DiscriminatedTerraformErrorf(err, err.Error(), "ibm_iam_trusted_profile_identity", "read", "initialize-client") + log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage()) + return tfErr.GetDiag() } getProfileIdentityOptions := &iamidentityv1.GetProfileIdentityOptions{} - parts_to_use, original_err := flex.SepIdParts(d.Id(), "|") - if original_err != nil { - parts, err := flex.SepIdParts(d.Id(), "/") // compatability - can be removed in future release - if err != nil { - return diag.FromErr(original_err) - } - parts_to_use = parts + parts, err := flex.SepIdParts(d.Id(), "|") + if err != nil { + return flex.DiscriminatedTerraformErrorf(err, err.Error(), "ibm_iam_trusted_profile_identity", "read", "sep-id-parts").GetDiag() } - getProfileIdentityOptions.SetProfileID(parts_to_use[0]) - getProfileIdentityOptions.SetIdentityType(parts_to_use[1]) - getProfileIdentityOptions.SetIdentifierID(parts_to_use[2]) + getProfileIdentityOptions.SetProfileID(parts[0]) + getProfileIdentityOptions.SetIdentityType(parts[1]) + getProfileIdentityOptions.SetIdentifierID(parts[2]) profileIdentityResponse, response, err := iamIdentityClient.GetProfileIdentityWithContext(context, getProfileIdentityOptions) if err != nil { @@ -154,32 +159,39 @@ func resourceIBMIamTrustedProfileIdentityRead(context context.Context, d *schema d.SetId("") return nil } - log.Printf("[DEBUG] GetProfileIdentityWithContext failed %s\n%s", err, response) - return diag.FromErr(fmt.Errorf("GetProfileIdentityWithContext failed %s\n%s", err, response)) + tfErr := flex.TerraformErrorf(err, fmt.Sprintf("GetProfileIdentityWithContext failed: %s", err.Error()), "ibm_iam_trusted_profile_identity", "read") + log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage()) + return tfErr.GetDiag() } d.SetId(fmt.Sprintf("%s|%s|%s", *getProfileIdentityOptions.ProfileID, *getProfileIdentityOptions.IdentityType, *getProfileIdentityOptions.IdentifierID)) if err = d.Set("profile_id", getProfileIdentityOptions.ProfileID); err != nil { - return diag.FromErr(fmt.Errorf("Error setting profile_id: %s", err)) + err = fmt.Errorf("Error setting profile_id: %s", err) + return flex.DiscriminatedTerraformErrorf(err, err.Error(), "ibm_iam_trusted_profile_identity", "read", "set-profile_id").GetDiag() } if err = d.Set("identity_type", getProfileIdentityOptions.IdentityType); err != nil { - return diag.FromErr(fmt.Errorf("Error setting identity_type: %s", err)) + err = fmt.Errorf("Error setting identity_type: %s", err) + return flex.DiscriminatedTerraformErrorf(err, err.Error(), "ibm_iam_trusted_profile_identity", "read", "set-identity_type").GetDiag() } if err = d.Set("identifier", profileIdentityResponse.Identifier); err != nil { - return diag.FromErr(fmt.Errorf("Error setting identifier: %s", err)) + err = fmt.Errorf("Error setting identifier: %s", err) + return flex.DiscriminatedTerraformErrorf(err, err.Error(), "ibm_iam_trusted_profile_identity", "read", "set-identifier").GetDiag() } if err = d.Set("type", profileIdentityResponse.Type); err != nil { - return diag.FromErr(fmt.Errorf("Error setting type: %s", err)) + err = fmt.Errorf("Error setting type: %s", err) + return flex.DiscriminatedTerraformErrorf(err, err.Error(), "ibm_iam_trusted_profile_identity", "read", "set-type").GetDiag() } if !core.IsNil(profileIdentityResponse.Accounts) { if err = d.Set("accounts", profileIdentityResponse.Accounts); err != nil { - return diag.FromErr(fmt.Errorf("Error setting accounts: %s", err)) + err = fmt.Errorf("Error setting accounts: %s", err) + return flex.DiscriminatedTerraformErrorf(err, err.Error(), "ibm_iam_trusted_profile_identity", "read", "set-accounts").GetDiag() } } if !core.IsNil(profileIdentityResponse.Description) { if err = d.Set("description", profileIdentityResponse.Description); err != nil { - return diag.FromErr(fmt.Errorf("Error setting description: %s", err)) + err = fmt.Errorf("Error setting description: %s", err) + return flex.DiscriminatedTerraformErrorf(err, err.Error(), "ibm_iam_trusted_profile_identity", "read", "set-description").GetDiag() } } @@ -189,28 +201,27 @@ func resourceIBMIamTrustedProfileIdentityRead(context context.Context, d *schema func resourceIBMIamTrustedProfileIdentityDelete(context context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { iamIdentityClient, err := meta.(conns.ClientSession).IAMIdentityV1API() if err != nil { - return diag.FromErr(err) + tfErr := flex.DiscriminatedTerraformErrorf(err, err.Error(), "ibm_iam_trusted_profile_identity", "delete", "initialize-client") + log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage()) + return tfErr.GetDiag() } deleteProfileIdentityOptions := &iamidentityv1.DeleteProfileIdentityOptions{} - parts_to_use, original_err := flex.SepIdParts(d.Id(), "|") - if original_err != nil { - parts, err := flex.SepIdParts(d.Id(), "/") // compatability - remove in future release - if err != nil { - return diag.FromErr(original_err) - } - parts_to_use = parts + parts, err := flex.SepIdParts(d.Id(), "|") + if err != nil { + return flex.DiscriminatedTerraformErrorf(err, err.Error(), "ibm_iam_trusted_profile_identity", "delete", "sep-id-parts").GetDiag() } - deleteProfileIdentityOptions.SetProfileID(parts_to_use[0]) - deleteProfileIdentityOptions.SetIdentityType(parts_to_use[1]) - deleteProfileIdentityOptions.SetIdentifierID(parts_to_use[2]) + deleteProfileIdentityOptions.SetProfileID(parts[0]) + deleteProfileIdentityOptions.SetIdentityType(parts[1]) + deleteProfileIdentityOptions.SetIdentifierID(parts[2]) - response, err := iamIdentityClient.DeleteProfileIdentityWithContext(context, deleteProfileIdentityOptions) + _, err = iamIdentityClient.DeleteProfileIdentityWithContext(context, deleteProfileIdentityOptions) if err != nil { - log.Printf("[DEBUG] DeleteProfileIdentityWithContext failed %s\n%s", err, response) - return diag.FromErr(fmt.Errorf("DeleteProfileIdentityWithContext failed %s\n%s", err, response)) + tfErr := flex.TerraformErrorf(err, fmt.Sprintf("DeleteProfileIdentityWithContext failed: %s", err.Error()), "ibm_iam_trusted_profile_identity", "delete") + log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage()) + return tfErr.GetDiag() } d.SetId("") diff --git a/ibm/service/iamidentity/resource_ibm_iam_trusted_profile_identity_test.go b/ibm/service/iamidentity/resource_ibm_iam_trusted_profile_identity_test.go index 4698230be54..2fb249e3e1e 100644 --- a/ibm/service/iamidentity/resource_ibm_iam_trusted_profile_identity_test.go +++ b/ibm/service/iamidentity/resource_ibm_iam_trusted_profile_identity_test.go @@ -1,4 +1,4 @@ -// Copyright IBM Corp. 2023 All Rights Reserved. +// Copyright IBM Corp. 2025 All Rights Reserved. // Licensed under the Mozilla Public License v2.0 package iamidentity_test @@ -28,14 +28,14 @@ func TestAccIBMIamTrustedProfileIdentityBasic(t *testing.T) { Providers: acc.TestAccProviders, CheckDestroy: testAccCheckIBMIamTrustedProfileIdentityDestroy, Steps: []resource.TestStep{ - { + resource.TestStep{ Config: testAccCheckIBMIamTrustedProfileIdentityConfigBasic(profileID, identityType, identifier, typeVar), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckIBMIamTrustedProfileIdentityExists("ibm_iam_trusted_profile_identity.iam_trusted_profile_identity", conf), - resource.TestCheckResourceAttr("ibm_iam_trusted_profile_identity.iam_trusted_profile_identity", "profile_id", profileID), - resource.TestCheckResourceAttr("ibm_iam_trusted_profile_identity.iam_trusted_profile_identity", "identity_type", identityType), - resource.TestCheckResourceAttr("ibm_iam_trusted_profile_identity.iam_trusted_profile_identity", "identifier", identifier), - resource.TestCheckResourceAttr("ibm_iam_trusted_profile_identity.iam_trusted_profile_identity", "type", typeVar), + testAccCheckIBMIamTrustedProfileIdentityExists("ibm_iam_trusted_profile_identity.iam_trusted_profile_identity_instance", conf), + resource.TestCheckResourceAttr("ibm_iam_trusted_profile_identity.iam_trusted_profile_identity_instance", "profile_id", profileID), + resource.TestCheckResourceAttr("ibm_iam_trusted_profile_identity.iam_trusted_profile_identity_instance", "identity_type", identityType), + resource.TestCheckResourceAttr("ibm_iam_trusted_profile_identity.iam_trusted_profile_identity_instance", "identifier", identifier), + resource.TestCheckResourceAttr("ibm_iam_trusted_profile_identity.iam_trusted_profile_identity_instance", "type", typeVar), ), }, },