qontract-reconcile 0.10.1rc639__py3-none-any.whl → 0.10.1rc640__py3-none-any.whl

{qontract_reconcile-0.10.1rc639.dist-info → qontract_reconcile-0.10.1rc640.dist-info}/METADATA

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

@@ -111,7 +111,7 @@ reconcile/terraform_cloudflare_dns.py,sha256=auU4bzeLwd4S8D8oqpqJbrCUoEdELXrgi7v
 reconcile/terraform_cloudflare_resources.py,sha256=EbQQaoDnZ7brvRCpbFtwlD7KLk2hDVNcjhrJGaAywEk,15023
 reconcile/terraform_cloudflare_users.py,sha256=1EbTHwJgiPkJpMP-Ag340QNgGK3mXn3dcC3DpLakudM,13987
 reconcile/terraform_repo.py,sha256=c0GZFuY3rCm6VHjHqYbsgOHrEkRWKF_1LrMThsn2XDw,16127
-reconcile/terraform_resources.py,sha256=hnW_C8i8am1rAojIOyoDG2FZofeBxK3GxH1S281eSqo,19278
+reconcile/terraform_resources.py,sha256=BN8XuJwjOt1ztruEAHydkd0YiBlb3fHZ7n0snZtRhck,19356
 reconcile/terraform_tgw_attachments.py,sha256=mWr4UU_bNBu9YzPN1MqLQPNlg9FOY7qi5EqQgg7ykos,15938
 reconcile/terraform_users.py,sha256=kXRUxCUchKCP2dbXXOzctynqMii4oyCP6bYZHQTrlTg,10202
 reconcile/terraform_vpc_peerings.py,sha256=rnDH1u93OyzrBM8Hib0HwSnlxZtx4ScRQaZAcn3mx-k,25402
@@ -466,7 +466,7 @@ reconcile/test/test_terraform_cloudflare_dns.py,sha256=aQTXX8Vr4h9aWvJZTnpZEhMGY
 reconcile/test/test_terraform_cloudflare_resources.py,sha256=NK_uktyWihkQ3gMN4bCaKerpi43CXAVYGIKTfcz05rY,13550
 reconcile/test/test_terraform_cloudflare_users.py,sha256=RAFtMMdqZha3jNnNNsqbNQQUDSqUzdoM63rCw7fs4Fo,27456
 reconcile/test/test_terraform_repo.py,sha256=soKFJfF8tWIimDs39RQl3Hnh-Od-bR4PfnEA2s1UprM,11552
-reconcile/test/test_terraform_resources.py,sha256=VQ9nCJfEWEaO7WonUmwgLYc5Sf6ansVRDJngtkL5qLg,15268
+reconcile/test/test_terraform_resources.py,sha256=EFCqPI5_G8hPRh1zmnU91o8wMeT2qK1CabDUa_X1rSk,15283
 reconcile/test/test_terraform_tgw_attachments.py,sha256=cAq6exc-K-jtLla1CZUZQzVnBkyDnIlL7jybnddhLKc,36861
 reconcile/test/test_terraform_users.py,sha256=Xn4y6EcxnNQb6XcPoOhz_Ikxmh9Nrsu88OM1scN9hzY,5434
 reconcile/test/test_terraform_vpc_peerings.py,sha256=ubcsKh0TrUIwuI1-W3ETIgzsFvzAyeoFmEJFC-IK6JY,20538
@@ -715,8 +715,8 @@ tools/test/test_app_interface_metrics_exporter.py,sha256=SX7qL3D1SIRKFo95FoQztvf
 tools/test/test_qontract_cli.py,sha256=OvalpVRfY4pNmpMaWHHYqBjV68b1eGQjX8SCyTAXb1w,3501
 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.1rc639.dist-info/METADATA,sha256=DNrRIZGZaEgHYnXjw6RGVIBhbKZP5t8S7P2UXtegTK4,2382
-qontract_reconcile-0.10.1rc639.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-qontract_reconcile-0.10.1rc639.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
-qontract_reconcile-0.10.1rc639.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc639.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc640.dist-info/METADATA,sha256=yGyS4wiJQccvkIo9N2MNCnbBdI2gKLZcw8quLh1Qgk4,2382
+qontract_reconcile-0.10.1rc640.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+qontract_reconcile-0.10.1rc640.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
+qontract_reconcile-0.10.1rc640.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc640.dist-info/RECORD,,

reconcile/terraform_resources.py

@@ -203,8 +203,10 @@ def get_aws_accounts(
         logging.error(message)
         raise ExcludeAccountsAndDryRunException(message)
 
-    if exclude_accounts and include_accounts:
-        message = "Using --exclude-accounts and --account-name at the same time is not allowed"
+    if (exclude_accounts and include_accounts) and any(
+        a in exclude_accounts for a in include_accounts
+    ):
+        message = "Using --exclude-accounts and --account-name with the same account is not allowed"
         logging.error(message)
         raise ExcludeAccountsAndAccountNameException(message)
 

reconcile/test/test_terraform_resources.py

@@ -23,12 +23,12 @@ def test_cannot_use_exclude_accounts_if_not_dry_run():
     assert "--exclude-accounts is only supported in dry-run mode" in str(excinfo.value)
 
 
-def test_cannot_use_exclude_account_with_account_name():
+def test_cannot_use_exclude_account_with_same_account_name():
     with pytest.raises(integ.ExcludeAccountsAndAccountNameException) as excinfo:
-        integ.run(True, exclude_accounts=("a", "b"), account_name=("c", "d"))
+        integ.run(True, exclude_accounts=("a", "b"), account_name=("b", "c", "d"))
 
     assert (
-        "Using --exclude-accounts and --account-name at the same time is not allowed"
+        "Using --exclude-accounts and --account-name with the same account is not allowed"
         in str(excinfo.value)
     )