Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ensure that UTC ISO8601 datetimes include timezone info #1238

Merged
merged 1 commit into from
Apr 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ansible_runner/display_callback/callback/awx_display.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@


def current_time():
return datetime.datetime.utcnow()
return datetime.datetime.utcnow().replace(tzinfo=datetime.timezone.utc)


# use a custom JSON serializer so we can properly handle !unsafe and !vault
Expand Down Expand Up @@ -198,7 +198,7 @@ def get_begin_dict(self):
event_dict['project_update_id'] = int(os.getenv('PROJECT_UPDATE_ID', '0'))
event_dict['pid'] = event_data.get('pid', os.getpid())
event_dict['uuid'] = event_data.get('uuid', str(uuid.uuid4()))
event_dict['created'] = event_data.get('created', datetime.datetime.utcnow().isoformat())
event_dict['created'] = event_data.get('created', current_time().isoformat())
if not event_data.get('parent_uuid', None):
for key in ('task_uuid', 'play_uuid', 'playbook_uuid'):
parent_uuid = event_data.get(key, None)
Expand Down
2 changes: 1 addition & 1 deletion ansible_runner/runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def event_callback(self, event_data):

# prefer 'created' from partial data, but verbose events set time here
if 'created' not in event_data:
event_data['created'] = datetime.datetime.utcnow().isoformat()
event_data['created'] = datetime.datetime.utcnow().replace(tzinfo=datetime.timezone.utc).isoformat()

if self.event_handler is not None:
should_write = self.event_handler(event_data)
Expand Down
2 changes: 2 additions & 0 deletions test/unit/test_runner.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-

import codecs
import datetime
import os

import json
Expand Down Expand Up @@ -80,6 +81,7 @@ def test_verbose_event_created_time(rc):
assert exitcode == 0
for event in runner.events:
assert 'created' in event, event
assert datetime.datetime.fromisoformat(event['created']).tzinfo == datetime.timezone.utc


@pytest.mark.parametrize('value', ['abc123', six.u('Iñtërnâtiônàlizætiøn')])
Expand Down