qontract-reconcile 0.10.2.dev254__py3-none-any.whl → 0.10.2.dev255__py3-none-any.whl

{qontract_reconcile-0.10.2.dev254.dist-info → qontract_reconcile-0.10.2.dev255.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev254
+Version: 0.10.2.dev255
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Project-URL: homepage, https://github.com/app-sre/qontract-reconcile
 Project-URL: repository, https://github.com/app-sre/qontract-reconcile

{qontract_reconcile-0.10.2.dev254.dist-info → qontract_reconcile-0.10.2.dev255.dist-info}/RECORD

@@ -608,7 +608,7 @@ reconcile/utils/git.py,sha256=o4p9m8jlzCJDcutl2HErvGLhL6sZ1NB4Aw3zGcQIzso,2427
 reconcile/utils/github_api.py,sha256=S1vO-hvYPzm5BIychVIHSYibMns0HBmLgS78MkPfunE,3402
 reconcile/utils/gitlab_api.py,sha256=0wJObojbXXk8Cgh8ymNWlwD1CdENmpsMo1zDSTddnoE,28335
 reconcile/utils/gpg.py,sha256=EKG7_fdMv8BMlV5yUdPiqoTx-KrzmVSEAl2sLkaKwWI,1123
-reconcile/utils/gql.py,sha256=C0thIm_k9MBldfqwHzyqtYZk9sIvMdm9IbbnXLGwjD8,14158
+reconcile/utils/gql.py,sha256=a1SXvhqqfmFpf9dNwGxnp_6ryvhOwm_kIaFwzJmQQDQ,14683
 reconcile/utils/grouping.py,sha256=vr9SFHZ7bqmHYrvYcEZt-Er3-yQYfAAdq5sHLZVmXPY,456
 reconcile/utils/helm.py,sha256=wC1h0GylhDFeZ6hZEtYy2giAGIIQroaQhkAtURoSlI8,3893
 reconcile/utils/helpers.py,sha256=koyAtYnxsUVx-HIn6GpedcUE-ekz_VtoYDkiZ0iv8ik,1795
@@ -796,7 +796,7 @@ tools/saas_promotion_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 tools/saas_promotion_state/saas_promotion_state.py,sha256=UfwwRLS5Ya4_Nh1w5n1dvoYtchQvYE9yj1VANt2IKqI,3925
 tools/sre_checkpoints/__init__.py,sha256=CDaDaywJnmRCLyl_NCcvxi-Zc0hTi_3OdwKiFOyS39I,145
 tools/sre_checkpoints/util.py,sha256=zEDbGr18ZeHNQwW8pUsr2JRjuXIPz--WAGJxZo9sv_Y,894
-qontract_reconcile-0.10.2.dev254.dist-info/METADATA,sha256=JL26uYCyRE9kZHUhkJ6TTuKMhYTgYyffI1Pv4t9dJGY,23820
-qontract_reconcile-0.10.2.dev254.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev254.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev254.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev255.dist-info/METADATA,sha256=o_zpsOZUysndjUn1lN3Sv7LKSNdPT0CVKbWcdLPy6gY,23820
+qontract_reconcile-0.10.2.dev255.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev255.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev255.dist-info/RECORD,,

reconcile/utils/gql.py

@@ -7,7 +7,7 @@ from datetime import (
     datetime,
 )
 from typing import Any
-from urllib.parse import urlparse
+from urllib.parse import ParseResult, urlparse
 
 import requests
 from gql import (
@@ -38,7 +38,7 @@ INTEGRATIONS_QUERY = """
 requests_logger.setLevel(logging.WARNING)
 
 
-def capture_and_forget(error):
+def capture_and_forget(error: BaseException) -> None:
     """fire-and-forget an exception to sentry
 
     :param error: exception to be captured and sent to sentry
@@ -54,7 +54,7 @@ class GqlApiError(Exception):
 
 
 class GqlApiIntegrationNotFound(Exception):
-    def __init__(self, integration):
+    def __init__(self, integration: str):
         msg = f"""
         Integration not found: {integration}
 
@@ -65,7 +65,7 @@ class GqlApiIntegrationNotFound(Exception):
 
 
 class GqlApiErrorForbiddenSchema(Exception):
-    def __init__(self, schemas):
+    def __init__(self, schemas: list):
         msg = f"""
         Forbidden schemas: {schemas}
 
@@ -76,7 +76,7 @@ class GqlApiErrorForbiddenSchema(Exception):
 
 
 class GqlGetResourceError(Exception):
-    def __init__(self, path, msg):
+    def __init__(self, path: str, msg: str):
         super().__init__(f"Error getting resource from path {path}: {msg!s}")
 
 
@@ -88,8 +88,8 @@ class GqlApi:
         self,
         url: str,
         token: str | None = None,
-        int_name=None,
-        validate_schemas=False,
+        int_name: str | None = None,
+        validate_schemas: bool = False,
         commit: str | None = None,
         commit_timestamp: str | None = None,
     ) -> None:
@@ -127,14 +127,21 @@ class GqlApi:
         )
         return Client(transport=transport)
 
-    def close(self):
+    def close(self) -> None:
         logging.debug("Closing GqlApi client")
-        if self.client.transport.session:
+        if (
+            self.client.transport is not None
+            and hasattr(self.client.transport, "session")
+            and self.client.transport.session
+        ):
             self.client.transport.session.close()
 
     @retry(exceptions=GqlApiError, max_attempts=5, hook=capture_and_forget)
     def query(
-        self, query: str, variables=None, skip_validation=False
+        self,
+        query: str,
+        variables: dict[str, Any] | None = None,
+        skip_validation: bool = False,
     ) -> dict[str, Any] | None:
         try:
             result = self.client.execute(
@@ -237,7 +244,7 @@ class GqlApi:
         resources = self.query(query, {"schema": schema}, skip_validation=True)
         return resources["resources"]
 
-    def get_queried_schemas(self):
+    def get_queried_schemas(self) -> list:
         return list(self._queried_schemas)
 
     @property
@@ -252,7 +259,7 @@ class GqlApiSingleton:
     gqlapi_lock = threading.Lock()
 
     @classmethod
-    def create(cls, *args, **kwargs) -> GqlApi:
+    def create(cls, *args: Any, **kwargs: Any) -> GqlApi:
         with cls.gqlapi_lock:
             if cls.gql_api:
                 logging.debug("Resestting GqlApi instance")
@@ -261,8 +268,9 @@ class GqlApiSingleton:
         return cls.gql_api
 
     @classmethod
-    def close_gqlapi(cls):
-        cls.gql_api.close()
+    def close_gqlapi(cls) -> None:
+        if cls.gql_api is not None:
+            cls.gql_api.close()
 
     @classmethod
     def instance(cls) -> GqlApi:
@@ -281,11 +289,11 @@ class GqlApiSingleton:
 def init(
     url: str,
     token: str | None = None,
-    integration=None,
-    validate_schemas=False,
+    integration: str | None = None,
+    validate_schemas: bool = False,
     commit: str | None = None,
     commit_timestamp: str | None = None,
-):
+) -> GqlApi:
     return GqlApiSingleton.create(
         url,
         token,
@@ -336,7 +344,7 @@ class PersistentRequestsHTTPTransport(RequestsHTTPTransport):
         # can't directly assign, due to mypy type checking
         self.session = session  # type: ignore
 
-    def connect(self):
+    def connect(self) -> None:
         pass
 
     def close(self) -> None:
@@ -344,7 +352,7 @@ class PersistentRequestsHTTPTransport(RequestsHTTPTransport):
 
 
 @retry(exceptions=requests.exceptions.HTTPError, max_attempts=5)
-def get_sha(server, token=None):
+def get_sha(server: ParseResult, token: str | None = None) -> str:
     sha_endpoint = server._replace(path="/sha256")
     headers = {"Authorization": token} if token else None
     response = requests.get(sha_endpoint.geturl(), headers=headers, timeout=60)
@@ -354,7 +362,9 @@ def get_sha(server, token=None):
 
 
 @retry(exceptions=requests.exceptions.HTTPError, max_attempts=5)
-def get_git_commit_info(sha, server, token=None):
+def get_git_commit_info(
+    sha: str, server: ParseResult, token: str | None = None
+) -> dict:
     git_commit_info_endpoint = server._replace(path=f"/git-commit-info/{sha}")
     headers = {"Authorization": token} if token else None
     response = requests.get(
@@ -367,12 +377,12 @@ def get_git_commit_info(sha, server, token=None):
 
 @retry(exceptions=requests.exceptions.ConnectionError, max_attempts=5)
 def init_from_config(
-    autodetect_sha=True,
-    sha=None,
-    integration=None,
-    validate_schemas=False,
-    print_url=True,
-):
+    autodetect_sha: bool = True,
+    sha: str | None = None,
+    integration: str | None = None,
+    validate_schemas: bool = False,
+    print_url: bool = True,
+) -> GqlApi:
     server, token, commit, timestamp = _get_gql_server_and_token(
         autodetect_sha=autodetect_sha, sha=sha
     )