qontract-reconcile 0.10.1rc1153__py3-none-any.whl → 0.10.1rc1154__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.1
2
2
  Name: qontract-reconcile
3
- Version: 0.10.1rc1153
3
+ Version: 0.10.1rc1154
4
4
  Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
5
5
  Home-page: https://github.com/app-sre/qontract-reconcile
6
6
  Author: Red Hat App-SRE Team
@@ -199,7 +199,7 @@ reconcile/external_resources/integration_secrets_sync.py,sha256=dX09O3r6KURziUYY
199
199
  reconcile/external_resources/manager.py,sha256=wcqTawNS4qoBHFVfyCfHtWXh4L3AlgcNYx_Ov_vEjNg,17914
200
200
  reconcile/external_resources/meta.py,sha256=noaytFzmShpzLA_ebGh7wuP45mOfHIOnnoUxivjDa1I,672
201
201
  reconcile/external_resources/metrics.py,sha256=nMbyonGZEJDD1lYzpQY2eR9TNwvxYC4ZCcpi6wrExcM,1037
202
- reconcile/external_resources/model.py,sha256=ibOd0pa6hyJX-MK3LGVxOa3ra_Xfq7mbd5T_9d3bfhM,8444
202
+ reconcile/external_resources/model.py,sha256=Ta8eOJ97RxCgBtWqsF4MWzQhgsOC2PoFfBKM5y3rM6U,8378
203
203
  reconcile/external_resources/reconciler.py,sha256=3KFmkHsN7YAwJUSBpN1Xd_D2zM9Ea5_c2uMGWsfruZo,9707
204
204
  reconcile/external_resources/secrets_sync.py,sha256=6n0oDPLjd9Ql0lf6zsr1AZw8A6EEe3yCzl20XodtgkE,16229
205
205
  reconcile/external_resources/state.py,sha256=UupSa6tl4-73_J6Fhisn-qHal3v3uAUS5s5sk85LGDs,9343
@@ -880,8 +880,8 @@ tools/test/test_qontract_cli.py,sha256=iuzKbQ6ahinvjoQmQLBrG4shey0z-1rB6qCgS8T6d
880
880
  tools/test/test_saas_promotion_state.py,sha256=dy4kkSSAQ7bC0Xp2CociETGN-2aABEfL6FU5D9Jl00Y,6056
881
881
  tools/test/test_sd_app_sre_alert_report.py,sha256=v363r9zM7__0kR5K6mvJoGFcM9BvE33fWAayrqkpojA,2116
882
882
  tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
883
- qontract_reconcile-0.10.1rc1153.dist-info/METADATA,sha256=W7PsNpp1_srAAOioGMxIeZNzgmkrmBV5ra6opFDI-58,2213
884
- qontract_reconcile-0.10.1rc1153.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
885
- qontract_reconcile-0.10.1rc1153.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
886
- qontract_reconcile-0.10.1rc1153.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
887
- qontract_reconcile-0.10.1rc1153.dist-info/RECORD,,
883
+ qontract_reconcile-0.10.1rc1154.dist-info/METADATA,sha256=S0xB9gH65bXGiy_EaEsoUw8L6KbifPatRapCwmnBAS0,2213
884
+ qontract_reconcile-0.10.1rc1154.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
885
+ qontract_reconcile-0.10.1rc1154.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
886
+ qontract_reconcile-0.10.1rc1154.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
887
+ qontract_reconcile-0.10.1rc1154.dist-info/RECORD,,
@@ -76,7 +76,25 @@ SUPPORTED_RESOURCE_TYPES = (
76
76
 
77
77
 
78
78
  class ExternalResourcesInventory(MutableMapping):
79
- _inventory: dict[ExternalResourceKey, ExternalResourceSpec] = {}
79
+ def __init__(self, namespaces: Iterable[NamespaceV1]) -> None:
80
+ self._inventory: dict[ExternalResourceKey, ExternalResourceSpec] = {}
81
+
82
+ desired_providers = [
83
+ (p, ns)
84
+ for ns in namespaces
85
+ for p in ns.external_resources or []
86
+ if isinstance(p, SUPPORTED_RESOURCE_PROVIDERS) and p.resources
87
+ ]
88
+
89
+ desired_specs = [
90
+ self._build_external_resource_spec(ns, p, r)
91
+ for (p, ns) in desired_providers
92
+ for r in p.resources
93
+ if isinstance(r, SUPPORTED_RESOURCE_TYPES) and r.managed_by_erv2
94
+ ]
95
+
96
+ for spec in desired_specs:
97
+ self._inventory[ExternalResourceKey.from_spec(spec)] = spec
80
98
 
81
99
  def _build_external_resource_spec(
82
100
  self,
@@ -100,24 +118,6 @@ class ExternalResourcesInventory(MutableMapping):
100
118
  spec.metadata[MODULE_OVERRIDES] = resource.module_overrides
101
119
  return spec
102
120
 
103
- def __init__(self, namespaces: Iterable[NamespaceV1]) -> None:
104
- desired_providers = [
105
- (p, ns)
106
- for ns in namespaces
107
- for p in ns.external_resources or []
108
- if isinstance(p, SUPPORTED_RESOURCE_PROVIDERS) and p.resources
109
- ]
110
-
111
- desired_specs = [
112
- self._build_external_resource_spec(ns, p, r)
113
- for (p, ns) in desired_providers
114
- for r in p.resources
115
- if isinstance(r, SUPPORTED_RESOURCE_TYPES) and r.managed_by_erv2
116
- ]
117
-
118
- for spec in desired_specs:
119
- self._inventory[ExternalResourceKey.from_spec(spec)] = spec
120
-
121
121
  def __getitem__(self, key: ExternalResourceKey) -> ExternalResourceSpec | None:
122
122
  return self._inventory[key]
123
123
 
@@ -161,8 +161,6 @@ class ExternalResourceModuleKey(BaseModel, frozen=True):
161
161
 
162
162
 
163
163
  class ModuleInventory:
164
- inventory: dict[ExternalResourceModuleKey, ExternalResourcesModuleV1]
165
-
166
164
  def __init__(
167
165
  self, inventory: dict[ExternalResourceModuleKey, ExternalResourcesModuleV1]
168
166
  ):