qontract-reconcile 0.10.1rc1134__py3-none-any.whl → 0.10.1rc1136__py3-none-any.whl

{qontract_reconcile-0.10.1rc1134.dist-info → qontract_reconcile-0.10.1rc1136.dist-info}/METADATA

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

@@ -785,7 +785,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=704SOkLBioEwXITEr2mNdqpXA30J7kuUq1kQ4Q_mN8c,6693
+reconcile/utils/mr/promote_qontract.py,sha256=wgvX2CBlcZaihKJSXJ0zcEK8NGaEP2_DUQDz0STzGes,7158
 reconcile/utils/mr/user_maintenance.py,sha256=cHPBn8zrReWLHalyk-EFdkFJe9zjVjRoZhT4t2zZfGE,3956
 reconcile/utils/ocm/__init__.py,sha256=Y-bp8GomMpyCo0tFW6kJ78-ZG1UIupYRtBzbMWU0kwM,798
 reconcile/utils/ocm/addons.py,sha256=_LDdJ-gapM3s5exKlIUt-MlXZTAUoHezbYBU0QmvfWQ,7335
@@ -838,7 +838,7 @@ tools/app_interface_metrics_exporter.py,sha256=zkwkxdAUAxjdc-pzx2_oJXG25fo0Fnyd5
 tools/app_interface_reporter.py,sha256=oZPib4HPq0aZ2Zui1QGJGk6qQdfpeihujGDBnSdKyGE,17627
 tools/glitchtip_access_reporter.py,sha256=oPBnk_YoDuljU3v0FaChzOwwnk4vap1xEE67QEjzdqs,2948
 tools/glitchtip_access_revalidation.py,sha256=8kbBJk04mkq28kWoRDDkfCGIF3GRg3pJrFAh1sW0dbk,2821
-tools/qontract_cli.py,sha256=sFwwL9GVUXnlxJV4glFKa1T4Q4IjNmgN0rex5aDIRyQ,135492
+tools/qontract_cli.py,sha256=PV2tqOqpFqAQh1_ZGNNf7up4OTBSPZmpGjN7eHxlQ0s,136187
 tools/sd_app_sre_alert_report.py,sha256=e9vAdyenUz2f5c8-z-5WY0wv-SJ9aePKDH2r4IwB6pc,5063
 tools/template_validation.py,sha256=qpKYaTgk0GOPGa2Ct5_5sKdwIHtCAKIBGzsMPuJU5fw,3371
 tools/cli_commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -871,8 +871,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.1rc1134.dist-info/METADATA,sha256=HtnNYSBnLq4T0QQnHtSMfJvmXumkAWedjkfjqucyqAw,2213
-qontract_reconcile-0.10.1rc1134.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-qontract_reconcile-0.10.1rc1134.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc1134.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc1134.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc1136.dist-info/METADATA,sha256=pEFFwEXsYv6-MilOPsRU2wI3TZWyzxxoEyy1GMhPm2g,2213
+qontract_reconcile-0.10.1rc1136.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+qontract_reconcile-0.10.1rc1136.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc1136.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc1136.dist-info/RECORD,,

reconcile/utils/mr/promote_qontract.py

@@ -184,6 +184,15 @@ class PromoteQontractReconcileCommercial(MergeRequestBase):
             replace_text=self.commit_sha,
         )
 
+        # data/services/app-interface/terraform-repo/cicd/ci-int/saas-terraform-repo.yaml
+        self._process_by(
+            "json_path",
+            gitlab_cli=gitlab_cli,
+            path="data/services/app-interface/terraform-repo/cicd/ci-int/saas-terraform-repo.yaml",
+            search_text="$.resourceTemplates[?(@.name == 'terraform-repo')].targets[?(@.name == 'tf-repo-prod')].parameters.QR_IMAGE_TAG",
+            replace_text=self.version,
+        )
+
         # data/pipelines/tekton-provider-global-defaults.yaml
         self._process_by(
             "json_path",

tools/qontract_cli.py

@@ -1377,8 +1377,13 @@ def aws_creds(ctx, account_name):
 @click.argument("src")
 @click.argument("dest")
 @click.argument("region", required=False, default="us-east-1")
+@click.option(
+    "--force/--no-force",
+    help="Force the copy even if a statefile already exists at the destination",
+    default=False,
+)
 @click.pass_context
-def copy_tfstate(ctx, account_name, bucket, src, dest, region):
+def copy_tfstate(ctx, account_name, bucket, src, dest, region, force):
     """copy a manually managed terraform state file to the correct location expected by
     the terraform-repo integration.
 
@@ -1409,15 +1414,32 @@ def copy_tfstate(ctx, account_name, bucket, src, dest, region):
     dest_bucket = account["terraformState"]["bucket"]
 
     with AWSApi(1, accounts, settings, secret_reader) as aws:
-        prompt_text = f"Are you sure you want to copy 's3://{bucket}/{src}' to 's3://{dest_bucket}/{dest_key}'? This will overwrite any object currently at the destination path."
-        if click.confirm(prompt_text):
-            session = aws.get_session(account_name)
-            s3_client = aws.get_session_client(session, "s3", region)
-            copy_source = {
-                "Bucket": bucket,
-                "Key": src,
-            }
+        session = aws.get_session(account_name)
+        s3_client = aws.get_session_client(session, "s3", region)
+        copy_source = {
+            "Bucket": bucket,
+            "Key": src,
+        }
 
+        dest_pretty_path = f"s3://{dest_bucket}/{dest_key}"
+        # check if dest already exists
+        response = s3_client.list_objects_v2(
+            Bucket=dest_bucket, Prefix=dest_key, MaxKeys=1
+        )
+
+        if "Contents" in response:
+            if force:
+                logging.warning(
+                    f"Existing object at '{dest_pretty_path}' will be overwritten as --force is set"
+                )
+            else:
+                logging.error(
+                    f"Will not overwrite existing object at '{dest_pretty_path}'. Use --force to overwrite the destination object"
+                )
+                return
+
+        prompt_text = f"Are you sure you want to copy 's3://{bucket}/{src}' to '{dest_pretty_path}'?"
+        if click.confirm(prompt_text):
             s3_client.copy(copy_source, dest_bucket, dest_key)
             logging.info("successfully copied the statefile to the new location")