qontract-reconcile 0.10.1rc643__py3-none-any.whl → 0.10.1rc645__py3-none-any.whl

{qontract_reconcile-0.10.1rc643.dist-info → qontract_reconcile-0.10.1rc645.dist-info}/METADATA

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

@@ -610,8 +610,8 @@ reconcile/utils/sqs_gateway.py,sha256=gFl9DM4DmGnptuxTOe4lS3YTyE80eSAvK42ljS8h4d
 reconcile/utils/state.py,sha256=zjsprjbOb0WddzmAvh8ACqAt0fcayrX2YPfz7qceRWw,16090
 reconcile/utils/structs.py,sha256=LcbLEg8WxfRqM6nW7NhcWN0YeqF7SQzxOgntmLs1SgY,352
 reconcile/utils/template.py,sha256=wTvRU4AnAV_o042tD4Mwls2dwWMuk7MKnde3MaCjaYg,331
-reconcile/utils/terraform_client.py,sha256=6hcC0ibXkiFBn-0krVl11Bz29QcW2RI7l40pmTRrRfg,32092
-reconcile/utils/terrascript_aws_client.py,sha256=AqRnkEBQ3Zw5PS62vq2rUWUQrq3zyud3E3ilfIM2Hgc,270697
+reconcile/utils/terraform_client.py,sha256=7L55Rvxfzj3KtJH8AD8D8YRfBnFpHiTFqSa5e2_9jtk,32092
+reconcile/utils/terrascript_aws_client.py,sha256=Vs-t9AfMiH4vyqcT-rNy8cyWgEsPsO73Uj6un2v0SzI,270796
 reconcile/utils/three_way_diff_strategy.py,sha256=nyqeQsLCoPI6e16k2CF3b9KNgQLU-rPf5RtfdUfVMwE,4468
 reconcile/utils/throughput.py,sha256=iP4UWAe2LVhDo69mPPmgo9nQ7RxHD6_GS8MZe-aSiuM,344
 reconcile/utils/unleash.py,sha256=1D56CsZfE3ShDtN3IErE1T2eeIwNmxhK-yYbCotJ99E,3601
@@ -691,7 +691,7 @@ reconcile/utils/terraform/__init__.py,sha256=zNbiyTWo35AT1sFTElL2j_AA0jJ_yWE_bfF
 reconcile/utils/terraform/config.py,sha256=5UVrd563TMcvi4ooa5JvWVDW1I3bIWg484u79evfV_8,164
 reconcile/utils/terraform/config_client.py,sha256=py-Ree-QUYD6Hvng6bM40VgSuttteehIKNgwOSoJO1o,4706
 reconcile/utils/terrascript/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/utils/terrascript/cloudflare_client.py,sha256=9TwSxG2nKNGhJwoRyG46iUmsLncSsvBWnjdtPLjtnCQ,10445
+reconcile/utils/terrascript/cloudflare_client.py,sha256=2g_DYiWP4-k8KDxz9Nnxrk7ZpUZfL71HKcGm18fBtEk,10559
 reconcile/utils/terrascript/cloudflare_resources.py,sha256=quyHhbexW4Y2ksVyEouV0SVFtZLs42xPoELK4LvzAqw,16043
 reconcile/utils/terrascript/models.py,sha256=x9HReI0k71MHBpRTvvmPlE0G6rri5GTzPXM9cqyTWm0,475
 reconcile/utils/terrascript/resources.py,sha256=bQzglnO41KZZEIeXYgi-qlup1p8R03Qyx_V944LRPsc,1391
@@ -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.1rc643.dist-info/METADATA,sha256=hJlI8eQNeIkYkmz6h7Q4TShxMjldryYAwZsBViJgJUY,2382
-qontract_reconcile-0.10.1rc643.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-qontract_reconcile-0.10.1rc643.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
-qontract_reconcile-0.10.1rc643.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc643.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc645.dist-info/METADATA,sha256=1wGzUbVLQ8WpYF1TKKaiKxTAk1qgYHVlg1YqJ0NOy8U,2382
+qontract_reconcile-0.10.1rc645.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+qontract_reconcile-0.10.1rc645.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
+qontract_reconcile-0.10.1rc645.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc645.dist-info/RECORD,,

reconcile/utils/terraform_client.py

@@ -41,7 +41,7 @@ from reconcile.utils.external_resource_spec import (
     ExternalResourceSpecInventory,
 )
 
-ALLOWED_TF_SHOW_FORMAT_VERSION = "0.1"
+ALLOWED_TF_SHOW_FORMAT_VERSION = "1.2"
 DATE_FORMAT = "%Y-%m-%d"
 PROVIDER_LOG_REGEX = (
     r""".*\s(?:\[INFO]|\[WARN]|\[ERROR])\s.+\s(?:\[WARN]|\[ERROR])\s.*"""

reconcile/utils/terrascript/cloudflare_client.py

@@ -21,6 +21,7 @@ from terrascript import (
     provider,
 )
 
+from reconcile.cli import TERRAFORM_VERSION
 from reconcile.utils.exceptions import SecretIncompleteError
 from reconcile.utils.external_resource_spec import (
     ExternalResourceSpec,
@@ -103,7 +104,11 @@ def create_cloudflare_terrascript(
         }
     }
 
-    terrascript += Terraform(backend=backend, required_providers=required_providers)
+    terrascript += Terraform(
+        backend=backend,
+        required_providers=required_providers,
+        required_version=TERRAFORM_VERSION[0],
+    )
 
     cloudflare_provider_values = {
         "api_token": account_config.api_token,

reconcile/utils/terrascript_aws_client.py

@@ -142,6 +142,7 @@ from terrascript.resource import (
 
 import reconcile.utils.aws_helper as awsh
 from reconcile import queries
+from reconcile.cli import TERRAFORM_VERSION
 from reconcile.github_org import get_default_config
 from reconcile.gql_definitions.terraform_resources.terraform_resources_namespaces import (
     NamespaceTerraformResourceLifecycleV1,
@@ -449,6 +450,7 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
                         "version": "2.2.0",
                     },
                 },
+                required_version=TERRAFORM_VERSION[0],
             )
             tss[name] = ts
             locks[name] = Lock()