From ebb49d02ed90256cd002d1d75cb8a92125c4392e Mon Sep 17 00:00:00 2001 From: Xavier Vello Date: Mon, 7 Jan 2019 18:19:57 +0100 Subject: [PATCH 1/2] Use safe_load and safe_dump for all yaml calls --- config/kube_config.py | 2 +- config/kube_config_test.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/kube_config.py b/config/kube_config.py index 958959e30..300d924e0 100644 --- a/config/kube_config.py +++ b/config/kube_config.py @@ -493,7 +493,7 @@ class ConfigNode(object): def _get_kube_config_loader_for_yaml_file(filename, **kwargs): with open(filename) as f: return KubeConfigLoader( - config_dict=yaml.load(f), + config_dict=yaml.safe_load(f), config_base_path=os.path.abspath(os.path.dirname(filename)), **kwargs) diff --git a/config/kube_config_test.py b/config/kube_config_test.py index ae9dc2255..f0bddf8ba 100644 --- a/config/kube_config_test.py +++ b/config/kube_config_test.py @@ -896,14 +896,14 @@ class TestKubeConfigLoader(BaseTestCase): def test_load_kube_config(self): expected = FakeConfig(host=TEST_HOST, token=BEARER_TOKEN_FORMAT % TEST_DATA_BASE64) - config_file = self._create_temp_file(yaml.dump(self.TEST_KUBE_CONFIG)) + config_file = self._create_temp_file(yaml.safe_dump(self.TEST_KUBE_CONFIG)) actual = FakeConfig() load_kube_config(config_file=config_file, context="simple_token", client_configuration=actual) self.assertEqual(expected, actual) def test_list_kube_config_contexts(self): - config_file = self._create_temp_file(yaml.dump(self.TEST_KUBE_CONFIG)) + config_file = self._create_temp_file(yaml.safe_dump(self.TEST_KUBE_CONFIG)) contexts, active_context = list_kube_config_contexts( config_file=config_file) self.assertDictEqual(self.TEST_KUBE_CONFIG['contexts'][0], @@ -916,7 +916,7 @@ class TestKubeConfigLoader(BaseTestCase): contexts) def test_new_client_from_config(self): - config_file = self._create_temp_file(yaml.dump(self.TEST_KUBE_CONFIG)) + config_file = self._create_temp_file(yaml.safe_dump(self.TEST_KUBE_CONFIG)) client = new_client_from_config( config_file=config_file, context="simple_token") self.assertEqual(TEST_HOST, client.configuration.host) From 13ff5184ac43c0bffa813bbba4fca04d610c45d7 Mon Sep 17 00:00:00 2001 From: Xavier Vello Date: Tue, 8 Jan 2019 10:37:28 +0100 Subject: [PATCH 2/2] linting --- config/kube_config_test.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/config/kube_config_test.py b/config/kube_config_test.py index f0bddf8ba..37ff3e27c 100644 --- a/config/kube_config_test.py +++ b/config/kube_config_test.py @@ -896,14 +896,16 @@ class TestKubeConfigLoader(BaseTestCase): def test_load_kube_config(self): expected = FakeConfig(host=TEST_HOST, token=BEARER_TOKEN_FORMAT % TEST_DATA_BASE64) - config_file = self._create_temp_file(yaml.safe_dump(self.TEST_KUBE_CONFIG)) + config_file = self._create_temp_file( + yaml.safe_dump(self.TEST_KUBE_CONFIG)) actual = FakeConfig() load_kube_config(config_file=config_file, context="simple_token", client_configuration=actual) self.assertEqual(expected, actual) def test_list_kube_config_contexts(self): - config_file = self._create_temp_file(yaml.safe_dump(self.TEST_KUBE_CONFIG)) + config_file = self._create_temp_file( + yaml.safe_dump(self.TEST_KUBE_CONFIG)) contexts, active_context = list_kube_config_contexts( config_file=config_file) self.assertDictEqual(self.TEST_KUBE_CONFIG['contexts'][0], @@ -916,7 +918,8 @@ class TestKubeConfigLoader(BaseTestCase): contexts) def test_new_client_from_config(self): - config_file = self._create_temp_file(yaml.safe_dump(self.TEST_KUBE_CONFIG)) + config_file = self._create_temp_file( + yaml.safe_dump(self.TEST_KUBE_CONFIG)) client = new_client_from_config( config_file=config_file, context="simple_token") self.assertEqual(TEST_HOST, client.configuration.host)