diff options
author | Florian Klink <flokli@flokli.de> | 2022-11-19T20·34+0000 |
---|---|---|
committer | flokli <flokli@flokli.de> | 2023-09-17T13·24+0000 |
commit | 0ecd10bf307049b9833e69f331ec049ae8840d85 (patch) | |
tree | 1718b6e0cd7cb3177b951c88dff1dba11faecabf /tvix/nar-bridge/cmd | |
parent | 683d3e0d2d1de30eb7895861627203e62702a770 (diff) |
feat(tvix/nar-bridge): init r/6600
This provides a Nix HTTP Binary Cache interface in front of a tvix-store that's reachable via gRPC. TODOs: - remove import command, move serve up to toplevel. We have nix-copy- closure and tvix-store commands. - loop into CI. We should be able to fetch the protos as a third-party dependency. - Check if we can test nar-bridge slightly easier in an integration test. - Ensure we support connecting to unix sockets and grpc+http at least, using the same syntax as tvix-store. - Don't buffer the entire blob when rendering NAR Co-Authored-By: Connor Brewster <cbrewster@hey.com> Co-Authored-By: Márton Boros <martonboros@gmail.com> Co-Authored-By: Vo Minh Thu <noteed@gmail.com> Change-Id: I6064474e49dfe78cea67676957462d9f28658d4a Reviewed-on: https://cl.tvl.fyi/c/depot/+/9339 Tested-by: BuildkiteCI Reviewed-by: tazjin <tazjin@tvl.su>
Diffstat (limited to 'tvix/nar-bridge/cmd')
-rw-r--r-- | tvix/nar-bridge/cmd/nar_bridge/import.go | 57 | ||||
-rw-r--r-- | tvix/nar-bridge/cmd/nar_bridge/main.go | 30 | ||||
-rw-r--r-- | tvix/nar-bridge/cmd/nar_bridge/serve.go | 60 |
3 files changed, 147 insertions, 0 deletions
diff --git a/tvix/nar-bridge/cmd/nar_bridge/import.go b/tvix/nar-bridge/cmd/nar_bridge/import.go new file mode 100644 index 000000000000..51b99c93a04b --- /dev/null +++ b/tvix/nar-bridge/cmd/nar_bridge/import.go @@ -0,0 +1,57 @@ +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 new file mode 100644 index 000000000000..78ed3e272d69 --- /dev/null +++ b/tvix/nar-bridge/cmd/nar_bridge/main.go @@ -0,0 +1,30 @@ +package main + +import ( + "os" + + "github.com/alecthomas/kong" +) + +//nolint:gochecknoglobals +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'"` +} + +func main() { + parser, err := kong.New(&cli) + if err != nil { + panic(err) + } + + ctx, err := parser.Parse(os.Args[1:]) + if err != nil { + panic(err) + } + // Call the Run() method of the selected parsed command. + err = ctx.Run() + + ctx.FatalIfErrorf(err) +} diff --git a/tvix/nar-bridge/cmd/nar_bridge/serve.go b/tvix/nar-bridge/cmd/nar_bridge/serve.go new file mode 100644 index 000000000000..6566257176d8 --- /dev/null +++ b/tvix/nar-bridge/cmd/nar_bridge/serve.go @@ -0,0 +1,60 @@ +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 +} |