1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00

validate-modules: Fix some files modules (#52440)

This PR includes:
- fixes to validate-modules issues

All modules already include parameter types.

The remaining files-modules have action plugins, so comparing to the arg_spec only is incorrect.
This commit is contained in:
Dag Wieers 2019-02-25 13:29:31 +01:00 committed by GitHub
parent 4670e41a30
commit 3ced545d06
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 35 additions and 35 deletions

View file

@ -14,7 +14,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1',
'supported_by': 'core'} 'supported_by': 'core'}
DOCUMENTATION = """ DOCUMENTATION = r'''
--- ---
module: lineinfile module: lineinfile
short_description: Manage lines in text files short_description: Manage lines in text files
@ -61,6 +61,7 @@ options:
- If C(backrefs) is set, may contain backreferences that will get - If C(backrefs) is set, may contain backreferences that will get
expanded with the C(regexp) capture groups if the regexp matches. expanded with the C(regexp) capture groups if the regexp matches.
type: str type: str
aliases: [ value ]
backrefs: backrefs:
description: description:
- Used with C(state=present). - Used with C(state=present).
@ -68,7 +69,7 @@ options:
that will get populated if the C(regexp) matches. that will get populated if the C(regexp) matches.
- This parameter changes the operation of the module slightly; - This parameter changes the operation of the module slightly;
C(insertbefore) and C(insertafter) will be ignored, and if the C(regexp) C(insertbefore) and C(insertafter) will be ignored, and if the C(regexp)
doesn't match anywhere in the file, the file will be left unchanged. does not match anywhere in the file, the file will be left unchanged.
- If the C(regexp) does match, the last matching line will be replaced by - If the C(regexp) does match, the last matching line will be replaced by
the expanded line parameter. the expanded line parameter.
type: bool type: bool
@ -137,22 +138,24 @@ seealso:
author: author:
- Daniel Hokka Zakrissoni (@dhozac) - Daniel Hokka Zakrissoni (@dhozac)
- Ahti Kitsik (@ahtik) - Ahti Kitsik (@ahtik)
""" '''
EXAMPLES = r""" EXAMPLES = r'''
# Before 2.3, option 'dest', 'destfile' or 'name' was used instead of 'path' # NOTE: Before 2.3, option 'dest', 'destfile' or 'name' was used instead of 'path'
- lineinfile: - name: Ensure SELinux is set to enforcing mode
lineinfile:
path: /etc/selinux/config path: /etc/selinux/config
regexp: '^SELINUX=' regexp: '^SELINUX='
line: SELINUX=enforcing line: SELINUX=enforcing
- lineinfile: - name: Make sure group wheel is not in the sudoers configuration
lineinfile:
path: /etc/sudoers path: /etc/sudoers
state: absent state: absent
regexp: '^%wheel' regexp: '^%wheel'
# Searches for a line that begins with 127.0.0.1 and replaces it with the value of the 'line' parameter - name: Replace a localhost entry with our own
- lineinfile: lineinfile:
path: /etc/hosts path: /etc/hosts
regexp: '^127\.0\.0\.1' regexp: '^127\.0\.0\.1'
line: 127.0.0.1 localhost line: 127.0.0.1 localhost
@ -160,46 +163,43 @@ EXAMPLES = r"""
group: root group: root
mode: '0644' mode: '0644'
- lineinfile: - name: Ensure the default Apache port is 8080
lineinfile:
path: /etc/httpd/conf/httpd.conf path: /etc/httpd/conf/httpd.conf
regexp: '^Listen ' regexp: '^Listen '
insertafter: '^#Listen ' insertafter: '^#Listen '
line: Listen 8080 line: Listen 8080
- lineinfile: - name: Ensure we have our own comment added to /etc/services
lineinfile:
path: /etc/services path: /etc/services
regexp: '^# port for http' regexp: '^# port for http'
insertbefore: '^www.*80/tcp' insertbefore: '^www.*80/tcp'
line: '# port for http by default' line: '# port for http by default'
# Add a line to a file if the file does not exist, without passing regexp - name: Add a line to a file if the file does not exist, without passing regexp
- lineinfile: lineinfile:
path: /tmp/testfile path: /tmp/testfile
line: 192.168.1.99 foo.lab.net foo line: 192.168.1.99 foo.lab.net foo
create: yes create: yes
# Fully quoted because of the ': ' on the line. See the Gotchas in the YAML docs. # NOTE: Yaml requires escaping backslashes in double quotes but not in single quotes
- lineinfile: - name: Ensure the JBoss memory settings are exactly as needed
path: /etc/sudoers lineinfile:
state: present
regexp: '^%wheel\s'
line: '%wheel ALL=(ALL) NOPASSWD: ALL'
# Yaml requires escaping backslashes in double quotes but not in single quotes
- lineinfile:
path: /opt/jboss-as/bin/standalone.conf path: /opt/jboss-as/bin/standalone.conf
regexp: '^(.*)Xms(\\d+)m(.*)$' regexp: '^(.*)Xms(\\d+)m(.*)$'
line: '\1Xms${xms}m\3' line: '\1Xms${xms}m\3'
backrefs: yes backrefs: yes
# Validate the sudoers file before saving # NOTE: Fully quoted because of the ': ' on the line. See the Gotchas in the YAML docs.
- lineinfile: - name: Validate the sudoers file before saving
lineinfile:
path: /etc/sudoers path: /etc/sudoers
state: present state: present
regexp: '^%ADMIN ALL=' regexp: '^%ADMIN ALL='
line: '%ADMIN ALL=(ALL) NOPASSWD: ALL' line: '%ADMIN ALL=(ALL) NOPASSWD: ALL'
validate: /usr/sbin/visudo -cf %s validate: /usr/sbin/visudo -cf %s
""" '''
import os import os
import re import re

View file

@ -41,8 +41,10 @@ options:
description: description:
- Port number for ssh on the destination host. - Port number for ssh on the destination host.
- Prior to Ansible 2.0, the ansible_ssh_port inventory var took precedence over this value. - Prior to Ansible 2.0, the ansible_ssh_port inventory var took precedence over this value.
- This parameter defaults to the value of C(ansible_ssh_port) or C(ansible_port),
the C(remote_port) config setting or the value from ssh client configuration
if none of the former have been set.
type: int type: int
default: Value of ansible_ssh_port for this host, remote_port config setting, or the value from ssh client configuration if none of those are set
version_added: "1.5" version_added: "1.5"
mode: mode:
description: description:
@ -91,13 +93,13 @@ options:
recursive: recursive:
description: description:
- Recurse into directories. - Recurse into directories.
- This parameter defaults to the value of the archive option.
type: bool type: bool
default: the value of the archive option
links: links:
description: description:
- Copy symlinks as symlinks. - Copy symlinks as symlinks.
- This parameter defaults to the value of the archive option.
type: bool type: bool
default: the value of the archive option
copy_links: copy_links:
description: description:
- Copy symlinks as the item that they point to (the referent) is copied, rather than the symlink. - Copy symlinks as the item that they point to (the referent) is copied, rather than the symlink.
@ -106,23 +108,23 @@ options:
perms: perms:
description: description:
- Preserve permissions. - Preserve permissions.
- This parameter defaults to the value of the archive option.
type: bool type: bool
default: the value of the archive option
times: times:
description: description:
- Preserve modification times. - Preserve modification times.
- This parameter defaults to the value of the archive option.
type: bool type: bool
default: the value of the archive option
owner: owner:
description: description:
- Preserve owner (super user only). - Preserve owner (super user only).
- This parameter defaults to the value of the archive option.
type: bool type: bool
default: the value of the archive option
group: group:
description: description:
- Preserve group. - Preserve group.
- This parameter defaults to the value of the archive option.
type: bool type: bool
default: the value of the archive option
rsync_path: rsync_path:
description: description:
- Specify the rsync command to run on the remote host. See C(--rsync-path) on the rsync man page. - Specify the rsync command to run on the remote host. See C(--rsync-path) on the rsync man page.
@ -384,7 +386,7 @@ def main():
private_key=dict(type='path'), private_key=dict(type='path'),
rsync_path=dict(type='str'), rsync_path=dict(type='str'),
_local_rsync_path=dict(type='path', default='rsync'), _local_rsync_path=dict(type='path', default='rsync'),
_local_rsync_password=dict(type='str', default=None, no_log=True), _local_rsync_password=dict(type='str', no_log=True),
_substitute_controller=dict(type='bool', default=False), _substitute_controller=dict(type='bool', default=False),
archive=dict(type='bool', default=True), archive=dict(type='bool', default=True),
checksum=dict(type='bool', default=False), checksum=dict(type='bool', default=False),

View file

@ -393,7 +393,6 @@ lib/ansible/modules/files/file.py E322
lib/ansible/modules/files/file.py E324 lib/ansible/modules/files/file.py E324
lib/ansible/modules/files/ini_file.py E323 lib/ansible/modules/files/ini_file.py E323
lib/ansible/modules/files/iso_extract.py E324 lib/ansible/modules/files/iso_extract.py E324
lib/ansible/modules/files/lineinfile.py E322
lib/ansible/modules/files/lineinfile.py E323 lib/ansible/modules/files/lineinfile.py E323
lib/ansible/modules/files/lineinfile.py E324 lib/ansible/modules/files/lineinfile.py E324
lib/ansible/modules/files/lineinfile.py E326 lib/ansible/modules/files/lineinfile.py E326
@ -401,7 +400,6 @@ lib/ansible/modules/files/replace.py E323
lib/ansible/modules/files/synchronize.py E322 lib/ansible/modules/files/synchronize.py E322
lib/ansible/modules/files/synchronize.py E323 lib/ansible/modules/files/synchronize.py E323
lib/ansible/modules/files/synchronize.py E324 lib/ansible/modules/files/synchronize.py E324
lib/ansible/modules/files/synchronize.py E327
lib/ansible/modules/files/unarchive.py E323 lib/ansible/modules/files/unarchive.py E323
lib/ansible/modules/identity/keycloak/keycloak_client.py E324 lib/ansible/modules/identity/keycloak/keycloak_client.py E324
lib/ansible/modules/identity/keycloak/keycloak_clienttemplate.py E324 lib/ansible/modules/identity/keycloak/keycloak_clienttemplate.py E324