Merge c401a5d331 into 6da1331018

.ansible-lint

@@ -4,12 +4,7 @@
 # SPDX-FileCopyrightText: 2024, Ansible Project
 
 skip_list:
-  - meta-runtime[unsupported-version]  # This rule doesn't make any sense
+  - meta-runtime[unsupported-version]  # Tis rule doesn't make any sense
   - fqcn[deep]  # This rule produces false positives for files in tests/unit/plugins/action/fixtures/
-  - sanity[cannot-ignore]  # This rule is skipped to keep backward compatibility with Python 2
-
 exclude_paths:
   - changelogs/
-  - .github/
-  - tests/
-  - meta/

.azure-pipelines/azure-pipelines.yml

@@ -43,7 +43,7 @@ pool: Standard
 
 stages:
   - stage: Sanity_devel
-    displayName: Ansible devel Sanity & Units & Lint
+    displayName: Ansible devel sanity
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
@@ -57,25 +57,8 @@ stages:
               test: units
             - name: Lint
               test: lint
-
-  - stage: Sanity_2_20
-    displayName: Ansible 2.20 Sanity & Units & Lint
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: "{0}"
-          testFormat: 2.20/{0}
-          targets:
-            - name: Sanity
-              test: sanity
-            - name: Units
-              test: units
-            - name: Lint
-              test: lint
-
   - stage: Sanity_2_19
-    displayName: Ansible 2.19 Sanity & Units & Lint
+    displayName: Ansible 2.19 sanitay & Units & Lint
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
@@ -89,9 +72,8 @@ stages:
               test: units
             - name: Lint
               test: lint
-
   - stage: Sanity_2_18
-    displayName: Ansible 2.18 Sanity & Units & Lint
+    displayName: Ansible 2.18 sanity & Units & Lint
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
@@ -105,9 +87,8 @@ stages:
               test: units
             - name: Lint
               test: lint
-
   - stage: Sanity_2_17
-    displayName: Ansible 2.17 Sanity & Units & Lint
+    displayName: Ansible 2.17 sanity & Units & Lint
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
@@ -121,7 +102,19 @@ stages:
               test: units
             - name: Lint
               test: lint
-
+  - stage: Sanity_2_16
+    displayName: Ansible 2.16 sanity & Units & Lint
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          nameFormat: "{0}"
+          testFormat: 2.16/{0}
+          targets:
+            - name: Sanity
+              test: sanity
+            - name: Units
+              test: units
   ## Docker
   - stage: Docker_devel
     displayName: Docker devel
@@ -130,21 +123,6 @@ stages:
       - template: templates/matrix.yml
         parameters:
           testFormat: devel/linux/{0}/1
-          targets:
-            - name: Fedora 43
-              test: fedora43
-            - name: Ubuntu 22.04
-              test: ubuntu2204
-            - name: Ubuntu 24.04
-              test: ubuntu2404
-
-  - stage: Docker_2_20
-    displayName: Docker 2.20
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.20/linux/{0}/1
           targets:
             - name: Fedora 42
               test: fedora42
@@ -152,7 +130,6 @@ stages:
               test: ubuntu2204
             - name: Ubuntu 24.04
               test: ubuntu2404
-
   - stage: Docker_2_19
     displayName: Docker 2.19
     dependsOn: []
@@ -167,7 +144,6 @@ stages:
               test: ubuntu2204
             - name: Ubuntu 24.04
               test: ubuntu2404
-
   - stage: Docker_2_18
     displayName: Docker 2.18
     dependsOn: []
@@ -182,7 +158,6 @@ stages:
               test: ubuntu2204
             - name: Ubuntu 24.04
               test: ubuntu2404
-
   - stage: Docker_2_17
     displayName: Docker 2.17
     dependsOn: []
@@ -195,6 +170,20 @@ stages:
               test: fedora39
             - name: Ubuntu 22.04
               test: ubuntu2204
+  - stage: Docker_2_16
+    displayName: Docker 2.16
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          testFormat: 2.16/linux/{0}/1
+          targets:
+            - name: CentOS 7
+              test: centos7
+            - name: Fedora 38
+              test: fedora38
+            - name: Ubuntu 22.04
+              test: ubuntu2204
 
   ## Remote
   - stage: Remote_devel
@@ -205,32 +194,14 @@ stages:
         parameters:
           testFormat: devel/{0}/1
           targets:
-            - name: RHEL 10.1
-              test: rhel/10.1
-            - name: RHEL 9.7
-              test: rhel/9.7
-            - name: FreeBSD 14.3
-              test: freebsd/14.3
-            - name: FreeBSD 15.0
-              test: freebsd/15.0
-
-  - stage: Remote_2_20
-    displayName: Remote 2.20
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.20/{0}/1
-          targets:
-            - name: RHEL 10.1
-              test: rhel/10.1
-            - name: RHEL 9.7
-              test: rhel/9.7
+            - name: RHEL 10.0
+              test: rhel/10.0
+            - name: RHEL 9.6
+              test: rhel/9.6
             - name: FreeBSD 14.3
               test: freebsd/14.3
             - name: FreeBSD 13.5
               test: freebsd/13.5
-
   - stage: Remote_2_19
     displayName: Remote 2.19
     dependsOn: []
@@ -239,15 +210,14 @@ stages:
         parameters:
           testFormat: 2.19/{0}/1
           targets:
-            - name: RHEL 10.1
-              test: rhel/10.1
-            - name: RHEL 9.7
-              test: rhel/9.7
+            - name: RHEL 10.0
+              test: rhel/10.0
+            - name: RHEL 9.5
+              test: rhel/9.5
             - name: FreeBSD 14.2
               test: freebsd/14.2
             - name: FreeBSD 13.5
               test: freebsd/13.5
-
   - stage: Remote_2_18
     displayName: Remote 2.18
     dependsOn: []
@@ -256,13 +226,10 @@ stages:
         parameters:
           testFormat: 2.18/{0}/1
           targets:
-            - name: RHEL 10.1
-              test: rhel/10.1
-            - name: RHEL 9.7
-              test: rhel/9.7
+            - name: RHEL 9.4
+              test: rhel/9.4
             - name: FreeBSD 13.5
               test: freebsd/13.5
-
   - stage: Remote_2_17
     displayName: Remote 2.17
     dependsOn: []
@@ -271,17 +238,31 @@ stages:
         parameters:
           testFormat: 2.17/{0}/1
           targets:
-            # 2.17 remote target doesn't have RHEL 9 image
-            - name: RHEL 10.0
-              test: rhel/10.0
+            - name: RHEL 9.3
+              test: rhel/9.3
             - name: FreeBSD 13.5
               test: freebsd/13.5
+  - stage: Remote_2_16
+    displayName: Remote 2.16
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          testFormat: 2.16/{0}/1
+          targets:
+            - name: RHEL 8.8
+              test: rhel/8.8
+            - name: RHEL 9.2
+              test: rhel/9.2
 
   ## Finally
 
   - stage: Summary
     condition: succeededOrFailed()
     dependsOn:
+      - Sanity_2_16
+      - Remote_2_16
+      - Docker_2_16
       - Sanity_2_17
       - Remote_2_17
       - Docker_2_17
@@ -291,9 +272,6 @@ stages:
       - Sanity_2_19
       - Remote_2_19
       - Docker_2_19
-      - Sanity_2_20
-      - Remote_2_20
-      - Docker_2_20
       - Sanity_devel
       - Remote_devel
       - Docker_devel

.github/BOTMETA.yml

@@ -0,0 +1,52 @@
+---
+automerge: false
+files:
+  $module_utils/mount.py:
+    labels: mount
+  $modules/acl.py:
+    authors: astorije bcoca
+    labels: acl
+    ignore: astorije
+  $modules/at.py:
+    authors: risaacson
+    labels: at
+  $modules/authorized_key.py:
+    authors: ansible
+    labels: authorized_key
+  $modules/mount.py:
+    authors: ansible skvidal
+    maintainers: jtyr
+    labels: mount
+    ignore: skvidal
+  $modules/patch.py:
+    authors: jirutka luisperlaz
+  $modules/seboolean.py:
+    authors: sfromm
+    labels: seboolean
+  $modules/selinux.py:
+    authors: goozbach
+    maintainers: samdoran
+    labels: selinux
+  $modules/synchronize.py:
+    authors: tima
+    labels: synchronize
+  $modules/sysctl.py:
+    authors: davixx
+    maintainers: Akasurde
+    labels: sysctl
+  $plugins/:
+    labels: profile
+  $plugins/debug.py:
+    labels: debug
+  $plugins/patch.py:
+    labels: patch
+  $plugins/synchronize.py:
+    labels: synchronize
+  $plugins/timer.py:
+macros:
+  actions: plugins/action
+  callbacks: plugins/callback
+  module_utils: plugins/module_utils
+  modules: plugins/modules
+  plugins: plugins/plugins
+  shells: plugins/shell

.github/workflows/certification.yml

@@ -1,35 +0,0 @@
----
-# This workflow calls the latest version of the
-# reusable workflow.
-# You can copy this file into your respository if
-# you want to check against pinned versions of
-# Automation Hub tests.
-name: Run collection certification checks
-
-on:
-  pull_request:
-    branches: [main]
-  workflow_dispatch:
-  schedule:
-    - cron: '0 6 * * *'
-
-concurrency:
-  group: cert-ver-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
-
-# Files that are not related to the core functionality
-# of your collection can cause Ansible Lint to fail.
-# If this happens, add an .ansible-lint file that includes
-# those files and directories to the root of your
-# repository; for example:
-# https://github.com/ansible-collections/partner-certification-checker/blob/main/.ansible-lint
-# https://github.com/ansible-collections/partner-certification-checker/blob/main/.ansible-lint
-
-# If there are sanity test failures that cannot be fixed and are allowed to ignore
-# https://docs.ansible.com/projects/lint/rules/sanity/, create a sanity ignore file
-# https://docs.ansible.com/projects/ansible/devel/dev_guide/testing/sanity/ignores.html#ignore-file-location
-# for each affected version of ansible-core (for example, `tests/sanity/ignore-2.18.txt`) and add corresponding entries.
-jobs:
-  call:
-    uses: ansible-collections/partner-certification-checker/.github/workflows/certification-reusable.yml@v0.1

README.md

@@ -2,7 +2,7 @@
 <!-- Add CI and code coverage badges here. Samples included below. -->
 [![Build Status](
 https://dev.azure.com/ansible/ansible.posix/_apis/build/status/CI?branchName=main)](https://dev.azure.com/ansible/ansible.posix/_build?definitionId=26)
-[![Codecov](https://img.shields.io/codecov/c/github/ansible-collections/ansible.posix)](https://codecov.io/gh/ansible-collections/ansible.posix)
+[![Run Status](https://api.shippable.com/projects/5e669aaf8b17a60007e4d18d/badge?branch=main)]() <!--[![Codecov](https://img.shields.io/codecov/c/github/ansible-collections/ansible.posix)](https://codecov.io/gh/ansible-collections/ansible.posix)-->
 
 ## Communication
 

changelogs/fragments/220_synchronize_add_quiet_option.yml

@@ -0,0 +1,2 @@
+minor_changes:
+- synchronize - add the ``quiet`` option to suppress non-error messages (https://github.com/ansible-collections/ansible.posix/issues/171).

changelogs/fragments/639_fix_authorized_key.yml

@@ -1,3 +0,0 @@
----
-bugfixes:
-  - ansible.posix.authorized_key - fixes error on permission denied in authorized_key module (https://github.com/ansible-collections/ansible.posix/issues/462).

changelogs/fragments/682_update_ci_20250929.yml

@@ -1,4 +0,0 @@
-trivial:
-  - Updatng AZP CI matrix to ignore ansible-bad-import-from on six(https://github.com/ansible-collections/ansible.posix/pull/682).
-  - Skipped sanity[cannot-ignore] to keep backward compatibility with Python2.
-  - Consolidate all ansible-lint option locations into .ansible-lint file.

changelogs/fragments/693_azp_update_20251205.yml

@@ -1,5 +0,0 @@
----
-trivial:
-  - AZP - Update AZP matrix to follow ansible-test changes.
-  - Add ignore file for Ansible Core 2.21.
-  - Remove ignore lines for ansible-bad-import-from in 2.20 sanity tests.

plugins/modules/authorized_key.py

@@ -225,8 +225,6 @@ import os.path
 import tempfile
 import re
 import shlex
-import errno
-import traceback
 from operator import itemgetter
 
 from ansible.module_utils._text import to_native
@@ -477,18 +475,16 @@ def parsekey(module, raw_key, rank=None):
     return (key, key_type, options, comment, rank)
 
 
-def readfile(module, filename):
+def readfile(filename):
+
+    if not os.path.isfile(filename):
+        return ''
+
+    f = open(filename)
     try:
-        with open(filename, 'r') as f:
-            return f.read()
-    except IOError as e:
-        if e.errno == errno.EACCES:
-            module.fail_json(msg="Permission denied on file or path for authorized keys file: %s" % filename,
-                             exception=traceback.format_exc())
-        elif e.errno == errno.ENOENT:
-            return ''
-        else:
-            raise
+        return f.read()
+    finally:
+        f.close()
 
 
 def parsekeys(module, lines):
@@ -601,7 +597,7 @@ def enforce_state(module, params):
     # check current state -- just get the filename, don't create file
     do_write = False
     params["keyfile"] = keyfile(module, user, do_write, path, manage_dir)
-    existing_content = readfile(module, params["keyfile"])
+    existing_content = readfile(params["keyfile"])
     existing_keys = parsekeys(module, existing_content)
 
     # Add a place holder for keys that should exist in the state=present and

plugins/modules/synchronize.py

@@ -8,7 +8,6 @@
 from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
-
 DOCUMENTATION = r'''
 ---
 module: synchronize
@@ -204,6 +203,12 @@ options:
     description: Internal use only. See O(use_ssh_args) for ssh arg settings.
     type: str
     required: false
+  quiet:
+    description:
+      - This option specifies quiet option which on true suppresses the output.
+    type: bool
+    default: false
+    version_added: 1.6.0
 
 notes:
    - C(rsync) must be installed on both the local and remote host.
@@ -361,6 +366,12 @@ EXAMPLES = r'''
         src: /tmp/localpath/
         dest: /tmp/remotepath
         rsync_path: /usr/gnu/bin/rsync
+
+- name: Synchronization with quiet option enabled
+  ansible.posix.synchronize:
+    src: some/relative/path
+    dest: /some/absolute/path
+    quiet: true
 '''
 
 
@@ -438,6 +449,7 @@ def main():
             delay_updates=dict(type='bool', default=True),
             mode=dict(type='str', default='push', choices=['pull', 'push']),
             link_dest=dict(type='list', elements='path'),
+            quiet=dict(type='bool', default=False)
         ),
         supports_check_mode=True,
     )
@@ -478,6 +490,7 @@ def main():
     verify_host = module.params['verify_host']
     link_dest = module.params['link_dest']
     delay_updates = module.params['delay_updates']
+    quiet = module.params['quiet']
 
     if '/' not in rsync:
         rsync = module.get_bin_path(rsync, required=True)
@@ -602,6 +615,9 @@ def main():
 
     cmd.append(shlex_quote(source))
     cmd.append(shlex_quote(dest))
+    if quiet:
+        cmd.append('--quiet')
+
     cmdstr = ' '.join(cmd)
 
     # If we are using password authentication, write the password into the pipe
@@ -634,14 +650,17 @@ def main():
     out_lines = out_clean.split('\n')
     while '' in out_lines:
         out_lines.remove('')
-    if module._diff:
-        diff = {'prepared': out_clean}
-        return module.exit_json(changed=changed, msg=out_clean,
-                                rc=rc, cmd=cmdstr, stdout_lines=out_lines,
-                                diff=diff)
 
-    return module.exit_json(changed=changed, msg=out_clean,
-                            rc=rc, cmd=cmdstr, stdout_lines=out_lines)
+    result = dict(changed=changed, rc=rc, cmd=cmdstr, stdout_lines=out_lines, msg=out_clean)
+
+    if quiet:
+        changes = out.count(changed_marker) if changed else 0
+        result['msg'] = "%s files/directories have been synchronized" % changes
+
+    if module._diff:
+        result['diff'] = {'prepared': out_clean}
+
+    return module.exit_json(**result)
 
 
 if __name__ == '__main__':

tests/integration/inventory

@@ -0,0 +1,2 @@
+[testgroup]
+testhost ansible_connection="local" ansible_pipelining="yes" ansible_python_interpreter="/Users/mandkulk/venv3.9/bin/python"

tests/integration/targets/authorized_key/tasks/check_permissions.yml

@@ -1,41 +0,0 @@
----
-# -------------------------------------------------------------
-# check permissions
-
-- name: Create a file that is not accessible
-  ansible.builtin.file:
-    state: touch
-    path: "{{ output_dir | expanduser }}/file_permissions"
-    owner: root
-    mode: '0000'
-
-- name: Create unprivileged user
-  ansible.builtin.user:
-    name: nopriv
-    create_home: true
-
-- name: Try to delete a key from an unreadable file
-  become: true
-  become_user: nopriv
-  ansible.posix.authorized_key:
-    user: root
-    key: "{{ dss_key_basic }}"
-    state: absent
-    path: "{{ output_dir | expanduser }}/file_permissions"
-  register: result
-  ignore_errors: true
-
-- name: Assert that the key deletion has failed
-  ansible.builtin.assert:
-    that:
-      - result is failed
-
-- name: Remove the file
-  ansible.builtin.file:
-    state: absent
-    path: "{{ output_dir | expanduser }}/file_permissions"
-
-- name: Remove the user
-  ansible.builtin.user:
-    name: nopriv
-    state: absent

tests/integration/targets/authorized_key/tasks/main.yml

@@ -34,6 +34,3 @@
 
 - name: Test for specifying key as a path
   ansible.builtin.import_tasks: check_path.yml
-
-- name: Test for permission denied files
-  ansible.builtin.import_tasks: check_permissions.yml

tests/integration/targets/synchronize/tasks/main.yml

@@ -339,6 +339,37 @@
       - stat_result_b.stat.exists == True
       - stat_result_b.stat.checksum == '2aae6c35c94fcfb415dbe95f408b9ce91ee846ed'
 
+- name: Synchronize files with quiet option
+  ansible.posix.synchronize:
+    src: '{{ output_dir }}/foo.txt'
+    dest: '{{ output_dir }}/foo.result'
+    quiet: true
+  register: sync_result
+
+- name: Assertion for synchronize with quiet option
+  ansible.builtin.assert:
+    that:
+      - '''files/directories have been synchronized'' in sync_result.msg'
+
+- name: Cleanup
+  ansible.builtin.file:
+    state: absent
+    path: '{{ output_dir }}/{{ item }}'
+  loop:
+    - foo.result
+    - bar.result
+
+- name: Synchronize files without quiet option
+  ansible.posix.synchronize:
+    src: '{{ output_dir }}/foo.txt'
+    dest: '{{ output_dir }}/foo.result'
+  register: sync_result
+
+- name: Assertion for synchronize without quiet option
+  ansible.builtin.assert:
+    that:
+      - '''files/directories have been synchronized'' not in sync_result.msg'
+
 - name: Cleanup
   ansible.builtin.file:
     state: absent

tests/sanity/ignore-2.21.txt

@@ -1,10 +0,0 @@
-tests/utils/shippable/timing.py shebang
-plugins/action/synchronize.py pylint:ansible-bad-import-from
-plugins/callback/cgroup_perf_recap.py pylint:ansible-bad-import-from
-plugins/modules/mount.py pylint:ansible-bad-import-from
-plugins/modules/sysctl.py pylint:ansible-bad-import-from
-plugins/shell/csh.py pylint:ansible-bad-import-from
-plugins/shell/fish.py pylint:ansible-bad-import-from
-tests/unit/mock/procenv.py pylint:ansible-bad-import-from
-tests/unit/mock/yaml_helper.py pylint:ansible-bad-import-from
-tests/unit/modules/conftest.py pylint:ansible-bad-import-from

tests/utils/shippable/lint.sh

@@ -9,5 +9,6 @@ command -v ansible
 pip install --upgrade --user pip
 pip install --upgrade --user ansible-lint
 
-# To specify additional options, you can specify them into .ansible-lint file.
-PATH="${PATH/\~/${HOME}}" ansible-lint
+PATH="${PATH/\~/${HOME}}" ansible-lint \
+                                    --exclude changelogs/ \
+                                    --profile=production