qontract-reconcile 0.10.2.dev296__py3-none-any.whl → 0.10.2.dev297__py3-none-any.whl

{qontract_reconcile-0.10.2.dev296.dist-info → qontract_reconcile-0.10.2.dev297.dist-info}/METADATA

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

@@ -82,12 +82,12 @@ 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=GQkUpuEzC1V_QrHEu_PoELVGnlNRvgFnTqVKp-xkgC4,2070
+reconcile/quay_base.py,sha256=hfHv8ET6iw0GqPyncYJMRH7YFwJc5E1C9z7zET5MCjo,2327
 reconcile/quay_membership.py,sha256=No2sgEyTVj-hr5VPLy_xdrYAPvt-xo-CPpOt0X3x_6o,6623
 reconcile/quay_mirror.py,sha256=pA1_OujRduwQ6dYljoWXU_VJgAwlv7DzThk26ymKmGs,14327
-reconcile/quay_mirror_org.py,sha256=2xLD-PZggP33LhZYxun5I3deF8hwGH9zueMtAByphzE,10842
+reconcile/quay_mirror_org.py,sha256=ltPbHuWUI8Wnl8gV4aeYmvoYFA1uXLWqlXqEPpw7Hi0,11065
 reconcile/quay_permissions.py,sha256=BF539lRxjpgwm88WzazklzgaCF_ipRALwbO2AdpqUqE,4388
-reconcile/quay_repos.py,sha256=woB2afCBgz0UPekHcYtV8zwQCZHZZBL8VDf82ATWZxE,7524
+reconcile/quay_repos.py,sha256=fBleLzMtfDmTidpzbrTt8kGCy-Bk3J06EO4hhyghGnQ,7570
 reconcile/queries.py,sha256=FLUZBtFC2S-e6yjtC1Oq968CJP6t3nc36NPj0wYa0bE,53472
 reconcile/query_validator.py,sha256=csOSkKxcf6ZlpchJu4ck2jLYKUN6y1l-UmSQUFHgssY,1618
 reconcile/requests_sender.py,sha256=914iluuF4UVgG3VyxxtnHOu4yf6YKS2fIy6PViSsFTQ,3875
@@ -637,11 +637,11 @@ reconcile/utils/openssl.py,sha256=QVvhzhpChq_4Daf_5wE1qeZJr4thg3DDjJPn4bOPD4E,36
 reconcile/utils/output.py,sha256=wvsyf8NsFTaFHNkc8to75ta8f474Y4TMO4cHyAHEePk,2209
 reconcile/utils/pagerduty_api.py,sha256=6Ae-KjcmA6Bf328UhTdQ2VwYjh4uFIW1NdZW6PUgT-c,7607
 reconcile/utils/parse_dhms_duration.py,sha256=TONpLnec5gHeF7k815YNJpQyDjXhkxZIcv9s8ffbTSY,1840
-reconcile/utils/password_validator.py,sha256=XwuWg-8CPlcuG7dl_oQ1G1h2gSVSnfMym_VkuprpWVg,2183
+reconcile/utils/password_validator.py,sha256=knR6jJGc-v44v-hhQFvpYrEubuFfCCc3Qly6n_GJm5I,2191
 reconcile/utils/prometheus.py,sha256=Ad0rwLbxRuuYjHwkwJloHEdK0bvy42h-p-HIT1DhDhs,3832
 reconcile/utils/promotion_state.py,sha256=McSgGj3oog83ThJCrMR2v8q6Xb_Pxij-HEe_RbDu8cg,3946
 reconcile/utils/promtool.py,sha256=YnqwMAzsQVGuBZ1j9zy3UcVPFQVJgBMLzQkxhK_KFkU,3079
-reconcile/utils/quay_api.py,sha256=Z6e3oPSp8sCIYxUSDTc6r_qZmXN8Ci_gK90DSCF7BDw,7814
+reconcile/utils/quay_api.py,sha256=ZWjfjzFnIsbKRDcdAnP9tWQezclf53I7VWZJ0gbF2kE,8260
 reconcile/utils/quay_mirror.py,sha256=dpWCNv5lITwIk6Q9RkmqaQKHNk_JPy27UQEribJ7E-U,1324
 reconcile/utils/raw_github_api.py,sha256=2WKtE8ABYYB9UGOAh9N_kLkksBWL3320Z2_scteZddI,2805
 reconcile/utils/repo_owners.py,sha256=P0QX6F0oB8wYA08yiyzhYUiBtU57iIK_PsxbzKENbKM,6571
@@ -796,7 +796,7 @@ tools/saas_promotion_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 tools/saas_promotion_state/saas_promotion_state.py,sha256=uQv2QJAmUXP1g2GPIH30WTlvL9soY6m9lefpZEVDM5w,3965
 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.dev296.dist-info/METADATA,sha256=7dJrZxkVMSto5PnvpCwOcPohimXhWm9frSgZUDnUXdw,24916
-qontract_reconcile-0.10.2.dev296.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev296.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev296.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev297.dist-info/METADATA,sha256=iGF5qMFr_OjJTe4VrXqoImqpXd6uvpYs0wXPJhdp1q0,24916
+qontract_reconcile-0.10.2.dev297.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev297.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev297.dist-info/RECORD,,

reconcile/quay_base.py

@@ -1,12 +1,24 @@
 from collections import namedtuple
-from typing import Any
+from typing import Any, TypedDict
 
 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]]
+
+
+class OrgInfo(TypedDict):
+    url: str
+    api: QuayApi
+    push_token: dict[str, str] | None
+    teams: list[str]
+    managedRepos: bool
+    mirror: OrgKey | None
+    mirror_filters: dict[str, Any]
+
+
+QuayApiStore = dict[OrgKey, OrgInfo]
 
 
 def get_quay_api_store() -> QuayApiStore:
@@ -49,14 +61,16 @@ def get_quay_api_store() -> QuayApiStore:
         else:
             push_token = None
 
-        store[org_key] = {
+        org_info: OrgInfo = {
             "url": base_url,
             "api": QuayApi(token, org_name, base_url=base_url),
             "push_token": push_token,
-            "teams": org_data.get("managedTeams"),
-            "managedRepos": org_data.get("managedRepos"),
+            "teams": org_data.get("managedTeams") or [],
+            "managedRepos": bool(org_data.get("managedRepos")),
             "mirror": mirror,
             "mirror_filters": mirror_filters,
         }
 
+        store[org_key] = org_info
+
     return store

reconcile/quay_mirror_org.py

@@ -103,11 +103,16 @@ class QuayMirrorOrg:
 
             quay_api = org_info["api"]
             upstream_org_key = org_info["mirror"]
+            assert upstream_org_key is not None
             upstream_org = self.quay_api_store[upstream_org_key]
             upstream_quay_api = upstream_org["api"]
 
-            username = upstream_org["push_token"]["user"]
-            token = upstream_org["push_token"]["token"]
+            push_token = upstream_org["push_token"]
+
+            assert push_token is not None
+
+            username = push_token["user"]
+            token = push_token["token"]
 
             org_repos = [item["name"] for item in quay_api.list_images()]
             for repo in upstream_quay_api.list_images():
@@ -143,8 +148,11 @@ class QuayMirrorOrg:
             org_name = org_key.org_name
 
             server_url = org["url"]
-            username = org["push_token"]["user"]
-            password = org["push_token"]["token"]
+            push_token = org["push_token"]
+            assert push_token is not None
+
+            username = push_token["user"]
+            password = push_token["token"]
 
             for item in data:
                 image = Image(
@@ -281,6 +289,8 @@ class QuayMirrorOrg:
         """
 
         push_token = self.quay_api_store[org_key]["push_token"]
+        assert push_token is not None
+
         username = push_token["user"]
         password = push_token["token"]
         return f"{username}:{password}"

reconcile/quay_repos.py

@@ -230,6 +230,7 @@ def run(dry_run: bool) -> None:
         if org_info.get("mirror"):
             # ensure there are no circular mirror dependencies
             mirror_org_key = org_info["mirror"]
+            assert mirror_org_key is not None
             mirror_org = quay_api_store[mirror_org_key]
             if mirror_org.get("mirror"):
                 logging.error(

reconcile/utils/password_validator.py

@@ -29,7 +29,7 @@ class PasswordValidator:
         self._policy_flags = policy_flags
         self._mininum_length = minimum_length
 
-    def validate(self, password: str):
+    def validate(self, password: str) -> None:
         errors: list[str] = []
 
         if len(password) < self._mininum_length:

reconcile/utils/quay_api.py

@@ -1,3 +1,5 @@
+from typing import Any
+
 import requests
 
 
@@ -8,17 +10,23 @@ class QuayTeamNotFoundError(Exception):
 class QuayApi:
     LIMIT_FOLLOWS = 15
 
-    def __init__(self, token, organization, base_url="quay.io", timeout=60):
+    def __init__(
+        self,
+        token: str,
+        organization: str,
+        base_url: str = "quay.io",
+        timeout: int = 60,
+    ) -> None:
         self.token = token
         self.organization = organization
         self.auth_header = {"Authorization": "Bearer %s" % (token,)}
-        self.team_members = {}
+        self.team_members: dict[str, Any] = {}
         self.api_url = f"https://{base_url}/api/v1"
 
         self._timeout = timeout
         """Timeout to use for HTTP calls to Quay (seconds)."""
 
-    def list_team_members(self, team, **kwargs):
+    def list_team_members(self, team: str, **kwargs: Any) -> list[dict]:
         """
         List Quay team members.
 
@@ -52,12 +60,12 @@ class QuayApi:
 
         return members_list
 
-    def user_exists(self, user):
+    def user_exists(self, user: str) -> bool:
         url = f"{self.api_url}/users/{user}"
         r = requests.get(url, headers=self.auth_header, timeout=self._timeout)
         return r.ok
 
-    def remove_user_from_team(self, user, team):
+    def remove_user_from_team(self, user: str, team: str) -> bool:
         """Deletes an user from a team.
 
         :raises HTTPError if there are any problems with the request
@@ -80,7 +88,7 @@ class QuayApi:
 
         return True
 
-    def add_user_to_team(self, user, team):
+    def add_user_to_team(self, user: str, team: str) -> bool:
         """Adds an user to a team.
 
         :raises HTTPError if there are any errors with the request
@@ -93,7 +101,9 @@ class QuayApi:
         r.raise_for_status()
         return True
 
-    def create_or_update_team(self, team: str, role="member", description=None) -> None:
+    def create_or_update_team(
+        self, team: str, role: str = "member", description: str | None = None
+    ) -> None:
         """
         Create or update an Organization team.
 
@@ -117,7 +127,9 @@ class QuayApi:
         )
         r.raise_for_status()
 
-    def list_images(self, images=None, page=None, count=0):
+    def list_images(
+        self, images: list | None = None, page: str | None = None, count: int = 0
+    ) -> list[dict[str, Any]]:
         """
         https://docs.quay.io/api/swagger/#!/repository/listRepos
 
@@ -156,7 +168,7 @@ class QuayApi:
             return self.list_images(images, next_page, count + 1)
         return images
 
-    def repo_create(self, repo_name, description, public):
+    def repo_create(self, repo_name: str, description: str, public: str) -> None:
         """Creates a repository called repo_name with the given description
         and public flag.
 
@@ -180,14 +192,14 @@ class QuayApi:
         )
         r.raise_for_status()
 
-    def repo_delete(self, repo_name):
+    def repo_delete(self, repo_name: str) -> None:
         url = f"{self.api_url}/repository/{self.organization}/{repo_name}"
 
         # perform request
         r = requests.delete(url, headers=self.auth_header, timeout=self._timeout)
         r.raise_for_status()
 
-    def repo_update_description(self, repo_name, description):
+    def repo_update_description(self, repo_name: str, description: str) -> None:
         url = f"{self.api_url}/repository/{self.organization}/{repo_name}"
 
         params = {"description": description}
@@ -198,13 +210,13 @@ class QuayApi:
         )
         r.raise_for_status()
 
-    def repo_make_public(self, repo_name):
+    def repo_make_public(self, repo_name: str) -> None:
         self._repo_change_visibility(repo_name, "public")
 
-    def repo_make_private(self, repo_name):
+    def repo_make_private(self, repo_name: str) -> None:
         self._repo_change_visibility(repo_name, "private")
 
-    def _repo_change_visibility(self, repo_name, visibility):
+    def _repo_change_visibility(self, repo_name: str, visibility: str) -> None:
         url = f"{self.api_url}/repository/{self.organization}/{repo_name}/changevisibility"
 
         params = {"visibility": visibility}
@@ -215,7 +227,7 @@ class QuayApi:
         )
         r.raise_for_status()
 
-    def get_repo_team_permissions(self, repo_name, team):
+    def get_repo_team_permissions(self, repo_name: str, team: str) -> str | None:
         url = (
             f"{self.api_url}/repository/{self.organization}/"
             + f"{repo_name}/permissions/team/{team}"
@@ -231,7 +243,7 @@ class QuayApi:
 
         return r.json().get("role") or None
 
-    def set_repo_team_permissions(self, repo_name, team, role):
+    def set_repo_team_permissions(self, repo_name: str, team: str, role: str) -> None:
         url = (
             f"{self.api_url}/repository/{self.organization}/"
             + f"{repo_name}/permissions/team/{team}"