Fix conversion of caveat debug context

Author: josephschorr

internal/caveats/debug.go

@@ -50,7 +50,7 @@ func BuildDebugInformation(exprResult ExpressionResult) (string, *structpb.Struc
 	}
 
 	// Convert the context map to a struct.
-	contextStruct, err := structpb.NewStruct(contextMap)
+	contextStruct, err := caveats.ConvertContextToStruct(contextMap)
 	if err != nil {
 		return "", nil, err
 	}

internal/caveats/debug_test.go

@@ -2,6 +2,7 @@ package caveats
 
 import (
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/require"
 
@@ -10,6 +11,8 @@ import (
 	core "github.com/authzed/spicedb/pkg/proto/core/v1"
 )
 
+var testTime = time.Date(2021, 1, 1, 0, 0, 0, 0, time.UTC)
+
 func TestBuildDebugInformation(t *testing.T) {
 	tcs := []struct {
 		name               string
@@ -165,6 +168,26 @@ func TestBuildDebugInformation(t *testing.T) {
 			},
 			expectedExprString: "(a__0 + b__0 + c == 5) && (a__1 - b__1 - d == 64)",
 		},
+		{
+			name: "name reuse around times",
+			result: and(
+				eval("expires_at < now", map[string]any{
+					"expires_at": testTime,
+					"now":        testTime.Add(1 * time.Hour),
+				}),
+				eval("expires_at < now", map[string]any{
+					"expires_at": testTime,
+					"now":        testTime.Add(1 * time.Hour),
+				}),
+			),
+			expectedContext: map[string]any{
+				"expires_at__0": "2021-01-01T00:00:00Z",
+				"expires_at__1": "2021-01-01T00:00:00Z",
+				"now__0":        "2021-01-01T01:00:00Z",
+				"now__1":        "2021-01-01T01:00:00Z",
+			},
+			expectedExprString: "(expires_at__0 < now__0) && (expires_at__1 < now__1)",
+		},
 	}
 
 	for _, tc := range tcs {