Fix caveat string encode to not emit spaces

authzed · Nov 4, 2024 · fdceb5c · fdceb5c
1 parent ac7dfee
commit fdceb5c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/pkg/tuple/core_test.go b/pkg/tuple/core_test.go
@@ -1,6 +1,7 @@
 package tuple
 
 import (
+	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -118,9 +119,13 @@ func TestCoreRelationToString(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			got, err := CoreRelationToString(tt.input)
 			require.NoError(t, err)
+
+			// Golang randomly injects spaces.
+			got = strings.ReplaceAll(got, " ", "")
 			require.Equal(t, tt.expected, got)
 
 			got = MustCoreRelationToString(tt.input)
+			got = strings.ReplaceAll(got, " ", "")
 			require.Equal(t, tt.expected, got)
 		})
 	}

diff --git a/pkg/tuple/strings.go b/pkg/tuple/strings.go
@@ -4,6 +4,7 @@ import (
 	"sort"
 	"strings"
 
+	"google.golang.org/protobuf/encoding/protojson"
 	"google.golang.org/protobuf/types/known/structpb"
 
 	core "github.com/authzed/spicedb/pkg/proto/core/v1"
@@ -131,7 +132,10 @@ func StringCaveatContext(context *structpb.Struct) (string, error) {
 		return "", nil
 	}
 
-	contextBytes, err := context.MarshalJSON()
+	contextBytes, err := protojson.MarshalOptions{
+		Multiline: false,
+		Indent:    "",
+	}.Marshal(context)
 	if err != nil {
 		return "", err
 	}