qontract-reconcile 0.10.1rc896__py3-none-any.whl → 0.10.1rc898__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.1rc896
3
+ Version: 0.10.1rc898
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
@@ -366,7 +366,7 @@ reconcile/gql_definitions/status_board/status_board.py,sha256=vHEzncabujkqbjJ-ib
366
366
  reconcile/gql_definitions/statuspage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
367
367
  reconcile/gql_definitions/statuspage/statuspages.py,sha256=CTRzjiR9k41LqlkgyoNHwC2JERsoD_Run_aK7jw_Ono,5299
368
368
  reconcile/gql_definitions/templating/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
369
- reconcile/gql_definitions/templating/template_collection.py,sha256=Y1xA4ODphlsSMjGkAH-nm-dF5FzaQlpfs8hVMBczH5o,3542
369
+ reconcile/gql_definitions/templating/template_collection.py,sha256=GiCtqtTj8602ppCatuF9HhQkHXDOd76Z9CSJQ1KwBuc,3532
370
370
  reconcile/gql_definitions/templating/templates.py,sha256=ejAvQ13zfNMQTz3FWtRUic6dSvio3aAgBKEqt600hbk,2821
371
371
  reconcile/gql_definitions/terraform_cloudflare_dns/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
372
372
  reconcile/gql_definitions/terraform_cloudflare_dns/app_interface_cloudflare_dns_settings.py,sha256=eyGX9HcTF6MZbOYZ6Kl6Mg3k6nJTUtwqs9gDxBP_8Dk,1920
@@ -711,7 +711,7 @@ reconcile/utils/three_way_diff_strategy.py,sha256=OniTnogBkdgy_7Xg51N1MgjS-Qtk8u
711
711
  reconcile/utils/throughput.py,sha256=iP4UWAe2LVhDo69mPPmgo9nQ7RxHD6_GS8MZe-aSiuM,344
712
712
  reconcile/utils/vault.py,sha256=f4mJLKE5vGMvNBbo8Xe0dPFLF5-Vchs5Ry5lyf0FuMg,14902
713
713
  reconcile/utils/vaultsecretref.py,sha256=0KUSzuvTRxPyKY919TO3-B_eYg4_76fzKvMF8j5s1G0,911
714
- reconcile/utils/vcs.py,sha256=qQ2-fxW2QvhNMcPbzRoqPCTyOfbvEK5iaeDd4Wk5msw,8509
714
+ reconcile/utils/vcs.py,sha256=b6WNrczLoKs24O4E74me-fVuNHyPdXeBAAvUQ-bna-o,8879
715
715
  reconcile/utils/acs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
716
716
  reconcile/utils/acs/base.py,sha256=6bMvtvmqb8j7fvOYqKu3lMWQzRuhMmZ6xv1Gfyev1hU,2535
717
717
  reconcile/utils/acs/notifiers.py,sha256=WI2HEerP73vDDYtBW-mC40MQAbo-VcTJbonl4_rhCTk,4997
@@ -844,8 +844,8 @@ tools/test/test_qontract_cli.py,sha256=_D61RFGAN5x44CY1tYbouhlGXXABwYfxKSWSQx3Jr
844
844
  tools/test/test_saas_promotion_state.py,sha256=dy4kkSSAQ7bC0Xp2CociETGN-2aABEfL6FU5D9Jl00Y,6056
845
845
  tools/test/test_sd_app_sre_alert_report.py,sha256=v363r9zM7__0kR5K6mvJoGFcM9BvE33fWAayrqkpojA,2116
846
846
  tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
847
- qontract_reconcile-0.10.1rc896.dist-info/METADATA,sha256=pQ4m4fzozho-85m19cdPiHgEt_NkZDf975_26gaf1Jw,2273
848
- qontract_reconcile-0.10.1rc896.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
849
- qontract_reconcile-0.10.1rc896.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
850
- qontract_reconcile-0.10.1rc896.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
851
- qontract_reconcile-0.10.1rc896.dist-info/RECORD,,
847
+ qontract_reconcile-0.10.1rc898.dist-info/METADATA,sha256=djXoIdLZii-8g7SmSzukn2Eoa_UKCQg0OaD4rY1B85c,2273
848
+ qontract_reconcile-0.10.1rc898.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
849
+ qontract_reconcile-0.10.1rc898.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
850
+ qontract_reconcile-0.10.1rc898.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
851
+ qontract_reconcile-0.10.1rc898.dist-info/RECORD,,
@@ -58,7 +58,7 @@ class ConfiguredBaseModel(BaseModel):
58
58
 
59
59
 
60
60
  class TemplateCollectionForEachV1(ConfiguredBaseModel):
61
- items: Optional[list[Json]] = Field(..., alias="items")
61
+ items: list[Json] = Field(..., alias="items")
62
62
 
63
63
 
64
64
  class TemplateCollectionVariablesQueriesV1(ConfiguredBaseModel):
reconcile/utils/vcs.py CHANGED
@@ -37,6 +37,10 @@ class Commit:
37
37
  date: datetime
38
38
 
39
39
 
40
+ class VCSMissingSourceBranchError(Exception):
41
+ pass
42
+
43
+
40
44
  class VCS:
41
45
  """
42
46
  Abstraction layer for aggregating different Version Control Systems.
@@ -212,7 +216,13 @@ class VCS:
212
216
  merge_request=mr,
213
217
  body=comment,
214
218
  )
219
+ source_branch = mr.attributes.get("source_branch")
220
+ if not source_branch:
221
+ raise VCSMissingSourceBranchError(
222
+ f"Source branch is missing for MR {mr.attributes.get('iid')}"
223
+ )
215
224
  self._app_interface_api.close(mr)
225
+ self._app_interface_api.delete_branch(source_branch)
216
226
 
217
227
  def get_file_content_from_app_interface_master(self, file_path: str) -> str:
218
228
  file_path = (