qontract-reconcile 0.10.1rc1018__py3-none-any.whl → 0.10.1rc1020__py3-none-any.whl

{qontract_reconcile-0.10.1rc1018.dist-info → qontract_reconcile-0.10.1rc1020.dist-info}/METADATA

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

@@ -644,7 +644,7 @@ reconcile/unleash_feature_toggles/integration.py,sha256=nx7BhtzCsTfPbOp60vI5MkNw
 reconcile/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/utils/aggregated_list.py,sha256=km0xadW0jO4G_CqZPsXmoBURQ8c90FaTu5x4X1K1cZs,3357
 reconcile/utils/amtool.py,sha256=ngtBuVPETH6oAy5RnKzvreVbjwQCaATS_PYYwBprzjQ,2288
-reconcile/utils/aws_api.py,sha256=FHE7tVN91ZAVDARN9EYr7kY3kB6UWtvZSlsvHcDyzx8,66830
+reconcile/utils/aws_api.py,sha256=0Sh83kX8tk-XGwsWbNI19miuits71c3btKxGVhyApuY,66860
 reconcile/utils/aws_helper.py,sha256=MDbv5jrNdqqJ5pfBxniGdJXBBO_EYc2_Uf2w9ZzeMNs,2854
 reconcile/utils/batches.py,sha256=TtEm64a8lWhFuNbUVpFEmXVdU2Q0sTBrP_I0Cjbgh7g,320
 reconcile/utils/binary.py,sha256=7MaAFBpzuBUTJ_aA6G6-eult_BPMVyiXbBLD0Y6F-DM,2301
@@ -775,7 +775,7 @@ reconcile/utils/mr/labels.py,sha256=9QRTRjZAtq45zELd9SwavaraczMjwjn5no3RK1YxFTg,
 reconcile/utils/mr/notificator.py,sha256=cp80wFzu_ZzrJPye7L1pI0H6JRGb7hOGuNxJYUq4Yr8,2967
 reconcile/utils/mr/ocm_update_recommended_version.py,sha256=p_aVP0TGrlKk9WBwgQnYWqUDsED_Hg6G5Bqj0UvtRwA,1536
 reconcile/utils/mr/ocm_upgrade_scheduler_org_updates.py,sha256=ojnIjw-8vRnmCCxOGBOEgPZLH4nC1hcuef74LWw2Rpk,3004
-reconcile/utils/mr/promote_qontract.py,sha256=6WWCSOU9B7P1VY8z7PCFWCnHA0LM0RuOwkZPWsFR700,6095
+reconcile/utils/mr/promote_qontract.py,sha256=4rUMZJGor2AE84BMqnekSbmFyu3ZOUfkxwel8Hnc3-M,5948
 reconcile/utils/mr/user_maintenance.py,sha256=cHPBn8zrReWLHalyk-EFdkFJe9zjVjRoZhT4t2zZfGE,3956
 reconcile/utils/ocm/__init__.py,sha256=xv7CJp7K9LCQfa4gL_W0MMCOD1P4qOy8t5aZj1xXNUE,808
 reconcile/utils/ocm/addons.py,sha256=_LDdJ-gapM3s5exKlIUt-MlXZTAUoHezbYBU0QmvfWQ,7335
@@ -859,8 +859,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.1rc1018.dist-info/METADATA,sha256=3OZq-m7eRqQY8igAdMP63_3OWuW5raq16rrwa8kfB14,2263
-qontract_reconcile-0.10.1rc1018.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc1018.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc1018.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc1018.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc1020.dist-info/METADATA,sha256=nlUFKwjsUyVZVDAbzvIF_4FhV-g1XlrJk91Z7lLRsjI,2263
+qontract_reconcile-0.10.1rc1020.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc1020.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc1020.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc1020.dist-info/RECORD,,

reconcile/utils/aws_api.py

@@ -1384,7 +1384,7 @@ class AWSApi:  # pylint: disable=too-many-public-methods
         if not zones:
             return []
         zone_id = self._get_hosted_zone_id(zones[0])
-        return route53.list_resource_record_sets(HostedZoneId=zone_id)[
+        return route53.list_resource_record_sets(HostedZoneId=zone_id)[  # type: ignore[return-value]
             "ResourceRecordSets"
         ]
 

reconcile/utils/mr/promote_qontract.py

@@ -1,3 +1,4 @@
+from jsonpath_ng.ext import parser
 from ruamel.yaml.compat import StringIO
 
 from reconcile.utils.gitlab_api import GitLabApi
@@ -63,82 +64,61 @@ class PromoteQontractReconcileCommercial(MergeRequestBase):
     def description(self) -> str:
         return f"promote qontract-reconcile to version {self.version}"
 
-    def process(self, gitlab_cli: GitLabApi) -> None:
-        yml = create_ruamel_instance()
-
-        # .env
-        path = ".env"
-        raw_file = gitlab_cli.project.files.get(
-            file_path=path, ref=gitlab_cli.main_branch
-        ).decode()
+    def _process_by_line_search(
+        self, raw_file: bytes, search_text: str, replace_text: str
+    ) -> str:
         content = raw_file.decode("utf-8")
         lines = content.splitlines()
         for index, text in enumerate(lines):
-            if text.startswith("export RECONCILE_IMAGE_TAG="):
-                lines[index] = f"export RECONCILE_IMAGE_TAG={self.version}"
+            if text.startswith(search_text):
+                lines[index] = replace_text
         new_content = "\n".join(lines) + "\n"
-        gitlab_cli.update_file(
-            branch_name=self.branch,
-            file_path=path,
-            commit_message=self.description,
-            content=new_content,
-        )
 
-        # resources/jenkins/global/defaults.yaml
-        path = "resources/jenkins/global/defaults.yaml"
-        raw_file = gitlab_cli.project.files.get(
-            file_path=path, ref=gitlab_cli.main_branch
-        ).decode()
-        content = raw_file.decode("utf-8")
-        lines = content.splitlines()
-        for index, text in enumerate(lines):
-            if text.startswith("    qontract_reconcile_image_tag: "):
-                lines[index] = f"    qontract_reconcile_image_tag: '{self.version}'"
-        new_content = "\n".join(lines) + "\n"
-        gitlab_cli.update_file(
-            branch_name=self.branch,
-            file_path=path,
-            commit_message=self.description,
-            content=new_content,
-        )
+        return new_content
 
-        # data/services/app-interface/cicd/ci-ext/saas-qontract-dashboards.yaml
-        path = "data/services/app-interface/cicd/ci-ext/saas-qontract-dashboards.yaml"
-        raw_file = gitlab_cli.project.files.get(
-            file_path=path, ref=gitlab_cli.main_branch
-        ).decode()
+    def _process_by_json_path(
+        self, raw_file: bytes, search_text: str, replace_text: str
+    ) -> str:
+        yml = create_ruamel_instance()
         content = yml.load(raw_file)
-        for rt in content["resourceTemplates"]:
-            if rt["url"] == "https://github.com/app-sre/qontract-reconcile":
-                for t in rt["targets"]:
-                    if t["name"] == "app-sre-observability-production":
-                        t["ref"] = self.commit_sha
+        for match in parser.parse(search_text).find(content):
+            parent = match.context.value
+            key = match.path.fields[0]
+            parent[key] = replace_text
         new_content = "---\n"
         with StringIO() as stream:
             yml.dump(content, stream)
             new_content += stream.getvalue() or ""
-        gitlab_cli.update_file(
-            branch_name=self.branch,
-            file_path=path,
-            commit_message=self.description,
-            content=new_content,
-        )
 
-        # data/services/app-interface/cicd/ci-int/saas-qontract-manager-int.yaml
-        path = "data/services/app-interface/cicd/ci-int/saas-qontract-manager-int.yaml"
+        return new_content
+
+    def _process_by(
+        self,
+        method: str,
+        gitlab_cli: GitLabApi,
+        path: str,
+        search_text: str,
+        replace_text: str,
+    ) -> None:
         raw_file = gitlab_cli.project.files.get(
             file_path=path, ref=gitlab_cli.main_branch
         ).decode()
-        content = yml.load(raw_file)
-        for rt in content["resourceTemplates"]:
-            if rt["url"] == "https://github.com/app-sre/qontract-reconcile":
-                for t in rt["targets"]:
-                    if t["name"] == "app-interface-production":
-                        t["ref"] = self.commit_sha
-        new_content = "---\n"
-        with StringIO() as stream:
-            yml.dump(content, stream)
-            new_content += stream.getvalue() or ""
+        match method:
+            case "line_search":
+                new_content = self._process_by_line_search(
+                    raw_file=raw_file,
+                    search_text=search_text,
+                    replace_text=replace_text,
+                )
+            case "json_path":
+                new_content = self._process_by_json_path(
+                    raw_file=raw_file,
+                    search_text=search_text,
+                    replace_text=replace_text,
+                )
+            case _:
+                raise NotImplementedError(method)
+
         gitlab_cli.update_file(
             branch_name=self.branch,
             file_path=path,
@@ -146,22 +126,48 @@ class PromoteQontractReconcileCommercial(MergeRequestBase):
             content=new_content,
         )
 
+    def process(self, gitlab_cli: GitLabApi) -> None:
+        # .env
+        self._process_by(
+            "line_search",
+            gitlab_cli=gitlab_cli,
+            path=".env",
+            search_text="export RECONCILE_IMAGE_TAG=",
+            replace_text=f"export RECONCILE_IMAGE_TAG={self.version}",
+        )
+
+        # resources/jenkins/global/defaults.yaml
+        self._process_by(
+            "line_search",
+            gitlab_cli=gitlab_cli,
+            path="resources/jenkins/global/defaults.yaml",
+            search_text="    qontract_reconcile_image_tag: ",
+            replace_text=f"    qontract_reconcile_image_tag: '{self.version}'",
+        )
+
+        # data/services/app-interface/cicd/ci-ext/saas-qontract-dashboards.yaml
+        self._process_by(
+            "json_path",
+            gitlab_cli=gitlab_cli,
+            path="data/services/app-interface/cicd/ci-ext/saas-qontract-dashboards.yaml",
+            search_text="$.resourceTemplates[?(@.url == 'https://github.com/app-sre/qontract-reconcile')].targets[?(@.name == 'app-sre-observability-production')].ref",
+            replace_text=self.commit_sha,
+        )
+
+        # data/services/app-interface/cicd/ci-int/saas-qontract-manager-int.yaml
+        self._process_by(
+            "json_path",
+            gitlab_cli=gitlab_cli,
+            path="data/services/app-interface/cicd/ci-int/saas-qontract-manager-int.yaml",
+            search_text="$.resourceTemplates[?(@.url == 'https://github.com/app-sre/qontract-reconcile')].targets[?(@.name == 'app-interface-production')].ref",
+            replace_text=self.commit_sha,
+        )
+
         # data/pipelines/tekton-provider-global-defaults.yaml
-        path = "data/pipelines/tekton-provider-global-defaults.yaml"
-        raw_file = gitlab_cli.project.files.get(
-            file_path=path, ref=gitlab_cli.main_branch
-        ).decode()
-        content = yml.load(raw_file)
-        for tt in content["taskTemplates"]:
-            if tt["name"] == "openshift-saas-deploy":
-                tt["variables"]["qontract_reconcile_image_tag"] = self.version
-        new_content = "---\n"
-        with StringIO() as stream:
-            yml.dump(content, stream)
-            new_content += stream.getvalue() or ""
-        gitlab_cli.update_file(
-            branch_name=self.branch,
-            file_path=path,
-            commit_message=self.description,
-            content=new_content,
+        self._process_by(
+            "json_path",
+            gitlab_cli=gitlab_cli,
+            path="data/pipelines/tekton-provider-global-defaults.yaml",
+            search_text="$.taskTemplates[?(@.name == 'openshift-saas-deploy')].variables.qontract_reconcile_image_tag",
+            replace_text=self.commit_sha,
         )