added tests for rfc3339 parsing

Author: charbonnierg

nats/js/api.py

@@ -96,11 +96,27 @@ def _convert_rfc3339(resp: Dict[str, Any], field: str) -> None:
         val = resp.get(field, None)
         if val is None:
             return None
-        raw_date = val[:26]
-        if raw_date.endswith("Z"):
-            raw_date = raw_date[:-1] + "+00:00"
-        resp[field] = datetime.datetime.fromisoformat(raw_date).replace(
-            tzinfo=datetime.timezone.utc
+        # Handle Zulu
+        offset = "+00:00"
+        if val.endswith("Z"):
+            raw_date = val[:-1]
+        # There MUST be an offset if not Zulu
+        else:
+            offset = val[-6:]
+            raw_date = val[:-6]
+        # Padd missing milliseconds
+        if "." not in raw_date:
+            raw_date += ".000000"
+        else:
+            raw_date = raw_date[:26]
+            length = len(raw_date)
+            if length < 26:
+                raw_date += "0" * (26 - length)
+        # Add offset    
+        raw_date = raw_date + offset
+        # Parse into datetime using fromisoformat
+        resp[field] = datetime.datetime.fromisoformat(raw_date).astimezone(
+            datetime.timezone.utc
         )
 
     @staticmethod

tests/test_js.py

@@ -1484,7 +1484,58 @@ async def test_consumer_with_opt_start_time_microseconds_tz(self):
         )
         await nc.close()
 
-
+    def test_parser_consumer_info_with_created_timestamp(self):
+        for created in [
+            "1970-01-01T01:02:03Z",
+            "1970-01-01T02:02:03+01:00",
+            "1970-01-01T01:02:03.0Z",
+            "1970-01-01T01:02:03.00Z",
+            "1970-01-01T01:02:03.000Z",
+            "1970-01-01T01:02:03.0000Z",
+            "1970-01-01T01:02:03.00000Z",
+            "1970-01-01T01:02:03.000000Z",
+            "1970-01-01T01:02:03.0000000Z",
+            "1970-01-01T01:02:03.00000000Z",
+            "1970-01-01T01:02:03.000000000Z",
+            "1970-01-01T02:02:03.000000000Z+01:00",
+        ]:
+            info = api.ConsumerInfo.from_response({
+                "name": "test",
+                "stream_name": "test",
+                "config": {},
+                "created": created
+            })
+            created = info.created
+            assert created == datetime.datetime(
+                1970, 1, 1, 1, 2, 3, tzinfo=datetime.timezone.utc
+            )
+        for created in [
+            "1970-01-01T01:02:03.4Z",
+            "1970-01-01T01:02:03.4+00:00",
+            "1970-01-01T01:02:03.40Z",
+            "1970-01-01T02:02:03.40+01:00",
+            "1970-01-01T01:02:03.400Z",
+            "1970-01-01T04:02:03.400+03:00",
+            "1970-01-01T01:02:03.4000Z",
+            "1970-01-01T07:22:03.4000+06:20",
+            "1970-01-01T01:02:03.40000Z",
+            "1970-01-01T00:02:03.400000-01:00",
+            "1970-01-01T01:02:03.400000Z",
+            "1970-01-01T01:02:03.4000000Z",
+            "1970-01-01T01:02:03.40000000Z",
+            "1970-01-01T01:02:03.400000000Z",
+            "1970-01-01T02:02:03.400000000Z+01:00",
+        ]:
+            info = api.ConsumerInfo.from_response({
+                "name": "test",
+                "stream_name": "test",
+                "config": {},
+                "created": created
+            })
+            created = info.created
+            assert created == datetime.datetime(
+                1970, 1, 1, 1, 2, 3, 400000, tzinfo=datetime.timezone.utc
+            )
 
     @async_test
     async def test_jsm_stream_info_options(self):