Merge pull request kubernetes-client#201 from Akasurde/kube_config_no…

…_obj_fix FileOrData: Handle None object
yliaog · Jul 29, 2020 · ab61ca3 · ab61ca3
2 parents fb86b8a + a270ea2
commit ab61ca3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/config/kube_config.py b/config/kube_config.py
@@ -97,6 +97,8 @@ def __init__(self, obj, file_key_name, data_key_name=None,
         self._file = None
         self._data = None
         self._base64_file_content = base64_file_content
+        if not obj:
+            return
         if data_key_name in obj:
             self._data = obj[data_key_name]
         elif file_key_name in obj:

diff --git a/config/kube_config_test.py b/config/kube_config_test.py
@@ -255,6 +255,16 @@ def test_file_given_data_bytes_no_base64(self):
                        data_key_name=TEST_DATA_KEY, base64_file_content=False)
         self.assertEqual(TEST_DATA, self.get_file_content(t.as_file()))
 
+    def test_file_given_no_object(self):
+        t = FileOrData(obj=None, file_key_name=TEST_FILE_KEY,
+                       data_key_name=TEST_DATA_KEY)
+        self.assertEqual(t.as_file(), None)
+
+    def test_file_given_no_object_data(self):
+        t = FileOrData(obj=None, file_key_name=TEST_FILE_KEY,
+                       data_key_name=TEST_DATA_KEY)
+        self.assertEqual(t.as_data(), None)
+
 
 class TestConfigNode(BaseTestCase):