fix(core): test and fix Profile.from_config_file_and_env (#54)

Author: quantumsheep

scaleway-core/scaleway_core/profile/profile.py

@@ -85,18 +85,15 @@ class ProfileConfig:
 
 @dataclass
 class Profile(ProfileDefaults, ProfileConfig):
-    @classmethod
-    def merge(cls: Type[ProfileSelf], other: ProfileSelf) -> ProfileSelf:
+    def merge(self, other: Profile) -> None:
         """
-        Create a new profile by merging the current profile with another one.
+        Merge the current profile with another one.
         """
-        fields = dataclasses.fields(Profile)
-        merged = {}
-
-        for field in fields:
-            merged[field.name] = getattr(cls, field.name) or getattr(other, field.name)
+        for field in dataclasses.fields(Profile):
+            current_value = getattr(self, field.name)
 
-        return cls(**merged)
+            if current_value is None:
+                setattr(self, field.name, getattr(other, field.name))
 
     @classmethod
     def from_env(cls: Type[ProfileSelf]) -> ProfileSelf:
@@ -192,7 +189,8 @@ def from_config_file_and_env(
 
         try:
             a = cls.from_config_file(filepath, profile_name)
-            return profile.merge(a)
+            profile.merge(a)
         except Exception as e:
             print(e)
-            return profile
+
+        return profile

scaleway-core/tests/test_profile_env.py

@@ -6,7 +6,6 @@
 from unittest import mock
 
 import utils
-
 from scaleway_core.profile import Profile
 
 logger = logging.getLogger()

scaleway-core/tests/test_profile_file.py

@@ -4,9 +4,9 @@
 import tempfile
 import unittest
 import uuid
+from unittest import mock
 
 import utils
-
 from scaleway_core.profile import Profile
 
 logger = logging.getLogger()
@@ -65,3 +65,13 @@ def test_load_profile_from_config_file(self) -> None:
     def test_load_profile_from_config_file_with_profile(self) -> None:
         profile = Profile.from_config_file(self.profile_file_name, "demo")
         self.assertEqual(profile, self.demo_profile_config)
+
+    def test_load_profile_from_config_file_and_env(self) -> None:
+        with mock.patch.dict(
+            os.environ,
+            {
+                "SCW_SECRET_KEY": "11111111-1111-1111-1111-111111111111",
+            },
+        ):
+            profile = Profile.from_config_file_and_env(filepath=self.profile_file_name)
+            self.assertEqual(profile.secret_key, "11111111-1111-1111-1111-111111111111")