Merge pull request #1740 from globus/v2.32.1

Bump versions and changelog for hotfix v2.32.1

compute_endpoint/globus_compute_endpoint/endpoint/config/__init__.py

@@ -6,6 +6,7 @@
 )
 from .model import (  # noqa: F401
     BaseConfigModel,
+    BaseEndpointConfigModel,
     ManagerEndpointConfigModel,
     UserEndpointConfigModel,
 )

compute_endpoint/globus_compute_endpoint/endpoint/config/model.py

@@ -44,16 +44,8 @@ def inner(cls, model: t.Optional[BaseModel]):
 
 
 class BaseConfigModel(BaseModel):
-    multi_user: t.Optional[bool]
-    display_name: t.Optional[str]
-    allowed_functions: t.Optional[t.List[uuid.UUID]]
-    authentication_policy: t.Optional[uuid.UUID]
-    subscription_id: t.Optional[uuid.UUID]
-    amqp_port: t.Optional[int]
-    heartbeat_period: t.Optional[int]
-    environment: t.Optional[str]
-    local_compute_services: t.Optional[bool]
-    debug: t.Optional[bool]
+    class Config:
+        extra = "allow"
 
 
 class AddressModel(BaseConfigModel):
@@ -81,9 +73,6 @@ class ChannelModel(BaseConfigModel):
 
 
 class ProviderModel(BaseConfigModel):
-    class Config:
-        extra = "allow"
-
     type: str
     channel: t.Optional[ChannelModel]
     launcher: t.Optional[LauncherModel]
@@ -154,7 +143,23 @@ def _validate_provider_container_compatibility(cls, values: dict):
         return values
 
 
-class UserEndpointConfigModel(BaseConfigModel):
+class BaseEndpointConfigModel(BaseModel):
+    multi_user: t.Optional[bool]
+    display_name: t.Optional[str]
+    allowed_functions: t.Optional[t.List[uuid.UUID]]
+    authentication_policy: t.Optional[uuid.UUID]
+    subscription_id: t.Optional[uuid.UUID]
+    amqp_port: t.Optional[int]
+    heartbeat_period: t.Optional[int]
+    environment: t.Optional[str]
+    local_compute_services: t.Optional[bool]
+    debug: t.Optional[bool]
+
+    class Config:
+        extra = "forbid"
+
+
+class UserEndpointConfigModel(BaseEndpointConfigModel):
     engine: EngineModel
     heartbeat_threshold: t.Optional[int]
     idle_heartbeats_soft: t.Optional[int]
@@ -168,9 +173,6 @@ class UserEndpointConfigModel(BaseConfigModel):
 
     _validate_engine = _validate_params("engine")
 
-    class Config:
-        extra = "forbid"
-
     def dict(self, *args, **kwargs):
         # Slight modification is needed here since we still
         # store the engine/executor in a list named executors
@@ -181,12 +183,9 @@ def dict(self, *args, **kwargs):
         return ret
 
 
-class ManagerEndpointConfigModel(BaseConfigModel):
+class ManagerEndpointConfigModel(BaseEndpointConfigModel):
     public: t.Optional[bool]
     identity_mapping_config_path: t.Optional[FilePath]
     force_mu_allow_same_user: t.Optional[bool]
     mu_child_ep_grace_period_s: t.Optional[float]
     pam: t.Optional[PamConfiguration]
-
-    class Config:
-        extra = "forbid"

compute_endpoint/globus_compute_endpoint/endpoint/config/utils.py

@@ -90,10 +90,12 @@ def load_config_yaml(config_str: str) -> UserEndpointConfig | ManagerEndpointCon
     try:
         ConfigClass: type[UserEndpointConfig | ManagerEndpointConfig]
         if is_templatable:
-            from . import BaseConfigModel, ManagerEndpointConfigModel
+            from . import BaseEndpointConfigModel, ManagerEndpointConfigModel
 
             ConfigClass = ManagerEndpointConfig
-            config_schema: BaseConfigModel = ManagerEndpointConfigModel(**config_dict)
+            config_schema: BaseEndpointConfigModel = ManagerEndpointConfigModel(
+                **config_dict
+            )
         else:
             from . import UserEndpointConfigModel
 

compute_endpoint/globus_compute_endpoint/version.py

@@ -1,6 +1,6 @@
 # single source of truth for package version,
 # see https://packaging.python.org/en/latest/single_source_version/
-__version__ = "2.32.0"
+__version__ = "2.32.1"
 
 # TODO: remove after a `globus-compute-sdk` release
 # this is needed because it's imported by `globus-compute-sdk` to do the version check

compute_endpoint/setup.py

@@ -6,7 +6,7 @@
 REQUIRES = [
     "requests>=2.31.0,<3",
     "globus-sdk",  # version will be bounded by `globus-compute-sdk`
-    "globus-compute-sdk==2.32.0",
+    "globus-compute-sdk==2.32.1",
     "globus-compute-common==0.5.0",
     "globus-identity-mapping==0.4.0",
     # table printing used in list-endpoints

compute_endpoint/tests/unit/test_endpoint_config.py

@@ -229,3 +229,20 @@ def test_managerconfig_repr_nondefault_kwargs(
         repr_c = repr(ManagerEndpointConfig(**{kw: val}))
 
     assert f"{kw}={repr(val)}" in repr_c
+
+
+def test_engine_model_objects_allow_extra():
+    config_dict = {
+        "engine": {
+            "type": "GlobusComputeEngine",
+            "address": {
+                "type": "address_by_interface",
+                "ifname": "lo",  # Not specified in model
+            },
+            "provider": {
+                "type": "LocalProvider",
+                "max_blocks": 2,  # Not specified in model
+            },
+        }
+    }
+    UserEndpointConfigModel(**config_dict)

compute_sdk/globus_compute_sdk/version.py

@@ -3,7 +3,7 @@
 
 # single source of truth for package version,
 # see https://packaging.python.org/en/latest/single_source_version/
-__version__ = "2.32.0"
+__version__ = "2.32.1"
 
 
 def compare_versions(

docs/changelog.rst

@@ -3,6 +3,17 @@ Changelog
 
 .. scriv-insert-here
 
+.. _changelog-2.32.1:
+
+globus-compute-sdk & globus-compute-endpoint v2.32.1
+----------------------------------------------------
+
+Bug Fixes
+^^^^^^^^^
+
+- Fixed an issue where valid endpoint configuration variables were ignored,
+  causing spurious validation errors.
+
 .. _changelog-2.32.0:
 
 globus-compute-sdk & globus-compute-endpoint v2.32.0