refactor: use pydandic settings to handle configuration

see #21

Author: Lujeni

gitlab2sentry/__init__.py

@@ -6,13 +6,7 @@
 from slugify import slugify
 
 from gitlab2sentry.exceptions import SentryProjectCreationFailed
-from gitlab2sentry.resources import (
-    G2S_STATS,
-    GRAPHQL_FETCH_PROJECT_QUERY,
-    GRAPHQL_LIST_PROJECTS_QUERY,
-    G2SProject,
-    settings,
-)
+from gitlab2sentry.resources import settings, G2SProject, G2S_STATS, GRAPHQL_LIST_PROJECTS_QUERY, GRAPHQL_FETCH_PROJECT_QUERY
 from gitlab2sentry.utils import GitlabProvider, SentryProvider
 
 logging.basicConfig(
@@ -37,9 +31,7 @@ def _get_gitlab_provider(self) -> GitlabProvider:
         return GitlabProvider(settings.gitlab_url, settings.gitlab_token)
 
     def _get_sentry_provider(self) -> SentryProvider:
-        return SentryProvider(
-            settings.sentry_url, settings.sentry_token, settings.sentry_org_slug
-        )
+        return SentryProvider(settings.sentry_url, settings.sentry_token, settings.sentry_org_slug)
 
     def _ensure_sentry_group(self, name: str) -> None:
         if name not in self.sentry_groups:
@@ -116,9 +108,7 @@ def _get_mr_states(
                 ):
                     if not (sentryclirc_mr_state and sentryclirc_mr_state == "opened"):
                         sentryclirc_mr_state = mr["state"]
-                elif mr["title"] == settings.dsn_mr_title.format(
-                    project_name=project_name
-                ):
+                elif mr["title"] == settings.dsn_mr_title.format(project_name=project_name):
                     if not (dsn_mr_state and dsn_mr_state == "opened"):
                         dsn_mr_state = mr["state"]
                 else:
@@ -240,7 +230,7 @@ def _create_sentry_project(
         full_path: str,
         sentry_group_name: str,
         sentry_project_name: str,
-        sentry_project_slug: str,
+        sentry_project_slug: str
     ) -> Optional[Dict[str, Any]]:
         try:
             return self.sentry_provider.get_or_create_project(
@@ -266,7 +256,7 @@ def _handle_g2s_project(
         self,
         g2s_project: G2SProject,
         sentry_group_name: str,
-        custom_name: Optional[str] = None,
+        custom_name: Optional[str] = None
     ) -> bool:
         """
         Creates sentry project for all given gitlab projects. It
@@ -314,7 +304,7 @@ def _handle_g2s_project(
                     g2s_project.full_path,
                     sentry_group_name,
                     sentry_project_name,
-                    sentry_project_slug,
+                    sentry_project_slug
                 )
 
                 # If Sentry fails to create project skip
@@ -358,7 +348,9 @@ def _handle_g2s_project(
         return False
 
     def update(
-        self, full_path: Optional[str] = None, custom_name: Optional[str] = None
+        self,
+        full_path: Optional[str] = None,
+        custom_name: Optional[str] = None
     ) -> None:
         """
         args: full_path
@@ -380,7 +372,7 @@ def update(
             if g2s_project:
                 sentry_group_name = g2s_project.group.split("/")[0].strip()
                 self._handle_g2s_project(
-                    g2s_project, sentry_group_name, custom_name  # type: ignore
+                    g2s_project, sentry_group_name, custom_name # type: ignore
                 )
             else:
                 logging.info(

gitlab2sentry/resources.py

@@ -1,11 +1,9 @@
-import os
 from collections import namedtuple
 from typing import List, Tuple
-
 from pydantic import Field
 from pydantic_settings import BaseSettings
 
-ENV = os.getenv("ENV", "production")
+
 
 
 class Settings(BaseSettings):

gitlab2sentry/utils/gitlab_provider.py

@@ -16,9 +16,7 @@
 
 class GraphQLClient:
     def __init__(
-        self,
-        url: Optional[str] = settings.gitlab_url,
-        token: Optional[str] = settings.gitlab_token,
+        self, url: Optional[str] = settings.gitlab_url, token: Optional[str] = settings.gitlab_token
     ):
         self._client = Client(
             transport=self._get_transport(url, token),
@@ -83,9 +81,7 @@ def project_list_query(
 
 class GitlabProvider:
     def __init__(
-        self,
-        url: Optional[str] = settings.gitlab_url,
-        token: Optional[str] = settings.gitlab_token,
+        self, url: Optional[str] = settings.gitlab_url, token: Optional[str] = settings.gitlab_token
     ) -> None:
         self.gitlab = self._get_gitlab(url, token)
         self._gql_client = GraphQLClient(url, token)
@@ -102,9 +98,7 @@ def _get_gitlab(self, url: Optional[str], token: Optional[str]) -> Gitlab:
 
     def _get_update_limit(self) -> Optional[datetime]:
         if settings.gitlab_project_creation_limit:
-            return datetime.now() - timedelta(
-                days=settings.gitlab_project_creation_limit
-            )
+            return datetime.now() - timedelta(days=settings.gitlab_project_creation_limit)
         else:
             return None
 

tests/conftest.py

@@ -5,6 +5,10 @@
 
 from gitlab2sentry import Gitlab2Sentry
 from gitlab2sentry.resources import G2SProject, settings
+from gitlab2sentry.resources import (
+    settings,
+    G2SProject,
+)
 from gitlab2sentry.utils.gitlab_provider import GitlabProvider, GraphQLClient
 from gitlab2sentry.utils.sentry_provider import SentryProvider
 
@@ -19,7 +23,6 @@
     "%Y-%m-%dT%H:%M:%SZ",
 )
 
-
 @pytest.fixture
 def g2s_fixture():
     yield Gitlab2Sentry()
@@ -106,7 +109,11 @@ def create_graphql_json_object(**kwargs):
                 "rawTextBlob": settings.dsn_mr_content.format(
                     sentry_url=settings.sentry_url,
                     dsn=settings.sentry_dsn,
+<<<<<<< HEAD
                     project_slug=TEST_PROJECT_NAME,
+=======
+                    project_slug=TEST_PROJECT_NAME
+>>>>>>> 438fae9 (refactor: use pydandic settings to handle configuration)
                 ),
             }
         else:
@@ -131,9 +138,13 @@ def create_graphql_json_object(**kwargs):
     if kwargs["dsn_mr_state"]:
         dsn_mr = {
             "id": "gid://gitlab/MergeRequest/0001",
+<<<<<<< HEAD
             "title": settings.dsn_mr_title.format(
                 project_name=response_dict["node"]["name"]
             ),
+=======
+            "title": settings.dsn_mr_title.format(project_name=response_dict["node"]["name"]),
+>>>>>>> 438fae9 (refactor: use pydandic settings to handle configuration)
             "state": kwargs["dsn_mr_state"],
         }
         response_dict["node"]["mergeRequests"]["nodes"].append(dsn_mr)
@@ -350,38 +361,3 @@ def payload_sentry_project():
         sentryclirc_mr_state="merged",
         dsn_mr_state="merged",
     )
-
-
-GRAPHQL_TEST_QUERY = {
-    "name": "TEST_QUERY",
-    "instance": "projects",
-    "body": """
-{
-    project(fullPath: "none") {
-        id
-        fullPath
-        name
-        createdAt
-        mergeRequestsEnabled
-        group {
-            name
-        }
-        repository {
-            blobs {
-                nodes {
-                    name
-                    rawTextBlob
-                }
-            }
-        }
-        mergeRequests {
-            nodes {
-                id
-                title
-                state
-            }
-        }
-    }
-}
-""",
-}

tests/test_gitlab_provider.py

@@ -64,8 +64,7 @@ def test_project_list_query(gql_client_fixture, payload_new_project, mocker):
 
 def test_get_gitlab(gitlab_provider_fixture):
     assert isinstance(
-        gitlab_provider_fixture._get_gitlab(settings.gitlab_url, settings.gitlab_token),
-        Gitlab,
+        gitlab_provider_fixture._get_gitlab(settings.gitlab_url, settings.gitlab_token), Gitlab
     )