Release version v1.26.0-rc01

GitOrigin-RevId: 2a4f952b2cf273fa118f6182e23df197d1d5d209

Author: Privacy Sandbox Team

CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## [1.26.0](https://github.com/privacysandbox/coordinator-services-and-shared-libraries/compare/v1.25.0...v1.26.0) (2025-06-10)
+
+### Changes
+- INFRA
+  - [CA] Remove terraform version constraint in child modules
+- MPKGDS
+  - [AWS] Fix AWS assume role policy issue with multiple roles
+  - [GCP] Ignore changes to KeyDb DDL Terraform field
+- PBS
+  - [CA] Introduce docker compose binary
+  - [CA] Introduce test to verify one to one mapping between budget type and budget consumer
+  - [CA] Use docker-compose in PBS GCP Integration test
+
 ## [1.25.0](https://github.com/privacysandbox/coordinator-services-and-shared-libraries/compare/v1.24.0...v1.25.0) (2025-05-27)
 ### Important Note
 **[GCP]**

MODULE.bazel

@@ -216,6 +216,13 @@ http_file(
     urls = ["https://github.com/google/google-java-format/releases/download/v1.15.0/google-java-format-1.15.0-all-deps.jar"],
 )
 
+http_file(
+    name = "docker_compose",
+    downloaded_file_path = "docker-compose",
+    sha256 = "9040bd35b2cc0783ce6c5de491de7e52e24d4137dbfc5de8a524f718fc23556c",
+    url = "https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-x86_64",
+)
+
 go_sdk = use_extension("@io_bazel_rules_go//go:extensions.bzl", "go_sdk")
 go_sdk.download(version = "1.23.0")
 

build_defs/scp_dependencies.bzl

@@ -30,6 +30,7 @@ load("//build_defs/shared:bazel_rules_java.bzl", "bazel_rules_java")
 load("//build_defs/shared:bazel_rules_pkg.bzl", "bazel_rules_pkg")
 load("//build_defs/shared:bazel_rules_proto.bzl", "bazel_rules_proto")
 load("//build_defs/shared:bazel_rules_python.bzl", "bazel_rules_python")
+load("//build_defs/shared:docker_compose.bzl", "docker_compose")
 load("//build_defs/shared:enclaves_kmstools.bzl", "import_aws_nitro_enclaves_sdk_c")
 load("//build_defs/shared:golang.bzl", "go_deps")
 load("//build_defs/shared:google_api_core.bzl", "google_api_core")
@@ -61,6 +62,7 @@ def scp_dependencies(protobuf_version, protobuf_repo_hash):
     go_deps()
     google_cloud_sdk()
     google_java_format()
+    docker_compose()
     google_test()
     grpc()
     libpsl()

build_defs/shared/docker_compose.bzl

@@ -0,0 +1,27 @@
+# Copyright 2025 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.
+
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file")
+load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
+
+# docker-compose for managing docker containers in PBS integration test
+
+def docker_compose():
+    maybe(
+        http_file,
+        name = "docker_compose",
+        downloaded_file_path = "docker-compose",
+        sha256 = "9040bd35b2cc0783ce6c5de491de7e52e24d4137dbfc5de8a524f718fc23556c",
+        url = "https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-x86_64",
+    )

cc/core/test/utils/docker_helper/BUILD

@@ -16,6 +16,15 @@ load("@rules_cc//cc:defs.bzl", "cc_library", "cc_test")
 
 package(default_visibility = ["//cc:pbs_visibility"])
 
+# Copy the file in the test directory for simplier executable file path
+genrule(
+    name = "docker_compose_executable",
+    srcs = ["@docker_compose//file"],
+    outs = ["docker-compose"],
+    cmd = "cp $(location @docker_compose//file) $@",
+    tags = ["manual"],
+)
+
 cc_library(
     name = "docker_helper_lib",
     srcs = glob(
@@ -27,6 +36,9 @@ cc_library(
             "docker_helper_test.cc",
         ],
     ),
+    data = [
+        ":docker_compose_executable",
+    ],
     deps = [
         "@com_google_absl//absl/strings:str_format",
     ],

cc/core/test/utils/docker_helper/docker_helper.cc

@@ -26,11 +26,8 @@ using std::map;
 using std::runtime_error;
 using std::string;
 
-// localstack version is pinned so that tests are repeatable
-static constexpr char kLocalstackImage[] = "localstack/localstack:1.0.3";
-// gcloud SDK tool version is pinned so that tests are repeatable
-static constexpr char kGcpImage[] =
-    "gcr.io/google.com/cloudsdktool/google-cloud-cli:380.0.0-emulators";
+static constexpr absl::string_view kDockerComposeBinaryPath =
+    "cc/core/test/utils/docker_helper/docker-compose";
 
 namespace privacy_sandbox::pbs_common {
 string PortMapToSelf(string port) {
@@ -146,4 +143,8 @@ std::string GetIpAddress(const std::string& network_name,
   return result.substr(0, length);
 }
 
+int RunDockerComposeCmd(const std::string& args) {
+  return std::system(absl::StrCat(kDockerComposeBinaryPath, " ", args).c_str());
+}
+
 }  // namespace privacy_sandbox::pbs_common

cc/core/test/utils/docker_helper/docker_helper.h

@@ -63,4 +63,12 @@ std::string BuildStartContainerCmd(
 std::string GetIpAddress(const std::string& network_name,
                          const std::string& container_name);
 
+/**
+ * @brief Execute a docker-compose command
+ *
+ * @param args arguments to the docker-compose command
+ * @return the status code of the command execution
+ */
+int RunDockerComposeCmd(const std::string& args);
+
 }  // namespace privacy_sandbox::pbs_common

cc/core/test/utils/docker_helper/docker_helper_test.cc

@@ -79,4 +79,9 @@ TEST(DockerHelper, BuildStopContainerCmd) {
   EXPECT_EQ(BuildStopContainerCmd("container_name"),
             "docker rm -f container_name");
 }
+
+TEST(DockerHelper, TestDockerCompose) {
+  EXPECT_EQ(RunDockerComposeCmd("version"), 0);
+}
+
 }  // namespace privacy_sandbox::pbs_common

cc/pbs/front_end_service/src/front_end_utils.cc

@@ -659,7 +659,7 @@ ValidateAndGetBudgetType(const ConsumePrivacyBudgetRequest& request_proto) {
 
   using PrivacyBudgetKey = ConsumePrivacyBudgetRequest::PrivacyBudgetKey;
   PrivacyBudgetKey::BudgetType budget_type =
-      PrivacyBudgetKey::BUDGET_TYPE_BINARY_BUDGET;
+      PrivacyBudgetKey::BUDGET_TYPE_UNSPECIFIED;
 
   for (const auto& data_body : request_proto.data()) {
     for (const auto& key_body : data_body.keys()) {
@@ -670,7 +670,9 @@ ValidateAndGetBudgetType(const ConsumePrivacyBudgetRequest& request_proto) {
       }
 
       // All keys should have the same budget type.
-      if (budget_type != key_budget_type) {
+      if (budget_type == PrivacyBudgetKey::BUDGET_TYPE_UNSPECIFIED) {
+        budget_type = key_budget_type;
+      } else if (budget_type != key_budget_type) {
         SCP_INFO(kFrontEndUtils, kZeroUuid,
                  absl::StrFormat(
                      "All keys should have the same budget type. "
@@ -679,12 +681,13 @@ ValidateAndGetBudgetType(const ConsumePrivacyBudgetRequest& request_proto) {
                      PrivacyBudgetKey::BudgetType_Name(key_budget_type)));
         return FailureExecutionResult(SC_PBS_FRONT_END_SERVICE_INVALID_REQUEST);
       }
-      budget_type = key_budget_type;
     }
   }
 
   // Default is binary budget consumer
-  return budget_type;
+  return budget_type == PrivacyBudgetKey::BUDGET_TYPE_UNSPECIFIED
+             ? PrivacyBudgetKey::BUDGET_TYPE_BINARY_BUDGET
+             : budget_type;
 }
 
 ExecutionResult ParseCommonV2TransactionRequestProto(

cc/pbs/front_end_service/test/front_end_service_v2_test.cc

@@ -26,8 +26,8 @@
 #include "cc/core/async_executor/mock/mock_async_executor.h"
 #include "cc/core/config_provider/mock/mock_config_provider.h"
 #include "cc/core/interface/async_context.h"
-#include "cc/core/interface/async_executor_interface.h"
 #include "cc/core/interface/config_provider_interface.h"
+#include "cc/core/interface/errors.h"
 #include "cc/core/interface/http_server_interface.h"
 #include "cc/core/interface/http_types.h"
 #include "cc/core/telemetry/mock/in_memory_metric_router.h"
@@ -39,12 +39,15 @@
 #include "cc/pbs/interface/type_def.h"
 #include "cc/public/core/interface/errors.h"
 #include "cc/public/core/interface/execution_result.h"
+#include "google/protobuf/text_format.h"
 
 namespace privacy_sandbox::pbs {
 
 namespace {
+using ::privacy_sandbox::pbs::v1::ConsumePrivacyBudgetRequest;
 using ::privacy_sandbox::pbs_common::AsyncContext;
 using ::privacy_sandbox::pbs_common::ExecutionResult;
+using ::privacy_sandbox::pbs_common::ExecutionResultOr;
 using ::privacy_sandbox::pbs_common::HttpRequest;
 using ::privacy_sandbox::pbs_common::HttpResponse;
 }  // namespace
@@ -92,17 +95,20 @@ class FrontEndServiceV2Peer {
 
   ExecutionResult Init() { return front_end_service_v2_->Init(); }
 
+  ExecutionResultOr<std::unique_ptr<BudgetConsumer>> GetBudgetConsumer(
+      const ConsumePrivacyBudgetRequest& req) {
+    return front_end_service_v2_->GetBudgetConsumer(req);
+  }
+
  private:
   std::unique_ptr<FrontEndServiceV2> front_end_service_v2_;
 };
 
 namespace {
 
+using ::google::protobuf::TextFormat;
 using ::privacy_sandbox::pbs_common::AsyncContext;
-using ::privacy_sandbox::pbs_common::AsyncExecutorInterface;
 using ::privacy_sandbox::pbs_common::Byte;
-using ::privacy_sandbox::pbs_common::ConfigProviderInterface;
-using ::privacy_sandbox::pbs_common::ExecutionResultOr;
 using ::privacy_sandbox::pbs_common::FailureExecutionResult;
 using ::privacy_sandbox::pbs_common::GetErrorMessage;
 using ::privacy_sandbox::pbs_common::GetMetricPointData;
@@ -115,7 +121,6 @@ using ::privacy_sandbox::pbs_common::MockAsyncExecutor;
 using ::privacy_sandbox::pbs_common::MockConfigProvider;
 using ::privacy_sandbox::pbs_common::SuccessExecutionResult;
 using ::testing::_;
-using ::testing::Invoke;
 using ::testing::NiceMock;
 using ::testing::Return;
 using ::testing::UnorderedElementsAreArray;
@@ -126,7 +131,6 @@ constexpr absl::string_view kTransactionId =
 constexpr absl::string_view kTransactionSecret = "secret";
 constexpr absl::string_view kReportingOrigin = "https://fake.com";
 constexpr absl::string_view kClaimedIdentity = "https://origin.site.com";
-constexpr absl::string_view kClaimedIdentityInvalid = "123";
 constexpr absl::string_view kUserAgent = "aggregation-service/2.8.7";
 constexpr size_t k20191212DaysFromEpoch = 18242;
 constexpr size_t k20191012DaysFromEpoch = 18181;
@@ -1029,5 +1033,56 @@ TEST_P(FrontEndServiceV2LifecycleTest, TestGetTransactionStatusReturns404) {
       SC_PBS_FRONT_END_SERVICE_GET_TRANSACTION_STATUS_RETURNS_404_BY_DEFAULT);
 }
 
+TEST(TestOneToOneMappingBetBudgetTypeAndBudgetConsumer,
+     TestOneToOneMappingBetBudgetTypeAndBudgetConsumer) {
+  auto budget_consumption_helper =
+      std::make_unique<MockBudgetConsumptionHelper>();
+  FrontEndServiceV2PeerOptions options;
+  options.budget_consumption_helper = budget_consumption_helper.get();
+  auto front_end_service_v2_peer = MakeFrontEndServiceV2Peer(options);
+  auto execution_result = front_end_service_v2_peer->Init();
+  ASSERT_TRUE(execution_result)
+      << GetErrorMessage(execution_result.status_code);
+
+  using PrivacyBudgetKey = ConsumePrivacyBudgetRequest::PrivacyBudgetKey;
+  std::string proto_string = R"pb(
+    version: "2.0"
+    data {
+      reporting_origin: "http://a.fake.com"
+      keys { budget_type: BUDGET_TYPE_BINARY_BUDGET }
+    }
+  )pb";
+
+  ConsumePrivacyBudgetRequest req;
+  ASSERT_TRUE(TextFormat::ParseFromString(proto_string, &req));
+
+  absl::flat_hash_set<std::string> returned_consumer_types;
+  const google::protobuf::EnumDescriptor* enum_descriptor =
+      PrivacyBudgetKey::BudgetType_descriptor();
+
+  // Do not test BUDGET_TYPE_UNSPECIFIED
+  for (int i = 1; i < enum_descriptor->value_count(); ++i) {
+    const google::protobuf::EnumValueDescriptor* value_descriptor =
+        enum_descriptor->value(i);
+    PrivacyBudgetKey::BudgetType budget_type =
+        static_cast<PrivacyBudgetKey::BudgetType>(value_descriptor->number());
+
+    req.mutable_data()->at(0).mutable_keys()->at(0).set_budget_type(
+        budget_type);
+    auto budget_consumer = front_end_service_v2_peer->GetBudgetConsumer(req);
+    ASSERT_TRUE(budget_consumer.has_value())
+        << GetErrorMessage(budget_consumer.result().status_code);
+    ASSERT_NE(budget_consumer->get(), nullptr);
+
+    // Ignore warning about deferencing the pointer
+#pragma GCC diagnostic ignored "-Wpotentially-evaluated-expression"
+    std::string type_name = typeid(*budget_consumer->get()).name();
+
+    ASSERT_TRUE(returned_consumer_types.insert(type_name).second)
+        << "Duplicate consumer type returned for enum value " << budget_type
+        << ". Type: " << type_name << " was already returned by another enum.";
+  }
+}
+
 }  // namespace
 }  // namespace privacy_sandbox::pbs