qontract-reconcile 0.10.2.dev122__py3-none-any.whl → 0.10.2.dev124__py3-none-any.whl

{qontract_reconcile-0.10.2.dev122.dist-info → qontract_reconcile-0.10.2.dev124.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev122
+Version: 0.10.2.dev124
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Project-URL: homepage, https://github.com/app-sre/qontract-reconcile
 Project-URL: repository, https://github.com/app-sre/qontract-reconcile

{qontract_reconcile-0.10.2.dev122.dist-info → qontract_reconcile-0.10.2.dev124.dist-info}/RECORD

@@ -227,7 +227,7 @@ reconcile/glitchtip_project_alerts/integration.py,sha256=BgMx-NyV9mTuv7Sotb2OioC
 reconcile/glitchtip_project_dsn/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/glitchtip_project_dsn/integration.py,sha256=2iugub-kHYkHNK33n0v9_TeWonuxCPah_VkoTPvaajE,8077
 reconcile/gql_definitions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/gql_definitions/introspection.json,sha256=_jq9M-0AjHkgGDguglV1mi29Ajk7yfpSKh28LOouPb4,2281058
+reconcile/gql_definitions/introspection.json,sha256=eHbVnokhdU5AjF1vnm2I_zHzU7-eH4rozjv45iZgHPs,2282580
 reconcile/gql_definitions/acs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/acs/acs_instances.py,sha256=L91WW9LbhJbBSrECqShQpFtjoBOsmNIYLRpMbx1io5o,2181
 reconcile/gql_definitions/acs/acs_policies.py,sha256=bN5i4mks10Z23KJSj7jqp966Osq2dps4d-sPH9gjxEA,7008
@@ -426,7 +426,7 @@ reconcile/gql_definitions/terraform_repo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5
 reconcile/gql_definitions/terraform_repo/terraform_repo.py,sha256=9cDKdP9ziBh9J_mw2Gi6GUOP4mFxMABY_D62qSeMtJI,3881
 reconcile/gql_definitions/terraform_resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/terraform_resources/database_access_manager.py,sha256=yv0_YC-LmhaKD_gyGG3le1w5BtypBjlsO894-Zgdg4U,4813
-reconcile/gql_definitions/terraform_resources/terraform_resources_namespaces.py,sha256=mBIs4VaMhEhy7DyTDWMpTlWkSWBEbHci5fb-FweN0e4,43692
+reconcile/gql_definitions/terraform_resources/terraform_resources_namespaces.py,sha256=8J0WW7F4Q6IHfLu85aeYNHSjJWSuypJsOBukJSleCiY,43944
 reconcile/gql_definitions/terraform_tgw_attachments/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/terraform_tgw_attachments/aws_accounts.py,sha256=FPyPEikpkZ_kvHfXqnkzSUDNmxMMTiUwhI-eLQtuIHM,2616
 reconcile/gql_definitions/unleash_feature_toggles/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -635,7 +635,7 @@ reconcile/utils/parse_dhms_duration.py,sha256=TONpLnec5gHeF7k815YNJpQyDjXhkxZIcv
 reconcile/utils/password_validator.py,sha256=XwuWg-8CPlcuG7dl_oQ1G1h2gSVSnfMym_VkuprpWVg,2183
 reconcile/utils/prometheus.py,sha256=Ad0rwLbxRuuYjHwkwJloHEdK0bvy42h-p-HIT1DhDhs,3832
 reconcile/utils/promotion_state.py,sha256=McSgGj3oog83ThJCrMR2v8q6Xb_Pxij-HEe_RbDu8cg,3946
-reconcile/utils/promtool.py,sha256=qOWgRY9-HgfTAcQz8NnLfnZn2WtCAvRAr85YQRXvMSA,2831
+reconcile/utils/promtool.py,sha256=xmPBWEApkk0L2qZBAvTxakNXxfTz-tVLPFxGnpsxXnM,2831
 reconcile/utils/quay_api.py,sha256=uE_jxcdy3ViHtYFAfwDQuFDaO7Pr6AAPoVnmORbyHio,7822
 reconcile/utils/raw_github_api.py,sha256=2WKtE8ABYYB9UGOAh9N_kLkksBWL3320Z2_scteZddI,2805
 reconcile/utils/repo_owners.py,sha256=BHrAXxKyvn4qWJwFPWYGTtfgnLmYnWtYFEJGFeD__FE,6573
@@ -651,7 +651,7 @@ reconcile/utils/state.py,sha256=az4tBmZ0EdbFcAGiBVUxs3cr2-BVWsuDQiNTvjjQq8s,1637
 reconcile/utils/structs.py,sha256=LcbLEg8WxfRqM6nW7NhcWN0YeqF7SQzxOgntmLs1SgY,352
 reconcile/utils/template.py,sha256=wTvRU4AnAV_o042tD4Mwls2dwWMuk7MKnde3MaCjaYg,331
 reconcile/utils/terraform_client.py,sha256=IDlrNvGEc2i6ElZIL_fzaJEad1nRC3DkP9_VXhJXmU0,37329
-reconcile/utils/terrascript_aws_client.py,sha256=4NNr1zYd2NNrR7q8W-YDkZOg5DvX-pStYEBRD12sebM,287496
+reconcile/utils/terrascript_aws_client.py,sha256=ChryO_v1CkGO1rhHL46qlwrHaW8BraAvuHapuxZ_EZM,287952
 reconcile/utils/three_way_diff_strategy.py,sha256=oQcHXd9LVhirJfoaOBoHUYuZVGfyL2voKr6KVI34zZE,4833
 reconcile/utils/throughput.py,sha256=iP4UWAe2LVhDo69mPPmgo9nQ7RxHD6_GS8MZe-aSiuM,344
 reconcile/utils/vault.py,sha256=aSA8l9cJlPUHpChFGl27nSY-Mpq9FMjBo7Dcgb1BVfM,15036
@@ -791,7 +791,7 @@ tools/saas_promotion_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 tools/saas_promotion_state/saas_promotion_state.py,sha256=UfwwRLS5Ya4_Nh1w5n1dvoYtchQvYE9yj1VANt2IKqI,3925
 tools/sre_checkpoints/__init__.py,sha256=CDaDaywJnmRCLyl_NCcvxi-Zc0hTi_3OdwKiFOyS39I,145
 tools/sre_checkpoints/util.py,sha256=zEDbGr18ZeHNQwW8pUsr2JRjuXIPz--WAGJxZo9sv_Y,894
-qontract_reconcile-0.10.2.dev122.dist-info/METADATA,sha256=Yvm5EADlY1tmAqXuNbsDWX88DNMZJeywiaQOYZuGBAw,24566
-qontract_reconcile-0.10.2.dev122.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev122.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev122.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev124.dist-info/METADATA,sha256=ArQaaGzA1InWUIlblpMRecxYGdRBSLgWmwSSmUE2lmc,24566
+qontract_reconcile-0.10.2.dev124.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev124.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev124.dist-info/RECORD,,

reconcile/gql_definitions/introspection.json

@@ -47241,6 +47241,42 @@
                             },
                             "isDeprecated": false,
                             "deprecationReason": null
+                        },
+                        {
+                            "name": "port",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "SCALAR",
+                                "name": "Int",
+                                "ofType": null
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "path",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "SCALAR",
+                                "name": "String",
+                                "ofType": null
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "protocol",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "SCALAR",
+                                "name": "String",
+                                "ofType": null
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
                         }
                     ],
                     "inputFields": null,

reconcile/gql_definitions/terraform_resources/terraform_resources_namespaces.py

@@ -324,6 +324,9 @@ query TerraformResourcesNamespaces {
                         timeout
                         interval
                         healthy_threshold
+                        path
+                        port
+                        protocol
                     }
                 }
                 rules {
@@ -810,6 +813,9 @@ class NamespaceTerraformResourceALBTargetHealthcheckV1(ConfiguredBaseModel):
     timeout: Optional[int] = Field(..., alias="timeout")
     interval: Optional[int] = Field(..., alias="interval")
     healthy_threshold: Optional[int] = Field(..., alias="healthy_threshold")
+    path: Optional[str] = Field(..., alias="path")
+    port: Optional[int] = Field(..., alias="port")
+    protocol: Optional[str] = Field(..., alias="protocol")
 
 
 class NamespaceTerraformResourceALBTargetsV1(ConfiguredBaseModel):

reconcile/utils/promtool.py

@@ -9,7 +9,7 @@ import yaml
 from reconcile.utils.defer import defer
 from reconcile.utils.structs import CommandExecutionResult
 
-PROMTOOL_VERSION = ["2.33.3"]
+PROMTOOL_VERSION = ["2.54.1"]
 PROMTOOL_VERSION_REGEX = r"^promtool,\sversion\s([\d]+\.[\d]+\.[\d]+).+$"
 
 

reconcile/utils/terrascript_aws_client.py

@@ -5380,6 +5380,9 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
             health_check_timeout = 5
             health_check_unhealthy_threshold = 3
             health_check_healthy_threshold = 3
+            health_check_path = "/"
+            health_check_protocol = "HTTPS"
+            health_check_port = 443
             if health_check := t.get("health_check"):
                 health_check_interval = (
                     health_check.get("interval") or health_check_interval
@@ -5395,6 +5398,11 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
                     health_check.get("healthy_threshold")
                     or health_check_healthy_threshold
                 )
+                health_check_path = health_check.get("path") or health_check_path
+                health_check_port = health_check.get("port") or health_check_port
+                health_check_protocol = (
+                    health_check.get("protocol") or health_check_protocol
+                )
 
             # https://www.terraform.io/docs/providers/aws/r/
             # lb_target_group.html
@@ -5411,9 +5419,9 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
                     "timeout": health_check_timeout,
                     "unhealthy_threshold": health_check_unhealthy_threshold,
                     "healthy_threshold": health_check_healthy_threshold,
-                    "path": "/",
-                    "protocol": "HTTPS",
-                    "port": 443,
+                    "path": health_check_path,
+                    "protocol": health_check_protocol,
+                    "port": health_check_port,
                 },
                 "lifecycle": {
                     "create_before_destroy": True,