3 files changed, 49 insertions, 128 deletions
diff --git a/tvix/nar-bridge/cmd/nar_bridge/import.go b/tvix/nar-bridge/cmd/nar_bridge/import.go
deleted file mode 100644
index 51b99c93a04b..000000000000
--- a/tvix/nar-bridge/cmd/nar_bridge/import.go
+++ /dev/null
@@ -1,57 +0,0 @@
-package main
-
-import (
-	"context"
-	"fmt"
-	"io"
-	"os"
-	"os/signal"
-
-	storev1pb "code.tvl.fyi/tvix/store/protos"
-
-	"code.tvl.fyi/tvix/nar-bridge/pkg/reader"
-	log "github.com/sirupsen/logrus"
-)
-
-type ImportCmd struct {
-	NarPath string `name:"nar-path" help:"A path to a NAR file"`
-}
-
-// `help:"Read a NAR file and display some information"`
-
-func (cmd *ImportCmd) Run() error {
-	retcode := 0
-
-	defer func() { os.Exit(retcode) }()
-
-	c := make(chan os.Signal, 1)
-	signal.Notify(c, os.Interrupt)
-
-	go func() {
-		for range c {
-			log.Info("Received Signal, shutting down…")
-			os.Exit(1)
-		}
-	}()
-
-	log.Infof("Reading %v...", cmd.NarPath)
-
-	f, _ := os.Open(cmd.NarPath)
-
-	r := reader.New(f)
-
-	actualPathInfo, _ := r.Import(
-		context.Background(),
-		func(fileReader io.Reader) error {
-			return nil
-		},
-		func(directory *storev1pb.Directory) error {
-			return nil
-		},
-	)
-
-	fmt.Printf("Node: %+v\n", actualPathInfo.Node)
-	fmt.Printf("References: %+v\n", actualPathInfo.References)
-	fmt.Printf("Narinfo: %+v\n", actualPathInfo.Narinfo)
-	return nil
-}
diff --git a/tvix/nar-bridge/cmd/nar_bridge/main.go b/tvix/nar-bridge/cmd/nar_bridge/main.go
index 78ed3e272d69..482012f39b5f 100644
--- a/tvix/nar-bridge/cmd/nar_bridge/main.go
+++ b/tvix/nar-bridge/cmd/nar_bridge/main.go
@@ -2,29 +2,67 @@ package main
 
 import (
 	"os"
+	"os/signal"
 
 	"github.com/alecthomas/kong"
+
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials/insecure"
+
+	"code.tvl.fyi/tvix/nar-bridge/pkg/server"
+	storev1pb "code.tvl.fyi/tvix/store/protos"
+	"github.com/sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 )
 
-//nolint:gochecknoglobals
+// `help:"Expose a tvix-store gRPC Interface as HTTP NAR/NARinfo"`
 var cli struct {
-	// TODO: make log level configurable
-	Import ImportCmd `kong:"cmd,name='import',help='Import a local NAR file into a tvix-store'"`
-	Serve  ServeCmd  `kong:"cmd,name='serve',help='Expose a tvix-store RPC interface as NAR/NARInfo'"`
+	LogLevel        string `enum:"trace,debug,info,warn,error,fatal,panic" help:"The log level to log with" default:"info"`
+	ListenAddr      string `name:"listen-addr" help:"The address this service listens on" type:"string" default:"[::]:9000"` //nolint:lll
+	EnableAccessLog bool   `name:"access-log" help:"Enable access logging" type:"bool" default:"true" negatable:""`          //nolint:lll
+	StoreAddr       string `name:"store-addr" help:"The address to the tvix-store RPC interface this will connect to"`
 }
 
 func main() {
-	parser, err := kong.New(&cli)
+	_ = kong.Parse(&cli)
+
+	logLevel, err := logrus.ParseLevel(cli.LogLevel)
 	if err != nil {
-		panic(err)
+		log.Panic("invalid log level")
+		return
 	}
+	logrus.SetLevel(logLevel)
+
+	c := make(chan os.Signal, 1)
+	signal.Notify(c, os.Interrupt)
 
-	ctx, err := parser.Parse(os.Args[1:])
+	go func() {
+		for range c {
+			log.Info("Received Signal, shutting down…")
+			os.Exit(1)
+		}
+	}()
+
+	// connect to tvix-store
+	log.Debugf("Dialing to %v", cli.StoreAddr)
+	conn, err := grpc.Dial(cli.StoreAddr, grpc.WithTransportCredentials(insecure.NewCredentials()))
 	if err != nil {
-		panic(err)
+		log.Fatalf("did not connect: %v", err)
 	}
-	// Call the Run() method of the selected parsed command.
-	err = ctx.Run()
+	defer conn.Close()
+
+	log.Printf("Starting nar-bridge at %v", cli.ListenAddr)
+	s := server.New(
+		storev1pb.NewDirectoryServiceClient(conn),
+		storev1pb.NewBlobServiceClient(conn),
+		storev1pb.NewPathInfoServiceClient(conn),
+		cli.EnableAccessLog,
+		30,
+	)
 
-	ctx.FatalIfErrorf(err)
+	err = s.ListenAndServe(cli.ListenAddr)
+	if err != nil {
+		log.Error("Server failed: %w", err)
+		os.Exit(1)
+	}
 }
diff --git a/tvix/nar-bridge/cmd/nar_bridge/serve.go b/tvix/nar-bridge/cmd/nar_bridge/serve.go
deleted file mode 100644
index 6566257176d8..000000000000
--- a/tvix/nar-bridge/cmd/nar_bridge/serve.go
+++ /dev/null
@@ -1,60 +0,0 @@
-package main
-
-import (
-	"os"
-	"os/signal"
-
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials/insecure"
-
-	"code.tvl.fyi/tvix/nar-bridge/pkg/server"
-	storev1pb "code.tvl.fyi/tvix/store/protos"
-	log "github.com/sirupsen/logrus"
-)
-
-type ServeCmd struct {
-	ListenAddr      string `name:"listen-addr" help:"The address this service listens on" type:"string" default:"[::]:9000"` //nolint:lll
-	EnableAccessLog bool   `name:"access-log" help:"Enable access logging" type:"bool" default:"true" negatable:""`          //nolint:lll
-	StoreAddr       string `name:"store-addr" help:"The address to the tvix-store RPC interface this will connect to"`
-}
-
-// `help:"Expose a tvix-store RPC interface as NAR/NARInfo"`
-func (cmd *ServeCmd) Run() error {
-	retcode := 0
-
-	defer func() { os.Exit(retcode) }()
-
-	c := make(chan os.Signal, 1)
-	signal.Notify(c, os.Interrupt)
-
-	go func() {
-		for range c {
-			log.Info("Received Signal, shutting down…")
-			//s.Close()
-			os.Exit(1)
-		}
-	}()
-
-	// connect to tvix-store
-	log.Debugf("Dialing to %v", cmd.StoreAddr)
-	conn, err := grpc.Dial(cmd.StoreAddr, grpc.WithTransportCredentials(insecure.NewCredentials()))
-	if err != nil {
-		log.Fatalf("did not connect: %v", err)
-	}
-	defer conn.Close()
-
-	log.Printf("Starting nar-bridge at %v", cmd.ListenAddr)
-	s := server.New(
-		storev1pb.NewDirectoryServiceClient(conn),
-		storev1pb.NewBlobServiceClient(conn),
-		storev1pb.NewPathInfoServiceClient(conn),
-		cmd.EnableAccessLog,
-		30,
-	)
-
-	err = s.ListenAndServe(cmd.ListenAddr)
-	if err != nil {
-		log.Error("Server failed: %w", err)
-	}
-	return nil
-}