Run conformance tests against published maven JARs

PiperOrigin-RevId: 793706852

Author: l46kok

.bazelrc

@@ -1,5 +1,4 @@
 common --enable_bzlmod
-common --enable_workspace
 build --java_runtime_version=remotejdk_11
 build --java_language_version=11
 

.github/workflows/workflow.yml

@@ -36,10 +36,44 @@ jobs:
       - name: Bazel Output Version
         run: bazelisk --version
       - name: Java 8 Build
-        run: bazel build ... --java_language_version=8 --java_runtime_version=8
+        run: bazel build ... --java_language_version=8 --java_runtime_version=8 --build_tag_filters=-conformance_maven
       - name: Bazel Test
         # Exclude codelab exercises as they are intentionally made to fail
-        run: bazelisk test ... --deleted_packages=//codelab/src/test/codelab --test_output=errors
+        # Exclude maven conformance tests. They are only executed when there's changes to version.
+        run: bazelisk test ... --deleted_packages=//codelab/src/test/codelab --test_output=errors --test_tag_filters=-conformance_maven --build_tag_filters=-conformance_maven
+
+      # -- Start of Maven Conformance Tests (Ran only when there's version changes) --
+      - name: Get changed file
+        id: changed_file
+        uses: tj-actions/changed-files@v44
+        with:
+          files: publish/cel_version.bzl
+      - name: Verify Version Consistency
+        if: steps.changed_file.outputs.any_changed == 'true'
+        run: |
+          CEL_VERSION=$(grep 'CEL_VERSION =' publish/cel_version.bzl | cut -d '"' -f 2)
+
+          MODULE_VERSION=$(grep 'dev.cel:cel' MODULE.bazel | cut -d '"' -f 2 | cut -d ':' -f 3)
+
+          if [ -z "$CEL_VERSION" ] || [ -z "$MODULE_VERSION" ]; then
+            echo "❌ Error: Could not extract one or both version strings."
+            exit 1
+          fi
+
+          echo "Version in publish/cel_version.bzl: ${CEL_VERSION}"
+          echo "Version in MODULE.bazel: ${MODULE_VERSION}"
+
+          if [ "$CEL_VERSION" != "$MODULE_VERSION" ]; then
+            echo "❌ Error: Version mismatch between files!"
+            exit 1
+          fi
+
+          echo "✅ Versions match."
+      - name: Run Conformance Maven Test on Version Change
+        if: steps.changed_file.outputs.any_changed == 'true'
+        run: bazelisk test //conformance/src/test/java/dev/cel/conformance:conformance_maven --test_output=errors
+      # -- End of Maven Conformance Tests --
+
       - name: Unwanted Dependencies
         run: .github/workflows/unwanted_deps.sh
       - run: echo "🍏 This job's status is ${{ job.status }}."

MODULE.bazel

@@ -18,15 +18,16 @@ module(
 
 bazel_dep(name = "bazel_skylib", version = "1.7.1")
 bazel_dep(name = "rules_jvm_external", version = "6.7")
-bazel_dep(name = "protobuf", version = "29.3", repo_name = "com_google_protobuf") # see https://github.com/bazelbuild/rules_android/issues/373
+bazel_dep(name = "protobuf", version = "29.3", repo_name = "com_google_protobuf")  # see https://github.com/bazelbuild/rules_android/issues/373
 bazel_dep(name = "googleapis", version = "0.0.0-20241220-5e258e33.bcr.1", repo_name = "com_google_googleapis")
 bazel_dep(name = "rules_pkg", version = "1.0.1")
 bazel_dep(name = "rules_license", version = "1.0.0")
 bazel_dep(name = "rules_proto", version = "7.1.0")
 bazel_dep(name = "rules_java", version = "8.12.0")
 bazel_dep(name = "rules_android", version = "0.6.4")
+bazel_dep(name = "rules_shell", version = "0.5.1")
 bazel_dep(name = "googleapis-java", version = "1.0.0")
-bazel_dep(name = "cel-spec", repo_name = "cel_spec", version = "0.24.0")
+bazel_dep(name = "cel-spec", version = "0.24.0", repo_name = "cel_spec")
 
 switched_rules = use_extension("@com_google_googleapis//:extensions.bzl", "switched_rules")
 switched_rules.use_languages(java = True)
@@ -35,14 +36,15 @@ use_repo(switched_rules, "com_google_googleapis_imports")
 maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
 
 GUAVA_VERSION = "33.4.8"
+
 TRUTH_VERSION = "1.4.4"
 
 # Compile only artifacts
 [
     maven.artifact(
-        neverlink = True,
         artifact = artifact,
         group = group,
+        neverlink = True,
         version = version,
     )
     for group, artifact, version in [coord.split(":") for coord in [
@@ -68,7 +70,6 @@ TRUTH_VERSION = "1.4.4"
         "com.google.truth.extensions:truth-proto-extension:" + TRUTH_VERSION,
         "com.google.truth.extensions:truth-liteproto-extension:" + TRUTH_VERSION,
         "com.google.truth:truth:" + TRUTH_VERSION,
-
     ]]
 ]
 
@@ -94,7 +95,6 @@ maven.install(
         "https://repo1.maven.org/maven2",
     ],
 )
-
 maven.install(
     name = "maven_android",
     # keep sorted
@@ -108,7 +108,18 @@ maven.install(
     ],
 )
 
-use_repo(maven, "maven", "maven_android")
+# Conformance test only
+
+maven.install(
+    name = "maven_conformance",
+    artifacts = ["dev.cel:cel:0.11.0-SNAPSHOT"],
+    repositories = [
+        "https://maven.google.com",
+        "https://repo1.maven.org/maven2",
+        "https://central.sonatype.com/repository/maven-snapshots/",
+    ],
+)
+use_repo(maven, "maven", "maven_android", "maven_conformance")
 
 non_module_dependencies = use_extension("//:repositories.bzl", "non_module_dependencies")
 use_repo(non_module_dependencies, "antlr4_jar")

compiler/tools/compile_cel.bzl

@@ -7,7 +7,7 @@
 #      https://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,
+# distributed under the License is distributed on an "AS Istrip_end_and_replaceS" 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.

conformance/src/test/java/dev/cel/conformance/BUILD.bazel

@@ -1,5 +1,5 @@
 load("@rules_java//java:defs.bzl", "java_library")
-load("//conformance/src/test/java/dev/cel/conformance:conformance_test.bzl", "conformance_test")
+load("//conformance/src/test/java/dev/cel/conformance:conformance_test.bzl", "MODE", "conformance_test")
 
 package(default_applicable_licenses = [
     "//:license",
@@ -40,6 +40,27 @@ java_library(
     ],
 )
 
+MAVEN_JAR_DEPS = ["@maven_conformance//:dev_cel_cel"]
+
+java_library(
+    name = "run_maven_jar",
+    testonly = True,
+    srcs = glob(["*.java"]),
+    tags = ["conformance_maven"],
+    deps = MAVEN_JAR_DEPS + [
+        "//:java_truth",
+        "//testing:expr_value_utils",
+        "@cel_spec//proto/cel/expr:expr_java_proto",
+        "@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
+        "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
+        "@cel_spec//proto/cel/expr/conformance/test:simple_java_proto",
+        "@maven//:com_google_guava_guava",
+        "@maven//:com_google_protobuf_protobuf_java",
+        "@maven//:com_google_truth_extensions_truth_proto_extension",
+        "@maven//:junit_junit",
+    ],
+)
+
 _ALL_TESTS = [
     "@cel_spec//tests/simple:testdata/basic.textproto",
     "@cel_spec//tests/simple:testdata/bindings_ext.textproto",
@@ -131,13 +152,19 @@ _TESTS_TO_SKIP = [
 
 conformance_test(
     name = "conformance",
-    dashboard = False,
     data = _ALL_TESTS,
     skip_tests = _TESTS_TO_SKIP,
 )
 
+conformance_test(
+    name = "conformance_maven",
+    data = _ALL_TESTS,
+    mode = MODE.MAVEN_TEST,
+    skip_tests = _TESTS_TO_SKIP,
+)
+
 conformance_test(
     name = "conformance_dashboard",
-    dashboard = True,
     data = _ALL_TESTS,
+    mode = MODE.DASHBOARD,
 )

conformance/src/test/java/dev/cel/conformance/ConformanceTest.java

@@ -61,7 +61,7 @@ public final class ConformanceTest extends Statement {
           .enableQuotedIdentifierSyntax(true)
           .build();
 
-  private static final CelParser PARSER_WITH_MACROS =
+  private static final CelParser PARSER =
       CelParserFactory.standardCelParserBuilder()
           .setOptions(OPTIONS)
           .addLibraries(
@@ -72,25 +72,12 @@ public final class ConformanceTest extends Statement {
               CelExtensions.sets(OPTIONS),
               CelExtensions.strings(),
               CelOptionalLibrary.INSTANCE)
-          .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
-          .build();
-
-  private static final CelParser PARSER_WITHOUT_MACROS =
-      CelParserFactory.standardCelParserBuilder()
-          .setOptions(OPTIONS)
-          .addLibraries(
-              CelExtensions.bindings(),
-              CelExtensions.encoders(),
-              CelExtensions.math(OPTIONS),
-              CelExtensions.protos(),
-              CelExtensions.sets(OPTIONS),
-              CelExtensions.strings(),
-              CelOptionalLibrary.INSTANCE)
-          .setStandardMacros()
           .build();
 
   private static CelParser getParser(SimpleTest test) {
-    return test.getDisableMacros() ? PARSER_WITHOUT_MACROS : PARSER_WITH_MACROS;
+    return test.getDisableMacros()
+        ? PARSER
+        : PARSER.toParserBuilder().setStandardMacros(CelStandardMacro.STANDARD_MACROS).build();
   }
 
   private static CelChecker getChecker(SimpleTest test) throws Exception {

conformance/src/test/java/dev/cel/conformance/conformance_test.bzl

@@ -43,8 +43,29 @@ def _conformance_test_args(data, skip_tests):
     args.append("-Ddev.cel.conformance.ConformanceTests.tests={}".format(",".join(["$(location " + test + ")" for test in data])))
     return args
 
-def conformance_test(name, data, dashboard, skip_tests = []):
-    if dashboard:
+MODE = struct(
+    # Standard test execution against HEAD
+    TEST = "test",
+    # Executes conformance test against published jar in maven central
+    MAVEN_TEST = "maven_test",
+    # Dashboard mode
+    DASHBOARD = "dashboard",
+)
+
+def conformance_test(name, data, mode = MODE.TEST, skip_tests = []):
+    """Executes conformance tests
+
+    Args:
+       name: unique label for the java_test
+       data: A list of test data files
+       mode: An enum that determines the test configuration.
+           - `MODE.TEST` (default): Runs the conformance tests
+           - `MODE.DASHBOARD`: Runs the conformance tests for displaying on dashboard.
+           - `MODE.MAVEN_TEST`: Runs the conformance tests against published JAR in maven central.
+       skip_tests: A list of strings, where each string is the name of a test file to
+                   exclude from the run.
+    """
+    if mode == MODE.DASHBOARD:
         java_test(
             name = "_" + name,
             jvm_flags = _conformance_test_args(data, skip_tests),
@@ -57,6 +78,7 @@ def conformance_test(name, data, dashboard, skip_tests = []):
                 "notap",
             ],
         )
+
         native.sh_test(
             name = name,
             size = "small",
@@ -69,7 +91,7 @@ def conformance_test(name, data, dashboard, skip_tests = []):
                 "notap",
             ],
         )
-    else:
+    elif mode == MODE.TEST:
         java_test(
             name = name,
             jvm_flags = _conformance_test_args(data, skip_tests),
@@ -78,3 +100,15 @@ def conformance_test(name, data, dashboard, skip_tests = []):
             test_class = "dev.cel.conformance.ConformanceTests",
             runtime_deps = ["//conformance/src/test/java/dev/cel/conformance:run"],
         )
+    elif mode == MODE.MAVEN_TEST:
+        java_test(
+            name = name,
+            jvm_flags = _conformance_test_args(data, skip_tests),
+            data = data,
+            size = "small",
+            test_class = "dev.cel.conformance.ConformanceTests",
+            tags = ["conformance_maven"],
+            runtime_deps = ["//conformance/src/test/java/dev/cel/conformance:run_maven_jar"],
+        )
+    else:
+        fail("Unknown mode specified: %s." % mode)