From 2d51da7f40e85b9411642e4c65efb23a9a0c4255 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 17 Oct 2023 21:30:29 +0100 Subject: chore(tvix/store-go): rename go module `code.tvl.fyi/tvix/store/protos` now points to a directory that only contains the `.proto` files, while all golang tooling and .pb.go files live in tvix/store-go. As discussed in https://cl.tvl.fyi/c/depot/+/9787/comment/fc5d155c_1bd38e3a/, the amount of people currently using this is still small, so rename the go.mod now, while it doesn't yet hurt. Also, use code.tvl.fyi/tvix/castore-go instead of code.tvl.fyi/tvix/ castore/protos, to make use of cl/9791. Change-Id: I9ea89957d7c29dfae4c893b9aae8ac8a0bad2d8e Reviewed-on: https://cl.tvl.fyi/c/depot/+/9792 Autosubmit: flokli Tested-by: BuildkiteCI Reviewed-by: Connor Brewster --- ops/modules/www/code.tvl.fyi.nix | 8 ++++---- tvix/store-go/default.nix | 2 +- tvix/store-go/export.go | 2 +- tvix/store-go/export_test.go | 4 ++-- tvix/store-go/go.mod | 4 ++-- tvix/store-go/go.sum | 4 ++-- tvix/store-go/pathinfo.pb.go | 2 +- tvix/store-go/pathinfo_test.go | 4 ++-- tvix/store-go/pick_next_node_test.go | 2 +- tvix/store-go/rpc_pathinfo.pb.go | 2 +- tvix/store-go/rpc_pathinfo_grpc.pb.go | 2 +- tvix/store/protos/pathinfo.proto | 2 +- tvix/store/protos/rpc_pathinfo.proto | 2 +- 13 files changed, 20 insertions(+), 20 deletions(-) diff --git a/ops/modules/www/code.tvl.fyi.nix b/ops/modules/www/code.tvl.fyi.nix index bf0e574f2656..efb4b6a8f5a2 100644 --- a/ops/modules/www/code.tvl.fyi.nix +++ b/ops/modules/www/code.tvl.fyi.nix @@ -24,8 +24,8 @@ alias ${pkgs.writeText "go-import-metadata.html" ''''}; } - location = /go-get/tvix/store/protos { - alias ${pkgs.writeText "go-import-metadata.html" ''''}; + location = /go-get/tvix/store-go { + alias ${pkgs.writeText "go-import-metadata.html" ''''}; } location = /go-get/tvix/nar-bridge { @@ -44,9 +44,9 @@ } } - location = /tvix/store/protos { + location = /tvix/store-go { if ($args ~* "/?go-get=1") { - return 302 /go-get/tvix/store/protos; + return 302 /go-get/tvix/store-go; } } diff --git a/tvix/store-go/default.nix b/tvix/store-go/default.nix index eb814d1e3ae9..914028eccd3f 100644 --- a/tvix/store-go/default.nix +++ b/tvix/store-go/default.nix @@ -8,7 +8,7 @@ in (pkgs.buildGoModule { name = "store-go"; src = depot.third_party.gitignoreSource ./.; - vendorHash = "sha256-WAYaIT3h3Cdvo1RB8T7DuoxeKvXfkq8vo/vdkhJQDs0="; + vendorHash = "sha256-EoxvI1J+w0R+oACAVx9FhUG5VhDyzXuN2Vu2iEhgh94="; }).overrideAttrs (_: { meta.ci.extraSteps = { check = { diff --git a/tvix/store-go/export.go b/tvix/store-go/export.go index 889311efe70b..c68e015cdbc8 100644 --- a/tvix/store-go/export.go +++ b/tvix/store-go/export.go @@ -5,7 +5,7 @@ import ( "io" "path" - 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/store-go/export_test.go b/tvix/store-go/export_test.go index 6c33bdc90117..6814df641429 100644 --- a/tvix/store-go/export_test.go +++ b/tvix/store-go/export_test.go @@ -6,8 +6,8 @@ import ( "os" "testing" - 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/stretchr/testify/require" ) diff --git a/tvix/store-go/go.mod b/tvix/store-go/go.mod index d56e2d9bc1b4..31f9fdd91232 100644 --- a/tvix/store-go/go.mod +++ b/tvix/store-go/go.mod @@ -1,9 +1,9 @@ -module code.tvl.fyi/tvix/store/protos +module code.tvl.fyi/tvix/store-go go 1.19 require ( - code.tvl.fyi/tvix/castore/protos v0.0.0-20231014122118-3fc2ade7dfb2 + code.tvl.fyi/tvix/castore-go v0.0.0-20231017202545-96df348c772c github.com/google/go-cmp v0.5.6 github.com/nix-community/go-nix v0.0.0-20231009143713-ebca3299475b github.com/stretchr/testify v1.8.1 diff --git a/tvix/store-go/go.sum b/tvix/store-go/go.sum index c412d838e289..e06075695ca0 100644 --- a/tvix/store-go/go.sum +++ b/tvix/store-go/go.sum @@ -1,6 +1,6 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -code.tvl.fyi/tvix/castore/protos v0.0.0-20231014122118-3fc2ade7dfb2 h1:Z5GS8OUe7L/hKDbb1amArY7QgX0DSD5xaBwWxmh4H3Y= -code.tvl.fyi/tvix/castore/protos v0.0.0-20231014122118-3fc2ade7dfb2/go.mod h1:hj0y8RPthqn1QPj8u2jFe2vzH7NouUoclrwo1/CSbuc= +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= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= diff --git a/tvix/store-go/pathinfo.pb.go b/tvix/store-go/pathinfo.pb.go index b8296114f602..cdd6129f7d56 100644 --- a/tvix/store-go/pathinfo.pb.go +++ b/tvix/store-go/pathinfo.pb.go @@ -10,7 +10,7 @@ package storev1 import ( - protos "code.tvl.fyi/tvix/castore/protos" + protos "code.tvl.fyi/tvix/castore-go" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" diff --git a/tvix/store-go/pathinfo_test.go b/tvix/store-go/pathinfo_test.go index 9a329f0010fc..ff68171a251e 100644 --- a/tvix/store-go/pathinfo_test.go +++ b/tvix/store-go/pathinfo_test.go @@ -7,8 +7,8 @@ import ( "github.com/nix-community/go-nix/pkg/storepath" "github.com/stretchr/testify/assert" - 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" ) const ( diff --git a/tvix/store-go/pick_next_node_test.go b/tvix/store-go/pick_next_node_test.go index 830c6cacc136..55a6b034f1a4 100644 --- a/tvix/store-go/pick_next_node_test.go +++ b/tvix/store-go/pick_next_node_test.go @@ -3,7 +3,7 @@ package storev1 import ( "testing" - castorev1pb "code.tvl.fyi/tvix/castore/protos" + castorev1pb "code.tvl.fyi/tvix/castore-go" "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/require" "google.golang.org/protobuf/testing/protocmp" diff --git a/tvix/store-go/rpc_pathinfo.pb.go b/tvix/store-go/rpc_pathinfo.pb.go index 8a3c10a82101..8698c79215c3 100644 --- a/tvix/store-go/rpc_pathinfo.pb.go +++ b/tvix/store-go/rpc_pathinfo.pb.go @@ -10,7 +10,7 @@ package storev1 import ( - protos "code.tvl.fyi/tvix/castore/protos" + protos "code.tvl.fyi/tvix/castore-go" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" diff --git a/tvix/store-go/rpc_pathinfo_grpc.pb.go b/tvix/store-go/rpc_pathinfo_grpc.pb.go index 10d8a7ffa49c..8f026f36bab5 100644 --- a/tvix/store-go/rpc_pathinfo_grpc.pb.go +++ b/tvix/store-go/rpc_pathinfo_grpc.pb.go @@ -10,7 +10,7 @@ package storev1 import ( - protos "code.tvl.fyi/tvix/castore/protos" + protos "code.tvl.fyi/tvix/castore-go" context "context" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" diff --git a/tvix/store/protos/pathinfo.proto b/tvix/store/protos/pathinfo.proto index ac528628ec88..316201226884 100644 --- a/tvix/store/protos/pathinfo.proto +++ b/tvix/store/protos/pathinfo.proto @@ -6,7 +6,7 @@ package tvix.store.v1; import "tvix/castore/protos/castore.proto"; -option go_package = "code.tvl.fyi/tvix/store/protos;storev1"; +option go_package = "code.tvl.fyi/tvix/store-go;storev1"; // PathInfo shows information about a Nix Store Path. // That's a single element inside /nix/store. diff --git a/tvix/store/protos/rpc_pathinfo.proto b/tvix/store/protos/rpc_pathinfo.proto index 1930e87de004..6802d7034fe1 100644 --- a/tvix/store/protos/rpc_pathinfo.proto +++ b/tvix/store/protos/rpc_pathinfo.proto @@ -7,7 +7,7 @@ package tvix.store.v1; import "tvix/store/protos/pathinfo.proto"; import "tvix/castore/protos/castore.proto"; -option go_package = "code.tvl.fyi/tvix/store/protos;storev1"; +option go_package = "code.tvl.fyi/tvix/store-go;storev1"; service PathInfoService { // Return a PathInfo message matching the criteria specified in the -- cgit 1.4.1