From 718af22dbba83ddebafdc849eb8645d646a0e163 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 17 Oct 2023 21:41:33 +0100 Subject: chore(tvix/nar-bridge): update to latest go mod renames - 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 Tested-by: BuildkiteCI Autosubmit: flokli --- tvix/nar-bridge/cmd/nar-bridge-http/main.go | 4 ++-- tvix/nar-bridge/cmd/nar-bridge-pathinfo/main.go | 4 ++-- tvix/nar-bridge/default.nix | 2 +- tvix/nar-bridge/go.mod | 4 ++-- tvix/nar-bridge/go.sum | 8 ++++---- tvix/nar-bridge/pkg/http/nar_get.go | 4 ++-- tvix/nar-bridge/pkg/http/nar_put.go | 2 +- tvix/nar-bridge/pkg/http/narinfo.go | 2 +- tvix/nar-bridge/pkg/http/narinfo_get.go | 2 +- tvix/nar-bridge/pkg/http/server.go | 4 ++-- tvix/nar-bridge/pkg/importer/blob_upload.go | 2 +- tvix/nar-bridge/pkg/importer/directory_upload.go | 2 +- tvix/nar-bridge/pkg/importer/gen_pathinfo.go | 4 ++-- tvix/nar-bridge/pkg/importer/importer.go | 2 +- tvix/nar-bridge/pkg/importer/importer_test.go | 2 +- tvix/nar-bridge/pkg/importer/roundtrip_test.go | 4 ++-- tvix/nar-bridge/pkg/importer/util_test.go | 2 +- tvix/nar-bridge/pkg/pathinfosvc/server.go | 4 ++-- 18 files changed, 29 insertions(+), 29 deletions(-) (limited to 'tvix') diff --git a/tvix/nar-bridge/cmd/nar-bridge-http/main.go b/tvix/nar-bridge/cmd/nar-bridge-http/main.go index 40357e68e864..2eed4f4f4c4b 100644 --- a/tvix/nar-bridge/cmd/nar-bridge-http/main.go +++ b/tvix/nar-bridge/cmd/nar-bridge-http/main.go @@ -11,9 +11,9 @@ import ( "google.golang.org/grpc" "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" - storev1pb "code.tvl.fyi/tvix/store/protos" + storev1pb "code.tvl.fyi/tvix/store-go" "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus" ) diff --git a/tvix/nar-bridge/cmd/nar-bridge-pathinfo/main.go b/tvix/nar-bridge/cmd/nar-bridge-pathinfo/main.go index 76d0fafa4cd6..e8f43d14ec8b 100644 --- a/tvix/nar-bridge/cmd/nar-bridge-pathinfo/main.go +++ b/tvix/nar-bridge/cmd/nar-bridge-pathinfo/main.go @@ -17,9 +17,9 @@ import ( "google.golang.org/grpc/credentials/insecure" "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" - storev1pb "code.tvl.fyi/tvix/store/protos" + storev1pb "code.tvl.fyi/tvix/store-go" "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus" ) diff --git a/tvix/nar-bridge/default.nix b/tvix/nar-bridge/default.nix index 0c7d1c608944..9a08c9e729f0 100644 --- a/tvix/nar-bridge/default.nix +++ b/tvix/nar-bridge/default.nix @@ -6,5 +6,5 @@ pkgs.buildGoModule { name = "nar-bridge"; src = depot.third_party.gitignoreSource ./.; - vendorHash = "sha256-drbjsty1hhVAvn/R/AiVIOPQREzHOB+90VpuM5D5COc="; + vendorHash = "sha256-kvovi5HJafg3Um64XJxBYm392tih0P6C/SDyCLhKHIA="; } diff --git a/tvix/nar-bridge/go.mod b/tvix/nar-bridge/go.mod index 8a845c909dd5..846c7699f75a 100644 --- a/tvix/nar-bridge/go.mod +++ b/tvix/nar-bridge/go.mod @@ -1,8 +1,8 @@ module code.tvl.fyi/tvix/nar-bridge require ( - code.tvl.fyi/tvix/castore/protos v0.0.0-20231009220507-d6e0c5ab9bb7 - code.tvl.fyi/tvix/store/protos v0.0.0-20231011152908-87506e287a9e + code.tvl.fyi/tvix/castore-go v0.0.0-20231017202545-96df348c772c + code.tvl.fyi/tvix/store-go v0.0.0-20231017203636-e5c25599293a github.com/alecthomas/kong v0.7.1 github.com/go-chi/chi v1.5.4 github.com/go-chi/chi/v5 v5.0.7 diff --git a/tvix/nar-bridge/go.sum b/tvix/nar-bridge/go.sum index 091a328f9251..4263851e5b82 100644 --- a/tvix/nar-bridge/go.sum +++ b/tvix/nar-bridge/go.sum @@ -1,7 +1,7 @@ -code.tvl.fyi/tvix/castore/protos v0.0.0-20231009220507-d6e0c5ab9bb7 h1:gX2LWo/QHwGZK2QsDap9Lx1GrKLPX6mfgeNbGK3mwrU= -code.tvl.fyi/tvix/castore/protos v0.0.0-20231009220507-d6e0c5ab9bb7/go.mod h1:hj0y8RPthqn1QPj8u2jFe2vzH7NouUoclrwo1/CSbuc= -code.tvl.fyi/tvix/store/protos v0.0.0-20231011152908-87506e287a9e h1:6ZIrsMGvJFRHxY9DCXYoQQMNLJE1oK8Danm0ZJhZinM= -code.tvl.fyi/tvix/store/protos v0.0.0-20231011152908-87506e287a9e/go.mod h1:RmijF3bfElwtZpNkBtW66QEj/jldGNu+W2HlgZro7lw= +code.tvl.fyi/tvix/castore-go v0.0.0-20231017202545-96df348c772c h1:NMxDhSYISwhTt3NoyYUnvDPQZTf5bnR9BoXAc1p2Ugg= +code.tvl.fyi/tvix/castore-go v0.0.0-20231017202545-96df348c772c/go.mod h1:+vKbozsa04yy2TWh3kUVU568jaza3Hf0p1jAEoMoCwA= +code.tvl.fyi/tvix/store-go v0.0.0-20231017203636-e5c25599293a h1:HyNz9WwYPgOsKcS4eawn7jLz2FM+aBjX+VMxd982A/A= +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/kong v0.7.1 h1:azoTh0IOfwlAX3qN9sHWTxACE2oV8Bg2gAwBsMwDQY4= github.com/alecthomas/kong v0.7.1/go.mod h1:n1iCIO2xS46oE8ZfYCNDqdR0b0wZNrXAIAqro/2132U= diff --git a/tvix/nar-bridge/pkg/http/nar_get.go b/tvix/nar-bridge/pkg/http/nar_get.go index a226c9da01eb..75797f8da90e 100644 --- a/tvix/nar-bridge/pkg/http/nar_get.go +++ b/tvix/nar-bridge/pkg/http/nar_get.go @@ -12,8 +12,8 @@ import ( "net/http" "sync" - castorev1pb "code.tvl.fyi/tvix/castore/protos" - storev1pb "code.tvl.fyi/tvix/store/protos" + castorev1pb "code.tvl.fyi/tvix/castore-go" + storev1pb "code.tvl.fyi/tvix/store-go" "github.com/go-chi/chi/v5" nixhash "github.com/nix-community/go-nix/pkg/hash" "github.com/nix-community/go-nix/pkg/nixbase32" diff --git a/tvix/nar-bridge/pkg/http/nar_put.go b/tvix/nar-bridge/pkg/http/nar_put.go index 9a4238e61395..fdfa20f9c396 100644 --- a/tvix/nar-bridge/pkg/http/nar_put.go +++ b/tvix/nar-bridge/pkg/http/nar_put.go @@ -6,7 +6,7 @@ import ( "fmt" "net/http" - castorev1pb "code.tvl.fyi/tvix/castore/protos" + castorev1pb "code.tvl.fyi/tvix/castore-go" "code.tvl.fyi/tvix/nar-bridge/pkg/importer" "github.com/go-chi/chi/v5" mh "github.com/multiformats/go-multihash/core" diff --git a/tvix/nar-bridge/pkg/http/narinfo.go b/tvix/nar-bridge/pkg/http/narinfo.go index c938baba6590..e5b99a9505f1 100644 --- a/tvix/nar-bridge/pkg/http/narinfo.go +++ b/tvix/nar-bridge/pkg/http/narinfo.go @@ -3,7 +3,7 @@ package http import ( "fmt" - storev1pb "code.tvl.fyi/tvix/store/protos" + storev1pb "code.tvl.fyi/tvix/store-go" mh "github.com/multiformats/go-multihash/core" nixhash "github.com/nix-community/go-nix/pkg/hash" diff --git a/tvix/nar-bridge/pkg/http/narinfo_get.go b/tvix/nar-bridge/pkg/http/narinfo_get.go index b3ee01fab531..98d85744d895 100644 --- a/tvix/nar-bridge/pkg/http/narinfo_get.go +++ b/tvix/nar-bridge/pkg/http/narinfo_get.go @@ -11,7 +11,7 @@ import ( "strings" "sync" - storev1pb "code.tvl.fyi/tvix/store/protos" + storev1pb "code.tvl.fyi/tvix/store-go" "github.com/go-chi/chi/v5" nixhash "github.com/nix-community/go-nix/pkg/hash" "github.com/nix-community/go-nix/pkg/nixbase32" diff --git a/tvix/nar-bridge/pkg/http/server.go b/tvix/nar-bridge/pkg/http/server.go index aa8037e2ba38..500902f262f0 100644 --- a/tvix/nar-bridge/pkg/http/server.go +++ b/tvix/nar-bridge/pkg/http/server.go @@ -7,8 +7,8 @@ import ( "sync" "time" - castorev1pb "code.tvl.fyi/tvix/castore/protos" - storev1pb "code.tvl.fyi/tvix/store/protos" + castorev1pb "code.tvl.fyi/tvix/castore-go" + storev1pb "code.tvl.fyi/tvix/store-go" "github.com/go-chi/chi/middleware" "github.com/go-chi/chi/v5" log "github.com/sirupsen/logrus" diff --git a/tvix/nar-bridge/pkg/importer/blob_upload.go b/tvix/nar-bridge/pkg/importer/blob_upload.go index 24aa1cad1df7..c1255dd3ad5d 100644 --- a/tvix/nar-bridge/pkg/importer/blob_upload.go +++ b/tvix/nar-bridge/pkg/importer/blob_upload.go @@ -8,7 +8,7 @@ import ( "fmt" "io" - castorev1pb "code.tvl.fyi/tvix/castore/protos" + castorev1pb "code.tvl.fyi/tvix/castore-go" log "github.com/sirupsen/logrus" ) diff --git a/tvix/nar-bridge/pkg/importer/directory_upload.go b/tvix/nar-bridge/pkg/importer/directory_upload.go index c531b7491bdd..117f442fa54f 100644 --- a/tvix/nar-bridge/pkg/importer/directory_upload.go +++ b/tvix/nar-bridge/pkg/importer/directory_upload.go @@ -6,7 +6,7 @@ import ( "encoding/base64" "fmt" - castorev1pb "code.tvl.fyi/tvix/castore/protos" + castorev1pb "code.tvl.fyi/tvix/castore-go" log "github.com/sirupsen/logrus" ) diff --git a/tvix/nar-bridge/pkg/importer/gen_pathinfo.go b/tvix/nar-bridge/pkg/importer/gen_pathinfo.go index bf8d08615e42..bdc298a9a399 100644 --- a/tvix/nar-bridge/pkg/importer/gen_pathinfo.go +++ b/tvix/nar-bridge/pkg/importer/gen_pathinfo.go @@ -1,8 +1,8 @@ package importer import ( - castorev1pb "code.tvl.fyi/tvix/castore/protos" - storev1pb "code.tvl.fyi/tvix/store/protos" + castorev1pb "code.tvl.fyi/tvix/castore-go" + storev1pb "code.tvl.fyi/tvix/store-go" "fmt" "github.com/nix-community/go-nix/pkg/narinfo" "github.com/nix-community/go-nix/pkg/storepath" diff --git a/tvix/nar-bridge/pkg/importer/importer.go b/tvix/nar-bridge/pkg/importer/importer.go index ce2798215a67..a5c6bbaae901 100644 --- a/tvix/nar-bridge/pkg/importer/importer.go +++ b/tvix/nar-bridge/pkg/importer/importer.go @@ -9,7 +9,7 @@ import ( "path" "strings" - castorev1pb "code.tvl.fyi/tvix/castore/protos" + castorev1pb "code.tvl.fyi/tvix/castore-go" "github.com/nix-community/go-nix/pkg/nar" ) diff --git a/tvix/nar-bridge/pkg/importer/importer_test.go b/tvix/nar-bridge/pkg/importer/importer_test.go index bf16c9926e3e..8ff63b92576d 100644 --- a/tvix/nar-bridge/pkg/importer/importer_test.go +++ b/tvix/nar-bridge/pkg/importer/importer_test.go @@ -8,7 +8,7 @@ import ( "os" "testing" - castorev1pb "code.tvl.fyi/tvix/castore/protos" + castorev1pb "code.tvl.fyi/tvix/castore-go" "code.tvl.fyi/tvix/nar-bridge/pkg/importer" "github.com/stretchr/testify/require" ) diff --git a/tvix/nar-bridge/pkg/importer/roundtrip_test.go b/tvix/nar-bridge/pkg/importer/roundtrip_test.go index 3f297d32dd1b..b16c310522f5 100644 --- a/tvix/nar-bridge/pkg/importer/roundtrip_test.go +++ b/tvix/nar-bridge/pkg/importer/roundtrip_test.go @@ -9,9 +9,9 @@ import ( "os" "testing" - castorev1pb "code.tvl.fyi/tvix/castore/protos" + castorev1pb "code.tvl.fyi/tvix/castore-go" "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" ) diff --git a/tvix/nar-bridge/pkg/importer/util_test.go b/tvix/nar-bridge/pkg/importer/util_test.go index 623253ed1a35..06353cf582e5 100644 --- a/tvix/nar-bridge/pkg/importer/util_test.go +++ b/tvix/nar-bridge/pkg/importer/util_test.go @@ -4,7 +4,7 @@ import ( "io" "testing" - castorev1pb "code.tvl.fyi/tvix/castore/protos" + castorev1pb "code.tvl.fyi/tvix/castore-go" "github.com/google/go-cmp/cmp" "google.golang.org/protobuf/testing/protocmp" "lukechampine.com/blake3" diff --git a/tvix/nar-bridge/pkg/pathinfosvc/server.go b/tvix/nar-bridge/pkg/pathinfosvc/server.go index 1601930049e6..b02f4a1addb2 100644 --- a/tvix/nar-bridge/pkg/pathinfosvc/server.go +++ b/tvix/nar-bridge/pkg/pathinfosvc/server.go @@ -10,9 +10,9 @@ import ( "net/http" "net/url" - castorev1pb "code.tvl.fyi/tvix/castore/protos" + castorev1pb "code.tvl.fyi/tvix/castore-go" "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" "github.com/nix-community/go-nix/pkg/narinfo" "github.com/nix-community/go-nix/pkg/nixbase32" -- cgit 1.4.1