qontract-reconcile 0.10.2.dev276__py3-none-any.whl → 0.10.2.dev278__py3-none-any.whl

{qontract_reconcile-0.10.2.dev276.dist-info → qontract_reconcile-0.10.2.dev278.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev276
+Version: 0.10.2.dev278
 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.dev276.dist-info → qontract_reconcile-0.10.2.dev278.dist-info}/RECORD

@@ -82,10 +82,10 @@ reconcile/openshift_tekton_resources.py,sha256=z9OidaI7Ju2O0O0PfIcdoyH62VA4TxLTD
 reconcile/openshift_upgrade_watcher.py,sha256=dGTQQdCOl95Bz0wOqg6JaMdBSSDgnAveH_hprUafhW0,6624
 reconcile/openshift_users.py,sha256=h4dH3gTCFFQID76PFuYeMWNzFQ9DgTUtsOcvxfj-3cs,5385
 reconcile/openshift_vault_secrets.py,sha256=Ax-_EBWWU1VRHYyKaUkGJkIjHGwWM3bZgjXL5CkPW8k,1883
-reconcile/quay_base.py,sha256=h5xNjb7EZm8L2JgpO42r6w0UA4im5dabZXJSIW69zKU,1987
-reconcile/quay_membership.py,sha256=1ajUJwPPudN7zmMZp81EipYljD0hAxzowaL-RbcroVA,6382
+reconcile/quay_base.py,sha256=GQkUpuEzC1V_QrHEu_PoELVGnlNRvgFnTqVKp-xkgC4,2070
+reconcile/quay_membership.py,sha256=No2sgEyTVj-hr5VPLy_xdrYAPvt-xo-CPpOt0X3x_6o,6623
 reconcile/quay_mirror.py,sha256=PBooiA0ShZpWYfO6oeKFqYYT6Syi7Q8JJD9kj0wRRLg,14030
-reconcile/quay_mirror_org.py,sha256=I-tEqRHLL6uFqbSi7qCfPuDNoae7EAI2U68NbDOhmv8,10809
+reconcile/quay_mirror_org.py,sha256=PG_WpzE4TymICs74mFt3lh7XA4Rg91y4EVREMEd8PFk,10815
 reconcile/quay_permissions.py,sha256=9KOutS1w4RFQqkvMSy54VtsKNx56-phzP6yI_rEW-B8,4244
 reconcile/quay_repos.py,sha256=cuEYG0HUe0ut5yvLdEwOF5-CmccpXQHRb_wDazvDrvQ,6895
 reconcile/queries.py,sha256=aaffpfMIlmHy73CUxos--NnUsTR5ms3VPeaUY3dnvIs,49879
@@ -797,7 +797,7 @@ tools/saas_promotion_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 tools/saas_promotion_state/saas_promotion_state.py,sha256=oF7C4hpIgyMTwTRm3Aun3cDCHIjVar65JoLp6NcJHlU,3909
 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.dev276.dist-info/METADATA,sha256=bIueWyC4gOTAksJl4z6yu3760Sb6y22pScGwcwT-YCw,24501
-qontract_reconcile-0.10.2.dev276.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev276.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev276.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev278.dist-info/METADATA,sha256=L0l-pOkoslND8UA8-rIGFKDtKTMVu3tRjgBQoFf_b48,24501
+qontract_reconcile-0.10.2.dev278.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev278.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev278.dist-info/RECORD,,

reconcile/quay_base.py

@@ -1,13 +1,15 @@
 from collections import namedtuple
+from typing import Any
 
 from reconcile import queries
 from reconcile.utils.quay_api import QuayApi
 from reconcile.utils.secret_reader import SecretReader
 
 OrgKey = namedtuple("OrgKey", ["instance", "org_name"])
+QuayApiStore = dict[OrgKey, dict[str, Any]]
 
 
-def get_quay_api_store():
+def get_quay_api_store() -> QuayApiStore:
     """
     Returns a dictionary with a key for each Quay organization
     managed in app-interface.

reconcile/quay_membership.py

@@ -1,6 +1,7 @@
 import logging
 import sys
 from collections.abc import Sequence
+from typing import Any
 
 from reconcile.gql_definitions.quay_membership import quay_membership
 from reconcile.gql_definitions.quay_membership.quay_membership import (
@@ -9,13 +10,14 @@ from reconcile.gql_definitions.quay_membership.quay_membership import (
     PermissionQuayOrgTeamV1,
     UserV1,
 )
-from reconcile.quay_base import get_quay_api_store
+from reconcile.quay_base import QuayApiStore, get_quay_api_store
 from reconcile.status import ExitCodes
 from reconcile.utils import (
     expiration,
     gql,
 )
 from reconcile.utils.aggregated_list import (
+    Action,
     AggregatedDiffRunner,
     AggregatedList,
     RunnerError,
@@ -33,7 +35,7 @@ def get_permissions_for_quay_membership() -> list[PermissionQuayOrgTeamV1]:
     return [p for p in query_data.permissions if isinstance(p, PermissionQuayOrgTeamV1)]
 
 
-def process_permission(permission: PermissionQuayOrgTeamV1):
+def process_permission(permission: PermissionQuayOrgTeamV1) -> dict[str, Any]:
     """Returns a new permission object with the right keys
 
     State needs these fields: service, org, team.
@@ -52,7 +54,7 @@ def process_permission(permission: PermissionQuayOrgTeamV1):
     }
 
 
-def fetch_current_state(quay_api_store):
+def fetch_current_state(quay_api_store: QuayApiStore) -> AggregatedList:
     state = AggregatedList()
 
     for org_key, org_data in quay_api_store.items():
@@ -85,7 +87,7 @@ def get_usernames(users: Sequence[UserV1 | BotV1 | ExternalUserV1]) -> list[str]
     return [u.quay_username for u in users if u.quay_username]
 
 
-def fetch_desired_state():
+def fetch_desired_state() -> AggregatedList:
     permissions = get_permissions_for_quay_membership()
     state = AggregatedList()
 
@@ -105,14 +107,14 @@ def fetch_desired_state():
 
 
 class RunnerAction:
-    def __init__(self, dry_run, quay_api_store):
+    def __init__(self, dry_run: bool, quay_api_store: QuayApiStore):
         self.dry_run = dry_run
         self.quay_api_store = quay_api_store
 
-    def add_to_team(self):
+    def add_to_team(self) -> Action:
         label = "add_to_team"
 
-        def action(params, items):
+        def action(params: dict, items: list) -> bool:
             org = params["org"]
             team = params["team"]
 
@@ -134,7 +136,7 @@ class RunnerAction:
 
         return action
 
-    def create_team(self):
+    def create_team(self) -> Action:
         """
         Create an empty team in Quay. This method avoids adding users to the
         new team. add_to_team() will handle updating the member list the
@@ -142,7 +144,7 @@ class RunnerAction:
         """
         label = "create_team"
 
-        def action(params, items):
+        def action(params: dict, items: list) -> bool:
             org = params["org"]
             team = params["team"]
 
@@ -164,10 +166,10 @@ class RunnerAction:
 
         return action
 
-    def del_from_team(self):
+    def del_from_team(self) -> Action:
         label = "del_from_team"
 
-        def action(params, items):
+        def action(params: dict, items: list) -> bool:
             org = params["org"]
             team = params["team"]
 
@@ -185,7 +187,7 @@ class RunnerAction:
         return action
 
 
-def run(dry_run):
+def run(dry_run: bool) -> None:
     quay_api_store = get_quay_api_store()
 
     current_state = fetch_current_state(quay_api_store)

reconcile/quay_mirror_org.py

@@ -290,7 +290,7 @@ class QuayMirrorOrg:
 
 
 def run(
-    dry_run,
+    dry_run: bool,
     control_file_dir: str | None,
     compare_tags: bool | None,
     compare_tags_interval: int,