kubernetes-client/csharp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: yaml with merge (#1332)

Browse Source 
* fix: yaml with merge

* chore: cleanup
This commit is contained in:
Ivan Josipovic
2023-07-27 04:44:08 -07:00
committed by GitHub
parent 66ad77d0d2
commit d1ba0aae72
2 changed files with 202 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/KubernetesClient.Models/KubernetesYaml.cs
View File

@@ -15,7 +15,7 @@ namespace k8s
/// </summary>
public static class KubernetesYaml
{
private static readonly DeserializerBuilder CommonDeserializerBuilder =
private static DeserializerBuilder CommonDeserializerBuilder =>
new DeserializerBuilder()
.WithNamingConvention(CamelCaseNamingConvention.Instance)
.WithTypeConverter(new IntOrStringYamlConverter())
@@ -23,6 +23,7 @@ namespace k8s
.WithTypeConverter(new ResourceQuantityYamlConverter())
.WithAttemptingUnquotedStringTypeDeserialization()
.WithOverridesFromJsonPropertyAttributes();
private static readonly IDeserializer StrictDeserializer =
CommonDeserializerBuilder
.WithDuplicateKeyChecking()
@@ -154,7 +155,7 @@ namespace k8s
typeMap?.ToList().ForEach(x => mergedTypeMap[x.Key] = x.Value);
var types = new List<Type>();
var parser = new Parser(new StringReader(content));
var parser = new MergingParser(new Parser(new StringReader(content)));
parser.Consume<StreamStart>();
while (parser.Accept<DocumentStart>(out _))
{
@@ -162,7 +163,7 @@ namespace k8s
types.Add(mergedTypeMap[dict["apiVersion"] + "/" + dict["kind"]]);
}
parser = new Parser(new StringReader(content));
parser = new MergingParser(new Parser(new StringReader(content)));
parser.Consume<StreamStart>();
var ix = 0;
var results = new List<object>();
@@ -205,12 +206,14 @@ namespace k8s
public static TValue Deserialize<TValue>(string yaml, bool strict = false)
{
return GetDeserializer(strict).Deserialize<TValue>(yaml);
using var reader = new StringReader(yaml);
return GetDeserializer(strict).Deserialize<TValue>(new MergingParser(new Parser(reader)));
}
public static TValue Deserialize<TValue>(Stream yaml, bool strict = false)
{
return GetDeserializer(strict).Deserialize<TValue>(new StreamReader(yaml));
using var reader = new StreamReader(yaml);
return GetDeserializer(strict).Deserialize<TValue>(new MergingParser(new Parser(reader)));
}
public static string SerializeAll(IEnumerable<object> values)