Merge pull request #490 from puppetlabs/MODULES-11458-revert-deferred…

…-function (MODULES-11458) Revert deferred function
puppetlabs · Aug 13, 2024 · 170b0d5 · 170b0d5
2 parents 3a43382 + d570416
commit 170b0d5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 17 deletions.
diff --git a/lib/puppet/functions/user_password.rb b/lib/puppet/functions/user_password.rb
diff --git a/manifests/user.pp b/manifests/user.pp
@@ -281,6 +281,10 @@
         }
       )
     }
+    $_password = (($password =~ String and $password == '') and $ignore_password_if_empty) ? {
+      true    => undef,
+      default => $password,
+    }
     $_purge_sshkeys = ($purge_sshkeys and $sshkey_custom_path != undef) ? {
       true => [String($sshkey_custom_path)],
       default => $purge_sshkeys,
@@ -301,10 +305,7 @@
       iterations       => $iterations,
       managehome       => $managehome,
       membership       => $membership,
-      password         => (($password =~ String and $password == '') and $ignore_password_if_empty) ? {
-        true    => undef,
-        default => Deferred('user_password', [$password]),
-      },
+      password         => $_password,
       password_max_age => $password_max_age,
       purge_ssh_keys   => $_purge_sshkeys,
       salt             => $salt,

diff --git a/spec/acceptance/user_spec.rb b/spec/acceptance/user_spec.rb
@@ -386,7 +386,7 @@
       apply_manifest(pp_user_with_sensitive_password, catch_failures: true)
 
       expect(user('sensitive_user')).to exist
-      expect(user('sensitive_user').encrypted_password).not_to be_empty
+      expect(user('sensitive_user')).to contain_password 'bar'
     end
   end
 end