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 23, 2024
1 parent 81c28b2 commit 4f4bf28
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 deletions.
10 changes: 5 additions & 5 deletions plugins/modules/ec2_vpc_vgw.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@
type: dict
author: Nick Aslanidis (@naslanidis)
extends_documentation_fragment:
- ansible.amazon.ec2
- ansible.amazon.aws
- amazon.aws.ec2
- amazon.aws.aws
'''

Expand Down Expand Up @@ -125,10 +125,10 @@
except ImportError:
HAS_BOTO3 = False

from ansible_collections.ansible.amazon.plugins.module_utils.aws.core import is_boto3_error_code
from ansible_collections.ansible.amazon.plugins.module_utils.aws.waiters import get_waiter
from ansible_collections.amazon.aws.plugins.module_utils.aws.core import is_boto3_error_code
from ansible_collections.amazon.aws.plugins.module_utils.aws.waiters import get_waiter
from ansible.module_utils.basic import AnsibleModule
from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import HAS_BOTO3, boto3_conn, ec2_argument_spec, get_aws_connection_info, AWSRetry
from ansible_collections.amazon.aws.plugins.module_utils.ec2 import HAS_BOTO3, boto3_conn, ec2_argument_spec, get_aws_connection_info, AWSRetry
from ansible.module_utils._text import to_native


Expand Down
18 changes: 9 additions & 9 deletions plugins/modules/ec2_vpc_vgw_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
elements: str
author: "Nick Aslanidis (@naslanidis)"
extends_documentation_fragment:
- ansible.amazon.aws
- ansible.amazon.ec2
- amazon.aws.aws
- amazon.aws.ec2
'''

Expand Down Expand Up @@ -101,13 +101,13 @@
pass # will be captured by imported HAS_BOTO3

from ansible.module_utils.basic import AnsibleModule
from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import (ec2_argument_spec,
get_aws_connection_info,
boto3_conn,
camel_dict_to_snake_dict,
ansible_dict_to_boto3_filter_list,
HAS_BOTO3,
)
from ansible_collections.amazon.aws.plugins.module_utils.ec2 import (ec2_argument_spec,
get_aws_connection_info,
boto3_conn,
camel_dict_to_snake_dict,
ansible_dict_to_boto3_filter_list,
HAS_BOTO3,
)


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

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

0 comments on commit 4f4bf28

Please sign in to comment.