qontract-reconcile 0.10.1rc1129__py3-none-any.whl → 0.10.1rc1131__py3-none-any.whl

{qontract_reconcile-0.10.1rc1129.dist-info → qontract_reconcile-0.10.1rc1131.dist-info}/METADATA

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

@@ -140,7 +140,7 @@ reconcile/aus/version_gates/ocp_gate_handler.py,sha256=RW1ppDaCZXVegV9AzzqYXxDUu
 reconcile/aus/version_gates/sts_version_gate_handler.py,sha256=swwwz0YyvrEBf_InqrRRBCt2QzHYNvvq8jz9aYwElh4,3663
 reconcile/aws_account_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/aws_account_manager/integration.py,sha256=WOE_mi45pvJW4TNKh4mCGSViJiElH--T4Wg0CLMYxpY,14988
-reconcile/aws_account_manager/merge_request_manager.py,sha256=eLRf7D6j9sPvJh3xpYRkrckleGrZcr6J0aED7xmNbXI,3815
+reconcile/aws_account_manager/merge_request_manager.py,sha256=fz9s1VrBGHi0MdUR9D1Pqo7Q2lHlzbgzgYEE4kEYm9s,3950
 reconcile/aws_account_manager/metrics.py,sha256=YB10ea4kIGwJfs5N14RF-RoXPb-QQWaDBz1jLZ3YWE0,917
 reconcile/aws_account_manager/reconciler.py,sha256=8mwwcWVVNoUzmttzxgnLyePqN823v1t_dQCNCrx1mG0,15035
 reconcile/aws_account_manager/utils.py,sha256=iYPPOtbZ7FiKkz9v5f1YXRIHw5YFOtSavUkF8oMwfJY,1439
@@ -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=_OqTpZ57TGdWR_0Oc9sT83JVilLKbAz5NbPm1EyL34I,133385
+tools/qontract_cli.py,sha256=sFwwL9GVUXnlxJV4glFKa1T4Q4IjNmgN0rex5aDIRyQ,135492
 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.1rc1129.dist-info/METADATA,sha256=Z1h9eqAPOgiPFSvnkYjuHeRDc1Xe5s3E1tX1VHVx1sc,2213
-qontract_reconcile-0.10.1rc1129.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-qontract_reconcile-0.10.1rc1129.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc1129.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc1129.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc1131.dist-info/METADATA,sha256=2COkT03GzJzpy3Gb1O-srsEwA9GQwzaBMm00k4pPxOI,2213
+qontract_reconcile-0.10.1rc1131.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+qontract_reconcile-0.10.1rc1131.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc1131.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc1131.dist-info/RECORD,,

reconcile/aws_account_manager/merge_request_manager.py

@@ -88,10 +88,12 @@ class MergeRequestManager:
             self._vcs.get_file_content_from_app_interface_master(
                 file_path=account_tmpl_file_path
             )
-            # File already exists
-            raise FileExistsError(
-                f"File {account_tmpl_file_path} already exists in the repository"
+            # File already exists. nothing to do.
+            logging.debug(
+                "The template collection file %s already exists. This may happen if the MR has been merged but template-renderer isn't running yet.",
+                account_tmpl_file_path,
             )
+            return
         except GitlabGetError as e:
             if e.response_code != 404:
                 raise e

tools/qontract_cli.py

@@ -1371,6 +1371,57 @@ def aws_creds(ctx, account_name):
     print(f"export AWS_SECRET_ACCESS_KEY={secret['aws_secret_access_key']}")
 
 
+@root.command()
+@click.argument("account_name")
+@click.argument("bucket")
+@click.argument("src")
+@click.argument("dest")
+@click.argument("region", required=False, default="us-east-1")
+@click.pass_context
+def copy_tfstate(ctx, account_name, bucket, src, dest, region):
+    """copy a manually managed terraform state file to the correct location expected by
+    the terraform-repo integration.
+
+    SRC should include the full filename including the extension
+
+    DEST should include the filename without extension.
+    """
+    settings = queries.get_app_interface_settings()
+    secret_reader = SecretReader(settings=settings)
+    accounts = queries.get_aws_accounts(name=account_name, terraform_state=True)
+    if not accounts:
+        print(f"{account_name} not found.")
+        sys.exit(1)
+    account = accounts[0]
+
+    state_key = [
+        i
+        for i in account["terraformState"]["integrations"]
+        if i["integration"] == "terraform-repo"
+    ]
+    if len(state_key) == 0:
+        logging.error(
+            "terraform-repo is missing a section in this account's '/dependencies/terraform-state-1.yml' file, please add one using the docs in https://gitlab.cee.redhat.com/service/app-interface/-/blob/master/docs/terraform-repo/sop/migrating-existing-state.md?ref_type=heads and then try again"
+        )
+        return
+
+    dest_key = f"{state_key[0]['key']}/{dest}-tf-repo.tfstate"
+    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,
+            }
+
+            s3_client.copy(copy_source, dest_bucket, dest_key)
+            logging.info("successfully copied the statefile to the new location")
+
+
 @get.command(short_help='obtain "rosa create cluster" command by cluster name')
 @click.argument("cluster_name")
 @click.pass_context