fix: P2 issue 25

Signed-off-by: habeck <habeck@us.ibm.com>

Author: tedhabeck

cpex/tools/catalog.py

@@ -50,11 +50,11 @@ class PluginCatalog:
     def __init__(self) -> None:
         """Utility for creating the catalog from one or more monorepos."""
         settings = get_catalog_settings()
-        self.github_api = os.environ.get("PLUGINS_GITHUB_API", settings.PLUGINS_GITHUB_API)
-        self.github_token = os.environ.get("PLUGINS_GITHUB_TOKEN", None)
-        self.monorepos = os.environ.get("PLUGINS_REPO_URLS", settings.PLUGINS_REPO_URLS or "").split(",")
-        self.plugin_folder = os.environ.get("PLUGINS_FOLDER", settings.PLUGINS_FOLDER)
-        self.catalog_folder = os.environ.get("PLUGINS_CATALOG_FOLDER", settings.PLUGINS_CATALOG_FOLDER)
+        self.github_api = settings.GITHUB_API
+        self.github_token = settings.GITHUB_TOKEN
+        self.monorepos = settings.REPO_URLS.split(",")
+        self.plugin_folder = settings.FOLDER
+        self.catalog_folder = settings.CATALOG_FOLDER
         self.manifests: list[PluginManifest] = []
         # Only create Auth.Token if a token is provided to avoid errors with None
         self.auth = Auth.Token(self.github_token) if self.github_token else None

cpex/tools/settings.py

@@ -23,21 +23,22 @@
 class CatalogSettings(BaseSettings):
     """Catalog settings."""
 
-    PLUGINS_GITHUB_TOKEN: str | None = Field(
+    model_config = SettingsConfigDict(env_prefix="PLUGINS_", env_file=".env", env_file_encoding="utf-8", extra="ignore")
+
+    GITHUB_TOKEN: str | None = Field(
         default=None, description="The github token for accessing the plugins repositories"
     )
-    PLUGINS_GITHUB_API: str | None = Field(default="api.github.com", description="api.github.com")
-    PLUGINS_REPO_URLS: str = Field(
+    GITHUB_API: str | None = Field(default="api.github.com", description="api.github.com")
+    REPO_URLS: str = Field(
         default="https://github.com/ibm/cpex-plugins", description="The url of the plugins repositories comma separated"
     )
-    PLUGINS_REGISTRY_FOLDER: str | None = Field(
+    REGISTRY_FOLDER: str | None = Field(
         default="data", description="The folder where the plugin registry is located (r/w)"
     )
-    PLUGINS_CATALOG_FOLDER: str = Field(
+    CATALOG_FOLDER: str = Field(
         default="plugin-catalog", description="The folder where the plugin catalog is located (r/w)"
     )
-    PLUGINS_FOLDER: str = Field(default="plugins", description="The folder where the plugins are located (r/w)")
-    model_config = SettingsConfigDict(env_prefix="PLUGINS_", env_file=".env", env_file_encoding="utf-8", extra="ignore")
+    FOLDER: str = Field(default="plugins", description="The folder where the plugins are located (r/w)")
 
 
 def get_catalog_settings() -> CatalogSettings:

tests/unit/cpex/tools/test_catalog.py

@@ -62,7 +62,17 @@ class TestPluginCatalogInit:
     def test_init_with_defaults(self):
         """Test initialization with default environment variables."""
         with (
-            patch.dict("os.environ", {"PLUGINS_GITHUB_TOKEN": "test_token"}, clear=True),
+            patch.dict(
+                "os.environ",
+                {
+                    "PLUGINS_GITHUB_TOKEN": "test_token",
+                    "PLUGINS_GITHUB_API": "api.github.com",
+                    "PLUGINS_REPO_URLS": "https://github.com/ibm/cpex-plugins",
+                    "PLUGINS_FOLDER": "plugins",
+                    "PLUGINS_CATALOG_FOLDER": "plugin-catalog",
+                },
+                clear=True,
+            ),
             patch("cpex.tools.catalog.Github"),
         ):
             catalog = PluginCatalog()