Merge pull request #2471 from NicoPolazzi/fix/recreate-deleted-temp-files

Fix/recreate deleted temp files

Author: k8s-ci-robot

kubernetes/base/config/kube_config.py

@@ -67,13 +67,13 @@ def _cleanup_temp_files():
     _temp_files = {}
 
 
-def _create_temp_file_with_content(content, temp_file_path=None):
+def _create_temp_file_with_content(content, temp_file_path=None, force_recreate=False):
     if len(_temp_files) == 0:
         atexit.register(_cleanup_temp_files)
     # Because we may change context several times, try to remember files we
     # created and reuse them at a small memory cost.
     content_key = str(content)
-    if content_key in _temp_files:
+    if not force_recreate and content_key in _temp_files:
         return _temp_files[content_key]
     if temp_file_path and not os.path.isdir(temp_file_path):
         os.makedirs(name=temp_file_path)
@@ -122,16 +122,10 @@ def as_file(self):
         decoded obj[%data_key_name] content otherwise obj[%file_key_name]."""
         use_data_if_no_file = not self._file and self._data
         if use_data_if_no_file:
-            if self._base64_file_content:
-                if isinstance(self._data, str):
-                    content = self._data.encode()
-                else:
-                    content = self._data
-                self._file = _create_temp_file_with_content(
-                    base64.standard_b64decode(content), self._temp_file_path)
-            else:
-                self._file = _create_temp_file_with_content(
-                    self._data, self._temp_file_path)
+            self._write_file()
+
+            if self._file and not os.path.isfile(self._file):
+                self._write_file(force_rewrite=True)
         if self._file and not os.path.isfile(self._file):
             raise ConfigException("File does not exist: %s" % self._file)
         return self._file
@@ -149,6 +143,18 @@ def as_data(self):
                     self._data = f.read()
         return self._data
 
+    def _write_file(self, force_rewrite=False):
+        if self._base64_file_content:
+            if isinstance(self._data, str):
+                content = self._data.encode()
+            else:
+                content = self._data
+            self._file = _create_temp_file_with_content(
+                base64.standard_b64decode(content), self._temp_file_path, force_recreate=force_rewrite)
+        else:
+            self._file = _create_temp_file_with_content(
+                self._data, self._temp_file_path, force_recreate=force_rewrite)
+
 
 class CommandTokenSource(object):
     def __init__(self, cmd, args, tokenKey, expiryKey):

kubernetes/base/config/kube_config_test.py

@@ -267,6 +267,26 @@ def test_file_given_no_object_data(self):
                        data_key_name=TEST_DATA_KEY)
         self.assertEqual(t.as_data(), None)
 
+    def test_file_recreation(self):
+        obj = {TEST_DATA_KEY: TEST_DATA_BASE64}
+        t1 = FileOrData(
+            obj=obj,
+            file_key_name=TEST_FILE_KEY,
+            data_key_name=TEST_DATA_KEY,
+        )
+        first_file_path = t1.as_file()
+        # We manually remove the file from the disk leaving it in the cache
+        os.remove(first_file_path)
+
+        t2 = FileOrData(
+            obj=obj,
+            file_key_name=TEST_FILE_KEY,
+            data_key_name=TEST_DATA_KEY,
+        )
+
+        second_file_path = t2.as_file()
+        self.assertEqual(TEST_DATA, self.get_file_content(second_file_path))
+
 
 class TestConfigNode(BaseTestCase):