handle nil network id in dhcp detail

Fixes IBM-Cloud#4683 Signed-off-by: Yussuf Shaikh <yussuf.shaikh1@ibm.com>
benbuchanan · Aug 17, 2023 · 86649ea · 86649ea
1 parent 2cfd566
commit 86649ea
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 9 deletions.
diff --git a/ibm/service/power/data_source_ibm_pi_dhcp.go b/ibm/service/power/data_source_ibm_pi_dhcp.go
@@ -113,9 +113,13 @@ func dataSourceIBMPIDhcpRead(ctx context.Context, d *schema.ResourceData, meta i
 
 	if dhcpServer.Network != nil {
 		dhcpNetwork := dhcpServer.Network
-		d.Set(Attr_DhcpNetworkDeprecated, *dhcpNetwork.ID)
-		d.Set(Attr_DhcpNetworkID, *dhcpNetwork.ID)
-		d.Set(Attr_DhcpNetworkName, *dhcpNetwork.Name)
+		if dhcpNetwork.ID != nil {
+			d.Set(Attr_DhcpNetworkDeprecated, *dhcpNetwork.ID)
+			d.Set(Attr_DhcpNetworkID, *dhcpNetwork.ID)
+		}
+		if dhcpNetwork.Name != nil {
+			d.Set(Attr_DhcpNetworkName, *dhcpNetwork.Name)
+		}
 	}
 
 	if dhcpServer.Leases != nil {

diff --git a/ibm/service/power/data_source_ibm_pi_dhcps.go b/ibm/service/power/data_source_ibm_pi_dhcps.go
@@ -102,9 +102,13 @@ func dataSourceIBMPIDhcpServersRead(ctx context.Context, d *schema.ResourceData,
 		}
 		if dhcpServer.Network != nil {
 			dhcpNetwork := dhcpServer.Network
-			server[Attr_DhcpNetworkDeprecated] = *dhcpNetwork.ID
-			server[Attr_DhcpNetworkID] = *dhcpNetwork.ID
-			server[Attr_DhcpNetworkName] = *dhcpNetwork.Name
+			if dhcpNetwork.ID != nil {
+				d.Set(Attr_DhcpNetworkDeprecated, *dhcpNetwork.ID)
+				d.Set(Attr_DhcpNetworkID, *dhcpNetwork.ID)
+			}
+			if dhcpNetwork.Name != nil {
+				d.Set(Attr_DhcpNetworkName, *dhcpNetwork.Name)
+			}
 		}
 		servers = append(servers, server)
 	}

diff --git a/ibm/service/power/resource_ibm_pi_dhcp.go b/ibm/service/power/resource_ibm_pi_dhcp.go
@@ -209,9 +209,13 @@ func resourceIBMPIDhcpRead(ctx context.Context, d *schema.ResourceData, meta int
 
 	if dhcpServer.Network != nil {
 		dhcpNetwork := dhcpServer.Network
-		d.Set(Attr_DhcpNetworkDeprecated, *dhcpNetwork.ID)
-		d.Set(Attr_DhcpNetworkID, *dhcpNetwork.ID)
-		d.Set(Attr_DhcpNetworkName, *dhcpNetwork.Name)
+		if dhcpNetwork.ID != nil {
+			d.Set(Attr_DhcpNetworkDeprecated, *dhcpNetwork.ID)
+			d.Set(Attr_DhcpNetworkID, *dhcpNetwork.ID)
+		}
+		if dhcpNetwork.Name != nil {
+			d.Set(Attr_DhcpNetworkName, *dhcpNetwork.Name)
+		}
 	}
 
 	if dhcpServer.Leases != nil {