Skip to content

Commit 0140344

Browse files
fix: Fix default utcnow argument in start_query (#2193)
1 parent 8534dbf commit 0140344

File tree

1 file changed

+13
-6
lines changed

1 file changed

+13
-6
lines changed

awswrangler/cloudwatch.py

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ def _validate_args(
2929
def start_query(
3030
query: str,
3131
log_group_names: List[str],
32-
start_time: datetime.datetime = datetime.datetime(year=1970, month=1, day=1, tzinfo=datetime.timezone.utc),
33-
end_time: datetime.datetime = datetime.datetime.utcnow(),
32+
start_time: Optional[datetime.datetime] = None,
33+
end_time: Optional[datetime.datetime] = None,
3434
limit: Optional[int] = None,
3535
boto3_session: Optional[boto3.Session] = None,
3636
) -> str:
@@ -68,10 +68,17 @@ def start_query(
6868
6969
"""
7070
_logger.debug("log_group_names: %s", log_group_names)
71+
72+
start_time = (
73+
start_time if start_time else datetime.datetime(year=1970, month=1, day=1, tzinfo=datetime.timezone.utc)
74+
)
75+
end_time = end_time if end_time else datetime.datetime.utcnow()
76+
7177
start_timestamp: int = int(1000 * start_time.timestamp())
7278
end_timestamp: int = int(1000 * end_time.timestamp())
7379
_logger.debug("start_timestamp: %s", start_timestamp)
7480
_logger.debug("end_timestamp: %s", end_timestamp)
81+
7582
_validate_args(start_timestamp=start_timestamp, end_timestamp=end_timestamp)
7683
args: Dict[str, Any] = {
7784
"logGroupNames": log_group_names,
@@ -139,8 +146,8 @@ def wait_query(
139146
def run_query(
140147
query: str,
141148
log_group_names: List[str],
142-
start_time: datetime.datetime = datetime.datetime(year=1970, month=1, day=1, tzinfo=datetime.timezone.utc),
143-
end_time: datetime.datetime = datetime.datetime.utcnow(),
149+
start_time: Optional[datetime.datetime] = None,
150+
end_time: Optional[datetime.datetime] = None,
144151
limit: Optional[int] = None,
145152
boto3_session: Optional[boto3.Session] = None,
146153
) -> List[List[Dict[str, str]]]:
@@ -192,8 +199,8 @@ def run_query(
192199
def read_logs(
193200
query: str,
194201
log_group_names: List[str],
195-
start_time: datetime.datetime = datetime.datetime(year=1970, month=1, day=1, tzinfo=datetime.timezone.utc),
196-
end_time: datetime.datetime = datetime.datetime.utcnow(),
202+
start_time: Optional[datetime.datetime] = None,
203+
end_time: Optional[datetime.datetime] = None,
197204
limit: Optional[int] = None,
198205
boto3_session: Optional[boto3.Session] = None,
199206
) -> pd.DataFrame:

0 commit comments

Comments
 (0)