From 10492b8a31402d6ce38a801eb9dc14a1fe4a9b27 Mon Sep 17 00:00:00 2001 From: Zack McCauley Date: Fri, 14 Jul 2023 11:41:39 -0700 Subject: [PATCH 1/2] Add additional options support to base --- JamfUploaderProcessors/JamfUploaderLib/JamfUploaderBase.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/JamfUploaderProcessors/JamfUploaderLib/JamfUploaderBase.py b/JamfUploaderProcessors/JamfUploaderLib/JamfUploaderBase.py index 4b81c5d9..d9eaeb6d 100644 --- a/JamfUploaderProcessors/JamfUploaderLib/JamfUploaderBase.py +++ b/JamfUploaderProcessors/JamfUploaderLib/JamfUploaderBase.py @@ -394,6 +394,9 @@ def curl( # additional headers for advanced requests if additional_headers: curl_cmd.extend(additional_headers) + # add additional flags specified + if self.env.get("curl_additional_opts"): + curl_cmd.extend(self.env.get("curl_additional_opts")) self.output(f"curl command: {' '.join(curl_cmd)}", verbose_level=3) From bec34e9b03e9d9acc2bfddf1a6f1e21401bd581a Mon Sep 17 00:00:00 2001 From: Zack McCauley Date: Thu, 18 Jul 2024 09:31:46 -0700 Subject: [PATCH 2/2] Rename key to custom_curl_opts --- JamfUploaderProcessors/JamfUploaderLib/JamfUploaderBase.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/JamfUploaderProcessors/JamfUploaderLib/JamfUploaderBase.py b/JamfUploaderProcessors/JamfUploaderLib/JamfUploaderBase.py index d9eaeb6d..cab1c1c9 100644 --- a/JamfUploaderProcessors/JamfUploaderLib/JamfUploaderBase.py +++ b/JamfUploaderProcessors/JamfUploaderLib/JamfUploaderBase.py @@ -395,8 +395,8 @@ def curl( if additional_headers: curl_cmd.extend(additional_headers) # add additional flags specified - if self.env.get("curl_additional_opts"): - curl_cmd.extend(self.env.get("curl_additional_opts")) + if self.env.get("custom_curl_opts"): + curl_cmd.extend(self.env.get("custom_curl_opts")) self.output(f"curl command: {' '.join(curl_cmd)}", verbose_level=3)