diff options
| author | Florian Klink <flokli@flokli.de> | 2023-10-03T11·40+0300 |
|---|---|---|
| committer | flokli <flokli@flokli.de> | 2023-10-05T06·17+0000 |
| commit | b78b8d83385a57cc58145662f2b96d97143eda7f (patch) | |
| tree | 5b56d7d2e8bf4ddeaa485d44cd3ba4d83070dbb7 /tvix | |
| parent | 259269482c9d98e800f44b9124cf33a9d43333db (diff) | |
refactor(tvix/nar-bridge): move blob cb function to pkg/importer r/6698
This is useful outside a HTTP server scenario. Change-Id: If35f1ab245855378fd01f16ad7b5774d0cf590ba Reviewed-on: https://cl.tvl.fyi/c/depot/+/9532 Tested-by: BuildkiteCI Reviewed-by: Connor Brewster <cbrewster@hey.com> Autosubmit: flokli <flokli@flokli.de>
Diffstat (limited to 'tvix')
| -rw-r--r-- | tvix/nar-bridge/pkg/importer/blob_upload.go (renamed from tvix/nar-bridge/pkg/server/blob_upload.go) | 4 | ||||
| -rw-r--r-- | tvix/nar-bridge/pkg/server/nar_put.go | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tvix/nar-bridge/pkg/server/blob_upload.go b/tvix/nar-bridge/pkg/importer/blob_upload.go index 2ae1448e7e79..24aa1cad1df7 100644 --- a/tvix/nar-bridge/pkg/server/blob_upload.go +++ b/tvix/nar-bridge/pkg/importer/blob_upload.go @@ -1,4 +1,4 @@ -package server +package importer import ( "bufio" @@ -17,7 +17,7 @@ const chunkSize = 1024 * 1024 // this produces a callback function that can be used as blobCb for the // importer.Import function call. -func genBlobServiceWriteCb(ctx context.Context, blobServiceClient castorev1pb.BlobServiceClient) func(io.Reader) ([]byte, error) { +func GenBlobUploaderCb(ctx context.Context, blobServiceClient castorev1pb.BlobServiceClient) func(io.Reader) ([]byte, error) { return func(blobReader io.Reader) ([]byte, error) { // Ensure the blobReader is buffered to at least the chunk size. blobReader = bufio.NewReaderSize(blobReader, chunkSize) diff --git a/tvix/nar-bridge/pkg/server/nar_put.go b/tvix/nar-bridge/pkg/server/nar_put.go index d8c77c146462..5a56cba8810c 100644 --- a/tvix/nar-bridge/pkg/server/nar_put.go +++ b/tvix/nar-bridge/pkg/server/nar_put.go @@ -43,7 +43,7 @@ func registerNarPut(s *Server) { ctx, // buffer the body by 10MiB bufio.NewReaderSize(r.Body, 10*1024*1024), - genBlobServiceWriteCb(ctx, s.blobServiceClient), + importer.GenBlobUploaderCb(ctx, s.blobServiceClient), func(directory *castorev1pb.Directory) ([]byte, error) { return directoriesUploader.Put(directory) }, |