From 1549f020ee386baf95041ca7886bc564c93ea9d0 Mon Sep 17 00:00:00 2001
From: Brian McGee <brian@bmcgee.ie>
Date: Sat, 9 Sep 2023 12:55:06 +0100
Subject: fix(tvix/protos): support []byte node names

The underlying protos were changed to return `[]byte` instead of `string`.

Change-Id: I5d3e5d8de0ed7200325f7ab0d62e3c10d8eb1b7d
Reviewed-on: https://cl.tvl.fyi/c/depot/+/9285
Tested-by: BuildkiteCI
Reviewed-by: flokli <flokli@flokli.de>
---
 tvix/store/protos/castore_test.go | 46 +++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

(limited to 'tvix/store/protos/castore_test.go')

diff --git a/tvix/store/protos/castore_test.go b/tvix/store/protos/castore_test.go
index 61fe535366d0..15a2554bbb57 100644
--- a/tvix/store/protos/castore_test.go
+++ b/tvix/store/protos/castore_test.go
@@ -29,7 +29,7 @@ func TestDirectorySize(t *testing.T) {
 	t.Run("containing single empty directory", func(t *testing.T) {
 		d := storev1pb.Directory{
 			Directories: []*storev1pb.DirectoryNode{{
-				Name:   "foo",
+				Name:   []byte([]byte("foo")),
 				Digest: dummyDigest,
 				Size:   0,
 			}},
@@ -43,7 +43,7 @@ func TestDirectorySize(t *testing.T) {
 	t.Run("containing single non-empty directory", func(t *testing.T) {
 		d := storev1pb.Directory{
 			Directories: []*storev1pb.DirectoryNode{{
-				Name:   "foo",
+				Name:   []byte("foo"),
 				Digest: dummyDigest,
 				Size:   4,
 			}},
@@ -58,7 +58,7 @@ func TestDirectorySize(t *testing.T) {
 		d := storev1pb.Directory{
 			Directories: []*storev1pb.DirectoryNode{},
 			Files: []*storev1pb.FileNode{{
-				Name:       "foo",
+				Name:       []byte("foo"),
 				Digest:     dummyDigest,
 				Size:       42,
 				Executable: false,
@@ -74,8 +74,8 @@ func TestDirectorySize(t *testing.T) {
 			Directories: []*storev1pb.DirectoryNode{},
 			Files:       []*storev1pb.FileNode{},
 			Symlinks: []*storev1pb.SymlinkNode{{
-				Name:   "foo",
-				Target: "bar",
+				Name:   []byte("foo"),
+				Target: []byte("bar"),
 			}},
 		}
 
@@ -114,7 +114,7 @@ func TestDirectoryValidate(t *testing.T) {
 		{
 			d := storev1pb.Directory{
 				Directories: []*storev1pb.DirectoryNode{{
-					Name:   "",
+					Name:   []byte{},
 					Digest: dummyDigest,
 					Size:   42,
 				}},
@@ -127,7 +127,7 @@ func TestDirectoryValidate(t *testing.T) {
 		{
 			d := storev1pb.Directory{
 				Directories: []*storev1pb.DirectoryNode{{
-					Name:   ".",
+					Name:   []byte("."),
 					Digest: dummyDigest,
 					Size:   42,
 				}},
@@ -141,7 +141,7 @@ func TestDirectoryValidate(t *testing.T) {
 			d := storev1pb.Directory{
 				Directories: []*storev1pb.DirectoryNode{},
 				Files: []*storev1pb.FileNode{{
-					Name:       "..",
+					Name:       []byte(".."),
 					Digest:     dummyDigest,
 					Size:       42,
 					Executable: false,
@@ -156,8 +156,8 @@ func TestDirectoryValidate(t *testing.T) {
 				Directories: []*storev1pb.DirectoryNode{},
 				Files:       []*storev1pb.FileNode{},
 				Symlinks: []*storev1pb.SymlinkNode{{
-					Name:   "\x00",
-					Target: "foo",
+					Name:   []byte("\x00"),
+					Target: []byte("foo"),
 				}},
 			}
 
@@ -168,8 +168,8 @@ func TestDirectoryValidate(t *testing.T) {
 				Directories: []*storev1pb.DirectoryNode{},
 				Files:       []*storev1pb.FileNode{},
 				Symlinks: []*storev1pb.SymlinkNode{{
-					Name:   "foo/bar",
-					Target: "foo",
+					Name:   []byte("foo/bar"),
+					Target: []byte("foo"),
 				}},
 			}
 
@@ -180,7 +180,7 @@ func TestDirectoryValidate(t *testing.T) {
 	t.Run("invalid digest", func(t *testing.T) {
 		d := storev1pb.Directory{
 			Directories: []*storev1pb.DirectoryNode{{
-				Name:   "foo",
+				Name:   []byte("foo"),
 				Digest: nil,
 				Size:   42,
 			}},
@@ -196,11 +196,11 @@ func TestDirectoryValidate(t *testing.T) {
 		{
 			d := storev1pb.Directory{
 				Directories: []*storev1pb.DirectoryNode{{
-					Name:   "b",
+					Name:   []byte("b"),
 					Digest: dummyDigest,
 					Size:   42,
 				}, {
-					Name:   "a",
+					Name:   []byte("a"),
 					Digest: dummyDigest,
 					Size:   42,
 				}},
@@ -214,12 +214,12 @@ func TestDirectoryValidate(t *testing.T) {
 		{
 			d := storev1pb.Directory{
 				Directories: []*storev1pb.DirectoryNode{{
-					Name:   "a",
+					Name:   []byte("a"),
 					Digest: dummyDigest,
 					Size:   42,
 				}},
 				Files: []*storev1pb.FileNode{{
-					Name:       "a",
+					Name:       []byte("a"),
 					Digest:     dummyDigest,
 					Size:       42,
 					Executable: false,
@@ -233,11 +233,11 @@ func TestDirectoryValidate(t *testing.T) {
 		{
 			d := storev1pb.Directory{
 				Directories: []*storev1pb.DirectoryNode{{
-					Name:   "a",
+					Name:   []byte("a"),
 					Digest: dummyDigest,
 					Size:   42,
 				}, {
-					Name:   "b",
+					Name:   []byte("b"),
 					Digest: dummyDigest,
 					Size:   42,
 				}},
@@ -251,18 +251,18 @@ func TestDirectoryValidate(t *testing.T) {
 		{
 			d := storev1pb.Directory{
 				Directories: []*storev1pb.DirectoryNode{{
-					Name:   "b",
+					Name:   []byte("b"),
 					Digest: dummyDigest,
 					Size:   42,
 				}, {
-					Name:   "c",
+					Name:   []byte("c"),
 					Digest: dummyDigest,
 					Size:   42,
 				}},
 				Files: []*storev1pb.FileNode{},
 				Symlinks: []*storev1pb.SymlinkNode{{
-					Name:   "a",
-					Target: "foo",
+					Name:   []byte("a"),
+					Target: []byte("foo"),
 				}},
 			}
 			assert.NoError(t, d.Validate(), "shouldn't error")
-- 
cgit 1.4.1