qontract-reconcile 0.10.1rc1148__py3-none-any.whl → 0.10.1rc1150__py3-none-any.whl

{qontract_reconcile-0.10.1rc1148.dist-info → qontract_reconcile-0.10.1rc1150.dist-info}/METADATA

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

@@ -574,7 +574,7 @@ reconcile/test/test_terraform_vpc_peerings.py,sha256=bpjCjhmic07cw3XKSHf-2JvmLuW
 reconcile/test/test_terraform_vpc_peerings_build_desired_state.py,sha256=cHmr1_yhRgfdqlFX6TMw-aiKXebaRv0szl16M9YRJic,49988
 reconcile/test/test_three_way_diff_strategy.py,sha256=v3rNkQFNy5e1uyfeNSlNBA07fvrPGD0aXD91Lgv8oxc,4062
 reconcile/test/test_utils_jinja2.py,sha256=rKugJEPl0qFC9joenJBXyk2qe-9md31-4EdxvQ2h5cs,4058
-reconcile/test/test_vault_replication.py,sha256=auadux0xrZb82xh7gKXThCQMct5nhbvujR-6m8um0yE,17522
+reconcile/test/test_vault_replication.py,sha256=WO18WnkXXQDqJ0FnSCl2HOiTfSY3LdRnKn_y6-Gre3w,17490
 reconcile/test/test_vault_utils.py,sha256=vbJnc89XAuE07qbTuWxHM5o9F6R9SO5aHXA38fwxT7A,1122
 reconcile/test/test_version_bump.py,sha256=q6-3Y1roriI6YWpFwaHOMN7emEP3yL33sh_0VdbmG7E,511
 reconcile/test/test_vpc_peerings_validator.py,sha256=dFSmjc_dMN2GqMbntCFpa7PUZmyYuQ9DKffh-T5wmxM,6639
@@ -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=OPfTSTyzhWrE1-s0Dl2L57aJ3soYpvAKKQmRlQnc6l0,139114
+tools/qontract_cli.py,sha256=dGK3kA7DS9ld63k3i4k8pY65D8MeQCjalte22TDXEwU,140204
 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.1rc1148.dist-info/METADATA,sha256=D-ZIpS5GYoipyMcDl5QuXJTq3n-DsESc0GbyvYDrNjM,2213
-qontract_reconcile-0.10.1rc1148.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-qontract_reconcile-0.10.1rc1148.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc1148.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc1148.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc1150.dist-info/METADATA,sha256=C_3wTc7F0vF9ai1ABtWqBjJCpW4gunMjA7cYGBSr5xU,2213
+qontract_reconcile-0.10.1rc1150.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+qontract_reconcile-0.10.1rc1150.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc1150.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc1150.dist-info/RECORD,,

reconcile/test/test_vault_replication.py

@@ -504,20 +504,19 @@ def test_get_policy_secret_list(mocker):
     vault_client.list_all.side_effect = [
         ["policy/path/1/secret1", "policy/path/1/secret2"],
         ["policy/path/2/secret1", "policy/path/2/secret2"],
-        ["my-policy/path_to_it/3/secret1"],
     ]
 
     assert set(
         integ.get_policy_secret_list(
             vault_client,
-            ["policy/path/1/*", "policy/path/2/*", "policy/path/3/secret1"],
+            ["policy/path/1/*", "policy/path/2/*", "policy/p-a_th/3/secret1_1-1"],
         )
     ) == {
         "policy/path/1/secret1",
         "policy/path/1/secret2",
         "policy/path/2/secret1",
         "policy/path/2/secret2",
-        "policy/path/3/secret1",
+        "policy/p-a_th/3/secret1_1-1",
     }
 
 

tools/qontract_cli.py

@@ -7,6 +7,7 @@ import logging
 import os
 import re
 import sys
+import textwrap
 from collections import defaultdict
 from datetime import (
     UTC,
@@ -1372,53 +1373,70 @@ def aws_creds(ctx, account_name):
 
 
 @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.option(
+    "--account-uid",
+    help="account UID of the account that owns the bucket",
+    required=True,
+)
+@click.option(
+    "--source-bucket",
+    help="aws bucket where the source statefile is stored",
+    required=True,
+)
+@click.option(
+    "--source-object-path",
+    help="path in the bucket where the statefile is stored",
+    required=True,
+)
+@click.option(
+    "--rename",
+    help="optionally rename the destination repo, otherwise keep the same name for the new location",
+)
+@click.option("--region", help="AWS region")
 @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, force):
-    """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.
-    """
+def copy_tfstate(
+    ctx, source_bucket, source_object_path, account_uid, rename, region, force
+):
     settings = queries.get_app_interface_settings()
     secret_reader = SecretReader(settings=settings)
-    accounts = queries.get_aws_accounts(name=account_name, terraform_state=True)
+    accounts = queries.get_aws_accounts(uid=account_uid, terraform_state=True)
     if not accounts:
-        print(f"{account_name} not found.")
+        print(f"{account_uid} not found in App-Interface.")
         sys.exit(1)
     account = accounts[0]
 
-    state_key = [
+    # terraform repo stores its statefiles within a "folder" in AWS S3 which is defined in App-Interface
+    dest_folder = [
         i
         for i in account["terraformState"]["integrations"]
         if i["integration"] == "terraform-repo"
     ]
-    if len(state_key) == 0:
+    if not dest_folder:
         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"
+            "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/getting-started.md?ref_type=heads#step-1-setup-aws-account and then try again"
         )
         return
 
-    dest_key = f"{state_key[0]['key']}/{dest}-tf-repo.tfstate"
+    dest_filename = ""
+    if rename:
+        dest_filename = rename.removesuffix(".tfstate")
+    else:
+        dest_filename = source_object_path.removesuffix(".tfstate")
+
+    dest_key = f"{dest_folder[0]['key']}/{dest_filename}-tf-repo.tfstate"
     dest_bucket = account["terraformState"]["bucket"]
 
     with AWSApi(1, accounts, settings, secret_reader) as aws:
-        session = aws.get_session(account_name)
+        session = aws.get_session(account["name"])
         s3_client = aws.get_session_client(session, "s3", region)
         copy_source = {
-            "Bucket": bucket,
-            "Key": src,
+            "Bucket": source_bucket,
+            "Key": source_object_path,
         }
 
         dest_pretty_path = f"s3://{dest_bucket}/{dest_key}"
@@ -1438,10 +1456,25 @@ def copy_tfstate(ctx, account_name, bucket, src, dest, region, force):
                 )
                 return
 
-        prompt_text = f"Are you sure you want to copy 's3://{bucket}/{src}' to '{dest_pretty_path}'?"
+        prompt_text = f"Are you sure you want to copy 's3://{source_bucket}/{source_object_path}' 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")
+            print(
+                textwrap.dedent(f"""
+                            Nicely done! Your tfstate file has been migrated. Now you can create a repo definition in App-Interface like so:
+
+                            ---
+                            $schema: /aws/terraform-repo-1.yml
+
+                            account:
+                                $ref: {account["path"]}
+
+                            name: {dest_filename}
+                            repository: <FILL_IN>
+                            projectPath: <FILL_IN>
+                            tfVersion: <FILL_IN>
+                            ref: <FILL_IN>""")
+            )
 
 
 @get.command(short_help='obtain "rosa create cluster" command by cluster name')