Skip to content

Add RFC3339 formats with offset #1705

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
k8s-ci-robot merged 4 commits into from
Dec 16, 2025
+43 −4
Merged

Add RFC3339 formats with offset #1705

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0e20cdb
Add last resort to parse DateTimeOff
luiscantero Dec 13, 2025
c2292de
Apply suggestion
luiscantero Dec 13, 2025
5a5afcb
Be more restrictive
luiscantero Dec 13, 2025
290d57a
Add unit test
luiscantero Dec 13, 2025
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
16 changes: 12 additions & 4 deletions src/KubernetesClient/KubernetesJson.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,27 +34,35 @@ public sealed class KubernetesDateTimeOffsetConverter : JsonConverter<DateTimeOf
private const string RFC3339NanoFormat = "yyyy-MM-dd'T'HH':'mm':'ss.fffffffZ";
private const string RFC3339Format = "yyyy'-'MM'-'dd'T'HH':'mm':'ssZ";

private static readonly string[] StandardFormats = { RFC3339Format, RFC3339MicroFormat };

public override DateTimeOffset Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
{
var str = reader.GetString();

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

// try RFC3339NanoLenient by trimming 1-9 digits to 7 digits
// 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))
if (DateTimeOffset.TryParseExact(str, RFC3339NanoFormat, CultureInfo.InvariantCulture, DateTimeStyles.None, out result))
{
return result;
}

// Last resort: try general DateTimeOffset parsing
if (DateTimeOffset.TryParse(str, CultureInfo.InvariantCulture, DateTimeStyles.RoundtripKind, 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)
{
// Output as RFC3339Micro
Expand Down