fix(iamcel): log correct type on mismatches

einride · Oct 20, 2023 · f76af83 · f76af83
1 parent 0bbd922
commit f76af83
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/iamcel/test.go b/iamcel/test.go
@@ -45,11 +45,11 @@ func NewTestFunctionImplementation(
 		Binary: func(callerVal, resourceVal ref.Val) ref.Val {
 			caller, ok := callerVal.Value().(*iamv1.Caller)
 			if !ok {
-				return types.NewErr("test: unexpected type of arg 1, expected %T but got %T", &iamv1.Caller{}, caller)
+				return types.NewErr("test: unexpected type of arg 1, expected %T but got %T", &iamv1.Caller{}, callerVal.Value())
 			}
 			resource, ok := resourceVal.Value().(string)
 			if !ok {
-				return types.NewErr("test: unexpected type of arg 2, expected string but got %T", resource)
+				return types.NewErr("test: unexpected type of arg 2, expected string but got %T", resourceVal.Value())
 			}
 			permission, ok := iampermission.ResolveMethodPermission(options, resource)
 			if !ok {

diff --git a/iamcel/testall.go b/iamcel/testall.go
@@ -45,7 +45,11 @@ func NewTestAllFunctionImplementation(
 		Binary: func(callerVal, resourcesVal ref.Val) ref.Val {
 			caller, ok := callerVal.Value().(*iamv1.Caller)
 			if !ok {
-				return types.NewErr("test_all: unexpected type of arg 1, expected %T but got %T", &iamv1.Caller{}, caller)
+				return types.NewErr(
+					"test_all: unexpected type of arg 1, expected %T but got %T",
+					&iamv1.Caller{},
+					callerVal.Value(),
+				)
 			}
 			convertedResources, err := resourcesVal.ConvertToNative(reflect.TypeOf([]string(nil)))
 			if err != nil {

diff --git a/iamcel/testany.go b/iamcel/testany.go
@@ -45,7 +45,11 @@ func NewTestAnyFunctionImplementation(
 		Binary: func(callerVal, resourcesVal ref.Val) ref.Val {
 			caller, ok := callerVal.Value().(*iamv1.Caller)
 			if !ok {
-				return types.NewErr("test_any: unexpected type of arg 1, expected %T but got %T", &iamv1.Caller{}, caller)
+				return types.NewErr(
+					"test_any: unexpected type of arg 1, expected %T but got %T",
+					&iamv1.Caller{},
+					callerVal.Value(),
+				)
 			}
 			convertedResources, err := resourcesVal.ConvertToNative(reflect.TypeOf([]string(nil)))
 			if err != nil {