Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(identity) new error messages for TP identity #5971

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(identity) new error messages for TP identity #5971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 32 additions & 21 deletions ibm/service/iamidentity/data_source_ibm_iam_trusted_profile_identities.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 (
Expand All @@ -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"
)

Expand Down Expand Up @@ -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
Expand All @@ -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
}
34 changes: 33 additions & 1 deletion ibm/service/iamidentity/data_source_ibm_iam_trusted_profile_identities_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 (
Expand All @@ -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) {
Expand All @@ -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)
}
41 changes: 31 additions & 10 deletions ibm/service/iamidentity/data_source_ibm_iam_trusted_profile_identity.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 (
Expand All @@ -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"
)

Expand Down Expand Up @@ -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{}
Expand All @@ -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
Expand Down
6 changes: 5 additions & 1 deletion ibm/service/iamidentity/data_source_ibm_iam_trusted_profile_identity_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 (
Expand Down
Loading
Loading