diff --git a/changelogs/fragments/4516-deprecation-removals.yml b/changelogs/fragments/4516-deprecation-removals.yml new file mode 100644 index 0000000000..df9e8d8dc9 --- /dev/null +++ b/changelogs/fragments/4516-deprecation-removals.yml @@ -0,0 +1,18 @@ +removed_features: + - xfconf - the ``get`` state has been removed. Use the ``xfconf_info`` module instead (https://github.com/ansible-collections/community.general/pull/4516). + - dnsimple - remove support for dnsimple < 2.0.0 (https://github.com/ansible-collections/community.general/pull/4516). + - proxmox, proxmox_kvm, proxmox_snap - no longer allow to specify a VM name that matches multiple VMs. If this happens, the modules now fail (https://github.com/ansible-collections/community.general/pull/4516). + - ali_instance_info - removed the options ``availability_zone``, ``instance_ids``, and ``instance_names``. Use filter item ``zone_id`` instead of ``availability_zone``, filter item ``instance_ids`` instead of ``instance_ids``, and filter item ``instance_name`` instead of ``instance_names`` (https://github.com/ansible-collections/community.general/pull/4516). + - linode - removed the ``backupsenabled`` option. Use ``backupweeklyday`` or ``backupwindow`` to enable backups (https://github.com/ansible-collections/community.general/pull/4516). + - serverless - removed the ``functions`` option. It was not used by the module (https://github.com/ansible-collections/community.general/pull/4516). + - compose - removed various deprecated aliases. Use the version with ``_`` instead of ``-`` instead (https://github.com/ansible-collections/community.general/pull/4516). + - homebrew, homebrew_cask - removed the deprecated alias ``update-brew`` of ``update_brew`` (https://github.com/ansible-collections/community.general/pull/4516). + - apt_rpm - removed the deprecated alias ``update-cache`` of ``update_cache`` (https://github.com/ansible-collections/community.general/pull/4516). + - opkg - removed the deprecated alias ``update-cache`` of ``update_cache`` (https://github.com/ansible-collections/community.general/pull/4516). + - pacman - removed the deprecated alias ``update-cache`` of ``update_cache`` (https://github.com/ansible-collections/community.general/pull/4516). + - slackpkg - removed the deprecated alias ``update-cache`` of ``update_cache`` (https://github.com/ansible-collections/community.general/pull/4516). + - urpmi - removed the deprecated alias ``no-recommends`` of ``no_recommends`` (https://github.com/ansible-collections/community.general/pull/4516). + - urpmi - removed the deprecated alias ``update-cache`` of ``update_cache`` (https://github.com/ansible-collections/community.general/pull/4516). + - xbps - removed the deprecated alias ``update-cache`` of ``update_cache`` (https://github.com/ansible-collections/community.general/pull/4516). + - github_deploy_key - removed the deprecated alias ``2fa_token`` of ``otp`` (https://github.com/ansible-collections/community.general/pull/4516). + - pacman - if ``update_cache=true`` is used with ``name`` or ``upgrade``, the changed state will now also indicate if only the cache was updated. To keep the old behavior - only indicate ``changed`` when a package was installed/upgraded -, use ``changed_when`` as indicated in the module examples (https://github.com/ansible-collections/community.general/pull/4516). diff --git a/galaxy.yml b/galaxy.yml index c74e4deddd..6dc58b3f0f 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -1,6 +1,6 @@ namespace: community name: general -version: 4.8.0 +version: 5.0.0 readme: README.md authors: - Ansible (https://github.com/ansible) diff --git a/plugins/module_utils/proxmox.py b/plugins/module_utils/proxmox.py index 94bd0b7943..56f0b35e7f 100644 --- a/plugins/module_utils/proxmox.py +++ b/plugins/module_utils/proxmox.py @@ -122,14 +122,7 @@ class ProxmoxAnsible(object): self.module.fail_json(msg='No VM with name %s found' % name) elif len(vms) > 1: - if choose_first_if_multiple: - self.module.deprecate( - 'Multiple VMs with name %s found, choosing the first one. ' % name + - 'This will be an error in the future. To ensure the correct VM is used, ' + - 'also pass the vmid parameter.', - version='5.0.0', collection_name='community.general') - else: - self.module.fail_json(msg='Multiple VMs with name %s found, provide vmid instead' % name) + self.module.fail_json(msg='Multiple VMs with name %s found, provide vmid instead' % name) return vms[0] diff --git a/plugins/modules/cloud/alicloud/ali_instance_info.py b/plugins/modules/cloud/alicloud/ali_instance_info.py index 06df6cb4f1..2331db69a6 100644 --- a/plugins/modules/cloud/alicloud/ali_instance_info.py +++ b/plugins/modules/cloud/alicloud/ali_instance_info.py @@ -33,25 +33,6 @@ description: - This module was called C(ali_instance_facts) before Ansible 2.9. The usage did not change. options: - availability_zone: - description: - - Aliyun availability zone ID in which to launch the instance. - - Deprecated parameter, it will be removed in community.general 5.0.0. Please use filter item I(zone_id) instead. - aliases: ['alicloud_zone'] - type: str - instance_names: - description: - - A list of ECS instance names. - - Deprecated parameter, it will be removed in community.general 5.0.0. Please use filter item I(instance_name) instead. - aliases: ["names"] - type: list - elements: str - instance_ids: - description: - - A list of ECS instance ids. - aliases: ["ids"] - type: list - elements: str name_prefix: description: - Use a instance name prefix to filter ecs instances. @@ -67,8 +48,8 @@ options: - A dict of filters to apply. Each dict item consists of a filter key and a filter value. The filter keys can be all of request parameters. See U(https://www.alibabacloud.com/help/doc-detail/25506.htm) for parameter details. Filter keys can be same as request parameter name or be lower case and use underscore ("_") or dash ("-") to - connect different words in one parameter. 'InstanceIds' should be a list and it will be appended to - I(instance_ids) automatically. 'Tag.n.Key' and 'Tag.n.Value' should be a dict and using I(tags) instead. + connect different words in one parameter. 'InstanceIds' should be a list. + 'Tag.n.Key' and 'Tag.n.Value' should be a dict and using I(tags) instead. type: dict version_added: '0.2.0' author: @@ -376,11 +357,6 @@ except ImportError: def main(): argument_spec = ecs_argument_spec() argument_spec.update(dict( - availability_zone=dict(aliases=['alicloud_zone'], - removed_in_version="5.0.0", removed_from_collection="community.general"), - instance_ids=dict(type='list', elements='str', aliases=['ids'], - removed_in_version="5.0.0", removed_from_collection="community.general"), - instance_names=dict(type='list', elements='str', aliases=['names']), name_prefix=dict(type='str'), tags=dict(type='dict', aliases=['instance_tags']), filters=dict(type='dict') @@ -398,21 +374,12 @@ def main(): instances = [] instance_ids = [] - ids = module.params['instance_ids'] + ids = [] name_prefix = module.params['name_prefix'] - names = module.params['instance_names'] - zone_id = module.params['availability_zone'] - if ids and (not isinstance(ids, list) or len(ids) < 1): - module.fail_json(msg='instance_ids should be a list of instances, aborting') - - if names and (not isinstance(names, list) or len(names) < 1): - module.fail_json(msg='instance_names should be a list of instances, aborting') filters = module.params['filters'] if not filters: filters = {} - if not ids: - ids = [] for key, value in list(filters.items()): if key in ["InstanceIds", "instance_ids", "instance-ids"] and isinstance(ids, list): for id in value: @@ -422,10 +389,6 @@ def main(): filters['instance_ids'] = ids if module.params['tags']: filters['tags'] = module.params['tags'] - if zone_id: - filters['zone_id'] = zone_id - if names: - filters['instance_name'] = names[0] for inst in ecs.describe_instances(**filters): if name_prefix: diff --git a/plugins/modules/cloud/linode/linode.py b/plugins/modules/cloud/linode/linode.py index c627fb705a..8c29e52a21 100644 --- a/plugins/modules/cloud/linode/linode.py +++ b/plugins/modules/cloud/linode/linode.py @@ -90,11 +90,6 @@ options: description: - Set threshold for average IO ops/sec over 2 hour period. type: int - backupsenabled: - description: - - Deprecated parameter, it will be removed in community.general C(5.0.0). - - To enable backups pass values to either I(backupweeklyday) or I(backupwindow). - type: int backupweeklyday: description: - Day of the week to take backups. @@ -594,7 +589,6 @@ def main(): alert_cpu_threshold=dict(type='int'), alert_diskio_enabled=dict(type='bool'), alert_diskio_threshold=dict(type='int'), - backupsenabled=dict(type='int', removed_in_version='5.0.0', removed_from_collection='community.general'), backupweeklyday=dict(type='int'), backupwindow=dict(type='int'), displaygroup=dict(type='str', default=''), diff --git a/plugins/modules/cloud/misc/proxmox.py b/plugins/modules/cloud/misc/proxmox.py index e6f9bc5b71..da8783e16d 100644 --- a/plugins/modules/cloud/misc/proxmox.py +++ b/plugins/modules/cloud/misc/proxmox.py @@ -626,7 +626,7 @@ def main(): if not vmid and state == 'present': vmid = proxmox.get_nextvmid() elif not vmid and hostname: - vmid = proxmox.get_vmid(hostname, choose_first_if_multiple=True) + vmid = proxmox.get_vmid(hostname) elif not vmid: module.exit_json(changed=False, msg="Vmid could not be fetched for the following action: %s" % state) @@ -637,9 +637,9 @@ def main(): module.exit_json(changed=False, msg="VM with vmid = %s is already exists" % vmid) # If no vmid was passed, there cannot be another VM named 'hostname' if (not module.params['vmid'] and - proxmox.get_vmid(hostname, ignore_missing=True, choose_first_if_multiple=True) and + proxmox.get_vmid(hostname, ignore_missing=True) and not module.params['force']): - vmid = proxmox.get_vmid(hostname, choose_first_if_multiple=True) + vmid = proxmox.get_vmid(hostname) module.exit_json(changed=False, msg="VM with hostname %s already exists and has ID number %s" % (hostname, vmid)) elif not proxmox.get_node(node): module.fail_json(msg="node '%s' not exists in cluster" % node) @@ -681,9 +681,9 @@ def main(): module.exit_json(changed=False, msg="VM with vmid = %s is already exists" % vmid) # If no vmid was passed, there cannot be another VM named 'hostname' if (not module.params['vmid'] and - proxmox.get_vmid(hostname, ignore_missing=True, choose_first_if_multiple=True) and + proxmox.get_vmid(hostname, ignore_missing=True) and not module.params['force']): - vmid = proxmox.get_vmid(hostname, choose_first_if_multiple=True) + vmid = proxmox.get_vmid(hostname) module.exit_json(changed=False, msg="VM with hostname %s already exists and has ID number %s" % (hostname, vmid)) if not proxmox.get_vm(clone, ignore_missing=True): module.exit_json(changed=False, msg="Container to be cloned does not exist") diff --git a/plugins/modules/cloud/misc/proxmox_kvm.py b/plugins/modules/cloud/misc/proxmox_kvm.py index f80848c4c4..2354cb916f 100644 --- a/plugins/modules/cloud/misc/proxmox_kvm.py +++ b/plugins/modules/cloud/misc/proxmox_kvm.py @@ -1187,7 +1187,7 @@ def main(): module.fail_json(msg="Can't get the next vmid for VM {0} automatically. Ensure your cluster state is good".format(name)) else: clone_target = clone or name - vmid = proxmox.get_vmid(clone_target, ignore_missing=True, choose_first_if_multiple=True) + vmid = proxmox.get_vmid(clone_target, ignore_missing=True) if clone is not None: # If newid is not defined then retrieve the next free id from ProxmoxAPI @@ -1205,7 +1205,7 @@ def main(): proxmox.get_vm(vmid) # Ensure the choosen VM name doesn't already exist when cloning - existing_vmid = proxmox.get_vmid(name, ignore_missing=True, choose_first_if_multiple=True) + existing_vmid = proxmox.get_vmid(name, ignore_missing=True) if existing_vmid: module.exit_json(changed=False, vmid=existing_vmid, msg="VM with name <%s> already exists" % name) @@ -1231,8 +1231,8 @@ def main(): try: if proxmox.get_vm(vmid, ignore_missing=True) and not (update or clone): module.exit_json(changed=False, vmid=vmid, msg="VM with vmid <%s> already exists" % vmid) - elif proxmox.get_vmid(name, ignore_missing=True, choose_first_if_multiple=True) and not (update or clone): - module.exit_json(changed=False, vmid=proxmox.get_vmid(name, choose_first_if_multiple=True), msg="VM with name <%s> already exists" % name) + elif proxmox.get_vmid(name, ignore_missing=True) and not (update or clone): + module.exit_json(changed=False, vmid=proxmox.get_vmid(name), msg="VM with name <%s> already exists" % name) elif not (node, name): module.fail_json(msg='node, name is mandatory for creating/updating vm') elif not proxmox.get_node(node): diff --git a/plugins/modules/cloud/misc/proxmox_snap.py b/plugins/modules/cloud/misc/proxmox_snap.py index 6802ec78e7..bf845e5103 100644 --- a/plugins/modules/cloud/misc/proxmox_snap.py +++ b/plugins/modules/cloud/misc/proxmox_snap.py @@ -197,7 +197,7 @@ def main(): # If hostname is set get the VM id from ProxmoxAPI if not vmid and hostname: - vmid = proxmox.get_vmid(hostname, choose_first_if_multiple=True) + vmid = proxmox.get_vmid(hostname) elif not vmid: module.exit_json(changed=False, msg="Vmid could not be fetched for the following action: %s" % state) diff --git a/plugins/modules/cloud/misc/serverless.py b/plugins/modules/cloud/misc/serverless.py index 878621c38c..fce6b77e16 100644 --- a/plugins/modules/cloud/misc/serverless.py +++ b/plugins/modules/cloud/misc/serverless.py @@ -34,14 +34,6 @@ options: - The name of the serverless framework project stage to deploy to. - This uses the serverless framework default "dev". type: str - functions: - description: - - A list of specific functions to deploy. - - If this is not provided, all functions in the service will be deployed. - - Deprecated parameter, it will be removed in community.general 5.0.0. - type: list - elements: str - default: [] region: description: - AWS region to deploy the service to. @@ -159,8 +151,6 @@ def main(): argument_spec=dict( service_path=dict(type='path', required=True), state=dict(type='str', default='present', choices=['absent', 'present']), - functions=dict(type='list', elements='str', - removed_in_version="5.0.0", removed_from_collection="community.general"), region=dict(type='str', default=''), stage=dict(type='str', default=''), deploy=dict(type='bool', default=True), diff --git a/plugins/modules/net_tools/dnsimple.py b/plugins/modules/net_tools/dnsimple.py index d6606cc098..a4d531c76d 100644 --- a/plugins/modules/net_tools/dnsimple.py +++ b/plugins/modules/net_tools/dnsimple.py @@ -81,9 +81,7 @@ options: default: no version_added: 3.5.0 requirements: - - "dnsimple >= 1.0.0" -notes: - - "Support for C(dnsimple < 2) is deprecated and will be removed in community.general 5.0.0." + - "dnsimple >= 2.0.0" author: "Alex Coomans (@drcapulet)" ''' @@ -153,80 +151,6 @@ import re from ansible_collections.community.general.plugins.module_utils.version import LooseVersion -class DNSimpleV1(): - """class which uses dnsimple-python < 2""" - - def __init__(self, account_email, account_api_token, sandbox, module): - """init""" - self.module = module - self.account_email = account_email - self.account_api_token = account_api_token - self.sandbox = sandbox - self.dnsimple_client() - - def dnsimple_client(self): - """creates a dnsimple client object""" - if self.account_email and self.account_api_token: - self.client = DNSimple(sandbox=self.sandbox, email=self.account_email, api_token=self.account_api_token) - else: - self.client = DNSimple(sandbox=self.sandbox) - - def get_all_domains(self): - """returns a list of all domains""" - domain_list = self.client.domains() - return [d['domain'] for d in domain_list] - - def get_domain(self, domain): - """returns a single domain by name or id""" - try: - dr = self.client.domain(domain)['domain'] - except DNSimpleException as e: - exception_string = str(e.args[0]['message']) - if re.match(r"^Domain .+ not found$", exception_string): - dr = None - else: - raise - return dr - - def create_domain(self, domain): - """create a single domain""" - return self.client.add_domain(domain)['domain'] - - def delete_domain(self, domain): - """delete a single domain""" - self.client.delete(domain) - - def get_records(self, domain, dnsimple_filter=None): - """return dns ressource records which match a specified filter""" - return [r['record'] for r in self.client.records(str(domain), params=dnsimple_filter)] - - def delete_record(self, domain, rid): - """delete a single dns ressource record""" - self.client.delete_record(str(domain), rid) - - def update_record(self, domain, rid, ttl=None, priority=None): - """update a single dns ressource record""" - data = {} - if ttl: - data['ttl'] = ttl - if priority: - data['priority'] = priority - return self.client.update_record(str(domain), str(rid), data)['record'] - - def create_record(self, domain, name, record_type, content, ttl=None, priority=None): - """create a single dns ressource record""" - data = { - 'name': name, - 'type': record_type, - 'content': content, - } - if ttl: - data['ttl'] = ttl - if priority: - data['priority'] = priority - return self.client.add_record(str(domain), data)['record'] - - class DNSimpleV2(): """class which uses dnsimple-python >= 2""" @@ -336,16 +260,6 @@ try: except ImportError: DNSIMPLE_IMP_ERR.append(traceback.format_exc()) -if not HAS_DNSIMPLE: - # try to import dnsimple < 2.0.0 - try: - from dnsimple.dnsimple import __version__ as dnsimple_version - from dnsimple import DNSimple - from dnsimple.dnsimple import DNSimpleException - HAS_DNSIMPLE = True - except ImportError: - DNSIMPLE_IMP_ERR.append(traceback.format_exc()) - from ansible.module_utils.basic import AnsibleModule, missing_required_lib, env_fallback @@ -395,15 +309,10 @@ def main(): DNSIMPLE_MAJOR_VERSION = LooseVersion(dnsimple_version).version[0] try: - if DNSIMPLE_MAJOR_VERSION > 1: - ds = DNSimpleV2(account_email, account_api_token, sandbox, module) - else: - module.deprecate( - 'Support for python-dnsimple < 2 is deprecated. ' - 'Update python-dnsimple to version >= 2.0.0', - version='5.0.0', collection_name='community.general' - ) - ds = DNSimpleV1(account_email, account_api_token, sandbox, module) + if DNSIMPLE_MAJOR_VERSION < 2: + module.fail_json( + msg='Support for python-dnsimple < 2 has been removed in community.general 5.0.0. Update python-dnsimple to version >= 2.0.0.') + ds = DNSimpleV2(account_email, account_api_token, sandbox, module) # Let's figure out what operation we want to do # No domain, return a list if not domain: diff --git a/plugins/modules/packaging/language/composer.py b/plugins/modules/packaging/language/composer.py index 86fe7bdea3..351a104658 100644 --- a/plugins/modules/packaging/language/composer.py +++ b/plugins/modules/packaging/language/composer.py @@ -41,82 +41,60 @@ options: - Directory of your project (see --working-dir). This is required when the command is not run globally. - Will be ignored if C(global_command=true). - - Alias C(working-dir) has been deprecated and will be removed in community.general 5.0.0. - aliases: [ working-dir ] global_command: description: - Runs the specified command globally. - - Alias C(global-command) has been deprecated and will be removed in community.general 5.0.0. type: bool default: false - aliases: [ global-command ] prefer_source: description: - Forces installation from package sources when possible (see --prefer-source). - - Alias C(prefer-source) has been deprecated and will be removed in community.general 5.0.0. default: false type: bool - aliases: [ prefer-source ] prefer_dist: description: - Forces installation from package dist even for dev versions (see --prefer-dist). - - Alias C(prefer-dist) has been deprecated and will be removed in community.general 5.0.0. default: false type: bool - aliases: [ prefer-dist ] no_dev: description: - Disables installation of require-dev packages (see --no-dev). - - Alias C(no-dev) has been deprecated and will be removed in community.general 5.0.0. default: true type: bool - aliases: [ no-dev ] no_scripts: description: - Skips the execution of all scripts defined in composer.json (see --no-scripts). - - Alias C(no-scripts) has been deprecated and will be removed in community.general 5.0.0. default: false type: bool - aliases: [ no-scripts ] no_plugins: description: - - Disables all plugins ( see --no-plugins ). - - Alias C(no-plugins) has been deprecated and will be removed in community.general 5.0.0. + - Disables all plugins (see --no-plugins). default: false type: bool - aliases: [ no-plugins ] optimize_autoloader: description: - Optimize autoloader during autoloader dump (see --optimize-autoloader). - Convert PSR-0/4 autoloading to classmap to get a faster autoloader. - Recommended especially for production, but can take a bit of time to run. - - Alias C(optimize-autoloader) has been deprecated and will be removed in community.general 5.0.0. default: true type: bool - aliases: [ optimize-autoloader ] classmap_authoritative: description: - Autoload classes from classmap only. - Implicitely enable optimize_autoloader. - Recommended especially for production, but can take a bit of time to run. - - Alias C(classmap-authoritative) has been deprecated and will be removed in community.general 5.0.0. default: false type: bool - aliases: [ classmap-authoritative ] apcu_autoloader: description: - Uses APCu to cache found/not-found classes - - Alias C(apcu-autoloader) has been deprecated and will be removed in community.general 5.0.0. default: false type: bool - aliases: [ apcu-autoloader ] ignore_platform_reqs: description: - Ignore php, hhvm, lib-* and ext-* requirements and force the installation even if the local machine does not fulfill these. - - Alias C(ignore-platform-reqs) has been deprecated and will be removed in community.general 5.0.0. default: false type: bool - aliases: [ ignore-platform-reqs ] composer_executable: type: path description: @@ -207,39 +185,17 @@ def main(): command=dict(default="install", type="str"), arguments=dict(default="", type="str"), executable=dict(type="path", aliases=["php_path"]), - working_dir=dict( - type="path", aliases=["working-dir"], - deprecated_aliases=[dict(name='working-dir', version='5.0.0', collection_name='community.general')]), - global_command=dict( - default=False, type="bool", aliases=["global-command"], - deprecated_aliases=[dict(name='global-command', version='5.0.0', collection_name='community.general')]), - prefer_source=dict( - default=False, type="bool", aliases=["prefer-source"], - deprecated_aliases=[dict(name='prefer-source', version='5.0.0', collection_name='community.general')]), - prefer_dist=dict( - default=False, type="bool", aliases=["prefer-dist"], - deprecated_aliases=[dict(name='prefer-dist', version='5.0.0', collection_name='community.general')]), - no_dev=dict( - default=True, type="bool", aliases=["no-dev"], - deprecated_aliases=[dict(name='no-dev', version='5.0.0', collection_name='community.general')]), - no_scripts=dict( - default=False, type="bool", aliases=["no-scripts"], - deprecated_aliases=[dict(name='no-scripts', version='5.0.0', collection_name='community.general')]), - no_plugins=dict( - default=False, type="bool", aliases=["no-plugins"], - deprecated_aliases=[dict(name='no-plugins', version='5.0.0', collection_name='community.general')]), - apcu_autoloader=dict( - default=False, type="bool", aliases=["apcu-autoloader"], - deprecated_aliases=[dict(name='apcu-autoloader', version='5.0.0', collection_name='community.general')]), - optimize_autoloader=dict( - default=True, type="bool", aliases=["optimize-autoloader"], - deprecated_aliases=[dict(name='optimize-autoloader', version='5.0.0', collection_name='community.general')]), - classmap_authoritative=dict( - default=False, type="bool", aliases=["classmap-authoritative"], - deprecated_aliases=[dict(name='classmap-authoritative', version='5.0.0', collection_name='community.general')]), - ignore_platform_reqs=dict( - default=False, type="bool", aliases=["ignore-platform-reqs"], - deprecated_aliases=[dict(name='ignore-platform-reqs', version='5.0.0', collection_name='community.general')]), + working_dir=dict(type="path"), + global_command=dict(default=False, type="bool"), + prefer_source=dict(default=False, type="bool"), + prefer_dist=dict(default=False, type="bool"), + no_dev=dict(default=True, type="bool"), + no_scripts=dict(default=False, type="bool"), + no_plugins=dict(default=False, type="bool"), + apcu_autoloader=dict(default=False, type="bool"), + optimize_autoloader=dict(default=True, type="bool"), + classmap_authoritative=dict(default=False, type="bool"), + ignore_platform_reqs=dict(default=False, type="bool"), composer_executable=dict(type="path"), ), required_if=[('global_command', False, ['working_dir'])], diff --git a/plugins/modules/packaging/os/apt_rpm.py b/plugins/modules/packaging/os/apt_rpm.py index 3c200927ce..95d0f64109 100644 --- a/plugins/modules/packaging/os/apt_rpm.py +++ b/plugins/modules/packaging/os/apt_rpm.py @@ -33,8 +33,6 @@ options: update_cache: description: - update the package database first C(apt-get update). - - Alias C(update-cache) has been deprecated and will be removed in community.general 5.0.0. - aliases: [ 'update-cache' ] type: bool default: no author: @@ -158,9 +156,7 @@ def main(): module = AnsibleModule( argument_spec=dict( state=dict(type='str', default='present', choices=['absent', 'installed', 'present', 'removed']), - update_cache=dict( - type='bool', default=False, aliases=['update-cache'], - deprecated_aliases=[dict(name='update-cache', version='5.0.0', collection_name='community.general')]), + update_cache=dict(type='bool', default=False), package=dict(type='list', elements='str', required=True, aliases=['name', 'pkg']), ), ) diff --git a/plugins/modules/packaging/os/homebrew.py b/plugins/modules/packaging/os/homebrew.py index 80e436191a..db1feda78e 100644 --- a/plugins/modules/packaging/os/homebrew.py +++ b/plugins/modules/packaging/os/homebrew.py @@ -49,10 +49,8 @@ options: update_homebrew: description: - update homebrew itself first. - - Alias C(update-brew) has been deprecated and will be removed in community.general 5.0.0. type: bool default: no - aliases: ['update-brew'] upgrade_all: description: - upgrade all homebrew packages. @@ -892,9 +890,7 @@ def main(): ), update_homebrew=dict( default=False, - aliases=["update-brew"], type='bool', - deprecated_aliases=[dict(name='update-brew', version='5.0.0', collection_name='community.general')], ), upgrade_all=dict( default=False, diff --git a/plugins/modules/packaging/os/homebrew_cask.py b/plugins/modules/packaging/os/homebrew_cask.py index df7a54558c..a43eabb7cb 100644 --- a/plugins/modules/packaging/os/homebrew_cask.py +++ b/plugins/modules/packaging/os/homebrew_cask.py @@ -49,10 +49,8 @@ options: description: - Update homebrew itself first. - Note that C(brew cask update) is a synonym for C(brew update). - - Alias C(update-brew) has been deprecated and will be removed in community.general 5.0.0. type: bool default: no - aliases: [ 'update-brew' ] install_options: description: - Options flags to install a package. @@ -806,9 +804,7 @@ def main(): ), update_homebrew=dict( default=False, - aliases=["update-brew"], type='bool', - deprecated_aliases=[dict(name='update-brew', version='5.0.0', collection_name='community.general')], ), install_options=dict( default=None, diff --git a/plugins/modules/packaging/os/opkg.py b/plugins/modules/packaging/os/opkg.py index bede73fb88..f7bc9ae842 100644 --- a/plugins/modules/packaging/os/opkg.py +++ b/plugins/modules/packaging/os/opkg.py @@ -50,8 +50,6 @@ options: update_cache: description: - Update the package DB first. - - Alias C(update-cache) has been deprecated and will be removed in community.general 5.0.0. - aliases: ['update-cache'] default: false type: bool requirements: @@ -177,9 +175,7 @@ def main(): state=dict(default="present", choices=["present", "installed", "absent", "removed"]), force=dict(default="", choices=["", "depends", "maintainer", "reinstall", "overwrite", "downgrade", "space", "postinstall", "remove", "checksum", "removal-of-dependent-packages"]), - update_cache=dict( - default="no", aliases=["update-cache"], type='bool', - deprecated_aliases=[dict(name='update-cache', version='5.0.0', collection_name='community.general')]), + update_cache=dict(default=False, type='bool'), ) ) diff --git a/plugins/modules/packaging/os/pacman.py b/plugins/modules/packaging/os/pacman.py index b7f3855533..a3e0b2f589 100644 --- a/plugins/modules/packaging/os/pacman.py +++ b/plugins/modules/packaging/os/pacman.py @@ -79,14 +79,11 @@ options: description: - Whether or not to refresh the master package lists. - This can be run as part of a package installation or as a separate step. - - Alias C(update-cache) has been deprecated and will be removed in community.general 5.0.0. - If not specified, it defaults to C(false). - - Please note that this option will only have an influence on the module's C(changed) state - if I(name) and I(upgrade) are not specified. This will change in community.general 5.0.0. - See the examples for how to make the module behave as it will in 5.0.0 right now, or how - to keep the current behavior with 5.0.0 and later. + - Please note that this option only had an influence on the module's C(changed) state + if I(name) and I(upgrade) are not specified before community.general 5.0.0. + See the examples for how to keep the old behavior. type: bool - aliases: [ update-cache ] update_cache_extra_args: description: @@ -179,9 +176,8 @@ EXAMPLES = """ extra_args: --builddir /var/cache/yay - name: Upgrade package foo - # The 'changed' state of this call will only indicate whether foo was - # installed/upgraded, but not on whether the cache was updated. This - # will change in community.general 5.0.0! + # The 'changed' state of this call will indicate whether the cache was + # updated *or* whether foo was installed/upgraded. community.general.pacman: name: foo state: latest @@ -209,29 +205,15 @@ EXAMPLES = """ upgrade: yes - name: Run the equivalent of "pacman -Syu" as a separate step - # The 'changed' state of this call will only indicate whether - # something was upgraded, but not on whether the cache was - # updated. This will change in community.general 5.0.0! + # Since community.general 5.0.0 the 'changed' state of this call + # will be 'true' in case the cache was updated, or when a package + # was updated. # - # To keep the old behavior, add the following to the task: + # The previous behavior was to only indicate whether something was + # upgraded. To keep the old behavior, add the following to the task: # # register: result # changed_when: result.packages | length > 0 - # - # To already switch to the new behavior now, add: - # - # register: result - # changed_when: result is changed or result.cache_updated - # - # Note that both constructs only work with community.general 4.6.0+. - # For compatibility with older versions of community.general, you - # have to use - # - # changed_when: result.packages | default([]) | length > 0 - # - # respectively - # - # changed_when: result is changed or (result.cache_updated | default(false)) community.general.pacman: update_cache: yes upgrade: yes @@ -328,11 +310,6 @@ class Pacman(object): if not (self.m.params["name"] or self.m.params["upgrade"]): self.success() - # Avoid shadowing lack of changes in the following stages - # so that `update_cache: true` doesn't always return changed - # TODO: remove this in community.general 5.0.0 - self.changed = False - self.inventory = self._build_inventory() if self.m.params["upgrade"]: self.upgrade() @@ -769,17 +746,7 @@ def setup_module(): extra_args=dict(type="str", default=""), upgrade=dict(type="bool"), upgrade_extra_args=dict(type="str", default=""), - update_cache=dict( - type="bool", - aliases=["update-cache"], - deprecated_aliases=[ - dict( - name="update-cache", - version="5.0.0", - collection_name="community.general", - ) - ], - ), + update_cache=dict(type="bool"), update_cache_extra_args=dict(type="str", default=""), ), required_one_of=[["name", "update_cache", "upgrade"]], diff --git a/plugins/modules/packaging/os/slackpkg.py b/plugins/modules/packaging/os/slackpkg.py index b556d8be3d..e98f9a338d 100644 --- a/plugins/modules/packaging/os/slackpkg.py +++ b/plugins/modules/packaging/os/slackpkg.py @@ -41,11 +41,9 @@ options: update_cache: description: - update the package database first - - Alias C(update-cache) has been deprecated and will be removed in community.general 5.0.0. required: false default: false type: bool - aliases: [update-cache] author: Kim Nørgaard (@KimNorgaard) requirements: [ "Slackware >= 12.2" ] @@ -178,9 +176,7 @@ def main(): argument_spec=dict( state=dict(default="present", choices=['installed', 'removed', 'absent', 'present', 'latest']), name=dict(aliases=["pkg"], required=True, type='list', elements='str'), - update_cache=dict( - default=False, aliases=["update-cache"], type='bool', - deprecated_aliases=[dict(name='update-cache', version='5.0.0', collection_name='community.general')]), + update_cache=dict(default=False, type='bool'), ), supports_check_mode=True) diff --git a/plugins/modules/packaging/os/urpmi.py b/plugins/modules/packaging/os/urpmi.py index 47c22ffb93..572a6146b0 100644 --- a/plugins/modules/packaging/os/urpmi.py +++ b/plugins/modules/packaging/os/urpmi.py @@ -33,17 +33,13 @@ options: update_cache: description: - Update the package database first C(urpmi.update -a). - - Alias C(update-cache) has been deprecated and will be removed in community.general 5.0.0. type: bool default: no - aliases: ['update-cache'] no_recommends: description: - Corresponds to the C(--no-recommends) option for I(urpmi). - - Alias C(no-recommends) has been deprecated and will be removed in community.general 5.0.0. type: bool default: yes - aliases: ['no-recommends'] force: description: - Assume "yes" is the answer to any question urpmi has to ask. @@ -197,13 +193,9 @@ def main(): argument_spec=dict( state=dict(type='str', default='present', choices=['absent', 'installed', 'present', 'removed']), - update_cache=dict( - type='bool', default=False, aliases=['update-cache'], - deprecated_aliases=[dict(name='update-cache', version='5.0.0', collection_name='community.general')]), + update_cache=dict(type='bool', default=False), force=dict(type='bool', default=True), - no_recommends=dict( - type='bool', default=True, aliases=['no-recommends'], - deprecated_aliases=[dict(name='no-recommends', version='5.0.0', collection_name='community.general')]), + no_recommends=dict(type='bool', default=True), name=dict(type='list', elements='str', required=True, aliases=['package', 'pkg']), root=dict(type='str', aliases=['installroot']), ), diff --git a/plugins/modules/packaging/os/xbps.py b/plugins/modules/packaging/os/xbps.py index 74a8951b36..212ec79cbf 100644 --- a/plugins/modules/packaging/os/xbps.py +++ b/plugins/modules/packaging/os/xbps.py @@ -42,8 +42,6 @@ options: description: - Whether or not to refresh the master package lists. This can be run as part of a package installation or as a separate step. - - Alias C(update-cache) has been deprecated and will be removed in community.general 5.0.0. - aliases: ['update-cache'] type: bool default: yes upgrade: @@ -286,10 +284,8 @@ def main(): 'removed']), recurse=dict(default=False, type='bool'), upgrade=dict(default=False, type='bool'), - update_cache=dict( - default=True, aliases=['update-cache'], type='bool', - deprecated_aliases=[dict(name='update-cache', version='5.0.0', collection_name='community.general')]), - upgrade_xbps=dict(default=True, type='bool') + update_cache=dict(default=True, type='bool'), + upgrade_xbps=dict(default=True, type='bool'), ), required_one_of=[['name', 'update_cache', 'upgrade']], supports_check_mode=True) diff --git a/plugins/modules/source_control/github/github_deploy_key.py b/plugins/modules/source_control/github/github_deploy_key.py index 7a67a12334..a90de48d42 100644 --- a/plugins/modules/source_control/github/github_deploy_key.py +++ b/plugins/modules/source_control/github/github_deploy_key.py @@ -78,8 +78,6 @@ options: otp: description: - The 6 digit One Time Password for 2-Factor Authentication. Required together with I(username) and I(password). - - Alias C(2fa_token) has been deprecated and will be removed in community.general 5.0.0. - aliases: ['2fa_token'] type: int notes: - "Refer to GitHub's API documentation here: https://developer.github.com/v3/repos/keys/." @@ -298,9 +296,7 @@ def main(): force=dict(required=False, type='bool', default=False), username=dict(required=False, type='str'), password=dict(required=False, type='str', no_log=True), - otp=dict( - required=False, type='int', aliases=['2fa_token'], no_log=True, - deprecated_aliases=[dict(name='2fa_token', version='5.0.0', collection_name='community.general')]), + otp=dict(required=False, type='int', no_log=True), token=dict(required=False, type='str', no_log=True) ), mutually_exclusive=[ diff --git a/plugins/modules/system/xfconf.py b/plugins/modules/system/xfconf.py index c25041d5f1..8becd4a683 100644 --- a/plugins/modules/system/xfconf.py +++ b/plugins/modules/system/xfconf.py @@ -30,25 +30,24 @@ options: description: - A Xfconf preference channel is a top-level tree key, inside of the Xfconf repository that corresponds to the location for which all - application properties/keys are stored. See man xfconf-query(1) + application properties/keys are stored. See man xfconf-query(1). required: true type: str property: description: - A Xfce preference key is an element in the Xfconf repository - that corresponds to an application preference. See man xfconf-query(1) + that corresponds to an application preference. See man xfconf-query(1). required: true type: str value: description: - Preference properties typically have simple values such as strings, - integers, or lists of strings and integers. This is ignored if the state - is "get". For array mode, use a list of values. See man xfconf-query(1) + integers, or lists of strings and integers. See man xfconf-query(1). type: list elements: raw value_type: description: - - The type of value being set. This is ignored if the state is "get". + - The type of value being set. - When providing more than one I(value_type), the length of the list must be equal to the length of I(value). - If only one I(value_type) is provided, but I(value) contains more than @@ -65,8 +64,8 @@ options: type: str description: - The action to take upon the property/value. - - State C(get) is deprecated and will be removed in community.general 5.0.0. Please use the module M(community.general.xfconf_info) instead. - choices: [ get, present, absent ] + - The state C(get) has been removed in community.general 5.0.0. Please use the module M(community.general.xfconf_info) instead. + choices: [ present, absent ] default: "present" force_array: description: @@ -121,7 +120,7 @@ RETURN = ''' sample: "/Xft/DPI" value_type: description: - - The type of the value that was changed (C(none) for C(get) and C(reset) + - The type of the value that was changed (C(none) for C(reset) state). Either a single string value or a list of strings for array types. - This is a string or a list of strings. @@ -138,9 +137,8 @@ RETURN = ''' sample: '"192" or ["orange", "yellow", "violet"]' previous_value: description: - - The value of the preference key before executing the module (C(none) for - C(get) state). Either a single string value or a list of strings for array - types. + - The value of the preference key before executing the module. + Either a single string value or a list of strings for array types. - This is a string or a list of strings. returned: success type: any @@ -178,7 +176,7 @@ class XFConfProperty(CmdStateModuleHelper): facts_params = ('property', 'channel', 'value') module = dict( argument_spec=dict( - state=dict(type='str', choices=("present", "get", "absent"), default="present"), + state=dict(type='str', choices=("present", "absent"), default="present"), channel=dict(type='str', required=True), property=dict(type='str', required=True), value_type=dict(type='list', elements='str', @@ -233,14 +231,6 @@ class XFConfProperty(CmdStateModuleHelper): def _get(self): return self.run_command(params=('channel', 'property')) - def state_get(self): - self.vars.value = self.vars.previous_value - self.vars.previous_value = None - self.module.deprecate( - msg="State 'get' is deprecated. Please use the module community.general.xfconf_info instead", - version="5.0.0", collection_name="community.general" - ) - def state_absent(self): if not self.module.check_mode: self.run_command(params=('channel', 'property', {'reset': True})) diff --git a/tests/sanity/ignore-2.10.txt b/tests/sanity/ignore-2.10.txt index 999ffac36a..2fdac74b00 100644 --- a/tests/sanity/ignore-2.10.txt +++ b/tests/sanity/ignore-2.10.txt @@ -24,17 +24,8 @@ plugins/modules/cloud/univention/udm_user.py validate-modules:parameter-list-no- plugins/modules/clustering/consul/consul.py validate-modules:doc-missing-type plugins/modules/clustering/consul/consul.py validate-modules:undocumented-parameter plugins/modules/clustering/consul/consul_session.py validate-modules:parameter-state-invalid-choice -plugins/modules/packaging/language/composer.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 plugins/modules/packaging/language/yarn.py use-argspec-type-path -plugins/modules/packaging/os/apt_rpm.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 -plugins/modules/packaging/os/homebrew.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 -plugins/modules/packaging/os/homebrew_cask.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 -plugins/modules/packaging/os/opkg.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 -plugins/modules/packaging/os/pacman.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 plugins/modules/packaging/os/redhat_subscription.py validate-modules:return-syntax-error -plugins/modules/packaging/os/slackpkg.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 -plugins/modules/packaging/os/urpmi.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 -plugins/modules/packaging/os/xbps.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 plugins/modules/remote_management/hpilo/hpilo_boot.py validate-modules:parameter-type-not-in-doc plugins/modules/remote_management/hpilo/hpilo_info.py validate-modules:parameter-type-not-in-doc plugins/modules/remote_management/hpilo/hponcfg.py validate-modules:parameter-type-not-in-doc @@ -44,7 +35,6 @@ plugins/modules/remote_management/manageiq/manageiq_provider.py validate-modules plugins/modules/remote_management/manageiq/manageiq_provider.py validate-modules:parameter-type-not-in-doc # missing docs on suboptions plugins/modules/remote_management/manageiq/manageiq_provider.py validate-modules:undocumented-parameter # missing docs on suboptions plugins/modules/remote_management/manageiq/manageiq_tags.py validate-modules:parameter-state-invalid-choice -plugins/modules/source_control/github/github_deploy_key.py validate-modules:parameter-invalid plugins/modules/system/gconftool2.py validate-modules:parameter-state-invalid-choice plugins/modules/system/iptables_state.py validate-modules:undocumented-parameter plugins/modules/system/osx_defaults.py validate-modules:parameter-state-invalid-choice @@ -52,7 +42,6 @@ plugins/modules/system/parted.py validate-modules:parameter-state-invalid-choice plugins/modules/system/puppet.py use-argspec-type-path plugins/modules/system/puppet.py validate-modules:parameter-invalid # invalid alias - removed in 7.0.0 plugins/modules/system/ssh_config.py use-argspec-type-path # Required since module uses other methods to specify path -plugins/modules/system/xfconf.py validate-modules:parameter-state-invalid-choice # state get removed in 5.0.0 plugins/modules/system/xfconf.py validate-modules:return-syntax-error plugins/modules/web_infrastructure/jenkins_plugin.py use-argspec-type-path tests/integration/targets/django_manage/files/base_test/simple_project/p1/manage.py compile-2.6 # django generated code diff --git a/tests/sanity/ignore-2.11.txt b/tests/sanity/ignore-2.11.txt index 55ce1b6f77..4fecc5e603 100644 --- a/tests/sanity/ignore-2.11.txt +++ b/tests/sanity/ignore-2.11.txt @@ -23,17 +23,8 @@ plugins/modules/cloud/univention/udm_user.py validate-modules:parameter-list-no- plugins/modules/clustering/consul/consul.py validate-modules:doc-missing-type plugins/modules/clustering/consul/consul.py validate-modules:undocumented-parameter plugins/modules/clustering/consul/consul_session.py validate-modules:parameter-state-invalid-choice -plugins/modules/packaging/language/composer.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 plugins/modules/packaging/language/yarn.py use-argspec-type-path -plugins/modules/packaging/os/apt_rpm.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 -plugins/modules/packaging/os/homebrew.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 -plugins/modules/packaging/os/homebrew_cask.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 -plugins/modules/packaging/os/opkg.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 -plugins/modules/packaging/os/pacman.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 plugins/modules/packaging/os/redhat_subscription.py validate-modules:return-syntax-error -plugins/modules/packaging/os/slackpkg.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 -plugins/modules/packaging/os/urpmi.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 -plugins/modules/packaging/os/xbps.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 plugins/modules/remote_management/hpilo/hpilo_boot.py validate-modules:parameter-type-not-in-doc plugins/modules/remote_management/hpilo/hpilo_info.py validate-modules:parameter-type-not-in-doc plugins/modules/remote_management/hpilo/hponcfg.py validate-modules:parameter-type-not-in-doc @@ -43,7 +34,6 @@ plugins/modules/remote_management/manageiq/manageiq_provider.py validate-modules plugins/modules/remote_management/manageiq/manageiq_provider.py validate-modules:parameter-type-not-in-doc # missing docs on suboptions plugins/modules/remote_management/manageiq/manageiq_provider.py validate-modules:undocumented-parameter # missing docs on suboptions plugins/modules/remote_management/manageiq/manageiq_tags.py validate-modules:parameter-state-invalid-choice -plugins/modules/source_control/github/github_deploy_key.py validate-modules:parameter-invalid plugins/modules/system/gconftool2.py validate-modules:parameter-state-invalid-choice plugins/modules/system/iptables_state.py validate-modules:undocumented-parameter plugins/modules/system/osx_defaults.py validate-modules:parameter-state-invalid-choice @@ -51,7 +41,6 @@ plugins/modules/system/parted.py validate-modules:parameter-state-invalid-choice plugins/modules/system/puppet.py use-argspec-type-path plugins/modules/system/puppet.py validate-modules:parameter-invalid # invalid alias - removed in 7.0.0 plugins/modules/system/ssh_config.py use-argspec-type-path # Required since module uses other methods to specify path -plugins/modules/system/xfconf.py validate-modules:parameter-state-invalid-choice # state get removed in 5.0.0 plugins/modules/system/xfconf.py validate-modules:return-syntax-error plugins/modules/web_infrastructure/jenkins_plugin.py use-argspec-type-path tests/integration/targets/django_manage/files/base_test/simple_project/p1/manage.py compile-2.6 # django generated code diff --git a/tests/sanity/ignore-2.12.txt b/tests/sanity/ignore-2.12.txt index f111ea954e..9ca528556b 100644 --- a/tests/sanity/ignore-2.12.txt +++ b/tests/sanity/ignore-2.12.txt @@ -18,17 +18,8 @@ plugins/modules/cloud/univention/udm_user.py validate-modules:parameter-list-no- plugins/modules/clustering/consul/consul.py validate-modules:doc-missing-type plugins/modules/clustering/consul/consul.py validate-modules:undocumented-parameter plugins/modules/clustering/consul/consul_session.py validate-modules:parameter-state-invalid-choice -plugins/modules/packaging/language/composer.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 plugins/modules/packaging/language/yarn.py use-argspec-type-path -plugins/modules/packaging/os/apt_rpm.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 -plugins/modules/packaging/os/homebrew.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 -plugins/modules/packaging/os/homebrew_cask.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 -plugins/modules/packaging/os/opkg.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 -plugins/modules/packaging/os/pacman.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 plugins/modules/packaging/os/redhat_subscription.py validate-modules:return-syntax-error -plugins/modules/packaging/os/slackpkg.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 -plugins/modules/packaging/os/urpmi.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 -plugins/modules/packaging/os/xbps.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 plugins/modules/remote_management/hpilo/hpilo_boot.py validate-modules:parameter-type-not-in-doc plugins/modules/remote_management/hpilo/hpilo_info.py validate-modules:parameter-type-not-in-doc plugins/modules/remote_management/hpilo/hponcfg.py validate-modules:parameter-type-not-in-doc @@ -38,7 +29,6 @@ plugins/modules/remote_management/manageiq/manageiq_provider.py validate-modules plugins/modules/remote_management/manageiq/manageiq_provider.py validate-modules:parameter-type-not-in-doc # missing docs on suboptions plugins/modules/remote_management/manageiq/manageiq_provider.py validate-modules:undocumented-parameter # missing docs on suboptions plugins/modules/remote_management/manageiq/manageiq_tags.py validate-modules:parameter-state-invalid-choice -plugins/modules/source_control/github/github_deploy_key.py validate-modules:parameter-invalid plugins/modules/system/gconftool2.py validate-modules:parameter-state-invalid-choice plugins/modules/system/iptables_state.py validate-modules:undocumented-parameter plugins/modules/system/osx_defaults.py validate-modules:parameter-state-invalid-choice @@ -46,6 +36,5 @@ plugins/modules/system/parted.py validate-modules:parameter-state-invalid-choice plugins/modules/system/puppet.py use-argspec-type-path plugins/modules/system/puppet.py validate-modules:parameter-invalid # invalid alias - removed in 7.0.0 plugins/modules/system/ssh_config.py use-argspec-type-path # Required since module uses other methods to specify path -plugins/modules/system/xfconf.py validate-modules:parameter-state-invalid-choice # state get removed in 5.0.0 plugins/modules/system/xfconf.py validate-modules:return-syntax-error plugins/modules/web_infrastructure/jenkins_plugin.py use-argspec-type-path diff --git a/tests/sanity/ignore-2.13.txt b/tests/sanity/ignore-2.13.txt index f111ea954e..9ca528556b 100644 --- a/tests/sanity/ignore-2.13.txt +++ b/tests/sanity/ignore-2.13.txt @@ -18,17 +18,8 @@ plugins/modules/cloud/univention/udm_user.py validate-modules:parameter-list-no- plugins/modules/clustering/consul/consul.py validate-modules:doc-missing-type plugins/modules/clustering/consul/consul.py validate-modules:undocumented-parameter plugins/modules/clustering/consul/consul_session.py validate-modules:parameter-state-invalid-choice -plugins/modules/packaging/language/composer.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 plugins/modules/packaging/language/yarn.py use-argspec-type-path -plugins/modules/packaging/os/apt_rpm.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 -plugins/modules/packaging/os/homebrew.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 -plugins/modules/packaging/os/homebrew_cask.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 -plugins/modules/packaging/os/opkg.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 -plugins/modules/packaging/os/pacman.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 plugins/modules/packaging/os/redhat_subscription.py validate-modules:return-syntax-error -plugins/modules/packaging/os/slackpkg.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 -plugins/modules/packaging/os/urpmi.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 -plugins/modules/packaging/os/xbps.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 plugins/modules/remote_management/hpilo/hpilo_boot.py validate-modules:parameter-type-not-in-doc plugins/modules/remote_management/hpilo/hpilo_info.py validate-modules:parameter-type-not-in-doc plugins/modules/remote_management/hpilo/hponcfg.py validate-modules:parameter-type-not-in-doc @@ -38,7 +29,6 @@ plugins/modules/remote_management/manageiq/manageiq_provider.py validate-modules plugins/modules/remote_management/manageiq/manageiq_provider.py validate-modules:parameter-type-not-in-doc # missing docs on suboptions plugins/modules/remote_management/manageiq/manageiq_provider.py validate-modules:undocumented-parameter # missing docs on suboptions plugins/modules/remote_management/manageiq/manageiq_tags.py validate-modules:parameter-state-invalid-choice -plugins/modules/source_control/github/github_deploy_key.py validate-modules:parameter-invalid plugins/modules/system/gconftool2.py validate-modules:parameter-state-invalid-choice plugins/modules/system/iptables_state.py validate-modules:undocumented-parameter plugins/modules/system/osx_defaults.py validate-modules:parameter-state-invalid-choice @@ -46,6 +36,5 @@ plugins/modules/system/parted.py validate-modules:parameter-state-invalid-choice plugins/modules/system/puppet.py use-argspec-type-path plugins/modules/system/puppet.py validate-modules:parameter-invalid # invalid alias - removed in 7.0.0 plugins/modules/system/ssh_config.py use-argspec-type-path # Required since module uses other methods to specify path -plugins/modules/system/xfconf.py validate-modules:parameter-state-invalid-choice # state get removed in 5.0.0 plugins/modules/system/xfconf.py validate-modules:return-syntax-error plugins/modules/web_infrastructure/jenkins_plugin.py use-argspec-type-path diff --git a/tests/sanity/ignore-2.14.txt b/tests/sanity/ignore-2.14.txt index f111ea954e..9ca528556b 100644 --- a/tests/sanity/ignore-2.14.txt +++ b/tests/sanity/ignore-2.14.txt @@ -18,17 +18,8 @@ plugins/modules/cloud/univention/udm_user.py validate-modules:parameter-list-no- plugins/modules/clustering/consul/consul.py validate-modules:doc-missing-type plugins/modules/clustering/consul/consul.py validate-modules:undocumented-parameter plugins/modules/clustering/consul/consul_session.py validate-modules:parameter-state-invalid-choice -plugins/modules/packaging/language/composer.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 plugins/modules/packaging/language/yarn.py use-argspec-type-path -plugins/modules/packaging/os/apt_rpm.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 -plugins/modules/packaging/os/homebrew.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 -plugins/modules/packaging/os/homebrew_cask.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 -plugins/modules/packaging/os/opkg.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 -plugins/modules/packaging/os/pacman.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 plugins/modules/packaging/os/redhat_subscription.py validate-modules:return-syntax-error -plugins/modules/packaging/os/slackpkg.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 -plugins/modules/packaging/os/urpmi.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 -plugins/modules/packaging/os/xbps.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 plugins/modules/remote_management/hpilo/hpilo_boot.py validate-modules:parameter-type-not-in-doc plugins/modules/remote_management/hpilo/hpilo_info.py validate-modules:parameter-type-not-in-doc plugins/modules/remote_management/hpilo/hponcfg.py validate-modules:parameter-type-not-in-doc @@ -38,7 +29,6 @@ plugins/modules/remote_management/manageiq/manageiq_provider.py validate-modules plugins/modules/remote_management/manageiq/manageiq_provider.py validate-modules:parameter-type-not-in-doc # missing docs on suboptions plugins/modules/remote_management/manageiq/manageiq_provider.py validate-modules:undocumented-parameter # missing docs on suboptions plugins/modules/remote_management/manageiq/manageiq_tags.py validate-modules:parameter-state-invalid-choice -plugins/modules/source_control/github/github_deploy_key.py validate-modules:parameter-invalid plugins/modules/system/gconftool2.py validate-modules:parameter-state-invalid-choice plugins/modules/system/iptables_state.py validate-modules:undocumented-parameter plugins/modules/system/osx_defaults.py validate-modules:parameter-state-invalid-choice @@ -46,6 +36,5 @@ plugins/modules/system/parted.py validate-modules:parameter-state-invalid-choice plugins/modules/system/puppet.py use-argspec-type-path plugins/modules/system/puppet.py validate-modules:parameter-invalid # invalid alias - removed in 7.0.0 plugins/modules/system/ssh_config.py use-argspec-type-path # Required since module uses other methods to specify path -plugins/modules/system/xfconf.py validate-modules:parameter-state-invalid-choice # state get removed in 5.0.0 plugins/modules/system/xfconf.py validate-modules:return-syntax-error plugins/modules/web_infrastructure/jenkins_plugin.py use-argspec-type-path diff --git a/tests/sanity/ignore-2.9.txt b/tests/sanity/ignore-2.9.txt index 2bc52a2260..6605bbd67d 100644 --- a/tests/sanity/ignore-2.9.txt +++ b/tests/sanity/ignore-2.9.txt @@ -18,17 +18,8 @@ plugins/modules/cloud/spotinst/spotinst_aws_elastigroup.py validate-modules:para plugins/modules/cloud/spotinst/spotinst_aws_elastigroup.py validate-modules:undocumented-parameter plugins/modules/clustering/consul/consul.py validate-modules:doc-missing-type plugins/modules/clustering/consul/consul.py validate-modules:undocumented-parameter -plugins/modules/packaging/language/composer.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 plugins/modules/packaging/language/yarn.py use-argspec-type-path -plugins/modules/packaging/os/apt_rpm.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 -plugins/modules/packaging/os/homebrew.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 -plugins/modules/packaging/os/homebrew_cask.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 -plugins/modules/packaging/os/opkg.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 -plugins/modules/packaging/os/pacman.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 plugins/modules/packaging/os/redhat_subscription.py validate-modules:return-syntax-error -plugins/modules/packaging/os/slackpkg.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 -plugins/modules/packaging/os/urpmi.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 -plugins/modules/packaging/os/xbps.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 plugins/modules/remote_management/hpilo/hpilo_boot.py validate-modules:parameter-type-not-in-doc plugins/modules/remote_management/hpilo/hpilo_info.py validate-modules:parameter-type-not-in-doc plugins/modules/remote_management/hpilo/hponcfg.py validate-modules:parameter-type-not-in-doc @@ -36,7 +27,6 @@ plugins/modules/remote_management/manageiq/manageiq_provider.py validate-modules plugins/modules/remote_management/manageiq/manageiq_provider.py validate-modules:doc-missing-type # missing docs on suboptions plugins/modules/remote_management/manageiq/manageiq_provider.py validate-modules:parameter-type-not-in-doc # missing docs on suboptions plugins/modules/remote_management/manageiq/manageiq_provider.py validate-modules:undocumented-parameter # missing docs on suboptions -plugins/modules/source_control/github/github_deploy_key.py validate-modules:parameter-invalid plugins/modules/system/iptables_state.py validate-modules:undocumented-parameter plugins/modules/system/puppet.py use-argspec-type-path plugins/modules/system/puppet.py validate-modules:parameter-invalid # invalid alias - removed in 7.0.0 diff --git a/tests/unit/plugins/modules/system/test_xfconf.py b/tests/unit/plugins/modules/system/test_xfconf.py index d8c9a30a9a..e8de07ae0b 100644 --- a/tests/unit/plugins/modules/system/test_xfconf.py +++ b/tests/unit/plugins/modules/system/test_xfconf.py @@ -40,106 +40,6 @@ def test_without_required_parameters(capfd, patch_xfconf): TEST_CASES = [ - [ - {'channel': 'xfwm4', 'property': '/general/inactive_opacity', 'state': 'get'}, - { - 'id': 'test_simple_property_get', - 'run_command.calls': [ - ( - # Calling of following command will be asserted - ['/testbin/xfconf-query', '--channel', 'xfwm4', '--property', '/general/inactive_opacity'], - # Was return code checked? - {'environ_update': {'LANGUAGE': 'C', 'LC_ALL': 'C'}, 'check_rc': False}, - # Mock of returned code, stdout and stderr - (0, '100\n', '',), - ), - ], - 'changed': False, - 'previous_value': None, - 'value_type': None, - 'value': '100', - } - ], - [ - {'channel': 'xfwm4', 'property': '/general/i_dont_exist', 'state': 'get'}, - { - 'id': 'test_simple_property_get_nonexistent', - 'run_command.calls': [ - ( - # Calling of following command will be asserted - ['/testbin/xfconf-query', '--channel', 'xfwm4', '--property', '/general/i_dont_exist'], - # Was return code checked? - {'environ_update': {'LANGUAGE': 'C', 'LC_ALL': 'C'}, 'check_rc': False}, - # Mock of returned code, stdout and stderr - (1, '', 'Property "/general/i_dont_exist" does not exist on channel "xfwm4".\n',), - ), - ], - 'changed': False, - 'previous_value': None, - 'value_type': None, - 'value': None, - } - ], - [ - {'channel': 'xfwm4', 'property': '/general/workspace_names', 'state': 'get'}, - { - 'id': 'test_property_get_array', - 'run_command.calls': [ - ( - # Calling of following command will be asserted - ['/testbin/xfconf-query', '--channel', 'xfwm4', '--property', '/general/workspace_names'], - # Was return code checked? - {'environ_update': {'LANGUAGE': 'C', 'LC_ALL': 'C'}, 'check_rc': False}, - # Mock of returned code, stdout and stderr - (0, 'Value is an array with 3 items:\n\nMain\nWork\nTmp\n', '',), - ), - ], - 'changed': False, - 'previous_value': None, - 'value_type': None, - 'value': ['Main', 'Work', 'Tmp'], - }, - ], - [ - {'channel': 'xfwm4', 'property': '/general/use_compositing', 'state': 'get'}, - { - 'id': 'test_property_get_bool', - 'run_command.calls': [ - ( - # Calling of following command will be asserted - ['/testbin/xfconf-query', '--channel', 'xfwm4', '--property', '/general/use_compositing'], - # Was return code checked? - {'environ_update': {'LANGUAGE': 'C', 'LC_ALL': 'C'}, 'check_rc': False}, - # Mock of returned code, stdout and stderr - (0, 'true', '',), - ), - ], - 'changed': False, - 'previous_value': None, - 'value_type': None, - 'value': 'true', - }, - ], - [ - {'channel': 'xfwm4', 'property': '/general/use_compositing', 'state': 'get'}, - { - 'id': 'test_property_get_bool_false', - 'run_command.calls': [ - ( - # Calling of following command will be asserted - ['/testbin/xfconf-query', '--channel', 'xfwm4', '--property', '/general/use_compositing'], - # Was return code checked? - {'environ_update': {'LANGUAGE': 'C', 'LC_ALL': 'C'}, 'check_rc': False}, - # Mock of returned code, stdout and stderr - (0, 'false', '',), - ), - ], - 'changed': False, - 'previous_value': None, - 'value_type': None, - 'value': 'false', - }, - ], [ { 'channel': 'xfwm4',