Introduce new Has method for presence testing on CelMap values.

PiperOrigin-RevId: 374306406

Author: TristonianJones

conformance/BUILD

@@ -85,8 +85,6 @@ cc_binary(
             # TODO(issues/114): Ensure the 'in' operator is a logical OR of element equality results.
             "--skip_test=comparisons/in_list_literal/elem_in_mixed_type_list_error",
             "--skip_test=comparisons/in_map_literal/key_in_mixed_key_type_map_error",
-            # TODO(issues/115): The 'in' operator fails with maps containing boolean keys.
-            "--skip_test=fields/in/singleton",
             # TODO(issues/97): Parse-only qualified variable lookup "x.y" wtih binding "x.y" or "y" within container "x" fails
             "--skip_test=fields/qualified_identifier_resolution/qualified_ident,map_field_select,ident_with_longest_prefix_check,qualified_identifier_resolution_unchecked",
             "--skip_test=namespace/qualified/self_eval_qualified_lookup",

eval/eval/BUILD

@@ -419,6 +419,7 @@ cc_test(
         "//eval/public/structs:cel_proto_wrapper",
         "//eval/testutil:test_message_cc_proto",
         "//testutil:util",
+        "@com_google_absl//absl/status",
         "@com_google_absl//absl/status:statusor",
         "@com_google_googleapis//google/api/expr/v1alpha1:syntax_cc_proto",
         "@com_google_googletest//:gtest_main",

eval/eval/select_step.cc

@@ -1,5 +1,6 @@
 #include "eval/eval/select_step.h"
 
+#include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "eval/eval/evaluator_core.h"
@@ -155,7 +156,6 @@ absl::Status SelectStep::Evaluate(ExecutionFrame* frame) const {
       }
 
       absl::Status status = CreateValueFromField(msg, frame->arena(), &result);
-
       if (status.ok()) {
         frame->value_stack().PopAndPush(result, result_trail);
       }
@@ -178,15 +178,23 @@ absl::Status SelectStep::Evaluate(ExecutionFrame* frame) const {
         return absl::OkStatus();
       }
 
-      auto lookup_result = (*cel_map)[CelValue::CreateString(&field_)];
-
-      // Test only Select expression.
+      CelValue field_name = CelValue::CreateString(&field_);
       if (test_field_presence_) {
-        result = CelValue::CreateBool(lookup_result.has_value());
+        // Field presence only supports string keys containing valid identifier
+        // characters.
+        auto presence = cel_map->Has(field_name);
+        if (!presence.ok()) {
+          CelValue error_value =
+              CreateErrorValue(frame->arena(), presence.status());
+          frame->value_stack().PopAndPush(error_value);
+          return absl::OkStatus();
+        }
+        result = CelValue::CreateBool(*presence);
         frame->value_stack().PopAndPush(result);
         return absl::OkStatus();
       }
 
+      auto lookup_result = (*cel_map)[field_name];
       if (frame->enable_unknowns()) {
         result_trail = trail.Step(&field_, frame->arena());
         if (frame->attribute_utility().CheckForUnknown(result_trail, false)) {
@@ -205,7 +213,6 @@ absl::Status SelectStep::Evaluate(ExecutionFrame* frame) const {
         result = CreateNoSuchKeyError(frame->arena(), field_);
       }
       frame->value_stack().PopAndPush(result, result_trail);
-
       return absl::OkStatus();
     }
     case CelValue::Type::kUnknownSet: {

eval/eval/select_step_test.cc

@@ -3,6 +3,7 @@
 #include "google/api/expr/v1alpha1/syntax.pb.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
+#include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "eval/eval/ident_step.h"
 #include "eval/public/cel_attribute.h"
@@ -32,7 +33,6 @@ absl::StatusOr<CelValue> RunExpression(const CelValue target,
                                        absl::string_view unknown_path,
                                        bool enable_unknowns) {
   ExecutionPath path;
-
   Expr dummy_expr;
 
   auto select = dummy_expr.mutable_select_expr();
@@ -179,6 +179,43 @@ TEST_P(SelectStepTest, MapPresenseIsTrueTest) {
   EXPECT_EQ(result.BoolOrDie(), true);
 }
 
+TEST(SelectStepTest, MapPresenseIsErrorTest) {
+  TestMessage message;
+  google::protobuf::Arena arena;
+
+  Expr select_expr;
+  auto select = select_expr.mutable_select_expr();
+  select->set_field("1");
+  select->set_test_only(true);
+  Expr* expr1 = select->mutable_operand();
+  auto select_map = expr1->mutable_select_expr();
+  select_map->set_field("int32_int32_map");
+  Expr* expr0 = select_map->mutable_operand();
+  auto ident = expr0->mutable_ident_expr();
+  ident->set_name("target");
+
+  auto step0_status = CreateIdentStep(ident, expr0->id());
+  auto step1_status = CreateSelectStep(select_map, expr1->id(), "");
+  auto step2_status = CreateSelectStep(select, select_expr.id(), "");
+  ASSERT_OK(step0_status);
+  ASSERT_OK(step1_status);
+  ASSERT_OK(step2_status);
+
+  ExecutionPath path;
+  path.push_back(std::move(step0_status.value()));
+  path.push_back(std::move(step1_status.value()));
+  path.push_back(std::move(step2_status.value()));
+  CelExpressionFlatImpl cel_expr(&select_expr, std::move(path), 0, {}, false);
+  Activation activation;
+  activation.InsertValue("target",
+                         CelProtoWrapper::CreateMessage(&message, &arena));
+  auto status = cel_expr.Evaluate(activation, &arena);
+  CelValue result = status.value();
+
+  EXPECT_TRUE(result.IsError());
+  EXPECT_EQ(result.ErrorOrDie()->code(), absl::StatusCode::kInvalidArgument);
+}
+
 TEST(SelectStepTest, MapPresenseIsTrueWithUnknownTest) {
   UnknownSet unknown_set;
   std::string key1 = "key1";

eval/public/BUILD

@@ -25,6 +25,7 @@ cc_library(
     deps = [
         ":cel_value_internal",
         "@com_google_absl//absl/status",
+        "@com_google_absl//absl/status:statusor",
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/strings:str_format",
         "@com_google_absl//absl/time",