Merge pull request #513 from sunbeam-labs/512-config-modify-overwriting-too-much

Config modify doesn't overwrite more than it should

Author: Ulthran

sunbeam/project/sunbeam_config.py

@@ -97,7 +97,15 @@ def modify(self, change_str: str):
         change_str should be a string in the format "root_key: {sub_key: value}"
         """
         changes = yaml.safe_load(change_str)
-        self.config.update(changes)
+        for k, v in changes.items():
+            if k not in self.config:
+                self.config[k] = v
+            else:
+                if isinstance(v, dict):
+                    for sub_k, sub_v in v.items():
+                        self.config[k][sub_k] = sub_v
+                else:
+                    self.config[k] = v
 
     @staticmethod
     def get_extensions(extensions_dir: Path = None) -> dict[str, Path]:

tests/unit/test_sunbeam_config.py

@@ -124,3 +124,37 @@ def test_fill_missing_doesnt_overwrite(test_extension):
     sc.fill_missing(ext_dir.parent)
 
     assert sc.config["sbx_test_extension"]["bloop"] == "not_blorp"
+
+
+def test_modify(tmp_path):
+    config = {
+        "all": {
+            "root": "/path/to/root",
+            "version": __version__,
+        },
+        "sbx_test_extension": {
+            "bloop": "blorp",
+        },
+    }
+    sc = SunbeamConfig(config)
+
+    sc.modify("sbx_test_extension: {bloop: 'new_value'}")
+    assert sc.config["sbx_test_extension"]["bloop"] == "new_value"
+
+
+def test_modify_one_of_many(tmp_path):
+    config = {
+        "all": {
+            "root": "/path/to/root",
+            "version": __version__,
+        },
+        "sbx_test_extension": {
+            "bloop": "blorp",
+            "blap": "blip",
+        },
+    }
+    sc = SunbeamConfig(config)
+
+    sc.modify("sbx_test_extension: {bloop: 'new_value'}")
+    assert sc.config["sbx_test_extension"]["bloop"] == "new_value"
+    assert sc.config["sbx_test_extension"]["blap"] == "blip"