Merge branch 'main' into renovate/configure

Author: niting3c

README.md

@@ -19,3 +19,4 @@ The `tools` directory follows https://github.com/envoyproxy/java-control-plane/c
 8. You may need to add or remove protos depending on the failures and you would want to refer to the bazel dependencies file to figure out what failed, finally udpate the scripts to have the change.
 
 Note: until we catch up with Envoy head version, slight adjustments might be needed for these scripts, towards matching upstream more closely.
+https://github.com/envoyproxy/envoy/blob/6fe1905459ff267a43a8a26d042ae03a8aa7bc98/api/bazel/repository_locations.bzl

gradle.properties

@@ -1,2 +1,2 @@
-version=1.34.0-1
+version=1.34.4-1
 org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8

src/main/proto/cel/expr/checked.proto

@@ -236,20 +236,6 @@ message Decl {
     Constant value = 2;
 
     // Documentation string for the identifier.
-    //
-    // Provide a brief description of what the variable represents and whether
-    // there are any constraints on the formatting or supported value range.
-    //
-    // Examples:
-    //
-    //    'request.auth.principal' - string which uniquely identifies an
-    //    authenticated principal. For JSON Web Tokens (JWTs), the principal
-    //    is the combination of the issuer ('iss') and subject ('sub') token
-    //    fields concatenated by a forward slash: iss + `/` + sub.
-    //
-    //    'min_cpus' - integer value indicates the minimum number of CPUs
-    //    required for a compute cluster. The 'min_cpus' value must be 
-    //    greater than zero and less than 'max_cpus' or 64 whichever is less.
     string doc = 3;
   }
 
@@ -307,45 +293,11 @@ message Decl {
       bool is_instance_function = 5;
 
       // Documentation string for the overload.
-      //
-      // Provide examples of the overload behavior, preferring to use literal
-      // values as input with a comment on the return value.
-      //
-      // Examples:
-      //
-      //    // Determine whether a value of type <V> exists within a list<V>.
-      //    2 in [1, 2, 3] // returns true
-      //
-      //    // Determine whether a key of type <K> exists within a map<K,V>.
-      //    'hello' in {'hi': 'you', 'hello': 'there'}  // returns true
-      //    'help' in {'hi': 'you', 'hello': 'there'}  // returns false
-      //
-      //    // Take the substring of a string starting at a specific character
-      //    // offset (inclusive).
-      //    "tacocat".substring(1) // returns "acocat"
-      //    "tacocat".substring(20) // error
-      //
-      //    // Take the substring of a string starting at a specific character
-      //    // offset (inclusive) and ending at the given offset (exclusive).
-      //    "tacocat".substring(1, 6) // returns "acoca"
       string doc = 6;
     }
 
     // Required. List of function overloads, must contain at least one overload.
     repeated Overload overloads = 1;
-
-    // Documentation string for the function that indicates the general purpose
-    // of the function and its behavior.
-    //
-    // Documentation strings for the function should be general purpose with
-    // specific examples provided in the overload doc string.
-    //
-    // Examples:
-    // 
-    //     The 'in' operator tests whether an item exists in a collection.
-    //
-    //     The 'substring' function returns a substring of a target string.
-    string doc = 2;
   }
 
   // The fully qualified name of the declaration.

src/main/proto/cel/expr/conformance/env_config.proto

@@ -0,0 +1,37 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Tests for runtime support of standard functions.
+
+syntax = "proto3";
+
+package cel.expr.conformance;
+
+import "cel/expr/checked.proto";
+
+option cc_enable_arenas = true;
+option go_package = "cel.dev/expr/conformance";
+option java_multiple_files = true;
+option java_outer_classname = "EnvcheckProto";
+option java_package = "dev.cel.expr.conformance";
+
+// The format of a standard environment, i.e. a collection of declarations
+// for the checker.
+message Env {
+  // Required.  The name of the environment.
+  string name = 1;
+
+  // The declarations in this environment.
+  repeated cel.expr.Decl decl = 2;
+}

src/main/proto/cel/expr/conformance/envcheck.proto

@@ -1,25 +1,9 @@
-// Copyright 2024 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
 syntax = "proto2";
 
 package cel.expr.conformance.proto2;
 
 import "google/protobuf/any.proto";
 import "google/protobuf/duration.proto";
-import "google/protobuf/empty.proto";
-import "google/protobuf/field_mask.proto";
 import "google/protobuf/struct.proto";
 import "google/protobuf/timestamp.proto";
 import "google/protobuf/wrappers.proto";
@@ -63,9 +47,6 @@ message TestAllTypes {
   optional string single_string = 14 [default = "empty"];
   optional bytes single_bytes = 15 [default = "none"];
 
-  // Collides with 'in' operator.
-  optional bool in = 18;
-
   // Wellknown.
   optional google.protobuf.Any single_any = 100;
   optional google.protobuf.Duration single_duration = 101;
@@ -84,8 +65,6 @@ message TestAllTypes {
   optional google.protobuf.ListValue list_value = 114;
   optional google.protobuf.NullValue null_value = 115;
   optional google.protobuf.NullValue optional_null_value = 116;
-  optional google.protobuf.FieldMask field_mask = 117;
-  optional google.protobuf.Empty empty = 118;
 
   // Nested messages
   oneof nested_type {
@@ -117,7 +96,7 @@ message TestAllTypes {
   repeated NestedEnum repeated_nested_enum = 52;
   repeated string repeated_string_piece = 53 [ctype = STRING_PIECE];
   repeated string repeated_cord = 54 [ctype = CORD];
-  repeated NestedMessage repeated_lazy_message = 55;
+  repeated NestedMessage repeated_lazy_message = 55 [lazy = true];
 
   // Repeated wellknown.
   repeated google.protobuf.Any repeated_any = 120;
@@ -307,19 +286,6 @@ message TestAllTypes {
   map<string, google.protobuf.StringValue> map_string_string_wrapper = 321;
   map<string, google.protobuf.BoolValue> map_string_bool_wrapper = 322;
   map<string, google.protobuf.BytesValue> map_string_bytes_wrapper = 323;
-
-  oneof kind {
-    NestedTestAllTypes oneof_type = 400;
-    NestedMessage oneof_msg = 401;
-    bool oneof_bool = 402;
-  }
-
-  optional group NestedGroup = 403 {
-    optional int32 single_id = 404;
-    optional string single_name = 405;
-  }
-
-  extensions 1000 to max;
 }
 
 // This proto includes a recursively nested message.