From 2fd1b9469cbb8806f63ef8d743ee7e0941d3db0e Mon Sep 17 00:00:00 2001 From: Pedro Lopez Mareque Date: Mon, 26 Sep 2022 22:39:38 +0200 Subject: [PATCH 1/5] feat: add missing e2e test for json and merge patch strategies --- kubernetes/e2e_test/test_client.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/kubernetes/e2e_test/test_client.py b/kubernetes/e2e_test/test_client.py index 7a75bbde9..8d700d127 100644 --- a/kubernetes/e2e_test/test_client.py +++ b/kubernetes/e2e_test/test_client.py @@ -536,6 +536,24 @@ class TestClient(unittest.TestCase): resp = api.patch_namespaced_config_map( name=name, namespace='default', body=test_configmap) + json_patch_name = "json_patch_name" + json_patch_body = [ + { + "op": "replace", + "path": "/metadata/name", + "value": json_patch_name + } + ] + resp = api.patch_namespaced_config_map( + name=name, namespace='default', body=json_patch_body) + self.assertEqual(json_patch_name, resp.metadata.name) + + merge_patch_name = "merge_patch_name" + merge_patch_body = [{"metadata": {"merge_patch_name": merge_patch_name}}] + resp = api.patch_namespaced_config_map( + name=name, namespace='default', body=merge_patch_body) + self.assertEqual(merge_patch_name, resp.metadata.name) + resp = api.delete_namespaced_config_map( name=name, body={}, namespace='default') From 1da8a689dd47420d29545c9a34365803188c24ba Mon Sep 17 00:00:00 2001 From: Pedro Lopez Mareque Date: Mon, 26 Sep 2022 22:42:24 +0200 Subject: [PATCH 2/5] fechange e2e test strategy to add instead of replace --- kubernetes/e2e_test/test_client.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kubernetes/e2e_test/test_client.py b/kubernetes/e2e_test/test_client.py index 8d700d127..377735454 100644 --- a/kubernetes/e2e_test/test_client.py +++ b/kubernetes/e2e_test/test_client.py @@ -539,20 +539,20 @@ class TestClient(unittest.TestCase): json_patch_name = "json_patch_name" json_patch_body = [ { - "op": "replace", - "path": "/metadata/name", + "op": "add", + "path": "/metadata/json_patch_name", "value": json_patch_name } ] resp = api.patch_namespaced_config_map( name=name, namespace='default', body=json_patch_body) - self.assertEqual(json_patch_name, resp.metadata.name) + self.assertEqual(json_patch_name, resp.metadata.json_patch_name) merge_patch_name = "merge_patch_name" merge_patch_body = [{"metadata": {"merge_patch_name": merge_patch_name}}] resp = api.patch_namespaced_config_map( name=name, namespace='default', body=merge_patch_body) - self.assertEqual(merge_patch_name, resp.metadata.name) + self.assertEqual(merge_patch_name, resp.metadata.merge_patch_name) resp = api.delete_namespaced_config_map( name=name, body={}, namespace='default') From 89730b40d4ee08f19d5144691d77443ee30077d6 Mon Sep 17 00:00:00 2001 From: Pedro Lopez Mareque Date: Tue, 27 Sep 2022 07:38:23 +0200 Subject: [PATCH 3/5] Run autopep8 and fix style --- kubernetes/e2e_test/test_client.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/kubernetes/e2e_test/test_client.py b/kubernetes/e2e_test/test_client.py index 377735454..39ab96f2f 100644 --- a/kubernetes/e2e_test/test_client.py +++ b/kubernetes/e2e_test/test_client.py @@ -538,12 +538,12 @@ class TestClient(unittest.TestCase): json_patch_name = "json_patch_name" json_patch_body = [ - { - "op": "add", - "path": "/metadata/json_patch_name", - "value": json_patch_name - } - ] + { + "op": "add", + "path": "/metadata/json_patch_name", + "value": json_patch_name + } + ] resp = api.patch_namespaced_config_map( name=name, namespace='default', body=json_patch_body) self.assertEqual(json_patch_name, resp.metadata.json_patch_name) From c8d814ddcea586181ec07b03a8468d0e564aad07 Mon Sep 17 00:00:00 2001 From: Pedro Lopez Mareque Date: Tue, 27 Sep 2022 08:36:56 +0200 Subject: [PATCH 4/5] fix tests --- kubernetes/e2e_test/test_client.py | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/kubernetes/e2e_test/test_client.py b/kubernetes/e2e_test/test_client.py index 39ab96f2f..d4a2967e9 100644 --- a/kubernetes/e2e_test/test_client.py +++ b/kubernetes/e2e_test/test_client.py @@ -539,20 +539,28 @@ class TestClient(unittest.TestCase): json_patch_name = "json_patch_name" json_patch_body = [ { - "op": "add", - "path": "/metadata/json_patch_name", - "value": json_patch_name + "op": "replace", + "path": "/data", + "value": { + "new_value": json_patch_name, + "config.json": "{\"command\":\"/usr/bin/mysqld_safe\"}", + "frontend.cnf": "[mysqld]\nbind-address = 10.0.0.3\nport = 3306\n" + } } ] resp = api.patch_namespaced_config_map( name=name, namespace='default', body=json_patch_body) - self.assertEqual(json_patch_name, resp.metadata.json_patch_name) + self.assertEqual(json_patch_name, resp.data["new_value"]) merge_patch_name = "merge_patch_name" - merge_patch_body = [{"metadata": {"merge_patch_name": merge_patch_name}}] + merge_patch_body = {"data": { + "new_value": merge_patch_name, + "config.json": "{\"command\":\"/usr/bin/mysqld_safe\"}", + "frontend.cnf": "[mysqld]\nbind-address = 10.0.0.3\nport = 3306\n" + }} resp = api.patch_namespaced_config_map( name=name, namespace='default', body=merge_patch_body) - self.assertEqual(merge_patch_name, resp.metadata.merge_patch_name) + self.assertEqual(merge_patch_name, resp.data["new_value"]) resp = api.delete_namespaced_config_map( name=name, body={}, namespace='default') From f7fc9deb184575cb14c006aa6da1b01d72adc30c Mon Sep 17 00:00:00 2001 From: Pedro Lopez Mareque Date: Tue, 27 Sep 2022 08:45:00 +0200 Subject: [PATCH 5/5] remove old assertion and improve tests --- kubernetes/e2e_test/test_client.py | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/kubernetes/e2e_test/test_client.py b/kubernetes/e2e_test/test_client.py index d4a2967e9..2c28dedc6 100644 --- a/kubernetes/e2e_test/test_client.py +++ b/kubernetes/e2e_test/test_client.py @@ -532,35 +532,22 @@ class TestClient(unittest.TestCase): name=name, namespace='default') self.assertEqual(name, resp.metadata.name) - test_configmap['data']['config.json'] = "{}" - resp = api.patch_namespaced_config_map( - name=name, namespace='default', body=test_configmap) - json_patch_name = "json_patch_name" - json_patch_body = [ - { - "op": "replace", - "path": "/data", - "value": { - "new_value": json_patch_name, - "config.json": "{\"command\":\"/usr/bin/mysqld_safe\"}", - "frontend.cnf": "[mysqld]\nbind-address = 10.0.0.3\nport = 3306\n" - } - } - ] + json_patch_body = [{"op": "replace", "path": "/data", + "value": {"new_value": json_patch_name}}] resp = api.patch_namespaced_config_map( name=name, namespace='default', body=json_patch_body) self.assertEqual(json_patch_name, resp.data["new_value"]) + self.assertEqual(None, resp.data.get("config.json")) + self.assertEqual(None, resp.data.get("frontend.cnf")) merge_patch_name = "merge_patch_name" - merge_patch_body = {"data": { - "new_value": merge_patch_name, - "config.json": "{\"command\":\"/usr/bin/mysqld_safe\"}", - "frontend.cnf": "[mysqld]\nbind-address = 10.0.0.3\nport = 3306\n" - }} + merge_patch_body = {"data": {"new_value": merge_patch_name}} resp = api.patch_namespaced_config_map( name=name, namespace='default', body=merge_patch_body) self.assertEqual(merge_patch_name, resp.data["new_value"]) + self.assertEqual(None, resp.data.get("config.json")) + self.assertEqual(None, resp.data.get("frontend.cnf")) resp = api.delete_namespaced_config_map( name=name, body={}, namespace='default')