Skip to content

support for rfc3339 nano #1351

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Aug 31, 2023
Merged

support for rfc3339 nano #1351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3fbd988
init support for rfc3339 nano
tg123 Jul 27, 2023
9ac10a1
add test cases
tg123 Jul 27, 2023
e1b4a2e
impl trimming
tg123 Aug 25, 2023
65b52ed
add 1-8 digits support
tg123 Aug 29, 2023
44645b9
happy build
tg123 Aug 29, 2023
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
24 changes: 20 additions & 4 deletions src/KubernetesClient.Models/KubernetesJson.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using k8s.Models;
using System.Globalization;
using System.IO;
using System.Text.RegularExpressions;
using System.Xml;

namespace k8s
Expand All @@ -26,18 +27,33 @@ public override void Write(Utf8JsonWriter writer, TimeSpan value, JsonSerializer

private sealed class KubernetesDateTimeOffsetConverter : JsonConverter<DateTimeOffset>
{
private const string SerializeFormat = "yyyy'-'MM'-'dd'T'HH':'mm':'ss.ffffffK";
private const string Iso8601Format = "yyyy'-'MM'-'dd'T'HH':'mm':'ssK";
private const string RFC3339MicroFormat = "yyyy'-'MM'-'dd'T'HH':'mm':'ss.ffffffK";
private const string RFC3339NanoFormat = "yyyy-MM-dd'T'HH':'mm':'ss.fffffffK";
private const string RFC3339Format = "yyyy'-'MM'-'dd'T'HH':'mm':'ssK";

public override DateTimeOffset Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
{
var str = reader.GetString();
return DateTimeOffset.ParseExact(str, new[] { Iso8601Format, SerializeFormat }, CultureInfo.InvariantCulture, DateTimeStyles.None);

if (DateTimeOffset.TryParseExact(str, new[] { RFC3339Format, RFC3339MicroFormat }, CultureInfo.InvariantCulture, DateTimeStyles.None, out var result))
{
return result;
}

// try RFC3339NanoLenient by trimming 1-9 digits to 7 digits
var originalstr = str;
str = Regex.Replace(str, @"\.\d+", m => (m.Value + "000000000").Substring(0, 7 + 1)); // 7 digits + 1 for the dot
if (DateTimeOffset.TryParseExact(str, new[] { RFC3339NanoFormat }, CultureInfo.InvariantCulture, DateTimeStyles.None, out result))
{
return result;
}

throw new FormatException($"Unable to parse {originalstr} as RFC3339 RFC3339Micro or RFC3339Nano");
}

public override void Write(Utf8JsonWriter writer, DateTimeOffset value, JsonSerializerOptions options)
{
writer.WriteStringValue(value.ToString(SerializeFormat));
writer.WriteStringValue(value.ToString(RFC3339MicroFormat));
}
}

Expand Down
119 changes: 119 additions & 0 deletions tests/KubernetesClient.Tests/KubernetesJsonTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
using System;
using Xunit;

namespace k8s.Tests;

public class KubernetesJsonTests
{
[System.Diagnostics.CodeAnalysis.SuppressMessage("Build", "CA1812:'KubernetesJsonTests.RfcTime' is an internal class that is apparently never instantiated. If so, remove the code from the assembly. If this class is intended to contain only static members, make it 'static' (Module in Visual Basic). (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1812)", Justification = "json type")]
private class RfcTime
{
public DateTime Rfc3339 { get; set; }
public DateTime Rfc3339micro { get; set; }
public DateTime Rfc3339nano { get; set; }
public DateTime Rfc3339nanolenient1 { get; set; }
public DateTime Rfc3339nanolenient2 { get; set; }
public DateTime Rfc3339nanolenient3 { get; set; }
public DateTime Rfc3339nanolenient4 { get; set; }
public DateTime Rfc3339nanolenient5 { get; set; }
public DateTime Rfc3339nanolenient6 { get; set; }
public DateTime Rfc3339nanolenient7 { get; set; }
public DateTime Rfc3339nanolenient8 { get; set; }
public DateTime Rfc3339nanolenient9 { get; set; }
}


[Fact]
public void RFC3339()
{
/* go code to generate the json https://go.dev/play/p/VL95pugm6o8

const RFC3339Micro = "2006-01-02T15:04:05.000000Z07:00"
const RFC3339Nano = "2006-01-02T15:04:05.000000000Z07:00"

func main() {
t := time.Now()
type Time struct {
RFC3339 string `json:"rfc3339"`
RFC3339Micro string `json:"rfc3339micro"`
RFC3339Nano string `json:"rfc3339nano"`

RFC3339NanoLenient1 string `json:"rfc3339nanolenient1"`
RFC3339NanoLenient2 string `json:"rfc3339nanolenient2"`
RFC3339NanoLenient3 string `json:"rfc3339nanolenient3"`
RFC3339NanoLenient4 string `json:"rfc3339nanolenient4"`
RFC3339NanoLenient5 string `json:"rfc3339nanolenient5"`
RFC3339NanoLenient6 string `json:"rfc3339nanolenient6"`
RFC3339NanoLenient7 string `json:"rfc3339nanolenient7"`
RFC3339NanoLenient8 string `json:"rfc3339nanolenient8"`
RFC3339NanoLenient9 string `json:"rfc3339nanolenient9"`
}
t1 := Time{
RFC3339: t.Add(45 * time.Minute).Add(12 * time.Second).Add(123456789 * time.Nanosecond).Format(time.RFC3339),
RFC3339Micro: t.Add(45 * time.Minute).Add(12 * time.Second).Add(123456789 * time.Nanosecond).Format(RFC3339Micro),
RFC3339Nano: t.Add(24 * time.Minute).Add(56 * time.Second).Add(123456789 * time.Nanosecond).Format(RFC3339Nano),

RFC3339NanoLenient1: t.Add(100000000 * time.Nanosecond).Format(time.RFC3339Nano),
RFC3339NanoLenient2: t.Add(120000000 * time.Nanosecond).Format(time.RFC3339Nano),
RFC3339NanoLenient3: t.Add(123000000 * time.Nanosecond).Format(time.RFC3339Nano),
RFC3339NanoLenient4: t.Add(123400000 * time.Nanosecond).Format(time.RFC3339Nano),
RFC3339NanoLenient5: t.Add(123450000 * time.Nanosecond).Format(time.RFC3339Nano),
RFC3339NanoLenient6: t.Add(123456000 * time.Nanosecond).Format(time.RFC3339Nano),
RFC3339NanoLenient7: t.Add(123456700 * time.Nanosecond).Format(time.RFC3339Nano),
RFC3339NanoLenient8: t.Add(123456780 * time.Nanosecond).Format(time.RFC3339Nano),
RFC3339NanoLenient9: t.Add(123456789 * time.Nanosecond).Format(time.RFC3339Nano),
}
b, err := json.Marshal(t1)
if err != nil {
fmt.Println("error:", err)
}
fmt.Println(string(b))
}
*/

var json = "{\"rfc3339\":\"2009-11-10T23:45:12Z\",\"rfc3339micro\":\"2009-11-10T23:45:12.123456Z\",\"rfc3339nano\":\"2009-11-10T23:24:56.123456789Z\",\"rfc3339nanolenient1\":\"2009-11-10T23:00:00.1Z\",\"rfc3339nanolenient2\":\"2009-11-10T23:00:00.12Z\",\"rfc3339nanolenient3\":\"2009-11-10T23:00:00.123Z\",\"rfc3339nanolenient4\":\"2009-11-10T23:00:00.1234Z\",\"rfc3339nanolenient5\":\"2009-11-10T23:00:00.12345Z\",\"rfc3339nanolenient6\":\"2009-11-10T23:00:00.123456Z\",\"rfc3339nanolenient7\":\"2009-11-10T23:00:00.1234567Z\",\"rfc3339nanolenient8\":\"2009-11-10T23:00:00.12345678Z\",\"rfc3339nanolenient9\":\"2009-11-10T23:00:00.123456789Z\"}\r\n";

var t = KubernetesJson.Deserialize<RfcTime>(json);

Assert.Equal(new DateTime(2009, 11, 10, 23, 45, 12, DateTimeKind.Utc), t.Rfc3339);

Assert.Equal(2009, t.Rfc3339micro.Year);
Assert.Equal(11, t.Rfc3339micro.Month);
Assert.Equal(10, t.Rfc3339micro.Day);
Assert.Equal(23, t.Rfc3339micro.Hour);
Assert.Equal(45, t.Rfc3339micro.Minute);
Assert.Equal(12, t.Rfc3339micro.Second);
Assert.Equal(123, t.Rfc3339micro.Millisecond);

Assert.Equal(2009, t.Rfc3339nano.Year);
Assert.Equal(11, t.Rfc3339nano.Month);
Assert.Equal(10, t.Rfc3339nano.Day);
Assert.Equal(23, t.Rfc3339nano.Hour);
Assert.Equal(24, t.Rfc3339nano.Minute);
Assert.Equal(56, t.Rfc3339nano.Second);
Assert.Equal(123, t.Rfc3339nano.Millisecond);

#if NET7_0_OR_GREATER
Assert.Equal(456, t.Rfc3339micro.Microsecond);
Assert.Equal(456, t.Rfc3339nano.Microsecond);
Assert.Equal(700, t.Rfc3339nano.Nanosecond);

Assert.Equal(100, t.Rfc3339nanolenient1.Millisecond);
Assert.Equal(120, t.Rfc3339nanolenient2.Millisecond);
Assert.Equal(123, t.Rfc3339nanolenient3.Millisecond);

Assert.Equal(400, t.Rfc3339nanolenient4.Microsecond);
Assert.Equal(450, t.Rfc3339nanolenient5.Microsecond);
Assert.Equal(456, t.Rfc3339nanolenient6.Microsecond);

Assert.Equal(456, t.Rfc3339nanolenient7.Microsecond);
Assert.Equal(456, t.Rfc3339nanolenient8.Microsecond);
Assert.Equal(456, t.Rfc3339nanolenient9.Microsecond);

Assert.Equal(700, t.Rfc3339nanolenient7.Nanosecond);
Assert.Equal(700, t.Rfc3339nanolenient8.Nanosecond);
Assert.Equal(700, t.Rfc3339nanolenient9.Nanosecond);
#endif

}
}