about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2023-10-17T20·10+0100
committerflokli <flokli@flokli.de>2023-10-17T20·25+0000
commit6e8fbc830a28cdca26da1dec583657706b84702f (patch)
treea73535ae425cfe6d79af4b5ca717ecc12f44cc6a
parent45d8a78a8b39561622fafdc495edf2dbac49465d (diff)
chore(tvix/castore-go): rename go module r/6847
`code.tvl.fyi/tvix/castore/protos` now points to a directory that only
contains the `.proto` files, while all golang tooling and .pb.go files
live in tvix/castore-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.

Change-Id: Ib3c6a2dac2923b3806ebb05be00af66d0da9f698
Reviewed-on: https://cl.tvl.fyi/c/depot/+/9791
Reviewed-by: Connor Brewster <cbrewster@hey.com>
Tested-by: BuildkiteCI
Autosubmit: flokli <flokli@flokli.de>
-rw-r--r--ops/modules/www/code.tvl.fyi.nix8
-rw-r--r--tvix/castore-go/castore_test.go2
-rw-r--r--tvix/castore-go/go.mod2
-rw-r--r--tvix/castore/protos/castore.proto2
-rw-r--r--tvix/castore/protos/rpc_blobstore.proto2
-rw-r--r--tvix/castore/protos/rpc_directory.proto2
6 files changed, 9 insertions, 9 deletions
diff --git a/ops/modules/www/code.tvl.fyi.nix b/ops/modules/www/code.tvl.fyi.nix
index b64f8f8cef7b..bf0e574f2656 100644
--- a/ops/modules/www/code.tvl.fyi.nix
+++ b/ops/modules/www/code.tvl.fyi.nix
@@ -20,8 +20,8 @@
             alias ${depot.tvix.docs.svg}/component-flow.svg;
         }
 
-        location = /go-get/tvix/castore/protos {
-            alias ${pkgs.writeText "go-import-metadata.html" ''<html><meta name="go-import" content="code.tvl.fyi/tvix/castore/protos git https://code.tvl.fyi/depot.git:/tvix/castore-go.git"></html>''};
+        location = /go-get/tvix/castore-go {
+            alias ${pkgs.writeText "go-import-metadata.html" ''<html><meta name="go-import" content="code.tvl.fyi/tvix/castore-go git https://code.tvl.fyi/depot.git:/tvix/castore-go.git"></html>''};
         }
 
         location = /go-get/tvix/store/protos {
@@ -38,9 +38,9 @@
             }
         }
 
-        location = /tvix/castore/protos {
+        location = /tvix/castore-go {
             if ($args ~* "/?go-get=1") {
-                return 302 /go-get/tvix/castore/protos;
+                return 302 /go-get/tvix/castore-go;
             }
         }
 
diff --git a/tvix/castore-go/castore_test.go b/tvix/castore-go/castore_test.go
index fda87a6cfb66..0d2d65208eff 100644
--- a/tvix/castore-go/castore_test.go
+++ b/tvix/castore-go/castore_test.go
@@ -3,7 +3,7 @@ package castorev1_test
 import (
 	"testing"
 
-	castorev1pb "code.tvl.fyi/tvix/castore/protos"
+	castorev1pb "code.tvl.fyi/tvix/castore-go"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/tvix/castore-go/go.mod b/tvix/castore-go/go.mod
index 9048aa205c46..94310dd2aa6c 100644
--- a/tvix/castore-go/go.mod
+++ b/tvix/castore-go/go.mod
@@ -1,4 +1,4 @@
-module code.tvl.fyi/tvix/castore/protos
+module code.tvl.fyi/tvix/castore-go
 
 go 1.19
 
diff --git a/tvix/castore/protos/castore.proto b/tvix/castore/protos/castore.proto
index d99df43857ac..34885964f08f 100644
--- a/tvix/castore/protos/castore.proto
+++ b/tvix/castore/protos/castore.proto
@@ -5,7 +5,7 @@ syntax = "proto3";
 
 package tvix.castore.v1;
 
-option go_package = "code.tvl.fyi/tvix/castore/protos;castorev1";
+option go_package = "code.tvl.fyi/tvix/castore-go;castorev1";
 
 // A Directory can contain Directory, File or Symlink nodes.
 // Each of these nodes have a name attribute, which is the basename in that directory
diff --git a/tvix/castore/protos/rpc_blobstore.proto b/tvix/castore/protos/rpc_blobstore.proto
index 6ee9a80f0afc..458803fd57cc 100644
--- a/tvix/castore/protos/rpc_blobstore.proto
+++ b/tvix/castore/protos/rpc_blobstore.proto
@@ -4,7 +4,7 @@ syntax = "proto3";
 
 package tvix.castore.v1;
 
-option go_package = "code.tvl.fyi/tvix/castore/protos;castorev1";
+option go_package = "code.tvl.fyi/tvix/castore-go;castorev1";
 
 service BlobService {
     // In the future, Stat will expose more metadata about a given blob,
diff --git a/tvix/castore/protos/rpc_directory.proto b/tvix/castore/protos/rpc_directory.proto
index 8d4c22828547..f45227a48eca 100644
--- a/tvix/castore/protos/rpc_directory.proto
+++ b/tvix/castore/protos/rpc_directory.proto
@@ -6,7 +6,7 @@ package tvix.castore.v1;
 
 import "tvix/castore/protos/castore.proto";
 
-option go_package = "code.tvl.fyi/tvix/castore/protos;castorev1";
+option go_package = "code.tvl.fyi/tvix/castore-go;castorev1";
 
 service DirectoryService {
   // Get retrieves a stream of Directory messages, by using the lookup