From de12063f5e19275b994c98a04c4d158474099e95 Mon Sep 17 00:00:00 2001
From: Robert August Vincent II <pillarsdotnet@gmail.com>
Date: Wed, 7 Dec 2022 16:36:56 -0500
Subject: [PATCH] MODULES-10763 Do not report apt-get update as a change

---
 manifests/update.pp      | 15 ++++++++++++---
 spec/classes/apt_spec.rb |  6 ++----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/manifests/update.pp b/manifests/update.pp
index ef37f52db0..28959296a9 100644
--- a/manifests/update.pp
+++ b/manifests/update.pp
@@ -56,13 +56,22 @@
   } else {
     $_refresh = true
   }
+  $apt_update_successful = @("ASH"/$)
+    for try in \$(seq ${apt::_update['tries']} -1 1); do
+      timeout ${apt::_update['timeout']} ${apt::provider} update && exit 0
+      [ \$try -eq 1 ] && exit \$?
+      sleep 1
+    done
+    - ASH
   exec { 'apt_update':
-    command     => "${apt::provider} update",
+    command     => "echo ${apt::provider} update FAILED",
     loglevel    => $apt::_update['loglevel'],
     logoutput   => 'on_failure',
+    path        => '/bin:/usr/bin',
+    provider    => shell,
     refreshonly => $_refresh,
+    returns     => [-1], # This ensures a run-time failure.
     timeout     => $apt::_update['timeout'],
-    tries       => $apt::_update['tries'],
-    try_sleep   => 1,
+    unless      => $apt_update_successful,
   }
 }
diff --git a/spec/classes/apt_spec.rb b/spec/classes/apt_spec.rb
index 1a7513c44a..85ea61099c 100644
--- a/spec/classes/apt_spec.rb
+++ b/spec/classes/apt_spec.rb
@@ -267,8 +267,7 @@
 
     it {
       is_expected.to contain_exec('apt_update').with(refreshonly: false,
-                                                     timeout: 1,
-                                                     tries: 3)
+                                                     timeout: 1)
     }
   end
 
@@ -307,8 +306,7 @@
 
     it {
       is_expected.to contain_exec('apt_update').with(refreshonly: false,
-                                                     timeout: 1,
-                                                     tries: 3)
+                                                     timeout: 1)
     }
   end