From 828176444a30f2d074ac8dfbe5a80e7a371581a4 Mon Sep 17 00:00:00 2001 From: Ziyan Huang Date: Mon, 15 Aug 2022 17:10:23 -0700 Subject: [PATCH] Remove partial dependency in PCSContainerService (#1428) Summary: Pull Request resolved: https://github.com/facebookresearch/fbpcs/pull/1428 X-link: https://github.com/facebookresearch/fbpcp/pull/405 We decided that validate_container_definitions should not be a public API in container service. This diff is to remove partial dependency in PCSContainerService The validation logic has been moved in D38629555, to ensure the backward compatibility, we firstly changed the function body to ``pass``. Differential Revision: D38604420 fbshipit-source-id: 74e63e0bd150e398b1a427fe35339b9ab0de6b39 --- fbpcs/CHANGELOG.md | 2 +- fbpcs/common/service/pcs_container_service.py | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/fbpcs/CHANGELOG.md b/fbpcs/CHANGELOG.md index c9776b728..ff037c45f 100644 --- a/fbpcs/CHANGELOG.md +++ b/fbpcs/CHANGELOG.md @@ -17,7 +17,7 @@ Types of changes ### Added ### Changed - + - Mark validate_container_definition as deprecated in PCSContainerService since it is no longer a public method in ContainerService in fbpcp ### Removed ## [1.10.0] - 2022-08-12 diff --git a/fbpcs/common/service/pcs_container_service.py b/fbpcs/common/service/pcs_container_service.py index 25b04274f..ce41bd4aa 100644 --- a/fbpcs/common/service/pcs_container_service.py +++ b/fbpcs/common/service/pcs_container_service.py @@ -15,6 +15,8 @@ from fbpcs.common.entity.pcs_container_instance import PCSContainerInstance from fbpcs.experimental.cloud_logs.log_retriever import CloudProvider, LogRetriever +from fbpcs.private_computation.service.utils import deprecated + class PCSContainerService(ContainerService): def __init__(self, inner_container_service: ContainerService) -> None: @@ -80,7 +82,8 @@ def cancel_instances(self, instance_ids: List[str]) -> List[Optional[PcpError]]: def get_current_instances_count(self) -> int: return self.inner_container_service.get_current_instances_count() + @deprecated( + "validate_container_definition is no longer a public method in container service" + ) def validate_container_definition(self, container_definition: str) -> None: - return self.inner_container_service.validate_container_definition( - container_definition - ) + pass