Skip to content

Commit 4db390f

Browse files
zhiweivzhiweiv
authored
fix obsolete warning about KubernetesYaml (#839)
1 parent 262e166 commit 4db390f

File tree

4 files changed

+25
-25
lines changed

4 files changed

+25
-25
lines changed

‎src/KubernetesClient.Models/KubernetesYaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ public static async Task<T> LoadFromStreamAsync<T>(Stream stream)
168168
{
169169
var reader = new StreamReader(stream);
170170
var content = await reader.ReadToEndAsync().ConfigureAwait(false);
171-
return LoadFromString<T>(content);
171+
return Deserialize<T>(content);
172172
}
173173

174174
public static async Task<T> LoadFromFileAsync<T>(string file)

‎tests/KubernetesClient.Tests/KubernetesClientConfigurationTests.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ public void ContextWithWildcardIPv62()
445445
public void LoadKubeConfigExplicitFilePath()
446446
{
447447
var txt = File.ReadAllText("assets/kubeconfig.yml");
448-
var expectedCfg = KubernetesYaml.LoadFromString<K8SConfiguration>(txt);
448+
var expectedCfg = KubernetesYaml.Deserialize<K8SConfiguration>(txt);
449449

450450
var cfg = KubernetesClientConfiguration.LoadKubeConfig("assets/kubeconfig.yml");
451451

@@ -458,7 +458,7 @@ public void LoadKubeConfigFileInfo()
458458
{
459459
var filePath = "assets/kubeconfig.yml";
460460
var txt = File.ReadAllText(filePath);
461-
var expectedCfg = KubernetesYaml.LoadFromString<K8SConfiguration>(txt);
461+
var expectedCfg = KubernetesYaml.Deserialize<K8SConfiguration>(txt);
462462

463463
var fileInfo = new FileInfo(filePath);
464464
var cfg = KubernetesClientConfiguration.LoadKubeConfig(fileInfo);
@@ -472,7 +472,7 @@ public void LoadKubeConfigStream()
472472
{
473473
var filePath = "assets/kubeconfig.yml";
474474
var txt = File.ReadAllText(filePath);
475-
var expectedCfg = KubernetesYaml.LoadFromString<K8SConfiguration>(txt);
475+
var expectedCfg = KubernetesYaml.Deserialize<K8SConfiguration>(txt);
476476

477477
var fileInfo = new FileInfo(filePath);
478478
K8SConfiguration cfg;
@@ -524,7 +524,7 @@ public void LoadKubeConfigFromEnvironmentVariableMultipleConfigs()
524524
public void LoadSameKubeConfigFromEnvironmentVariableUnmodified()
525525
{
526526
var txt = File.ReadAllText("assets/kubeconfig.yml");
527-
var expectedCfg = KubernetesYaml.LoadFromString<K8SConfiguration>(txt);
527+
var expectedCfg = KubernetesYaml.Deserialize<K8SConfiguration>(txt);
528528

529529
var fileInfo = new FileInfo(Path.GetFullPath("assets/kubeconfig.yml"));
530530

@@ -537,7 +537,7 @@ public void LoadSameKubeConfigFromEnvironmentVariableUnmodified()
537537
public void LoadKubeConfigWithAdditionalProperties()
538538
{
539539
var txt = File.ReadAllText("assets/kubeconfig.additional-properties.yml");
540-
var expectedCfg = KubernetesYaml.LoadFromString<K8SConfiguration>(txt);
540+
var expectedCfg = KubernetesYaml.Deserialize<K8SConfiguration>(txt);
541541

542542
var fileInfo = new FileInfo(Path.GetFullPath("assets/kubeconfig.additional-properties.yml"));
543543

‎tests/KubernetesClient.Tests/KubernetesYamlTests.cs

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ public void LoadFromString()
193193
name: foo
194194
";
195195

196-
var obj = KubernetesYaml.LoadFromString<V1Pod>(content);
196+
var obj = KubernetesYaml.Deserialize<V1Pod>(content);
197197

198198
Assert.Equal("foo", obj.Metadata.Name);
199199
}
@@ -208,7 +208,7 @@ public void LoadFromStringWithAdditionalProperties()
208208
youDontKnow: Me
209209
";
210210

211-
var obj = KubernetesYaml.LoadFromString<V1Pod>(content);
211+
var obj = KubernetesYaml.Deserialize<V1Pod>(content);
212212

213213
Assert.Equal("foo", obj.Metadata.Name);
214214
}
@@ -223,7 +223,7 @@ public void LoadFromStringWithAdditionalPropertiesAndCustomType()
223223
youDontKnow: Me
224224
";
225225

226-
var obj = KubernetesYaml.LoadFromString<V1Pod>(content);
226+
var obj = KubernetesYaml.Deserialize<V1Pod>(content);
227227

228228
Assert.Equal("foo", obj.Metadata.Name);
229229
}
@@ -238,7 +238,7 @@ public void LoadNamespacedFromString()
238238
name: foo
239239
";
240240

241-
var obj = KubernetesYaml.LoadFromString<V1Pod>(content);
241+
var obj = KubernetesYaml.Deserialize<V1Pod>(content);
242242

243243
Assert.Equal("foo", obj.Metadata.Name);
244244
Assert.Equal("bar", obj.Metadata.NamespaceProperty);
@@ -264,7 +264,7 @@ public void LoadPropertyNamedReadOnlyFromString()
264264
readOnly: false
265265
";
266266

267-
var obj = KubernetesYaml.LoadFromString<V1Pod>(content);
267+
var obj = KubernetesYaml.Deserialize<V1Pod>(content);
268268

269269
Assert.True(obj.Spec.Containers[0].VolumeMounts[0].ReadOnlyProperty);
270270
Assert.False(obj.Spec.Containers[0].VolumeMounts[1].ReadOnlyProperty);
@@ -318,10 +318,10 @@ public void RoundtripTypeWithMismatchedPropertyName()
318318
{
319319
var content = @"namespace: foo";
320320

321-
var deserialized = KubernetesYaml.LoadFromString<V1ObjectMeta>(content);
321+
var deserialized = KubernetesYaml.Deserialize<V1ObjectMeta>(content);
322322
Assert.Equal("foo", deserialized.NamespaceProperty);
323323

324-
var serialized = KubernetesYaml.SaveToString(deserialized);
324+
var serialized = KubernetesYaml.Serialize(deserialized);
325325
Assert.Equal(content, serialized);
326326
}
327327

@@ -330,7 +330,7 @@ public void WriteToString()
330330
{
331331
var pod = new V1Pod() { ApiVersion = "v1", Kind = "Pod", Metadata = new V1ObjectMeta() { Name = "foo" } };
332332

333-
var yaml = KubernetesYaml.SaveToString(pod);
333+
var yaml = KubernetesYaml.Serialize(pod);
334334
Assert.Equal(
335335
ToLines(@"apiVersion: v1
336336
kind: Pod
@@ -348,7 +348,7 @@ public void WriteNamespacedToString()
348348
Metadata = new V1ObjectMeta() { Name = "foo", NamespaceProperty = "bar" },
349349
};
350350

351-
var yaml = KubernetesYaml.SaveToString(pod);
351+
var yaml = KubernetesYaml.Serialize(pod);
352352
Assert.Equal(
353353
ToLines(@"apiVersion: v1
354354
kind: Pod
@@ -388,7 +388,7 @@ public void WritePropertyNamedReadOnlyToString()
388388
},
389389
};
390390

391-
var yaml = KubernetesYaml.SaveToString(pod);
391+
var yaml = KubernetesYaml.Serialize(pod);
392392
Assert.Equal(
393393
ToLines(@"apiVersion: v1
394394
kind: Pod
@@ -446,7 +446,7 @@ public void CpuRequestAndLimitFromString()
446446
- -cpus
447447
- ""2""";
448448

449-
var obj = KubernetesYaml.LoadFromString<V1Pod>(content);
449+
var obj = KubernetesYaml.Deserialize<V1Pod>(content);
450450

451451
Assert.NotNull(obj?.Spec?.Containers);
452452
var container = Assert.Single(obj.Spec.Containers);
@@ -476,7 +476,7 @@ public void LoadIntOrString()
476476
targetPort: 3000
477477
";
478478

479-
var obj = KubernetesYaml.LoadFromString<V1Service>(content);
479+
var obj = KubernetesYaml.Deserialize<V1Service>(content);
480480

481481
Assert.Equal(3000, obj.Spec.Ports[0].Port);
482482
Assert.Equal(3000, int.Parse(obj.Spec.Ports[0].TargetPort));
@@ -508,7 +508,7 @@ public void SerializeIntOrString()
508508
},
509509
};
510510

511-
var output = KubernetesYaml.SaveToString(obj);
511+
var output = KubernetesYaml.Serialize(obj);
512512
Assert.Equal(ToLines(output), ToLines(content));
513513
}
514514

@@ -534,11 +534,11 @@ public void QuotedValuesShouldRemainQuotedAfterSerialization()
534534
value: ""false""
535535
image: vish/stress
536536
name: cpu-demo-ctr";
537-
var obj = KubernetesYaml.LoadFromString<V1Pod>(content);
537+
var obj = KubernetesYaml.Deserialize<V1Pod>(content);
538538
Assert.NotNull(obj?.Spec?.Containers);
539539
var container = Assert.Single(obj.Spec.Containers);
540540
Assert.NotNull(container.Env);
541-
var objStr = KubernetesYaml.SaveToString(obj);
541+
var objStr = KubernetesYaml.Serialize(obj);
542542
Assert.Equal(content.Replace("\r\n", "\n"), objStr.Replace("\r\n", "\n"));
543543
}
544544

@@ -555,7 +555,7 @@ public void LoadSecret()
555555
password: Mzk1MjgkdmRnN0pi
556556
";
557557

558-
var result = KubernetesYaml.LoadFromString<V1Secret>(kManifest);
558+
var result = KubernetesYaml.Deserialize<V1Secret>(kManifest);
559559
Assert.Equal("bXktYXBw", Encoding.UTF8.GetString(result.Data["username"]));
560560
Assert.Equal("Mzk1MjgkdmRnN0pi", Encoding.UTF8.GetString(result.Data["password"]));
561561
}
@@ -589,7 +589,7 @@ public void DeserializeWithJsonPropertyName()
589589
served: true
590590
storage: true
591591
";
592-
var result = KubernetesYaml.LoadFromString<V1CustomResourceDefinition>(kManifest);
592+
var result = KubernetesYaml.Deserialize<V1CustomResourceDefinition>(kManifest);
593593
Assert.Single(result?.Spec?.Versions);
594594
var ver = result.Spec.Versions[0];
595595
Assert.Equal(true, ver?.Schema?.OpenAPIV3Schema?.XKubernetesIntOrString);

‎tests/KubernetesClient.Tests/QuantityValueTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,14 +211,14 @@ public void Serialize()
211211
[Fact]
212212
public void DeserializeYaml()
213213
{
214-
var value = KubernetesYaml.LoadFromString<ResourceQuantity>("\"1\"");
214+
var value = KubernetesYaml.Deserialize<ResourceQuantity>("\"1\"");
215215
Assert.Equal(new ResourceQuantity(1, 0, DecimalSI), value);
216216
}
217217

218218
[Fact]
219219
public void SerializeYaml()
220220
{
221-
var value = KubernetesYaml.SaveToString(new ResourceQuantity(1, -1, DecimalSI));
221+
var value = KubernetesYaml.Serialize(new ResourceQuantity(1, -1, DecimalSI));
222222
Assert.Equal("100m", value);
223223
}
224224
}

0 commit comments

Comments
 (0)