From 0353108e99c6c2b7f15ea0c99a8ca4fd899d241a Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 3 Oct 2023 14:42:59 +0300 Subject: [PATCH] refactor(tvix/nar-bridge): move DirectoriesUploader to pkg/importer This is useful outside a HTTP server scenario. Change-Id: I0042a6e773906a15a254d850520e6f841035bf20 Reviewed-on: https://cl.tvl.fyi/c/depot/+/9533 Autosubmit: flokli Tested-by: BuildkiteCI Reviewed-by: Connor Brewster --- tvix/nar-bridge/pkg/{server => importer}/directory_upload.go | 2 +- tvix/nar-bridge/pkg/server/nar_put.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename tvix/nar-bridge/pkg/{server => importer}/directory_upload.go (99%) diff --git a/tvix/nar-bridge/pkg/server/directory_upload.go b/tvix/nar-bridge/pkg/importer/directory_upload.go similarity index 99% rename from tvix/nar-bridge/pkg/server/directory_upload.go rename to tvix/nar-bridge/pkg/importer/directory_upload.go index ad04d2e38..5d5ca1f38 100644 --- a/tvix/nar-bridge/pkg/server/directory_upload.go +++ b/tvix/nar-bridge/pkg/importer/directory_upload.go @@ -1,4 +1,4 @@ -package server +package importer import ( "context" diff --git a/tvix/nar-bridge/pkg/server/nar_put.go b/tvix/nar-bridge/pkg/server/nar_put.go index 5a56cba88..41cd257f7 100644 --- a/tvix/nar-bridge/pkg/server/nar_put.go +++ b/tvix/nar-bridge/pkg/server/nar_put.go @@ -36,7 +36,7 @@ func registerNarPut(s *Server) { log := log.WithField("narhash_url", narHashFromUrl.SRIString()) - directoriesUploader := NewDirectoriesUploader(ctx, s.directoryServiceClient) + directoriesUploader := importer.NewDirectoriesUploader(ctx, s.directoryServiceClient) defer directoriesUploader.Done() //nolint:errcheck pathInfo, err := importer.Import(