From 5a73edead27430bb9a7859982593ccad7b21512e Mon Sep 17 00:00:00 2001 From: Scott Spiering Date: Tue, 21 Jan 2025 15:03:06 -0800 Subject: [PATCH 01/12] Initial Commit --- meraki/api/networks.py | 6 +++++- src/spiering-meraki | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) create mode 160000 src/spiering-meraki diff --git a/meraki/api/networks.py b/meraki/api/networks.py index 820e04e4..b8fed80e 100644 --- a/meraki/api/networks.py +++ b/meraki/api/networks.py @@ -1658,8 +1658,12 @@ def deleteNetworkMerakiAuthUser(self, networkId: str, merakiAuthUserId: str, **k networkId = urllib.parse.quote(str(networkId), safe='') merakiAuthUserId = urllib.parse.quote(str(merakiAuthUserId), safe='') resource = f'/networks/{networkId}/merakiAuthUsers/{merakiAuthUserId}' + + query_params = ['delete'] + params = {k.strip(): v for k, v in kwargs.items() if k.strip() in query_params} - return self._session.delete(metadata, resource) + + return self._session.delete(metadata, resource, params) diff --git a/src/spiering-meraki b/src/spiering-meraki new file mode 160000 index 00000000..458b0384 --- /dev/null +++ b/src/spiering-meraki @@ -0,0 +1 @@ +Subproject commit 458b0384b43701749e6606fe4760181b03b97072 From 9b515752e4d78cd35baa360679bb53a10f934afa Mon Sep 17 00:00:00 2001 From: Scott Spiering Date: Tue, 21 Jan 2025 15:08:19 -0800 Subject: [PATCH 02/12] Editing rest_session to include json param --- meraki/rest_session.py | 4 ++-- src/meraki | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) create mode 160000 src/meraki diff --git a/meraki/rest_session.py b/meraki/rest_session.py index 3ea4b142..608a5622 100644 --- a/meraki/rest_session.py +++ b/meraki/rest_session.py @@ -495,10 +495,10 @@ def put(self, metadata, url, json=None): response.close() return ret - def delete(self, metadata, url): + def delete(self, metadata, url, json=None): metadata['method'] = 'DELETE' metadata['url'] = url - response = self.request(metadata, 'DELETE', url) + response = self.request(metadata, 'DELETE', url, json=json) if response: response.close() return None diff --git a/src/meraki b/src/meraki new file mode 160000 index 00000000..5a73edea --- /dev/null +++ b/src/meraki @@ -0,0 +1 @@ +Subproject commit 5a73edead27430bb9a7859982593ccad7b21512e From 9a68ce1e977760825b403165d2d4b31aeff8d181 Mon Sep 17 00:00:00 2001 From: Scott Spiering Date: Tue, 21 Jan 2025 15:10:17 -0800 Subject: [PATCH 03/12] editing rest_session to include json --- src/meraki | 1 - 1 file changed, 1 deletion(-) delete mode 160000 src/meraki diff --git a/src/meraki b/src/meraki deleted file mode 160000 index 5a73edea..00000000 --- a/src/meraki +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5a73edead27430bb9a7859982593ccad7b21512e From 5823ec2dc90fcc12ce58ee7d11033e2146fdb26c Mon Sep 17 00:00:00 2001 From: Scott Spiering Date: Tue, 21 Jan 2025 16:10:53 -0800 Subject: [PATCH 04/12] updating delete to have json metadata --- meraki/rest_session.py | 1 + src/meraki | 1 + src/spiering-meraki | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) create mode 160000 src/meraki diff --git a/meraki/rest_session.py b/meraki/rest_session.py index 608a5622..7e9653f5 100644 --- a/meraki/rest_session.py +++ b/meraki/rest_session.py @@ -498,6 +498,7 @@ def put(self, metadata, url, json=None): def delete(self, metadata, url, json=None): metadata['method'] = 'DELETE' metadata['url'] = url + metadata['json'] = json response = self.request(metadata, 'DELETE', url, json=json) if response: response.close() diff --git a/src/meraki b/src/meraki new file mode 160000 index 00000000..9a68ce1e --- /dev/null +++ b/src/meraki @@ -0,0 +1 @@ +Subproject commit 9a68ce1e977760825b403165d2d4b31aeff8d181 diff --git a/src/spiering-meraki b/src/spiering-meraki index 458b0384..9a68ce1e 160000 --- a/src/spiering-meraki +++ b/src/spiering-meraki @@ -1 +1 @@ -Subproject commit 458b0384b43701749e6606fe4760181b03b97072 +Subproject commit 9a68ce1e977760825b403165d2d4b31aeff8d181 From e96ce1a532a12a46604b98b2a5bba53a389c03c1 Mon Sep 17 00:00:00 2001 From: Scott Spiering Date: Tue, 21 Jan 2025 16:11:51 -0800 Subject: [PATCH 05/12] added json metadata to rest_session delete --- src/meraki | 1 - 1 file changed, 1 deletion(-) delete mode 160000 src/meraki diff --git a/src/meraki b/src/meraki deleted file mode 160000 index 9a68ce1e..00000000 --- a/src/meraki +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9a68ce1e977760825b403165d2d4b31aeff8d181 From 0ce31e94db7221aee7f88585e5cd605ca3386a5b Mon Sep 17 00:00:00 2001 From: Scott Spiering Date: Tue, 21 Jan 2025 16:29:13 -0800 Subject: [PATCH 06/12] removed empty src subfolder I accidentally created --- src/spiering-meraki | 1 - 1 file changed, 1 deletion(-) delete mode 160000 src/spiering-meraki diff --git a/src/spiering-meraki b/src/spiering-meraki deleted file mode 160000 index 9a68ce1e..00000000 --- a/src/spiering-meraki +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9a68ce1e977760825b403165d2d4b31aeff8d181 From 43c4f6c4ac1ac7a2af0aa9b754878ddcb7e4470d Mon Sep 17 00:00:00 2001 From: Scott Spiering Date: Fri, 24 Jan 2025 16:10:51 -0800 Subject: [PATCH 07/12] Modified generate_libary for delete query params --- generator/generate_library.py | 11 ++++++++--- src/meraki | 1 + 2 files changed, 9 insertions(+), 3 deletions(-) create mode 160000 src/meraki diff --git a/generator/generate_library.py b/generator/generate_library.py index b437bea2..e72945c9 100644 --- a/generator/generate_library.py +++ b/generator/generate_library.py @@ -482,7 +482,7 @@ def generate_standard_and_async_functions( # Function body for DELETE endpoints elif method == "delete": - call_line, path_params = parse_delete_params(operation, parameters) + call_line, path_params, query_params = parse_delete_params(operation, parameters) # Add function to files with open( @@ -569,9 +569,14 @@ def parse_post_and_put_params(method: str, operation: str, parameters: dict): def parse_delete_params(operation: str, parameters: dict): + query_params = parse_params(operation, parameters, "query") path_params = parse_params(operation, parameters, "path") - call_line = "return self._session.delete(metadata, resource)" - return call_line, path_params + + if query_params: + call_line = "return self._session.delete(metadata, resource, params)" + else: + call_line = "return self._session.delete(metadata, resource)" + return call_line, path_params, query_params def generate_action_batch_functions( diff --git a/src/meraki b/src/meraki new file mode 160000 index 00000000..e96ce1a5 --- /dev/null +++ b/src/meraki @@ -0,0 +1 @@ +Subproject commit e96ce1a532a12a46604b98b2a5bba53a389c03c1 From ac3aaa1d835bdd16cba82b12083f694153901c57 Mon Sep 17 00:00:00 2001 From: Scott Spiering Date: Fri, 24 Jan 2025 16:14:10 -0800 Subject: [PATCH 08/12] Updated delete generator --- src/meraki | 1 - 1 file changed, 1 deletion(-) delete mode 160000 src/meraki diff --git a/src/meraki b/src/meraki deleted file mode 160000 index e96ce1a5..00000000 --- a/src/meraki +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e96ce1a532a12a46604b98b2a5bba53a389c03c1 From 262a2478a8915c9a2a4f0326229122537abd1c02 Mon Sep 17 00:00:00 2001 From: Scott Spiering Date: Fri, 24 Jan 2025 16:26:38 -0800 Subject: [PATCH 09/12] Reverting changes to networks.py --- meraki/api/networks.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/meraki/api/networks.py b/meraki/api/networks.py index b8fed80e..7b77c6d4 100644 --- a/meraki/api/networks.py +++ b/meraki/api/networks.py @@ -1658,12 +1658,8 @@ def deleteNetworkMerakiAuthUser(self, networkId: str, merakiAuthUserId: str, **k networkId = urllib.parse.quote(str(networkId), safe='') merakiAuthUserId = urllib.parse.quote(str(merakiAuthUserId), safe='') resource = f'/networks/{networkId}/merakiAuthUsers/{merakiAuthUserId}' - - query_params = ['delete'] - params = {k.strip(): v for k, v in kwargs.items() if k.strip() in query_params} - - return self._session.delete(metadata, resource, params) + return self._session.delete(metadata, resource) @@ -2941,4 +2937,4 @@ def getNetworkWebhooksWebhookTest(self, networkId: str, webhookTestId: str): resource = f'/networks/{networkId}/webhooks/webhookTests/{webhookTestId}' return self._session.get(metadata, resource) - + \ No newline at end of file From b896cf8f9eebef372417d656709372ecbd482030 Mon Sep 17 00:00:00 2001 From: Scott Spiering Date: Fri, 24 Jan 2025 16:27:44 -0800 Subject: [PATCH 10/12] removed space --- meraki/api/networks.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meraki/api/networks.py b/meraki/api/networks.py index 7b77c6d4..65d971b0 100644 --- a/meraki/api/networks.py +++ b/meraki/api/networks.py @@ -2936,5 +2936,4 @@ def getNetworkWebhooksWebhookTest(self, networkId: str, webhookTestId: str): webhookTestId = urllib.parse.quote(str(webhookTestId), safe='') resource = f'/networks/{networkId}/webhooks/webhookTests/{webhookTestId}' - return self._session.get(metadata, resource) - \ No newline at end of file + return self._session.get(metadata, resource) \ No newline at end of file From 4c73bc1341c94c0e72ebcfdf76a0d57241d0de4b Mon Sep 17 00:00:00 2001 From: Scott Spiering Date: Fri, 24 Jan 2025 16:30:54 -0800 Subject: [PATCH 11/12] full revert networks.py --- meraki/api/networks.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meraki/api/networks.py b/meraki/api/networks.py index 65d971b0..7b77c6d4 100644 --- a/meraki/api/networks.py +++ b/meraki/api/networks.py @@ -2936,4 +2936,5 @@ def getNetworkWebhooksWebhookTest(self, networkId: str, webhookTestId: str): webhookTestId = urllib.parse.quote(str(webhookTestId), safe='') resource = f'/networks/{networkId}/webhooks/webhookTests/{webhookTestId}' - return self._session.get(metadata, resource) \ No newline at end of file + return self._session.get(metadata, resource) + \ No newline at end of file From c62b4d5b85af2635337e56268b861f8407385272 Mon Sep 17 00:00:00 2001 From: Scott Spiering Date: Fri, 24 Jan 2025 16:36:18 -0800 Subject: [PATCH 12/12] revert --- meraki/api/networks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meraki/api/networks.py b/meraki/api/networks.py index 7b77c6d4..820e04e4 100644 --- a/meraki/api/networks.py +++ b/meraki/api/networks.py @@ -2937,4 +2937,4 @@ def getNetworkWebhooksWebhookTest(self, networkId: str, webhookTestId: str): resource = f'/networks/{networkId}/webhooks/webhookTests/{webhookTestId}' return self._session.get(metadata, resource) - \ No newline at end of file +