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

chore(tvix/nar-bridge): update to latest go mod renames

Browse source 
- code.tvl.fyi/tvix/castore/protos -> code.tvl.fyi/tvix/castore-go
 - code.tvl.fyi/tvix/store/protos -> code.tvl.fyi/tvix/store-go

 See cl/9791, cl/9792 for context.

Change-Id: I44614c6ed40b9f52d9dcdea8e61fe2c3c830ce78
Reviewed-on: https://cl.tvl.fyi/c/depot/+/9793
Reviewed-by: Connor Brewster <cbrewster@hey.com>
Tested-by: BuildkiteCI
Autosubmit: flokli <flokli@flokli.de>
This commit is contained in:
Florian Klink 2023-10-17 21:41:33 +01:00 • committed by clbot
parent 2d51da7f40
commit 718af22dbb
18 changed files with 29 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tvix/nar-bridge/cmd/nar-bridge-http/main.go
View file

@ -11,9 +11,9 @@ import (
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/credentials/insecure"
castorev1pb "code.tvl.fyi/tvix/castore/protos" castorev1pb "code.tvl.fyi/tvix/castore-go"
narBridgeHttp "code.tvl.fyi/tvix/nar-bridge/pkg/http" narBridgeHttp "code.tvl.fyi/tvix/nar-bridge/pkg/http"
storev1pb "code.tvl.fyi/tvix/store/protos" storev1pb "code.tvl.fyi/tvix/store-go"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
) )

4
tvix/nar-bridge/cmd/nar-bridge-pathinfo/main.go
View file

@ -17,9 +17,9 @@ import (
"google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/credentials/insecure"
"google.golang.org/grpc/reflection" "google.golang.org/grpc/reflection"
castorev1pb "code.tvl.fyi/tvix/castore/protos" castorev1pb "code.tvl.fyi/tvix/castore-go"
"code.tvl.fyi/tvix/nar-bridge/pkg/pathinfosvc" "code.tvl.fyi/tvix/nar-bridge/pkg/pathinfosvc"
storev1pb "code.tvl.fyi/tvix/store/protos" storev1pb "code.tvl.fyi/tvix/store-go"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
) )

2
tvix/nar-bridge/default.nix
View file

@ -6,5 +6,5 @@ pkgs.buildGoModule {
name = "nar-bridge"; name = "nar-bridge";
src = depot.third_party.gitignoreSource ./.; src = depot.third_party.gitignoreSource ./.;
vendorHash = "sha256-drbjsty1hhVAvn/R/AiVIOPQREzHOB+90VpuM5D5COc="; vendorHash = "sha256-kvovi5HJafg3Um64XJxBYm392tih0P6C/SDyCLhKHIA=";
} }

4
tvix/nar-bridge/go.mod
View file

@ -1,8 +1,8 @@
module code.tvl.fyi/tvix/nar-bridge module code.tvl.fyi/tvix/nar-bridge
require ( require (
code.tvl.fyi/tvix/castore/protos v0.0.0-20231009220507-d6e0c5ab9bb7 code.tvl.fyi/tvix/castore-go v0.0.0-20231017202545-96df348c772c
code.tvl.fyi/tvix/store/protos v0.0.0-20231011152908-87506e287a9e code.tvl.fyi/tvix/store-go v0.0.0-20231017203636-e5c25599293a
github.com/alecthomas/kong v0.7.1 github.com/alecthomas/kong v0.7.1
github.com/go-chi/chi v1.5.4 github.com/go-chi/chi v1.5.4
github.com/go-chi/chi/v5 v5.0.7 github.com/go-chi/chi/v5 v5.0.7

8
tvix/nar-bridge/go.sum
View file

@ -1,7 +1,7 @@
code.tvl.fyi/tvix/castore/protos v0.0.0-20231009220507-d6e0c5ab9bb7 h1:gX2LWo/QHwGZK2QsDap9Lx1GrKLPX6mfgeNbGK3mwrU= code.tvl.fyi/tvix/castore-go v0.0.0-20231017202545-96df348c772c h1:NMxDhSYISwhTt3NoyYUnvDPQZTf5bnR9BoXAc1p2Ugg=
code.tvl.fyi/tvix/castore/protos v0.0.0-20231009220507-d6e0c5ab9bb7/go.mod h1:hj0y8RPthqn1QPj8u2jFe2vzH7NouUoclrwo1/CSbuc= code.tvl.fyi/tvix/castore-go v0.0.0-20231017202545-96df348c772c/go.mod h1:+vKbozsa04yy2TWh3kUVU568jaza3Hf0p1jAEoMoCwA=
code.tvl.fyi/tvix/store/protos v0.0.0-20231011152908-87506e287a9e h1:6ZIrsMGvJFRHxY9DCXYoQQMNLJE1oK8Danm0ZJhZinM= code.tvl.fyi/tvix/store-go v0.0.0-20231017203636-e5c25599293a h1:HyNz9WwYPgOsKcS4eawn7jLz2FM+aBjX+VMxd982A/A=
code.tvl.fyi/tvix/store/protos v0.0.0-20231011152908-87506e287a9e/go.mod h1:RmijF3bfElwtZpNkBtW66QEj/jldGNu+W2HlgZro7lw= code.tvl.fyi/tvix/store-go v0.0.0-20231017203636-e5c25599293a/go.mod h1:tqaK4m6wCj8d6ozy5zBXIQ8+sZtuxAf4GRob2B2cCiI=
github.com/alecthomas/assert/v2 v2.1.0 h1:tbredtNcQnoSd3QBhQWI7QZ3XHOVkw1Moklp2ojoH/0= github.com/alecthomas/assert/v2 v2.1.0 h1:tbredtNcQnoSd3QBhQWI7QZ3XHOVkw1Moklp2ojoH/0=
github.com/alecthomas/kong v0.7.1 h1:azoTh0IOfwlAX3qN9sHWTxACE2oV8Bg2gAwBsMwDQY4= github.com/alecthomas/kong v0.7.1 h1:azoTh0IOfwlAX3qN9sHWTxACE2oV8Bg2gAwBsMwDQY4=
github.com/alecthomas/kong v0.7.1/go.mod h1:n1iCIO2xS46oE8ZfYCNDqdR0b0wZNrXAIAqro/2132U= github.com/alecthomas/kong v0.7.1/go.mod h1:n1iCIO2xS46oE8ZfYCNDqdR0b0wZNrXAIAqro/2132U=

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

@ -12,8 +12,8 @@ import (
"net/http" "net/http"
"sync" "sync"
castorev1pb "code.tvl.fyi/tvix/castore/protos" castorev1pb "code.tvl.fyi/tvix/castore-go"
storev1pb "code.tvl.fyi/tvix/store/protos" storev1pb "code.tvl.fyi/tvix/store-go"
"github.com/go-chi/chi/v5" "github.com/go-chi/chi/v5"
nixhash "github.com/nix-community/go-nix/pkg/hash" nixhash "github.com/nix-community/go-nix/pkg/hash"
"github.com/nix-community/go-nix/pkg/nixbase32" "github.com/nix-community/go-nix/pkg/nixbase32"

2
tvix/nar-bridge/pkg/http/nar_put.go
View file

@ -6,7 +6,7 @@ import (
"fmt" "fmt"
"net/http" "net/http"
castorev1pb "code.tvl.fyi/tvix/castore/protos" castorev1pb "code.tvl.fyi/tvix/castore-go"
"code.tvl.fyi/tvix/nar-bridge/pkg/importer" "code.tvl.fyi/tvix/nar-bridge/pkg/importer"
"github.com/go-chi/chi/v5" "github.com/go-chi/chi/v5"
mh "github.com/multiformats/go-multihash/core" mh "github.com/multiformats/go-multihash/core"

2
tvix/nar-bridge/pkg/http/narinfo.go
View file

@ -3,7 +3,7 @@ package http
import ( import (
"fmt" "fmt"
storev1pb "code.tvl.fyi/tvix/store/protos" storev1pb "code.tvl.fyi/tvix/store-go"
mh "github.com/multiformats/go-multihash/core" mh "github.com/multiformats/go-multihash/core"
nixhash "github.com/nix-community/go-nix/pkg/hash" nixhash "github.com/nix-community/go-nix/pkg/hash"

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

@ -11,7 +11,7 @@ import (
"strings" "strings"
"sync" "sync"
storev1pb "code.tvl.fyi/tvix/store/protos" storev1pb "code.tvl.fyi/tvix/store-go"
"github.com/go-chi/chi/v5" "github.com/go-chi/chi/v5"
nixhash "github.com/nix-community/go-nix/pkg/hash" nixhash "github.com/nix-community/go-nix/pkg/hash"
"github.com/nix-community/go-nix/pkg/nixbase32" "github.com/nix-community/go-nix/pkg/nixbase32"

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

@ -7,8 +7,8 @@ import (
"sync" "sync"
"time" "time"
castorev1pb "code.tvl.fyi/tvix/castore/protos" castorev1pb "code.tvl.fyi/tvix/castore-go"
storev1pb "code.tvl.fyi/tvix/store/protos" storev1pb "code.tvl.fyi/tvix/store-go"
"github.com/go-chi/chi/middleware" "github.com/go-chi/chi/middleware"
"github.com/go-chi/chi/v5" "github.com/go-chi/chi/v5"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"

2
tvix/nar-bridge/pkg/importer/blob_upload.go
View file

@ -8,7 +8,7 @@ import (
"fmt" "fmt"
"io" "io"
castorev1pb "code.tvl.fyi/tvix/castore/protos" castorev1pb "code.tvl.fyi/tvix/castore-go"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
) )

2
tvix/nar-bridge/pkg/importer/directory_upload.go
View file

@ -6,7 +6,7 @@ import (
"encoding/base64" "encoding/base64"
"fmt" "fmt"
castorev1pb "code.tvl.fyi/tvix/castore/protos" castorev1pb "code.tvl.fyi/tvix/castore-go"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
) )

4
tvix/nar-bridge/pkg/importer/gen_pathinfo.go
View file

@ -1,8 +1,8 @@
package importer package importer
import ( import (
castorev1pb "code.tvl.fyi/tvix/castore/protos" castorev1pb "code.tvl.fyi/tvix/castore-go"
storev1pb "code.tvl.fyi/tvix/store/protos" storev1pb "code.tvl.fyi/tvix/store-go"
"fmt" "fmt"
"github.com/nix-community/go-nix/pkg/narinfo" "github.com/nix-community/go-nix/pkg/narinfo"
"github.com/nix-community/go-nix/pkg/storepath" "github.com/nix-community/go-nix/pkg/storepath"

2
tvix/nar-bridge/pkg/importer/importer.go
View file

@ -9,7 +9,7 @@ import (
"path" "path"
"strings" "strings"
castorev1pb "code.tvl.fyi/tvix/castore/protos" castorev1pb "code.tvl.fyi/tvix/castore-go"
"github.com/nix-community/go-nix/pkg/nar" "github.com/nix-community/go-nix/pkg/nar"
) )

2
tvix/nar-bridge/pkg/importer/importer_test.go
View file

@ -8,7 +8,7 @@ import (
"os" "os"
"testing" "testing"
castorev1pb "code.tvl.fyi/tvix/castore/protos" castorev1pb "code.tvl.fyi/tvix/castore-go"
"code.tvl.fyi/tvix/nar-bridge/pkg/importer" "code.tvl.fyi/tvix/nar-bridge/pkg/importer"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )

4
tvix/nar-bridge/pkg/importer/roundtrip_test.go
View file

@ -9,9 +9,9 @@ import (
"os" "os"
"testing" "testing"
castorev1pb "code.tvl.fyi/tvix/castore/protos" castorev1pb "code.tvl.fyi/tvix/castore-go"
"code.tvl.fyi/tvix/nar-bridge/pkg/importer" "code.tvl.fyi/tvix/nar-bridge/pkg/importer"
storev1pb "code.tvl.fyi/tvix/store/protos" storev1pb "code.tvl.fyi/tvix/store-go"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )

2
tvix/nar-bridge/pkg/importer/util_test.go
View file

@ -4,7 +4,7 @@ import (
"io" "io"
"testing" "testing"
castorev1pb "code.tvl.fyi/tvix/castore/protos" castorev1pb "code.tvl.fyi/tvix/castore-go"
"github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp"
"google.golang.org/protobuf/testing/protocmp" "google.golang.org/protobuf/testing/protocmp"
"lukechampine.com/blake3" "lukechampine.com/blake3"

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

@ -10,9 +10,9 @@ import (
"net/http" "net/http"
"net/url" "net/url"
castorev1pb "code.tvl.fyi/tvix/castore/protos" castorev1pb "code.tvl.fyi/tvix/castore-go"
"code.tvl.fyi/tvix/nar-bridge/pkg/importer" "code.tvl.fyi/tvix/nar-bridge/pkg/importer"
storev1pb "code.tvl.fyi/tvix/store/protos" storev1pb "code.tvl.fyi/tvix/store-go"
mh "github.com/multiformats/go-multihash/core" mh "github.com/multiformats/go-multihash/core"
"github.com/nix-community/go-nix/pkg/narinfo" "github.com/nix-community/go-nix/pkg/narinfo"
"github.com/nix-community/go-nix/pkg/nixbase32" "github.com/nix-community/go-nix/pkg/nixbase32"