qontract-reconcile 0.10.2.dev296__tar.gz → 0.10.2.dev298__tar.gz

{qontract_reconcile-0.10.2.dev296 → qontract_reconcile-0.10.2.dev298}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev296
+Version: 0.10.2.dev298
 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 → qontract_reconcile-0.10.2.dev298}/pyproject.toml

@@ -287,8 +287,6 @@ module = [
     "reconcile.utils.ocm.ocm",
     "reconcile.utils.openshift_resource",
     "reconcile.utils.openssl",
-    "reconcile.utils.password_validator",
-    "reconcile.utils.quay_api",
     "reconcile.utils.raw_github_api",
     "reconcile.utils.repo_owners",
     "reconcile.utils.runtime.meta",
@@ -370,9 +368,7 @@ module = [
     "reconcile.test.utils.test_oc",
     "reconcile.test.utils.test_ocm",
     "reconcile.test.utils.test_parse_dhms_duration",
-    "reconcile.test.utils.test_password_validator",
     "reconcile.test.utils.test_promotion_state",
-    "reconcile.test.utils.test_quay_api",
     "reconcile.test.utils.test_semver_helper",
     "reconcile.test.utils.test_sharding",
     "reconcile.test.utils.test_smtp_client",

{qontract_reconcile-0.10.2.dev296 → qontract_reconcile-0.10.2.dev298}/reconcile/gql_definitions/rhcs/certs.py

@@ -61,6 +61,24 @@ query RhcsCerts {
         annotations
       }
     }
+    sharedResources {
+      openshiftResources {
+        provider
+        ... on NamespaceOpenshiftResourceRhcsCert_v1 {
+          secret_name
+          service_account_name
+          service_account_password {
+            ... on VaultSecret_v1 {
+              path
+              field
+              version
+            }
+          }
+          auto_renew_threshold_days
+          annotations
+        }
+      }
+    }
     cluster {
       name
       serverUrl
@@ -112,6 +130,32 @@ class NamespaceOpenshiftResourceRhcsCertV1(NamespaceOpenshiftResourceV1):
     annotations: Optional[Json] = Field(..., alias="annotations")
 
 
+class SharedResourcesV1_NamespaceOpenshiftResourceV1(ConfiguredBaseModel):
+    provider: str = Field(..., alias="provider")
+
+
+class SharedResourcesV1_NamespaceOpenshiftResourceV1_NamespaceOpenshiftResourceRhcsCertV1_VaultSecretV1(ConfiguredBaseModel):
+    ...
+
+
+class SharedResourcesV1_NamespaceOpenshiftResourceV1_NamespaceOpenshiftResourceRhcsCertV1_VaultSecretV1_VaultSecretV1(SharedResourcesV1_NamespaceOpenshiftResourceV1_NamespaceOpenshiftResourceRhcsCertV1_VaultSecretV1):
+    path: str = Field(..., alias="path")
+    field: str = Field(..., alias="field")
+    version: Optional[int] = Field(..., alias="version")
+
+
+class SharedResourcesV1_NamespaceOpenshiftResourceV1_NamespaceOpenshiftResourceRhcsCertV1(SharedResourcesV1_NamespaceOpenshiftResourceV1):
+    secret_name: str = Field(..., alias="secret_name")
+    service_account_name: str = Field(..., alias="service_account_name")
+    service_account_password: Union[SharedResourcesV1_NamespaceOpenshiftResourceV1_NamespaceOpenshiftResourceRhcsCertV1_VaultSecretV1_VaultSecretV1, SharedResourcesV1_NamespaceOpenshiftResourceV1_NamespaceOpenshiftResourceRhcsCertV1_VaultSecretV1] = Field(..., alias="service_account_password")
+    auto_renew_threshold_days: Optional[int] = Field(..., alias="auto_renew_threshold_days")
+    annotations: Optional[Json] = Field(..., alias="annotations")
+
+
+class SharedResourcesV1(ConfiguredBaseModel):
+    openshift_resources: list[Union[SharedResourcesV1_NamespaceOpenshiftResourceV1_NamespaceOpenshiftResourceRhcsCertV1, SharedResourcesV1_NamespaceOpenshiftResourceV1]] = Field(..., alias="openshiftResources")
+
+
 class DisableClusterAutomationsV1(ConfiguredBaseModel):
     integrations: Optional[list[str]] = Field(..., alias="integrations")
 
@@ -132,6 +176,7 @@ class NamespaceV1(ConfiguredBaseModel):
     delete: Optional[bool] = Field(..., alias="delete")
     cluster_admin: Optional[bool] = Field(..., alias="clusterAdmin")
     openshift_resources: Optional[list[Union[NamespaceOpenshiftResourceRhcsCertV1, NamespaceOpenshiftResourceV1]]] = Field(..., alias="openshiftResources")
+    shared_resources: Optional[list[SharedResourcesV1]] = Field(..., alias="sharedResources")
     cluster: ClusterV1 = Field(..., alias="cluster")
 
 

{qontract_reconcile-0.10.2.dev296 → qontract_reconcile-0.10.2.dev298}/reconcile/openshift_rhcs_certs.py

@@ -2,7 +2,7 @@ import logging
 import sys
 import time
 from collections.abc import Callable, Iterable, Mapping
-from typing import Any
+from typing import Any, cast
 
 import reconcile.openshift_base as ob
 import reconcile.openshift_resources_base as orb
@@ -67,20 +67,25 @@ class OpenshiftRhcsCertExpiration(GaugeMetric):
         return "qontract_reconcile_rhcs_cert_expiration_timestamp"
 
 
+def _is_rhcs_cert(obj: Any) -> bool:
+    return getattr(obj, "provider", None) == "rhcs-cert"
+
+
 def get_namespaces_with_rhcs_certs(
-    query_func: Callable, cluster_name: Iterable[str] | None = None
+    query_func: Callable,
+    cluster_name: Iterable[str] | None = None,
 ) -> list[NamespaceV1]:
-    return [
-        ns
-        for ns in rhcs_certs_query(query_func=query_func).namespaces or []
-        if integration_is_enabled(QONTRACT_INTEGRATION, ns.cluster)
-        and not bool(ns.delete)
-        and (not cluster_name or ns.cluster.name in cluster_name)
-        and any(
-            isinstance(r, NamespaceOpenshiftResourceRhcsCertV1)
-            for r in ns.openshift_resources or []
-        )
-    ]
+    result: list[NamespaceV1] = []
+    for ns in rhcs_certs_query(query_func=query_func).namespaces or []:
+        ob.aggregate_shared_resources_typed(cast("Any", ns))  # mypy: ignore[arg-type]
+        if (
+            integration_is_enabled(QONTRACT_INTEGRATION, ns.cluster)
+            and not bool(ns.delete)
+            and (not cluster_name or ns.cluster.name in cluster_name)
+            and any(_is_rhcs_cert(r) for r in ns.openshift_resources or [])
+        ):
+            result.append(ns)
+    return result
 
 
 def construct_rhcs_cert_oc_secret(
@@ -224,17 +229,16 @@ def fetch_desired_state(
 ) -> None:
     vault = VaultClient()
     cert_provider = get_rhcs_provider_settings(query_func=query_func)
-
     for ns in namespaces:
         for cert_resource in ns.openshift_resources or []:
-            if isinstance(cert_resource, NamespaceOpenshiftResourceRhcsCertV1):
+            if _is_rhcs_cert(cert_resource):
                 ri.add_desired_resource(
                     cluster=ns.cluster.name,
                     namespace=ns.name,
                     resource=fetch_openshift_resource_for_cert_resource(
                         dry_run,
                         ns,
-                        cert_resource,
+                        cast("NamespaceOpenshiftResourceRhcsCertV1", cert_resource),
                         vault,
                         cert_provider,
                     ),

{qontract_reconcile-0.10.2.dev296 → qontract_reconcile-0.10.2.dev298}/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

{qontract_reconcile-0.10.2.dev296 → qontract_reconcile-0.10.2.dev298}/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}"

{qontract_reconcile-0.10.2.dev296 → qontract_reconcile-0.10.2.dev298}/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(

{qontract_reconcile-0.10.2.dev296 → qontract_reconcile-0.10.2.dev298}/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:

{qontract_reconcile-0.10.2.dev296 → qontract_reconcile-0.10.2.dev298}/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}"