Merge pull request #7 from turkenh/fix-null

Fix null parsing issue

KubeContextTests/KubeContextTests.swift

@@ -138,7 +138,7 @@ class KubeContextLoadTwoContextTests: XCTestCase {
             XCTFail()
         }
         XCTAssertNotNil(config)
-        XCTAssertEqual(config?.Contexts.count, 2, "There is two contexts")
+        XCTAssertEqual(config?.Contexts.count, 2, "There are two contexts")
         XCTAssertEqual(config?.Contexts[0].Name, "kubernetes-admin@kubernetes", "Name of the context is correct")
         XCTAssertEqual(config?.Contexts[0].Context.Cluster, "kubernetes", "Cluster of the context is correct")
         XCTAssertEqual(config?.Contexts[0].Context.AuthInfo, "kubernetes-admin", "User of the context is correct")
@@ -164,3 +164,53 @@ class KubeContextLoadTwoContextTests: XCTestCase {
 
     }
 }
+
+class KubeContextLoadConfigWithNullTests: XCTestCase {
+    let fileManager = FileManager.default
+
+    var k8s: Kubernetes?
+    var bundle: Bundle!
+    var url: URL!
+
+    override func setUp() {
+        bundle = Bundle(for: type(of: self))
+        var tempDataUrl: URL?
+        do {
+            let documentDirectory = try fileManager.url(for: .documentDirectory, in: .userDomainMask, appropriateFor:nil, create:false)
+            tempDataUrl = documentDirectory.appendingPathComponent("TempData")
+            try fileManager.removeItem(at: tempDataUrl!)
+            let testDataPath = bundle.resourcePath! + "/TestData"
+            try fileManager.copyItem(atPath: testDataPath, toPath: tempDataUrl!.path)
+        } catch {
+            XCTFail()
+        }
+
+        url = tempDataUrl!.appendingPathComponent("config-with-null.yaml")
+        k8s = Kubernetes()
+        XCTAssertNoThrow(try k8s?.setKubeconfig(configFile: url))
+        XCTAssertNotNil(k8s)
+        // Put setup code here. This method is called before the invocation of each test method in the class.
+    }
+
+    override func tearDown() {
+        // Put teardown code here. This method is called after the invocation of each test method in the class.
+    }
+
+    func testKubernetesLoadConfig() {
+        var config: Config?
+        do {
+            config = try k8s?.getConfig()
+        } catch {
+            XCTFail()
+        }
+        XCTAssertNotNil(config)
+        XCTAssertEqual(config?.Contexts.count, 2, "There are two contexts")
+        XCTAssertEqual(config?.Contexts[0].Name, "dev", "Name of the context is correct")
+        XCTAssertEqual(config?.Contexts[0].Context.Cluster, "dev-cluster", "Cluster of the context is correct")
+        XCTAssertEqual(config?.Contexts[0].Context.AuthInfo, "dev-user", "User of the context is correct")
+        XCTAssertNil(config?.Contexts[0].Context.Namespace)
+
+        XCTAssertEqual(config?.Clusters.count, 2, "There are two clusters")
+        XCTAssertEqual(config?.AuthInfos.count, 2, "There are two users")
+    }
+}

KubeContextTests/TestData/config-with-null.yaml

@@ -0,0 +1,47 @@
+apiVersion: v1
+clusters:
+- cluster:
+    certificate-authority-data: snipped-cert
+    server: redacted-url
+  name: dev-cluster
+- cluster:
+    certificate-authority-data: snipped-cert
+    server: redacted-url
+  name: prod-cluster
+contexts:
+- context:
+    cluster: dev-cluster
+    user: dev-user
+  name: dev
+- context:
+    cluster: prod-cluster
+    user: prod-user
+  name: prod
+current-context: dev
+kind: Config
+preferences: {}
+users:
+- name: dev-user
+  user:
+    exec:
+      apiVersion: client.authentication.k8s.io/v1alpha1
+      args:
+      - token
+      - -i
+      - redacted-url
+      - -r
+      - redacted-arn
+      command: aws-iam-authenticator
+      env: null
+- name: prod-user
+  user:
+    exec:
+      apiVersion: client.authentication.k8s.io/v1alpha1
+      args:
+      - token
+      - -i
+      - redacted-url
+      - -r
+      - redacted-arn
+      command: aws-iam-authenticator
+      env: null

Podfile

@@ -6,7 +6,7 @@ target 'KubeContext' do
   use_frameworks!
 
   # Pods for KubeContext
-  pod 'Yams'
+  pod 'Yams', '~> 1.0.2'
   pod 'SwiftyStoreKit'
 
 end

Podfile.lock

@@ -1,10 +1,10 @@
 PODS:
   - SwiftyStoreKit (0.14.1)
-  - Yams (1.0.0)
+  - Yams (1.0.2)
 
 DEPENDENCIES:
   - SwiftyStoreKit
-  - Yams
+  - Yams (~> 1.0.2)
 
 SPEC REPOS:
   https://github.com/cocoapods/specs.git:
@@ -13,8 +13,8 @@ SPEC REPOS:
 
 SPEC CHECKSUMS:
   SwiftyStoreKit: a5cdece4327f3943eb72fa81aebe3aa6684b5eab
-  Yams: a01cdee527b3a82a3e192255b34ad5aacdf96b8c
+  Yams: fcdf51397d30c85f8ac780e917bcf7bdf6bc654b
 
-PODFILE CHECKSUM: 54099b2c26581357952df5ecabfc6e12d705cdb6
+PODFILE CHECKSUM: d95677dbdb75cd2c1572aa5267cf323ccc58a4ea
 
 COCOAPODS: 1.5.3