From dfb48dcadebf027fd86e854f15630f14b87136c0 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 27 Nov 2023 20:56:47 +0200
Subject: fix(tvix/nar-bridge): drop pathinfoservice

This now exists in tvix-store directly, as NixHTTPPathInfoService, and
contrary to this version, also validates signatures.

Change-Id: Ib6ca161e40d627b7d9741839fc849f2392f422da
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10155
Tested-by: BuildkiteCI
Autosubmit: flokli <flokli@flokli.de>
Reviewed-by: Connor Brewster <cbrewster@hey.com>
---
 tvix/nar-bridge/cmd/nar-bridge-pathinfo/main.go | 117 ------------------------
 1 file changed, 117 deletions(-)
 delete mode 100644 tvix/nar-bridge/cmd/nar-bridge-pathinfo/main.go

(limited to 'tvix/nar-bridge/cmd')

diff --git a/tvix/nar-bridge/cmd/nar-bridge-pathinfo/main.go b/tvix/nar-bridge/cmd/nar-bridge-pathinfo/main.go
deleted file mode 100644
index e8f43d14ec8b..000000000000
--- a/tvix/nar-bridge/cmd/nar-bridge-pathinfo/main.go
+++ /dev/null
@@ -1,117 +0,0 @@
-package main
-
-import (
-	"context"
-	"fmt"
-	"net"
-	"net/http"
-	"net/url"
-	"os"
-	"os/signal"
-	"strings"
-	"time"
-
-	"github.com/alecthomas/kong"
-
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials/insecure"
-	"google.golang.org/grpc/reflection"
-
-	castorev1pb "code.tvl.fyi/tvix/castore-go"
-	"code.tvl.fyi/tvix/nar-bridge/pkg/pathinfosvc"
-	storev1pb "code.tvl.fyi/tvix/store-go"
-	"github.com/sirupsen/logrus"
-	log "github.com/sirupsen/logrus"
-)
-
-// `help:"Provide a tvix-store gRPC PathInfoService for a HTTP Nix Binary Cache"`
-var cli struct {
-	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:"[::]:8001"` //nolint:lll
-	BlobServiceAddr      string   `name:"blob-service-addr" env:"BLOB_SERVICE_ADDR" default:"grpc+http://[::1]:8000"`
-	DirectoryServiceAddr string   `name:"directory-service-addr" env:"DIRECTORY_SERVICE_ADDR" default:"grpc+http://[::1]:8000"`
-	HTTPBinaryCacheURL   *url.URL `name:"http-binary-cache-url" env:"HTTP_BINARY_CACHE_URL" help:"The URL containing the Nix HTTP Binary cache" default:"https://cache.nixos.org"`
-}
-
-func connectService(ctx context.Context, serviceAddr string) (*grpc.ClientConn, error) {
-	if !strings.HasPrefix(serviceAddr, "grpc+http://") {
-		return nil, fmt.Errorf("invalid serviceAddr: %s", serviceAddr)
-	}
-	addr := strings.TrimPrefix(serviceAddr, "grpc+http://")
-
-	conn, err := grpc.DialContext(ctx, addr, grpc.WithTransportCredentials(insecure.NewCredentials()))
-	if err != nil {
-		log.Fatalf("did not connect: %v", err)
-	}
-	return conn, nil
-}
-
-func main() {
-	_ = kong.Parse(&cli)
-
-	logLevel, err := logrus.ParseLevel(cli.LogLevel)
-	if err != nil {
-		log.Fatal("invalid log level")
-	}
-	logrus.SetLevel(logLevel)
-
-	ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt)
-	defer stop()
-
-	// connect to the two stores
-	connBlobSvc, err := connectService(ctx, cli.BlobServiceAddr)
-	if err != nil {
-		log.Fatalf("unable to connect to blob service: %v", err)
-	}
-	defer connBlobSvc.Close()
-
-	connDirectorySvc, err := connectService(ctx, cli.DirectoryServiceAddr)
-	if err != nil {
-		log.Fatalf("unable to connect to directory service: %v", err)
-	}
-	defer connDirectorySvc.Close()
-
-	// set up pathinfoservice
-	var opts []grpc.ServerOption
-	s := grpc.NewServer(opts...)
-	reflection.Register(s)
-
-	storev1pb.RegisterPathInfoServiceServer(s,
-		pathinfosvc.New(
-			cli.HTTPBinaryCacheURL,
-			&http.Client{},
-			castorev1pb.NewDirectoryServiceClient(connDirectorySvc),
-			castorev1pb.NewBlobServiceClient(connBlobSvc),
-		),
-	)
-
-	log.Printf("Starting nar-bridge-pathinfosvc at %v", cli.ListenAddr)
-	lis, err := net.Listen("tcp", cli.ListenAddr)
-	if err != nil {
-		log.Fatalf("failed to listen: %v", err)
-	}
-	go s.Serve(lis)
-
-	// listen for the interrupt signal.
-	<-ctx.Done()
-
-	// Restore default behaviour on the interrupt signal
-	stop()
-	log.Info("Received Signal, shutting down, press Ctl+C again to force.")
-
-	stopped := make(chan interface{})
-	go func() {
-		s.GracefulStop()
-		close(stopped)
-	}()
-
-	t := time.NewTimer(30 * time.Second)
-	select {
-	case <-t.C:
-		log.Info("timeout, kicking remaining clients")
-		s.Stop()
-	case <-stopped:
-		log.Info("all clients left during grace period")
-		t.Stop()
-	}
-}
-- 
cgit 1.4.1