diff options
| author | Tim Smith <tsmith84@gmail.com> | 2021-08-13 21:42:53 -0700 |
|---|---|---|
| committer | Tim Smith <tsmith84@gmail.com> | 2021-08-17 09:01:14 -0700 |
| commit | 065103bf6b85f319053d658f498d6056a5f3d40e (patch) | |
| tree | a134c67cb7dd4010cb9367823098e3a5cf884767 | |
| parent | f534ac51c8564651d52fe2bb144b2c0af1703768 (diff) | |
| download | chef-065103bf6b85f319053d658f498d6056a5f3d40e.tar.gz | |
Fix failures in mac_user
After merging https://github.com/chef/chef/pull/11731 our functional tests started failing. It turns out we're not being defensive about data missing when we parse the dscl -> plist -> current resource. On my mac after creating a single user 'foo' with all defaults the shell data is nil as is the is_hidden data. The way we try to get the first item in the array fails on a method missing error for nilclass.
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | lib/chef/provider/user/mac.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/chef/provider/user/mac.rb b/lib/chef/provider/user/mac.rb index 94b0ce0b21..e0e120aa0b 100644 --- a/lib/chef/provider/user/mac.rb +++ b/lib/chef/provider/user/mac.rb @@ -28,7 +28,7 @@ class Chef class Provider class User # A macOS user provider that is compatible with default TCC restrictions - # in macOS 10.14. See resource/user/mac_user.rb for complete description + # in macOS 10.14+. See resource/user/mac_user.rb for complete description # of the mac_user resource class MacUser < Chef::Provider::User include Chef::Mixin::Which @@ -49,11 +49,11 @@ class Chef current_resource.uid(user_plist[:uid][0]) current_resource.gid(user_plist[:gid][0]) current_resource.home(user_plist[:home][0]) - current_resource.shell(user_plist[:shell][0]) + current_resource.shell(user_plist[:shell]&.first) # use &.first since shell can be nil current_resource.comment(user_plist[:comment][0]) if user_plist[:is_hidden] - current_resource.hidden(user_plist[:is_hidden][0] == "1" ? true : false) + current_resource.hidden(user_plist[:is_hidden]&.first == "1" ? true : false) # when not hidden the value seems to be nil so &.first to handle that end shadow_hash = user_plist[:shadow_hash] |