about summary refs log tree commit diff
path: root/tvix/store-go
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2023-10-17T20·30+0100
committerclbot <clbot@tvl.fyi>2023-10-17T20·36+0000
commit2d51da7f40e85b9411642e4c65efb23a9a0c4255 (patch)
tree0ee01ee02ea4dcfb76d892e8ee7a14df8af66b16 /tvix/store-go
parent6e8fbc830a28cdca26da1dec583657706b84702f (diff)
chore(tvix/store-go): rename go module r/6848
`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 <flokli@flokli.de>
Tested-by: BuildkiteCI
Reviewed-by: Connor Brewster <cbrewster@hey.com>
Diffstat (limited to 'tvix/store-go')
-rw-r--r--tvix/store-go/default.nix2
-rw-r--r--tvix/store-go/export.go2
-rw-r--r--tvix/store-go/export_test.go4
-rw-r--r--tvix/store-go/go.mod4
-rw-r--r--tvix/store-go/go.sum4
-rw-r--r--tvix/store-go/pathinfo.pb.go2
-rw-r--r--tvix/store-go/pathinfo_test.go4
-rw-r--r--tvix/store-go/pick_next_node_test.go2
-rw-r--r--tvix/store-go/rpc_pathinfo.pb.go2
-rw-r--r--tvix/store-go/rpc_pathinfo_grpc.pb.go2
10 files changed, 14 insertions, 14 deletions
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"