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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: qontract-reconcile
3
- Version: 0.10.2.dev122
3
+ Version: 0.10.2.dev124
4
4
  Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
5
5
  Project-URL: homepage, https://github.com/app-sre/qontract-reconcile
6
6
  Project-URL: repository, https://github.com/app-sre/qontract-reconcile
@@ -227,7 +227,7 @@ reconcile/glitchtip_project_alerts/integration.py,sha256=BgMx-NyV9mTuv7Sotb2OioC
227
227
  reconcile/glitchtip_project_dsn/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
228
228
  reconcile/glitchtip_project_dsn/integration.py,sha256=2iugub-kHYkHNK33n0v9_TeWonuxCPah_VkoTPvaajE,8077
229
229
  reconcile/gql_definitions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
230
- reconcile/gql_definitions/introspection.json,sha256=_jq9M-0AjHkgGDguglV1mi29Ajk7yfpSKh28LOouPb4,2281058
230
+ reconcile/gql_definitions/introspection.json,sha256=eHbVnokhdU5AjF1vnm2I_zHzU7-eH4rozjv45iZgHPs,2282580
231
231
  reconcile/gql_definitions/acs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
232
232
  reconcile/gql_definitions/acs/acs_instances.py,sha256=L91WW9LbhJbBSrECqShQpFtjoBOsmNIYLRpMbx1io5o,2181
233
233
  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
426
426
  reconcile/gql_definitions/terraform_repo/terraform_repo.py,sha256=9cDKdP9ziBh9J_mw2Gi6GUOP4mFxMABY_D62qSeMtJI,3881
427
427
  reconcile/gql_definitions/terraform_resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
428
428
  reconcile/gql_definitions/terraform_resources/database_access_manager.py,sha256=yv0_YC-LmhaKD_gyGG3le1w5BtypBjlsO894-Zgdg4U,4813
429
- reconcile/gql_definitions/terraform_resources/terraform_resources_namespaces.py,sha256=mBIs4VaMhEhy7DyTDWMpTlWkSWBEbHci5fb-FweN0e4,43692
429
+ reconcile/gql_definitions/terraform_resources/terraform_resources_namespaces.py,sha256=8J0WW7F4Q6IHfLu85aeYNHSjJWSuypJsOBukJSleCiY,43944
430
430
  reconcile/gql_definitions/terraform_tgw_attachments/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
431
431
  reconcile/gql_definitions/terraform_tgw_attachments/aws_accounts.py,sha256=FPyPEikpkZ_kvHfXqnkzSUDNmxMMTiUwhI-eLQtuIHM,2616
432
432
  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
635
635
  reconcile/utils/password_validator.py,sha256=XwuWg-8CPlcuG7dl_oQ1G1h2gSVSnfMym_VkuprpWVg,2183
636
636
  reconcile/utils/prometheus.py,sha256=Ad0rwLbxRuuYjHwkwJloHEdK0bvy42h-p-HIT1DhDhs,3832
637
637
  reconcile/utils/promotion_state.py,sha256=McSgGj3oog83ThJCrMR2v8q6Xb_Pxij-HEe_RbDu8cg,3946
638
- reconcile/utils/promtool.py,sha256=qOWgRY9-HgfTAcQz8NnLfnZn2WtCAvRAr85YQRXvMSA,2831
638
+ reconcile/utils/promtool.py,sha256=xmPBWEApkk0L2qZBAvTxakNXxfTz-tVLPFxGnpsxXnM,2831
639
639
  reconcile/utils/quay_api.py,sha256=uE_jxcdy3ViHtYFAfwDQuFDaO7Pr6AAPoVnmORbyHio,7822
640
640
  reconcile/utils/raw_github_api.py,sha256=2WKtE8ABYYB9UGOAh9N_kLkksBWL3320Z2_scteZddI,2805
641
641
  reconcile/utils/repo_owners.py,sha256=BHrAXxKyvn4qWJwFPWYGTtfgnLmYnWtYFEJGFeD__FE,6573
@@ -651,7 +651,7 @@ reconcile/utils/state.py,sha256=az4tBmZ0EdbFcAGiBVUxs3cr2-BVWsuDQiNTvjjQq8s,1637
651
651
  reconcile/utils/structs.py,sha256=LcbLEg8WxfRqM6nW7NhcWN0YeqF7SQzxOgntmLs1SgY,352
652
652
  reconcile/utils/template.py,sha256=wTvRU4AnAV_o042tD4Mwls2dwWMuk7MKnde3MaCjaYg,331
653
653
  reconcile/utils/terraform_client.py,sha256=IDlrNvGEc2i6ElZIL_fzaJEad1nRC3DkP9_VXhJXmU0,37329
654
- reconcile/utils/terrascript_aws_client.py,sha256=4NNr1zYd2NNrR7q8W-YDkZOg5DvX-pStYEBRD12sebM,287496
654
+ reconcile/utils/terrascript_aws_client.py,sha256=ChryO_v1CkGO1rhHL46qlwrHaW8BraAvuHapuxZ_EZM,287952
655
655
  reconcile/utils/three_way_diff_strategy.py,sha256=oQcHXd9LVhirJfoaOBoHUYuZVGfyL2voKr6KVI34zZE,4833
656
656
  reconcile/utils/throughput.py,sha256=iP4UWAe2LVhDo69mPPmgo9nQ7RxHD6_GS8MZe-aSiuM,344
657
657
  reconcile/utils/vault.py,sha256=aSA8l9cJlPUHpChFGl27nSY-Mpq9FMjBo7Dcgb1BVfM,15036
@@ -791,7 +791,7 @@ tools/saas_promotion_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
791
791
  tools/saas_promotion_state/saas_promotion_state.py,sha256=UfwwRLS5Ya4_Nh1w5n1dvoYtchQvYE9yj1VANt2IKqI,3925
792
792
  tools/sre_checkpoints/__init__.py,sha256=CDaDaywJnmRCLyl_NCcvxi-Zc0hTi_3OdwKiFOyS39I,145
793
793
  tools/sre_checkpoints/util.py,sha256=zEDbGr18ZeHNQwW8pUsr2JRjuXIPz--WAGJxZo9sv_Y,894
794
- qontract_reconcile-0.10.2.dev122.dist-info/METADATA,sha256=Yvm5EADlY1tmAqXuNbsDWX88DNMZJeywiaQOYZuGBAw,24566
795
- qontract_reconcile-0.10.2.dev122.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
796
- qontract_reconcile-0.10.2.dev122.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
797
- qontract_reconcile-0.10.2.dev122.dist-info/RECORD,,
794
+ qontract_reconcile-0.10.2.dev124.dist-info/METADATA,sha256=ArQaaGzA1InWUIlblpMRecxYGdRBSLgWmwSSmUE2lmc,24566
795
+ qontract_reconcile-0.10.2.dev124.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
796
+ qontract_reconcile-0.10.2.dev124.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
797
+ qontract_reconcile-0.10.2.dev124.dist-info/RECORD,,
@@ -47241,6 +47241,42 @@
47241
47241
  },
47242
47242
  "isDeprecated": false,
47243
47243
  "deprecationReason": null
47244
+ },
47245
+ {
47246
+ "name": "port",
47247
+ "description": null,
47248
+ "args": [],
47249
+ "type": {
47250
+ "kind": "SCALAR",
47251
+ "name": "Int",
47252
+ "ofType": null
47253
+ },
47254
+ "isDeprecated": false,
47255
+ "deprecationReason": null
47256
+ },
47257
+ {
47258
+ "name": "path",
47259
+ "description": null,
47260
+ "args": [],
47261
+ "type": {
47262
+ "kind": "SCALAR",
47263
+ "name": "String",
47264
+ "ofType": null
47265
+ },
47266
+ "isDeprecated": false,
47267
+ "deprecationReason": null
47268
+ },
47269
+ {
47270
+ "name": "protocol",
47271
+ "description": null,
47272
+ "args": [],
47273
+ "type": {
47274
+ "kind": "SCALAR",
47275
+ "name": "String",
47276
+ "ofType": null
47277
+ },
47278
+ "isDeprecated": false,
47279
+ "deprecationReason": null
47244
47280
  }
47245
47281
  ],
47246
47282
  "inputFields": null,
@@ -324,6 +324,9 @@ query TerraformResourcesNamespaces {
324
324
  timeout
325
325
  interval
326
326
  healthy_threshold
327
+ path
328
+ port
329
+ protocol
327
330
  }
328
331
  }
329
332
  rules {
@@ -810,6 +813,9 @@ class NamespaceTerraformResourceALBTargetHealthcheckV1(ConfiguredBaseModel):
810
813
  timeout: Optional[int] = Field(..., alias="timeout")
811
814
  interval: Optional[int] = Field(..., alias="interval")
812
815
  healthy_threshold: Optional[int] = Field(..., alias="healthy_threshold")
816
+ path: Optional[str] = Field(..., alias="path")
817
+ port: Optional[int] = Field(..., alias="port")
818
+ protocol: Optional[str] = Field(..., alias="protocol")
813
819
 
814
820
 
815
821
  class NamespaceTerraformResourceALBTargetsV1(ConfiguredBaseModel):
@@ -9,7 +9,7 @@ import yaml
9
9
  from reconcile.utils.defer import defer
10
10
  from reconcile.utils.structs import CommandExecutionResult
11
11
 
12
- PROMTOOL_VERSION = ["2.33.3"]
12
+ PROMTOOL_VERSION = ["2.54.1"]
13
13
  PROMTOOL_VERSION_REGEX = r"^promtool,\sversion\s([\d]+\.[\d]+\.[\d]+).+$"
14
14
 
15
15
 
@@ -5380,6 +5380,9 @@ class TerrascriptClient: # pylint: disable=too-many-public-methods
5380
5380
  health_check_timeout = 5
5381
5381
  health_check_unhealthy_threshold = 3
5382
5382
  health_check_healthy_threshold = 3
5383
+ health_check_path = "/"
5384
+ health_check_protocol = "HTTPS"
5385
+ health_check_port = 443
5383
5386
  if health_check := t.get("health_check"):
5384
5387
  health_check_interval = (
5385
5388
  health_check.get("interval") or health_check_interval
@@ -5395,6 +5398,11 @@ class TerrascriptClient: # pylint: disable=too-many-public-methods
5395
5398
  health_check.get("healthy_threshold")
5396
5399
  or health_check_healthy_threshold
5397
5400
  )
5401
+ health_check_path = health_check.get("path") or health_check_path
5402
+ health_check_port = health_check.get("port") or health_check_port
5403
+ health_check_protocol = (
5404
+ health_check.get("protocol") or health_check_protocol
5405
+ )
5398
5406
 
5399
5407
  # https://www.terraform.io/docs/providers/aws/r/
5400
5408
  # lb_target_group.html
@@ -5411,9 +5419,9 @@ class TerrascriptClient: # pylint: disable=too-many-public-methods
5411
5419
  "timeout": health_check_timeout,
5412
5420
  "unhealthy_threshold": health_check_unhealthy_threshold,
5413
5421
  "healthy_threshold": health_check_healthy_threshold,
5414
- "path": "/",
5415
- "protocol": "HTTPS",
5416
- "port": 443,
5422
+ "path": health_check_path,
5423
+ "protocol": health_check_protocol,
5424
+ "port": health_check_port,
5417
5425
  },
5418
5426
  "lifecycle": {
5419
5427
  "create_before_destroy": True,