Skip to content

Commit 2dfbe7b

Browse files
committed
don't check error when transforming
1 parent 0cbf916 commit 2dfbe7b

File tree

2 files changed

+6
-14
lines changed

2 files changed

+6
-14
lines changed

rpc/rpc.go

+2-10
Original file line numberDiff line numberDiff line change
@@ -462,11 +462,7 @@ func (v *Vibranium) CacheImage(opts *pb.CacheImageOptions, stream pb.CoreRPC_Cac
462462
v.taskAdd("CacheImage", true)
463463
defer v.taskDone("CacheImage", true)
464464

465-
cacheImageOptions, err := toCoreCacheImageOptions(opts)
466-
if err != nil {
467-
return err
468-
}
469-
ch, err := v.cluster.CacheImage(stream.Context(), cacheImageOptions)
465+
ch, err := v.cluster.CacheImage(stream.Context(), toCoreCacheImageOptions(opts))
470466
if err != nil {
471467
return err
472468
}
@@ -484,11 +480,7 @@ func (v *Vibranium) RemoveImage(opts *pb.RemoveImageOptions, stream pb.CoreRPC_R
484480
v.taskAdd("RemoveImage", true)
485481
defer v.taskDone("RemoveImage", true)
486482

487-
removeImageOptions, err := toCoreRemoveImageOptions(opts)
488-
if err != nil {
489-
return err
490-
}
491-
ch, err := v.cluster.RemoveImage(stream.Context(), removeImageOptions)
483+
ch, err := v.cluster.RemoveImage(stream.Context(), toCoreRemoveImageOptions(opts))
492484
if err != nil {
493485
return err
494486
}

rpc/transform.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -541,21 +541,21 @@ func toRPCCapacityMessage(msg *types.CapacityMessage) *pb.CapacityMessage {
541541
}
542542
}
543543

544-
func toCoreCacheImageOptions(opts *pb.CacheImageOptions) (*types.ImageOptions, error) {
544+
func toCoreCacheImageOptions(opts *pb.CacheImageOptions) *types.ImageOptions {
545545
return &types.ImageOptions{
546546
Podname: opts.Podname,
547547
Nodenames: opts.Nodenames,
548548
Images: opts.Images,
549549
Step: int(opts.Step),
550-
}, nil
550+
}
551551
}
552552

553-
func toCoreRemoveImageOptions(opts *pb.RemoveImageOptions) (*types.ImageOptions, error) {
553+
func toCoreRemoveImageOptions(opts *pb.RemoveImageOptions) *types.ImageOptions {
554554
return &types.ImageOptions{
555555
Podname: opts.Podname,
556556
Nodenames: opts.Nodenames,
557557
Images: opts.Images,
558558
Step: int(opts.Step),
559559
Prune: opts.Prune,
560-
}, nil
560+
}
561561
}

0 commit comments

Comments
 (0)