From ceb1674e9f66bcbf382130bb195d367d269ddf86 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 11 Oct 2023 11:21:57 +0200 Subject: refactor(tvix/nar-bridge): pass root node to storev1pb.Export Bumps the go module past cl/9604 and update the consumer side. Change-Id: Id44245017f1dc2f8aac28051cdbb45b83bdc5be3 Reviewed-on: https://cl.tvl.fyi/c/depot/+/9650 Reviewed-by: Brian McGee Tested-by: BuildkiteCI --- tvix/nar-bridge/pkg/http/nar_get.go | 2 +- tvix/nar-bridge/pkg/importer/roundtrip_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tvix/nar-bridge/pkg') diff --git a/tvix/nar-bridge/pkg/http/nar_get.go b/tvix/nar-bridge/pkg/http/nar_get.go index 85405d81f463..eecc59900784 100644 --- a/tvix/nar-bridge/pkg/http/nar_get.go +++ b/tvix/nar-bridge/pkg/http/nar_get.go @@ -95,7 +95,7 @@ func renderNar( // render the NAR file err := storev1pb.Export( w, - pathInfo, + pathInfo.Node, func(directoryDigest []byte) (*castorev1pb.Directory, error) { log.WithField("directory", base64.StdEncoding.EncodeToString(directoryDigest)).Debug("Get directory") directoryRefStr := hex.EncodeToString(directoryDigest) diff --git a/tvix/nar-bridge/pkg/importer/roundtrip_test.go b/tvix/nar-bridge/pkg/importer/roundtrip_test.go index 89603cfcfdbe..1daba449bd33 100644 --- a/tvix/nar-bridge/pkg/importer/roundtrip_test.go +++ b/tvix/nar-bridge/pkg/importer/roundtrip_test.go @@ -59,7 +59,7 @@ func TestRoundtrip(t *testing.T) { var buf bytes.Buffer err = storev1pb.Export( &buf, - pathInfo, + pathInfo.Node, func(directoryDgst []byte) (*castorev1pb.Directory, error) { d, found := directoriesMap[base64.StdEncoding.EncodeToString(directoryDgst)] if !found { -- cgit 1.4.1