qontract-reconcile 0.10.1rc1096__py3-none-any.whl → 0.10.1rc1098__py3-none-any.whl

{qontract_reconcile-0.10.1rc1096.dist-info → qontract_reconcile-0.10.1rc1098.dist-info}/METADATA

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

@@ -160,11 +160,11 @@ reconcile/aws_version_sync/merge_request_manager/merge_request.py,sha256=2FbqLLd
 reconcile/aws_version_sync/merge_request_manager/merge_request_manager.py,sha256=3bRpw7DluiYw3daRg0yAyCSGYf39Ru0d8lUjoepDSpU,5525
 reconcile/change_owners/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/change_owners/approver.py,sha256=Z3_11vnK2WNOxjEEXVDh0224-_-qbt9d6mBeVE-7fsc,2259
-reconcile/change_owners/bundle.py,sha256=ZIlXRo6Z2raeWSCUqYsexBdol-q-r9kWJs5O_YPaEYk,5273
-reconcile/change_owners/change_log_tracking.py,sha256=tGN-z1HGf0EjC3BSqs54WhQwIb7bhXEeTBm2v2Q2ju0,7075
+reconcile/change_owners/bundle.py,sha256=h30fU-JmLH5a-rCAovpzTeTkkkgZztsZ5A2raee0YuU,5355
+reconcile/change_owners/change_log_tracking.py,sha256=36-bXJgpseC_92hZ3r6dnOfPywU5tPSJhnhb4CRUXpY,7365
 reconcile/change_owners/change_owners.py,sha256=0HRJhDm0oW3uYJFgzynqA1gA0lbhalhSkmWOiQmr-NM,17062
 reconcile/change_owners/change_types.py,sha256=HEsoBduhcczAXZHwT26mr5sVPxtf8J6tsvjSDDI1ceI,32077
-reconcile/change_owners/changes.py,sha256=pa3cNAL-Xawh700ARJJQjY0p09NA1J2329RcE0F0MHM,17224
+reconcile/change_owners/changes.py,sha256=IO2va8RZ1UsC_iosQR7qiQir7UwGuMQfFwceoU0utCI,18162
 reconcile/change_owners/decision.py,sha256=iUJcIc_N_RqXIAY8D10RZqPMC2OinsHTMcqI6f6uylE,7606
 reconcile/change_owners/diff.py,sha256=0vyu29xCL24ZhUa7hqBni0NaxoCYRXLwvA-h8V23YQ4,9009
 reconcile/change_owners/implicit_ownership.py,sha256=6BehZvx4IjrphmOt_LLLk9_02Fl5BY5jd00Wuz_PBZk,4234
@@ -292,7 +292,7 @@ reconcile/gql_definitions/endpoints_discovery/namespaces.py,sha256=FqJ0H7NdsIm5B
 reconcile/gql_definitions/external_resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/external_resources/aws_accounts.py,sha256=XR69j9dpTQ0gv8y-AZN7AJ0dPvO-wbHscyCDgrax6Bk,2046
 reconcile/gql_definitions/external_resources/external_resources_modules.py,sha256=HFOQjmNbNxk0j5nChxppQeCnJjeDsqibJkPgA7R1zRw,2417
-reconcile/gql_definitions/external_resources/external_resources_namespaces.py,sha256=6WiI1exSzyEel_vOeVH3zitroGXI7JqDkDSKav_SzT4,42483
+reconcile/gql_definitions/external_resources/external_resources_namespaces.py,sha256=5aQaNJC73cT-EqiDZ8rq5zaxUAX5dcbyuRp-YEBADwI,42533
 reconcile/gql_definitions/external_resources/external_resources_settings.py,sha256=Hw9n_90BPG6Lnt2PT3mHc6p0KEm2CxKxvSGRFc_Dhus,2982
 reconcile/gql_definitions/fragments/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/fragments/aus_organization.py,sha256=uBKbTuBa3CZmTXR5HOcGhRcu2U9kM93KbYmoWTxcpB0,4767
@@ -332,7 +332,7 @@ reconcile/gql_definitions/glitchtip_project_alerts/glitchtip_project.py,sha256=P
 reconcile/gql_definitions/integrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/integrations/integrations.py,sha256=HosEgRUlAkxLNoj2cnq3mrTdWDn9UvbNmtz6OcweIYk,11668
 reconcile/gql_definitions/jenkins_configs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/gql_definitions/jenkins_configs/jenkins_configs.py,sha256=0nMkH0G-AjQwu53fqHykth6X6jjbHdW2hBp5n7N-r24,2766
+reconcile/gql_definitions/jenkins_configs/jenkins_configs.py,sha256=kr1RwKcSpmpBkotl8rR0cOZ02Co5FAbE1he80CCFbTc,2961
 reconcile/gql_definitions/jenkins_configs/jenkins_instances.py,sha256=b3gYVzQavxeLe4jSM5ZxrO77Vvs7kOljVOXEkTO943U,2165
 reconcile/gql_definitions/jira/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/jira/jira_servers.py,sha256=N7mvIdqoXT-90abkiaC2bxz2ZjW3d826qVV5OL8_TAM,2223
@@ -574,7 +574,7 @@ reconcile/test/test_terraform_vpc_peerings.py,sha256=bpjCjhmic07cw3XKSHf-2JvmLuW
 reconcile/test/test_terraform_vpc_peerings_build_desired_state.py,sha256=cHmr1_yhRgfdqlFX6TMw-aiKXebaRv0szl16M9YRJic,49988
 reconcile/test/test_three_way_diff_strategy.py,sha256=v3rNkQFNy5e1uyfeNSlNBA07fvrPGD0aXD91Lgv8oxc,4062
 reconcile/test/test_utils_jinja2.py,sha256=rKugJEPl0qFC9joenJBXyk2qe-9md31-4EdxvQ2h5cs,4058
-reconcile/test/test_vault_replication.py,sha256=wlc4jm9f8P641UvvxIFFFc5_unJysNkOVrKJscjhQr0,16867
+reconcile/test/test_vault_replication.py,sha256=rMx-opCpC8GobL2vDj_yYYuSgX0crQuncyvrKul1xoM,16998
 reconcile/test/test_vault_utils.py,sha256=vbJnc89XAuE07qbTuWxHM5o9F6R9SO5aHXA38fwxT7A,1122
 reconcile/test/test_version_bump.py,sha256=q6-3Y1roriI6YWpFwaHOMN7emEP3yL33sh_0VdbmG7E,511
 reconcile/test/test_vpc_peerings_validator.py,sha256=dFSmjc_dMN2GqMbntCFpa7PUZmyYuQ9DKffh-T5wmxM,6639
@@ -621,7 +621,7 @@ reconcile/typed_queries/get_state_aws_account.py,sha256=CSJjVPWsUZ2rkGIt8ehoQt7h
 reconcile/typed_queries/github_orgs.py,sha256=UZhoPl8qvA_tcO7CZlN8GuMKckt3ywd47Suu61rgHsc,258
 reconcile/typed_queries/gitlab_instances.py,sha256=ZVQHy2W9xIp53f5qYkjKLHLHgOVtQpxTfcmM1C2046g,291
 reconcile/typed_queries/glitchtip.py,sha256=fYHIT3rXWlqTloRH5zjNFb3N4HCumfHwBPBFlS6KDG4,277
-reconcile/typed_queries/jenkins.py,sha256=1XnCwpSXsuFpPhtZruGKncxEIceZNx334Jv5h0rbS78,296
+reconcile/typed_queries/jenkins.py,sha256=Pus8Rhsb04F92Iqh31xe-rW1TLiEziIWd0UAthvLYkY,794
 reconcile/typed_queries/jira.py,sha256=jq6-ERCr_Fh96_3i9A9UKfpAAstoc4Iz6Irl-_0IUkw,235
 reconcile/typed_queries/jira_settings.py,sha256=i0ddx5xxHrM1v-9mtL_6OB-jBFLw7-HS6xenpIDjrkw,570
 reconcile/typed_queries/jiralert_settings.py,sha256=y59S5xvYmuaGxszzfKhVLjbCyDwKiaSIlajocbK5MDE,793
@@ -760,7 +760,7 @@ reconcile/utils/glitchtip/__init__.py,sha256=FT6iBhGqoe7KExFdbgL8AYUb64iW_4snF5_
 reconcile/utils/glitchtip/client.py,sha256=ovh4tx-ajlihjvcq6nyY4chulbuMJYvzDPv9j9CuAKM,7867
 reconcile/utils/glitchtip/models.py,sha256=uHbCK9-RWgxNYUAkEHXRAZRDDZW7jkOFFt9MdlqN4bU,6481
 reconcile/utils/internal_groups/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/utils/internal_groups/client.py,sha256=V3uubJJHqW_wjwrwbC0halZrhOy7_yxe49kad9ikEGg,4545
+reconcile/utils/internal_groups/client.py,sha256=DVWSEOsdP0trHANM-xw9WJjKSywrA9x_SFSCgUjvEV8,4665
 reconcile/utils/internal_groups/models.py,sha256=y_IqBVqfGqNXiu0VudvBWFrm_-uafVm5KgLG-ca8XAs,2281
 reconcile/utils/jinja2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/utils/jinja2/extensions.py,sha256=7K-uo6G2eCWa98MHT8fRPYIKCLQB_5D2keqQ_LyAfHM,1293
@@ -870,8 +870,8 @@ tools/test/test_qontract_cli.py,sha256=_D61RFGAN5x44CY1tYbouhlGXXABwYfxKSWSQx3Jr
 tools/test/test_saas_promotion_state.py,sha256=dy4kkSSAQ7bC0Xp2CociETGN-2aABEfL6FU5D9Jl00Y,6056
 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.1rc1096.dist-info/METADATA,sha256=yRvGWzA7FiVeLTcn5HCehJgz4D7ERObULAvVS-dnBok,2213
-qontract_reconcile-0.10.1rc1096.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-qontract_reconcile-0.10.1rc1096.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc1096.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc1096.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc1098.dist-info/METADATA,sha256=pjNngxJo9vBuZNc9KjKvtttpkNoImxKiopWLamcZg7A,2213
+qontract_reconcile-0.10.1rc1098.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+qontract_reconcile-0.10.1rc1098.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc1098.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc1098.dist-info/RECORD,,

reconcile/change_owners/bundle.py

@@ -32,6 +32,7 @@ class FileRef:
     file_type: BundleFileType
     path: str
     schema: str | None
+    json_path: str | None = None
 
     def __str__(self) -> str:
         return f"{self.file_type.value}:{self.path}"
@@ -106,6 +107,7 @@ class QontractServerResourcefileBackref(BaseModel):
 
     path: str
     datafileschema: str = Field(..., alias="datafileSchema")
+    jsonpath: str = Field(..., alias="jsonpath")
 
 
 class QontractServerResourcefileDiffState(BaseModel):

reconcile/change_owners/change_log_tracking.py

@@ -12,9 +12,14 @@ from reconcile.change_owners.change_owners import (
     init_gitlab,
 )
 from reconcile.change_owners.change_types import ChangeTypeContext
-from reconcile.change_owners.changes import aggregate_file_moves, parse_bundle_changes
+from reconcile.change_owners.changes import (
+    aggregate_file_moves,
+    aggregate_resource_changes,
+    parse_bundle_changes,
+)
 from reconcile.typed_queries.apps import get_apps
 from reconcile.typed_queries.external_resources import get_namespaces
+from reconcile.typed_queries.jenkins import get_jenkins_configs
 from reconcile.utils import gql
 from reconcile.utils.defer import defer
 from reconcile.utils.gitlab_api import MRState
@@ -73,6 +78,7 @@ class ChangeLogIntegration(QontractReconcileIntegration[ChangeLogIntegrationPara
             cluster = ns.cluster.name
             app = ns.app.name
             app_names_by_cluster_name[cluster].add(app)
+        jenkins_configs = get_jenkins_configs()
 
         integration_state = init_state(
             integration=self.name,
@@ -127,7 +133,10 @@ class ChangeLogIntegration(QontractReconcileIntegration[ChangeLogIntegrationPara
                 change_log_item.error = True
                 continue
             diff = QontractServerDiff(**obj)
-            changes = aggregate_file_moves(parse_bundle_changes(diff))
+            changes = aggregate_resource_changes(
+                aggregate_file_moves(parse_bundle_changes(diff)),
+                {c.path: c.dict() for c in namespaces + jenkins_configs},
+            )
             for change in changes:
                 logging.debug(f"Processing change {change}")
                 change_versions = filter(None, [change.old, change.new])

reconcile/change_owners/changes.py

@@ -10,6 +10,7 @@ from dataclasses import (
 from typing import Any
 
 import anymarkup
+import jsonpath_ng
 
 from reconcile.change_owners.bundle import (
     DATAFILE_PATH_FIELD_NAME,
@@ -434,6 +435,7 @@ def parse_bundle_changes(
                     file_type=BundleFileType.DATAFILE,
                     path=br.path,
                     schema=br.datafileschema,
+                    json_path=br.jsonpath,
                 )
                 for br in (rf.old.backrefs if rf.old and rf.old.backrefs else [])
             ],
@@ -442,6 +444,7 @@ def parse_bundle_changes(
                     file_type=BundleFileType.DATAFILE,
                     path=br.path,
                     schema=br.datafileschema,
+                    json_path=br.jsonpath,
                 )
                 for br in (rf.new.backrefs if rf.new and rf.new.backrefs else [])
             ],
@@ -454,3 +457,31 @@ def parse_bundle_changes(
             )
 
     return change_list
+
+
+def aggregate_resource_changes(
+    bundle_changes: list[BundleFileChange],
+    content_store: dict[str, Any],
+) -> list[BundleFileChange]:
+    resource_changes = [
+        BundleFileChange(
+            fileref=file_ref,
+            old=file_content,
+            new=file_content,
+            old_content_sha="",
+            new_content_sha="",
+            diffs=[
+                Diff(
+                    path=jsonpath_ng.parse(file_ref.json_path),
+                    diff_type=DiffType.CHANGED,
+                    old=file_content,
+                    new=file_content,
+                )
+            ],
+        )
+        for change in bundle_changes
+        for file_ref in change.old_backrefs | change.new_backrefs
+        if (file_content := content_store[file_ref.path])
+    ]
+
+    return bundle_changes + resource_changes

reconcile/gql_definitions/external_resources/external_resources_namespaces.py

@@ -62,6 +62,7 @@ fragment VaultSecret on VaultSecret_v1 {
 
 query ExternalResourcesNamespaces {
   namespaces: namespaces_v1 {
+    path
     name
     delete
     clusterAdmin
@@ -1044,6 +1045,7 @@ class NamespaceV1_ClusterV1(ConfiguredBaseModel):
 
 
 class NamespaceV1(ConfiguredBaseModel):
+    path: str = Field(..., alias="path")
     name: str = Field(..., alias="name")
     delete: Optional[bool] = Field(..., alias="delete")
     cluster_admin: Optional[bool] = Field(..., alias="clusterAdmin")

reconcile/gql_definitions/jenkins_configs/jenkins_configs.py

@@ -30,7 +30,11 @@ fragment VaultSecret on VaultSecret_v1 {
 
 query JenkinsConfigs {
   jenkins_configs: jenkins_configs_v1 {
+    path
     name
+    app {
+      name
+    }
     ...on JenkinsConfig_v1 {
       instance {
         name
@@ -57,8 +61,14 @@ class ConfiguredBaseModel(BaseModel):
         extra=Extra.forbid
 
 
+class AppV1(ConfiguredBaseModel):
+    name: str = Field(..., alias="name")
+
+
 class JenkinsConfigV1(ConfiguredBaseModel):
+    path: str = Field(..., alias="path")
     name: str = Field(..., alias="name")
+    app: AppV1 = Field(..., alias="app")
 
 
 class JenkinsInstanceV1(ConfiguredBaseModel):

reconcile/test/test_vault_replication.py

@@ -5,6 +5,7 @@ import pytest
 import reconcile.vault_replication as integ
 from reconcile.gql_definitions.fragments.vault_secret import VaultSecret
 from reconcile.gql_definitions.jenkins_configs.jenkins_configs import (
+    AppV1,
     JenkinsConfigsQueryData,
     JenkinsConfigV1_JenkinsConfigV1,
     JenkinsInstanceV1,
@@ -32,7 +33,11 @@ def jenkins_config_query_data() -> JenkinsConfigsQueryData:
     return JenkinsConfigsQueryData(
         jenkins_configs=[
             JenkinsConfigV1_JenkinsConfigV1(
+                path="path/to/config",
                 name="jenkins-secrets-config",
+                app=AppV1(
+                    name="my-app",
+                ),
                 instance=JenkinsInstanceV1(
                     name="jenkins-instance",
                     serverUrl="https://test.net",

reconcile/typed_queries/jenkins.py

@@ -1,11 +1,25 @@
+from reconcile.gql_definitions.jenkins_configs.jenkins_configs import (
+    JenkinsConfigV1,
+)
+from reconcile.gql_definitions.jenkins_configs.jenkins_configs import (
+    query as jenkins_configs_query,
+)
 from reconcile.gql_definitions.jenkins_configs.jenkins_instances import (
     JenkinsInstanceV1,
-    query,
+)
+from reconcile.gql_definitions.jenkins_configs.jenkins_instances import (
+    query as jenkins_instances_query,
 )
 from reconcile.utils import gql
 
 
 def get_jenkins_instances() -> list[JenkinsInstanceV1]:
     gqlapi = gql.get_api()
-    data = query(gqlapi.query)
+    data = jenkins_instances_query(gqlapi.query)
     return list(data.instances or [])
+
+
+def get_jenkins_configs() -> list[JenkinsConfigV1]:
+    gqlapi = gql.get_api()
+    data = jenkins_configs_query(gqlapi.query)
+    return list(data.jenkins_configs or [])

reconcile/utils/internal_groups/client.py

@@ -14,6 +14,8 @@ from sretoolbox.utils import retry
 
 from reconcile.utils.internal_groups.models import Group
 
+REQUEST_TIMEOUT = 30
+
 
 class NotFound(Exception):
     """Not found exception."""
@@ -60,7 +62,11 @@ class InternalGroupsApi:
 
     @retry(exceptions=(TokenExpiredError,), max_attempts=2)
     def _request(
-        self, method: str, url: str, json: dict[Any, Any] | None = None
+        self,
+        method: str,
+        url: str,
+        json: dict[Any, Any] | None = None,
+        timeout: int = REQUEST_TIMEOUT,
     ) -> Response:
         try:
             return self._client.request(
@@ -69,6 +75,7 @@ class InternalGroupsApi:
                 json=json,
                 # Content-Type is required for GET too :(
                 headers={"Content-Type": "application/json"},
+                timeout=timeout,
             )
         except TokenExpiredError:
             self._client.token = self._fetch_token()