qontract-reconcile 0.10.1rc522__py3-none-any.whl → 0.10.1rc525__py3-none-any.whl

{qontract_reconcile-0.10.1rc522.dist-info → qontract_reconcile-0.10.1rc525.dist-info}/METADATA

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

@@ -70,10 +70,10 @@ reconcile/openshift_namespaces.py,sha256=DboMc6t0vXD54lL9ZP9P9fQnCRo2g_0z5FWubtW
 reconcile/openshift_network_policies.py,sha256=_qqv7yj17OM1J8KJPsFmzFZ85gzESJeBocC672z4_WU,4231
 reconcile/openshift_resourcequotas.py,sha256=yUi56PiOn3inMMfq_x_FEHmaW-reGipzoorjdar372g,2415
 reconcile/openshift_resources.py,sha256=kwsY5cko7udEKNlhL2oKiKv_5wzEw9wmmwROE016ng8,1400
-reconcile/openshift_resources_base.py,sha256=ZhNVhotSbp2Ue3cMEqso-Cmug6vDV67lwX7pEvUpmbw,45787
+reconcile/openshift_resources_base.py,sha256=XSctdE3pD4BI-91tlV5rdXIhvdtymZYeOKiCad8ZJl4,45839
 reconcile/openshift_rolebindings.py,sha256=0sEKajdqVuBSzlagyPbLxtNXQdI2vyabmbIRifs0des,6629
 reconcile/openshift_routes.py,sha256=fXvuPSjcjVw1X3j2EQvUAdbOepmIFdKk-M3qP8QzPiw,1075
-reconcile/openshift_saas_deploy.py,sha256=MySDWBQN2N3rv_B8ifWzRY5t2Afq3DEVkFECHMpW_Sk,11908
+reconcile/openshift_saas_deploy.py,sha256=TEB58e1FcYymso4q_v8vRBCpa--wrhUHmA4xgM5qGpg,12163
 reconcile/openshift_saas_deploy_change_tester.py,sha256=fMmPDz-ZRO-WH8OIiDo4e4sBK4-zzpvFXmVCKGY1l-I,8837
 reconcile/openshift_saas_deploy_trigger_base.py,sha256=p1Mv7dbw_K7TVFv-M-DDq6r1ltuW9VAF6PCNnEng_zM,14291
 reconcile/openshift_saas_deploy_trigger_cleaner.py,sha256=aT8wqoXGyZEeXUA7Q6reaL9v5j5UnPLoYVe70D31HUg,2917
@@ -428,7 +428,7 @@ reconcile/test/test_quay_repos.py,sha256=TdkcRF_a8PLp01Kti9eZZN-vGup2yPBT4Iba3k0
 reconcile/test/test_queries.py,sha256=SpH3RmNpBjEr_ne3VjAMCgKK8RE1z1zo7bypkT5uoO4,1946
 reconcile/test/test_repo_owners.py,sha256=uRYMLbMmh-9usF0TerabZTZV-Z1CS4I6ybT-LQqCLe8,1423
 reconcile/test/test_requests_sender.py,sha256=7fd9C2kEFS0-CYtlsif66N1kO9c44pzuBPAJKR9igqU,5385
-reconcile/test/test_saasherder.py,sha256=_MblumyssujfLbxqLDizRp384NRIVmaduarlNQFI1iQ,41759
+reconcile/test/test_saasherder.py,sha256=hCRwkmMSws8o-SCiaa68hdD2lDXzl21EZ_6v0CCG7vA,47064
 reconcile/test/test_saasherder_allowed_secret_paths.py,sha256=5NHQwNJO66at6HiyMZ5sVRTQDwxdvlOQo0KmkBWCw5Q,4853
 reconcile/test/test_secret_reader.py,sha256=kz7nzcPjvA08cytnvcA_PMA98AEyqJWsESkYeRn5xCk,4994
 reconcile/test/test_slack_base.py,sha256=gpbWOLNxMMX6fyAbs1JakhLTnwfedb3f7WpUae4tQZE,5060
@@ -640,7 +640,7 @@ reconcile/utils/runtime/sharding.py,sha256=roCdbnBklhTK_g34zbgQYqzpKPaNQ8J6Xd9XL
 reconcile/utils/saasherder/__init__.py,sha256=J3MBZBFa5YmhqYm08QsjBXz8mFcVOCiOCkyIcw41t7E,343
 reconcile/utils/saasherder/interfaces.py,sha256=XXY35h8VWQ66z3LBPxaoUAMkIW50264DQiecrzyV6oA,9076
 reconcile/utils/saasherder/models.py,sha256=a_cE_fHo_a8iZhkwFTYVrnRwjcYg1Ayx17WbAtpXV88,5033
-reconcile/utils/saasherder/saasherder.py,sha256=826zFeBvOmc-28V38weJolEe1Rcr9LU_fNW7-TrQ_nM,85570
+reconcile/utils/saasherder/saasherder.py,sha256=BoqaDYGsGK0f6bPkP0Cbh8JSzZbnI7MsZLc7-2ScUCI,85666
 reconcile/utils/terraform/__init__.py,sha256=zNbiyTWo35AT1sFTElL2j_AA0jJ_yWE_bfFn-nD2xik,250
 reconcile/utils/terraform/config.py,sha256=5UVrd563TMcvi4ooa5JvWVDW1I3bIWg484u79evfV_8,164
 reconcile/utils/terraform/config_client.py,sha256=py-Ree-QUYD6Hvng6bM40VgSuttteehIKNgwOSoJO1o,4706
@@ -668,8 +668,8 @@ tools/test/test_app_interface_metrics_exporter.py,sha256=SX7qL3D1SIRKFo95FoQztvf
 tools/test/test_qontract_cli.py,sha256=d18KrdhtUGqoC7_kWZU128U0-VJEj-0rjFkLVufcI6I,2755
 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.1rc522.dist-info/METADATA,sha256=R2XzzcNUvBuX1bSzUrBBYUQqLDtSv6D6V5Xs-cAn3Rw,2349
-qontract_reconcile-0.10.1rc522.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-qontract_reconcile-0.10.1rc522.dist-info/entry_points.txt,sha256=rTjAv28I_CHLM8ID3OPqMI_suoQ9s7tFbim4aYjn9kk,376
-qontract_reconcile-0.10.1rc522.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc522.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc525.dist-info/METADATA,sha256=jLbqlSjobIeHU4kHMd9FRJtwsljLmh3VnL_gc0jga2A,2349
+qontract_reconcile-0.10.1rc525.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+qontract_reconcile-0.10.1rc525.dist-info/entry_points.txt,sha256=rTjAv28I_CHLM8ID3OPqMI_suoQ9s7tFbim4aYjn9kk,376
+qontract_reconcile-0.10.1rc525.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc525.dist-info/RECORD,,

reconcile/openshift_resources_base.py

@@ -169,6 +169,10 @@ NAMESPACES_QUERY = """
     openshiftResources {
       %s
     }
+    environment {
+      name
+      parameters
+    }
     cluster {
       name
       labels

reconcile/openshift_saas_deploy.py

@@ -7,6 +7,8 @@ from typing import Optional
 import reconcile.openshift_base as ob
 from reconcile import (
     jenkins_base,
+    openshift_saas_deploy_trigger_images,
+    openshift_saas_deploy_trigger_upstream_jobs,
     queries,
 )
 from reconcile.gql_definitions.common.saas_files import PipelinesProviderTektonV1
@@ -302,12 +304,16 @@ def run(
     # we only do this if:
     # - this is not a dry run
     # - there is a single saas file deployed
-    # - saas-deploy triggered by upstream-job
+    # - saas-deploy triggered by upstream job or image build
+    allowed_integration = [
+        openshift_saas_deploy_trigger_upstream_jobs.QONTRACT_INTEGRATION,
+        openshift_saas_deploy_trigger_images.QONTRACT_INTEGRATION,
+    ]
     sast = (
         not dry_run
         and len(saas_files) == 1
         and trigger_integration
-        and trigger_integration == "openshift-saas-deploy-trigger-upstream-jobs"
+        and trigger_integration in allowed_integration
         and trigger_reason
     )
     if sast:

reconcile/test/test_saasherder.py

@@ -35,6 +35,7 @@ from reconcile.utils.openshift_resource import ResourceInventory
 from reconcile.utils.saasherder import SaasHerder
 from reconcile.utils.saasherder.interfaces import SaasFile as SaasFileInterface
 from reconcile.utils.saasherder.models import (
+    TriggerSpecContainerImage,
     TriggerSpecMovingCommit,
     TriggerSpecUpstreamJob,
 )
@@ -431,7 +432,7 @@ class TestSaasFileValid(TestCase):
 class TestGetMovingCommitsDiffSaasFile(TestCase):
     def setUp(self) -> None:
         self.saas_file = self.gql_class_factory(  # type: ignore[attr-defined] # it's set in the fixture
-            SaasFile, Fixtures("saasherder").get_anymarkup("saas.gql.yml")
+            SaasFile, Fixtures("saasherder").get_anymarkup("saas-trigger.gql.yml")
         )
 
         self.initiate_gh_patcher = patch.object(
@@ -463,7 +464,7 @@ class TestGetMovingCommitsDiffSaasFile(TestCase):
         )
         saasherder.state = MagicMock()
         saasherder.state.get.return_value = "asha"
-        self.get_commit_sha.side_effect = ("abcd4242",)
+        self.get_commit_sha.return_value = "abcd4242"
         # 2nd target is the one that will be promoted
         expected = [
             TriggerSpecMovingCommit(
@@ -473,9 +474,9 @@ class TestGetMovingCommitsDiffSaasFile(TestCase):
                 pipelines_provider=self.saas_file.pipelines_provider,
                 resource_template_name="test-saas-deployments",
                 cluster_name="appsres03ue1",
-                namespace_name="test-ns-subscriber",
+                namespace_name="test-moving-commit-trigger",
                 state_content="abcd4242",
-                ref="1234567890123456789012345678901234567890",
+                ref="main",
                 reason=None,
             )
         ]
@@ -501,7 +502,7 @@ class TestGetMovingCommitsDiffSaasFile(TestCase):
 
         saasherder.state = MagicMock()
         saasherder.state.get.return_value = "asha"
-        self.get_commit_sha.side_effect = ("abcd4242", "4242efg")
+        self.get_commit_sha.return_value = "abcd4242"
         expected = [
             TriggerSpecMovingCommit(
                 saas_file_name=self.saas_file.name,
@@ -510,9 +511,9 @@ class TestGetMovingCommitsDiffSaasFile(TestCase):
                 pipelines_provider=self.saas_file.pipelines_provider,
                 resource_template_name="test-saas-deployments",
                 cluster_name="appsres03ue1",
-                namespace_name="test-ns-subscriber",
+                namespace_name="test-moving-commit-trigger",
                 state_content="abcd4242",
-                ref="1234567890123456789012345678901234567890",
+                ref="main",
                 reason="https://github.com/app-sre/test-saas-deployments/commit/abcd4242",
             ),
         ]
@@ -547,7 +548,7 @@ class TestGetMovingCommitsDiffSaasFile(TestCase):
 class TestGetUpstreamJobsDiffSaasFile(TestCase):
     def setUp(self) -> None:
         self.saas_file = self.gql_class_factory(  # type: ignore[attr-defined] # it's set in the fixture
-            SaasFile, Fixtures("saasherder").get_anymarkup("saas.gql.yml")
+            SaasFile, Fixtures("saasherder").get_anymarkup("saas-trigger.gql.yml")
         )
         self.maxDiff = None
 
@@ -577,7 +578,7 @@ class TestGetUpstreamJobsDiffSaasFile(TestCase):
                 pipelines_provider=self.saas_file.pipelines_provider,
                 resource_template_name="test-saas-deployments",
                 cluster_name="appsres03ue1",
-                namespace_name="test-ns-publisher",
+                namespace_name="test-upstream-job-trigger",
                 instance_name="ci",
                 job_name="job",
                 state_content=state_content,
@@ -621,7 +622,7 @@ class TestGetUpstreamJobsDiffSaasFile(TestCase):
                 pipelines_provider=self.saas_file.pipelines_provider,
                 resource_template_name="test-saas-deployments",
                 cluster_name="appsres03ue1",
-                namespace_name="test-ns-publisher",
+                namespace_name="test-upstream-job-trigger",
                 instance_name="ci",
                 job_name="job",
                 state_content=state_content,
@@ -636,7 +637,125 @@ class TestGetUpstreamJobsDiffSaasFile(TestCase):
             expected,
         )
 
-    def test_get_archive_info(self) -> None:
+
+@pytest.mark.usefixtures("inject_gql_class_factory")
+class TestGetContainerImagesDiffSaasFile(TestCase):
+    def setUp(self) -> None:
+        self.saas_file = self.gql_class_factory(  # type: ignore[attr-defined] # it's set in the fixture
+            SaasFile, Fixtures("saasherder").get_anymarkup("saas-trigger.gql.yml")
+        )
+
+        self.initiate_gh_patcher = patch.object(
+            SaasHerder, "_initiate_github", autospec=True
+        )
+        self.get_commit_sha_patcher = patch.object(
+            SaasHerder, "_get_commit_sha", autospec=True
+        )
+        self.check_image_patcher = patch.object(
+            SaasHerder, "_check_image", autospec=True
+        )
+        self.initiate_gh = self.initiate_gh_patcher.start()
+        self.get_commit_sha = self.get_commit_sha_patcher.start()
+        self.check_image = self.check_image_patcher.start()
+        self.maxDiff = None
+
+    def tearDown(self) -> None:
+        for p in (
+            self.initiate_gh_patcher,
+            self.get_commit_sha_patcher,
+            self.check_image_patcher,
+        ):
+            p.stop()
+
+    def test_get_container_images_diff_saas_file_all_fine(self) -> None:
+        saasherder = SaasHerder(
+            [self.saas_file],
+            secret_reader=MockSecretReader(),
+            thread_pool_size=1,
+            integration="",
+            integration_version="",
+            hash_length=7,
+            repo_url="https://repo-url.com",
+        )
+        saasherder.state = MagicMock()
+        saasherder.state.get.return_value = "asha"
+        self.get_commit_sha.return_value = "abcd4242"
+        self.check_image.return_value = None
+        expected = [
+            TriggerSpecContainerImage(
+                saas_file_name=self.saas_file.name,
+                env_name="App-SRE-stage",
+                timeout=None,
+                pipelines_provider=self.saas_file.pipelines_provider,
+                resource_template_name="test-saas-deployments",
+                cluster_name="appsres03ue1",
+                namespace_name="test-image-trigger",
+                image="quay.io/centos/centos",
+                state_content="abcd424",
+                reason=None,
+            )
+        ]
+
+        self.assertEqual(
+            saasherder.get_container_images_diff_saas_file(self.saas_file, True),
+            expected,
+        )
+
+    def test_get_container_images_diff_saas_file_all_fine_include_trigger_trace(
+        self,
+    ) -> None:
+        saasherder = SaasHerder(
+            [self.saas_file],
+            secret_reader=MockSecretReader(),
+            thread_pool_size=1,
+            integration="",
+            integration_version="",
+            hash_length=7,
+            repo_url="https://repo-url.com",
+            include_trigger_trace=True,
+        )
+        saasherder.state = MagicMock()
+        saasherder.state.get.return_value = "asha"
+        self.get_commit_sha.return_value = "abcd4242"
+        self.check_image.return_value = None
+        expected = [
+            TriggerSpecContainerImage(
+                saas_file_name=self.saas_file.name,
+                env_name="App-SRE-stage",
+                timeout=None,
+                pipelines_provider=self.saas_file.pipelines_provider,
+                resource_template_name="test-saas-deployments",
+                cluster_name="appsres03ue1",
+                namespace_name="test-image-trigger",
+                image="quay.io/centos/centos",
+                state_content="abcd424",
+                reason="https://github.com/app-sre/test-saas-deployments/commit/abcd4242 build quay.io/centos/centos:abcd424",
+            )
+        ]
+
+        self.assertEqual(
+            saasherder.get_container_images_diff_saas_file(self.saas_file, True),
+            expected,
+        )
+
+
+@pytest.mark.usefixtures("inject_gql_class_factory")
+class TestGetArchiveInfo(TestCase):
+    def setUp(self) -> None:
+        self.saas_file = self.gql_class_factory(  # type: ignore[attr-defined] # it's set in the fixture
+            SaasFile, Fixtures("saasherder").get_anymarkup("saas-trigger.gql.yml")
+        )
+        self.initiate_gh_patcher = patch.object(
+            SaasHerder, "_initiate_github", autospec=True
+        )
+        self.initiate_gh = self.initiate_gh_patcher.start()
+        self.maxDiff = None
+
+    def tearDown(self) -> None:
+        for p in (self.initiate_gh_patcher,):
+            p.stop()
+
+    def test_get_gitlab_archive_info(self) -> None:
         trigger_reason = "https://gitlab.com/app-sre/test-saas-deployments/commit/abcd4242 via https://jenkins.com/job/job/2"
         saasherder = SaasHerder(
             [self.saas_file],
@@ -655,6 +774,26 @@ class TestGetUpstreamJobsDiffSaasFile(TestCase):
             (file_name, archive_url),
         )
 
+    def test_get_github_archive_info(self) -> None:
+        trigger_reason = "https://github.com/app-sre/test-saas-deployments/commit/abcd4242 build quay.io/centos/centos:abcd424"
+        saasherder = SaasHerder(
+            [self.saas_file],
+            secret_reader=MockSecretReader(),
+            thread_pool_size=1,
+            integration="",
+            integration_version="",
+            hash_length=7,
+            repo_url="https://repo-url.com",
+            include_trigger_trace=True,
+        )
+        file_name = "app-sre-test-saas-deployments-abcd4242.tar.gz"
+        archive_url = "https://api.github.com/repos/app-sre/test-saas-deployments/tarball/abcd4242"
+        self.initiate_gh.return_value.get_repo.return_value.get_archive_link.return_value = archive_url
+        self.assertEqual(
+            saasherder.get_archive_info(self.saas_file, trigger_reason),
+            (file_name, archive_url),
+        )
+
 
 @pytest.mark.usefixtures("inject_gql_class_factory")
 class TestPopulateDesiredState(TestCase):
@@ -948,8 +1087,7 @@ class TestConfigHashPromotionsValidation(TestCase):
         """Promotion is not valid if the parent target config hash set in
         the state does not match with the one set in the subscriber target
         promotion_data. This could happen if the parent target has run again
-        with the same ref before before the subscriber target promotion MR is
-        merged.
+        with the same ref before the subscriber target promotion MR is merged.
         """
         publisher_state = {
             "success": True,

reconcile/utils/saasherder/saasherder.py

@@ -1686,7 +1686,9 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
                         state_content=desired_image_tag,
                     )
                     if self.include_trigger_trace:
-                        trigger_spec.reason = image_uri
+                        trigger_spec.reason = (
+                            f"{rt.url}/commit/{commit_sha} build {image_uri}"
+                        )
                     if not self.state:
                         raise Exception("state is not initialized")
                     current_image_tag = self.state.get(trigger_spec.state_key, None)