Skip to content

Refactor terraform errors to use new toolchain in dhcp, disaster recovery location, and host group data sources #253

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
wants to merge 5 commits into from
Closed

Refactor terraform errors to use new toolchain in dhcp, disaster recovery location, and host group data sources #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e8aa4fa
Replace interface{} with any
ismirlia Aug 19, 2025
97dce88
Update error handling on dhcp data source
ismirlia Aug 19, 2025
ff37350
Update error handling on disaster recovery location data source
ismirlia Aug 19, 2025
dee4ecf
Update error handling on host groups data source
ismirlia Aug 19, 2025
09f866f
Fix dhcp error messages
ismirlia Aug 20, 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
6 changes: 3 additions & 3 deletions ibm/service/power/data_source_ibm_pi_available_hosts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ func DataSourceIBMPIAvailableHosts() *schema.Resource {
}
}

func dataSourceIBMPIAvailableHostsRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
func dataSourceIBMPIAvailableHostsRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
sess, err := meta.(conns.ClientSession).IBMPISession()
if err != nil {
return diag.FromErr(err)
Expand All @@ -71,10 +71,10 @@ func dataSourceIBMPIAvailableHostsRead(ctx context.Context, d *schema.ResourceDa
if err != nil {
return diag.FromErr(err)
}
availableHosts := []map[string]interface{}{}
availableHosts := []map[string]any{}
for _, value := range hostlist {
if value.Capacity != nil {
availableHosts = append(availableHosts, map[string]interface{}{
availableHosts = append(availableHosts, map[string]any{
Attr_Count: int(value.Count),
Attr_SysType: value.SysType,
Attr_AvailableCores: value.Capacity.Cores.Total,
Expand Down
6 changes: 3 additions & 3 deletions ibm/service/power/data_source_ibm_pi_catalog_images.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ func DataSourceIBMPICatalogImages() *schema.Resource {
}
}

func dataSourceIBMPICatalogImagesRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
func dataSourceIBMPICatalogImagesRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
sess, err := meta.(conns.ClientSession).IBMPISession()
if err != nil {
return diag.FromErr(err)
Expand All @@ -151,9 +151,9 @@ func dataSourceIBMPICatalogImagesRead(ctx context.Context, d *schema.ResourceDat
return diag.FromErr(err)
}

images := make([]map[string]interface{}, 0)
images := make([]map[string]any, 0)
for _, i := range stockImages.Images {
image := make(map[string]interface{})
image := make(map[string]any)
image[Attr_ImageID] = *i.ImageID
image[Attr_Name] = *i.Name

Expand Down
12 changes: 8 additions & 4 deletions ibm/service/power/data_source_ibm_pi_dhcp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (

"github.com/IBM-Cloud/power-go-client/clients/instance"
"github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns"
"github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex"
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
Expand Down Expand Up @@ -77,19 +78,22 @@ func DataSourceIBMPIDhcp() *schema.Resource {
}
}

func dataSourceIBMPIDhcpRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
func dataSourceIBMPIDhcpRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
sess, err := meta.(conns.ClientSession).IBMPISession()
if err != nil {
return diag.FromErr(err)
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("IBMPISession failed: %s", err.Error()), "(Data) ibm_pi_dhcp", "read")
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
return tfErr.GetDiag()
}

cloudInstanceID := d.Get(Arg_CloudInstanceID).(string)
dhcpID := d.Get(Arg_DhcpID).(string)
client := instance.NewIBMPIDhcpClient(ctx, sess, cloudInstanceID)
dhcpServer, err := client.Get(dhcpID)
if err != nil {
log.Printf("[DEBUG] get DHCP failed %v", err)
return diag.FromErr(err)
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Get failed: %s", err.Error()), "(Data) ibm_pi_dhcp", "read")
log.Printf("[DEBUG] get DHCP failed \n%s", tfErr.GetDebugMessage())
return tfErr.GetDiag()
}

d.SetId(fmt.Sprintf("%s/%s", cloudInstanceID, *dhcpServer.ID))
Expand Down
17 changes: 11 additions & 6 deletions ibm/service/power/data_source_ibm_pi_dhcps.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@ package power

import (
"context"
"fmt"
"log"

"github.com/IBM-Cloud/power-go-client/clients/instance"
"github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns"
"github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex"
"github.com/hashicorp/go-uuid"
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
Expand Down Expand Up @@ -62,23 +64,26 @@ func DataSourceIBMPIDhcps() *schema.Resource {
}
}

func dataSourceIBMPIDhcpServersRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
func dataSourceIBMPIDhcpServersRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
sess, err := meta.(conns.ClientSession).IBMPISession()
if err != nil {
return diag.FromErr(err)
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("IBMPISession failed: %s", err.Error()), "(Data) ibm_pi_dhcps", "read")
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
return tfErr.GetDiag()
}

cloudInstanceID := d.Get(Arg_CloudInstanceID).(string)
client := instance.NewIBMPIDhcpClient(ctx, sess, cloudInstanceID)
dhcpServers, err := client.GetAll()
if err != nil {
log.Printf("[DEBUG] get all DHCP failed %v", err)
return diag.FromErr(err)
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("GetAll failed: %s", err.Error()), "(Data) ibm_pi_dhcps", "read")
log.Printf("[DEBUG] get all DHCP failed \n%s", tfErr.GetDebugMessage())
return tfErr.GetDiag()
}

servers := make([]map[string]interface{}, 0, len(dhcpServers))
servers := make([]map[string]any, 0, len(dhcpServers))
for _, dhcpServer := range dhcpServers {
server := map[string]interface{}{
server := map[string]any{
Attr_DhcpID: *dhcpServer.ID,
Attr_Status: *dhcpServer.Status,
}
Expand Down
17 changes: 12 additions & 5 deletions ibm/service/power/data_source_ibm_pi_disaster_recovery_location.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,12 @@ package power

import (
"context"
"fmt"
"log"

"github.com/IBM-Cloud/power-go-client/clients/instance"
"github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns"
"github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex"
"github.com/hashicorp/go-uuid"
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
Expand Down Expand Up @@ -74,20 +77,24 @@ func DataSourceIBMPIDisasterRecoveryLocation() *schema.Resource {
}
}

func dataSourceIBMPIDisasterRecoveryLocation(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
func dataSourceIBMPIDisasterRecoveryLocation(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
sess, err := meta.(conns.ClientSession).IBMPISession()
if err != nil {
return diag.FromErr(err)
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("IBMPISession failed: %s", err.Error()), "(Data) ibm_pi_disaster_recovery_location", "read")
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
return tfErr.GetDiag()
}

cloudInstanceID := d.Get(Arg_CloudInstanceID).(string)
drClient := instance.NewIBMPIDisasterRecoveryLocationClient(ctx, sess, cloudInstanceID)
drLocationSite, err := drClient.Get()
if err != nil {
return diag.FromErr(err)
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Get failed: %s", err.Error()), "(Data) ibm_pi_disaster_recovery_location", "read")
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
return tfErr.GetDiag()
}

result := make([]map[string]interface{}, 0, len(drLocationSite.ReplicationSites))
result := make([]map[string]any, 0, len(drLocationSite.ReplicationSites))
for _, site := range drLocationSite.ReplicationSites {
if site != nil {
replicationPoolMap := make([]map[string]string, 0)
Expand All @@ -100,7 +107,7 @@ func dataSourceIBMPIDisasterRecoveryLocation(ctx context.Context, d *schema.Reso
}
}

l := map[string]interface{}{
l := map[string]any{
Attr_IsActive: site.IsActive,
Attr_Location: site.Location,
Attr_ReplicationPoolMap: replicationPoolMap,
Expand Down
21 changes: 14 additions & 7 deletions ibm/service/power/data_source_ibm_pi_disaster_recovery_locations.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,12 @@ package power

import (
"context"
"fmt"
"log"

"github.com/IBM-Cloud/power-go-client/clients/instance"
"github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns"
"github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex"
"github.com/hashicorp/go-uuid"
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
Expand Down Expand Up @@ -73,22 +76,26 @@ func DataSourceIBMPIDisasterRecoveryLocations() *schema.Resource {
}
}

func dataSourceIBMPIDisasterRecoveryLocations(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
func dataSourceIBMPIDisasterRecoveryLocations(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
sess, err := meta.(conns.ClientSession).IBMPISession()
if err != nil {
return diag.FromErr(err)
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("IBMPISession failed: %s", err.Error()), "(Data) ibm_pi_disaster_recovery_locations", "read")
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
return tfErr.GetDiag()
}

drClient := instance.NewIBMPIDisasterRecoveryLocationClient(ctx, sess, "")
drLocationSites, err := drClient.GetAll()
if err != nil {
return diag.FromErr(err)
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("GetAll failed: %s", err.Error()), "(Data) ibm_pi_disaster_recovery_locations", "read")
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
return tfErr.GetDiag()
}

results := make([]map[string]interface{}, 0, len(drLocationSites.DisasterRecoveryLocations))
results := make([]map[string]any, 0, len(drLocationSites.DisasterRecoveryLocations))
for _, drl := range drLocationSites.DisasterRecoveryLocations {
if drl != nil {
replicationSites := make([]map[string]interface{}, 0, len(drl.ReplicationSites))
replicationSites := make([]map[string]any, 0, len(drl.ReplicationSites))
for _, site := range drl.ReplicationSites {
if site != nil {
replicationPoolMap := make([]map[string]string, 0)
Expand All @@ -100,15 +107,15 @@ func dataSourceIBMPIDisasterRecoveryLocations(ctx context.Context, d *schema.Res
replicationPoolMap = append(replicationPoolMap, replicationPool)
}
}
r := map[string]interface{}{
r := map[string]any{
Attr_IsActive: site.IsActive,
Attr_Location: site.Location,
Attr_ReplicationPoolMap: replicationPoolMap,
}
replicationSites = append(replicationSites, r)
}
}
l := map[string]interface{}{
l := map[string]any{
Attr_Location: drl.Location,
Attr_ReplicationSites: replicationSites,
}
Expand Down
16 changes: 10 additions & 6 deletions ibm/service/power/data_source_ibm_pi_host_group.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@ package power

import (
"context"
"fmt"
"log"

"github.com/IBM-Cloud/power-go-client/clients/instance"
"github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns"
"github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex"
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"

"github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns"
)

func DataSourceIBMPIHostGroup() *schema.Resource {
Expand Down Expand Up @@ -69,18 +70,21 @@ func DataSourceIBMPIHostGroup() *schema.Resource {
}
}

func dataSourceIBMPIHostGroupRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
func dataSourceIBMPIHostGroupRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
sess, err := meta.(conns.ClientSession).IBMPISession()
if err != nil {
return diag.FromErr(err)
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("IBMPISession failed: %s", err.Error()), "(Data) ibm_pi_host_group", "read")
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
return tfErr.GetDiag()
}
cloudInstanceID := d.Get(Arg_CloudInstanceID).(string)
hostGroupID := d.Get(Arg_HostGroupID).(string)
client := instance.NewIBMPIHostGroupsClient(ctx, sess, cloudInstanceID)
hostGroup, err := client.GetHostGroup(hostGroupID)
if err != nil {
log.Printf("[DEBUG] get host group %v", err)
return diag.FromErr(err)
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("GetHostGroup failed: %s", err.Error()), "(Data) ibm_pi_host_group", "read")
log.Printf("[DEBUG] get host group \n%s", tfErr.GetDebugMessage())
return tfErr.GetDiag()
}

d.SetId(hostGroup.ID)
Expand Down
26 changes: 16 additions & 10 deletions ibm/service/power/data_source_ibm_pi_host_groups.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,17 @@ package power

import (
"context"
"fmt"
"log"

"github.com/IBM-Cloud/power-go-client/clients/instance"
"github.com/IBM-Cloud/power-go-client/power/models"
"github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns"
"github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex"
"github.com/hashicorp/go-uuid"
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"

"github.com/IBM-Cloud/power-go-client/clients/instance"
"github.com/IBM-Cloud/power-go-client/power/models"
"github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns"
)

func DataSourceIBMPIHostGroups() *schema.Resource {
Expand Down Expand Up @@ -78,17 +80,21 @@ func DataSourceIBMPIHostGroups() *schema.Resource {
}
}

func dataSourceIBMPIHostGroupsRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
func dataSourceIBMPIHostGroupsRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
sess, err := meta.(conns.ClientSession).IBMPISession()
if err != nil {
return diag.FromErr(err)
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("IBMPISession failed: %s", err.Error()), "(Data) ibm_pi_host_groups", "read")
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
return tfErr.GetDiag()
}
cloudInstanceID := d.Get(Arg_CloudInstanceID).(string)

client := instance.NewIBMPIHostGroupsClient(ctx, sess, cloudInstanceID)
hostGroups, err := client.GetHostGroups()
if err != nil {
return diag.FromErr(err)
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("GetHostGroups failed: %s", err.Error()), "(Data) ibm_pi_host_groups", "read")
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
return tfErr.GetDiag()
}
var clientgenU, _ = uuid.GenerateUUID()
d.SetId(clientgenU)
Expand All @@ -97,10 +103,10 @@ func dataSourceIBMPIHostGroupsRead(ctx context.Context, d *schema.ResourceData,

return nil
}
func flattenHostGroups(hostGroupList models.HostGroupList) []map[string]interface{} {
hostGroups := make([]map[string]interface{}, 0, len(hostGroupList))
func flattenHostGroups(hostGroupList models.HostGroupList) []map[string]any {
hostGroups := make([]map[string]any, 0, len(hostGroupList))
for _, hg := range hostGroupList {
hostGroup := map[string]interface{}{
hostGroup := map[string]any{
Attr_CreationDate: hg.CreationDate.String(),
Attr_Hosts: hg.Hosts,
Attr_ID: hg.ID,
Expand Down
Loading