Specify the timezone in timestamps

fixes theforeman#1171
evgeni · Jan 3, 2022 · 12e202f · 12e202f
1 parent 336b4c8
commit 12e202f
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 7 deletions.
diff --git a/changelogs/fragments/1171-timezone.yml b/changelogs/fragments/1171-timezone.yml
@@ -0,0 +1,2 @@
+bugfixes:
+  - callback plugin - include timezone information in the callback reported data (https://github.com/theforeman/foreman-ansible-modules/issues/1171)
diff --git a/plugins/callback/foreman.py b/plugins/callback/foreman.py
@@ -166,8 +166,10 @@ def get_time():
 def get_now():
     """
     Return the current timestamp as a string to be sent over the network.
+    The time is always in UTC *with* timezone information, so that Ruby
+    DateTime can easily parse it.
     """
-    return datetime.utcnow().isoformat()
+    return datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S+00:00")
 
 
 class CallbackModule(CallbackBase):

diff --git a/tests/fixtures/callback/dir_store/foreman/testhost.json b/tests/fixtures/callback/dir_store/foreman/testhost.json
@@ -97,7 +97,7 @@
         "total": 1
       }
     },
-    "reported_at": "2000-01-01 12:00:00.0000",
+    "reported_at": "2000-01-01 12:00:00+00:00",
     "reporter": "ansible",
     "status": {
       "applied": 5,

diff --git a/tests/fixtures/callback/dir_store/foreman/testhostA.json b/tests/fixtures/callback/dir_store/foreman/testhostA.json
@@ -42,7 +42,7 @@
         "total": 1
       }
     },
-    "reported_at": "2000-01-01 12:00:00.0000",
+    "reported_at": "2000-01-01 12:00:00+00:00",
     "reporter": "ansible",
     "status": {
       "applied": 1,

diff --git a/tests/fixtures/callback/dir_store/foreman/testhostB.json b/tests/fixtures/callback/dir_store/foreman/testhostB.json
@@ -42,7 +42,7 @@
         "total": 1
       }
     },
-    "reported_at": "2000-01-01 12:00:00.0000",
+    "reported_at": "2000-01-01 12:00:00+00:00",
     "reporter": "ansible",
     "status": {
       "applied": 1,

diff --git a/tests/fixtures/callback/dir_store/proxy/testhost.json b/tests/fixtures/callback/dir_store/proxy/testhost.json
@@ -6,7 +6,7 @@
       "total": 1
     }
   },
-  "reported_at": "2000-01-01 12:00:00.0000",
+  "reported_at": "2000-01-01 12:00:00+00:00",
   "results": [
     {
       "failed": false,

diff --git a/tests/fixtures/callback/dir_store/proxy/testhostA.json b/tests/fixtures/callback/dir_store/proxy/testhostA.json
@@ -6,7 +6,7 @@
       "total": 1
     }
   },
-  "reported_at": "2000-01-01 12:00:00.0000",
+  "reported_at": "2000-01-01 12:00:00+00:00",
   "results": [
     {
       "failed": false,

diff --git a/tests/fixtures/callback/dir_store/proxy/testhostB.json b/tests/fixtures/callback/dir_store/proxy/testhostB.json
@@ -6,7 +6,7 @@
       "total": 1
     }
   },
-  "reported_at": "2000-01-01 12:00:00.0000",
+  "reported_at": "2000-01-01 12:00:00+00:00",
   "results": [
     {
       "failed": false,

diff --git a/tests/test_callback.py b/tests/test_callback.py
@@ -56,6 +56,7 @@ def run_callback(tmpdir, report_type, vcrmode):
     assert len(tmpdir.listdir()) > 0, "Directory with results is empty"
     for real_file in tmpdir.listdir(sort=True):
         contents = real_file.read()
+        contents = re.sub(r"\d+-\d+-\d+ \d+:\d+:\d+\+\d+:\d+", "2000-01-01 12:00:00+00:00", contents)
         contents = re.sub(r"\d+-\d+-\d+[ T]\d+:\d+:\d+\.\d+", "2000-01-01 12:00:00.0000", contents)
         contents = re.sub(r"\d+:\d+:\d+\.\d+", "12:00:00.0000", contents)
         if report_type == "foreman":