mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(tvix/store-go): rename go module

Browse source 
`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>
This commit is contained in:
Florian Klink 2023-10-17 21:30:29 +01:00 committed by clbot
parent 6e8fbc830a
commit 2d51da7f40
13 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ops/modules/www/code.tvl.fyi.nix
View file

@ -24,8 +24,8 @@
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>''}; 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 { location = /go-get/tvix/store-go {
alias ${pkgs.writeText "go-import-metadata.html" ''<html><meta name="go-import" content="code.tvl.fyi/tvix/store/protos git https://code.tvl.fyi/depot.git:/tvix/store-go.git"></html>''}; alias ${pkgs.writeText "go-import-metadata.html" ''<html><meta name="go-import" content="code.tvl.fyi/tvix/store-go git https://code.tvl.fyi/depot.git:/tvix/store-go.git"></html>''};
} }
location = /go-get/tvix/nar-bridge { location = /go-get/tvix/nar-bridge {
@ -44,9 +44,9 @@
} }
} }
location = /tvix/store/protos { location = /tvix/store-go {
if ($args ~* "/?go-get=1") { if ($args ~* "/?go-get=1") {
return 302 /go-get/tvix/store/protos; return 302 /go-get/tvix/store-go;
} }
} }

2
tvix/store-go/default.nix
View file

@ -8,7 +8,7 @@ in
(pkgs.buildGoModule { (pkgs.buildGoModule {
name = "store-go"; name = "store-go";
src = depot.third_party.gitignoreSource ./.; src = depot.third_party.gitignoreSource ./.;
vendorHash = "sha256-WAYaIT3h3Cdvo1RB8T7DuoxeKvXfkq8vo/vdkhJQDs0="; vendorHash = "sha256-EoxvI1J+w0R+oACAVx9FhUG5VhDyzXuN2Vu2iEhgh94=";
}).overrideAttrs (_: { }).overrideAttrs (_: {
meta.ci.extraSteps = { meta.ci.extraSteps = {
check = { check = {

2
tvix/store-go/export.go
View file

@ -5,7 +5,7 @@ import (
"io" "io"
"path" "path"
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"
) )

4
tvix/store-go/export_test.go
View file

@ -6,8 +6,8 @@ import (
"os" "os"
"testing" "testing"
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/stretchr/testify/require" "github.com/stretchr/testify/require"
) )

4
tvix/store-go/go.mod
View file

@ -1,9 +1,9 @@
module code.tvl.fyi/tvix/store/protos module code.tvl.fyi/tvix/store-go
go 1.19 go 1.19
require ( 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/google/go-cmp v0.5.6
github.com/nix-community/go-nix v0.0.0-20231009143713-ebca3299475b github.com/nix-community/go-nix v0.0.0-20231009143713-ebca3299475b
github.com/stretchr/testify v1.8.1 github.com/stretchr/testify v1.8.1

4
tvix/store-go/go.sum
View file

@ -1,6 +1,6 @@
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= 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-go v0.0.0-20231017202545-96df348c772c h1:NMxDhSYISwhTt3NoyYUnvDPQZTf5bnR9BoXAc1p2Ugg=
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/go.mod h1:+vKbozsa04yy2TWh3kUVU568jaza3Hf0p1jAEoMoCwA=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= 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/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=

2
tvix/store-go/pathinfo.pb.go
View file

@ -10,7 +10,7 @@
package storev1 package storev1
import ( import (
protos "code.tvl.fyi/tvix/castore/protos" protos "code.tvl.fyi/tvix/castore-go"
protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl" protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect" reflect "reflect"

4
tvix/store-go/pathinfo_test.go
View file

@ -7,8 +7,8 @@ import (
"github.com/nix-community/go-nix/pkg/storepath" "github.com/nix-community/go-nix/pkg/storepath"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
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"
) )
const ( const (

2
tvix/store-go/pick_next_node_test.go
View file

@ -3,7 +3,7 @@ package storev1
import ( import (
"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"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"google.golang.org/protobuf/testing/protocmp" "google.golang.org/protobuf/testing/protocmp"

2
tvix/store-go/rpc_pathinfo.pb.go
View file

@ -10,7 +10,7 @@
package storev1 package storev1
import ( import (
protos "code.tvl.fyi/tvix/castore/protos" protos "code.tvl.fyi/tvix/castore-go"
protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl" protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect" reflect "reflect"

2
tvix/store-go/rpc_pathinfo_grpc.pb.go
View file

@ -10,7 +10,7 @@
package storev1 package storev1
import ( import (
protos "code.tvl.fyi/tvix/castore/protos" protos "code.tvl.fyi/tvix/castore-go"
context "context" context "context"
grpc "google.golang.org/grpc" grpc "google.golang.org/grpc"
codes "google.golang.org/grpc/codes" codes "google.golang.org/grpc/codes"

2
tvix/store/protos/pathinfo.proto
View file

@ -6,7 +6,7 @@ package tvix.store.v1;
import "tvix/castore/protos/castore.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";
// PathInfo shows information about a Nix Store Path. // PathInfo shows information about a Nix Store Path.
// That's a single element inside /nix/store. // That's a single element inside /nix/store.

2
tvix/store/protos/rpc_pathinfo.proto
View file

@ -7,7 +7,7 @@ package tvix.store.v1;
import "tvix/store/protos/pathinfo.proto"; import "tvix/store/protos/pathinfo.proto";
import "tvix/castore/protos/castore.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 { service PathInfoService {
// Return a PathInfo message matching the criteria specified in the // Return a PathInfo message matching the criteria specified in the