From 5a3e972fa9fc033e419a178ddfc22c335830ab83 Mon Sep 17 00:00:00 2001 From: Alina Buzachis Date: Thu, 5 Sep 2024 18:32:32 +0200 Subject: [PATCH 1/3] Rename module_utils/elb_utils.py to module_utils/elbv2_utils.py since it include util esed by the elbv2 client Signed-off-by: Alina Buzachis --- .../fragments/20240905-rename_elb_utils.yml | 3 ++ plugins/module_utils/elbv2.py | 46 +++++++++---------- .../{elb_utils.py => elbv2_utils.py} | 0 plugins/modules/autoscaling_group.py | 2 +- plugins/modules/autoscaling_group_info.py | 4 +- plugins/modules/elb_application_lb.py | 4 +- plugins/modules/elb_application_lb_info.py | 12 ++--- 7 files changed, 37 insertions(+), 34 deletions(-) create mode 100644 changelogs/fragments/20240905-rename_elb_utils.yml rename plugins/module_utils/{elb_utils.py => elbv2_utils.py} (100%) diff --git a/changelogs/fragments/20240905-rename_elb_utils.yml b/changelogs/fragments/20240905-rename_elb_utils.yml new file mode 100644 index 00000000000..0570b9470da --- /dev/null +++ b/changelogs/fragments/20240905-rename_elb_utils.yml @@ -0,0 +1,3 @@ +minor_changes: + - 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). + diff --git a/plugins/module_utils/elbv2.py b/plugins/module_utils/elbv2.py index 2d8574d24c9..a0bba07b1bd 100644 --- a/plugins/module_utils/elbv2.py +++ b/plugins/module_utils/elbv2.py @@ -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 diff --git a/plugins/module_utils/elb_utils.py b/plugins/module_utils/elbv2_utils.py similarity index 100% rename from plugins/module_utils/elb_utils.py rename to plugins/module_utils/elbv2_utils.py diff --git a/plugins/modules/autoscaling_group.py b/plugins/modules/autoscaling_group.py index 0efd38cc481..778a3f125d2 100644 --- a/plugins/modules/autoscaling_group.py +++ b/plugins/modules/autoscaling_group.py @@ -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 diff --git a/plugins/modules/autoscaling_group_info.py b/plugins/modules/autoscaling_group_info.py index fcf1ee8a5c3..4422960b64c 100644 --- a/plugins/modules/autoscaling_group_info.py +++ b/plugins/modules/autoscaling_group_info.py @@ -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 diff --git a/plugins/modules/elb_application_lb.py b/plugins/modules/elb_application_lb.py index 7675f3bf413..a9c44133c52 100644 --- a/plugins/modules/elb_application_lb.py +++ b/plugins/modules/elb_application_lb.py @@ -765,8 +765,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 get_elb_listener_rules +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.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 diff --git a/plugins/modules/elb_application_lb_info.py b/plugins/modules/elb_application_lb_info.py index d3627b16d9b..6a651395179 100644 --- a/plugins/modules/elb_application_lb_info.py +++ b/plugins/modules/elb_application_lb_info.py @@ -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 From ea10aaeabcf1e394fdcb981040597af8f0f00343 Mon Sep 17 00:00:00 2001 From: Alina Buzachis Date: Fri, 13 Sep 2024 14:00:22 +0200 Subject: [PATCH 2/3] Fix linting Signed-off-by: Alina Buzachis --- changelogs/fragments/20240905-rename_elb_utils.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/changelogs/fragments/20240905-rename_elb_utils.yml b/changelogs/fragments/20240905-rename_elb_utils.yml index 0570b9470da..3cf8db5951a 100644 --- a/changelogs/fragments/20240905-rename_elb_utils.yml +++ b/changelogs/fragments/20240905-rename_elb_utils.yml @@ -1,3 +1,2 @@ minor_changes: - 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). - From aa6934b2b571cc4fa0ba4d129c11dd990b432a3d Mon Sep 17 00:00:00 2001 From: Alina Buzachis Date: Fri, 13 Sep 2024 14:16:30 +0200 Subject: [PATCH 3/3] Apply isort Signed-off-by: Alina Buzachis --- plugins/modules/elb_application_lb.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/modules/elb_application_lb.py b/plugins/modules/elb_application_lb.py index a9c44133c52..61f516c9ebd 100644 --- a/plugins/modules/elb_application_lb.py +++ b/plugins/modules/elb_application_lb.py @@ -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.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.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