Merge pull request #964 from ialidzhikov/nit/remove-duplication

k8s-ci-robot · web-flow · commit 8f3601563a27 · 2022-04-20T22:40:57.000-07:00
Use existing error message format
diff --git a/pkg/gce-pd-csi-driver/node.go b/pkg/gce-pd-csi-driver/node.go
@@ -356,7 +356,7 @@ func (ns *GCENodeServer) NodeUnstageVolume(ctx context.Context, req *csi.NodeUns
 	}
 
 	if acquired := ns.volumeLocks.TryAcquire(volumeID); !acquired {
-		return nil, status.Error(codes.Aborted, fmt.Sprintf("An operation with the given Volume ID %s already exists", volumeID))
+		return nil, status.Errorf(codes.Aborted, common.VolumeOperationAlreadyExistsFmt, volumeID)
 	}
 	defer ns.volumeLocks.Release(volumeID)
 

Original file line number	Diff line number	Diff line change
`@@ -356,7 +356,7 @@ func (ns GCENodeServer) NodeUnstageVolume(ctx context.Context, req csi.NodeUns`
`356`	`356`	`}`
`357`	`357`
`358`	`358`	`if acquired := ns.volumeLocks.TryAcquire(volumeID); !acquired {`
`359`		`- return nil, status.Error(codes.Aborted, fmt.Sprintf("An operation with the given Volume ID %s already exists", volumeID))`
	`359`	`+ return nil, status.Errorf(codes.Aborted, common.VolumeOperationAlreadyExistsFmt, volumeID)`
`360`	`360`	`}`
`361`	`361`	`defer ns.volumeLocks.Release(volumeID)`
`362`	`362`