Fixes from code review

Author: Alexander-Kita

ibm/service/power/data_source_ibm_pi_virtual_serial_number.go

@@ -5,7 +5,6 @@ package power
 
 import (
 	"context"
-	"log"
 
 	"github.com/IBM-Cloud/power-go-client/clients/instance"
 	"github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns"
@@ -65,7 +64,6 @@ func dataSourceIBMPIVirtualSerialNumberRead(ctx context.Context, d *schema.Resou
 	vsnInput := d.Get(Arg_VirtualSerialNumber).(string)
 	virtualSerialNumberData, err := client.Get(vsnInput)
 	if err != nil {
-		log.Printf("[DEBUG] get virtual serial number %s failed: %v", vsnInput, err)
 		return diag.FromErr(err)
 	}
 

ibm/service/power/data_source_ibm_pi_virtual_serial_numbers.go

@@ -5,7 +5,6 @@ package power
 
 import (
 	"context"
-	"log"
 
 	"github.com/IBM-Cloud/power-go-client/clients/instance"
 	"github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns"
@@ -77,7 +76,6 @@ func dataSourceIBMPIVirtualSerialNumbersRead(ctx context.Context, d *schema.Reso
 
 	vsns, err := client.GetAll(&pvmInstanceID)
 	if err != nil {
-		log.Printf("[DEBUG] get virtual serial numbers failed: %v", err)
 		return diag.FromErr(err)
 	}
 
@@ -93,5 +91,3 @@ func dataSourceIBMPIVirtualSerialNumbersRead(ctx context.Context, d *schema.Reso
 	d.Set(Attr_VirtualSerialNumbers, vsnMapList)
 	return nil
 }
-
-func flattenVirtualSerialNumbers() {}

ibm/service/power/resource_ibm_pi_instance.go

@@ -983,9 +983,7 @@ func resourceIBMPIInstanceUpdate(ctx context.Context, d *schema.ResourceData, me
 			instanceRestart := false
 
 			status := d.Get(Attr_Status).(string)
-			if strings.ToLower(status) == State_Shutoff {
-				log.Printf("[DEBUG] lpar shutoff not needed")
-			} else {
+			if strings.ToLower(status) != State_Shutoff {
 				err := stopLparForResourceChange(ctx, client, instanceID, d)
 				if err != nil {
 					return diag.FromErr(err)
@@ -1066,11 +1064,14 @@ func resourceIBMPIInstanceDelete(ctx context.Context, d *schema.ResourceData, me
 	client := instance.NewIBMPIInstanceClient(ctx, sess, cloudInstanceID)
 	for _, instanceID := range idArr[1:] {
 		retainVSNBool := d.Get(Arg_RetainVirtualSerialNumber).(bool)
-		body := &models.PVMInstanceDelete{
-			RetainVSN: &retainVSNBool,
+		if retainVSNBool {
+			body := &models.PVMInstanceDelete{
+				RetainVSN: &retainVSNBool,
+			}
+			err = client.DeleteWithBody(instanceID, body)
+		} else {
+			err = client.Delete(instanceID)
 		}
-		err = client.DeleteWithBody(instanceID, body)
-
 		if err != nil {
 			return diag.FromErr(err)
 		}