Skip to content

chore(consumable-errors): Make errors consumable and consistent in vpc file share #424

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

Closed
deepaksibm wants to merge 8 commits into from
Closed

chore(consumable-errors): Make errors consumable and consistent in vpc file share #424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
36532fa
chore(consumable-errors): Make errors consumable and consistent in vp…
deepaksibm Feb 25, 2025
c4bef9d
Merge branch 'master' into share-err
deepaksibm Mar 11, 2025
36790e7
additional error messages for shares
deepaksibm Apr 3, 2025
29d136c
updates to share
deepaksibm Apr 15, 2025
4bfe07a
updates to the error messages
deepaksibm Apr 21, 2025
2feecae
additional data source changes
deepaksibm May 17, 2025
03ac249
corrections
deepaksibm May 21, 2025
b4f9b22
updated method name in log for accessor binding delete resource
deepaksibm May 21, 2025
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
88 changes: 58 additions & 30 deletions ibm/service/vpc/data_source_ibm_is_share.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,7 +597,9 @@ func DataSourceIbmIsShare() *schema.Resource {
func dataSourceIbmIsShareRead(context context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
vpcClient, err := meta.(conns.ClientSession).VpcV1API()
if err != nil {
return diag.FromErr(err)
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("vpcClient creation failed: %s", err.Error()), "(Data) ibm_is_share", "read")
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
return tfErr.GetDiag()
}

shareName := d.Get("name").(string)
Expand All @@ -610,8 +612,9 @@ func dataSourceIbmIsShareRead(context context.Context, d *schema.ResourceData, m

shareItem, response, err := vpcClient.GetShareWithContext(context, getShareOptions)
if err != nil {
log.Printf("[DEBUG] GetShareWithContext failed %s\n%s", err, response)
return diag.FromErr(fmt.Errorf("[ERROR] GetShareWithContext failed %s\n%s", err, response))
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("GetShareWithContext failed: %s\n%s", err.Error(), response), "(Data) ibm_is_share", "read")
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
return tfErr.GetDiag()
}
share = shareItem
} else if shareName != "" {
Expand All @@ -622,8 +625,9 @@ func dataSourceIbmIsShareRead(context context.Context, d *schema.ResourceData, m
}
shareCollection, response, err := vpcClient.ListSharesWithContext(context, listSharesOptions)
if err != nil {
log.Printf("[DEBUG] ListSharesWithContext failed %s\n%s", err, response)
return diag.FromErr(err)
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("ListSharesWithContext failed: %s\n%s", err.Error(), response), "(Data) ibm_is_share", "read")
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
return tfErr.GetDiag()
}
for _, sharesItem := range shareCollection.Shares {
if *sharesItem.Name == shareName {
Expand All @@ -632,32 +636,38 @@ func dataSourceIbmIsShareRead(context context.Context, d *schema.ResourceData, m
}
}
if share == nil {
return diag.FromErr(fmt.Errorf("[ERROR] Share with provided name %s not found", shareName))
return flex.TerraformErrorf(err, fmt.Sprintf("[ERROR] Share with provided name %s not found", shareName), "(Data) ibm_is_share", "read").GetDiag()
}
}

d.SetId(*share.ID)
if err = d.Set("created_at", share.CreatedAt.String()); err != nil {
return diag.FromErr(fmt.Errorf("Error setting created_at: %s", err))
err = fmt.Errorf("Error setting captured_at: %s", err)
return flex.DiscriminatedTerraformErrorf(err, err.Error(), "(Data) ibm_is_share", "read", "set-captured_at").GetDiag()
}
if err = d.Set("crn", share.CRN); err != nil {
return diag.FromErr(fmt.Errorf("Error setting crn: %s", err))
err = fmt.Errorf("Error setting crn: %s", err)
return flex.DiscriminatedTerraformErrorf(err, err.Error(), "(Data) ibm_is_share", "read", "set-crn").GetDiag()
}
if err = d.Set("encryption", share.Encryption); err != nil {
return diag.FromErr(fmt.Errorf("Error setting encryption: %s", err))
err = fmt.Errorf("Error setting encryption: %s", err)
return flex.DiscriminatedTerraformErrorf(err, err.Error(), "(Data) ibm_is_share", "read", "set-encryption").GetDiag()
}

if share.EncryptionKey != nil {
err = d.Set("encryption_key", *share.EncryptionKey.CRN)
if err != nil {
return diag.FromErr(fmt.Errorf("Error setting encryption_key %s", err))
err = fmt.Errorf("Error setting encryption_key: %s", err)
return flex.DiscriminatedTerraformErrorf(err, err.Error(), "(Data) ibm_is_share", "read", "set-encryption_key").GetDiag()
}
}
if err = d.Set("href", share.Href); err != nil {
return diag.FromErr(fmt.Errorf("Error setting href: %s", err))
err = fmt.Errorf("Error setting href: %s", err)
return flex.DiscriminatedTerraformErrorf(err, err.Error(), "(Data) ibm_is_share", "read", "set-href").GetDiag()
}
if err = d.Set("iops", share.Iops); err != nil {
return diag.FromErr(fmt.Errorf("Error setting iops: %s", err))
err = fmt.Errorf("Error setting iops: %s", err)
return flex.DiscriminatedTerraformErrorf(err, err.Error(), "(Data) ibm_is_share", "read", "set-iops").GetDiag()
}
latest_syncs := []map[string]interface{}{}
if share.LatestSync != nil {
Expand All @@ -673,15 +683,18 @@ func dataSourceIbmIsShareRead(context context.Context, d *schema.ResourceData, m
if share.LatestJob != nil {
err = d.Set("latest_job", dataSourceShareFlattenLatestJob(*share.LatestJob))
if err != nil {
return diag.FromErr(fmt.Errorf("Error setting latest_job %s", err))
err = fmt.Errorf("Error setting latest_job: %s", err)
return flex.DiscriminatedTerraformErrorf(err, err.Error(), "(Data) ibm_is_share", "read", "set-latest_job").GetDiag()
}
}

if err = d.Set("lifecycle_state", share.LifecycleState); err != nil {
return diag.FromErr(fmt.Errorf("Error setting lifecycle_state: %s", err))
err = fmt.Errorf("Error setting lifecycle_state: %s", err)
return flex.DiscriminatedTerraformErrorf(err, err.Error(), "(Data) ibm_is_share", "read", "set-lifecycle_state").GetDiag()
}
if err = d.Set("name", share.Name); err != nil {
return diag.FromErr(fmt.Errorf("Error setting name: %s", err))
err = fmt.Errorf("Error setting name: %s", err)
return flex.DiscriminatedTerraformErrorf(err, err.Error(), "(Data) ibm_is_share", "read", "set-name").GetDiag()
}
if share.AccessControlMode != nil {
d.Set("access_control_mode", *share.AccessControlMode)
Expand Down Expand Up @@ -715,66 +728,79 @@ func dataSourceIbmIsShareRead(context context.Context, d *schema.ResourceData, m
if share.Profile != nil {
err = d.Set("profile", *share.Profile.Name)
if err != nil {
return diag.FromErr(fmt.Errorf("Error setting profile %s", err))
err = fmt.Errorf("Error setting profile: %s", err)
return flex.DiscriminatedTerraformErrorf(err, err.Error(), "(Data) ibm_is_share", "read", "set-profile").GetDiag()
}
}

if share.ReplicaShare != nil {
err = d.Set("replica_share", dataSourceShareFlattenReplicaShare(*share.ReplicaShare))
if err != nil {
return diag.FromErr(fmt.Errorf("Error setting replica_share %s", err))
err = fmt.Errorf("Error setting replica_share: %s", err)
return flex.DiscriminatedTerraformErrorf(err, err.Error(), "(Data) ibm_is_share", "read", "set-replica_share").GetDiag()
}
}
if err = d.Set("replication_cron_spec", share.ReplicationCronSpec); err != nil {
return diag.FromErr(fmt.Errorf("Error setting replication_cron_spec: %s", err))
err = fmt.Errorf("Error setting replication_cron_spec: %s", err)
return flex.DiscriminatedTerraformErrorf(err, err.Error(), "(Data) ibm_is_share", "read", "set-replication_cron_spec").GetDiag()
}
if err = d.Set("replication_role", share.ReplicationRole); err != nil {
return diag.FromErr(fmt.Errorf("Error setting replication_role: %s", err))
err = fmt.Errorf("Error setting replication_role: %s", err)
return flex.DiscriminatedTerraformErrorf(err, err.Error(), "(Data) ibm_is_share", "read", "set-replication_role").GetDiag()
}
if err = d.Set("replication_status", share.ReplicationStatus); err != nil {
return diag.FromErr(fmt.Errorf("Error setting replication_status: %s", err))
err = fmt.Errorf("Error setting replication_status: %s", err)
return flex.DiscriminatedTerraformErrorf(err, err.Error(), "(Data) ibm_is_share", "read", "set-replication_status").GetDiag()
}

if share.ReplicationStatusReasons != nil {
err = d.Set("replication_status_reasons", dataSourceShareFlattenReplicationStatusReasons(share.ReplicationStatusReasons))
if err != nil {
return diag.FromErr(fmt.Errorf("Error setting replication_status_reasons %s", err))
err = fmt.Errorf("Error setting replication_status_reasons: %s", err)
return flex.DiscriminatedTerraformErrorf(err, err.Error(), "(Data) ibm_is_share", "read", "set-replication_status_reasons").GetDiag()
}
}

if share.ResourceGroup != nil {
err = d.Set("resource_group", *share.ResourceGroup.ID)
if err != nil {
return diag.FromErr(fmt.Errorf("Error setting resource_group %s", err))
err = fmt.Errorf("Error setting resource_group: %s", err)
return flex.DiscriminatedTerraformErrorf(err, err.Error(), "(Data) ibm_is_share", "read", "set-resource_group").GetDiag()
}
}
if err = d.Set("resource_type", share.ResourceType); err != nil {
return diag.FromErr(fmt.Errorf("Error setting resource_type: %s", err))
err = fmt.Errorf("Error setting resource_type: %s", err)
return flex.DiscriminatedTerraformErrorf(err, err.Error(), "(Data) ibm_is_share", "read", "set-resource_type").GetDiag()
}
if err = d.Set("size", share.Size); err != nil {
return diag.FromErr(fmt.Errorf("Error setting size: %s", err))
err = fmt.Errorf("Error setting size: %s", err)
return flex.DiscriminatedTerraformErrorf(err, err.Error(), "(Data) ibm_is_share", "read", "set-size").GetDiag()
}
if share.SourceShare != nil {
err = d.Set("source_share", dataSourceShareFlattenSourceShare(*share.SourceShare))
if err != nil {
return diag.FromErr(fmt.Errorf("Error setting source_share %s", err))
err = fmt.Errorf("Error setting source_share: %s", err)
return flex.DiscriminatedTerraformErrorf(err, err.Error(), "(Data) ibm_is_share", "read", "set-source_share").GetDiag()
}
}
if share.MountTargets != nil {
err = d.Set("share_targets", dataSourceShareFlattenTargets(share.MountTargets))
if err != nil {
return diag.FromErr(fmt.Errorf("Error setting targets %s", err))
err = fmt.Errorf("Error setting share_targets: %s", err)
return flex.DiscriminatedTerraformErrorf(err, err.Error(), "(Data) ibm_is_share", "read", "set-share_targets").GetDiag()
}
err = d.Set("mount_targets", dataSourceShareFlattenTargets(share.MountTargets))
if err != nil {
return diag.FromErr(fmt.Errorf("Error setting targets %s", err))
err = fmt.Errorf("Error setting mount_targets: %s", err)
return flex.DiscriminatedTerraformErrorf(err, err.Error(), "(Data) ibm_is_share", "read", "set-mount_targets").GetDiag()
}
}

if share.Zone != nil {
err = d.Set("zone", *share.Zone.Name)
if err != nil {
return diag.FromErr(fmt.Errorf("Error setting zone %s", err))
err = fmt.Errorf("Error setting zone: %s", err)
return flex.DiscriminatedTerraformErrorf(err, err.Error(), "(Data) ibm_is_share", "read", "set-zone").GetDiag()
}
}
if err = d.Set("snapshot_count", flex.IntValue(share.SnapshotCount)); err != nil {
Expand All @@ -797,14 +823,16 @@ func dataSourceIbmIsShareRead(context context.Context, d *schema.ResourceData, m
}
accesstags, err := flex.GetGlobalTagsUsingCRN(meta, *share.CRN, "", isAccessTagType)
if err != nil {
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting shares (%s) access tags: %s", d.Id(), err), "(Data) ibm_is_share", "read")
log.Printf(
"Error getting shares (%s) access tags: %s", d.Id(), err)
"[ERROR] %s", tfErr.GetDebugMessage())
}

if share.UserTags != nil {
if err = d.Set(isFileShareTags, share.UserTags); err != nil {
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting shares (%s) user tags: %s", d.Id(), err), "(Data) ibm_is_share", "read")
log.Printf(
"Error setting shares (%s) user tags: %s", d.Id(), err)
"[ERROR] %s", tfErr.GetDebugMessage())
}
}

Expand Down
3 changes: 1 addition & 2 deletions ibm/service/vpc/data_source_ibm_is_share_accessor_binding.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,7 @@ func DataSourceIBMIsShareAccessorBinding() *schema.Resource {
func dataSourceIBMIsShareAccessorBindingRead(context context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
vpcClient, err := meta.(conns.ClientSession).VpcV1API()
if err != nil {
// Error is coming from SDK client, so it doesn't need to be discriminated.
tfErr := flex.TerraformErrorf(err, err.Error(), "(Data) ibm_is_share_accessor_binding", "read")
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("vpcClient creation failed: %s", err.Error()), "(Data) ibm_is_share_accessor_binding", "read")
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
return tfErr.GetDiag()
}
Expand Down
5 changes: 2 additions & 3 deletions ibm/service/vpc/data_source_ibm_is_share_accessor_bindings.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ func DataSourceIBMIsShareAccessorBindings() *schema.Resource {
func dataSourceIBMIsShareAccessorBindingsRead(context context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
vpcClient, err := meta.(conns.ClientSession).VpcV1API()
if err != nil {
tfErr := flex.TerraformErrorf(err, err.Error(), "(Data) ibm_is_share_accessor_bindings", "read")
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("vpcClient creation failed: %s", err.Error()), "(Data) ibm_is_share_accessor_bindings", "read")
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
return tfErr.GetDiag()
}
Expand Down Expand Up @@ -204,8 +204,7 @@ func dataSourceIBMIsShareAccessorBindingsRead(context context.Context, d *schema
}

if err = d.Set("accessor_bindings", mapSlice); err != nil {
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting accessor_bindings %s", err), "(Data) ibm_is_share_accessor_bindings", "read")
return tfErr.GetDiag()
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting accessor_bindings: %s", err), "(Data) ibm_is_share_accessor_bindings", "read", "set-accessor_bindings").GetDiag()
}

return nil
Expand Down
Loading
Loading