Fix UnstructuredResource's metadata encoding

swiftkube · Jan 29, 2023 · 7f748ae · 7f748ae
1 parent d961d40
commit 7f748ae
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.7.1
+
+- Fix UnstructuredResource's `metadata` encoding
+
 ## 0.7.0
 
 - Drop `AnyKubernetesAPIResource` in favour of `UnstructuredResource`

diff --git a/Sources/Model/UnstructuredResource.swift b/Sources/Model/UnstructuredResource.swift
@@ -87,7 +87,10 @@ extension UnstructuredResource: Codable {
 		var encodingContainer = encoder.container(keyedBy: JSONCodingKeys.self)
 
 		try properties.forEach { key, value in
-			try encodingContainer.encodeAny(value, forKey: JSONCodingKeys(stringValue: key)!)
+			switch key {
+			case "metadata": try encodingContainer.encodeIfPresent(value as? meta.v1.ObjectMeta, forKey: JSONCodingKeys(stringValue: key)!)
+			default: try encodingContainer.encodeAny(value, forKey: JSONCodingKeys(stringValue: key)!)
+			}
 		}
 	}
 }
diff --git a/Tests/SwiftkubeModelTests/UnstructureResourceTests.swift b/Tests/SwiftkubeModelTests/UnstructureResourceTests.swift
@@ -53,10 +53,7 @@ final class UnstructuredResourceTests: XCTestCase {
 		let cron = UnstructuredResource(properties: [
 			"apiVersion": "stable.example.com/v1",
 			"kind": "CronTab",
-			"metadata": [
-				"name": "my-new-cron-object",
-				"namespace": "default"
-			],
+			"metadata": meta.v1.ObjectMeta(name: "my-new-cron-object", namespace: "default"),
 			"spec": [
 				"cronSpec": "* * * * */5",
 				"image": "my-awesome-cron-image"