move check op is error check

Author: amacaskill

pkg/gce-cloud-provider/compute/gce-compute.go

@@ -415,14 +415,12 @@ func (cloud *CloudProvider) insertRegionalDisk(
 		insertOp, err = cloud.betaService.RegionDisks.Insert(project, volKey.Region, betaDiskToCreate).Context(ctx).Do()
 		if insertOp != nil {
 			opName = insertOp.Name
-			klog.V(5).Infof("InsertDisk operation %s for disk %s", opName, betaDiskToCreate.Name)
 		}
 	} else {
 		var insertOp *computev1.Operation
 		insertOp, err = cloud.service.RegionDisks.Insert(project, volKey.Region, diskToCreate).Context(ctx).Do()
 		if insertOp != nil {
 			opName = insertOp.Name
-			klog.V(5).Infof("InsertDisk operation %s for disk %s", opName, diskToCreate.Name)
 		}
 	}
 	if err != nil {
@@ -463,6 +461,7 @@ func (cloud *CloudProvider) insertRegionalDisk(
 		}
 		return fmt.Errorf("unknown Insert disk operation error: %v", err)
 	}
+	klog.V(5).Infof("InsertDisk operation %s for disk %s", opName, diskToCreate.Name)
 	return nil
 }
 
@@ -511,14 +510,12 @@ func (cloud *CloudProvider) insertZonalDisk(
 		insertOp, err = cloud.betaService.Disks.Insert(project, volKey.Zone, betaDiskToCreate).Context(ctx).Do()
 		if insertOp != nil {
 			opName = insertOp.Name
-			klog.V(5).Infof("InsertDisk operation %s for disk %s", opName, betaDiskToCreate.Name)
 		}
 	} else {
 		var insertOp *computev1.Operation
 		insertOp, err = cloud.service.Disks.Insert(project, volKey.Zone, diskToCreate).Context(ctx).Do()
 		if insertOp != nil {
 			opName = insertOp.Name
-			klog.V(5).Infof("InsertDisk operation %s for disk %s", opName, diskToCreate.Name)
 		}
 	}
 
@@ -561,6 +558,7 @@ func (cloud *CloudProvider) insertZonalDisk(
 		}
 		return fmt.Errorf("unknown Insert disk operation error: %v", err)
 	}
+	klog.V(5).Infof("InsertDisk operation %s for disk %s", opName, diskToCreate.Name)
 	return nil
 }
 
@@ -578,9 +576,6 @@ func (cloud *CloudProvider) DeleteDisk(ctx context.Context, project string, volK
 
 func (cloud *CloudProvider) deleteZonalDisk(ctx context.Context, project, zone, name string) error {
 	op, err := cloud.service.Disks.Delete(project, zone, name).Context(ctx).Do()
-	if op != nil {
-		klog.V(5).Infof("DeleteDisk operation %s for disk %s", op.Name, name)
-	}
 	if err != nil {
 		if IsGCEError(err, "notFound") {
 			// Already deleted
@@ -592,14 +587,14 @@ func (cloud *CloudProvider) deleteZonalDisk(ctx context.Context, project, zone,
 	if err != nil {
 		return err
 	}
+	// if op != nil {
+	klog.V(5).Infof("DeleteDisk operation %s for disk %s", op.Name, name)
+	// }
 	return nil
 }
 
 func (cloud *CloudProvider) deleteRegionalDisk(ctx context.Context, project, region, name string) error {
 	op, err := cloud.service.RegionDisks.Delete(project, region, name).Context(ctx).Do()
-	if op != nil {
-		klog.V(5).Infof("DeleteDisk operation %s for disk %s", op.Name, name)
-	}
 	if err != nil {
 		if IsGCEError(err, "notFound") {
 			// Already deleted
@@ -611,6 +606,9 @@ func (cloud *CloudProvider) deleteRegionalDisk(ctx context.Context, project, reg
 	if err != nil {
 		return err
 	}
+	// if op != nil {
+	klog.V(5).Infof("DeleteDisk operation %s for disk %s", op.Name, name)
+	// }
 	return nil
 }
 
@@ -631,32 +629,32 @@ func (cloud *CloudProvider) AttachDisk(ctx context.Context, project string, volK
 	}
 
 	op, err := cloud.service.Instances.AttachDisk(project, instanceZone, instanceName, attachedDiskV1).Context(ctx).Do()
-	if op != nil {
-		klog.V(5).Infof("AttachDisk operation %s for disk %s", op.Name, attachedDiskV1.DeviceName)
-	}
 	if err != nil {
 		return fmt.Errorf("failed cloud service attach disk call: %v", err)
 	}
 	err = cloud.waitForZonalOp(ctx, project, op.Name, instanceZone)
 	if err != nil {
 		return fmt.Errorf("failed when waiting for zonal op: %v", err)
 	}
+	// if op != nil {
+	klog.V(5).Infof("AttachDisk operation %s for disk %s", op.Name, attachedDiskV1.DeviceName)
+	// }
 	return nil
 }
 
 func (cloud *CloudProvider) DetachDisk(ctx context.Context, project, deviceName, instanceZone, instanceName string) error {
 	klog.V(5).Infof("Detaching disk %v from %v", deviceName, instanceName)
 	op, err := cloud.service.Instances.DetachDisk(project, instanceZone, instanceName, deviceName).Context(ctx).Do()
-	if op != nil {
-		klog.V(5).Infof("DetachDisk operation %s for disk %s", op.Name, deviceName)
-	}
 	if err != nil {
 		return err
 	}
 	err = cloud.waitForZonalOp(ctx, project, op.Name, instanceZone)
 	if err != nil {
 		return err
 	}
+	if op != nil {
+		klog.V(5).Infof("DetachDisk operation %s for disk %s", op.Name, deviceName)
+	}
 	return nil
 }
 
@@ -862,9 +860,6 @@ func (cloud *CloudProvider) resizeZonalDisk(ctx context.Context, project string,
 		SizeGb: requestGb,
 	}
 	op, err := cloud.service.Disks.Resize(project, volKey.Zone, volKey.Name, resizeReq).Context(ctx).Do()
-	if op != nil {
-		klog.V(5).Infof("ResizeDisk operation %s for disk %s", op.Name, volKey.Name)
-	}
 	if err != nil {
 		return -1, fmt.Errorf("failed to resize zonal volume %v: %v", volKey.String(), err)
 	}
@@ -873,7 +868,9 @@ func (cloud *CloudProvider) resizeZonalDisk(ctx context.Context, project string,
 	if err != nil {
 		return -1, fmt.Errorf("failed waiting for op for zonal resize for %s: %v", volKey.String(), err)
 	}
-
+	// if op != nil {
+	klog.V(5).Infof("ResizeDisk operation %s for disk %s", op.Name, volKey.Name)
+	// }
 	return requestGb, nil
 }
 
@@ -883,9 +880,6 @@ func (cloud *CloudProvider) resizeRegionalDisk(ctx context.Context, project stri
 	}
 
 	op, err := cloud.service.RegionDisks.Resize(project, volKey.Region, volKey.Name, resizeReq).Context(ctx).Do()
-	if op != nil {
-		klog.V(5).Infof("ResizeDisk operation %s for disk %s", op.Name, volKey.Name)
-	}
 	if err != nil {
 		return -1, fmt.Errorf("failed to resize regional volume %v: %v", volKey.String(), err)
 	}
@@ -894,7 +888,9 @@ func (cloud *CloudProvider) resizeRegionalDisk(ctx context.Context, project stri
 	if err != nil {
 		return -1, fmt.Errorf("failed waiting for op for regional resize for %s: %v", volKey.String(), err)
 	}
-
+	// if op != nil {
+	klog.V(5).Infof("ResizeDisk operation %s for disk %s", op.Name, volKey.Name)
+	// }
 	return requestGb, nil
 }