Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename module_utils/elb_utils.py to module_utils/elbv2_utils.py #2285

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Rename module_utils/elb_utils.py to module_utils/elbv2_utils.py #2285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5a3e972
Rename module_utils/elb_utils.py to module_utils/elbv2_utils.py since…
alinabuzachis Sep 5, 2024
ea10aae
Fix linting
alinabuzachis Sep 13, 2024
aa6934b
Apply isort
alinabuzachis Sep 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelogs/fragments/20240905-rename_elb_utils.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
minor_changes:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
minor_changes:
breaking_changes:

Technically this is a breaking change, but I think it's the right change to make in this case.

Further thought:
It's a breaking change because someone can in theory import from module_utils/elb_utils/...

Do we want people directly importing things from module_utils/elbv2_utils ? The bulk of this code is just calls wrapped with helpers.

Do we in fact move this to module_utils/_elbv2 (marking the module private), and only directly import AnsibleELBv2Error which we want to publicly expose (for the other calls we import ._elbv2 _elbv2_utils and then do things like _elbv2_utils.describe_load_balancer_attributes(self.connection, self.elb["LoadBalancerArn"])

- module_utils/elb_utils.py - Rename ``module_utils/elb_utils.py`` to ``module_utils/elbv2_utils.py``, since it only includes utilities for the elbv2 client (https://github.com/ansible-collections/amazon.aws/pull/2285).
46 changes: 23 additions & 23 deletions plugins/module_utils/elbv2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,29 +19,29 @@
from typing import Tuple

from .ec2 import get_ec2_security_group_ids_from_names
from .elb_utils import AnsibleELBv2Error
from .elb_utils import add_listener_certificates
from .elb_utils import add_tags
from .elb_utils import convert_tg_name_to_arn
from .elb_utils import create_listener
from .elb_utils import create_load_balancer
from .elb_utils import create_rule
from .elb_utils import delete_listener
from .elb_utils import delete_load_balancer
from .elb_utils import delete_rule
from .elb_utils import describe_listeners
from .elb_utils import describe_load_balancer_attributes
from .elb_utils import describe_rules
from .elb_utils import describe_tags
from .elb_utils import get_elb
from .elb_utils import modify_listener
from .elb_utils import modify_load_balancer_attributes
from .elb_utils import modify_rule
from .elb_utils import remove_tags
from .elb_utils import set_ip_address_type
from .elb_utils import set_rule_priorities
from .elb_utils import set_security_groups
from .elb_utils import set_subnets
from .elbv2_utils import AnsibleELBv2Error
from .elbv2_utils import add_listener_certificates
from .elbv2_utils import add_tags
from .elbv2_utils import convert_tg_name_to_arn
from .elbv2_utils import create_listener
from .elbv2_utils import create_load_balancer
from .elbv2_utils import create_rule
from .elbv2_utils import delete_listener
from .elbv2_utils import delete_load_balancer
from .elbv2_utils import delete_rule
from .elbv2_utils import describe_listeners
from .elbv2_utils import describe_load_balancer_attributes
from .elbv2_utils import describe_rules
from .elbv2_utils import describe_tags
from .elbv2_utils import get_elb
from .elbv2_utils import modify_listener
from .elbv2_utils import modify_load_balancer_attributes
from .elbv2_utils import modify_rule
from .elbv2_utils import remove_tags
from .elbv2_utils import set_ip_address_type
from .elbv2_utils import set_rule_priorities
from .elbv2_utils import set_security_groups
from .elbv2_utils import set_subnets
from .modules import AnsibleAWSModule
from .retries import AWSRetry
from .tagging import ansible_dict_to_boto3_tag_list
Expand Down
0 plugins/module_utils/elb_utils.py → plugins/module_utils/elbv2_utils.py
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion plugins/modules/autoscaling_group.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,7 +666,7 @@
from ansible.module_utils.common.dict_transformations import snake_dict_to_camel_dict

from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code
from ansible_collections.amazon.aws.plugins.module_utils.elb_utils import describe_target_groups
from ansible_collections.amazon.aws.plugins.module_utils.elbv2_utils import describe_target_groups
from ansible_collections.amazon.aws.plugins.module_utils.modules import AnsibleAWSModule
from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry
from ansible_collections.amazon.aws.plugins.module_utils.transformation import scrub_none_parameters
Expand Down
4 changes: 2 additions & 2 deletions plugins/modules/autoscaling_group_info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,8 +354,8 @@

from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict

from ansible_collections.amazon.aws.plugins.module_utils.elb_utils import AnsibleELBv2Error
from ansible_collections.amazon.aws.plugins.module_utils.elb_utils import describe_target_groups
from ansible_collections.amazon.aws.plugins.module_utils.elbv2_utils import AnsibleELBv2Error
from ansible_collections.amazon.aws.plugins.module_utils.elbv2_utils import describe_target_groups
from ansible_collections.amazon.aws.plugins.module_utils.modules import AnsibleAWSModule


Expand Down
4 changes: 2 additions & 2 deletions plugins/modules/elb_application_lb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -765,13 +765,13 @@

from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict

from ansible_collections.amazon.aws.plugins.module_utils.elb_utils import AnsibleELBv2Error
from ansible_collections.amazon.aws.plugins.module_utils.elb_utils import get_elb_listener_rules
from ansible_collections.amazon.aws.plugins.module_utils.elbv2 import ApplicationLoadBalancer
from ansible_collections.amazon.aws.plugins.module_utils.elbv2 import ELBListener
from ansible_collections.amazon.aws.plugins.module_utils.elbv2 import ELBListenerRule
from ansible_collections.amazon.aws.plugins.module_utils.elbv2 import ELBListenerRules
from ansible_collections.amazon.aws.plugins.module_utils.elbv2 import ELBListeners
from ansible_collections.amazon.aws.plugins.module_utils.elbv2_utils import AnsibleELBv2Error
from ansible_collections.amazon.aws.plugins.module_utils.elbv2_utils import get_elb_listener_rules
from ansible_collections.amazon.aws.plugins.module_utils.modules import AnsibleAWSModule
from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry
from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_list_to_ansible_dict
Expand Down
12 changes: 6 additions & 6 deletions plugins/modules/elb_application_lb_info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,12 +407,12 @@

from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict

from ansible_collections.amazon.aws.plugins.module_utils.elb_utils import AnsibleELBv2Error
from ansible_collections.amazon.aws.plugins.module_utils.elb_utils import describe_listeners
from ansible_collections.amazon.aws.plugins.module_utils.elb_utils import describe_load_balancer_attributes
from ansible_collections.amazon.aws.plugins.module_utils.elb_utils import describe_load_balancers
from ansible_collections.amazon.aws.plugins.module_utils.elb_utils import describe_rules
from ansible_collections.amazon.aws.plugins.module_utils.elb_utils import describe_tags
from ansible_collections.amazon.aws.plugins.module_utils.elbv2_utils import AnsibleELBv2Error
from ansible_collections.amazon.aws.plugins.module_utils.elbv2_utils import describe_listeners
from ansible_collections.amazon.aws.plugins.module_utils.elbv2_utils import describe_load_balancer_attributes
from ansible_collections.amazon.aws.plugins.module_utils.elbv2_utils import describe_load_balancers
from ansible_collections.amazon.aws.plugins.module_utils.elbv2_utils import describe_rules
from ansible_collections.amazon.aws.plugins.module_utils.elbv2_utils import describe_tags
from ansible_collections.amazon.aws.plugins.module_utils.modules import AnsibleAWSModule
from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_list_to_ansible_dict

Expand Down
Loading