From 01827577bb1e47f508f9b2a8c9a95228a912765d Mon Sep 17 00:00:00 2001
From: Mark Chappell <mchappel@redhat.com>
Date: Tue, 24 May 2022 13:03:28 +0200
Subject: [PATCH] module_utils.batch remove unused AWSConnection

---
 .../fragments/67191-remove-AWSConnection.yml  |  2 +
 plugins/module_utils/batch.py                 | 48 -------------------
 2 files changed, 2 insertions(+), 48 deletions(-)
 create mode 100644 changelogs/fragments/67191-remove-AWSConnection.yml

diff --git a/changelogs/fragments/67191-remove-AWSConnection.yml b/changelogs/fragments/67191-remove-AWSConnection.yml
new file mode 100644
index 00000000000..de2d32655f9
--- /dev/null
+++ b/changelogs/fragments/67191-remove-AWSConnection.yml
@@ -0,0 +1,2 @@
+removed_features:
+- module_utils.batch - the class ``ansible_collections.amazon.aws.plugins.module_utils.batch.AWSConnection`` has been removed.  Please use ``AnsibleAWSModule.client()`` instead (https://github.com/ansible-collections/amazon.aws/pull/831).
diff --git a/plugins/module_utils/batch.py b/plugins/module_utils/batch.py
index 648d0a3816a..c2721451943 100644
--- a/plugins/module_utils/batch.py
+++ b/plugins/module_utils/batch.py
@@ -32,56 +32,8 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
-try:
-    from botocore.exceptions import ClientError
-except ImportError:
-    pass
-
 from ansible.module_utils.common.dict_transformations import snake_dict_to_camel_dict
 
-from .ec2 import boto3_conn
-from .ec2 import get_aws_connection_info
-
-
-class AWSConnection(object):
-    """
-    Create the connection object and client objects as required.
-    """
-
-    def __init__(self, ansible_obj, resources, boto3=True):
-
-        ansible_obj.deprecate("The 'AWSConnection' class is deprecated, please use 'AnsibleAWSModule.client()'",
-                              date='2022-06-01', collection_name='amazon.aws')
-
-        self.region, self.endpoint, aws_connect_kwargs = get_aws_connection_info(ansible_obj, boto3=boto3)
-
-        self.resource_client = dict()
-        if not resources:
-            resources = ['batch']
-
-        resources.append('iam')
-
-        for resource in resources:
-            aws_connect_kwargs.update(dict(region=self.region,
-                                           endpoint=self.endpoint,
-                                           conn_type='client',
-                                           resource=resource
-                                           ))
-            self.resource_client[resource] = boto3_conn(ansible_obj, **aws_connect_kwargs)
-
-        # if region is not provided, then get default profile/session region
-        if not self.region:
-            self.region = self.resource_client['batch'].meta.region_name
-
-        # set account ID
-        try:
-            self.account_id = self.resource_client['iam'].get_user()['User']['Arn'].split(':')[4]
-        except (ClientError, ValueError, KeyError, IndexError):
-            self.account_id = ''
-
-    def client(self, resource='batch'):
-        return self.resource_client[resource]
-
 
 def cc(key):
     """