fix: address sixth round of PR review feedback

- Validate integration.id/name/version/description are strings
- Catch TypeError in pkg_version.Version() for non-string versions
- Swap validation order: check catalogs type before emptiness
- Isolate TestActiveCatalogs from user ~/.specify/ via monkeypatch

Author: mnriem

src/specify_cli/integrations/catalog.py

@@ -111,16 +111,16 @@ def _load_catalog_config(
                 f"Invalid catalog config {config_path}: expected a YAML mapping at the root"
             )
         catalogs_data = data.get("catalogs", [])
-        if not catalogs_data:
-            raise IntegrationCatalogError(
-                f"Catalog config {config_path} exists but contains no 'catalogs' entries. "
-                f"Remove the file to use built-in defaults, or add valid catalog entries."
-            )
         if not isinstance(catalogs_data, list):
             raise IntegrationCatalogError(
                 f"Invalid catalog config: 'catalogs' must be a list, "
                 f"got {type(catalogs_data).__name__}"
             )
+        if not catalogs_data:
+            raise IntegrationCatalogError(
+                f"Catalog config {config_path} exists but contains no 'catalogs' entries. "
+                f"Remove the file to use built-in defaults, or add valid catalog entries."
+            )
         entries: List[IntegrationCatalogEntry] = []
         skipped: List[int] = []
         for idx, item in enumerate(catalogs_data):
@@ -475,6 +475,10 @@ def _validate(self) -> None:
                 raise IntegrationDescriptorError(
                     f"Missing integration.{field}"
                 )
+            if not isinstance(integ[field], str):
+                raise IntegrationDescriptorError(
+                    f"integration.{field} must be a string, got {type(integ[field]).__name__}"
+                )
 
         if not re.match(r"^[a-z0-9-]+$", integ["id"]):
             raise IntegrationDescriptorError(
@@ -484,7 +488,7 @@ def _validate(self) -> None:
 
         try:
             pkg_version.Version(integ["version"])
-        except pkg_version.InvalidVersion:
+        except (pkg_version.InvalidVersion, TypeError):
             raise IntegrationDescriptorError(
                 f"Invalid version '{integ['version']}'"
             )

tests/integrations/test_integration_catalog.py

@@ -73,7 +73,9 @@ def test_missing_host_rejected(self):
 
 
 class TestActiveCatalogs:
-    def test_defaults_when_no_config(self, tmp_path):
+    def test_defaults_when_no_config(self, tmp_path, monkeypatch):
+        monkeypatch.setenv("HOME", str(tmp_path))
+        monkeypatch.setenv("USERPROFILE", str(tmp_path))
         (tmp_path / ".specify").mkdir()
         cat = IntegrationCatalog(tmp_path)
         active = cat.get_active_catalogs()