From 9ff1c54c687aaccac3626ff2e1c118244fa4821b Mon Sep 17 00:00:00 2001 From: Mark Chappell Date: Wed, 20 Jan 2021 20:09:02 +0100 Subject: [PATCH 1/3] deprecate policy_file --- plugins/modules/ec2_vpc_endpoint.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/plugins/modules/ec2_vpc_endpoint.py b/plugins/modules/ec2_vpc_endpoint.py index 771ea52ba75..e5e93bf9794 100644 --- a/plugins/modules/ec2_vpc_endpoint.py +++ b/plugins/modules/ec2_vpc_endpoint.py @@ -44,6 +44,9 @@ on how to use it properly. Cannot be used with I(policy). - Option when creating an endpoint. If not provided AWS will utilise a default policy which provides full access to the service. + - This option has been deprecated and will be removed after 2022-12-01 + to maintain the existing functionality please use the I(policy) option + and a file lookup. required: false aliases: [ "policy_path" ] type: path @@ -352,6 +355,11 @@ def main(): # Validate Requirements state = module.params.get('state') + if module.params.get('policy_file'): + module.deprecate('The policy_file option has been deprecated and' + ' will be removed after 2022-12-01', + date='2022-12-01', collection_name='community.aws') + try: ec2 = module.client('ec2') except (botocore.exceptions.ClientError, botocore.exceptions.BotoCoreError) as e: From 9741e2cae72833ee25948b16a3eecbfa9724bfd7 Mon Sep 17 00:00:00 2001 From: Mark Chappell Date: Wed, 20 Jan 2021 20:22:00 +0100 Subject: [PATCH 2/3] ignore file --- tests/sanity/ignore-2.9.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/sanity/ignore-2.9.txt b/tests/sanity/ignore-2.9.txt index 45e370f6e1d..8276c8e3754 100644 --- a/tests/sanity/ignore-2.9.txt +++ b/tests/sanity/ignore-2.9.txt @@ -15,6 +15,7 @@ plugins/modules/ec2_instance_info.py pylint:ansible-deprecated-no-version plugins/modules/ec2_lc_info.py pylint:ansible-deprecated-no-version plugins/modules/ec2_metric_alarm.py pylint:ansible-deprecated-no-version plugins/modules/ec2_placement_group_info.py pylint:ansible-deprecated-no-version +plugins/modules/ec2_vpc_endpoint.py pylint:ansible-deprecated-no-version plugins/modules/ec2_vpc_endpoint_info.py pylint:ansible-deprecated-no-version plugins/modules/ec2_vpc_igw_info.py pylint:ansible-deprecated-no-version plugins/modules/ec2_vpc_nacl_info.py pylint:ansible-deprecated-no-version From 5fdf8d0b7a5a517951620847d5acbeec500e6c6f Mon Sep 17 00:00:00 2001 From: Mark Chappell Date: Wed, 20 Jan 2021 20:22:13 +0100 Subject: [PATCH 3/3] changelog --- changelogs/fragments/366-ec2_vpc_endpoint-policy_file.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 changelogs/fragments/366-ec2_vpc_endpoint-policy_file.yml diff --git a/changelogs/fragments/366-ec2_vpc_endpoint-policy_file.yml b/changelogs/fragments/366-ec2_vpc_endpoint-policy_file.yml new file mode 100644 index 00000000000..1057736bc5b --- /dev/null +++ b/changelogs/fragments/366-ec2_vpc_endpoint-policy_file.yml @@ -0,0 +1,2 @@ +deprecated_features: +- ec2_vpc_endpoint - deprecate the policy_file option and recommend using policy with a lookup (https://github.com/ansible-collections/community.aws/pull/366).