Merge.

world-federation-of-advertisers · Jan 17, 2025 · 695d6ff · 695d6ff
2 parents 7a97415 + b3c547c
commit 695d6ff
Show file tree

Hide file tree

Showing 144 changed files with 15,649 additions and 1,830 deletions.
diff --git a/.github/workflows/configure-reporting-v2.yml b/.github/workflows/configure-reporting-v2.yml
@@ -79,6 +79,7 @@ jobs:
     - name: Write ~/.bazelrc
       env:
         IMAGE_TAG: ${{ inputs.image-tag }}
+        SPANNER_INSTANCE: ${{ vars.SPANNER_INSTANCE }}
         POSTGRES_INSTANCE: ${{ vars.POSTGRES_INSTANCE }}
         GCLOUD_REGION: ${{ vars.GCLOUD_REGION }}
         KINGDOM_PUBLIC_API_TARGET: ${{ vars.KINGDOM_PUBLIC_API_TARGET }}
@@ -89,6 +90,7 @@ jobs:
         common --config=ghcr
         build --define "image_tag=$IMAGE_TAG"
         build --define "google_cloud_project=$GCLOUD_PROJECT"
+        build --define "spanner_instance=$SPANNER_INSTANCE"
         build --define "postgres_instance=$POSTGRES_INSTANCE"
         build --define "postgres_region=$GCLOUD_REGION"
         build --define "kingdom_public_api_target=$KINGDOM_PUBLIC_API_TARGET"

diff --git a/.github/workflows/update-cmms.yml b/.github/workflows/update-cmms.yml
@@ -141,6 +141,7 @@ jobs:
       update-worker1-duchy,
       update-worker2-duchy,
       update-simulators,
+      update-reporting-v2,
     ]
     uses: ./.github/workflows/run-k8s-tests.yml
     secrets: inherit

diff --git a/CPPLINT.cfg b/CPPLINT.cfg
@@ -1,3 +1,3 @@
 set noparent
 root=.
-filter=-runtime/references
+filter=-runtime/references,-whitespace/indent_namespace
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -3,7 +3,7 @@ module(
     repo_name = "wfa_measurement_system",
 )
 
-BORINGSSL_VERSION = "0.0.0-20230215-5c22014"
+BORINGSSL_VERSION = "0.20241209.0"
 
 # Version of Apache Beam.
 #
@@ -22,7 +22,7 @@ K8S_CLIENT_VERSION = "21.0.1"
 # See https://github.com/bazelbuild/bazel/discussions/23075.
 bazel_dep(
     name = "rules_kotlin_jvm",
-    version = "0.4.0",
+    version = "0.5.0",
     repo_name = "wfa_rules_kotlin_jvm",
 )
 bazel_dep(
@@ -37,7 +37,7 @@ bazel_dep(
 )
 bazel_dep(
     name = "common-jvm",
-    version = "0.97.0",
+    version = "0.99.1",
     repo_name = "wfa_common_jvm",
 )
 bazel_dep(
@@ -57,12 +57,12 @@ bazel_dep(
 )
 bazel_dep(
     name = "any-sketch",
-    version = "0.9.1",
+    version = "0.10.0",
     repo_name = "any_sketch",
 )
 bazel_dep(
     name = "any-sketch-java",
-    version = "0.7.0",
+    version = "0.8.0",
     repo_name = "any_sketch_java",
 )
 bazel_dep(
@@ -77,7 +77,7 @@ bazel_dep(
 )
 bazel_dep(
     name = "virtual-people-common",
-    version = "0.4.0",
+    version = "0.5.0",
     repo_name = "wfa_virtual_people_common",
 )
 bazel_dep(
@@ -90,6 +90,11 @@ bazel_dep(
     version = "1.5.23",
     repo_name = "cloud_spanner_emulator",
 )
+bazel_dep(
+    name = "shell-encryption",
+    version = "0.0.0-20241214-b381c4e",
+    repo_name = "com_github_google_shell",
+)
 
 # --- Bazel Central Registry modules. ---
 
@@ -103,11 +108,11 @@ bazel_dep(
 )
 bazel_dep(
     name = "rules_proto",
-    version = "6.0.2",
+    version = "7.0.2",
 )
 bazel_dep(
     name = "rules_cc",
-    version = "0.0.9",
+    version = "0.1.0",
 )
 bazel_dep(
     name = "rules_pkg",
@@ -125,15 +130,15 @@ bazel_dep(
 )
 bazel_dep(
     name = "rules_java",
-    version = "7.11.1",
+    version = "8.6.2",
 )
 bazel_dep(
     name = "rules_jvm_external",
-    version = "6.4",
+    version = "6.6",
 )
 bazel_dep(
     name = "rules_python",
-    version = "0.31.0",
+    version = "0.33.2",
 )
 bazel_dep(
     name = "protobuf",
@@ -162,21 +167,21 @@ bazel_dep(
 )
 bazel_dep(
     name = "abseil-cpp",
-    version = "20230802.1",
+    version = "20240722.0.bcr.2",
     repo_name = "com_google_absl",
 )
 bazel_dep(
     name = "googletest",
-    version = "1.14.0.bcr.1",
+    version = "1.15.2",
     repo_name = "com_google_googletest",
 )
 bazel_dep(
-    name = "glog",  # For shell-encryption.
-    version = "0.6.0",
+    name = "glog",
+    version = "0.7.1",
     repo_name = "com_github_google_glog",
 )
 bazel_dep(
-    name = "boringssl",  # For shell-encryption.
+    name = "boringssl",
     version = BORINGSSL_VERSION,
 )
 bazel_dep(
@@ -188,6 +193,10 @@ bazel_dep(
     version = "0.0.0-20240606-973b6f0",
     repo_name = "com_google_riegeli",
 )
+bazel_dep(
+    name = "tink_cc",
+    version = "2.1.3",
+)
 
 maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
 maven.artifact(
@@ -208,6 +217,7 @@ maven.install(
         "com.google.crypto.tink:tink-awskms:1.9.1",
         "com.google.crypto.tink:tink-gcpkms:1.9.0",
         "com.squareup.okhttp3:okhttp:4.12.0",
+        "info.picocli:picocli:4.7.6",
         "io.opentelemetry.semconv:opentelemetry-semconv:1.22.0-alpha",
         "io.kubernetes:client-java:" + K8S_CLIENT_VERSION,
         "io.kubernetes:client-java-extended:" + K8S_CLIENT_VERSION,
@@ -316,20 +326,6 @@ http_archive(
     url = "https://github.com/google/private-membership/archive/84e45669f7357bffcdafbc1b0cc26e72512808ce.zip",
 )
 
-http_archive(
-    name = "com_github_google_shell",
-    sha256 = "807d42caed3056cea63b9048a2fd69122c071740d43c9de546cc0fabded87a5c",
-    strip_prefix = "shell-encryption-507781e129a03f8178c9716d79163fae23d34b6a",
-    url = "https://github.com/google/shell-encryption/archive/507781e129a03f8178c9716d79163fae23d34b6a.tar.gz",
-)
-
-http_archive(
-    name = "tink_cc",
-    sha256 = "c2c252b09969576965fd4610d933682a71890d90f01a96c418fcbcf808edf513",
-    strip_prefix = "tink-1.7.0/cc",
-    url = "https://github.com/google/tink/archive/refs/tags/v1.7.0.tar.gz",
-)
-
 http_archive(
     name = "uk_pilot_event_templates",
     sha256 = "e5d9cb0f6087b6286f5bfeb053a968870c88c27fa7a5dc40055ae7681dad9b2c",