maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(tvix/nar-bridge): bump go-nix dependency

Browse source 
nixpath.FromString -> storepath.FromAbsolutePath.

See https://github.com/nix-community/go-nix/pull/113 for details.

Closes: https://b.tvl.fyi/issues/314
Change-Id: I25277fb6006cbbb2a323ffb5809a1be500822a97
Reviewed-on: https://cl.tvl.fyi/c/depot/+/9551
Autosubmit: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
Reviewed-by: Connor Brewster <cbrewster@hey.com>
This commit is contained in:
Florian Klink 2023-10-05 18:26:30 +03:00 • committed by clbot
parent 600815c168
commit 61e5a63fe1
6 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tvix/nar-bridge/pkg/http/narinfo_get.go
View file

@ -19,7 +19,7 @@ import (
"github.com/nix-community/go-nix/pkg/narinfo"
"github.com/nix-community/go-nix/pkg/narinfo/signature"
"github.com/nix-community/go-nix/pkg/nixbase32"
"github.com/nix-community/go-nix/pkg/nixpath"
"github.com/nix-community/go-nix/pkg/storepath"
log "github.com/sirupsen/logrus"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
@ -92,7 +92,7 @@ func renderNarinfo(
}
narInfo := narinfo.NarInfo{
StorePath: path.Join(nixpath.StoreDir, string(nodeName)),
StorePath: path.Join(storepath.StoreDir, string(nodeName)),
URL: "nar/" + nixbase32.EncodeToString(narHash.Digest()) + ".nar",
Compression: "none", // TODO: implement zstd compression
NarHash: narHash,

6
tvix/nar-bridge/pkg/http/narinfo_put.go
View file

@ -9,7 +9,7 @@ import (
"github.com/go-chi/chi/v5"
"github.com/nix-community/go-nix/pkg/narinfo"
"github.com/nix-community/go-nix/pkg/nixbase32"
"github.com/nix-community/go-nix/pkg/nixpath"
"github.com/nix-community/go-nix/pkg/storepath"
"github.com/sirupsen/logrus"
log "github.com/sirupsen/logrus"
)
@ -82,7 +82,7 @@ func registerNarinfoPut(s *Server) {
// the bytes in pathInfo.References, and the full strings in pathInfo.Narinfo.ReferenceNames.
referencesBytes := make([][]byte, 0)
for _, reference := range narInfo.References {
np, err := nixpath.FromString(path.Join(nixpath.StoreDir, reference))
storePath, err := storepath.FromString(reference)
if err != nil {
log.WithField("reference", reference).WithError(err).Error("unable to parse reference")
w.WriteHeader(http.StatusBadRequest)
@ -93,7 +93,7 @@ func registerNarinfoPut(s *Server) {
return
}
referencesBytes = append(referencesBytes, np.Digest)
referencesBytes = append(referencesBytes, storePath.Digest)
}
// assemble the []*storev1pb.NARInfo_Signature{} from narinfo.Signatures.

4
tvix/nar-bridge/pkg/pathinfosvc/server.go
View file

@ -16,7 +16,7 @@ import (
mh "github.com/multiformats/go-multihash/core"
"github.com/nix-community/go-nix/pkg/narinfo"
"github.com/nix-community/go-nix/pkg/nixbase32"
"github.com/nix-community/go-nix/pkg/nixpath"
"github.com/nix-community/go-nix/pkg/storepath"
"github.com/sirupsen/logrus"
"github.com/ulikunitz/xz"
"google.golang.org/grpc/codes"
@ -246,7 +246,7 @@ func (p *PathInfoServiceServer) Get(ctx context.Context, getPathInfoRequest *sto
// set the root node name to the basename of the output path in the narInfo.
// currently the root node has no name yet.
outPath, err := nixpath.FromString(narInfo.StorePath)
outPath, err := storepath.FromAbsolutePath(narInfo.StorePath)
if err != nil {
// unreachable due to nixpath.Check()
panic(err)