From 6fe34b7ba03c5e2406a0659da651134e675a55d6 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 10 Oct 2023 00:53:11 +0200 Subject: refactor(tvix/nar-bridge): use castorev1pb.RenamedNode We can use the helper to rename the node. Change-Id: Id8defea7e5ebbd43d7b7a9b2992c62084e1828ec Reviewed-on: https://cl.tvl.fyi/c/depot/+/9601 Autosubmit: flokli Reviewed-by: Brian McGee Tested-by: BuildkiteCI --- tvix/nar-bridge/pkg/pathinfosvc/server.go | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'tvix/nar-bridge/pkg') diff --git a/tvix/nar-bridge/pkg/pathinfosvc/server.go b/tvix/nar-bridge/pkg/pathinfosvc/server.go index c452237f26..a271745039 100644 --- a/tvix/nar-bridge/pkg/pathinfosvc/server.go +++ b/tvix/nar-bridge/pkg/pathinfosvc/server.go @@ -247,16 +247,7 @@ func (p *PathInfoServiceServer) Get(ctx context.Context, getPathInfoRequest *sto panic(err) } - // set the root name in all three cases. - if node := pathInfo.Node.GetDirectory(); node != nil { - node.Name = []byte(outPath.String()) - } else if node := pathInfo.Node.GetFile(); node != nil { - node.Name = []byte(outPath.String()) - } else if node := pathInfo.Node.GetSymlink(); node != nil { - node.Name = []byte(outPath.String()) - } else { - panic("node may not be nil") - } + pathInfo.Node = castorev1pb.RenamedNode(pathInfo.Node, outPath.String()) // run Validate on the PathInfo, more as an additional sanity check our code is sound, // to make sure we populated everything properly, before returning it. -- cgit 1.4.1