mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(tvix/nar-bridge): rename writer package to exporter

Browse source 
Change-Id: I7cf6a3ed0dca4c450fadd9228dc0154ad6254f51
Reviewed-on: https://cl.tvl.fyi/c/depot/+/9530
Tested-by: BuildkiteCI
Reviewed-by: Connor Brewster <cbrewster@hey.com>
Autosubmit: flokli <flokli@flokli.de>
This commit is contained in:
Florian Klink 2023-10-03 14:29:24 +03:00 committed by flokli
parent 49b427d773
commit d3c44ab03d
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tvix/nar-bridge/pkg/writer/writer.go → tvix/nar-bridge/pkg/exporter/export.go
View file

@ -1,4 +1,4 @@
package writer
package exporter
import (
"fmt"
@ -13,7 +13,7 @@ import (
type DirectoryLookupFn func([]byte) (*castorev1pb.Directory, error)
type BlobLookupFn func([]byte) (io.ReadCloser, error)
// Export will traverse a given pathInfo structure, and write the contents
// Export will traverse a given PathInfo structure, and write the contents
// in NAR format to the passed Writer.
// It uses directoryLookupFn and blobLookupFn to resolve references.
func Export(

12
tvix/nar-bridge/pkg/writer/writer_test.go → tvix/nar-bridge/pkg/exporter/export_test.go
View file

@ -1,4 +1,4 @@
package writer_test
package exporter_test
import (
"bytes"
@ -10,8 +10,8 @@ import (
"testing"
castorev1pb "code.tvl.fyi/tvix/castore/protos"
"code.tvl.fyi/tvix/nar-bridge/pkg/exporter"
"code.tvl.fyi/tvix/nar-bridge/pkg/importer"
"code.tvl.fyi/tvix/nar-bridge/pkg/writer"
storev1pb "code.tvl.fyi/tvix/store/protos"
"github.com/stretchr/testify/require"
"lukechampine.com/blake3"
@ -49,7 +49,7 @@ func TestSymlink(t *testing.T) {
var buf bytes.Buffer
err := writer.Export(&buf, pathInfo, func([]byte) (*castorev1pb.Directory, error) {
err := exporter.Export(&buf, pathInfo, func([]byte) (*castorev1pb.Directory, error) {
panic("no directories expected")
}, func([]byte) (io.ReadCloser, error) {
panic("no files expected")
@ -90,7 +90,7 @@ func TestRegular(t *testing.T) {
var buf bytes.Buffer
err := writer.Export(&buf, pathInfo, func([]byte) (*castorev1pb.Directory, error) {
err := exporter.Export(&buf, pathInfo, func([]byte) (*castorev1pb.Directory, error) {
panic("no directories expected")
}, func(blobRef []byte) (io.ReadCloser, error) {
if !bytes.Equal(blobRef, BLAKE3_DIGEST_0X01) {
@ -134,7 +134,7 @@ func TestEmptyDirectory(t *testing.T) {
var buf bytes.Buffer
err := writer.Export(&buf, pathInfo, func(directoryRef []byte) (*castorev1pb.Directory, error) {
err := exporter.Export(&buf, pathInfo, func(directoryRef []byte) (*castorev1pb.Directory, error) {
if !bytes.Equal(directoryRef, emptyDirectoryDigest) {
panic("unexpected directoryRef")
}
@ -196,7 +196,7 @@ func TestFull(t *testing.T) {
// done populating everything, now actually test the export :-)
var buf bytes.Buffer
err = writer.Export(
err = exporter.Export(
&buf,
pathInfo,
func(directoryDgst []byte) (*castorev1pb.Directory, error) {

2
tvix/nar-bridge/pkg/writer/writer_pick_next_node_test.go → tvix/nar-bridge/pkg/exporter/pick_next_node_test.go
View file

@ -1,4 +1,4 @@
package writer
package exporter
import (
"testing"

4
tvix/nar-bridge/pkg/server/nar_get.go
View file

@ -13,7 +13,7 @@ import (
"sync"
castorev1pb "code.tvl.fyi/tvix/castore/protos"
"code.tvl.fyi/tvix/nar-bridge/pkg/writer"
"code.tvl.fyi/tvix/nar-bridge/pkg/exporter"
storev1pb "code.tvl.fyi/tvix/store/protos"
"github.com/go-chi/chi/v5"
nixhash "github.com/nix-community/go-nix/pkg/hash"
@ -94,7 +94,7 @@ func renderNar(
}
// render the NAR file
err := writer.Export(
err := exporter.Export(
w,
pathInfo,
func(directoryDigest []byte) (*castorev1pb.Directory, error) {