fix import issue _typeshed and improve test

Author: Laure-di

scaleway-core/scaleway_core/utils/resolve_one_of.py

@@ -1,9 +1,13 @@
 from __future__ import annotations
 from collections.abc import Callable
-from scaleway_core.profile.profile import ProfileDefaults
 from dataclasses import dataclass
 from typing import Any, Dict, Generic, List, Optional, TypeVar
-from _typeshed import SupportsKeysAndGetItem
+
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from _typeshed import SupportsKeysAndGetItem
+
 
 T = TypeVar("T")
 
@@ -19,6 +23,12 @@ class OneOfPossibility(Generic[T]):
 def resolve_one_of(
     possibilities: List[OneOfPossibility[Any]], is_required: bool = False
 ) -> SupportsKeysAndGetItem[str, Any]:
+    """
+    Resolves the ideal parameter and value amongst an optional list.
+    Uses marshal_func if provided.
+    """
+
+    # Try to resolve using non-None value
     for possibility in possibilities:
         if possibility.value is not None:
             if possibility.marshal_func is not None:
@@ -32,15 +42,20 @@ def resolve_one_of(
     for possibility in possibilities:
         if possibility.default is not None:
             if possibility.marshal_func is not None:
-                raise ValueError(
-                    f"{possibility.param} is missing a required value for marshal_func"
-                )
+                # When no actual value, call with None as value
+                return {
+                    possibility.param: possibility.marshal_func(
+                        None, possibility.default
+                    )
+                }
             return {possibility.param: possibility.default}
 
+    # If required but unresolved, raise an error
     if is_required:
         possibilities_keys = " or ".join(
             [possibility.param for possibility in possibilities]
         )
         raise ValueError(f"one of ${possibilities_keys} must be present")
 
+    # Else, return empty dict
     return {}

scaleway/tests/test_vpc.py

@@ -13,7 +13,7 @@
 class TestScalewayVPCV2(unittest.TestCase):
     @classmethod
     def setUpClass(self):
-        self.client = Client.from_env()
+        self.client = Client.from_config_file_and_env()
         self.vpcAPI = VpcV2API(self.client)
         self.project_id = self.client.default_project_id
         self.region = region