regscale-cli 6.20.4.0__py3-none-any.whl → 6.20.5.0__py3-none-any.whl

tests/fixtures/test_fixture.py

@@ -12,6 +12,7 @@ from typing import Optional, Union
 import pytest
 import yaml
 
+from regscale.models import SecurityPlan
 from regscale.core.app.api import Api
 from regscale.core.app.application import Application
 from regscale.core.app.internal.login import login
@@ -28,6 +29,7 @@ class CLITestFixture:
     config: dict
     logger: Logger
     title_prefix: str
+    security_plan: SecurityPlan
 
     def update_config_with_env(self):
         """
@@ -103,8 +105,20 @@ class CLITestFixture:
             cwd = Path(os.getcwd())
         return cwd / suffix if suffix else cwd
 
+    @pytest.fixture(scope="session")
+    def generate_uuid(self) -> str:
+        """
+        Generate a string with the python version and random UUID
+
+        :return: A string with the python version and random UUID
+        :rtype: str
+        """
+        python_info = f"Python{sys.version_info.major}.{sys.version_info.minor}"
+        random_id = uuid.uuid1()
+        return f"{python_info} Test {random_id}"
+
     @pytest.fixture(autouse=True)
-    def cli_test_fixture(self, request):
+    def cli_test_fixture(self, request, generate_uuid):
         """
         Test fixture for the CLI application
 
@@ -124,9 +138,7 @@ class CLITestFixture:
         test_config = {**config_dict, **self.app.config}
         self.app.save_config(test_config)
         self.config = self.app.config
-        python_info = f"Python{sys.version_info.major}.{sys.version_info.minor}"
-        random_id = uuid.uuid3(uuid.NAMESPACE_DNS, python_info)
-        self.title_prefix = f"{python_info} Test {random_id} - "
+        self.title_prefix = generate_uuid
         # login with token if available
         if token := os.getenv("REGSCALE_TOKEN") or self.config.get("token"):
             login(token=token, app=self.app)
@@ -142,3 +154,20 @@ class CLITestFixture:
         logger.info(f"Test Setup Complete: {self.title_prefix}")
         # Test Execution
         yield self.app
+
+    @pytest.fixture(scope="class")
+    def create_security_plan(self, request, generate_uuid):
+        """Create a security plan for testing"""
+        security_plan = None
+        try:
+            ssp = SecurityPlan(
+                systemName=generate_uuid,
+                description="Test SSP",
+            )
+            security_plan = ssp.create()
+
+            yield security_plan
+        finally:
+            # Cleanup after all tests in the class are done
+            if security_plan:
+                security_plan.delete()

tests/regscale/core/test_app.py

@@ -4,6 +4,7 @@ Test the Application class used by the RegScale CLI.
 
 import os
 from unittest.mock import patch, MagicMock
+import pytest
 
 from requests import Response
 
@@ -18,6 +19,13 @@ class TestApplication:
     test_domain = "https://example.com"
     test_token = "Bearer test_token"
 
+    @pytest.fixture(autouse=True)
+    def save_config(self):
+        original_conf = self.app.config
+        yield
+        self.app.config = original_conf
+        self.app.save_config(original_conf)
+
     def teardown_method(self, method):
         """
         Remove the test config file after each test
@@ -60,13 +68,15 @@ class TestApplication:
         mock_response = MagicMock()
         mock_response.json.return_value = {"cliConfig": "key: value"}
         mock_get.return_value = mock_response
-        os.environ["REGSCALE_DOMAIN"] = self.test_domain
-        os.environ["REGSCALE_TOKEN"] = self.test_token
-        config = self.app._fetch_config_from_regscale(config={})
-        assert config["domain"] == self.test_domain
-        assert config["token"] == self.test_token
-        assert config["userId"] == "test_user_id"
-        assert config["key"] == "value"
+        envars = os.environ.copy()
+        envars["REGSCALE_DOMAIN"] = self.test_domain
+        envars["REGSCALE_TOKEN"] = self.test_token
+        with patch.dict(os.environ, envars, clear=True):
+            config = self.app._fetch_config_from_regscale(config={})
+            assert config["domain"] == self.test_domain
+            assert config["token"] == self.test_token
+            assert config["userId"] == "test_user_id"
+            assert config["key"] == "value"
 
     @patch("requests.get")
     def test_fetch_config_from_regscale_failure(self, mock_get):
@@ -74,14 +84,16 @@ class TestApplication:
         mock_response.json.return_value = "Not found."
         mock_response.status_code = 404
         mock_get.return_value = mock_response
-        os.environ["REGSCALE_DOMAIN"] = self.test_domain
-        os.environ["REGSCALE_TOKEN"] = self.test_token
-        empty_config = self.app._fetch_config_from_regscale()
-        assert empty_config == {}
-        with patch.object(self.app.logger, "error") as mock_logger_error:
-            config = self.app._fetch_config_from_regscale(config=self.app.config)
-            mock_logger_error.assert_called_once()
-            assert config == {}
+        envars = os.environ.copy()
+        envars["REGSCALE_DOMAIN"] = self.test_domain
+        envars["REGSCALE_TOKEN"] = self.test_token
+        with patch.dict(os.environ, envars, clear=True):
+            empty_config = self.app._fetch_config_from_regscale()
+            assert empty_config == {}
+            with patch.object(self.app.logger, "error") as mock_logger_error:
+                config = self.app._fetch_config_from_regscale(config=self.app.config)
+                mock_logger_error.assert_called_once()
+                assert config == {}
 
     def test_gen_config(self):
         self.app.local_config = True
@@ -158,26 +170,35 @@ class TestApplication:
             assert result == {"key": "value"}
 
     def test_get_airflow_config_with_env_vars(self):
-        os.environ["REGSCALE_TOKEN"] = self.test_token
-        os.environ["REGSCALE_DOMAIN"] = self.test_domain
-        with patch.object(self.app, "_fetch_config_from_regscale", return_value={"key": "value"}):
-            result = self.app._get_airflow_config()
-            assert result == {"key": "value"}
+        envars = os.environ.copy()
+        envars["REGSCALE_TOKEN"] = self.test_token
+        envars["REGSCALE_DOMAIN"] = self.test_domain
+        with patch.dict(os.environ, envars, clear=True):
+            with patch.object(self.app, "_fetch_config_from_regscale", return_value={"key": "value"}):
+                result = self.app._get_airflow_config()
+                assert result == {"key": "value"}
 
     def test_get_airflow_config_no_config(self):
-        os.environ["REGSCALE_TOKEN"] = ""
-        os.environ["REGSCALE_DOMAIN"] = ""
-        result = self.app._get_airflow_config()
-        assert result is None
-
-        os.environ["REGSCALE_TOKEN"] = self.test_token
-        os.environ["REGSCALE_DOMAIN"] = self.test_domain
-        with patch.object(
-            self.app, "_fetch_config_from_regscale", return_value={"token": self.test_token, "domain": self.test_domain}
-        ):
+        envars = os.environ.copy()
+        envars.pop("REGSCALE_TOKEN")
+        envars.pop("REGSCALE_DOMAIN")
+        assert envars.get("REGSCALE_TOKEN") is None
+        assert envars.get("REGSCALE_DOMAIN") is None
+        with patch.dict(os.environ, envars, clear=True):
             result = self.app._get_airflow_config()
-            assert result["token"] == self.test_token
-            assert result["domain"] == self.test_domain
+            assert result is None
+
+        envars["REGSCALE_TOKEN"] = self.test_token
+        envars["REGSCALE_DOMAIN"] = self.test_domain
+        with patch.dict(os.environ, envars, clear=True):
+            with patch.object(
+                self.app,
+                "_fetch_config_from_regscale",
+                return_value={"token": self.test_token, "domain": self.test_domain},
+            ):
+                result = self.app._get_airflow_config()
+                assert result["token"] == self.test_token
+                assert result["domain"] == self.test_domain
 
     def test_get_airflow_config_invalid_json(self):
         config = "{'key': 'value'"