qontract-reconcile 0.10.2.dev152__py3-none-any.whl → 0.10.2.dev153__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.dev152
3
+ Version: 0.10.2.dev153
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
@@ -657,7 +657,7 @@ reconcile/utils/state.py,sha256=az4tBmZ0EdbFcAGiBVUxs3cr2-BVWsuDQiNTvjjQq8s,1637
657
657
  reconcile/utils/structs.py,sha256=LcbLEg8WxfRqM6nW7NhcWN0YeqF7SQzxOgntmLs1SgY,352
658
658
  reconcile/utils/template.py,sha256=wTvRU4AnAV_o042tD4Mwls2dwWMuk7MKnde3MaCjaYg,331
659
659
  reconcile/utils/terraform_client.py,sha256=IDlrNvGEc2i6ElZIL_fzaJEad1nRC3DkP9_VXhJXmU0,37329
660
- reconcile/utils/terrascript_aws_client.py,sha256=WMT9cZ4Cu4vjiIgRiTMyZ3Iio2_HNODg2OlrWGW9nQA,288803
660
+ reconcile/utils/terrascript_aws_client.py,sha256=FH4BFlAhTN9KughGlSUF75XpsquilIe4MGyLz4E9CGc,288893
661
661
  reconcile/utils/three_way_diff_strategy.py,sha256=oQcHXd9LVhirJfoaOBoHUYuZVGfyL2voKr6KVI34zZE,4833
662
662
  reconcile/utils/throughput.py,sha256=iP4UWAe2LVhDo69mPPmgo9nQ7RxHD6_GS8MZe-aSiuM,344
663
663
  reconcile/utils/vault.py,sha256=aSA8l9cJlPUHpChFGl27nSY-Mpq9FMjBo7Dcgb1BVfM,15036
@@ -797,7 +797,7 @@ tools/saas_promotion_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
797
797
  tools/saas_promotion_state/saas_promotion_state.py,sha256=UfwwRLS5Ya4_Nh1w5n1dvoYtchQvYE9yj1VANt2IKqI,3925
798
798
  tools/sre_checkpoints/__init__.py,sha256=CDaDaywJnmRCLyl_NCcvxi-Zc0hTi_3OdwKiFOyS39I,145
799
799
  tools/sre_checkpoints/util.py,sha256=zEDbGr18ZeHNQwW8pUsr2JRjuXIPz--WAGJxZo9sv_Y,894
800
- qontract_reconcile-0.10.2.dev152.dist-info/METADATA,sha256=vJsdGK7g6V30epBk2e5-Z3IjYTweJywk5bBbC636psU,24627
801
- qontract_reconcile-0.10.2.dev152.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
802
- qontract_reconcile-0.10.2.dev152.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
803
- qontract_reconcile-0.10.2.dev152.dist-info/RECORD,,
800
+ qontract_reconcile-0.10.2.dev153.dist-info/METADATA,sha256=ZrltsVvXSSiCsv4o8Yfra_Dxd8OJfIPEO7M6CByNhQo,24627
801
+ qontract_reconcile-0.10.2.dev153.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
802
+ qontract_reconcile-0.10.2.dev153.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
803
+ qontract_reconcile-0.10.2.dev153.dist-info/RECORD,,
@@ -4639,11 +4639,14 @@ class TerrascriptClient: # pylint: disable=too-many-public-methods
4639
4639
  admin_user_secret = auth_options["admin_user_credentials"]
4640
4640
  secret_data = self.secret_reader.read_all(admin_user_secret)
4641
4641
 
4642
- required_keys = {"master_user_name", "master_user_password"}
4643
- if secret_data.keys() != required_keys:
4642
+ required_keys = {
4643
+ "master_user_name",
4644
+ "master_user_password",
4645
+ }
4646
+ if not (required_keys <= secret_data.keys()):
4644
4647
  raise KeyError(
4645
4648
  f"vault secret '{admin_user_secret['path']}' must "
4646
- f"exactly contain these keys: {', '.join(required_keys)}"
4649
+ f"contain these keys: {', '.join(required_keys)}"
4647
4650
  )
4648
4651
 
4649
4652
  # AWS requires the admin user password must be at least 8 chars long, contain at least one
@@ -5005,11 +5008,14 @@ class TerrascriptClient: # pylint: disable=too-many-public-methods
5005
5008
  master_user_secret = master_user_options["master_user_secret"]
5006
5009
  secret_data = self.secret_reader.read_all(master_user_secret)
5007
5010
 
5008
- required_keys = {"master_user_name", "master_user_password"}
5009
- if secret_data.keys() != required_keys:
5011
+ required_keys = {
5012
+ "master_user_name",
5013
+ "master_user_password",
5014
+ }
5015
+ if not (required_keys <= secret_data.keys()):
5010
5016
  raise KeyError(
5011
5017
  f"vault secret '{master_user_secret['path']}' must "
5012
- f"exactly contain these keys: {', '.join(required_keys)}"
5018
+ f"contain these keys: {', '.join(required_keys)}"
5013
5019
  )
5014
5020
 
5015
5021
  advanced_security_options["master_user_options"] = secret_data