From c69c83c962f987c78af98da0746527df0e5c194d Mon Sep 17 00:00:00 2001
From: Caesarovich <38408878+Caesarovich@users.noreply.github.com>
Date: Mon, 21 Aug 2023 19:02:47 +0200
Subject: [PATCH] Fix macos defaults (#79999)

---
 .../79999-ansible-user-tweak-macos-defaults.yaml     |  2 ++
 lib/ansible/modules/user.py                          | 10 ++++++++++
 .../targets/user/tasks/test_create_user.yml          | 12 ++++++++++++
 test/integration/targets/user/vars/main.yml          |  2 +-
 4 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 changelogs/fragments/79999-ansible-user-tweak-macos-defaults.yaml

diff --git a/changelogs/fragments/79999-ansible-user-tweak-macos-defaults.yaml b/changelogs/fragments/79999-ansible-user-tweak-macos-defaults.yaml
new file mode 100644
index 00000000000..0457a0f1cb7
--- /dev/null
+++ b/changelogs/fragments/79999-ansible-user-tweak-macos-defaults.yaml
@@ -0,0 +1,2 @@
+minor_changes:
+  - 'ansible_user_module - tweaked macos user defaults to reflect expected defaults (https://github.com/ansible/ansible/issues/44316)'
diff --git a/lib/ansible/modules/user.py b/lib/ansible/modules/user.py
index f48e3244bf1..cc06c27a6db 100644
--- a/lib/ansible/modules/user.py
+++ b/lib/ansible/modules/user.py
@@ -28,6 +28,7 @@ options:
     comment:
         description:
             - Optionally sets the description (aka I(GECOS)) of user account.
+            - On macOS, this defaults to the O(name) option.
         type: str
     hidden:
         description:
@@ -49,6 +50,7 @@ options:
     group:
         description:
             - Optionally sets the user's primary group (takes a group name).
+            - On macOS, this defaults to V('staff')
         type: str
     groups:
         description:
@@ -2512,6 +2514,14 @@ class DarwinUser(User):
         if rc != 0:
             self.module.fail_json(msg='Cannot create user "%s".' % self.name, err=err, out=out, rc=rc)
 
+        # Make the Gecos (alias display name) default to username
+        if self.comment is None:
+            self.comment = self.name
+
+        # Make user group default to 'staff'
+        if self.group is None:
+            self.group = 'staff'
+
         self._make_group_numerical()
         if self.uid is None:
             self.uid = str(self._get_next_uid(self.system))
diff --git a/test/integration/targets/user/tasks/test_create_user.yml b/test/integration/targets/user/tasks/test_create_user.yml
index bced79056e5..644dbebbc55 100644
--- a/test/integration/targets/user/tasks/test_create_user.yml
+++ b/test/integration/targets/user/tasks/test_create_user.yml
@@ -65,3 +65,15 @@
       - "user_test1.results[2]['state'] == 'present'"
       - "user_test1.results[3]['state'] == 'present'"
       - "user_test1.results[4]['state'] == 'present'"
+
+- name: register user informations
+  when: ansible_facts.system == 'Darwin'
+  command: dscl . -read /Users/ansibulluser
+  register: user_test2
+
+- name: validate user defaults for MacOS
+  when: ansible_facts.system == 'Darwin'
+  assert:
+    that:
+      - "'RealName: ansibulluser' in user_test2.stdout_lines "
+      - "'PrimaryGroupID: 20' in user_test2.stdout_lines "
diff --git a/test/integration/targets/user/vars/main.yml b/test/integration/targets/user/vars/main.yml
index 4b328f7184b..2acd1e12bca 100644
--- a/test/integration/targets/user/vars/main.yml
+++ b/test/integration/targets/user/vars/main.yml
@@ -10,4 +10,4 @@ status_command:
 
 default_user_group:
   openSUSE Leap: users
-  MacOSX: admin
+  MacOSX: staff