qontract-reconcile 0.10.2.dev161__py3-none-any.whl → 0.10.2.dev163__py3-none-any.whl

{qontract_reconcile-0.10.2.dev161.dist-info → qontract_reconcile-0.10.2.dev163.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev161
+Version: 0.10.2.dev163
 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
@@ -20,7 +20,7 @@ Requires-Dist: croniter<1.1.0,>=1.0.15
 Requires-Dist: dateparser~=1.1.7
 Requires-Dist: deepdiff==6.7.1
 Requires-Dist: dnspython~=2.1
-Requires-Dist: dt==1.1.61
+Requires-Dist: dt==1.1.73
 Requires-Dist: filetype~=1.2.0
 Requires-Dist: gql==3.1.0
 Requires-Dist: hvac<0.8.0,>=0.7.0

{qontract_reconcile-0.10.2.dev161.dist-info → qontract_reconcile-0.10.2.dev163.dist-info}/RECORD

@@ -30,7 +30,7 @@ reconcile/github_repo_permissions_validator.py,sha256=DsM5IdEw3HvrpSRR9ZYjOLwE7Q
 reconcile/github_users.py,sha256=QdX164LZrm8sqggMj-0beCzWofpS6OEBfzKNrWPrfj0,3934
 reconcile/github_validator.py,sha256=-j17tn3csFVjPMSPL3te48iWVkPZCncRXdeKeLdGjjQ,931
 reconcile/gitlab_fork_compliance.py,sha256=RbHckzLnE9zkOFHJANzoejEMMbMAivmqJVs3Suvp9lU,4591
-reconcile/gitlab_housekeeping.py,sha256=Gy1mhn33xGp9IyQFqs4VrBmhwJBD6x90XITDR_pU4MU,25416
+reconcile/gitlab_housekeeping.py,sha256=c31Jtw5t8bnOzUO9jMWF_0DHitPzol93AA7YWBxM5L0,25416
 reconcile/gitlab_labeler.py,sha256=BA2dbXsN9hErUwJl22qcxfeH7XiPCuQ9LN3NddWdnpo,4540
 reconcile/gitlab_members.py,sha256=MUIgYDLeJx2-_vMypyq2Pa17cpKdXATYhtVACS2ghpQ,8297
 reconcile/gitlab_mr_sqs_consumer.py,sha256=i_MDVfA3Uk_TJiNkfEJzhO6_rwR7z3I3dH9oEw686U4,2681
@@ -691,7 +691,7 @@ reconcile/utils/clusterhealth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
 reconcile/utils/clusterhealth/providerbase.py,sha256=DXomGYogckBLqWtXn0PXU0hWYxB6K0F7ernldrkHhVY,1140
 reconcile/utils/clusterhealth/telemeter.py,sha256=PllSLsJXvGNatmTF4mxCNPVbDrpr_MPk0m5pWj-LT6g,1534
 reconcile/utils/dynatrace/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/utils/dynatrace/client.py,sha256=RUk6KH-3CJyfJ1jolrdGQR4Hhz-tIWWJo9dsZ1IgJVw,3736
+reconcile/utils/dynatrace/client.py,sha256=H8EjqmZlB1a2ionAjV8_R1ozs9lWbmPCYKLe0J8kZAs,2838
 reconcile/utils/glitchtip/__init__.py,sha256=FT6iBhGqoe7KExFdbgL8AYUb64iW_4snF5__Dcl7yt0,258
 reconcile/utils/glitchtip/client.py,sha256=F_x18QMHfeNoS3vS_VvjVm1IKnwGOsXvopjR9iwj4aY,8948
 reconcile/utils/glitchtip/models.py,sha256=FyNt9EA9IS6tlsvqz-j7SkL9MoT_zIUTun0EiC9No6U,6684
@@ -804,7 +804,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.dev161.dist-info/METADATA,sha256=8F0IJKYcSCyZq47ZOd2Bn6zFBeo2I83momD5TwvCTSg,24627
-qontract_reconcile-0.10.2.dev161.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev161.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev161.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev163.dist-info/METADATA,sha256=5N8yyOG8iyt-2Yd_11j59PrrMza06xwFPNvd7qIjYrk,24627
+qontract_reconcile-0.10.2.dev163.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev163.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev163.dist-info/RECORD,,

reconcile/gitlab_housekeeping.py

@@ -229,7 +229,7 @@ def verify_on_demand_tests(
             commit.id,
         ])
         if not dry_run and state_change:
-            markdown_report = f"On-demand Tests: \n\n All necessary tests have paased for latest [commit]({commit.web_url})\n"
+            markdown_report = f"On-demand Tests: \n\n All necessary tests have passed for latest [commit]({commit.web_url})\n"
             gl.delete_merge_request_comments(mr, startswith="On-demand Tests:")
             gl.add_comment_to_merge_request(mr, markdown_report)
             state.add(state_key, remaining_tests, force=True)

reconcile/utils/dynatrace/client.py

@@ -1,8 +1,6 @@
 from __future__ import annotations
 
 from collections.abc import Iterable
-from datetime import datetime
-from unittest.mock import patch
 
 from dynatrace import Dynatrace
 from dynatrace.environment_v2.tokens_api import ApiTokenUpdate
@@ -35,32 +33,11 @@ class DynatraceAPIToken(BaseModel):
     scopes: list[str]
 
 
-# TODO: Remove once APPSRE-11428 is resolved #######
-ISO_8601 = "%Y-%m-%dT%H:%M:%S.%fZ"
-FIXED_ISO_8601 = "%Y-%m-%dT%H:%M:%SZ"
-
-
-def custom_iso8601_to_datetime(timestamp: str | None) -> datetime | None:
-    if isinstance(timestamp, str):
-        try:
-            return datetime.strptime(timestamp, ISO_8601)
-        except ValueError:
-            return datetime.strptime(timestamp, FIXED_ISO_8601)
-    return timestamp
-
-
-################################################
-
-
 class DynatraceClient:
     def __init__(self, environment_url: str, api: Dynatrace) -> None:
         self._environment_url = environment_url
         self._api = api
 
-    @patch(
-        "dynatrace.environment_v2.tokens_api.iso8601_to_datetime",
-        custom_iso8601_to_datetime,
-    )
     def create_api_token(
         self, name: str, scopes: Iterable[str]
     ) -> DynatraceAPITokenCreated:
@@ -72,10 +49,6 @@ class DynatraceClient:
             ) from e
         return DynatraceAPITokenCreated(token=token.token, id=token.id)
 
-    @patch(
-        "dynatrace.environment_v2.tokens_api.iso8601_to_datetime",
-        custom_iso8601_to_datetime,
-    )
     def get_token_ids_map_for_name_prefix(self, prefix: str) -> dict[str, str]:
         try:
             dt_tokens = self._api.tokens.list()
@@ -87,10 +60,6 @@ class DynatraceClient:
             token.id: token.name for token in dt_tokens if token.name.startswith(prefix)
         }
 
-    @patch(
-        "dynatrace.environment_v2.tokens_api.iso8601_to_datetime",
-        custom_iso8601_to_datetime,
-    )
     def get_token_by_id(self, token_id: str) -> DynatraceAPIToken:
         try:
             token = self._api.tokens.get(token_id=token_id)