Skip to content

Commit

Permalink
Added support for 'vpc_endpoint_type'. (ansible-collections#460)
Browse files Browse the repository at this point in the history
* Added support for 'vpc_endpoint_type'.
* Integration test for the 'vpc_endpoint_type' feature.
* Added choices in documentation.
* Added changelog.
  • Loading branch information
Proksima authored Mar 7, 2021
1 parent 3b42349 commit 2f2d56f
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 1 deletion.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
minor_changes:
- Added support for specifying 'vpc_endpoint_type' in module 'ec2_vpc_endpoint'.
11 changes: 10 additions & 1 deletion plugins/modules/ec2_vpc_endpoint.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,13 @@
- Required when creating a VPC endpoint.
required: false
type: str
vpc_endpoint_type:
description:
- The type of endpoint.
required: false
default: Gateway
choices: [ "Interface", "Gateway", "GatewayLoadBalancer" ]
type: str
service:
description:
- An AWS supported vpc endpoint service. Use the M(community.aws.ec2_vpc_endpoint_info)
Expand Down Expand Up @@ -56,7 +63,7 @@
- absent to remove resource
required: false
default: present
choices: [ "present", "absent"]
choices: [ "present", "absent" ]
type: str
wait:
description:
Expand Down Expand Up @@ -251,6 +258,7 @@ def create_vpc_endpoint(client, module):
changed = False
token_provided = False
params['VpcId'] = module.params.get('vpc_id')
params['VpcEndpointType'] = module.params.get('vpc_endpoint_type')
params['ServiceName'] = module.params.get('service')
params['DryRun'] = module.check_mode

Expand Down Expand Up @@ -334,6 +342,7 @@ def setup_removal(client, module):
def main():
argument_spec = dict(
vpc_id=dict(),
vpc_endpoint_type=dict(default='Gateway', choices=['Interface', 'Gateway', 'GatewayLoadBalancer']),
service=dict(),
policy=dict(type='json'),
policy_file=dict(type='path', aliases=['policy_path']),
Expand Down
20 changes: 20 additions & 0 deletions tests/integration/targets/ec2_vpc_endpoint/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,26 @@
that:
- endpoint_delete_check is not changed

- name: Create interface endpoint
ec2_vpc_endpoint:
state: present
vpc_id: '{{ vpc_id }}'
service: '{{ endpoint_service_a }}'
vpc_endpoint_type: Interface
register: create_interface_endpoint
- name: Check that the interface endpoint was created properly
assert:
that:
- create_interface_endpoint is changed
- create_interface_endpoint.result.vpc_endpoint_type == "Interface"
- name: Delete interface endpoint
ec2_vpc_endpoint:
state: absent
vpc_endpoint_id: "{{ create_interface_endpoint.result.vpc_endpoint_id }}"
register: interface_endpoint_delete_check
- assert:
that:
- interface_endpoint_delete_check is changed

# ============================================================
# BEGIN POST-TEST CLEANUP
Expand Down

0 comments on commit 2f2d56f

Please sign in to comment.