Skip to content
This repository was archived by the owner on Mar 13, 2022. It is now read-only.

Commit a270ea2

Browse files
committed
FileOrData: Handle None object
Return when object is None in FileOrData class Signed-off-by: Abhijeet Kasurde <[email protected]>
1 parent 3ea8003 commit a270ea2

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

config/kube_config.py

+2
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,8 @@ def __init__(self, obj, file_key_name, data_key_name=None,
9797
self._file = None
9898
self._data = None
9999
self._base64_file_content = base64_file_content
100+
if not obj:
101+
return
100102
if data_key_name in obj:
101103
self._data = obj[data_key_name]
102104
elif file_key_name in obj:

config/kube_config_test.py

+10
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,16 @@ def test_file_given_data_bytes_no_base64(self):
255255
data_key_name=TEST_DATA_KEY, base64_file_content=False)
256256
self.assertEqual(TEST_DATA, self.get_file_content(t.as_file()))
257257

258+
def test_file_given_no_object(self):
259+
t = FileOrData(obj=None, file_key_name=TEST_FILE_KEY,
260+
data_key_name=TEST_DATA_KEY)
261+
self.assertEqual(t.as_file(), None)
262+
263+
def test_file_given_no_object_data(self):
264+
t = FileOrData(obj=None, file_key_name=TEST_FILE_KEY,
265+
data_key_name=TEST_DATA_KEY)
266+
self.assertEqual(t.as_data(), None)
267+
258268

259269
class TestConfigNode(BaseTestCase):
260270

0 commit comments

Comments
 (0)