From dc724e4142c426cf62543d110b39f2271c3d930d Mon Sep 17 00:00:00 2001 From: Mark Chappell Date: Mon, 30 May 2022 11:50:47 +0200 Subject: [PATCH] aws_kms_info - remove deprecated keys_attr parameter (#1172) aws_kms_info - remove deprecated keys_attr parameter SUMMARY remove deprecated keys_attr parameter ISSUE TYPE Feature Pull Request COMPONENT NAME aws_kms_info ADDITIONAL INFORMATION See also: #838 Reviewed-by: Alina Buzachis --- .../fragments/1172-aws_kms_info-keys_attr.yml | 2 ++ plugins/modules/aws_kms_info.py | 15 --------------- 2 files changed, 2 insertions(+), 15 deletions(-) create mode 100644 changelogs/fragments/1172-aws_kms_info-keys_attr.yml diff --git a/changelogs/fragments/1172-aws_kms_info-keys_attr.yml b/changelogs/fragments/1172-aws_kms_info-keys_attr.yml new file mode 100644 index 00000000000..4dfbd6e3736 --- /dev/null +++ b/changelogs/fragments/1172-aws_kms_info-keys_attr.yml @@ -0,0 +1,2 @@ +removed_features: +- aws_kms_info - the unused and deprecated ``keys_attr`` parameter has been removed (https://github.com/ansible-collections/amazon.aws/pull/1172). diff --git a/plugins/modules/aws_kms_info.py b/plugins/modules/aws_kms_info.py index fabff61fcc1..2863fd0538e 100644 --- a/plugins/modules/aws_kms_info.py +++ b/plugins/modules/aws_kms_info.py @@ -45,14 +45,6 @@ description: Whether to get full details (tags, grants etc.) of keys pending deletion. default: False type: bool - keys_attr: - description: - - Returning the C(keys) attribute conflicted with the builtin keys() - method on dictionaries and as such was deprecated. - - This parameter now does nothing, and after version C(4.0.0) this - parameter will be removed. - type: bool - version_added: 2.0.0 extends_documentation_fragment: - amazon.aws.aws - amazon.aws.ec2 @@ -496,7 +488,6 @@ def main(): key_id=dict(aliases=['key_arn']), filters=dict(type='dict'), pending_deletion=dict(type='bool', default=False), - keys_attr=dict(type='bool'), ) module = AnsibleAWSModule(argument_spec=argument_spec, @@ -515,12 +506,6 @@ def main(): filtered_keys = [key for key in all_keys if key_matches_filters(key, module.params['filters'])] ret_params = dict(kms_keys=filtered_keys) - # We originally returned "keys" - if module.params.get('keys_attr') is not None: - module.deprecate("Returning results in the 'keys' attribute conflicts with the builtin keys() method on " - "dicts and as such was removed in version 3.0.0. Please use the kms_keys attribute. " - "This parameter is now ignored and will be removed in version 4.0.0.", - version='4.0.0', collection_name='community.aws') module.exit_json(**ret_params)