qontract-reconcile 0.10.1rc546__py3-none-any.whl → 0.10.1rc547__py3-none-any.whl

{qontract_reconcile-0.10.1rc546.dist-info → qontract_reconcile-0.10.1rc547.dist-info}/METADATA

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

@@ -73,7 +73,7 @@ reconcile/openshift_resources.py,sha256=kwsY5cko7udEKNlhL2oKiKv_5wzEw9wmmwROE016
 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=TEB58e1FcYymso4q_v8vRBCpa--wrhUHmA4xgM5qGpg,12163
+reconcile/openshift_saas_deploy.py,sha256=NFiNrk7055vunzzJmI7cVBubFj6JPDlEpJqDwpG_t9g,12706
 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
@@ -641,8 +641,8 @@ reconcile/utils/runtime/runner.py,sha256=72cc-I6yXyPov8UCLHpyERRy1eiMLpGite2roO0
 reconcile/utils/runtime/sharding.py,sha256=roCdbnBklhTK_g34zbgQYqzpKPaNQ8J6Xd9XLO9-t6Q,16258
 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=BoqaDYGsGK0f6bPkP0Cbh8JSzZbnI7MsZLc7-2ScUCI,85666
+reconcile/utils/saasherder/models.py,sha256=PBv8DuAb6KUw_ayn5Ufiya20cCAelBv6Iv--x7hbpa4,5449
+reconcile/utils/saasherder/saasherder.py,sha256=HuJQWnugPFWIVMPpH-5Hw4KLhRY3OVlCMGED74Pu9Xc,85737
 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
@@ -670,8 +670,8 @@ tools/test/test_app_interface_metrics_exporter.py,sha256=SX7qL3D1SIRKFo95FoQztvf
 tools/test/test_qontract_cli.py,sha256=se-YG_YVCWRFrnCPvBVHDBT_59CkbIoEni-4SJa8_MU,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.1rc546.dist-info/METADATA,sha256=r9ClNJ4KvX2B2LuH_Pp-j9Cpcy5743kfHk-bYY6KQvE,2349
-qontract_reconcile-0.10.1rc546.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-qontract_reconcile-0.10.1rc546.dist-info/entry_points.txt,sha256=rTjAv28I_CHLM8ID3OPqMI_suoQ9s7tFbim4aYjn9kk,376
-qontract_reconcile-0.10.1rc546.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc546.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc547.dist-info/METADATA,sha256=b4IdTIYgycDnvOu8T8KhIyQxE7hYqhq4JvztZk07c9Y,2349
+qontract_reconcile-0.10.1rc547.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+qontract_reconcile-0.10.1rc547.dist-info/entry_points.txt,sha256=rTjAv28I_CHLM8ID3OPqMI_suoQ9s7tFbim4aYjn9kk,376
+qontract_reconcile-0.10.1rc547.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc547.dist-info/RECORD,,

reconcile/openshift_saas_deploy.py

@@ -1,3 +1,4 @@
+import json
 import logging
 import os
 import sys
@@ -301,6 +302,7 @@ def run(
             slack.chat_post_message(message)
 
     # get upstream repo info for sast scan
+    # get image info for clamav scan
     # we only do this if:
     # - this is not a dry run
     # - there is a single saas file deployed
@@ -309,14 +311,14 @@ def run(
         openshift_saas_deploy_trigger_upstream_jobs.QONTRACT_INTEGRATION,
         openshift_saas_deploy_trigger_images.QONTRACT_INTEGRATION,
     ]
-    sast = (
+    scan = (
         not dry_run
         and len(saas_files) == 1
         and trigger_integration
         and trigger_integration in allowed_integration
         and trigger_reason
     )
-    if sast:
+    if scan:
         saas_file = saas_files[0]
         owners = saas_file.app.service_owners or []
         emails = " ".join([o.email for o in owners])
@@ -326,3 +328,12 @@ def run(
             f.write(file + "\n")
             f.write(url + "\n")
             f.write(emails + "\n")
+        images = " ".join(saasherder.images)
+        images_file = os.path.join(io_dir, "images")
+        with open(images_file, "w", encoding="locale") as f:
+            f.write(images)
+        image_auth = saasherder._initiate_image_auth(saas_file)
+        if image_auth.auth_server:
+            json_file = os.path.join(io_dir, "dockerconfigjson")
+            with open(json_file, "w", encoding="locale") as f:
+                f.write(json.dumps(image_auth.getDockerConfigJson(), indent=2))

reconcile/utils/saasherder/models.py

@@ -1,3 +1,4 @@
+import base64
 from collections.abc import Iterable
 from dataclasses import dataclass
 from enum import Enum
@@ -192,6 +193,19 @@ class ImageAuth:
     password: Optional[str] = None
     auth_server: Optional[str] = None
 
+    def getDockerConfigJson(self) -> dict:
+        return {
+            "auths": {
+                self.auth_server: {
+                    "username": self.username,
+                    "password": self.password,
+                    "auth": base64.b64encode(
+                        f"{self.username}:{self.password}".encode()
+                    ).decode(),
+                }
+            }
+        }
+
 
 @dataclass
 class TargetSpec:

reconcile/utils/saasherder/saasherder.py

@@ -147,6 +147,7 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
         self.state = state
         self._promotion_state = PromotionState(state=state) if state else None
         self._channel_map = self._assemble_channels(saas_files=all_saas_files)
+        self.images: list[str] = []
 
         # each namespace is in fact a target,
         # so we can use it to calculate.
@@ -1171,6 +1172,7 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
             self._collect_images, resources, self.available_thread_pool_size
         )
         images = set(itertools.chain.from_iterable(images_list))
+        self.images.extend(images)
         if not images:
             return False  # no errors
         errors = threaded.run(