qontract-reconcile 0.10.1rc742__py3-none-any.whl → 0.10.1rc744__py3-none-any.whl

{qontract_reconcile-0.10.1rc742.dist-info → qontract_reconcile-0.10.1rc744.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc742
+Version: 0.10.1rc744
 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.10.1rc742.dist-info → qontract_reconcile-0.10.1rc744.dist-info}/RECORD

@@ -114,7 +114,7 @@ reconcile/terraform_cloudflare_resources.py,sha256=EbQQaoDnZ7brvRCpbFtwlD7KLk2hD
 reconcile/terraform_cloudflare_users.py,sha256=1EbTHwJgiPkJpMP-Ag340QNgGK3mXn3dcC3DpLakudM,13987
 reconcile/terraform_repo.py,sha256=c0GZFuY3rCm6VHjHqYbsgOHrEkRWKF_1LrMThsn2XDw,16127
 reconcile/terraform_resources.py,sha256=BN8XuJwjOt1ztruEAHydkd0YiBlb3fHZ7n0snZtRhck,19356
-reconcile/terraform_tgw_attachments.py,sha256=6uIzRWLtFerQZ2yOygv54tGmXbXTvexnFnu_DSG2CNQ,16043
+reconcile/terraform_tgw_attachments.py,sha256=k9Lf0ST65gmI6aUV6HnvxSGcKL7MGx_lN22OXuRGH9Y,16224
 reconcile/terraform_users.py,sha256=L921n4bD6-XbJeiiMKUI3quRacIkHlFEyvpi5Dcli_8,10374
 reconcile/terraform_vpc_peerings.py,sha256=rnDH1u93OyzrBM8Hib0HwSnlxZtx4ScRQaZAcn3mx-k,25402
 reconcile/vault_replication.py,sha256=79GZ_kCimPoQcxkdhkWTQxPOAa46E0mNhf05s_Mk5so,17385
@@ -663,7 +663,7 @@ reconcile/utils/throughput.py,sha256=iP4UWAe2LVhDo69mPPmgo9nQ7RxHD6_GS8MZe-aSiuM
 reconcile/utils/unleash.py,sha256=1D56CsZfE3ShDtN3IErE1T2eeIwNmxhK-yYbCotJ99E,3601
 reconcile/utils/vault.py,sha256=S0eHqvZ9N3fya1E8YDaUffEvLk_fdtpzL4rvWn6f828,14991
 reconcile/utils/vaultsecretref.py,sha256=3Ed2uBy36TzSvL0B-l4FoWQqB2SbBKDKEuUPIO608Bo,931
-reconcile/utils/vcs.py,sha256=o1r0n_IrU2El75CED_6sjR2GZGM-exuWsj5F7jONaMU,6779
+reconcile/utils/vcs.py,sha256=uHFyYSHGpsdtiY76XVquq_5IzJTkkghBwWESeCJIeAw,8416
 reconcile/utils/acs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/utils/acs/base.py,sha256=kjcxLGIMe8oLNFOxZ_bDcClFqGCL7Auwug5is0yNGbw,2555
 reconcile/utils/acs/notifiers.py,sha256=2n5blP9N1FdGLZuy3do9bpjd8NKg88kmLNNqhAGn8w4,5013
@@ -777,8 +777,8 @@ tools/test/test_app_interface_metrics_exporter.py,sha256=SX7qL3D1SIRKFo95FoQztvf
 tools/test/test_qontract_cli.py,sha256=w2l4BHB09k1d-BGJ1jBUNCqDv7zkqYrMHojQXg-21kQ,4155
 tools/test/test_sd_app_sre_alert_report.py,sha256=v363r9zM7__0kR5K6mvJoGFcM9BvE33fWAayrqkpojA,2116
 tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
-qontract_reconcile-0.10.1rc742.dist-info/METADATA,sha256=wi7RZmNJAfEGcpm4t3f_762yHlzo-7XlYEJUewqnUS4,2382
-qontract_reconcile-0.10.1rc742.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc742.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
-qontract_reconcile-0.10.1rc742.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc742.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc744.dist-info/METADATA,sha256=sIbstE_GcpNpldwcIVZDvFWxsYWgttSR6hyw9KGJai4,2382
+qontract_reconcile-0.10.1rc744.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc744.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
+qontract_reconcile-0.10.1rc744.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc744.dist-info/RECORD,,

reconcile/terraform_tgw_attachments.py

@@ -39,6 +39,7 @@ from reconcile.typed_queries.terraform_tgw_attachments.aws_accounts import (
 from reconcile.utils import gql
 from reconcile.utils.aws_api import AWSApi
 from reconcile.utils.defer import defer
+from reconcile.utils.disabled_integrations import integration_is_enabled
 from reconcile.utils.ocm import (
     OCM,
     OCMMap,
@@ -381,7 +382,12 @@ def _filter_tgw_accounts(
                     ClusterPeeringConnectionAccountTGWV1, peer_connection
                 )
                 tgw_account_names.add(tgw_peer_connection.account.name)
-    return [a for a in accounts if a.name in tgw_account_names]
+    return [
+        a
+        for a in accounts
+        if a.name in tgw_account_names
+        and integration_is_enabled(QONTRACT_INTEGRATION.replace("_", "-"), a)
+    ]
 
 
 def _fetch_desired_state_data_source(

reconcile/utils/vcs.py

@@ -3,6 +3,8 @@ from __future__ import annotations
 import logging
 import re
 from collections.abc import Iterable
+from dataclasses import dataclass
+from datetime import datetime
 from enum import Enum
 from typing import Optional
 
@@ -29,6 +31,13 @@ class MRCheckStatus(Enum):
     RUNNING = 3
 
 
+@dataclass(order=True)
+class Commit:
+    repo: str
+    sha: str
+    date: datetime
+
+
 class VCS:
     """
     Abstraction layer for aggregating different Version Control Systems.
@@ -46,17 +55,20 @@ class VCS:
         gitlab_instances: Iterable[GitlabInstanceV1],
         app_interface_repo_url: str,
         dry_run: bool,
-        allow_deleting_mrs: bool,
-        allow_opening_mrs: bool,
+        allow_deleting_mrs: bool = False,
+        allow_opening_mrs: bool = False,
         gitlab_instance: Optional[GitLabApi] = None,
         default_gh_token: Optional[str] = None,
         app_interface_api: Optional[GitLabApi] = None,
+        github_api_per_repo_url: Optional[dict[str, GithubRepositoryApi]] = None,
     ):
         self._dry_run = dry_run
         self._allow_deleting_mrs = allow_deleting_mrs
         self._allow_opening_mrs = allow_opening_mrs
         self._secret_reader = secret_reader
-        self._gh_per_repo_url: dict[str, GithubRepositoryApi] = {}
+        self._gh_per_repo_url: dict[str, GithubRepositoryApi] = (
+            {} if not github_api_per_repo_url else github_api_per_repo_url
+        )
         self._default_gh_token = (
             default_gh_token
             if default_gh_token
@@ -151,12 +163,48 @@ class VCS:
     ) -> str:
         if bool(self._is_commit_sha_regex.search(ref)):
             return ref
-        if "github.com" in repo_url:
+        if repo_url.startswith("https://github.com/"):
             github = self._init_github(repo_url=repo_url, auth_code=auth_code)
             return github.get_commit_sha(ref=ref)
         # assume gitlab by default
         return self._gitlab_instance.get_commit_sha(ref=ref, repo_url=repo_url)
 
+    def get_commits_between(
+        self,
+        repo_url: str,
+        commit_from: str,
+        commit_to: str,
+        auth_code: Optional[HasSecret],
+    ) -> list[Commit]:
+        """
+        Return a list of commits between two commits.
+        Note, that the commit_to is included in the result list, whereas commit_from is not included.
+        """
+        if repo_url.startswith("https://github.com/"):
+            github = self._init_github(repo_url=repo_url, auth_code=auth_code)
+            data = github.compare(commit_from=commit_from, commit_to=commit_to)
+            return [
+                Commit(
+                    repo=repo_url,
+                    sha=gh_commit.sha,
+                    date=gh_commit.commit.committer.date,
+                )
+                for gh_commit in data
+            ]
+        # assume gitlab by default
+        else:
+            data = self._gitlab_instance.repository_compare(
+                repo_url=repo_url, ref_from=commit_from, ref_to=commit_to
+            )
+            return [
+                Commit(
+                    repo=repo_url,
+                    sha=gl_commit["id"],
+                    date=datetime.fromisoformat(gl_commit["committed_date"]),
+                )
+                for gl_commit in data
+            ]
+
     def close_app_interface_mr(self, mr: ProjectMergeRequest, comment: str) -> None:
         if not self._allow_deleting_mrs:
             logging.info("Deleting MRs is disabled. Skipping.")