From b857e691db0a38c9dd39bf6f55803243fa2d8adc Mon Sep 17 00:00:00 2001
From: Alina Buzachis <abuzachis@redhat.com>
Date: Wed, 31 Mar 2021 14:49:12 +0200
Subject: [PATCH] 	* Add changelog 	* Address reviewer's comments 
 * Add six in requirements.txt

Signed-off-by: Alina Buzachis <abuzachis@redhat.com>
---
 changelogs/fragments/405-cachefile_dynamic_client.yml | 4 ++++
 plugins/module_utils/common.py                        | 7 +++----
 requirements.txt                                      | 1 +
 3 files changed, 8 insertions(+), 4 deletions(-)
 create mode 100644 changelogs/fragments/405-cachefile_dynamic_client.yml

diff --git a/changelogs/fragments/405-cachefile_dynamic_client.yml b/changelogs/fragments/405-cachefile_dynamic_client.yml
new file mode 100644
index 00000000..fda83dc0
--- /dev/null
+++ b/changelogs/fragments/405-cachefile_dynamic_client.yml
@@ -0,0 +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
diff --git a/plugins/module_utils/common.py b/plugins/module_utils/common.py
index 671efc4a..277b7fe0 100644
--- a/plugins/module_utils/common.py
+++ b/plugins/module_utils/common.py
@@ -23,9 +23,6 @@
 import os
 import traceback
 import sys
-import six
-import hashlib
-import tempfile
 from datetime import datetime
 from distutils.version import LooseVersion
 
@@ -143,6 +140,7 @@ def get_user():
 
 
 def get_default_cache_id(configuration):
+    import six
     user = get_user()
     if user:
         cache_id = "{0}-{1}".format(configuration.host, user)
@@ -219,13 +217,14 @@ def auth_set(*names):
         return client
 
     def generate_cache_file(configuration):
+        import hashlib
         return 'osrcp-{0}.json'.format(hashlib.sha1(get_default_cache_id(configuration)).hexdigest())
 
     kubeclient = kubernetes.client.ApiClient(configuration)
     cache_file = generate_cache_file(kubeclient)
 
     try:
-        client = DynamicClient(kubernetes.client.ApiClient(configuration), cache_file)
+        client = DynamicClient(kubeclient, cache_file)
     except Exception as err:
         _raise_or_fail(err, 'Failed to get client due to %s')
 
diff --git a/requirements.txt b/requirements.txt
index 6ed70a79..1daabca4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,3 @@
 openshift>=0.6.2
 requests-oauthlib
+six