refactor(tvix/nar-bridge): move pkg/server to pkg/http r/6700

This is only dealing with the HTTP interface.

Change-Id: I011b624fd9f11ea96231b92fea1166c118a219f2
Reviewed-on: https://cl.tvl.fyi/c/depot/+/9535
Tested-by: BuildkiteCI
Autosubmit: flokli <flokli@flokli.de>
Reviewed-by: Connor Brewster <cbrewster@hey.com>

7 files changed, 8 insertions, 8 deletions

diff --git a/tvix/nar-bridge/cmd/nar-bridge/main.go b/tvix/nar-bridge/cmd/nar-bridge/main.go
index 0f7445ced5..d86e84b870 100644
--- a/tvix/nar-bridge/cmd/nar-bridge/main.go
+++ b/tvix/nar-bridge/cmd/nar-bridge/main.go
@@ -12,7 +12,7 @@ import (
 	"google.golang.org/grpc/credentials/insecure"
 
 	castorev1pb "code.tvl.fyi/tvix/castore/protos"
-	"code.tvl.fyi/tvix/nar-bridge/pkg/server"
+	narBridgeHttp "code.tvl.fyi/tvix/nar-bridge/pkg/http"
 	storev1pb "code.tvl.fyi/tvix/store/protos"
 	"github.com/sirupsen/logrus"
 	log "github.com/sirupsen/logrus"
@@ -47,7 +47,7 @@ func main() {
 	}
 	defer conn.Close()
 
-	s := server.New(
+	s := narBridgeHttp.New(
 		castorev1pb.NewDirectoryServiceClient(conn),
 		castorev1pb.NewBlobServiceClient(conn),
 		storev1pb.NewPathInfoServiceClient(conn),
diff --git a/tvix/nar-bridge/pkg/server/nar_get.go b/tvix/nar-bridge/pkg/http/nar_get.go
index 3ccb8d658d..be7eb82606 100644
--- a/tvix/nar-bridge/pkg/server/nar_get.go
+++ b/tvix/nar-bridge/pkg/http/nar_get.go
@@ -1,4 +1,4 @@
-package server
+package http
 
 import (
 	"bytes"
diff --git a/tvix/nar-bridge/pkg/server/nar_put.go b/tvix/nar-bridge/pkg/http/nar_put.go
index 41cd257f72..52ab425dfc 100644
--- a/tvix/nar-bridge/pkg/server/nar_put.go
+++ b/tvix/nar-bridge/pkg/http/nar_put.go
@@ -1,4 +1,4 @@
-package server
+package http
 
 import (
 	"bufio"
diff --git a/tvix/nar-bridge/pkg/server/narinfo_get.go b/tvix/nar-bridge/pkg/http/narinfo_get.go
index f2276400c6..91fe6c5603 100644
--- a/tvix/nar-bridge/pkg/server/narinfo_get.go
+++ b/tvix/nar-bridge/pkg/http/narinfo_get.go
@@ -1,4 +1,4 @@
-package server
+package http
 
 import (
 	"context"
diff --git a/tvix/nar-bridge/pkg/server/narinfo_put.go b/tvix/nar-bridge/pkg/http/narinfo_put.go
index 55543c9bc2..831f93fbdf 100644
--- a/tvix/nar-bridge/pkg/server/narinfo_put.go
+++ b/tvix/nar-bridge/pkg/http/narinfo_put.go
@@ -1,4 +1,4 @@
-package server
+package http
 
 import (
 	"net/http"
diff --git a/tvix/nar-bridge/pkg/server/server.go b/tvix/nar-bridge/pkg/http/server.go
index e50c637541..e8eb229ab4 100644
--- a/tvix/nar-bridge/pkg/server/server.go
+++ b/tvix/nar-bridge/pkg/http/server.go
@@ -1,4 +1,4 @@
-package server
+package http
 
 import (
 	"context"
diff --git a/tvix/nar-bridge/pkg/server/util.go b/tvix/nar-bridge/pkg/http/util.go
index 47e368adde..60febea1f4 100644
--- a/tvix/nar-bridge/pkg/server/util.go
+++ b/tvix/nar-bridge/pkg/http/util.go
@@ -1,4 +1,4 @@
-package server
+package http
 
 import (
 	"fmt"