qontract-reconcile 0.9.1rc268__py3-none-any.whl → 0.9.1rc269__py3-none-any.whl

{qontract_reconcile-0.9.1rc268.dist-info → qontract_reconcile-0.9.1rc269.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.9.1rc268
+Version: 0.9.1rc269
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Home-page: https://github.com/app-sre/qontract-reconcile
 Author: Red Hat App-SRE Team

{qontract_reconcile-0.9.1rc268.dist-info → qontract_reconcile-0.9.1rc269.dist-info}/RECORD

@@ -173,6 +173,7 @@ reconcile/gql_definitions/cna/queries/cna_provisioners.py,sha256=MxCdDVZkB_tBYTV
 reconcile/gql_definitions/cna/queries/cna_resources.py,sha256=B8deNpCTpRDLuJIULT4zSArPocMTsYTdweOZj5wtGdc,2728
 reconcile/gql_definitions/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/common/app_code_component_repos.py,sha256=kWjhUj-_BQCYIbzxGXVJA0UbrWmNc8QXqubqMo8kdqU,1853
+reconcile/gql_definitions/common/app_interface_repo_settings.py,sha256=Pu2k0gTWQIg94CQCUEjyM3iE9CE6LGFSkXpWi_vrDI4,1758
 reconcile/gql_definitions/common/app_interface_state_settings.py,sha256=-u159W101xGOYM-MHD8PCrP6YNZ0CkiFOBFZ05Afyi0,2525
 reconcile/gql_definitions/common/app_interface_vault_settings.py,sha256=GEjbO_R9qSWy-tyLoSR8P1usQ3QPA8kxIofd507xJzs,1789
 reconcile/gql_definitions/common/clusters.py,sha256=qr8gnFH71pYUGijReg0NvaQ7LF8u3pRvp1wG_8a43ig,24303
@@ -257,7 +258,7 @@ reconcile/jenkins/types.py,sha256=-WMs4TsCEcbJNF_n-615Fealk08boBYZcTzVUk3Wlns,26
 reconcile/ocm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/ocm/types.py,sha256=gCuVra66cIk2Wvoj8PQ-hvsZiozFDFXxUOilPdC0w-c,3138
 reconcile/saas_auto_promotions_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/saas_auto_promotions_manager/integration.py,sha256=9_B8VmynFhlp5hgX5ZyIHO8wVkghTLcajurSUhpuhlw,6101
+reconcile/saas_auto_promotions_manager/integration.py,sha256=EAQipdFjlwbKUENTlnd_UKoUYy3LHjRD9K-LXFOvFe0,6208
 reconcile/saas_auto_promotions_manager/publisher.py,sha256=gdzR7jNDKy130pO6J-UNwXI__EXgiREzdaXvNkE3Bhg,1845
 reconcile/saas_auto_promotions_manager/subscriber.py,sha256=JsS_wrCGZC3-86kHSUTq8veLpdGH6XFL_zqlXKx-eNk,5891
 reconcile/saas_auto_promotions_manager/merge_request_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -266,7 +267,7 @@ reconcile/saas_auto_promotions_manager/merge_request_manager/merge_request_manag
 reconcile/saas_auto_promotions_manager/merge_request_manager/renderer.py,sha256=Lfwii68Tiobk8bU1JYco3OosYAd0A-0lvyLtSykeCWk,4598
 reconcile/saas_auto_promotions_manager/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/saas_auto_promotions_manager/utils/saas_files_inventory.py,sha256=aQ-rVGjJfD0eAWFwU0ocOGTF5BHld-49yBwSmgKtUvg,8371
-reconcile/saas_auto_promotions_manager/utils/vcs.py,sha256=VJYAaf7mBpPpyKqL-qCXmWscPYSVrZHEdhQy31Wp3qI,5197
+reconcile/saas_auto_promotions_manager/utils/vcs.py,sha256=wIB3DUazVpmysKuKmHZZ_yG9d04givRBulXrUuZyOgw,5240
 reconcile/skupper_network/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/skupper_network/integration.py,sha256=jF5uPhePnWq4axnxxarEQ_tw71WBxYoTZZUoi9JrZ6M,9831
 reconcile/skupper_network/models.py,sha256=5mTONziFFDx3NJamKzdCrVHXPNfQ6dYIlwxoSBeRihQ,11403
@@ -416,6 +417,7 @@ reconcile/test/saas_auto_promotions_manager/utils/saas_files_inventory/test_mult
 reconcile/test/saas_auto_promotions_manager/utils/saas_files_inventory/test_saas_files_with_auto_promote.py,sha256=bGT1dlFk2NGOvAa1U4t4eNpWvVUxLMIFI-8sp0W_4nk,2643
 reconcile/test/saas_auto_promotions_manager/utils/saas_files_inventory/test_saas_files_without_auto_promote.py,sha256=6EYKmXDN9ckkMvdUBZlUiunCKuwQ9UmnPijKvXU8iZo,2170
 reconcile/typed_queries/__init__.py,sha256=rRk4CyslLsBr4vAh1pIPgt6s3P4R1M9NSEPLnyQgBpk,61
+reconcile/typed_queries/app_interface_repo_url.py,sha256=ePr_nvjDeyZPR4sHsDQFubV2gslj9lPUSzIWWhm0syo,609
 reconcile/typed_queries/app_interface_state_settings.py,sha256=ytNAf3feg8JwmdCC4vO1WtVb-Ok5_ZtNAL3mXe2d1Pw,479
 reconcile/typed_queries/app_interface_vault_settings.py,sha256=N0GiRYDzlPipTOMM50ieR08BxsXaGAga6GxiIKjQDS8,1002
 reconcile/typed_queries/clusters.py,sha256=mjEudUxMl0pqT0CIbDhgRONLQqfhTvDPS4SVyl0zIpM,393
@@ -560,8 +562,8 @@ tools/sre_checkpoints/util.py,sha256=zEDbGr18ZeHNQwW8pUsr2JRjuXIPz--WAGJxZo9sv_Y
 tools/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/test/test_qontract_cli.py,sha256=awwTHEc2DWlykuqGIYM0WOBoSL0KRnOraCLk3C7izis,1401
 tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
-qontract_reconcile-0.9.1rc268.dist-info/METADATA,sha256=3TjHR7ZeexPt4pYZB7mBrqFis9R4dm9EO8XynkGF_ks,2287
-qontract_reconcile-0.9.1rc268.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-qontract_reconcile-0.9.1rc268.dist-info/entry_points.txt,sha256=aIVvB7OTCxYu0QkONzBPfFEyg68Pr8KUVKEEm4ChDVc,333
-qontract_reconcile-0.9.1rc268.dist-info/top_level.txt,sha256=j0CHPIc8TsVRB50wOz_jhxjjaRyCJB3NOQeXhuHS67c,34
-qontract_reconcile-0.9.1rc268.dist-info/RECORD,,
+qontract_reconcile-0.9.1rc269.dist-info/METADATA,sha256=VlnVDPpU3MlQuXOcadFEk2X00DdrPfEDbZYFqDDePgs,2287
+qontract_reconcile-0.9.1rc269.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+qontract_reconcile-0.9.1rc269.dist-info/entry_points.txt,sha256=aIVvB7OTCxYu0QkONzBPfFEyg68Pr8KUVKEEm4ChDVc,333
+qontract_reconcile-0.9.1rc269.dist-info/top_level.txt,sha256=j0CHPIc8TsVRB50wOz_jhxjjaRyCJB3NOQeXhuHS67c,34
+qontract_reconcile-0.9.1rc269.dist-info/RECORD,,

reconcile/gql_definitions/common/app_interface_repo_settings.py

@@ -0,0 +1,60 @@
+"""
+Generated by qenerate plugin=pydantic_v1. DO NOT MODIFY MANUALLY!
+"""
+from collections.abc import Callable  # noqa: F401 # pylint: disable=W0611
+from datetime import datetime  # noqa: F401 # pylint: disable=W0611
+from enum import Enum  # noqa: F401 # pylint: disable=W0611
+from typing import (  # noqa: F401 # pylint: disable=W0611
+    Any,
+    Optional,
+    Union,
+)
+
+from pydantic import (  # noqa: F401 # pylint: disable=W0611
+    BaseModel,
+    Extra,
+    Field,
+    Json,
+)
+
+
+DEFINITION = """
+query AppInterfaceRepoSettings {
+  settings: app_interface_settings_v1 {
+    repoUrl
+  }
+}
+"""
+
+
+class ConfiguredBaseModel(BaseModel):
+    class Config:
+        smart_union = True
+        extra = Extra.forbid
+
+
+class AppInterfaceSettingsV1(ConfiguredBaseModel):
+    repo_url: str = Field(..., alias="repoUrl")
+
+
+class AppInterfaceRepoSettingsQueryData(ConfiguredBaseModel):
+    settings: Optional[list[AppInterfaceSettingsV1]] = Field(..., alias="settings")
+
+
+def query(query_func: Callable, **kwargs: Any) -> AppInterfaceRepoSettingsQueryData:
+    """
+    This is a convenience function which queries and parses the data into
+    concrete types. It should be compatible with most GQL clients.
+    You do not have to use it to consume the generated data classes.
+    Alternatively, you can also mime and alternate the behavior
+    of this function in the caller.
+
+    Parameters:
+        query_func (Callable): Function which queries your GQL Server
+        kwargs: optional arguments that will be passed to the query function
+
+    Returns:
+        AppInterfaceRepoSettingsQueryData: queried data parsed into generated classes
+    """
+    raw_data: dict[Any, Any] = query_func(DEFINITION, **kwargs)
+    return AppInterfaceRepoSettingsQueryData(**raw_data)

reconcile/saas_auto_promotions_manager/integration.py

@@ -21,6 +21,7 @@ from reconcile.saas_auto_promotions_manager.utils.saas_files_inventory import (
     SaasFilesInventory,
 )
 from reconcile.saas_auto_promotions_manager.utils.vcs import VCS
+from reconcile.typed_queries.app_interface_repo_url import get_app_interface_repo_url
 from reconcile.typed_queries.app_interface_vault_settings import (
     get_app_interface_vault_settings,
 )
@@ -123,11 +124,11 @@ def init_external_dependencies(
         default=False,
     )
     secret_reader = create_secret_reader(use_vault=vault_settings.vault)
-    gitlab_instances = get_gitlab_instances()
     vcs = VCS(
         secret_reader=secret_reader,
         github_orgs=get_github_orgs(),
-        gitlab_instances=gitlab_instances,
+        gitlab_instances=get_gitlab_instances(),
+        app_interface_repo_url=get_app_interface_repo_url(),
         dry_run=dry_run,
         allow_deleting_mrs=allow_deleting_mrs,
         allow_opening_mrs=allow_opening_mrs,

reconcile/saas_auto_promotions_manager/utils/vcs.py

@@ -33,6 +33,7 @@ class VCS:
         secret_reader: SecretReaderBase,
         github_orgs: Iterable[GithubOrgV1],
         gitlab_instances: Iterable[GitlabInstanceV1],
+        app_interface_repo_url: str,
         dry_run: bool,
         allow_deleting_mrs: bool,
         allow_opening_mrs: bool,
@@ -45,7 +46,8 @@ class VCS:
         self._default_gh_token = self._get_default_gh_token(github_orgs=github_orgs)
         self._gitlab_instance = self._gitlab_api(gitlab_instances=gitlab_instances)
         self._app_interface_api = self._init_app_interface_api(
-            gitlab_instances=gitlab_instances
+            gitlab_instances=gitlab_instances,
+            app_interface_repo_url=app_interface_repo_url,
         )
         self._is_commit_sha_regex = re.compile(r"^[0-9a-f]{40}$")
 
@@ -91,12 +93,14 @@ class VCS:
         )
 
     def _init_app_interface_api(
-        self, gitlab_instances: Iterable[GitlabInstanceV1]
+        self,
+        gitlab_instances: Iterable[GitlabInstanceV1],
+        app_interface_repo_url: str,
     ) -> GitLabApi:
         return GitLabApi(
             list(gitlab_instances)[0].dict(by_alias=True),
             secret_reader=self._secret_reader,
-            project_url="https://gitlab.cee.redhat.com/service/app-interface",
+            project_url=app_interface_repo_url,
         )
 
     def get_commit_sha(
@@ -107,9 +111,8 @@ class VCS:
         if "github.com" in repo_url:
             github = self._init_github(repo_url=repo_url, auth_code=auth_code)
             return github.get_commit_sha(ref=ref)
-        if "gitlab.cee" in repo_url:
-            return self._gitlab_instance.get_commit_sha(ref=ref, repo_url=repo_url)
-        raise RuntimeError(f"Unsupported Repo URL {repo_url}")
+        # assume gitlab by default
+        return self._gitlab_instance.get_commit_sha(ref=ref, repo_url=repo_url)
 
     def close_app_interface_mr(self, mr: ProjectMergeRequest, comment: str) -> None:
         if not self._dry_run and self._allow_deleting_mrs:

reconcile/typed_queries/app_interface_repo_url.py

@@ -0,0 +1,16 @@
+from collections.abc import Callable
+from typing import Optional
+
+from reconcile.gql_definitions.common.app_interface_repo_settings import query
+from reconcile.utils import gql
+from reconcile.utils.exceptions import AppInterfaceSettingsError
+
+
+def get_app_interface_repo_url(query_func: Optional[Callable] = None) -> str:
+    if not query_func:
+        gqlapi = gql.get_api()
+        query_func = gqlapi.query
+    data = query(query_func=query_func)
+    if data.settings and len(data.settings) == 1:
+        return data.settings[0].repo_url
+    raise AppInterfaceSettingsError("repoUrl not uniquely defined")