From d635b871d18301c19309fdb667eff35b6b28ab47 Mon Sep 17 00:00:00 2001
From: James Livulpi <james.livulpi@me.com>
Date: Wed, 13 Jul 2022 16:32:18 -0400
Subject: [PATCH] Cleanup write_file method in uri (#76412)

---
 .../fragments/write_file_uri_cleanup.yml      |  2 +
 lib/ansible/modules/uri.py                    | 56 ++++++-------------
 .../targets/uri/tasks/unexpected-failures.yml |  3 +-
 3 files changed, 20 insertions(+), 41 deletions(-)
 create mode 100644 changelogs/fragments/write_file_uri_cleanup.yml

diff --git a/changelogs/fragments/write_file_uri_cleanup.yml b/changelogs/fragments/write_file_uri_cleanup.yml
new file mode 100644
index 00000000000..a58e7ad502f
--- /dev/null
+++ b/changelogs/fragments/write_file_uri_cleanup.yml
@@ -0,0 +1,2 @@
+minor_changes:
+  - uri - cleanup write_file method, remove overkill safety checks and report any exception, change shutilcopyfile to use module.atomic_move
diff --git a/lib/ansible/modules/uri.py b/lib/ansible/modules/uri.py
index 6f5b7f3c48b..67ff3142ead 100644
--- a/lib/ansible/modules/uri.py
+++ b/lib/ansible/modules/uri.py
@@ -464,61 +464,39 @@ def format_message(err, resp):
 
 
 def write_file(module, dest, content, resp):
-    # create a tempfile with some test content
-    fd, tmpsrc = tempfile.mkstemp(dir=module.tmpdir)
-    f = os.fdopen(fd, 'wb')
+    """
+    Create temp file and write content to dest file only if content changed
+    """
     try:
-        if isinstance(content, binary_type):
-            f.write(content)
-        else:
-            shutil.copyfileobj(content, f)
+        fd, tmpsrc = tempfile.mkstemp(dir=module.tmpdir)
+        with os.fdopen(fd, 'wb') as f:
+            if isinstance(content, binary_type):
+                f.write(content)
+            else:
+                shutil.copyfileobj(content, f)
     except Exception as e:
-        os.remove(tmpsrc)
+        if os.path.exists(tmpsrc):
+            os.remove(tmpsrc)
         msg = format_message("Failed to create temporary content file: %s" % to_native(e), resp)
         module.fail_json(msg=msg, **resp)
-    f.close()
 
     checksum_src = None
     checksum_dest = None
 
-    # raise an error if there is no tmpsrc file
-    if not os.path.exists(tmpsrc):
-        os.remove(tmpsrc)
-        msg = format_message("Source '%s' does not exist" % tmpsrc, resp)
-        module.fail_json(msg=msg, **resp)
-    if not os.access(tmpsrc, os.R_OK):
-        os.remove(tmpsrc)
-        msg = format_message("Source '%s' not readable" % tmpsrc, resp)
-        module.fail_json(msg=msg, **resp)
     checksum_src = module.sha1(tmpsrc)
-
-    # check if there is no dest file
-    if os.path.exists(dest):
-        # raise an error if copy has no permission on dest
-        if not os.access(dest, os.W_OK):
-            os.remove(tmpsrc)
-            msg = format_message("Destination '%s' not writable" % dest, resp)
-            module.fail_json(msg=msg, **resp)
-        if not os.access(dest, os.R_OK):
-            os.remove(tmpsrc)
-            msg = format_message("Destination '%s' not readable" % dest, resp)
-            module.fail_json(msg=msg, **resp)
-        checksum_dest = module.sha1(dest)
-    else:
-        if not os.access(os.path.dirname(dest), os.W_OK):
-            os.remove(tmpsrc)
-            msg = format_message("Destination dir '%s' not writable" % os.path.dirname(dest), resp)
-            module.fail_json(msg=msg, **resp)
+    checksum_dest = module.sha1(dest)
 
     if checksum_src != checksum_dest:
         try:
-            shutil.copyfile(tmpsrc, dest)
+            module.atomic_move(tmpsrc, dest)
         except Exception as e:
-            os.remove(tmpsrc)
+            if os.path.exists(tmpsrc):
+                os.remove(tmpsrc)
             msg = format_message("failed to copy %s to %s: %s" % (tmpsrc, dest, to_native(e)), resp)
             module.fail_json(msg=msg, **resp)
 
-    os.remove(tmpsrc)
+    if os.path.exists(tmpsrc):
+        os.remove(tmpsrc)
 
 
 def absolute_location(url, location):
diff --git a/test/integration/targets/uri/tasks/unexpected-failures.yml b/test/integration/targets/uri/tasks/unexpected-failures.yml
index f00380ab2f7..341b66e709e 100644
--- a/test/integration/targets/uri/tasks/unexpected-failures.yml
+++ b/test/integration/targets/uri/tasks/unexpected-failures.yml
@@ -23,5 +23,4 @@
     that:
       - ret is failed
       - "not ret.msg.startswith('MODULE FAILURE')"
-      - '"Destination dir ''" ~ remote_dir_expanded ~ "/non/existent'' not writable" in ret.msg'
-      - ret.status == 200
+      - '"Could not replace file" in ret.msg'