diff options
-rw-r--r-- | tvix/nar-bridge/cmd/nar-bridge/main.go | 4 | ||||
-rw-r--r-- | tvix/nar-bridge/pkg/http/nar_get.go (renamed from tvix/nar-bridge/pkg/server/nar_get.go) | 2 | ||||
-rw-r--r-- | tvix/nar-bridge/pkg/http/nar_put.go (renamed from tvix/nar-bridge/pkg/server/nar_put.go) | 2 | ||||
-rw-r--r-- | tvix/nar-bridge/pkg/http/narinfo_get.go (renamed from tvix/nar-bridge/pkg/server/narinfo_get.go) | 2 | ||||
-rw-r--r-- | tvix/nar-bridge/pkg/http/narinfo_put.go (renamed from tvix/nar-bridge/pkg/server/narinfo_put.go) | 2 | ||||
-rw-r--r-- | tvix/nar-bridge/pkg/http/server.go (renamed from tvix/nar-bridge/pkg/server/server.go) | 2 | ||||
-rw-r--r-- | tvix/nar-bridge/pkg/http/util.go (renamed from tvix/nar-bridge/pkg/server/util.go) | 2 |
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 0f7445ced5e6..d86e84b870c4 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 3ccb8d658d72..be7eb826062b 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 41cd257f722a..52ab425dfcf9 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 f2276400c61a..91fe6c5603a2 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 55543c9bc297..831f93fbdf77 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 e50c63754130..e8eb229ab41a 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 47e368adde80..60febea1f430 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" |