Update the AWS automation tests to use existing CloudFormation stacks (#3092)

AutomatedTesting/Gem/PythonTests/AWS/conftest.py

@@ -11,8 +11,7 @@ import typing
 
 from AWS.common.aws_utils import AwsUtils
 from AWS.common.aws_credentials import AwsCredentials
-from AWS.Windows.cdk.cdk_utils import Cdk
-from AWS.Windows.resource_mappings.resource_mappings import ResourceMappings
+from AWS.common.resource_mappings import ResourceMappings
 
 logger = logging.getLogger(__name__)
 
@@ -52,6 +51,7 @@ def resource_mappings(
         project: str,
         feature_name: str,
         resource_mappings_filename: str,
+        stacks: typing.List,
         workspace: pytest.fixture,
         aws_utils: pytest.fixture) -> ResourceMappings:
     """
@@ -61,6 +61,7 @@ def resource_mappings(
     :param project: Project to find resource mapping file.
     :param feature_name: AWS Gem name that is prepended to resource mapping keys.
     :param resource_mappings_filename: Name of resource mapping file.
+    :param stacks: List of stack names to describe and populate resource mappings with.
     :param workspace: ly_test_tools workspace fixture.
     :param aws_utils: AWS utils fixture.
     :return: ResourceMappings class object.
@@ -70,8 +71,8 @@ def resource_mappings(
     logger.info(f'Resource mapping path : {path}')
     logger.info(f'Resource mapping resolved path : {abspath(path)}')
     resource_mappings_obj = ResourceMappings(abspath(path), aws_utils.assume_session().region_name, feature_name,
-                                             aws_utils.assume_account_id(), workspace,
-                                             aws_utils.client('cloudformation'))
+                                             aws_utils.assume_account_id(), aws_utils.client('cloudformation'))
+    resource_mappings_obj.populate_output_keys(stacks)
 
     def teardown():
         resource_mappings_obj.clear_output_keys()
@@ -81,56 +82,6 @@ def resource_mappings(
     return resource_mappings_obj
 
 
-@pytest.fixture(scope='function')
-def cdk(
-        request: pytest.fixture,
-        project: str,
-        feature_name: str,
-        workspace: pytest.fixture,
-        aws_utils: pytest.fixture,
-        resource_mappings: pytest.fixture,
-        deployment_params: typing.List[str],
-        destroy_stacks_on_teardown: bool) -> Cdk:
-    """
-    Fixture for setting up a Cdk
-    :param request: _pytest.fixtures.SubRequest class that handles getting
-        a pytest fixture from a pytest function/fixture.
-    :param project: Project name used for cdk project name env variable.
-    :param feature_name: Feature gem name to expect cdk folder in.
-    :param workspace: ly_test_tools workspace fixture.
-    :param aws_utils: aws_utils fixture.
-    :param resource_mappings: resource_mappings fixture.
-    :param deployment_params: Parameters for the CDK application deployment.
-    :param destroy_stacks_on_teardown: option to control calling destroy ot the end of test.
-    :return Cdk class object.
-    """
-
-    cdk_path = f'{workspace.paths.engine_root()}/Gems/{feature_name}/cdk'
-    logger.info(f'CDK Path {cdk_path}')
-
-    if pytest.cdk_obj is None:
-        pytest.cdk_obj = Cdk()
-        pytest.cdk_obj.setup(cdk_path, project, aws_utils.assume_account_id(), workspace, aws_utils.assume_session())
-
-    stacks = pytest.cdk_obj.deploy(deployment_params=deployment_params)
-
-    logger.info(f'Cdk stack names:\n{stacks}')
-    resource_mappings.populate_output_keys(stacks)
-
-    def teardown():
-        if destroy_stacks_on_teardown:
-            pytest.cdk_obj.destroy(deployment_params=deployment_params)
-            # Enable after https://github.com/aws/aws-cdk/issues/986 is fixed.
-            # Until then clean the bootstrap bucket manually.
-            # pytest.cdk_obj.remove_bootstrap_stack()
-
-            pytest.cdk_obj = None
-
-    request.addfinalizer(teardown)
-
-    return pytest.cdk_obj
-
-
 @pytest.fixture(scope='function')
 def aws_credentials(request: pytest.fixture, aws_utils: pytest.fixture, profile_name: str):
     """