Skip to content

Commit

Permalink
Rename collection (#12)
Browse files Browse the repository at this point in the history
* Rename core collection

Rename references to ansible.amazon to amazon.aws.

* Rename community.amazon to community.aws
Fix pep8 line lengths for rewritten amazon.aws imports

* Missed a path in shippable.sh
* Dependency repos moved

This commit was initially merged in https://github.com/ansible-collections/community.aws
See: ansible-collections/community.aws@235c5db
  • Loading branch information
jillr authored and alinabuzachis committed Oct 24, 2024
1 parent 3044dfd commit 87ad79d
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
8 changes: 4 additions & 4 deletions plugins/modules/ec2_vpc_vpn.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
- This module creates, modifies, and deletes VPN connections. Idempotence is achieved by using the filters
option or specifying the VPN connection identifier.
extends_documentation_fragment:
- ansible.amazon.ec2
- ansible.amazon.aws
- amazon.aws.ec2
- amazon.aws.aws
requirements: ['boto3', 'botocore']
author: "Sloane Hertel (@s-hertel)"
Expand Down Expand Up @@ -300,9 +300,9 @@
vpn_connection_id: vpn-781e0e19
"""

from ansible_collections.ansible.amazon.plugins.module_utils.aws.core import AnsibleAWSModule
from ansible_collections.amazon.aws.plugins.module_utils.aws.core import AnsibleAWSModule
from ansible.module_utils._text import to_text
from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import (
from ansible_collections.amazon.aws.plugins.module_utils.ec2 import (
camel_dict_to_snake_dict,
boto3_tag_list_to_ansible_dict,
compare_aws_tags,
Expand Down
14 changes: 7 additions & 7 deletions plugins/modules/ec2_vpc_vpn_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
type: list
elements: str
extends_documentation_fragment:
- ansible.amazon.aws
- ansible.amazon.ec2
- amazon.aws.aws
- amazon.aws.ec2
'''

Expand Down Expand Up @@ -169,11 +169,11 @@
except ImportError:
pass # caught by AnsibleAWSModule

from ansible_collections.ansible.amazon.plugins.module_utils.aws.core import AnsibleAWSModule
from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import (ansible_dict_to_boto3_filter_list,
boto3_tag_list_to_ansible_dict,
camel_dict_to_snake_dict,
)
from ansible_collections.amazon.aws.plugins.module_utils.aws.core import AnsibleAWSModule
from ansible_collections.amazon.aws.plugins.module_utils.ec2 import (ansible_dict_to_boto3_filter_list,
boto3_tag_list_to_ansible_dict,
camel_dict_to_snake_dict,
)


def date_handler(obj):
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/targets/ec2_vpc_vpn_info/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
- name: ec2_vpc_vpn_info tests
collections:
- ansible.amazon
- amazon.aws
block:

# ============================================================
Expand Down

0 comments on commit 87ad79d

Please sign in to comment.