Resolve merge conflicts in go.mod and go.sumv1.3.4

1 files changed, 5 insertions, 5 deletions

diff --git a/pkg/driver/controllerserver.go b/pkg/driver/controllerserver.go
index 3a2d9fc..b7fb1bb 100644
--- a/pkg/driver/controllerserver.go
+++ b/pkg/driver/controllerserver.go
@@ -53,8 +53,8 @@ func (cs *ControllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol
 	glog.V(4).Infof("params:%v", params)
 	capacity := req.GetCapacityRange().GetRequiredBytes()
 
-	if err := filer_pb.Mkdir(cs.Driver, "/buckets", volumeId, nil); err != nil {
-		return nil, fmt.Errorf("error setting bucket metadata: %v", err)
+	if err := filer_pb.Mkdir(ctx, cs.Driver, "/buckets", volumeId, nil); err != nil {
+		return nil, fmt.Errorf("error creating bucket: %v", err)
 	}
 
 	glog.V(4).Infof("volume created %s", volumeId)
@@ -84,8 +84,8 @@ func (cs *ControllerServer) DeleteVolume(ctx context.Context, req *csi.DeleteVol
 	}
 	glog.V(4).Infof("deleting volume %s", volumeId)
 
-	if err := filer_pb.Remove(cs.Driver, "/buckets", volumeId, true, true, true, false, nil); err != nil {
-		return nil, fmt.Errorf("error setting bucket metadata: %v", err)
+	if err := filer_pb.Remove(ctx, cs.Driver, "/buckets", volumeId, true, true, true, false, nil); err != nil {
+		return nil, fmt.Errorf("error deleting bucket: %v", err)
 	}
 
 	return &csi.DeleteVolumeResponse{}, nil
@@ -135,7 +135,7 @@ func (cs *ControllerServer) ValidateVolumeCapabilities(ctx context.Context, req
 		return nil, status.Error(codes.InvalidArgument, "Volume capabilities missing in request")
 	}
 
-	exists, err := filer_pb.Exists(cs.Driver, "/buckets", req.GetVolumeId(), true)
+	exists, err := filer_pb.Exists(ctx, cs.Driver, "/buckets", req.GetVolumeId(), true)
 	if err != nil {
 		return nil, fmt.Errorf("error checking bucket %s exists: %v", req.GetVolumeId(), err)
 	}