Create an util method to convert rpc status to eval status (#1178)

* Create an util method to convert rpc status to eval status

* Formatted the Go files.

* Formatted the WORKSPACE file.

* Add failing conformance test to SKIP_TESTS.

* Added RefValue to ExprValue converter.

* Update Module bazel.

* Updated go.mod and go.sum.

* Removed gRpc status dependencies from io and io_test.

* formatted the files.

* Followed the convention of returning the v1alpha1 format.

* Updated the documentation.

* Remove unnecessary dependencies.

Author: ChinmayMadeshi

.gitignore

@@ -10,3 +10,4 @@ proto/checked.pb.go
 proto/syntax.pb.go
 *~
 MODULE.bazel.lock
+.ijwb/

WORKSPACE

@@ -45,10 +45,10 @@ http_archive(
     urls = ["https://github.com/protocolbuffers/protobuf/archive/v3.21.5.zip"],
 )
 
-load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
 load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository")
 load("@com_google_googleapis//:repository_rules.bzl", "switched_rules_by_language")
 load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
+load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
 
 switched_rules_by_language(
     name = "com_google_googleapis_imports",
@@ -101,8 +101,8 @@ go_repository(
 go_repository(
     name = "dev_cel_expr",
     importpath = "cel.dev/expr",
-    sum = "h1:K4KOtPCJQjVggkARsjG9RWXP6O4R73aHeJMa/dmCQQg=",
-    version = "v0.23.1",
+    sum = "h1:56OvJKSH3hDGL0ml5uSxZmz3/3Pq4tJ+fb1unVLAFcY=",
+    version = "v0.24.0",
 )
 
 # local_repository(
@@ -158,12 +158,15 @@ go_register_toolchains(version = "1.22.0")
 gazelle_dependencies()
 
 load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
+
 rules_proto_dependencies()
 
 load("@rules_proto//proto:setup.bzl", "rules_proto_setup")
+
 rules_proto_setup()
 
 load("@rules_proto//proto:toolchains.bzl", "rules_proto_toolchains")
+
 rules_proto_toolchains()
 
 protobuf_deps()

cel/BUILD.bazel

@@ -11,8 +11,8 @@ go_library(
         "decls.go",
         "env.go",
         "folding.go",
-        "io.go",
         "inlining.go",
+        "io.go",
         "library.go",
         "macro.go",
         "optimizer.go",
@@ -64,8 +64,8 @@ go_test(
         "decls_test.go",
         "env_test.go",
         "folding_test.go",
-        "io_test.go",
         "inlining_test.go",
+        "io_test.go",
         "optimizer_test.go",
         "prompt_test.go",
         "validator_test.go",
@@ -90,8 +90,8 @@ go_test(
         "//test/proto2pb:go_default_library",
         "//test/proto3pb:go_default_library",
         "@org_golang_google_genproto_googleapis_api//expr/v1alpha1:go_default_library",
-        "@org_golang_google_protobuf//proto:go_default_library",
         "@org_golang_google_protobuf//encoding/prototext:go_default_library",
+        "@org_golang_google_protobuf//proto:go_default_library",
         "@org_golang_google_protobuf//types/known/structpb:go_default_library",
         "@org_golang_google_protobuf//types/known/wrapperspb:go_default_library",
     ],

cel/io.go

@@ -126,6 +126,55 @@ func ValueAsAlphaProto(res ref.Val) (*exprpb.Value, error) {
 	return alpha, err
 }
 
+// RefValToExprValue converts between ref.Val and google.api.expr.v1alpha1.ExprValue.
+// The result ExprValue is the serialized proto form.
+func RefValToExprValue(res ref.Val) (*exprpb.ExprValue, error) {
+	return ExprValueAsAlphaProto(res)
+}
+
+// ExprValueAsAlphaProto converts between ref.Val and google.api.expr.v1alpha1.ExprValue.
+// The result ExprValue is the serialized proto form.
+func ExprValueAsAlphaProto(res ref.Val) (*exprpb.ExprValue, error) {
+	canonical, err := ExprValueAsProto(res)
+	if err != nil {
+		return nil, err
+	}
+	alpha := &exprpb.ExprValue{}
+	err = convertProto(canonical, alpha)
+	return alpha, err
+}
+
+// ExprValueAsProto converts between ref.Val and cel.expr.ExprValue.
+// The result ExprValue is the serialized proto form.
+func ExprValueAsProto(res ref.Val) (*celpb.ExprValue, error) {
+	switch res := res.(type) {
+	case *types.Unknown:
+		return &celpb.ExprValue{
+			Kind: &celpb.ExprValue_Unknown{
+				Unknown: &celpb.UnknownSet{
+					Exprs: res.IDs(),
+				},
+			}}, nil
+	case *types.Err:
+		return &celpb.ExprValue{
+			Kind: &celpb.ExprValue_Error{
+				Error: &celpb.ErrorSet{
+					// Keeping the error code as UNKNOWN since there's no error codes associated with
+					// Cel-Go runtime errors.
+					Errors: []*celpb.Status{{Code: 2, Message: res.Error()}},
+				},
+			},
+		}, nil
+	default:
+		val, err := ValueAsProto(res)
+		if err != nil {
+			return nil, err
+		}
+		return &celpb.ExprValue{
+			Kind: &celpb.ExprValue_Value{Value: val}}, nil
+	}
+}
+
 // ValueAsProto converts between ref.Val and cel.expr.Value.
 // The result Value is the serialized proto form. The ref.Val must not be error or unknown.
 func ValueAsProto(res ref.Val) (*celpb.Value, error) {

cel/io_test.go

@@ -26,6 +26,7 @@ import (
 	celast "github.com/google/cel-go/common/ast"
 	"github.com/google/cel-go/common/operators"
 	"github.com/google/cel-go/common/types"
+	"github.com/google/cel-go/common/types/ref"
 
 	proto3pb "github.com/google/cel-go/test/proto3pb"
 	exprpb "google.golang.org/genproto/googleapis/api/expr/v1alpha1"
@@ -193,6 +194,58 @@ func TestExprToString(t *testing.T) {
 	}
 }
 
+func TestRefValToExprValue(t *testing.T) {
+	tests := []struct {
+		name        string
+		refVal      ref.Val
+		expectError bool
+	}{
+		{
+			name:        "unknown value",
+			refVal:      types.NewUnknown(1, nil),
+			expectError: false,
+		},
+		{
+			name:        "error value",
+			refVal:      types.NewErr("test error"),
+			expectError: false,
+		},
+		{
+			name:        "bool value",
+			refVal:      types.Bool(true),
+			expectError: false,
+		},
+		{
+			name:        "string value",
+			refVal:      types.String("test"),
+			expectError: false,
+		},
+		{
+			name:        "int value",
+			refVal:      types.Int(1),
+			expectError: false,
+		},
+	}
+	for _, tst := range tests {
+		tc := tst
+		t.Run(tc.name, func(t *testing.T) {
+			exprVal, err := ExprValueAsProto(tc.refVal)
+			if tc.expectError {
+				if err == nil {
+					t.Errorf("RefValToExprValue(%v) expected error, got %v", tc.refVal, exprVal)
+				}
+			} else {
+				if err != nil {
+					t.Errorf("RefValToExprValue(%v) failed with error: %v", tc.refVal, err)
+				}
+				if exprVal == nil {
+					t.Errorf("RefValToExprValue(%v) expected value, got nil", tc.refVal)
+				}
+			}
+		})
+	}
+}
+
 func TestAstToStringNil(t *testing.T) {
 	expr, err := AstToString(nil)
 	if err == nil || !strings.Contains(err.Error(), "unsupported expr") {

conformance/BUILD.bazel

@@ -48,6 +48,7 @@ _TESTS_TO_SKIP = [
     "fields/qualified_identifier_resolution/map_value_repeat_key_heterogeneous",
     "macros/map/map_extract_keys",
     "timestamps/duration_converters/get_milliseconds",
+    "optionals/optionals/map_optional_select_has",
 
     # Temporarily failing tests, need a spec update
     "string_ext/value_errors/indexof_out_of_range,lastindexof_out_of_range",
@@ -84,9 +85,9 @@ go_test(
         "@com_github_google_go_cmp//cmp:go_default_library",
         "@dev_cel_expr//:expr",
         "@dev_cel_expr//conformance:go_default_library",
-        "@dev_cel_expr//conformance/test:go_default_library",
         "@dev_cel_expr//conformance/proto2:go_default_library",
         "@dev_cel_expr//conformance/proto3:go_default_library",
+        "@dev_cel_expr//conformance/test:go_default_library",
         "@io_bazel_rules_go//go/runfiles",
         "@org_golang_google_genproto_googleapis_api//expr/v1alpha1:go_default_library",
         "@org_golang_google_protobuf//encoding/prototext:go_default_library",

conformance/go.mod

@@ -3,7 +3,7 @@ module github.com/google/cel-go/conformance
 go 1.22.0
 
 require (
-	cel.dev/expr v0.23.1
+	cel.dev/expr v0.24.0
 	github.com/bazelbuild/rules_go v0.49.0
 	github.com/google/cel-go v0.21.0
 	github.com/google/go-cmp v0.6.0

conformance/go.sum

@@ -1,5 +1,5 @@
-cel.dev/expr v0.23.1 h1:K4KOtPCJQjVggkARsjG9RWXP6O4R73aHeJMa/dmCQQg=
-cel.dev/expr v0.23.1/go.mod h1:hLPLo1W4QUmuYdA72RBX06QTs6MXw941piREPl3Yfiw=
+cel.dev/expr v0.24.0 h1:56OvJKSH3hDGL0ml5uSxZmz3/3Pq4tJ+fb1unVLAFcY=
+cel.dev/expr v0.24.0/go.mod h1:hLPLo1W4QUmuYdA72RBX06QTs6MXw941piREPl3Yfiw=
 github.com/antlr4-go/antlr/v4 v4.13.0 h1:lxCg3LAv+EUK6t1i0y1V6/SLeUi0eKEKdhQAlS8TVTI=
 github.com/antlr4-go/antlr/v4 v4.13.0/go.mod h1:pfChB/xh/Unjila75QW7+VU4TSnWnnk9UTnmpPaOR2g=
 github.com/bazelbuild/rules_go v0.49.0 h1:5vCbuvy8Q11g41lseGJDc5vxhDjJtfxr6nM/IC4VmqM=

go.mod

@@ -5,7 +5,7 @@ go 1.22.0
 toolchain go1.23.0
 
 require (
-	cel.dev/expr v0.23.1
+	cel.dev/expr v0.24.0
 	github.com/antlr4-go/antlr/v4 v4.13.0
 	github.com/stoewer/go-strcase v1.2.0
 	google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7

go.sum

@@ -1,5 +1,5 @@
-cel.dev/expr v0.23.1 h1:K4KOtPCJQjVggkARsjG9RWXP6O4R73aHeJMa/dmCQQg=
-cel.dev/expr v0.23.1/go.mod h1:hLPLo1W4QUmuYdA72RBX06QTs6MXw941piREPl3Yfiw=
+cel.dev/expr v0.24.0 h1:56OvJKSH3hDGL0ml5uSxZmz3/3Pq4tJ+fb1unVLAFcY=
+cel.dev/expr v0.24.0/go.mod h1:hLPLo1W4QUmuYdA72RBX06QTs6MXw941piREPl3Yfiw=
 github.com/antlr4-go/antlr/v4 v4.13.0 h1:lxCg3LAv+EUK6t1i0y1V6/SLeUi0eKEKdhQAlS8TVTI=
 github.com/antlr4-go/antlr/v4 v4.13.0/go.mod h1:pfChB/xh/Unjila75QW7+VU4TSnWnnk9UTnmpPaOR2g=
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=