diff --git a/ibm/service/power/data_source_ibm_pi_available_hosts.go b/ibm/service/power/data_source_ibm_pi_available_hosts.go index e6b74b4489..9bf7c5c5a1 100644 --- a/ibm/service/power/data_source_ibm_pi_available_hosts.go +++ b/ibm/service/power/data_source_ibm_pi_available_hosts.go @@ -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) @@ -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, diff --git a/ibm/service/power/data_source_ibm_pi_catalog_images.go b/ibm/service/power/data_source_ibm_pi_catalog_images.go index 83afd38672..7150053151 100644 --- a/ibm/service/power/data_source_ibm_pi_catalog_images.go +++ b/ibm/service/power/data_source_ibm_pi_catalog_images.go @@ -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) @@ -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 diff --git a/ibm/service/power/data_source_ibm_pi_dhcp.go b/ibm/service/power/data_source_ibm_pi_dhcp.go index 9d4d4c3aa8..541c60b5a2 100644 --- a/ibm/service/power/data_source_ibm_pi_dhcp.go +++ b/ibm/service/power/data_source_ibm_pi_dhcp.go @@ -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" @@ -77,10 +78,12 @@ 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) @@ -88,8 +91,9 @@ func dataSourceIBMPIDhcpRead(ctx context.Context, d *schema.ResourceData, meta i 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)) diff --git a/ibm/service/power/data_source_ibm_pi_dhcps.go b/ibm/service/power/data_source_ibm_pi_dhcps.go index 67377a7d2e..d69d3f6880 100644 --- a/ibm/service/power/data_source_ibm_pi_dhcps.go +++ b/ibm/service/power/data_source_ibm_pi_dhcps.go @@ -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" @@ -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, } diff --git a/ibm/service/power/data_source_ibm_pi_disaster_recovery_location.go b/ibm/service/power/data_source_ibm_pi_disaster_recovery_location.go index c8f9a557d3..f045ed1edf 100644 --- a/ibm/service/power/data_source_ibm_pi_disaster_recovery_location.go +++ b/ibm/service/power/data_source_ibm_pi_disaster_recovery_location.go @@ -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" @@ -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) @@ -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, diff --git a/ibm/service/power/data_source_ibm_pi_disaster_recovery_locations.go b/ibm/service/power/data_source_ibm_pi_disaster_recovery_locations.go index 7ff1a9f0a3..bdd099098e 100644 --- a/ibm/service/power/data_source_ibm_pi_disaster_recovery_locations.go +++ b/ibm/service/power/data_source_ibm_pi_disaster_recovery_locations.go @@ -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" @@ -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) @@ -100,7 +107,7 @@ 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, @@ -108,7 +115,7 @@ func dataSourceIBMPIDisasterRecoveryLocations(ctx context.Context, d *schema.Res replicationSites = append(replicationSites, r) } } - l := map[string]interface{}{ + l := map[string]any{ Attr_Location: drl.Location, Attr_ReplicationSites: replicationSites, } diff --git a/ibm/service/power/data_source_ibm_pi_host_group.go b/ibm/service/power/data_source_ibm_pi_host_group.go index 287b8c3ebf..67757a8b70 100644 --- a/ibm/service/power/data_source_ibm_pi_host_group.go +++ b/ibm/service/power/data_source_ibm_pi_host_group.go @@ -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 { @@ -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) diff --git a/ibm/service/power/data_source_ibm_pi_host_groups.go b/ibm/service/power/data_source_ibm_pi_host_groups.go index bbc0e97374..ece45628f1 100644 --- a/ibm/service/power/data_source_ibm_pi_host_groups.go +++ b/ibm/service/power/data_source_ibm_pi_host_groups.go @@ -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 { @@ -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) @@ -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,