From fb44b2b52388f6e03ee7ca17540d6cab5f0f8650 Mon Sep 17 00:00:00 2001
From: Alina Buzachis <abuzachis@redhat.com>
Date: Wed, 31 Mar 2021 15:02:28 +0200
Subject: [PATCH] 	* Fix parameter error

Signed-off-by: Alina Buzachis <abuzachis@redhat.com>
---
 .../fragments/405-cachefile_dynamic_client.yml    |  6 +++---
 plugins/module_utils/common.py                    | 15 +++++++--------
 requirements.txt                                  |  1 -
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/changelogs/fragments/405-cachefile_dynamic_client.yml b/changelogs/fragments/405-cachefile_dynamic_client.yml
index fda83dc0..2bd838d1 100644
--- a/changelogs/fragments/405-cachefile_dynamic_client.yml
+++ b/changelogs/fragments/405-cachefile_dynamic_client.yml
@@ -1,4 +1,4 @@
 ---
- minor_changes:
- - Add logic for cache file name generation (https://github.com/ansible-collections/community.kubernetes/pull/405).
- - Add cache_file when DynamicClient is created (https://github.com/ansible-collections/community.kubernetes/pull/405).
\ No newline at end of file
+minor_changes:
+- Add logic for cache file name generation (https://github.com/ansible-collections/community.kubernetes/pull/405).
+- Add cache_file when DynamicClient is created (https://github.com/ansible-collections/community.kubernetes/pull/405).
diff --git a/plugins/module_utils/common.py b/plugins/module_utils/common.py
index 277b7fe0..771c7304 100644
--- a/plugins/module_utils/common.py
+++ b/plugins/module_utils/common.py
@@ -29,7 +29,7 @@
 from ansible_collections.community.kubernetes.plugins.module_utils.args_common import (AUTH_ARG_MAP, AUTH_ARG_SPEC)
 
 from ansible.module_utils.basic import AnsibleModule, missing_required_lib
-from ansible.module_utils.six import iteritems, string_types
+from ansible.module_utils.six import iteritems, string_types, PY3
 from ansible.module_utils._text import to_native, to_bytes, to_text
 from ansible.module_utils.common.dict_transformations import dict_merge
 from ansible.module_utils.parsing.convert_bool import boolean
@@ -139,15 +139,14 @@ def get_user():
     return None
 
 
-def get_default_cache_id(configuration):
-    import six
+def get_default_cache_id(client):
     user = get_user()
     if user:
-        cache_id = "{0}-{1}".format(configuration.host, user)
+        cache_id = "{0}-{1}".format(client.configuration.host, user)
     else:
-        cache_id = configuration.host
+        cache_id = client.configuration.host
 
-    if six.PY3:
+    if PY3:
         return cache_id.encode('utf-8')
 
     return cache_id
@@ -216,9 +215,9 @@ def auth_set(*names):
         client = get_api_client._pool[digest]
         return client
 
-    def generate_cache_file(configuration):
+    def generate_cache_file(kubeclient):
         import hashlib
-        return 'osrcp-{0}.json'.format(hashlib.sha1(get_default_cache_id(configuration)).hexdigest())
+        return 'osrcp-{0}.json'.format(hashlib.sha1(get_default_cache_id(kubeclient)).hexdigest())
 
     kubeclient = kubernetes.client.ApiClient(configuration)
     cache_file = generate_cache_file(kubeclient)
diff --git a/requirements.txt b/requirements.txt
index 1daabca4..6ed70a79 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,2 @@
 openshift>=0.6.2
 requests-oauthlib
-six