Skip to content

Commit 644f5ad

Browse files
committed
change to Infof s
1 parent f90c0e0 commit 644f5ad

File tree

1 file changed

+24
-12
lines changed

1 file changed

+24
-12
lines changed

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

+24-12
Original file line numberDiff line numberDiff line change
@@ -576,8 +576,10 @@ func (cloud *CloudProvider) DeleteDisk(ctx context.Context, project string, volK
576576

577577
func (cloud *CloudProvider) deleteZonalDisk(ctx context.Context, project, zone, name string) error {
578578
op, err := cloud.service.Disks.Delete(project, zone, name).Context(ctx).Do()
579-
opName := op.Name
580-
klog.V(5).Infof("DeleteDisk operation %s", opName)
579+
if op != nil {
580+
opName := op.Name
581+
klog.V(5).Infof("DeleteDisk operation %s", opName)
582+
}
581583
if err != nil {
582584
if IsGCEError(err, "notFound") {
583585
// Already deleted
@@ -594,8 +596,10 @@ func (cloud *CloudProvider) deleteZonalDisk(ctx context.Context, project, zone,
594596

595597
func (cloud *CloudProvider) deleteRegionalDisk(ctx context.Context, project, region, name string) error {
596598
op, err := cloud.service.RegionDisks.Delete(project, region, name).Context(ctx).Do()
597-
opName := op.Name
598-
klog.V(5).Infof("DeleteDisk operation %s", opName)
599+
if op != nil {
600+
opName := op.Name
601+
klog.V(5).Infof("DeleteDisk operation %s", opName)
602+
}
599603
if err != nil {
600604
if IsGCEError(err, "notFound") {
601605
// Already deleted
@@ -627,8 +631,10 @@ func (cloud *CloudProvider) AttachDisk(ctx context.Context, project string, volK
627631
}
628632

629633
op, err := cloud.service.Instances.AttachDisk(project, instanceZone, instanceName, attachedDiskV1).Context(ctx).Do()
630-
opName := op.Name
631-
klog.V(5).Infof("AttachDisk operation %s", opName)
634+
if op != nil {
635+
opName := op.Name
636+
klog.V(5).Infof("AttachDisk operation %s", opName)
637+
}
632638
if err != nil {
633639
return fmt.Errorf("failed cloud service attach disk call: %v", err)
634640
}
@@ -642,8 +648,10 @@ func (cloud *CloudProvider) AttachDisk(ctx context.Context, project string, volK
642648
func (cloud *CloudProvider) DetachDisk(ctx context.Context, project, deviceName, instanceZone, instanceName string) error {
643649
klog.V(5).Infof("Detaching disk %v from %v", deviceName, instanceName)
644650
op, err := cloud.service.Instances.DetachDisk(project, instanceZone, instanceName, deviceName).Context(ctx).Do()
645-
opName := op.Name
646-
klog.V(5).Infof("DetachDisk operation %s", opName)
651+
if op != nil {
652+
opName := op.Name
653+
klog.V(5).Infof("DetachDisk operation %s", opName)
654+
}
647655
if err != nil {
648656
return err
649657
}
@@ -856,8 +864,10 @@ func (cloud *CloudProvider) resizeZonalDisk(ctx context.Context, project string,
856864
SizeGb: requestGb,
857865
}
858866
op, err := cloud.service.Disks.Resize(project, volKey.Zone, volKey.Name, resizeReq).Context(ctx).Do()
859-
opName := op.Name
860-
klog.V(5).Infof("ResizeDisk operation %s", opName)
867+
if op != nil {
868+
opName := op.Name
869+
klog.V(5).Infof("ResizeDisk operation %s", opName)
870+
}
861871
if err != nil {
862872
return -1, fmt.Errorf("failed to resize zonal volume %v: %v", volKey.String(), err)
863873
}
@@ -875,8 +885,10 @@ func (cloud *CloudProvider) resizeRegionalDisk(ctx context.Context, project stri
875885
SizeGb: requestGb,
876886
}
877887
op, err := cloud.service.RegionDisks.Resize(project, volKey.Region, volKey.Name, resizeReq).Context(ctx).Do()
878-
opName := op.Name
879-
klog.V(5).Infof("ResizeDisk operation %s", opName)
888+
if op != nil {
889+
opName := op.Name
890+
klog.V(5).Infof("ResizeDisk operation %s", opName)
891+
}
880892
if err != nil {
881893
return -1, fmt.Errorf("failed to resize regional volume %v: %v", volKey.String(), err)
882894
}

0 commit comments

Comments
 (0)