From 5c1d474f086aca052dd4306128f78bac1c3396bb Mon Sep 17 00:00:00 2001 From: Tomasz Prus Date: Tue, 8 Jan 2019 22:27:01 +0100 Subject: [PATCH] feat: use yaml.safe_load/dump --- kubernetes_asyncio/config/kube_config.py | 2 +- kubernetes_asyncio/config/kube_config_test.py | 6 +++--- kubernetes_asyncio/e2e_test/test_extensions.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/kubernetes_asyncio/config/kube_config.py b/kubernetes_asyncio/config/kube_config.py index 0be8a850a..b5bc48c8f 100644 --- a/kubernetes_asyncio/config/kube_config.py +++ b/kubernetes_asyncio/config/kube_config.py @@ -426,7 +426,7 @@ def get_with_name(self, name, safe=False): 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/kubernetes_asyncio/config/kube_config_test.py b/kubernetes_asyncio/config/kube_config_test.py index 8f0cc63f9..36552657d 100644 --- a/kubernetes_asyncio/config/kube_config_test.py +++ b/kubernetes_asyncio/config/kube_config_test.py @@ -853,7 +853,7 @@ async def test_ssl_with_relative_ssl_files(self): async 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() await load_kube_config(config_file=config_file, context="simple_token", @@ -861,7 +861,7 @@ async def test_load_kube_config(self): 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], @@ -874,7 +874,7 @@ def test_list_kube_config_contexts(self): contexts) async 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 = await new_client_from_config( config_file=config_file, context="simple_token") self.assertEqual(TEST_HOST, client.configuration.host) diff --git a/kubernetes_asyncio/e2e_test/test_extensions.py b/kubernetes_asyncio/e2e_test/test_extensions.py index 15b246847..743ad08d8 100644 --- a/kubernetes_asyncio/e2e_test/test_extensions.py +++ b/kubernetes_asyncio/e2e_test/test_extensions.py @@ -51,7 +51,7 @@ async def test_create_deployment(self): - containerPort: 80 ''' resp = await api.create_namespaced_deployment( - body=yaml.load(deployment % name), + body=yaml.safe_load(deployment % name), namespace="default") resp = await api.read_namespaced_deployment(name, 'default') self.assertIsNotNone(resp)