fix: migrate MissingRequiredArgumentError imports to ocp_resources.exceptions (#2657)

* fix: add exceptions import to template_imports in user_code_parser

The template_imports set in user_code_parser.py was missing
"from ocp_resources.exceptions import MissingRequiredArgumentError",
causing duplicate imports when regenerating resource files with --overwrite.

Closes #2656

* convert all imports to import from exceptnios

* update test to reflect MissingRequiredArgumentError import from exceptions

Author: rnetser

class_generator/parsers/user_code_parser.py

@@ -60,8 +60,7 @@ def parse_user_code_from_file(file_path: str) -> tuple[str, str]:
                 "from typing import Any",
                 "from ocp_resources.resource import NamespacedResource",
                 "from ocp_resources.resource import Resource",
-                "from ocp_resources.resource import NamespacedResource, MissingRequiredArgumentError",
-                "from ocp_resources.resource import Resource, MissingRequiredArgumentError",
+                "from ocp_resources.exceptions import MissingRequiredArgumentError",
             }
 
             for _import in imports:

class_generator/tests/test_user_code_parser.py

@@ -134,7 +134,8 @@ def test_parse_file_with_different_template_imports(self):
         content = '''# Generated using https://github.com/RedHatQE/openshift-python-wrapper/blob/main/scripts/resource/README.md
 
 from typing import Any
-from ocp_resources.resource import NamespacedResource, MissingRequiredArgumentError
+from ocp_resources.exceptions import MissingRequiredArgumentError
+from ocp_resources.resource import NamespacedResource
 from custom_validators import validate_name
 import json
 
@@ -160,7 +161,8 @@ def validate(self):
         assert "from custom_validators import validate_name" in user_imports
         assert "import json" in user_imports
         assert "from typing import Any" not in user_imports
-        assert "from ocp_resources.resource import NamespacedResource, MissingRequiredArgumentError" not in user_imports
+        assert "from ocp_resources.exceptions import MissingRequiredArgumentError" not in user_imports
+        assert "from ocp_resources.resource import NamespacedResource" not in user_imports
 
     def test_parse_empty_file(self):
         """Test parsing an empty file."""
@@ -203,6 +205,44 @@ class MyResource(Resource):
         assert user_code.strip() == ""  # Only whitespace after marker
         assert user_imports == ""
 
+    def test_parse_file_with_exceptions_import(self):
+        """Test parsing a file with import from ocp_resources.exceptions module."""
+        content = '''# Generated using https://github.com/RedHatQE/openshift-python-wrapper/blob/main/scripts/resource/README.md
+
+from typing import Any
+from ocp_resources.resource import NamespacedResource
+from ocp_resources.exceptions import MissingRequiredArgumentError
+import json
+
+
+class MyResource(NamespacedResource):
+    """My resource class."""
+
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+
+    # End of generated code
+
+    def custom_method(self):
+        return True
+'''
+
+        with tempfile.NamedTemporaryFile(mode="w", suffix=".py", delete=False) as f:
+            f.write(content)
+            f.flush()
+
+            _user_code, user_imports = parse_user_code_from_file(file_path=f.name)
+
+        Path(f.name).unlink()
+
+        # Template imports should be filtered out
+        assert "from ocp_resources.exceptions import MissingRequiredArgumentError" not in user_imports
+        assert "from typing import Any" not in user_imports
+        assert "from ocp_resources.resource import NamespacedResource" not in user_imports
+
+        # User imports should be preserved
+        assert "import json" in user_imports
+
     def test_parse_file_with_syntax_error(self):
         """Test parsing a file with syntax errors in imports section."""
         content = '''# Generated using https://github.com/RedHatQE/openshift-python-wrapper/blob/main/scripts/resource/README.md

ocp_resources/application_aware_cluster_resource_quota.py

@@ -2,7 +2,8 @@
 # TODO: update API reference when OCP doc is available
 from typing import Any
 
-from ocp_resources.resource import MissingRequiredArgumentError, Resource
+from ocp_resources.exceptions import MissingRequiredArgumentError
+from ocp_resources.resource import Resource
 
 
 class ApplicationAwareClusterResourceQuota(Resource):

ocp_resources/application_aware_resource_quota.py

@@ -2,7 +2,8 @@
 # TODO: update API reference when OCP doc is available
 from typing import Any
 
-from ocp_resources.resource import MissingRequiredArgumentError, NamespacedResource
+from ocp_resources.exceptions import MissingRequiredArgumentError
+from ocp_resources.resource import NamespacedResource
 
 
 class ApplicationAwareResourceQuota(NamespacedResource):

ocp_resources/authorino.py

@@ -3,7 +3,8 @@
 
 from typing import Any
 
-from ocp_resources.resource import MissingRequiredArgumentError, NamespacedResource
+from ocp_resources.exceptions import MissingRequiredArgumentError
+from ocp_resources.resource import NamespacedResource
 
 
 class Authorino(NamespacedResource):

ocp_resources/catalog_source.py

@@ -1,6 +1,7 @@
 from typing import Any
 
-from ocp_resources.resource import MissingRequiredArgumentError, NamespacedResource
+from ocp_resources.exceptions import MissingRequiredArgumentError
+from ocp_resources.resource import NamespacedResource
 
 
 class CatalogSource(NamespacedResource):

ocp_resources/cluster_resource_quota.py

@@ -3,7 +3,8 @@
 
 from typing import Any
 
-from ocp_resources.resource import MissingRequiredArgumentError, Resource
+from ocp_resources.exceptions import MissingRequiredArgumentError
+from ocp_resources.resource import Resource
 
 
 class ClusterResourceQuota(Resource):

ocp_resources/cluster_role.py

@@ -1,4 +1,5 @@
-from ocp_resources.resource import MissingRequiredArgumentError, Resource
+from ocp_resources.exceptions import MissingRequiredArgumentError
+from ocp_resources.resource import Resource
 
 
 class ClusterRole(Resource):

ocp_resources/cluster_role_binding.py

@@ -1,5 +1,6 @@
 from ocp_resources.cluster_role import ClusterRole
-from ocp_resources.resource import MissingRequiredArgumentError, Resource
+from ocp_resources.exceptions import MissingRequiredArgumentError
+from ocp_resources.resource import Resource
 
 
 class ClusterRoleBinding(Resource):

ocp_resources/cluster_user_defined_network.py

@@ -3,7 +3,8 @@
 
 from typing import Any
 
-from ocp_resources.resource import MissingRequiredArgumentError, Resource
+from ocp_resources.exceptions import MissingRequiredArgumentError
+from ocp_resources.resource import Resource
 
 
 class ClusterUserDefinedNetwork(Resource):