From fc872ac5436d0d7e4bda86b554e75bd021f969fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Eichhorn?= Date: Thu, 23 Sep 2021 11:59:47 +0200 Subject: [PATCH] fixes #142 #patch minor variable name refactoring and fixing duplicate variable usage --- sidecar/resources.py | 24 ++++++++++++------------ sidecar/sidecar.py | 10 +++++----- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/sidecar/resources.py b/sidecar/resources.py index 2b5a192..8a9f06f 100755 --- a/sidecar/resources.py +++ b/sidecar/resources.py @@ -65,7 +65,7 @@ def _get_destination_folder(metadata, default_folder, folder_annotation): return default_folder -def list_resources(label, label_value, target_folder, url, method, payload, +def list_resources(label, label_value, target_folder, request_url, request_method, request_payload, namespace, folder_annotation, resource, unique_filenames, script, enable_5xx): v1 = client.CoreV1Api() # Filter resources based on label and value or just label @@ -98,8 +98,8 @@ def list_resources(label, label_value, target_folder, url, method, payload, if script and files_changed: execute(script) - if url and files_changed: - request(url, method, enable_5xx, payload) + if request_url and files_changed: + request(request_url, request_method, enable_5xx, request_payload) def _process_secret(dest_folder, secret, resource, unique_filenames, enable_5xx, is_removed=False): @@ -184,7 +184,7 @@ def _update_file(data_key, data_content, dest_folder, metadata, resource, return False -def _watch_resource_iterator(label, label_value, target_folder, url, method, payload, +def _watch_resource_iterator(label, label_value, target_folder, request_url, request_method, request_payload, namespace, folder_annotation, resource, unique_filenames, script, enable_5xx): v1 = client.CoreV1Api() # Filter resources based on label and value or just label @@ -221,8 +221,8 @@ def _watch_resource_iterator(label, label_value, target_folder, url, method, pay if script and files_changed: execute(script) - if url and files_changed: - request(url, method, enable_5xx, payload) + if request_url and files_changed: + request(request_url, request_method, enable_5xx, request_payload) def _watch_resource_loop(mode, *args): @@ -249,11 +249,11 @@ def _watch_resource_loop(mode, *args): traceback.print_exc() -def watch_for_changes(mode, label, label_value, target_folder, url, method, payload, +def watch_for_changes(mode, label, label_value, target_folder, request_url, request_method, request_payload, current_namespace, folder_annotation, resources, unique_filenames, script, enable_5xx): processes = _start_watcher_processes(current_namespace, folder_annotation, label, - label_value, method, mode, payload, resources, - target_folder, unique_filenames, script, url, enable_5xx) + label_value, request_method, mode, request_payload, resources, + target_folder, unique_filenames, script, request_url, enable_5xx) while True: died = False @@ -271,13 +271,13 @@ def watch_for_changes(mode, label, label_value, target_folder, url, method, payl sleep(5) -def _start_watcher_processes(namespace, folder_annotation, label, label_value, method, - mode, payload, resources, target_folder, unique_filenames, script, url, enable_5xx): +def _start_watcher_processes(namespace, folder_annotation, label, label_value, request_method, + mode, request_payload, resources, target_folder, unique_filenames, script, request_url, enable_5xx): processes = [] for resource in resources: for ns in namespace.split(','): proc = Process(target=_watch_resource_loop, - args=(mode, label, label_value, target_folder, url, method, payload, + args=(mode, label, label_value, target_folder, request_url, request_method, request_payload, ns, folder_annotation, resource, unique_filenames, script, enable_5xx) ) proc.daemon = True diff --git a/sidecar/sidecar.py b/sidecar/sidecar.py index b6169e8..7bd4e09 100755 --- a/sidecar/sidecar.py +++ b/sidecar/sidecar.py @@ -51,9 +51,9 @@ def main(): resources = ("secret", "configmap") if resources == "both" else (resources,) print(f"{timestamp()} Selected resource type: {resources}") - method = os.getenv(REQ_METHOD) - url = os.getenv(REQ_URL) - payload = os.getenv(REQ_PAYLOAD) + request_method = os.getenv(REQ_METHOD) + request_url = os.getenv(REQ_URL) + request_payload = os.getenv(REQ_PAYLOAD) script = os.getenv(SCRIPT) _initialize_kubeclient_configuration() @@ -81,10 +81,10 @@ def main(): if method == "LIST": for res in resources: for ns in namespace.split(','): - list_resources(label, label_value, target_folder, url, method, payload, + list_resources(label, label_value, target_folder, request_url, request_method, request_payload, ns, folder_annotation, res, unique_filenames, script, enable_5xx) else: - watch_for_changes(method, label, label_value, target_folder, url, method, payload, + watch_for_changes(method, label, label_value, target_folder, request_url, request_method, request_payload, namespace, folder_annotation, resources, unique_filenames, script, enable_5xx)