Merge branch 'development' into terrain/sphrose/SurfaceDataConstants

AutomatedTesting/Gem/PythonTests/AWS/CMakeLists.txt

@@ -13,7 +13,8 @@
 
 if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
     # Only enable AWS automated tests on Windows
-    if(NOT "${PAL_PLATFORM_NAME}" STREQUAL "Windows")
+    set(SUPPORTED_PLATFORMS "Windows" "Linux")
+    if (NOT "${PAL_PLATFORM_NAME}" IN_LIST SUPPORTED_PLATFORMS)
         return()
     endif()
 
@@ -23,7 +24,6 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
         TEST_SERIAL
         PATH ${CMAKE_CURRENT_LIST_DIR}/${PAL_PLATFORM_NAME}/
         RUNTIME_DEPENDENCIES
-            Legacy::Editor
             AZ::AssetProcessor
             AutomatedTesting.GameLauncher
             AutomatedTesting.Assets

AutomatedTesting/Gem/PythonTests/AWS/README.md

@@ -2,30 +2,61 @@
 
 ## Prerequisites
 1. Build the O3DE Editor and AutomatedTesting.GameLauncher in Profile.
-2. AWS CLI is installed and configured following [Configuration and Credential File Settings](https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-files.html).
-3. [AWS Cloud Development Kit (CDK)](https://docs.aws.amazon.com/cdk/latest/guide/getting_started.html#getting_started_install) is installed.
+2. Install the latest version of NodeJs.
+3. AWS CLI is installed and configured following [Configuration and Credential File Settings](https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-files.html).
+4. [AWS Cloud Development Kit (CDK)](https://docs.aws.amazon.com/cdk/latest/guide/getting_started.html#getting_started_install) is installed.
 
 ## Deploy CDK Applications
 1. Go to the AWS IAM console and create an IAM role called o3de-automation-tests which adds your own account as as a trusted entity and uses the "AdministratorAccess" permissions policy.
-2. Copy {engine_root}\scripts\build\Platform\Windows\deploy_cdk_applications.cmd to your engine root folder.
-3. Open a new Command Prompt window at the engine root and set the following environment variables:
-```
-   Set O3DE_AWS_PROJECT_NAME=AWSAUTO
-   Set O3DE_AWS_DEPLOY_REGION=us-east-1
-   Set O3DE_AWS_DEPLOY_ACCOUNT={your_aws_account_id}
-   Set ASSUME_ROLE_ARN=arn:aws:iam::{your_aws_account_id}:role/o3de-automation-tests
-   Set COMMIT_ID=HEAD
-```
-4. In the same Command Prompt window, Deploy the CDK applications for AWS gems by running deploy_cdk_applications.cmd.
+2. Copy the following deployment script to your engine root folder:
+    * Windows (Command Prompt)
+        ```
+            {engine_root}\scripts\build\Platform\Windows\deploy_cdk_applications.cmd
+        ```
+    * Linux
+        ```
+            {engine_root}/scripts/build/Platform/Linux/deploy_cdk_applications.sh
+        ```
+3. Open a new CLI window at the engine root and set the following environment variables:
+    * Windows
+        ```
+            Set O3DE_AWS_PROJECT_NAME=AWSAUTO
+            Set O3DE_AWS_DEPLOY_REGION=us-east-1
+            Set ASSUME_ROLE_ARN=arn:aws:iam::{your_aws_account_id}:role/o3de-automation-tests
+            Set COMMIT_ID=HEAD
+        ```
+    * Linux
+        ```
+            export O3DE_AWS_PROJECT_NAME=AWSAUTO
+            export O3DE_AWS_DEPLOY_REGION=us-east-1
+            export ASSUME_ROLE_ARN=arn:aws:iam::{your_aws_account_id}:role/o3de-automation-tests
+            export COMMIT_ID=HEAD
+        ```
+4. In the same CLI window, Deploy the CDK applications for AWS gems by running deploy_cdk_applications.cmd.
    
 ## Run Automation Tests
 ### CLI
-In the same Command Prompt window, run the following CLI command:  
-python\python.cmd -m pytest {path_to_the_test_file} --build-directory {directory_to_the_profile_build}
+1. In the same CLI window, run the following CLI command:
+    * Windows
+        ```
+            python\python.cmd -m pytest {path_to_the_test_file} --build-directory {directory_to_the_profile_build}
+        ```
+    * Linux
+        ```
+            python/python.sh -m pytest {path_to_the_test_file} --build-directory {directory_to_the_profile_build}
+        ```
 
 ### Pycharm
 You can also run any specific automation test directly from Pycharm by providing the "--build-directory" argument in the Run Configuration.
 
 ## Destroy CDK Applications
-1. Copy {engine_root}\scripts\build\Platform\Windows\destroy_cdk_applications.cmd to your engine root folder.
-2. In the same Command Prompt window, destroy the CDK applications for AWS gems by running destroy_cdk_applications.cmd.
+1. Copy the following destruction script to your engine root folder:
+    * Windows
+        ```
+            {engine_root}\scripts\build\Platform\Windows\destroy_cdk_applications.cmd
+        ```
+    * Linux
+        ```
+            {engine_root}/scripts/build/Platform/Linux/destroy_cdk_applications.sh
+        ```
+2. In the same CLI window, destroy the CDK applications for AWS gems by running destroy_cdk_applications.cmd.

AutomatedTesting/Gem/PythonTests/AWS/Windows/aws_metrics/__init__.py

@@ -1,6 +0,0 @@
-"""
-Copyright (c) Contributors to the Open 3D Engine Project.
-For complete copyright and license terms please see the LICENSE at the root of this distribution.
-
-SPDX-License-Identifier: Apache-2.0 OR MIT
-"""

AutomatedTesting/Gem/PythonTests/AWS/aws_metrics/aws_metrics_automation_test.py

@@ -1,289 +1,289 @@
-"""
-Copyright (c) Contributors to the Open 3D Engine Project.
-For complete copyright and license terms please see the LICENSE at the root of this distribution.
-
-SPDX-License-Identifier: Apache-2.0 OR MIT
-"""
-
-import logging
-import os
-import pytest
-import typing
-from datetime import datetime
-
-import ly_test_tools.log.log_monitor
-
-from AWS.common import constants
-from AWS.common.resource_mappings import AWS_RESOURCE_MAPPINGS_ACCOUNT_ID_KEY
-from .aws_metrics_custom_thread import AWSMetricsThread
-
-# fixture imports
-from assetpipeline.ap_fixtures.asset_processor_fixture import asset_processor
-from .aws_metrics_utils import aws_metrics_utils
-
-AWS_METRICS_FEATURE_NAME = 'AWSMetrics'
-
-logger = logging.getLogger(__name__)
-
-
-def setup(launcher: pytest.fixture,
-          asset_processor: pytest.fixture) -> pytest.fixture:
-    """
-    Set up the resource mapping configuration and start the log monitor.
-    :param launcher: Client launcher for running the test level.
-    :param asset_processor: asset_processor fixture.
-    :return log monitor object.
-    """
-    asset_processor.start()
-    asset_processor.wait_for_idle()
-
-    file_to_monitor = os.path.join(launcher.workspace.paths.project_log(), constants.GAME_LOG_NAME)
-
-    # Initialize the log monitor.
-    log_monitor = ly_test_tools.log.log_monitor.LogMonitor(launcher=launcher, log_file_path=file_to_monitor)
-
-    return log_monitor
-
-
-def monitor_metrics_submission(log_monitor: pytest.fixture) -> None:
-    """
-    Monitor the messages and notifications for submitting metrics.
-    :param log_monitor: Log monitor to check the log messages.
-    """
-    expected_lines = [
-        '(Script) - Submitted metrics without buffer.',
-        '(Script) - Submitted metrics with buffer.',
-        '(Script) - Flushed the buffered metrics.',
-        '(Script) - Metrics is sent successfully.'
-    ]
-
-    unexpected_lines = [
-        '(Script) - Failed to submit metrics without buffer.',
-        '(Script) - Failed to submit metrics with buffer.',
-        '(Script) - Failed to send metrics.'
-    ]
-
-    result = log_monitor.monitor_log_for_lines(
-        expected_lines=expected_lines,
-        unexpected_lines=unexpected_lines,
-        halt_on_unexpected=True)
-
-    # Assert the log monitor detected expected lines and did not detect any unexpected lines.
-    assert result, (
-        f'Log monitoring failed. Used expected_lines values: {expected_lines} & '
-        f'unexpected_lines values: {unexpected_lines}')
-
-
-def query_metrics_from_s3(aws_metrics_utils: pytest.fixture, resource_mappings: pytest.fixture) -> None:
-    """
-    Verify that the metrics events are delivered to the S3 bucket and can be queried.
-    :param aws_metrics_utils: aws_metrics_utils fixture.
-    :param resource_mappings: resource_mappings fixture.
-    """
-    aws_metrics_utils.verify_s3_delivery(
-        resource_mappings.get_resource_name_id('AWSMetrics.AnalyticsBucketName')
-    )
-    logger.info('Metrics are sent to S3.')
-
-    aws_metrics_utils.run_glue_crawler(
-        resource_mappings.get_resource_name_id('AWSMetrics.EventsCrawlerName'))
-
-    # Remove the events_json table if exists so that the sample query can create a table with the same name.
-    aws_metrics_utils.delete_table(resource_mappings.get_resource_name_id('AWSMetrics.EventDatabaseName'), 'events_json')
-    aws_metrics_utils.run_named_queries(resource_mappings.get_resource_name_id('AWSMetrics.AthenaWorkGroupName'))
-    logger.info('Query metrics from S3 successfully.')
-
-
-def verify_operational_metrics(aws_metrics_utils: pytest.fixture,
-                               resource_mappings: pytest.fixture, start_time: datetime) -> None:
-    """
-    Verify that operational health metrics are delivered to CloudWatch.
-    :param aws_metrics_utils: aws_metrics_utils fixture.
-    :param resource_mappings: resource_mappings fixture.
-    :param start_time: Time when the game launcher starts.
-    """
-    aws_metrics_utils.verify_cloud_watch_delivery(
-        'AWS/Lambda',
-        'Invocations',
-        [{'Name': 'FunctionName',
-          'Value': resource_mappings.get_resource_name_id('AWSMetrics.AnalyticsProcessingLambdaName')}],
-        start_time)
-    logger.info('AnalyticsProcessingLambda metrics are sent to CloudWatch.')
-
-    aws_metrics_utils.verify_cloud_watch_delivery(
-        'AWS/Lambda',
-        'Invocations',
-        [{'Name': 'FunctionName',
-          'Value': resource_mappings.get_resource_name_id('AWSMetrics.EventProcessingLambdaName')}],
-        start_time)
-    logger.info('EventsProcessingLambda metrics are sent to CloudWatch.')
-
-
-def update_kinesis_analytics_application_status(aws_metrics_utils: pytest.fixture,
-                                                resource_mappings: pytest.fixture, start_application: bool) -> None:
-    """
-    Update the Kinesis analytics application to start or stop it.
-    :param aws_metrics_utils: aws_metrics_utils fixture.
-    :param resource_mappings: resource_mappings fixture.
-    :param start_application: whether to start or stop the application.
-    """
-    if start_application:
-        aws_metrics_utils.start_kinesis_data_analytics_application(
-            resource_mappings.get_resource_name_id('AWSMetrics.AnalyticsApplicationName'))
-    else:
-        aws_metrics_utils.stop_kinesis_data_analytics_application(
-            resource_mappings.get_resource_name_id('AWSMetrics.AnalyticsApplicationName'))
-
-@pytest.mark.SUITE_awsi
-@pytest.mark.usefixtures('automatic_process_killer')
-@pytest.mark.usefixtures('aws_credentials')
-@pytest.mark.usefixtures('resource_mappings')
-@pytest.mark.parametrize('assume_role_arn', [constants.ASSUME_ROLE_ARN])
-@pytest.mark.parametrize('feature_name', [AWS_METRICS_FEATURE_NAME])
-@pytest.mark.parametrize('profile_name', ['AWSAutomationTest'])
-@pytest.mark.parametrize('project', ['AutomatedTesting'])
-@pytest.mark.parametrize('region_name', [constants.AWS_REGION])
-@pytest.mark.parametrize('resource_mappings_filename', [constants.AWS_RESOURCE_MAPPING_FILE_NAME])
-@pytest.mark.parametrize('session_name', [constants.SESSION_NAME])
-@pytest.mark.parametrize('stacks', [[f'{constants.AWS_PROJECT_NAME}-{AWS_METRICS_FEATURE_NAME}-{constants.AWS_REGION}']])
-class TestAWSMetricsWindows(object):
-    """
-    Test class to verify the real-time and batch analytics for metrics.
-    """
-    @pytest.mark.parametrize('level', ['AWS/Metrics'])
-    def test_realtime_and_batch_analytics(self,
-                                          level: str,
-                                          launcher: pytest.fixture,
-                                          asset_processor: pytest.fixture,
-                                          workspace: pytest.fixture,
-                                          aws_utils: pytest.fixture,
-                                          resource_mappings: pytest.fixture,
-                                          aws_metrics_utils: pytest.fixture):
-        """
-        Verify that the metrics events are sent to CloudWatch and S3 for analytics.
-        """
-        # Start Kinesis analytics application on a separate thread to avoid blocking the test.
-        kinesis_analytics_application_thread = AWSMetricsThread(target=update_kinesis_analytics_application_status,
-                                                                args=(aws_metrics_utils, resource_mappings, True))
-        kinesis_analytics_application_thread.start()
-
-        log_monitor = setup(launcher, asset_processor)
-
-        # Kinesis analytics application needs to be in the running state before we start the game launcher.
-        kinesis_analytics_application_thread.join()
-        launcher.args = ['+LoadLevel', level]
-        launcher.args.extend(['-rhi=null'])
-        start_time = datetime.utcnow()
-        with launcher.start(launch_ap=False):
-            monitor_metrics_submission(log_monitor)
-
-            # Verify that real-time analytics metrics are delivered to CloudWatch.
-            aws_metrics_utils.verify_cloud_watch_delivery(
-                AWS_METRICS_FEATURE_NAME,
-                'TotalLogins',
-                [],
-                start_time)
-            logger.info('Real-time metrics are sent to CloudWatch.')
-
-        # Run time-consuming operations on separate threads to avoid blocking the test.
-        operational_threads = list()
-        operational_threads.append(
-            AWSMetricsThread(target=query_metrics_from_s3,
-                             args=(aws_metrics_utils, resource_mappings)))
-        operational_threads.append(
-            AWSMetricsThread(target=verify_operational_metrics,
-                             args=(aws_metrics_utils, resource_mappings, start_time)))
-        operational_threads.append(
-            AWSMetricsThread(target=update_kinesis_analytics_application_status,
-                             args=(aws_metrics_utils, resource_mappings, False)))
-        for thread in operational_threads:
-            thread.start()
-        for thread in operational_threads:
-            thread.join()
-
-    @pytest.mark.parametrize('level', ['AWS/Metrics'])
-    def test_realtime_and_batch_analytics_no_global_accountid(self,
-                                                            level: str,
-                                                            launcher: pytest.fixture,
-                                                            asset_processor: pytest.fixture,
-                                                            workspace: pytest.fixture,
-                                                            aws_utils: pytest.fixture,
-                                                            resource_mappings: pytest.fixture,
-                                                            aws_metrics_utils: pytest.fixture):
-        """
-        Verify that the metrics events are sent to CloudWatch and S3 for analytics.
-        """
-        # Remove top-level account ID from resource mappings
-        resource_mappings.clear_select_keys([AWS_RESOURCE_MAPPINGS_ACCOUNT_ID_KEY])
-        # Start Kinesis analytics application on a separate thread to avoid blocking the test.
-        kinesis_analytics_application_thread = AWSMetricsThread(target=update_kinesis_analytics_application_status,
-                                                                args=(aws_metrics_utils, resource_mappings, True))
-        kinesis_analytics_application_thread.start()
-
-        log_monitor = setup(launcher, asset_processor)
-
-        # Kinesis analytics application needs to be in the running state before we start the game launcher.
-        kinesis_analytics_application_thread.join()
-        launcher.args = ['+LoadLevel', level]
-        launcher.args.extend(['-rhi=null'])
-        start_time = datetime.utcnow()
-        with launcher.start(launch_ap=False):
-            monitor_metrics_submission(log_monitor)
-
-            # Verify that real-time analytics metrics are delivered to CloudWatch.
-            aws_metrics_utils.verify_cloud_watch_delivery(
-                AWS_METRICS_FEATURE_NAME,
-                'TotalLogins',
-                [],
-                start_time)
-            logger.info('Real-time metrics are sent to CloudWatch.')
-
-        # Run time-consuming operations on separate threads to avoid blocking the test.
-        operational_threads = list()
-        operational_threads.append(
-            AWSMetricsThread(target=query_metrics_from_s3,
-                             args=(aws_metrics_utils, resource_mappings)))
-        operational_threads.append(
-            AWSMetricsThread(target=verify_operational_metrics,
-                             args=(aws_metrics_utils, resource_mappings, start_time)))
-        operational_threads.append(
-            AWSMetricsThread(target=update_kinesis_analytics_application_status,
-                             args=(aws_metrics_utils, resource_mappings, False)))
-        for thread in operational_threads:
-            thread.start()
-        for thread in operational_threads:
-            thread.join()
-
-    @pytest.mark.parametrize('level', ['AWS/Metrics'])
-    def test_unauthorized_user_request_rejected(self,
-                                                level: str,
-                                                launcher: pytest.fixture,
-                                                asset_processor: pytest.fixture,
-                                                workspace: pytest.fixture):
-        """
-        Verify that unauthorized users cannot send metrics events to the AWS backed backend.
-        """
-        log_monitor = setup(launcher, asset_processor)
-
-        # Set invalid AWS credentials.
-        launcher.args = ['+LoadLevel', level, '+cl_awsAccessKey', 'AKIAIOSFODNN7EXAMPLE',
-                         '+cl_awsSecretKey', 'wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY']
-        launcher.args.extend(['-rhi=null'])
-
-        with launcher.start(launch_ap=False):
-            result = log_monitor.monitor_log_for_lines(
-                expected_lines=['(Script) - Failed to send metrics.'],
-                unexpected_lines=['(Script) - Metrics is sent successfully.'],
-                halt_on_unexpected=True)
-            assert result, 'Metrics events are sent successfully by unauthorized user'
-            logger.info('Unauthorized user is rejected to send metrics.')
-
-    def test_clean_up_s3_bucket(self,
-                                aws_utils: pytest.fixture,
-                                resource_mappings: pytest.fixture,
-                                aws_metrics_utils: pytest.fixture):
-        """
-        Clear the analytics bucket objects so that the S3 bucket can be destroyed during tear down.
-        """
-        aws_metrics_utils.empty_bucket(
-            resource_mappings.get_resource_name_id('AWSMetrics.AnalyticsBucketName'))
+"""
+Copyright (c) Contributors to the Open 3D Engine Project.
+For complete copyright and license terms please see the LICENSE at the root of this distribution.
+
+SPDX-License-Identifier: Apache-2.0 OR MIT
+"""
+
+import logging
+import os
+import pytest
+import typing
+from datetime import datetime
+
+import ly_test_tools.log.log_monitor
+
+from AWS.common import constants
+from AWS.common.resource_mappings import AWS_RESOURCE_MAPPINGS_ACCOUNT_ID_KEY
+from .aws_metrics_custom_thread import AWSMetricsThread
+
+# fixture imports
+from assetpipeline.ap_fixtures.asset_processor_fixture import asset_processor
+from .aws_metrics_utils import aws_metrics_utils
+
+AWS_METRICS_FEATURE_NAME = 'AWSMetrics'
+
+logger = logging.getLogger(__name__)
+
+
+def setup(launcher: pytest.fixture,
+          asset_processor: pytest.fixture) -> pytest.fixture:
+    """
+    Set up the resource mapping configuration and start the log monitor.
+    :param launcher: Client launcher for running the test level.
+    :param asset_processor: asset_processor fixture.
+    :return log monitor object.
+    """
+    asset_processor.start()
+    asset_processor.wait_for_idle()
+
+    file_to_monitor = os.path.join(launcher.workspace.paths.project_log(), constants.GAME_LOG_NAME)
+
+    # Initialize the log monitor.
+    log_monitor = ly_test_tools.log.log_monitor.LogMonitor(launcher=launcher, log_file_path=file_to_monitor)
+
+    return log_monitor
+
+
+def monitor_metrics_submission(log_monitor: pytest.fixture) -> None:
+    """
+    Monitor the messages and notifications for submitting metrics.
+    :param log_monitor: Log monitor to check the log messages.
+    """
+    expected_lines = [
+        '(Script) - Submitted metrics without buffer.',
+        '(Script) - Submitted metrics with buffer.',
+        '(Script) - Flushed the buffered metrics.',
+        '(Script) - Metrics is sent successfully.'
+    ]
+
+    unexpected_lines = [
+        '(Script) - Failed to submit metrics without buffer.',
+        '(Script) - Failed to submit metrics with buffer.',
+        '(Script) - Failed to send metrics.'
+    ]
+
+    result = log_monitor.monitor_log_for_lines(
+        expected_lines=expected_lines,
+        unexpected_lines=unexpected_lines,
+        halt_on_unexpected=True)
+
+    # Assert the log monitor detected expected lines and did not detect any unexpected lines.
+    assert result, (
+        f'Log monitoring failed. Used expected_lines values: {expected_lines} & '
+        f'unexpected_lines values: {unexpected_lines}')
+
+
+def query_metrics_from_s3(aws_metrics_utils: pytest.fixture, resource_mappings: pytest.fixture) -> None:
+    """
+    Verify that the metrics events are delivered to the S3 bucket and can be queried.
+    :param aws_metrics_utils: aws_metrics_utils fixture.
+    :param resource_mappings: resource_mappings fixture.
+    """
+    aws_metrics_utils.verify_s3_delivery(
+        resource_mappings.get_resource_name_id('AWSMetrics.AnalyticsBucketName')
+    )
+    logger.info('Metrics are sent to S3.')
+
+    aws_metrics_utils.run_glue_crawler(
+        resource_mappings.get_resource_name_id('AWSMetrics.EventsCrawlerName'))
+
+    # Remove the events_json table if exists so that the sample query can create a table with the same name.
+    aws_metrics_utils.delete_table(resource_mappings.get_resource_name_id('AWSMetrics.EventDatabaseName'), 'events_json')
+    aws_metrics_utils.run_named_queries(resource_mappings.get_resource_name_id('AWSMetrics.AthenaWorkGroupName'))
+    logger.info('Query metrics from S3 successfully.')
+
+
+def verify_operational_metrics(aws_metrics_utils: pytest.fixture,
+                               resource_mappings: pytest.fixture, start_time: datetime) -> None:
+    """
+    Verify that operational health metrics are delivered to CloudWatch.
+    :param aws_metrics_utils: aws_metrics_utils fixture.
+    :param resource_mappings: resource_mappings fixture.
+    :param start_time: Time when the game launcher starts.
+    """
+    aws_metrics_utils.verify_cloud_watch_delivery(
+        'AWS/Lambda',
+        'Invocations',
+        [{'Name': 'FunctionName',
+          'Value': resource_mappings.get_resource_name_id('AWSMetrics.AnalyticsProcessingLambdaName')}],
+        start_time)
+    logger.info('AnalyticsProcessingLambda metrics are sent to CloudWatch.')
+
+    aws_metrics_utils.verify_cloud_watch_delivery(
+        'AWS/Lambda',
+        'Invocations',
+        [{'Name': 'FunctionName',
+          'Value': resource_mappings.get_resource_name_id('AWSMetrics.EventProcessingLambdaName')}],
+        start_time)
+    logger.info('EventsProcessingLambda metrics are sent to CloudWatch.')
+
+
+def update_kinesis_analytics_application_status(aws_metrics_utils: pytest.fixture,
+                                                resource_mappings: pytest.fixture, start_application: bool) -> None:
+    """
+    Update the Kinesis analytics application to start or stop it.
+    :param aws_metrics_utils: aws_metrics_utils fixture.
+    :param resource_mappings: resource_mappings fixture.
+    :param start_application: whether to start or stop the application.
+    """
+    if start_application:
+        aws_metrics_utils.start_kinesis_data_analytics_application(
+            resource_mappings.get_resource_name_id('AWSMetrics.AnalyticsApplicationName'))
+    else:
+        aws_metrics_utils.stop_kinesis_data_analytics_application(
+            resource_mappings.get_resource_name_id('AWSMetrics.AnalyticsApplicationName'))
+
+@pytest.mark.SUITE_awsi
+@pytest.mark.usefixtures('automatic_process_killer')
+@pytest.mark.usefixtures('aws_credentials')
+@pytest.mark.usefixtures('resource_mappings')
+@pytest.mark.parametrize('assume_role_arn', [constants.ASSUME_ROLE_ARN])
+@pytest.mark.parametrize('feature_name', [AWS_METRICS_FEATURE_NAME])
+@pytest.mark.parametrize('profile_name', ['AWSAutomationTest'])
+@pytest.mark.parametrize('project', ['AutomatedTesting'])
+@pytest.mark.parametrize('region_name', [constants.AWS_REGION])
+@pytest.mark.parametrize('resource_mappings_filename', [constants.AWS_RESOURCE_MAPPING_FILE_NAME])
+@pytest.mark.parametrize('session_name', [constants.SESSION_NAME])
+@pytest.mark.parametrize('stacks', [[f'{constants.AWS_PROJECT_NAME}-{AWS_METRICS_FEATURE_NAME}-{constants.AWS_REGION}']])
+class TestAWSMetricsWindows(object):
+    """
+    Test class to verify the real-time and batch analytics for metrics.
+    """
+    @pytest.mark.parametrize('level', ['levels/aws/metrics/metrics.spawnable'])
+    def test_realtime_and_batch_analytics(self,
+                                          level: str,
+                                          launcher: pytest.fixture,
+                                          asset_processor: pytest.fixture,
+                                          workspace: pytest.fixture,
+                                          aws_utils: pytest.fixture,
+                                          resource_mappings: pytest.fixture,
+                                          aws_metrics_utils: pytest.fixture):
+        """
+        Verify that the metrics events are sent to CloudWatch and S3 for analytics.
+        """
+        # Start Kinesis analytics application on a separate thread to avoid blocking the test.
+        kinesis_analytics_application_thread = AWSMetricsThread(target=update_kinesis_analytics_application_status,
+                                                                args=(aws_metrics_utils, resource_mappings, True))
+        kinesis_analytics_application_thread.start()
+
+        log_monitor = setup(launcher, asset_processor)
+
+        # Kinesis analytics application needs to be in the running state before we start the game launcher.
+        kinesis_analytics_application_thread.join()
+        launcher.args = ['+LoadLevel', level]
+        launcher.args.extend(['-rhi=null'])
+        start_time = datetime.utcnow()
+        with launcher.start(launch_ap=False):
+            monitor_metrics_submission(log_monitor)
+
+            # Verify that real-time analytics metrics are delivered to CloudWatch.
+            aws_metrics_utils.verify_cloud_watch_delivery(
+                AWS_METRICS_FEATURE_NAME,
+                'TotalLogins',
+                [],
+                start_time)
+            logger.info('Real-time metrics are sent to CloudWatch.')
+
+        # Run time-consuming operations on separate threads to avoid blocking the test.
+        operational_threads = list()
+        operational_threads.append(
+            AWSMetricsThread(target=query_metrics_from_s3,
+                             args=(aws_metrics_utils, resource_mappings)))
+        operational_threads.append(
+            AWSMetricsThread(target=verify_operational_metrics,
+                             args=(aws_metrics_utils, resource_mappings, start_time)))
+        operational_threads.append(
+            AWSMetricsThread(target=update_kinesis_analytics_application_status,
+                             args=(aws_metrics_utils, resource_mappings, False)))
+        for thread in operational_threads:
+            thread.start()
+        for thread in operational_threads:
+            thread.join()
+
+    @pytest.mark.parametrize('level', ['levels/aws/metrics/metrics.spawnable'])
+    def test_realtime_and_batch_analytics_no_global_accountid(self,
+                                                            level: str,
+                                                            launcher: pytest.fixture,
+                                                            asset_processor: pytest.fixture,
+                                                            workspace: pytest.fixture,
+                                                            aws_utils: pytest.fixture,
+                                                            resource_mappings: pytest.fixture,
+                                                            aws_metrics_utils: pytest.fixture):
+        """
+        Verify that the metrics events are sent to CloudWatch and S3 for analytics.
+        """
+        # Remove top-level account ID from resource mappings
+        resource_mappings.clear_select_keys([AWS_RESOURCE_MAPPINGS_ACCOUNT_ID_KEY])
+        # Start Kinesis analytics application on a separate thread to avoid blocking the test.
+        kinesis_analytics_application_thread = AWSMetricsThread(target=update_kinesis_analytics_application_status,
+                                                                args=(aws_metrics_utils, resource_mappings, True))
+        kinesis_analytics_application_thread.start()
+
+        log_monitor = setup(launcher, asset_processor)
+
+        # Kinesis analytics application needs to be in the running state before we start the game launcher.
+        kinesis_analytics_application_thread.join()
+        launcher.args = ['+LoadLevel', level]
+        launcher.args.extend(['-rhi=null'])
+        start_time = datetime.utcnow()
+        with launcher.start(launch_ap=False):
+            monitor_metrics_submission(log_monitor)
+
+            # Verify that real-time analytics metrics are delivered to CloudWatch.
+            aws_metrics_utils.verify_cloud_watch_delivery(
+                AWS_METRICS_FEATURE_NAME,
+                'TotalLogins',
+                [],
+                start_time)
+            logger.info('Real-time metrics are sent to CloudWatch.')
+
+        # Run time-consuming operations on separate threads to avoid blocking the test.
+        operational_threads = list()
+        operational_threads.append(
+            AWSMetricsThread(target=query_metrics_from_s3,
+                             args=(aws_metrics_utils, resource_mappings)))
+        operational_threads.append(
+            AWSMetricsThread(target=verify_operational_metrics,
+                             args=(aws_metrics_utils, resource_mappings, start_time)))
+        operational_threads.append(
+            AWSMetricsThread(target=update_kinesis_analytics_application_status,
+                             args=(aws_metrics_utils, resource_mappings, False)))
+        for thread in operational_threads:
+            thread.start()
+        for thread in operational_threads:
+            thread.join()
+
+    @pytest.mark.parametrize('level', ['levels/aws/metrics/metrics.spawnable'])
+    def test_unauthorized_user_request_rejected(self,
+                                                level: str,
+                                                launcher: pytest.fixture,
+                                                asset_processor: pytest.fixture,
+                                                workspace: pytest.fixture):
+        """
+        Verify that unauthorized users cannot send metrics events to the AWS backed backend.
+        """
+        log_monitor = setup(launcher, asset_processor)
+
+        # Set invalid AWS credentials.
+        launcher.args = ['+LoadLevel', level, '+cl_awsAccessKey', 'AKIAIOSFODNN7EXAMPLE',
+                         '+cl_awsSecretKey', 'wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY']
+        launcher.args.extend(['-rhi=null'])
+
+        with launcher.start(launch_ap=False):
+            result = log_monitor.monitor_log_for_lines(
+                expected_lines=['(Script) - Failed to send metrics.'],
+                unexpected_lines=['(Script) - Metrics is sent successfully.'],
+                halt_on_unexpected=True)
+            assert result, 'Metrics events are sent successfully by unauthorized user'
+            logger.info('Unauthorized user is rejected to send metrics.')
+
+    def test_clean_up_s3_bucket(self,
+                                aws_utils: pytest.fixture,
+                                resource_mappings: pytest.fixture,
+                                aws_metrics_utils: pytest.fixture):
+        """
+        Clear the analytics bucket objects so that the S3 bucket can be destroyed during tear down.
+        """
+        aws_metrics_utils.empty_bucket(
+            resource_mappings.get_resource_name_id('AWSMetrics.AnalyticsBucketName'))

AutomatedTesting/Gem/PythonTests/AWS/aws_metrics/aws_metrics_custom_thread.py

@@ -1,29 +1,29 @@
-"""
-Copyright (c) Contributors to the Open 3D Engine Project.
-For complete copyright and license terms please see the LICENSE at the root of this distribution.
-
-SPDX-License-Identifier: Apache-2.0 OR MIT
-"""
-
-from threading import Thread
-
-
-class AWSMetricsThread(Thread):
-    """
-    Custom thread for raising assertion errors on the main thread.
-    """
-    def __init__(self, **kwargs):
-        super().__init__(**kwargs)
-        self._error = None
-
-    def run(self) -> None:
-        try:
-            super().run()
-        except AssertionError as e:
-            self._error = e
-
-    def join(self, **kwargs) -> None:
-        super().join(**kwargs)
-
-        if self._error:
-            raise AssertionError(self._error)
+"""
+Copyright (c) Contributors to the Open 3D Engine Project.
+For complete copyright and license terms please see the LICENSE at the root of this distribution.
+
+SPDX-License-Identifier: Apache-2.0 OR MIT
+"""
+
+from threading import Thread
+
+
+class AWSMetricsThread(Thread):
+    """
+    Custom thread for raising assertion errors on the main thread.
+    """
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+        self._error = None
+
+    def run(self) -> None:
+        try:
+            super().run()
+        except AssertionError as e:
+            self._error = e
+
+    def join(self, **kwargs) -> None:
+        super().join(**kwargs)
+
+        if self._error:
+            raise AssertionError(self._error)

AutomatedTesting/Gem/PythonTests/AWS/aws_metrics/aws_metrics_utils.py

@@ -1,239 +1,239 @@
-"""
-Copyright (c) Contributors to the Open 3D Engine Project.
-For complete copyright and license terms please see the LICENSE at the root of this distribution.
-
-SPDX-License-Identifier: Apache-2.0 OR MIT
-"""
-
-import logging
-import pathlib
-import pytest
-import typing
-
-from datetime import datetime
-from botocore.exceptions import WaiterError
-
-from .aws_metrics_waiters import KinesisAnalyticsApplicationUpdatedWaiter, \
-    CloudWatchMetricsDeliveredWaiter, DataLakeMetricsDeliveredWaiter, GlueCrawlerReadyWaiter
-
-logging.getLogger('boto').setLevel(logging.CRITICAL)
-
-# Expected directory and file extension for the S3 objects.
-EXPECTED_S3_DIRECTORY = 'firehose_events/'
-EXPECTED_S3_OBJECT_EXTENSION = '.parquet'
-
-
-class AWSMetricsUtils:
-    """
-    Provide utils functions for the AWSMetrics gem to interact with the deployed resources.
-    """
-
-    def __init__(self, aws_utils: pytest.fixture):
-        self._aws_util = aws_utils
-
-    def start_kinesis_data_analytics_application(self, application_name: str) -> None:
-        """
-        Start the Kenisis Data Analytics application for real-time analytics.
-        :param application_name: Name of the Kenisis Data Analytics application.
-        """
-        input_id = self.get_kinesis_analytics_application_input_id(application_name)
-        assert input_id, 'invalid Kinesis Data Analytics application input.'
-
-        client = self._aws_util.client('kinesisanalytics')
-        try:
-            client.start_application(
-                ApplicationName=application_name,
-                InputConfigurations=[
-                    {
-                        'Id': input_id,
-                        'InputStartingPositionConfiguration': {
-                            'InputStartingPosition': 'NOW'
-                        }
-                    },
-                ]
-            )
-        except client.exceptions.ResourceInUseException:
-            # The application has been started.
-            return
-
-        try:
-            KinesisAnalyticsApplicationUpdatedWaiter(client, 'RUNNING').wait(application_name=application_name)
-        except WaiterError as e:
-            assert False, f'Failed to start the Kinesis Data Analytics application: {str(e)}.'
-
-    def get_kinesis_analytics_application_input_id(self, application_name: str) -> str:
-        """
-        Get the input ID for the Kenisis Data Analytics application.
-        :param application_name: Name of the Kenisis Data Analytics application.
-        :return: Input ID for the Kenisis Data Analytics application.
-        """
-        client = self._aws_util.client('kinesisanalytics')
-        response = client.describe_application(
-            ApplicationName=application_name
-        )
-        if not response:
-            return ''
-        input_descriptions = response.get('ApplicationDetail', {}).get('InputDescriptions', [])
-        if len(input_descriptions) != 1:
-            return ''
-
-        return input_descriptions[0].get('InputId', '')
-
-    def stop_kinesis_data_analytics_application(self, application_name: str) -> None:
-        """
-        Stop the Kenisis Data Analytics application.
-        :param application_name: Name of the Kenisis Data Analytics application.
-        """
-        client = self._aws_util.client('kinesisanalytics')
-        client.stop_application(
-            ApplicationName=application_name
-        )
-
-        try:
-            KinesisAnalyticsApplicationUpdatedWaiter(client, 'READY').wait(application_name=application_name)
-        except WaiterError as e:
-            assert False, f'Failed to stop the Kinesis Data Analytics application: {str(e)}.'
-
-    def verify_cloud_watch_delivery(self, namespace: str, metrics_name: str,
-                                    dimensions: typing.List[dict], start_time: datetime) -> None:
-        """
-        Verify that the expected metrics is delivered to CloudWatch.
-        :param namespace: Namespace of the metrics.
-        :param metrics_name: Name of the metrics.
-        :param dimensions: Dimensions of the metrics.
-        :param start_time: Start time for generating the metrics.
-        """
-        client = self._aws_util.client('cloudwatch')
-
-        try:
-            CloudWatchMetricsDeliveredWaiter(client).wait(
-                namespace=namespace,
-                metrics_name=metrics_name,
-                dimensions=dimensions,
-                start_time=start_time
-            )
-        except WaiterError as e:
-            assert False, f'Failed to deliver metrics to CloudWatch: {str(e)}.'
-
-    def verify_s3_delivery(self, analytics_bucket_name: str) -> None:
-        """
-        Verify that metrics are delivered to S3 for batch analytics successfully.
-        :param analytics_bucket_name: Name of the deployed S3 bucket.
-        """
-        client = self._aws_util.client('s3')
-        bucket_name = analytics_bucket_name
-
-        try:
-            DataLakeMetricsDeliveredWaiter(client).wait(bucket_name=bucket_name, prefix=EXPECTED_S3_DIRECTORY)
-        except WaiterError as e:
-            assert False, f'Failed to find the S3 directory for storing metrics data: {str(e)}.'
-
-        # Check whether the data is converted to the expected data format.
-        response = client.list_objects_v2(
-            Bucket=bucket_name,
-            Prefix=EXPECTED_S3_DIRECTORY
-        )
-        assert response.get('KeyCount', 0) != 0, f'Failed to deliver metrics to the S3 bucket {bucket_name}.'
-
-        s3_objects = response.get('Contents', [])
-        for s3_object in s3_objects:
-            key = s3_object.get('Key', '')
-            assert pathlib.Path(key).suffix == EXPECTED_S3_OBJECT_EXTENSION, \
-                f'Invalid data format is found in the S3 bucket {bucket_name}'
-
-    def run_glue_crawler(self, crawler_name: str) -> None:
-        """
-        Run the Glue crawler and wait for it to finish.
-        :param crawler_name: Name of the Glue crawler
-        """
-        client = self._aws_util.client('glue')
-        try:
-            client.start_crawler(
-                Name=crawler_name
-            )
-        except client.exceptions.CrawlerRunningException:
-            # The crawler has already been started.
-            return
-
-        try:
-            GlueCrawlerReadyWaiter(client).wait(crawler_name=crawler_name)
-        except WaiterError as e:
-            assert False, f'Failed to run the Glue crawler: {str(e)}.'
-
-    def run_named_queries(self, work_group: str) -> None:
-        """
-        Run the named queries under the specific Athena work group.
-        :param work_group: Name of the Athena work group.
-        """
-        client = self._aws_util.client('athena')
-        # List all the named queries.
-        response = client.list_named_queries(
-            WorkGroup=work_group
-        )
-        named_query_ids = response.get('NamedQueryIds', [])
-
-        # Run each of the queries.
-        for named_query_id in named_query_ids:
-            get_named_query_response = client.get_named_query(
-                NamedQueryId=named_query_id
-            )
-            named_query = get_named_query_response.get('NamedQuery', {})
-
-            start_query_execution_response = client.start_query_execution(
-                QueryString=named_query.get('QueryString', ''),
-                QueryExecutionContext={
-                    'Database': named_query.get('Database', '')
-                },
-                WorkGroup=work_group
-            )
-
-            # Wait for the query to finish.
-            state = 'RUNNING'
-            while state == 'QUEUED' or state == 'RUNNING':
-                get_query_execution_response = client.get_query_execution(
-                    QueryExecutionId=start_query_execution_response.get('QueryExecutionId', '')
-                )
-
-                state = get_query_execution_response.get('QueryExecution', {}).get('Status', {}).get('State', '')
-
-            assert state == 'SUCCEEDED', f'Failed to run the named query {named_query.get("Name", {})}'
-
-    def empty_bucket(self, bucket_name: str) -> None:
-        """
-        Empty the S3 bucket following:
-        https://boto3.amazonaws.com/v1/documentation/api/latest/guide/migrations3.html
-
-        :param bucket_name: Name of the S3 bucket.
-        """
-        s3 = self._aws_util.resource('s3')
-        bucket = s3.Bucket(bucket_name)
-
-        for key in bucket.objects.all():
-            key.delete()
-
-    def delete_table(self, database_name: str, table_name: str) -> None:
-        """
-        Delete an existing Glue table.
-
-        :param database_name: Name of the Glue database.
-        :param table_name: Name of the table to delete.
-        """
-        client = self._aws_util.client('glue')
-        client.delete_table(
-            DatabaseName=database_name,
-            Name=table_name
-        )
-
-
-@pytest.fixture(scope='function')
-def aws_metrics_utils(
-        request: pytest.fixture,
-        aws_utils: pytest.fixture):
-    """
-    Fixture for the AWS metrics util functions.
-    :param request:  _pytest.fixtures.SubRequest class that handles getting
-        a pytest fixture from a pytest function/fixture.
-    :param aws_utils: aws_utils fixture.
-    """
-    aws_utils_obj = AWSMetricsUtils(aws_utils)
-    return aws_utils_obj
+"""
+Copyright (c) Contributors to the Open 3D Engine Project.
+For complete copyright and license terms please see the LICENSE at the root of this distribution.
+
+SPDX-License-Identifier: Apache-2.0 OR MIT
+"""
+
+import logging
+import pathlib
+import pytest
+import typing
+
+from datetime import datetime
+from botocore.exceptions import WaiterError
+
+from .aws_metrics_waiters import KinesisAnalyticsApplicationUpdatedWaiter, \
+    CloudWatchMetricsDeliveredWaiter, DataLakeMetricsDeliveredWaiter, GlueCrawlerReadyWaiter
+
+logging.getLogger('boto').setLevel(logging.CRITICAL)
+
+# Expected directory and file extension for the S3 objects.
+EXPECTED_S3_DIRECTORY = 'firehose_events/'
+EXPECTED_S3_OBJECT_EXTENSION = '.parquet'
+
+
+class AWSMetricsUtils:
+    """
+    Provide utils functions for the AWSMetrics gem to interact with the deployed resources.
+    """
+
+    def __init__(self, aws_utils: pytest.fixture):
+        self._aws_util = aws_utils
+
+    def start_kinesis_data_analytics_application(self, application_name: str) -> None:
+        """
+        Start the Kenisis Data Analytics application for real-time analytics.
+        :param application_name: Name of the Kenisis Data Analytics application.
+        """
+        input_id = self.get_kinesis_analytics_application_input_id(application_name)
+        assert input_id, 'invalid Kinesis Data Analytics application input.'
+
+        client = self._aws_util.client('kinesisanalytics')
+        try:
+            client.start_application(
+                ApplicationName=application_name,
+                InputConfigurations=[
+                    {
+                        'Id': input_id,
+                        'InputStartingPositionConfiguration': {
+                            'InputStartingPosition': 'NOW'
+                        }
+                    },
+                ]
+            )
+        except client.exceptions.ResourceInUseException:
+            # The application has been started.
+            return
+
+        try:
+            KinesisAnalyticsApplicationUpdatedWaiter(client, 'RUNNING').wait(application_name=application_name)
+        except WaiterError as e:
+            assert False, f'Failed to start the Kinesis Data Analytics application: {str(e)}.'
+
+    def get_kinesis_analytics_application_input_id(self, application_name: str) -> str:
+        """
+        Get the input ID for the Kenisis Data Analytics application.
+        :param application_name: Name of the Kenisis Data Analytics application.
+        :return: Input ID for the Kenisis Data Analytics application.
+        """
+        client = self._aws_util.client('kinesisanalytics')
+        response = client.describe_application(
+            ApplicationName=application_name
+        )
+        if not response:
+            return ''
+        input_descriptions = response.get('ApplicationDetail', {}).get('InputDescriptions', [])
+        if len(input_descriptions) != 1:
+            return ''
+
+        return input_descriptions[0].get('InputId', '')
+
+    def stop_kinesis_data_analytics_application(self, application_name: str) -> None:
+        """
+        Stop the Kenisis Data Analytics application.
+        :param application_name: Name of the Kenisis Data Analytics application.
+        """
+        client = self._aws_util.client('kinesisanalytics')
+        client.stop_application(
+            ApplicationName=application_name
+        )
+
+        try:
+            KinesisAnalyticsApplicationUpdatedWaiter(client, 'READY').wait(application_name=application_name)
+        except WaiterError as e:
+            assert False, f'Failed to stop the Kinesis Data Analytics application: {str(e)}.'
+
+    def verify_cloud_watch_delivery(self, namespace: str, metrics_name: str,
+                                    dimensions: typing.List[dict], start_time: datetime) -> None:
+        """
+        Verify that the expected metrics is delivered to CloudWatch.
+        :param namespace: Namespace of the metrics.
+        :param metrics_name: Name of the metrics.
+        :param dimensions: Dimensions of the metrics.
+        :param start_time: Start time for generating the metrics.
+        """
+        client = self._aws_util.client('cloudwatch')
+
+        try:
+            CloudWatchMetricsDeliveredWaiter(client).wait(
+                namespace=namespace,
+                metrics_name=metrics_name,
+                dimensions=dimensions,
+                start_time=start_time
+            )
+        except WaiterError as e:
+            assert False, f'Failed to deliver metrics to CloudWatch: {str(e)}.'
+
+    def verify_s3_delivery(self, analytics_bucket_name: str) -> None:
+        """
+        Verify that metrics are delivered to S3 for batch analytics successfully.
+        :param analytics_bucket_name: Name of the deployed S3 bucket.
+        """
+        client = self._aws_util.client('s3')
+        bucket_name = analytics_bucket_name
+
+        try:
+            DataLakeMetricsDeliveredWaiter(client).wait(bucket_name=bucket_name, prefix=EXPECTED_S3_DIRECTORY)
+        except WaiterError as e:
+            assert False, f'Failed to find the S3 directory for storing metrics data: {str(e)}.'
+
+        # Check whether the data is converted to the expected data format.
+        response = client.list_objects_v2(
+            Bucket=bucket_name,
+            Prefix=EXPECTED_S3_DIRECTORY
+        )
+        assert response.get('KeyCount', 0) != 0, f'Failed to deliver metrics to the S3 bucket {bucket_name}.'
+
+        s3_objects = response.get('Contents', [])
+        for s3_object in s3_objects:
+            key = s3_object.get('Key', '')
+            assert pathlib.Path(key).suffix == EXPECTED_S3_OBJECT_EXTENSION, \
+                f'Invalid data format is found in the S3 bucket {bucket_name}'
+
+    def run_glue_crawler(self, crawler_name: str) -> None:
+        """
+        Run the Glue crawler and wait for it to finish.
+        :param crawler_name: Name of the Glue crawler
+        """
+        client = self._aws_util.client('glue')
+        try:
+            client.start_crawler(
+                Name=crawler_name
+            )
+        except client.exceptions.CrawlerRunningException:
+            # The crawler has already been started.
+            return
+
+        try:
+            GlueCrawlerReadyWaiter(client).wait(crawler_name=crawler_name)
+        except WaiterError as e:
+            assert False, f'Failed to run the Glue crawler: {str(e)}.'
+
+    def run_named_queries(self, work_group: str) -> None:
+        """
+        Run the named queries under the specific Athena work group.
+        :param work_group: Name of the Athena work group.
+        """
+        client = self._aws_util.client('athena')
+        # List all the named queries.
+        response = client.list_named_queries(
+            WorkGroup=work_group
+        )
+        named_query_ids = response.get('NamedQueryIds', [])
+
+        # Run each of the queries.
+        for named_query_id in named_query_ids:
+            get_named_query_response = client.get_named_query(
+                NamedQueryId=named_query_id
+            )
+            named_query = get_named_query_response.get('NamedQuery', {})
+
+            start_query_execution_response = client.start_query_execution(
+                QueryString=named_query.get('QueryString', ''),
+                QueryExecutionContext={
+                    'Database': named_query.get('Database', '')
+                },
+                WorkGroup=work_group
+            )
+
+            # Wait for the query to finish.
+            state = 'RUNNING'
+            while state == 'QUEUED' or state == 'RUNNING':
+                get_query_execution_response = client.get_query_execution(
+                    QueryExecutionId=start_query_execution_response.get('QueryExecutionId', '')
+                )
+
+                state = get_query_execution_response.get('QueryExecution', {}).get('Status', {}).get('State', '')
+
+            assert state == 'SUCCEEDED', f'Failed to run the named query {named_query.get("Name", {})}'
+
+    def empty_bucket(self, bucket_name: str) -> None:
+        """
+        Empty the S3 bucket following:
+        https://boto3.amazonaws.com/v1/documentation/api/latest/guide/migrations3.html
+
+        :param bucket_name: Name of the S3 bucket.
+        """
+        s3 = self._aws_util.resource('s3')
+        bucket = s3.Bucket(bucket_name)
+
+        for key in bucket.objects.all():
+            key.delete()
+
+    def delete_table(self, database_name: str, table_name: str) -> None:
+        """
+        Delete an existing Glue table.
+
+        :param database_name: Name of the Glue database.
+        :param table_name: Name of the table to delete.
+        """
+        client = self._aws_util.client('glue')
+        client.delete_table(
+            DatabaseName=database_name,
+            Name=table_name
+        )
+
+
+@pytest.fixture(scope='function')
+def aws_metrics_utils(
+        request: pytest.fixture,
+        aws_utils: pytest.fixture):
+    """
+    Fixture for the AWS metrics util functions.
+    :param request:  _pytest.fixtures.SubRequest class that handles getting
+        a pytest fixture from a pytest function/fixture.
+    :param aws_utils: aws_utils fixture.
+    """
+    aws_utils_obj = AWSMetricsUtils(aws_utils)
+    return aws_utils_obj

AutomatedTesting/Gem/PythonTests/AWS/aws_metrics/aws_metrics_waiters.py

@@ -1,139 +1,139 @@
-"""
-Copyright (c) Contributors to the Open 3D Engine Project.
-For complete copyright and license terms please see the LICENSE at the root of this distribution.
-
-SPDX-License-Identifier: Apache-2.0 OR MIT
-"""
-
-import botocore.client
-import logging
-
-from datetime import timedelta
-from AWS.common.custom_waiter import CustomWaiter, WaitState
-
-logging.getLogger('boto').setLevel(logging.CRITICAL)
-
-
-class KinesisAnalyticsApplicationUpdatedWaiter(CustomWaiter):
-    """
-    Subclass of the base custom waiter class.
-    Wait for the Kinesis analytics application being updated to a specific status.
-    """
-    def __init__(self, client: botocore.client, status: str):
-        """
-        Initialize the waiter.
-
-        :param client: Boto3 client to use.
-        :param status: Expected status.
-        """
-        super().__init__(
-            'KinesisAnalyticsApplicationUpdated',
-            'DescribeApplication',
-            'ApplicationDetail.ApplicationStatus',
-            {status: WaitState.SUCCESS},
-            client)
-
-    def wait(self, application_name: str):
-        """
-        Wait for the expected status.
-
-        :param application_name: Name of the Kinesis analytics application.
-        """
-        self._wait(ApplicationName=application_name)
-
-
-class GlueCrawlerReadyWaiter(CustomWaiter):
-    """
-    Subclass of the base custom waiter class.
-    Wait for the Glue crawler to finish its processing. Return when the crawler is in the "Stopping" status
-    to avoid wasting too much time in the automation tests on its shutdown process.
-    """
-    def __init__(self, client: botocore.client):
-        """
-        Initialize the waiter.
-
-        :param client: Boto3 client to use.
-        """
-        super().__init__(
-            'GlueCrawlerReady',
-            'GetCrawler',
-            'Crawler.State',
-            {'STOPPING': WaitState.SUCCESS},
-            client)
-
-    def wait(self, crawler_name):
-        """
-        Wait for the expected status.
-
-        :param crawler_name: Name of the Glue crawler.
-        """
-        self._wait(Name=crawler_name)
-
-
-class DataLakeMetricsDeliveredWaiter(CustomWaiter):
-    """
-    Subclass of the base custom waiter class.
-    Wait for the expected directory being created in the S3 bucket.
-    """
-    def __init__(self, client: botocore.client):
-        """
-        Initialize the waiter.
-
-        :param client: Boto3 client to use.
-        """
-        super().__init__(
-            'DataLakeMetricsDelivered',
-            'ListObjectsV2',
-            'KeyCount > `0`',
-            {True: WaitState.SUCCESS},
-            client)
-
-    def wait(self, bucket_name, prefix):
-        """
-        Wait for the expected directory being created.
-
-        :param bucket_name: Name of the S3 bucket.
-        :param prefix: Name of the expected directory prefix.
-        """
-        self._wait(Bucket=bucket_name, Prefix=prefix)
-
-
-class CloudWatchMetricsDeliveredWaiter(CustomWaiter):
-    """
-    Subclass of the base custom waiter class.
-    Wait for the expected metrics being delivered to CloudWatch.
-    """
-    def __init__(self, client: botocore.client):
-        """
-        Initialize the waiter.
-
-        :param client: Boto3 client to use.
-        """
-        super().__init__(
-            'CloudWatchMetricsDelivered',
-            'GetMetricStatistics',
-            'length(Datapoints) > `0`',
-            {True: WaitState.SUCCESS},
-            client)
-
-    def wait(self, namespace, metrics_name, dimensions, start_time):
-        """
-        Wait for the expected metrics being delivered.
-
-        :param namespace: Namespace of the metrics.
-        :param metrics_name: Name of the metrics.
-        :param dimensions: Dimensions of the metrics.
-        :param start_time: Start time for generating the metrics.
-        """
-        self._wait(
-            Namespace=namespace,
-            MetricName=metrics_name,
-            Dimensions=dimensions,
-            StartTime=start_time,
-            EndTime=start_time + timedelta(0, self.timeout),
-            Period=60,
-            Statistics=[
-                'SampleCount'
-            ],
-            Unit='Count'
-        )
+"""
+Copyright (c) Contributors to the Open 3D Engine Project.
+For complete copyright and license terms please see the LICENSE at the root of this distribution.
+
+SPDX-License-Identifier: Apache-2.0 OR MIT
+"""
+
+import botocore.client
+import logging
+
+from datetime import timedelta
+from AWS.common.custom_waiter import CustomWaiter, WaitState
+
+logging.getLogger('boto').setLevel(logging.CRITICAL)
+
+
+class KinesisAnalyticsApplicationUpdatedWaiter(CustomWaiter):
+    """
+    Subclass of the base custom waiter class.
+    Wait for the Kinesis analytics application being updated to a specific status.
+    """
+    def __init__(self, client: botocore.client, status: str):
+        """
+        Initialize the waiter.
+
+        :param client: Boto3 client to use.
+        :param status: Expected status.
+        """
+        super().__init__(
+            'KinesisAnalyticsApplicationUpdated',
+            'DescribeApplication',
+            'ApplicationDetail.ApplicationStatus',
+            {status: WaitState.SUCCESS},
+            client)
+
+    def wait(self, application_name: str):
+        """
+        Wait for the expected status.
+
+        :param application_name: Name of the Kinesis analytics application.
+        """
+        self._wait(ApplicationName=application_name)
+
+
+class GlueCrawlerReadyWaiter(CustomWaiter):
+    """
+    Subclass of the base custom waiter class.
+    Wait for the Glue crawler to finish its processing. Return when the crawler is in the "Stopping" status
+    to avoid wasting too much time in the automation tests on its shutdown process.
+    """
+    def __init__(self, client: botocore.client):
+        """
+        Initialize the waiter.
+
+        :param client: Boto3 client to use.
+        """
+        super().__init__(
+            'GlueCrawlerReady',
+            'GetCrawler',
+            'Crawler.State',
+            {'STOPPING': WaitState.SUCCESS},
+            client)
+
+    def wait(self, crawler_name):
+        """
+        Wait for the expected status.
+
+        :param crawler_name: Name of the Glue crawler.
+        """
+        self._wait(Name=crawler_name)
+
+
+class DataLakeMetricsDeliveredWaiter(CustomWaiter):
+    """
+    Subclass of the base custom waiter class.
+    Wait for the expected directory being created in the S3 bucket.
+    """
+    def __init__(self, client: botocore.client):
+        """
+        Initialize the waiter.
+
+        :param client: Boto3 client to use.
+        """
+        super().__init__(
+            'DataLakeMetricsDelivered',
+            'ListObjectsV2',
+            'KeyCount > `0`',
+            {True: WaitState.SUCCESS},
+            client)
+
+    def wait(self, bucket_name, prefix):
+        """
+        Wait for the expected directory being created.
+
+        :param bucket_name: Name of the S3 bucket.
+        :param prefix: Name of the expected directory prefix.
+        """
+        self._wait(Bucket=bucket_name, Prefix=prefix)
+
+
+class CloudWatchMetricsDeliveredWaiter(CustomWaiter):
+    """
+    Subclass of the base custom waiter class.
+    Wait for the expected metrics being delivered to CloudWatch.
+    """
+    def __init__(self, client: botocore.client):
+        """
+        Initialize the waiter.
+
+        :param client: Boto3 client to use.
+        """
+        super().__init__(
+            'CloudWatchMetricsDelivered',
+            'GetMetricStatistics',
+            'length(Datapoints) > `0`',
+            {True: WaitState.SUCCESS},
+            client)
+
+    def wait(self, namespace, metrics_name, dimensions, start_time):
+        """
+        Wait for the expected metrics being delivered.
+
+        :param namespace: Namespace of the metrics.
+        :param metrics_name: Name of the metrics.
+        :param dimensions: Dimensions of the metrics.
+        :param start_time: Start time for generating the metrics.
+        """
+        self._wait(
+            Namespace=namespace,
+            MetricName=metrics_name,
+            Dimensions=dimensions,
+            StartTime=start_time,
+            EndTime=start_time + timedelta(0, self.timeout),
+            Period=60,
+            Statistics=[
+                'SampleCount'
+            ],
+            Unit='Count'
+        )

AutomatedTesting/Gem/PythonTests/AWS/client_auth/aws_client_auth_automation_test.py

@@ -40,7 +40,7 @@ class TestAWSClientAuthWindows(object):
     Test class to verify AWS Client Auth gem features on Windows.
     """
 
-    @pytest.mark.parametrize('level', ['AWS/ClientAuth'])
+    @pytest.mark.parametrize('level', ['levels/aws/clientauth/clientauth.spawnable'])
     def test_anonymous_credentials(self,
                                    level: str,
                                    launcher: pytest.fixture,
@@ -72,7 +72,7 @@ class TestAWSClientAuthWindows(object):
             )
             assert result, 'Anonymous credentials fetched successfully.'
     
-    @pytest.mark.parametrize('level', ['AWS/ClientAuth'])
+    @pytest.mark.parametrize('level', ['levels/aws/clientauth/clientauth.spawnable'])
     def test_anonymous_credentials_no_global_accountid(self,
                                                        level: str,
                                                        launcher: pytest.fixture,
@@ -140,7 +140,7 @@ class TestAWSClientAuthWindows(object):
         except cognito_idp.exceptions.UserNotFoundException:
             pass
 
-        launcher.args = ['+LoadLevel', 'AWS/ClientAuthPasswordSignUp']
+        launcher.args = ['+LoadLevel', 'levels/aws/clientauthpasswordsignup/clientauthpasswordsignup.spawnable']
         launcher.args.extend(['-rhi=null'])
 
         with launcher.start(launch_ap=False):
@@ -158,7 +158,7 @@ class TestAWSClientAuthWindows(object):
             Username='test1'
         )
 
-        launcher.args = ['+LoadLevel', 'AWS/ClientAuthPasswordSignIn']
+        launcher.args = ['+LoadLevel', 'levels/aws/clientauthpasswordsignin/clientauthpasswordsignin.spawnable']
         launcher.args.extend(['-rhi=null'])
 
         with launcher.start(launch_ap=False):

AutomatedTesting/Gem/PythonTests/AWS/core/__init__.py

@@ -4,4 +4,3 @@ For complete copyright and license terms please see the LICENSE at the root of t
 
 SPDX-License-Identifier: Apache-2.0 OR MIT
 """
-

AutomatedTesting/Gem/PythonTests/AWS/core/test_aws_resource_interaction.py

@@ -84,7 +84,7 @@ def write_test_data_to_dynamodb_table(resource_mappings: pytest.fixture, aws_uti
 @pytest.mark.parametrize('session_name', [constants.SESSION_NAME])
 @pytest.mark.usefixtures('workspace')
 @pytest.mark.parametrize('project', ['AutomatedTesting'])
-@pytest.mark.parametrize('level', ['AWS/Core'])
+@pytest.mark.parametrize('level', ['levels/aws/core/core.spawnable'])
 @pytest.mark.usefixtures('resource_mappings')
 @pytest.mark.parametrize('resource_mappings_filename', [constants.AWS_RESOURCE_MAPPING_FILE_NAME])
 @pytest.mark.parametrize('stacks', [[f'{constants.AWS_PROJECT_NAME}-{AWS_CORE_FEATURE_NAME}',

AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Main.py

@@ -39,10 +39,6 @@ class TestAutomation(EditorTestSuite):
     class AtomEditorComponents_DirectionalLightAdded(EditorSharedTest):
         from Atom.tests import hydra_AtomEditorComponents_DirectionalLightAdded as test_module
 
-    @pytest.mark.test_case_id("C36525660")
-    class AtomEditorComponents_DisplayMapperAdded(EditorSharedTest):
-        from Atom.tests import hydra_AtomEditorComponents_DisplayMapperAdded as test_module
-
     @pytest.mark.test_case_id("C36525661")
     class AtomEditorComponents_EntityReferenceAdded(EditorSharedTest):
         from Atom.tests import hydra_AtomEditorComponents_EntityReferenceAdded as test_module

AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Sandbox.py

@@ -19,13 +19,6 @@ logger = logging.getLogger(__name__)
 TEST_DIRECTORY = os.path.join(os.path.dirname(__file__), "tests")
 
 
-class TestAtomEditorComponentsSandbox(object):
-
-    # It requires at least one test
-    def test_Dummy(self, request, editor, level, workspace, project, launcher_platform):
-        pass
-
-
 @pytest.mark.parametrize("project", ["AutomatedTesting"])
 @pytest.mark.parametrize("launcher_platform", ['windows_editor'])
 @pytest.mark.parametrize("level", ["auto_test"])
@@ -167,10 +160,17 @@ class TestAutomation(EditorTestSuite):
 
     enable_prefab_system = False
 
+    #this test is intermittently timing out without ever having executed. sandboxing while we investigate cause.
+    @pytest.mark.test_case_id("C36525660")
+    class AtomEditorComponents_DisplayMapperAdded(EditorSharedTest):
+        from Atom.tests import hydra_AtomEditorComponents_DisplayMapperAdded as test_module
+
+    # this test causes editor to crash when using slices. once automation transitions to prefabs it should pass
     @pytest.mark.test_case_id("C36529666")
     class AtomEditorComponentsLevel_DiffuseGlobalIlluminationAdded(EditorSharedTest):
         from Atom.tests import hydra_AtomEditorComponentsLevel_DiffuseGlobalIlluminationAdded as test_module
 
+    # this test causes editor to crash when using slices. once automation transitions to prefabs it should pass
     @pytest.mark.test_case_id("C36525660")
     class AtomEditorComponentsLevel_DisplayMapperAdded(EditorSharedTest):
         from Atom.tests import hydra_AtomEditorComponentsLevel_DisplayMapperAdded as test_module

AutomatedTesting/Gem/PythonTests/editor/EditorScripts/Menus_EditMenuOptions.py

@@ -40,11 +40,12 @@ def Menus_EditMenuOptions_Work():
         ("Toggle Pivot Location",),
         ("Reset Entity Transform",),
         ("Reset Manipulator",),
-        ("Reset Transform (Local)",),
-        ("Reset Transform (World)",),
         ("Hide Selection",),
         ("Show All",),
-        ("Modify", "Snap", "Snap angle"),
+        ("Lock Selection",),
+        ("Unlock All Entities",),
+        ("Modify", "Snap", "Angle snapping"),
+        ("Modify", "Snap", "Grid snapping"),
         ("Modify", "Transform Mode", "Move"),
         ("Modify", "Transform Mode", "Rotate"),
         ("Modify", "Transform Mode", "Scale"),

AutomatedTesting/Gem/PythonTests/editor/EditorScripts/Menus_ViewMenuOptions.py

@@ -39,7 +39,8 @@ def Menus_ViewMenuOptions_Work():
         ("Viewport", "Go to Location"),
         ("Viewport", "Remember Location"),
         ("Viewport", "Switch Camera"),
-        ("Viewport", "Show/Hide Helpers"),
+        ("Viewport", "Show Helpers"),
+        ("Viewport", "Show Icons"),
         ("Refresh Style",),
     ]
 

AutomatedTesting/Levels/AWS/ClientAuth/ClientAuth.ly

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:19f2c4454bb395cdc0a36d1e45e6a384bbd23037af1a2fb93e088ecfa0f10e5b
-size 9343

AutomatedTesting/Levels/AWS/ClientAuth/ClientAuth.prefab

@@ -0,0 +1,620 @@
+{
+    "ContainerEntity": {
+        "Id": "Entity_[1146574390643]",
+        "Name": "Level",
+        "Components": {
+            "Component_[10641544592923449938]": {
+                "$type": "EditorInspectorComponent",
+                "Id": 10641544592923449938
+            },
+            "Component_[12039882709170782873]": {
+                "$type": "EditorOnlyEntityComponent",
+                "Id": 12039882709170782873
+            },
+            "Component_[12265484671603697631]": {
+                "$type": "EditorPendingCompositionComponent",
+                "Id": 12265484671603697631
+            },
+            "Component_[14126657869720434043]": {
+                "$type": "EditorEntitySortComponent",
+                "Id": 14126657869720434043,
+                "Child Entity Order": [
+                    "Entity_[1176639161715]",
+                    "Entity_[2670735447885]",
+                    "Entity_[2670735447885]"
+                ]
+            },
+            "Component_[15230859088967841193]": {
+                "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                "Id": 15230859088967841193,
+                "Parent Entity": ""
+            },
+            "Component_[16239496886950819870]": {
+                "$type": "EditorDisabledCompositionComponent",
+                "Id": 16239496886950819870
+            },
+            "Component_[5688118765544765547]": {
+                "$type": "EditorEntityIconComponent",
+                "Id": 5688118765544765547
+            },
+            "Component_[6545738857812235305]": {
+                "$type": "SelectionComponent",
+                "Id": 6545738857812235305
+            },
+            "Component_[7247035804068349658]": {
+                "$type": "EditorPrefabComponent",
+                "Id": 7247035804068349658
+            },
+            "Component_[9307224322037797205]": {
+                "$type": "EditorLockComponent",
+                "Id": 9307224322037797205
+            },
+            "Component_[9562516168917670048]": {
+                "$type": "EditorVisibilityComponent",
+                "Id": 9562516168917670048
+            }
+        }
+    },
+    "Entities": {
+        "Entity_[1155164325235]": {
+            "Id": "Entity_[1155164325235]",
+            "Name": "Sun",
+            "Components": {
+                "Component_[10440557478882592717]": {
+                    "$type": "SelectionComponent",
+                    "Id": 10440557478882592717
+                },
+                "Component_[13620450453324765907]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 13620450453324765907
+                },
+                "Component_[2134313378593666258]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 2134313378593666258
+                },
+                "Component_[234010807770404186]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 234010807770404186
+                },
+                "Component_[2970359110423865725]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 2970359110423865725
+                },
+                "Component_[3722854130373041803]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 3722854130373041803
+                },
+                "Component_[5992533738676323195]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 5992533738676323195
+                },
+                "Component_[7378860763541895402]": {
+                    "$type": "AZ::Render::EditorDirectionalLightComponent",
+                    "Id": 7378860763541895402,
+                    "Controller": {
+                        "Configuration": {
+                            "Intensity": 1.0,
+                            "CameraEntityId": "",
+                            "ShadowFilterMethod": 1
+                        }
+                    }
+                },
+                "Component_[7892834440890947578]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 7892834440890947578,
+                    "Parent Entity": "Entity_[1176639161715]",
+                    "Transform Data": {
+                        "Translate": [
+                            0.0,
+                            0.0,
+                            13.487043380737305
+                        ],
+                        "Rotate": [
+                            -76.13099670410156,
+                            -0.847000002861023,
+                            -15.8100004196167
+                        ]
+                    }
+                },
+                "Component_[8599729549570828259]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 8599729549570828259
+                },
+                "Component_[952797371922080273]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 952797371922080273
+                }
+            }
+        },
+        "Entity_[1159459292531]": {
+            "Id": "Entity_[1159459292531]",
+            "Name": "Ground",
+            "Components": {
+                "Component_[11701138785793981042]": {
+                    "$type": "SelectionComponent",
+                    "Id": 11701138785793981042
+                },
+                "Component_[12260880513256986252]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 12260880513256986252
+                },
+                "Component_[13711420870643673468]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 13711420870643673468
+                },
+                "Component_[138002849734991713]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 138002849734991713
+                },
+                "Component_[16578565737331764849]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 16578565737331764849,
+                    "Parent Entity": "Entity_[1176639161715]"
+                },
+                "Component_[16919232076966545697]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 16919232076966545697
+                },
+                "Component_[5182430712893438093]": {
+                    "$type": "EditorMaterialComponent",
+                    "Id": 5182430712893438093
+                },
+                "Component_[5675108321710651991]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 5675108321710651991,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{0CD745C0-6AA8-569A-A68A-73A3270986C4}",
+                                    "subId": 277889906
+                                },
+                                "assetHint": "objects/groudplane/groundplane_512x512m.azmodel"
+                            }
+                        }
+                    }
+                },
+                "Component_[5681893399601237518]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 5681893399601237518
+                },
+                "Component_[592692962543397545]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 592692962543397545
+                },
+                "Component_[7090012899106946164]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 7090012899106946164
+                },
+                "Component_[9410832619875640998]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 9410832619875640998
+                }
+            }
+        },
+        "Entity_[1163754259827]": {
+            "Id": "Entity_[1163754259827]",
+            "Name": "Camera",
+            "Components": {
+                "Component_[11895140916889160460]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 11895140916889160460
+                },
+                "Component_[16880285896855930892]": {
+                    "$type": "{CA11DA46-29FF-4083-B5F6-E02C3A8C3A3D} EditorCameraComponent",
+                    "Id": 16880285896855930892,
+                    "Controller": {
+                        "Configuration": {
+                            "Field of View": 55.0,
+                            "EditorEntityId": 6861302815203973165
+                        }
+                    }
+                },
+                "Component_[17187464423780271193]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 17187464423780271193
+                },
+                "Component_[17495696818315413311]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 17495696818315413311
+                },
+                "Component_[18086214374043522055]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 18086214374043522055,
+                    "Parent Entity": "Entity_[1176639161715]",
+                    "Transform Data": {
+                        "Translate": [
+                            -2.3000001907348633,
+                            -3.9368600845336914,
+                            1.0
+                        ],
+                        "Rotate": [
+                            -2.050307512283325,
+                            1.9552897214889526,
+                            -43.623355865478516
+                        ]
+                    }
+                },
+                "Component_[18387556550380114975]": {
+                    "$type": "SelectionComponent",
+                    "Id": 18387556550380114975
+                },
+                "Component_[2654521436129313160]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 2654521436129313160
+                },
+                "Component_[5265045084611556958]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 5265045084611556958
+                },
+                "Component_[7169798125182238623]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 7169798125182238623
+                },
+                "Component_[7255796294953281766]": {
+                    "$type": "GenericComponentWrapper",
+                    "Id": 7255796294953281766,
+                    "m_template": {
+                        "$type": "FlyCameraInputComponent"
+                    }
+                },
+                "Component_[8866210352157164042]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 8866210352157164042
+                },
+                "Component_[9129253381063760879]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 9129253381063760879
+                }
+            }
+        },
+        "Entity_[1168049227123]": {
+            "Id": "Entity_[1168049227123]",
+            "Name": "Grid",
+            "Components": {
+                "Component_[11443347433215807130]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 11443347433215807130
+                },
+                "Component_[11779275529534764488]": {
+                    "$type": "SelectionComponent",
+                    "Id": 11779275529534764488
+                },
+                "Component_[14249419413039427459]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 14249419413039427459
+                },
+                "Component_[15448581635946161318]": {
+                    "$type": "AZ::Render::EditorGridComponent",
+                    "Id": 15448581635946161318,
+                    "Controller": {
+                        "Configuration": {
+                            "primarySpacing": 4.0,
+                            "primaryColor": [
+                                0.501960813999176,
+                                0.501960813999176,
+                                0.501960813999176
+                            ],
+                            "secondarySpacing": 0.5,
+                            "secondaryColor": [
+                                0.250980406999588,
+                                0.250980406999588,
+                                0.250980406999588
+                            ]
+                        }
+                    }
+                },
+                "Component_[1843303322527297409]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 1843303322527297409
+                },
+                "Component_[380249072065273654]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 380249072065273654,
+                    "Parent Entity": "Entity_[1176639161715]"
+                },
+                "Component_[7476660583684339787]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 7476660583684339787
+                },
+                "Component_[7557626501215118375]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 7557626501215118375
+                },
+                "Component_[7984048488947365511]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 7984048488947365511
+                },
+                "Component_[8118181039276487398]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 8118181039276487398
+                },
+                "Component_[9189909764215270515]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 9189909764215270515
+                }
+            }
+        },
+        "Entity_[1172344194419]": {
+            "Id": "Entity_[1172344194419]",
+            "Name": "Shader Ball",
+            "Components": {
+                "Component_[10789351944715265527]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 10789351944715265527
+                },
+                "Component_[12037033284781049225]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 12037033284781049225
+                },
+                "Component_[13759153306105970079]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 13759153306105970079
+                },
+                "Component_[14135560884830586279]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 14135560884830586279
+                },
+                "Component_[16247165675903986673]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 16247165675903986673
+                },
+                "Component_[18082433625958885247]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 18082433625958885247
+                },
+                "Component_[6472623349872972660]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 6472623349872972660,
+                    "Parent Entity": "Entity_[1176639161715]",
+                    "Transform Data": {
+                        "Rotate": [
+                            0.0,
+                            0.10000000149011612,
+                            180.0
+                        ]
+                    }
+                },
+                "Component_[6495255223970673916]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 6495255223970673916,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{FD340C30-755C-5911-92A3-19A3F7A77931}",
+                                    "subId": 281415304
+                                },
+                                "assetHint": "objects/shaderball/shaderball_default_1m.azmodel"
+                            }
+                        }
+                    }
+                },
+                "Component_[8056625192494070973]": {
+                    "$type": "SelectionComponent",
+                    "Id": 8056625192494070973
+                },
+                "Component_[8550141614185782969]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 8550141614185782969
+                },
+                "Component_[9439770997198325425]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 9439770997198325425
+                }
+            }
+        },
+        "Entity_[1176639161715]": {
+            "Id": "Entity_[1176639161715]",
+            "Name": "Atom Default Environment",
+            "Components": {
+                "Component_[10757302973393310045]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 10757302973393310045,
+                    "Parent Entity": "Entity_[1146574390643]"
+                },
+                "Component_[14505817420424255464]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 14505817420424255464,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 10757302973393310045
+                        }
+                    ]
+                },
+                "Component_[14988041764659020032]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 14988041764659020032
+                },
+                "Component_[15808690248755038124]": {
+                    "$type": "SelectionComponent",
+                    "Id": 15808690248755038124
+                },
+                "Component_[15900837685796817138]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 15900837685796817138
+                },
+                "Component_[3298767348226484884]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 3298767348226484884
+                },
+                "Component_[4076975109609220594]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 4076975109609220594
+                },
+                "Component_[5679760548946028854]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 5679760548946028854
+                },
+                "Component_[5855590796136709437]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 5855590796136709437,
+                    "Child Entity Order": [
+                        "Entity_[1155164325235]",
+                        "Entity_[1180934129011]",
+                        "Entity_[1172344194419]",
+                        "Entity_[1168049227123]",
+                        "Entity_[1163754259827]",
+                        "Entity_[1159459292531]"
+                    ]
+                },
+                "Component_[9277695270015777859]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 9277695270015777859
+                }
+            }
+        },
+        "Entity_[1180934129011]": {
+            "Id": "Entity_[1180934129011]",
+            "Name": "Global Sky",
+            "Components": {
+                "Component_[11231930600558681245]": {
+                    "$type": "AZ::Render::EditorHDRiSkyboxComponent",
+                    "Id": 11231930600558681245,
+                    "Controller": {
+                        "Configuration": {
+                            "CubemapAsset": {
+                                "assetId": {
+                                    "guid": "{215E47FD-D181-5832-B1AB-91673ABF6399}",
+                                    "subId": 1000
+                                },
+                                "assetHint": "lightingpresets/highcontrast/goegap_4k_skyboxcm.exr.streamingimage"
+                            }
+                        }
+                    }
+                },
+                "Component_[11980494120202836095]": {
+                    "$type": "SelectionComponent",
+                    "Id": 11980494120202836095
+                },
+                "Component_[1428633914413949476]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 1428633914413949476
+                },
+                "Component_[14936200426671614999]": {
+                    "$type": "AZ::Render::EditorImageBasedLightComponent",
+                    "Id": 14936200426671614999,
+                    "Controller": {
+                        "Configuration": {
+                            "diffuseImageAsset": {
+                                "assetId": {
+                                    "guid": "{3FD09945-D0F2-55C8-B9AF-B2FD421FE3BE}",
+                                    "subId": 3000
+                                },
+                                "assetHint": "lightingpresets/highcontrast/goegap_4k_iblglobalcm_ibldiffuse.exr.streamingimage"
+                            },
+                            "specularImageAsset": {
+                                "assetId": {
+                                    "guid": "{3FD09945-D0F2-55C8-B9AF-B2FD421FE3BE}",
+                                    "subId": 2000
+                                },
+                                "assetHint": "lightingpresets/highcontrast/goegap_4k_iblglobalcm_iblspecular.exr.streamingimage"
+                            }
+                        }
+                    }
+                },
+                "Component_[14994774102579326069]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 14994774102579326069
+                },
+                "Component_[15417479889044493340]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 15417479889044493340
+                },
+                "Component_[15826613364991382688]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 15826613364991382688
+                },
+                "Component_[1665003113283562343]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 1665003113283562343
+                },
+                "Component_[3704934735944502280]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 3704934735944502280
+                },
+                "Component_[5698542331457326479]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 5698542331457326479
+                },
+                "Component_[6644513399057217122]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 6644513399057217122,
+                    "Parent Entity": "Entity_[1176639161715]"
+                },
+                "Component_[931091830724002070]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 931091830724002070
+                }
+            }
+        },
+        "Entity_[2670735447885]": {
+            "Id": "Entity_[2670735447885]",
+            "Name": "AnonymousAuthorization",
+            "Components": {
+                "Component_[11400228652398928245]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 11400228652398928245
+                },
+                "Component_[15542812360906781451]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 15542812360906781451,
+                    "Parent Entity": "Entity_[1146574390643]",
+                    "Transform Data": {
+                        "Translate": [
+                            0.0,
+                            0.10000038146972656,
+                            4.005923748016357
+                        ]
+                    }
+                },
+                "Component_[16858205397479531670]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 16858205397479531670
+                },
+                "Component_[1921474395300693283]": {
+                    "$type": "EditorScriptCanvasComponent",
+                    "Id": 1921474395300693283,
+                    "m_name": "ConitoAnonymousAuthorization.scriptcanvas",
+                    "runtimeDataIsValid": true,
+                    "runtimeDataOverrides": {
+                        "source": {
+                            "id": "{C0B0CEBA-064E-580F-AD81-CFE8CE0D61B1}"
+                        }
+                    },
+                    "sourceHandle": {
+                        "id": "{C0B0CEBA-064E-580F-AD81-CFE8CE0D61B1}"
+                    }
+                },
+                "Component_[2312432053711106201]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 2312432053711106201
+                },
+                "Component_[4066858233846929269]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 4066858233846929269
+                },
+                "Component_[6542133807409587028]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 6542133807409587028
+                },
+                "Component_[7002965736546436267]": {
+                    "$type": "SelectionComponent",
+                    "Id": 7002965736546436267
+                },
+                "Component_[7455250879152263787]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 7455250879152263787
+                },
+                "Component_[8081535907930415421]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 8081535907930415421
+                },
+                "Component_[9630473919092479415]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 9630473919092479415
+                }
+            }
+        }
+    }
+}

AutomatedTesting/Levels/AWS/ClientAuth/filelist.xml

@@ -1,6 +0,0 @@
-<download name="ClientAuth" type="Map">
- <index src="filelist.xml" dest="filelist.xml"/>
- <files>
-  <file src="level.pak" dest="level.pak" size="E1A" md5="fecbc160ebc2186184504482e3e2eba3"/>
- </files>
-</download>

AutomatedTesting/Levels/AWS/ClientAuth/level.pak

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8a674e05824e5ceec13a0487b318923568710bc8269e5be84adad59c495a7ceb
-size 3610

AutomatedTesting/Levels/AWS/ClientAuthPasswordSignIn/ClientAuthPasswordSignIn.ly

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a1c0b621525b8e88c3775ea4c60c2197d1e1b060ace9bad9d6efcb0532817e44
-size 9356

AutomatedTesting/Levels/AWS/ClientAuthPasswordSignIn/ClientAuthPasswordSignIn.prefab

@@ -0,0 +1,620 @@
+{
+    "ContainerEntity": {
+        "Id": "Entity_[1146574390643]",
+        "Name": "Level",
+        "Components": {
+            "Component_[10641544592923449938]": {
+                "$type": "EditorInspectorComponent",
+                "Id": 10641544592923449938
+            },
+            "Component_[12039882709170782873]": {
+                "$type": "EditorOnlyEntityComponent",
+                "Id": 12039882709170782873
+            },
+            "Component_[12265484671603697631]": {
+                "$type": "EditorPendingCompositionComponent",
+                "Id": 12265484671603697631
+            },
+            "Component_[14126657869720434043]": {
+                "$type": "EditorEntitySortComponent",
+                "Id": 14126657869720434043,
+                "Child Entity Order": [
+                    "Entity_[1176639161715]",
+                    "Entity_[3263440934733]",
+                    "Entity_[3263440934733]"
+                ]
+            },
+            "Component_[15230859088967841193]": {
+                "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                "Id": 15230859088967841193,
+                "Parent Entity": ""
+            },
+            "Component_[16239496886950819870]": {
+                "$type": "EditorDisabledCompositionComponent",
+                "Id": 16239496886950819870
+            },
+            "Component_[5688118765544765547]": {
+                "$type": "EditorEntityIconComponent",
+                "Id": 5688118765544765547
+            },
+            "Component_[6545738857812235305]": {
+                "$type": "SelectionComponent",
+                "Id": 6545738857812235305
+            },
+            "Component_[7247035804068349658]": {
+                "$type": "EditorPrefabComponent",
+                "Id": 7247035804068349658
+            },
+            "Component_[9307224322037797205]": {
+                "$type": "EditorLockComponent",
+                "Id": 9307224322037797205
+            },
+            "Component_[9562516168917670048]": {
+                "$type": "EditorVisibilityComponent",
+                "Id": 9562516168917670048
+            }
+        }
+    },
+    "Entities": {
+        "Entity_[1155164325235]": {
+            "Id": "Entity_[1155164325235]",
+            "Name": "Sun",
+            "Components": {
+                "Component_[10440557478882592717]": {
+                    "$type": "SelectionComponent",
+                    "Id": 10440557478882592717
+                },
+                "Component_[13620450453324765907]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 13620450453324765907
+                },
+                "Component_[2134313378593666258]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 2134313378593666258
+                },
+                "Component_[234010807770404186]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 234010807770404186
+                },
+                "Component_[2970359110423865725]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 2970359110423865725
+                },
+                "Component_[3722854130373041803]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 3722854130373041803
+                },
+                "Component_[5992533738676323195]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 5992533738676323195
+                },
+                "Component_[7378860763541895402]": {
+                    "$type": "AZ::Render::EditorDirectionalLightComponent",
+                    "Id": 7378860763541895402,
+                    "Controller": {
+                        "Configuration": {
+                            "Intensity": 1.0,
+                            "CameraEntityId": "",
+                            "ShadowFilterMethod": 1
+                        }
+                    }
+                },
+                "Component_[7892834440890947578]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 7892834440890947578,
+                    "Parent Entity": "Entity_[1176639161715]",
+                    "Transform Data": {
+                        "Translate": [
+                            0.0,
+                            0.0,
+                            13.487043380737305
+                        ],
+                        "Rotate": [
+                            -76.13099670410156,
+                            -0.847000002861023,
+                            -15.8100004196167
+                        ]
+                    }
+                },
+                "Component_[8599729549570828259]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 8599729549570828259
+                },
+                "Component_[952797371922080273]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 952797371922080273
+                }
+            }
+        },
+        "Entity_[1159459292531]": {
+            "Id": "Entity_[1159459292531]",
+            "Name": "Ground",
+            "Components": {
+                "Component_[11701138785793981042]": {
+                    "$type": "SelectionComponent",
+                    "Id": 11701138785793981042
+                },
+                "Component_[12260880513256986252]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 12260880513256986252
+                },
+                "Component_[13711420870643673468]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 13711420870643673468
+                },
+                "Component_[138002849734991713]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 138002849734991713
+                },
+                "Component_[16578565737331764849]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 16578565737331764849,
+                    "Parent Entity": "Entity_[1176639161715]"
+                },
+                "Component_[16919232076966545697]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 16919232076966545697
+                },
+                "Component_[5182430712893438093]": {
+                    "$type": "EditorMaterialComponent",
+                    "Id": 5182430712893438093
+                },
+                "Component_[5675108321710651991]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 5675108321710651991,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{0CD745C0-6AA8-569A-A68A-73A3270986C4}",
+                                    "subId": 277889906
+                                },
+                                "assetHint": "objects/groudplane/groundplane_512x512m.azmodel"
+                            }
+                        }
+                    }
+                },
+                "Component_[5681893399601237518]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 5681893399601237518
+                },
+                "Component_[592692962543397545]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 592692962543397545
+                },
+                "Component_[7090012899106946164]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 7090012899106946164
+                },
+                "Component_[9410832619875640998]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 9410832619875640998
+                }
+            }
+        },
+        "Entity_[1163754259827]": {
+            "Id": "Entity_[1163754259827]",
+            "Name": "Camera",
+            "Components": {
+                "Component_[11895140916889160460]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 11895140916889160460
+                },
+                "Component_[16880285896855930892]": {
+                    "$type": "{CA11DA46-29FF-4083-B5F6-E02C3A8C3A3D} EditorCameraComponent",
+                    "Id": 16880285896855930892,
+                    "Controller": {
+                        "Configuration": {
+                            "Field of View": 55.0,
+                            "EditorEntityId": 6861302815203973165
+                        }
+                    }
+                },
+                "Component_[17187464423780271193]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 17187464423780271193
+                },
+                "Component_[17495696818315413311]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 17495696818315413311
+                },
+                "Component_[18086214374043522055]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 18086214374043522055,
+                    "Parent Entity": "Entity_[1176639161715]",
+                    "Transform Data": {
+                        "Translate": [
+                            -2.3000001907348633,
+                            -3.9368600845336914,
+                            1.0
+                        ],
+                        "Rotate": [
+                            -2.050307512283325,
+                            1.9552897214889526,
+                            -43.623355865478516
+                        ]
+                    }
+                },
+                "Component_[18387556550380114975]": {
+                    "$type": "SelectionComponent",
+                    "Id": 18387556550380114975
+                },
+                "Component_[2654521436129313160]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 2654521436129313160
+                },
+                "Component_[5265045084611556958]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 5265045084611556958
+                },
+                "Component_[7169798125182238623]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 7169798125182238623
+                },
+                "Component_[7255796294953281766]": {
+                    "$type": "GenericComponentWrapper",
+                    "Id": 7255796294953281766,
+                    "m_template": {
+                        "$type": "FlyCameraInputComponent"
+                    }
+                },
+                "Component_[8866210352157164042]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 8866210352157164042
+                },
+                "Component_[9129253381063760879]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 9129253381063760879
+                }
+            }
+        },
+        "Entity_[1168049227123]": {
+            "Id": "Entity_[1168049227123]",
+            "Name": "Grid",
+            "Components": {
+                "Component_[11443347433215807130]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 11443347433215807130
+                },
+                "Component_[11779275529534764488]": {
+                    "$type": "SelectionComponent",
+                    "Id": 11779275529534764488
+                },
+                "Component_[14249419413039427459]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 14249419413039427459
+                },
+                "Component_[15448581635946161318]": {
+                    "$type": "AZ::Render::EditorGridComponent",
+                    "Id": 15448581635946161318,
+                    "Controller": {
+                        "Configuration": {
+                            "primarySpacing": 4.0,
+                            "primaryColor": [
+                                0.501960813999176,
+                                0.501960813999176,
+                                0.501960813999176
+                            ],
+                            "secondarySpacing": 0.5,
+                            "secondaryColor": [
+                                0.250980406999588,
+                                0.250980406999588,
+                                0.250980406999588
+                            ]
+                        }
+                    }
+                },
+                "Component_[1843303322527297409]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 1843303322527297409
+                },
+                "Component_[380249072065273654]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 380249072065273654,
+                    "Parent Entity": "Entity_[1176639161715]"
+                },
+                "Component_[7476660583684339787]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 7476660583684339787
+                },
+                "Component_[7557626501215118375]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 7557626501215118375
+                },
+                "Component_[7984048488947365511]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 7984048488947365511
+                },
+                "Component_[8118181039276487398]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 8118181039276487398
+                },
+                "Component_[9189909764215270515]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 9189909764215270515
+                }
+            }
+        },
+        "Entity_[1172344194419]": {
+            "Id": "Entity_[1172344194419]",
+            "Name": "Shader Ball",
+            "Components": {
+                "Component_[10789351944715265527]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 10789351944715265527
+                },
+                "Component_[12037033284781049225]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 12037033284781049225
+                },
+                "Component_[13759153306105970079]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 13759153306105970079
+                },
+                "Component_[14135560884830586279]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 14135560884830586279
+                },
+                "Component_[16247165675903986673]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 16247165675903986673
+                },
+                "Component_[18082433625958885247]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 18082433625958885247
+                },
+                "Component_[6472623349872972660]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 6472623349872972660,
+                    "Parent Entity": "Entity_[1176639161715]",
+                    "Transform Data": {
+                        "Rotate": [
+                            0.0,
+                            0.10000000149011612,
+                            180.0
+                        ]
+                    }
+                },
+                "Component_[6495255223970673916]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 6495255223970673916,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{FD340C30-755C-5911-92A3-19A3F7A77931}",
+                                    "subId": 281415304
+                                },
+                                "assetHint": "objects/shaderball/shaderball_default_1m.azmodel"
+                            }
+                        }
+                    }
+                },
+                "Component_[8056625192494070973]": {
+                    "$type": "SelectionComponent",
+                    "Id": 8056625192494070973
+                },
+                "Component_[8550141614185782969]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 8550141614185782969
+                },
+                "Component_[9439770997198325425]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 9439770997198325425
+                }
+            }
+        },
+        "Entity_[1176639161715]": {
+            "Id": "Entity_[1176639161715]",
+            "Name": "Atom Default Environment",
+            "Components": {
+                "Component_[10757302973393310045]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 10757302973393310045,
+                    "Parent Entity": "Entity_[1146574390643]"
+                },
+                "Component_[14505817420424255464]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 14505817420424255464,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 10757302973393310045
+                        }
+                    ]
+                },
+                "Component_[14988041764659020032]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 14988041764659020032
+                },
+                "Component_[15808690248755038124]": {
+                    "$type": "SelectionComponent",
+                    "Id": 15808690248755038124
+                },
+                "Component_[15900837685796817138]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 15900837685796817138
+                },
+                "Component_[3298767348226484884]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 3298767348226484884
+                },
+                "Component_[4076975109609220594]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 4076975109609220594
+                },
+                "Component_[5679760548946028854]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 5679760548946028854
+                },
+                "Component_[5855590796136709437]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 5855590796136709437,
+                    "Child Entity Order": [
+                        "Entity_[1155164325235]",
+                        "Entity_[1180934129011]",
+                        "Entity_[1172344194419]",
+                        "Entity_[1168049227123]",
+                        "Entity_[1163754259827]",
+                        "Entity_[1159459292531]"
+                    ]
+                },
+                "Component_[9277695270015777859]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 9277695270015777859
+                }
+            }
+        },
+        "Entity_[1180934129011]": {
+            "Id": "Entity_[1180934129011]",
+            "Name": "Global Sky",
+            "Components": {
+                "Component_[11231930600558681245]": {
+                    "$type": "AZ::Render::EditorHDRiSkyboxComponent",
+                    "Id": 11231930600558681245,
+                    "Controller": {
+                        "Configuration": {
+                            "CubemapAsset": {
+                                "assetId": {
+                                    "guid": "{215E47FD-D181-5832-B1AB-91673ABF6399}",
+                                    "subId": 1000
+                                },
+                                "assetHint": "lightingpresets/highcontrast/goegap_4k_skyboxcm.exr.streamingimage"
+                            }
+                        }
+                    }
+                },
+                "Component_[11980494120202836095]": {
+                    "$type": "SelectionComponent",
+                    "Id": 11980494120202836095
+                },
+                "Component_[1428633914413949476]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 1428633914413949476
+                },
+                "Component_[14936200426671614999]": {
+                    "$type": "AZ::Render::EditorImageBasedLightComponent",
+                    "Id": 14936200426671614999,
+                    "Controller": {
+                        "Configuration": {
+                            "diffuseImageAsset": {
+                                "assetId": {
+                                    "guid": "{3FD09945-D0F2-55C8-B9AF-B2FD421FE3BE}",
+                                    "subId": 3000
+                                },
+                                "assetHint": "lightingpresets/highcontrast/goegap_4k_iblglobalcm_ibldiffuse.exr.streamingimage"
+                            },
+                            "specularImageAsset": {
+                                "assetId": {
+                                    "guid": "{3FD09945-D0F2-55C8-B9AF-B2FD421FE3BE}",
+                                    "subId": 2000
+                                },
+                                "assetHint": "lightingpresets/highcontrast/goegap_4k_iblglobalcm_iblspecular.exr.streamingimage"
+                            }
+                        }
+                    }
+                },
+                "Component_[14994774102579326069]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 14994774102579326069
+                },
+                "Component_[15417479889044493340]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 15417479889044493340
+                },
+                "Component_[15826613364991382688]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 15826613364991382688
+                },
+                "Component_[1665003113283562343]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 1665003113283562343
+                },
+                "Component_[3704934735944502280]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 3704934735944502280
+                },
+                "Component_[5698542331457326479]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 5698542331457326479
+                },
+                "Component_[6644513399057217122]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 6644513399057217122,
+                    "Parent Entity": "Entity_[1176639161715]"
+                },
+                "Component_[931091830724002070]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 931091830724002070
+                }
+            }
+        },
+        "Entity_[3263440934733]": {
+            "Id": "Entity_[3263440934733]",
+            "Name": "Auth",
+            "Components": {
+                "Component_[10677660472305013611]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 10677660472305013611
+                },
+                "Component_[12020966173483420539]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 12020966173483420539
+                },
+                "Component_[1395011275436594572]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 1395011275436594572
+                },
+                "Component_[14204408480276164321]": {
+                    "$type": "EditorScriptCanvasComponent",
+                    "Id": 14204408480276164321,
+                    "m_name": "PasswordSignIn.scriptcanvas",
+                    "runtimeDataIsValid": true,
+                    "runtimeDataOverrides": {
+                        "source": {
+                            "id": "{DA0FCA2B-66E4-575B-802E-BA93F35690C1}"
+                        }
+                    },
+                    "sourceHandle": {
+                        "id": "{DA0FCA2B-66E4-575B-802E-BA93F35690C1}"
+                    }
+                },
+                "Component_[15510129631063791276]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 15510129631063791276
+                },
+                "Component_[2829815269827202953]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 2829815269827202953
+                },
+                "Component_[4152540778425032559]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 4152540778425032559,
+                    "Parent Entity": "Entity_[1146574390643]",
+                    "Transform Data": {
+                        "Translate": [
+                            0.0,
+                            0.10000038146972656,
+                            4.005923748016357
+                        ]
+                    }
+                },
+                "Component_[4562090268412258507]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 4562090268412258507
+                },
+                "Component_[4826060551136971267]": {
+                    "$type": "SelectionComponent",
+                    "Id": 4826060551136971267
+                },
+                "Component_[8974703175361704047]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 8974703175361704047
+                },
+                "Component_[9513341577149946975]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 9513341577149946975
+                }
+            }
+        }
+    }
+}

AutomatedTesting/Levels/AWS/ClientAuthPasswordSignIn/filelist.xml

@@ -1,6 +0,0 @@
-<download name="ClientAuthPasswordSignIn" type="Map">
- <index src="filelist.xml" dest="filelist.xml"/>
- <files>
-  <file src="level.pak" dest="level.pak" size="E53" md5="12728d49c7efe0c8e83e3651a1d13ca6"/>
- </files>
-</download>

AutomatedTesting/Levels/AWS/ClientAuthPasswordSignIn/level.pak

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f318a1787069385de291660f79e350cea2ca2c3ef3b5e0576686066bd9c49395
-size 3667

AutomatedTesting/Levels/AWS/ClientAuthPasswordSignUp/ClientAuthPasswordSignUp.ly

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:afc5d665128738e6bea09e78a16ee38acc923a8ecefff90d987858ce72c395fa
-size 9360

AutomatedTesting/Levels/AWS/ClientAuthPasswordSignUp/ClientAuthPasswordSignUp.prefab

@@ -0,0 +1,620 @@
+{
+    "ContainerEntity": {
+        "Id": "Entity_[1146574390643]",
+        "Name": "Level",
+        "Components": {
+            "Component_[10641544592923449938]": {
+                "$type": "EditorInspectorComponent",
+                "Id": 10641544592923449938
+            },
+            "Component_[12039882709170782873]": {
+                "$type": "EditorOnlyEntityComponent",
+                "Id": 12039882709170782873
+            },
+            "Component_[12265484671603697631]": {
+                "$type": "EditorPendingCompositionComponent",
+                "Id": 12265484671603697631
+            },
+            "Component_[14126657869720434043]": {
+                "$type": "EditorEntitySortComponent",
+                "Id": 14126657869720434043,
+                "Child Entity Order": [
+                    "Entity_[1176639161715]",
+                    "Entity_[3851851454285]",
+                    "Entity_[3851851454285]"
+                ]
+            },
+            "Component_[15230859088967841193]": {
+                "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                "Id": 15230859088967841193,
+                "Parent Entity": ""
+            },
+            "Component_[16239496886950819870]": {
+                "$type": "EditorDisabledCompositionComponent",
+                "Id": 16239496886950819870
+            },
+            "Component_[5688118765544765547]": {
+                "$type": "EditorEntityIconComponent",
+                "Id": 5688118765544765547
+            },
+            "Component_[6545738857812235305]": {
+                "$type": "SelectionComponent",
+                "Id": 6545738857812235305
+            },
+            "Component_[7247035804068349658]": {
+                "$type": "EditorPrefabComponent",
+                "Id": 7247035804068349658
+            },
+            "Component_[9307224322037797205]": {
+                "$type": "EditorLockComponent",
+                "Id": 9307224322037797205
+            },
+            "Component_[9562516168917670048]": {
+                "$type": "EditorVisibilityComponent",
+                "Id": 9562516168917670048
+            }
+        }
+    },
+    "Entities": {
+        "Entity_[1155164325235]": {
+            "Id": "Entity_[1155164325235]",
+            "Name": "Sun",
+            "Components": {
+                "Component_[10440557478882592717]": {
+                    "$type": "SelectionComponent",
+                    "Id": 10440557478882592717
+                },
+                "Component_[13620450453324765907]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 13620450453324765907
+                },
+                "Component_[2134313378593666258]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 2134313378593666258
+                },
+                "Component_[234010807770404186]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 234010807770404186
+                },
+                "Component_[2970359110423865725]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 2970359110423865725
+                },
+                "Component_[3722854130373041803]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 3722854130373041803
+                },
+                "Component_[5992533738676323195]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 5992533738676323195
+                },
+                "Component_[7378860763541895402]": {
+                    "$type": "AZ::Render::EditorDirectionalLightComponent",
+                    "Id": 7378860763541895402,
+                    "Controller": {
+                        "Configuration": {
+                            "Intensity": 1.0,
+                            "CameraEntityId": "",
+                            "ShadowFilterMethod": 1
+                        }
+                    }
+                },
+                "Component_[7892834440890947578]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 7892834440890947578,
+                    "Parent Entity": "Entity_[1176639161715]",
+                    "Transform Data": {
+                        "Translate": [
+                            0.0,
+                            0.0,
+                            13.487043380737305
+                        ],
+                        "Rotate": [
+                            -76.13099670410156,
+                            -0.847000002861023,
+                            -15.8100004196167
+                        ]
+                    }
+                },
+                "Component_[8599729549570828259]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 8599729549570828259
+                },
+                "Component_[952797371922080273]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 952797371922080273
+                }
+            }
+        },
+        "Entity_[1159459292531]": {
+            "Id": "Entity_[1159459292531]",
+            "Name": "Ground",
+            "Components": {
+                "Component_[11701138785793981042]": {
+                    "$type": "SelectionComponent",
+                    "Id": 11701138785793981042
+                },
+                "Component_[12260880513256986252]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 12260880513256986252
+                },
+                "Component_[13711420870643673468]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 13711420870643673468
+                },
+                "Component_[138002849734991713]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 138002849734991713
+                },
+                "Component_[16578565737331764849]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 16578565737331764849,
+                    "Parent Entity": "Entity_[1176639161715]"
+                },
+                "Component_[16919232076966545697]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 16919232076966545697
+                },
+                "Component_[5182430712893438093]": {
+                    "$type": "EditorMaterialComponent",
+                    "Id": 5182430712893438093
+                },
+                "Component_[5675108321710651991]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 5675108321710651991,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{0CD745C0-6AA8-569A-A68A-73A3270986C4}",
+                                    "subId": 277889906
+                                },
+                                "assetHint": "objects/groudplane/groundplane_512x512m.azmodel"
+                            }
+                        }
+                    }
+                },
+                "Component_[5681893399601237518]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 5681893399601237518
+                },
+                "Component_[592692962543397545]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 592692962543397545
+                },
+                "Component_[7090012899106946164]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 7090012899106946164
+                },
+                "Component_[9410832619875640998]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 9410832619875640998
+                }
+            }
+        },
+        "Entity_[1163754259827]": {
+            "Id": "Entity_[1163754259827]",
+            "Name": "Camera",
+            "Components": {
+                "Component_[11895140916889160460]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 11895140916889160460
+                },
+                "Component_[16880285896855930892]": {
+                    "$type": "{CA11DA46-29FF-4083-B5F6-E02C3A8C3A3D} EditorCameraComponent",
+                    "Id": 16880285896855930892,
+                    "Controller": {
+                        "Configuration": {
+                            "Field of View": 55.0,
+                            "EditorEntityId": 6861302815203973165
+                        }
+                    }
+                },
+                "Component_[17187464423780271193]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 17187464423780271193
+                },
+                "Component_[17495696818315413311]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 17495696818315413311
+                },
+                "Component_[18086214374043522055]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 18086214374043522055,
+                    "Parent Entity": "Entity_[1176639161715]",
+                    "Transform Data": {
+                        "Translate": [
+                            -2.3000001907348633,
+                            -3.9368600845336914,
+                            1.0
+                        ],
+                        "Rotate": [
+                            -2.050307512283325,
+                            1.9552897214889526,
+                            -43.623355865478516
+                        ]
+                    }
+                },
+                "Component_[18387556550380114975]": {
+                    "$type": "SelectionComponent",
+                    "Id": 18387556550380114975
+                },
+                "Component_[2654521436129313160]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 2654521436129313160
+                },
+                "Component_[5265045084611556958]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 5265045084611556958
+                },
+                "Component_[7169798125182238623]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 7169798125182238623
+                },
+                "Component_[7255796294953281766]": {
+                    "$type": "GenericComponentWrapper",
+                    "Id": 7255796294953281766,
+                    "m_template": {
+                        "$type": "FlyCameraInputComponent"
+                    }
+                },
+                "Component_[8866210352157164042]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 8866210352157164042
+                },
+                "Component_[9129253381063760879]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 9129253381063760879
+                }
+            }
+        },
+        "Entity_[1168049227123]": {
+            "Id": "Entity_[1168049227123]",
+            "Name": "Grid",
+            "Components": {
+                "Component_[11443347433215807130]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 11443347433215807130
+                },
+                "Component_[11779275529534764488]": {
+                    "$type": "SelectionComponent",
+                    "Id": 11779275529534764488
+                },
+                "Component_[14249419413039427459]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 14249419413039427459
+                },
+                "Component_[15448581635946161318]": {
+                    "$type": "AZ::Render::EditorGridComponent",
+                    "Id": 15448581635946161318,
+                    "Controller": {
+                        "Configuration": {
+                            "primarySpacing": 4.0,
+                            "primaryColor": [
+                                0.501960813999176,
+                                0.501960813999176,
+                                0.501960813999176
+                            ],
+                            "secondarySpacing": 0.5,
+                            "secondaryColor": [
+                                0.250980406999588,
+                                0.250980406999588,
+                                0.250980406999588
+                            ]
+                        }
+                    }
+                },
+                "Component_[1843303322527297409]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 1843303322527297409
+                },
+                "Component_[380249072065273654]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 380249072065273654,
+                    "Parent Entity": "Entity_[1176639161715]"
+                },
+                "Component_[7476660583684339787]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 7476660583684339787
+                },
+                "Component_[7557626501215118375]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 7557626501215118375
+                },
+                "Component_[7984048488947365511]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 7984048488947365511
+                },
+                "Component_[8118181039276487398]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 8118181039276487398
+                },
+                "Component_[9189909764215270515]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 9189909764215270515
+                }
+            }
+        },
+        "Entity_[1172344194419]": {
+            "Id": "Entity_[1172344194419]",
+            "Name": "Shader Ball",
+            "Components": {
+                "Component_[10789351944715265527]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 10789351944715265527
+                },
+                "Component_[12037033284781049225]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 12037033284781049225
+                },
+                "Component_[13759153306105970079]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 13759153306105970079
+                },
+                "Component_[14135560884830586279]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 14135560884830586279
+                },
+                "Component_[16247165675903986673]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 16247165675903986673
+                },
+                "Component_[18082433625958885247]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 18082433625958885247
+                },
+                "Component_[6472623349872972660]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 6472623349872972660,
+                    "Parent Entity": "Entity_[1176639161715]",
+                    "Transform Data": {
+                        "Rotate": [
+                            0.0,
+                            0.10000000149011612,
+                            180.0
+                        ]
+                    }
+                },
+                "Component_[6495255223970673916]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 6495255223970673916,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{FD340C30-755C-5911-92A3-19A3F7A77931}",
+                                    "subId": 281415304
+                                },
+                                "assetHint": "objects/shaderball/shaderball_default_1m.azmodel"
+                            }
+                        }
+                    }
+                },
+                "Component_[8056625192494070973]": {
+                    "$type": "SelectionComponent",
+                    "Id": 8056625192494070973
+                },
+                "Component_[8550141614185782969]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 8550141614185782969
+                },
+                "Component_[9439770997198325425]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 9439770997198325425
+                }
+            }
+        },
+        "Entity_[1176639161715]": {
+            "Id": "Entity_[1176639161715]",
+            "Name": "Atom Default Environment",
+            "Components": {
+                "Component_[10757302973393310045]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 10757302973393310045,
+                    "Parent Entity": "Entity_[1146574390643]"
+                },
+                "Component_[14505817420424255464]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 14505817420424255464,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 10757302973393310045
+                        }
+                    ]
+                },
+                "Component_[14988041764659020032]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 14988041764659020032
+                },
+                "Component_[15808690248755038124]": {
+                    "$type": "SelectionComponent",
+                    "Id": 15808690248755038124
+                },
+                "Component_[15900837685796817138]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 15900837685796817138
+                },
+                "Component_[3298767348226484884]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 3298767348226484884
+                },
+                "Component_[4076975109609220594]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 4076975109609220594
+                },
+                "Component_[5679760548946028854]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 5679760548946028854
+                },
+                "Component_[5855590796136709437]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 5855590796136709437,
+                    "Child Entity Order": [
+                        "Entity_[1155164325235]",
+                        "Entity_[1180934129011]",
+                        "Entity_[1172344194419]",
+                        "Entity_[1168049227123]",
+                        "Entity_[1163754259827]",
+                        "Entity_[1159459292531]"
+                    ]
+                },
+                "Component_[9277695270015777859]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 9277695270015777859
+                }
+            }
+        },
+        "Entity_[1180934129011]": {
+            "Id": "Entity_[1180934129011]",
+            "Name": "Global Sky",
+            "Components": {
+                "Component_[11231930600558681245]": {
+                    "$type": "AZ::Render::EditorHDRiSkyboxComponent",
+                    "Id": 11231930600558681245,
+                    "Controller": {
+                        "Configuration": {
+                            "CubemapAsset": {
+                                "assetId": {
+                                    "guid": "{215E47FD-D181-5832-B1AB-91673ABF6399}",
+                                    "subId": 1000
+                                },
+                                "assetHint": "lightingpresets/highcontrast/goegap_4k_skyboxcm.exr.streamingimage"
+                            }
+                        }
+                    }
+                },
+                "Component_[11980494120202836095]": {
+                    "$type": "SelectionComponent",
+                    "Id": 11980494120202836095
+                },
+                "Component_[1428633914413949476]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 1428633914413949476
+                },
+                "Component_[14936200426671614999]": {
+                    "$type": "AZ::Render::EditorImageBasedLightComponent",
+                    "Id": 14936200426671614999,
+                    "Controller": {
+                        "Configuration": {
+                            "diffuseImageAsset": {
+                                "assetId": {
+                                    "guid": "{3FD09945-D0F2-55C8-B9AF-B2FD421FE3BE}",
+                                    "subId": 3000
+                                },
+                                "assetHint": "lightingpresets/highcontrast/goegap_4k_iblglobalcm_ibldiffuse.exr.streamingimage"
+                            },
+                            "specularImageAsset": {
+                                "assetId": {
+                                    "guid": "{3FD09945-D0F2-55C8-B9AF-B2FD421FE3BE}",
+                                    "subId": 2000
+                                },
+                                "assetHint": "lightingpresets/highcontrast/goegap_4k_iblglobalcm_iblspecular.exr.streamingimage"
+                            }
+                        }
+                    }
+                },
+                "Component_[14994774102579326069]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 14994774102579326069
+                },
+                "Component_[15417479889044493340]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 15417479889044493340
+                },
+                "Component_[15826613364991382688]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 15826613364991382688
+                },
+                "Component_[1665003113283562343]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 1665003113283562343
+                },
+                "Component_[3704934735944502280]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 3704934735944502280
+                },
+                "Component_[5698542331457326479]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 5698542331457326479
+                },
+                "Component_[6644513399057217122]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 6644513399057217122,
+                    "Parent Entity": "Entity_[1176639161715]"
+                },
+                "Component_[931091830724002070]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 931091830724002070
+                }
+            }
+        },
+        "Entity_[3851851454285]": {
+            "Id": "Entity_[3851851454285]",
+            "Name": "Auth",
+            "Components": {
+                "Component_[10199578265902796701]": {
+                    "$type": "EditorScriptCanvasComponent",
+                    "Id": 10199578265902796701,
+                    "m_name": "PasswordSignUp.scriptcanvas",
+                    "runtimeDataIsValid": true,
+                    "runtimeDataOverrides": {
+                        "source": {
+                            "id": "{367CEE66-3A7D-549E-BD69-C63612B3F12D}"
+                        }
+                    },
+                    "sourceHandle": {
+                        "id": "{367CEE66-3A7D-549E-BD69-C63612B3F12D}"
+                    }
+                },
+                "Component_[10665743855533689275]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 10665743855533689275
+                },
+                "Component_[15982638153420818774]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 15982638153420818774,
+                    "Parent Entity": "Entity_[1146574390643]",
+                    "Transform Data": {
+                        "Translate": [
+                            0.0,
+                            0.10000038146972656,
+                            4.005923748016357
+                        ]
+                    }
+                },
+                "Component_[17743308263820862394]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 17743308263820862394
+                },
+                "Component_[18074634570765223479]": {
+                    "$type": "SelectionComponent",
+                    "Id": 18074634570765223479
+                },
+                "Component_[3471158028107369345]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 3471158028107369345
+                },
+                "Component_[376079292001997684]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 376079292001997684
+                },
+                "Component_[4387781728620577034]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 4387781728620577034
+                },
+                "Component_[8591645353763910598]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 8591645353763910598
+                },
+                "Component_[9373910525775599099]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 9373910525775599099
+                },
+                "Component_[9394316863271268125]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 9394316863271268125
+                }
+            }
+        }
+    }
+}

AutomatedTesting/Levels/AWS/ClientAuthPasswordSignUp/filelist.xml

@@ -1,6 +0,0 @@
-<download name="ClientAuthPasswordSignUp" type="Map">
- <index src="filelist.xml" dest="filelist.xml"/>
- <files>
-  <file src="level.pak" dest="level.pak" size="E44" md5="acfaa325178533f135cd683d3782cc8e"/>
- </files>
-</download>

AutomatedTesting/Levels/AWS/ClientAuthPasswordSignUp/level.pak

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:87882b64688a77815d93c6973929fa21b89dc6c13d4866c710124ce2cd0f411e
-size 3652

AutomatedTesting/Levels/AWS/Core/Core.ly

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5242a9b598bc329ef2af2b114092e4e50c7c398cdde4605a0717b0b3ce66d797
-size 10030

AutomatedTesting/Levels/AWS/Core/Core.prefab

@@ -0,0 +1,758 @@
+{
+    "ContainerEntity": {
+        "Id": "Entity_[1146574390643]",
+        "Name": "Level",
+        "Components": {
+            "Component_[10641544592923449938]": {
+                "$type": "EditorInspectorComponent",
+                "Id": 10641544592923449938
+            },
+            "Component_[12039882709170782873]": {
+                "$type": "EditorOnlyEntityComponent",
+                "Id": 12039882709170782873
+            },
+            "Component_[12265484671603697631]": {
+                "$type": "EditorPendingCompositionComponent",
+                "Id": 12265484671603697631
+            },
+            "Component_[14126657869720434043]": {
+                "$type": "EditorEntitySortComponent",
+                "Id": 14126657869720434043,
+                "Child Entity Order": [
+                    "Entity_[1176639161715]",
+                    "Entity_[1386540226381]",
+                    "Entity_[1390835193677]",
+                    "Entity_[1395130160973]",
+                    "Entity_[1395130160973]"
+                ]
+            },
+            "Component_[15230859088967841193]": {
+                "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                "Id": 15230859088967841193,
+                "Parent Entity": ""
+            },
+            "Component_[16239496886950819870]": {
+                "$type": "EditorDisabledCompositionComponent",
+                "Id": 16239496886950819870
+            },
+            "Component_[5688118765544765547]": {
+                "$type": "EditorEntityIconComponent",
+                "Id": 5688118765544765547
+            },
+            "Component_[6545738857812235305]": {
+                "$type": "SelectionComponent",
+                "Id": 6545738857812235305
+            },
+            "Component_[7247035804068349658]": {
+                "$type": "EditorPrefabComponent",
+                "Id": 7247035804068349658
+            },
+            "Component_[9307224322037797205]": {
+                "$type": "EditorLockComponent",
+                "Id": 9307224322037797205
+            },
+            "Component_[9562516168917670048]": {
+                "$type": "EditorVisibilityComponent",
+                "Id": 9562516168917670048
+            }
+        }
+    },
+    "Entities": {
+        "Entity_[1155164325235]": {
+            "Id": "Entity_[1155164325235]",
+            "Name": "Sun",
+            "Components": {
+                "Component_[10440557478882592717]": {
+                    "$type": "SelectionComponent",
+                    "Id": 10440557478882592717
+                },
+                "Component_[13620450453324765907]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 13620450453324765907
+                },
+                "Component_[2134313378593666258]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 2134313378593666258
+                },
+                "Component_[234010807770404186]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 234010807770404186
+                },
+                "Component_[2970359110423865725]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 2970359110423865725
+                },
+                "Component_[3722854130373041803]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 3722854130373041803
+                },
+                "Component_[5992533738676323195]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 5992533738676323195
+                },
+                "Component_[7378860763541895402]": {
+                    "$type": "AZ::Render::EditorDirectionalLightComponent",
+                    "Id": 7378860763541895402,
+                    "Controller": {
+                        "Configuration": {
+                            "Intensity": 1.0,
+                            "CameraEntityId": "",
+                            "ShadowFilterMethod": 1
+                        }
+                    }
+                },
+                "Component_[7892834440890947578]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 7892834440890947578,
+                    "Parent Entity": "Entity_[1176639161715]",
+                    "Transform Data": {
+                        "Translate": [
+                            0.0,
+                            0.0,
+                            13.487043380737305
+                        ],
+                        "Rotate": [
+                            -76.13099670410156,
+                            -0.847000002861023,
+                            -15.8100004196167
+                        ]
+                    }
+                },
+                "Component_[8599729549570828259]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 8599729549570828259
+                },
+                "Component_[952797371922080273]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 952797371922080273
+                }
+            }
+        },
+        "Entity_[1159459292531]": {
+            "Id": "Entity_[1159459292531]",
+            "Name": "Ground",
+            "Components": {
+                "Component_[11701138785793981042]": {
+                    "$type": "SelectionComponent",
+                    "Id": 11701138785793981042
+                },
+                "Component_[12260880513256986252]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 12260880513256986252
+                },
+                "Component_[13711420870643673468]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 13711420870643673468
+                },
+                "Component_[138002849734991713]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 138002849734991713
+                },
+                "Component_[16578565737331764849]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 16578565737331764849,
+                    "Parent Entity": "Entity_[1176639161715]"
+                },
+                "Component_[16919232076966545697]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 16919232076966545697
+                },
+                "Component_[5182430712893438093]": {
+                    "$type": "EditorMaterialComponent",
+                    "Id": 5182430712893438093
+                },
+                "Component_[5675108321710651991]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 5675108321710651991,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{0CD745C0-6AA8-569A-A68A-73A3270986C4}",
+                                    "subId": 277889906
+                                },
+                                "assetHint": "objects/groudplane/groundplane_512x512m.azmodel"
+                            }
+                        }
+                    }
+                },
+                "Component_[5681893399601237518]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 5681893399601237518
+                },
+                "Component_[592692962543397545]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 592692962543397545
+                },
+                "Component_[7090012899106946164]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 7090012899106946164
+                },
+                "Component_[9410832619875640998]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 9410832619875640998
+                }
+            }
+        },
+        "Entity_[1163754259827]": {
+            "Id": "Entity_[1163754259827]",
+            "Name": "Camera",
+            "Components": {
+                "Component_[11895140916889160460]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 11895140916889160460
+                },
+                "Component_[16880285896855930892]": {
+                    "$type": "{CA11DA46-29FF-4083-B5F6-E02C3A8C3A3D} EditorCameraComponent",
+                    "Id": 16880285896855930892,
+                    "Controller": {
+                        "Configuration": {
+                            "Field of View": 55.0,
+                            "EditorEntityId": 6861302815203973165
+                        }
+                    }
+                },
+                "Component_[17187464423780271193]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 17187464423780271193
+                },
+                "Component_[17495696818315413311]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 17495696818315413311
+                },
+                "Component_[18086214374043522055]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 18086214374043522055,
+                    "Parent Entity": "Entity_[1176639161715]",
+                    "Transform Data": {
+                        "Translate": [
+                            -2.3000001907348633,
+                            -3.9368600845336914,
+                            1.0
+                        ],
+                        "Rotate": [
+                            -2.050307512283325,
+                            1.9552897214889526,
+                            -43.623355865478516
+                        ]
+                    }
+                },
+                "Component_[18387556550380114975]": {
+                    "$type": "SelectionComponent",
+                    "Id": 18387556550380114975
+                },
+                "Component_[2654521436129313160]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 2654521436129313160
+                },
+                "Component_[5265045084611556958]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 5265045084611556958
+                },
+                "Component_[7169798125182238623]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 7169798125182238623
+                },
+                "Component_[7255796294953281766]": {
+                    "$type": "GenericComponentWrapper",
+                    "Id": 7255796294953281766,
+                    "m_template": {
+                        "$type": "FlyCameraInputComponent"
+                    }
+                },
+                "Component_[8866210352157164042]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 8866210352157164042
+                },
+                "Component_[9129253381063760879]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 9129253381063760879
+                }
+            }
+        },
+        "Entity_[1168049227123]": {
+            "Id": "Entity_[1168049227123]",
+            "Name": "Grid",
+            "Components": {
+                "Component_[11443347433215807130]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 11443347433215807130
+                },
+                "Component_[11779275529534764488]": {
+                    "$type": "SelectionComponent",
+                    "Id": 11779275529534764488
+                },
+                "Component_[14249419413039427459]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 14249419413039427459
+                },
+                "Component_[15448581635946161318]": {
+                    "$type": "AZ::Render::EditorGridComponent",
+                    "Id": 15448581635946161318,
+                    "Controller": {
+                        "Configuration": {
+                            "primarySpacing": 4.0,
+                            "primaryColor": [
+                                0.501960813999176,
+                                0.501960813999176,
+                                0.501960813999176
+                            ],
+                            "secondarySpacing": 0.5,
+                            "secondaryColor": [
+                                0.250980406999588,
+                                0.250980406999588,
+                                0.250980406999588
+                            ]
+                        }
+                    }
+                },
+                "Component_[1843303322527297409]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 1843303322527297409
+                },
+                "Component_[380249072065273654]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 380249072065273654,
+                    "Parent Entity": "Entity_[1176639161715]"
+                },
+                "Component_[7476660583684339787]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 7476660583684339787
+                },
+                "Component_[7557626501215118375]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 7557626501215118375
+                },
+                "Component_[7984048488947365511]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 7984048488947365511
+                },
+                "Component_[8118181039276487398]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 8118181039276487398
+                },
+                "Component_[9189909764215270515]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 9189909764215270515
+                }
+            }
+        },
+        "Entity_[1172344194419]": {
+            "Id": "Entity_[1172344194419]",
+            "Name": "Shader Ball",
+            "Components": {
+                "Component_[10789351944715265527]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 10789351944715265527
+                },
+                "Component_[12037033284781049225]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 12037033284781049225
+                },
+                "Component_[13759153306105970079]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 13759153306105970079
+                },
+                "Component_[14135560884830586279]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 14135560884830586279
+                },
+                "Component_[16247165675903986673]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 16247165675903986673
+                },
+                "Component_[18082433625958885247]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 18082433625958885247
+                },
+                "Component_[6472623349872972660]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 6472623349872972660,
+                    "Parent Entity": "Entity_[1176639161715]",
+                    "Transform Data": {
+                        "Rotate": [
+                            0.0,
+                            0.10000000149011612,
+                            180.0
+                        ]
+                    }
+                },
+                "Component_[6495255223970673916]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 6495255223970673916,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{FD340C30-755C-5911-92A3-19A3F7A77931}",
+                                    "subId": 281415304
+                                },
+                                "assetHint": "objects/shaderball/shaderball_default_1m.azmodel"
+                            }
+                        }
+                    }
+                },
+                "Component_[8056625192494070973]": {
+                    "$type": "SelectionComponent",
+                    "Id": 8056625192494070973
+                },
+                "Component_[8550141614185782969]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 8550141614185782969
+                },
+                "Component_[9439770997198325425]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 9439770997198325425
+                }
+            }
+        },
+        "Entity_[1176639161715]": {
+            "Id": "Entity_[1176639161715]",
+            "Name": "Atom Default Environment",
+            "Components": {
+                "Component_[10757302973393310045]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 10757302973393310045,
+                    "Parent Entity": "Entity_[1146574390643]"
+                },
+                "Component_[14505817420424255464]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 14505817420424255464,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 10757302973393310045
+                        }
+                    ]
+                },
+                "Component_[14988041764659020032]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 14988041764659020032
+                },
+                "Component_[15808690248755038124]": {
+                    "$type": "SelectionComponent",
+                    "Id": 15808690248755038124
+                },
+                "Component_[15900837685796817138]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 15900837685796817138
+                },
+                "Component_[3298767348226484884]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 3298767348226484884
+                },
+                "Component_[4076975109609220594]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 4076975109609220594
+                },
+                "Component_[5679760548946028854]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 5679760548946028854
+                },
+                "Component_[5855590796136709437]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 5855590796136709437,
+                    "Child Entity Order": [
+                        "Entity_[1155164325235]",
+                        "Entity_[1180934129011]",
+                        "Entity_[1172344194419]",
+                        "Entity_[1168049227123]",
+                        "Entity_[1163754259827]",
+                        "Entity_[1159459292531]"
+                    ]
+                },
+                "Component_[9277695270015777859]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 9277695270015777859
+                }
+            }
+        },
+        "Entity_[1180934129011]": {
+            "Id": "Entity_[1180934129011]",
+            "Name": "Global Sky",
+            "Components": {
+                "Component_[11231930600558681245]": {
+                    "$type": "AZ::Render::EditorHDRiSkyboxComponent",
+                    "Id": 11231930600558681245,
+                    "Controller": {
+                        "Configuration": {
+                            "CubemapAsset": {
+                                "assetId": {
+                                    "guid": "{215E47FD-D181-5832-B1AB-91673ABF6399}",
+                                    "subId": 1000
+                                },
+                                "assetHint": "lightingpresets/highcontrast/goegap_4k_skyboxcm.exr.streamingimage"
+                            }
+                        }
+                    }
+                },
+                "Component_[11980494120202836095]": {
+                    "$type": "SelectionComponent",
+                    "Id": 11980494120202836095
+                },
+                "Component_[1428633914413949476]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 1428633914413949476
+                },
+                "Component_[14936200426671614999]": {
+                    "$type": "AZ::Render::EditorImageBasedLightComponent",
+                    "Id": 14936200426671614999,
+                    "Controller": {
+                        "Configuration": {
+                            "diffuseImageAsset": {
+                                "assetId": {
+                                    "guid": "{3FD09945-D0F2-55C8-B9AF-B2FD421FE3BE}",
+                                    "subId": 3000
+                                },
+                                "assetHint": "lightingpresets/highcontrast/goegap_4k_iblglobalcm_ibldiffuse.exr.streamingimage"
+                            },
+                            "specularImageAsset": {
+                                "assetId": {
+                                    "guid": "{3FD09945-D0F2-55C8-B9AF-B2FD421FE3BE}",
+                                    "subId": 2000
+                                },
+                                "assetHint": "lightingpresets/highcontrast/goegap_4k_iblglobalcm_iblspecular.exr.streamingimage"
+                            }
+                        }
+                    }
+                },
+                "Component_[14994774102579326069]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 14994774102579326069
+                },
+                "Component_[15417479889044493340]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 15417479889044493340
+                },
+                "Component_[15826613364991382688]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 15826613364991382688
+                },
+                "Component_[1665003113283562343]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 1665003113283562343
+                },
+                "Component_[3704934735944502280]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 3704934735944502280
+                },
+                "Component_[5698542331457326479]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 5698542331457326479
+                },
+                "Component_[6644513399057217122]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 6644513399057217122,
+                    "Parent Entity": "Entity_[1176639161715]"
+                },
+                "Component_[931091830724002070]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 931091830724002070
+                }
+            }
+        },
+        "Entity_[1386540226381]": {
+            "Id": "Entity_[1386540226381]",
+            "Name": "s3",
+            "Components": {
+                "Component_[11158492000035348927]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 11158492000035348927
+                },
+                "Component_[13101294672800983417]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 13101294672800983417
+                },
+                "Component_[13312594438559441372]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 13312594438559441372
+                },
+                "Component_[14532086496432860950]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 14532086496432860950
+                },
+                "Component_[15284288439796123368]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 15284288439796123368
+                },
+                "Component_[17553238493971510581]": {
+                    "$type": "EditorScriptCanvasComponent",
+                    "Id": 17553238493971510581,
+                    "m_name": "s3demo.scriptcanvas",
+                    "runtimeDataIsValid": true,
+                    "runtimeDataOverrides": {
+                        "source": {
+                            "id": "{D72821C5-1C31-5AE5-891D-30371C49B9E0}"
+                        }
+                    },
+                    "sourceHandle": {
+                        "id": "{D72821C5-1C31-5AE5-891D-30371C49B9E0}"
+                    }
+                },
+                "Component_[17621265899133139471]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 17621265899133139471
+                },
+                "Component_[2763569637558196086]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 2763569637558196086,
+                    "Parent Entity": "Entity_[1146574390643]",
+                    "Transform Data": {
+                        "Translate": [
+                            0.0,
+                            0.10000038146972656,
+                            4.005923748016357
+                        ]
+                    }
+                },
+                "Component_[3946146016045577093]": {
+                    "$type": "SelectionComponent",
+                    "Id": 3946146016045577093
+                },
+                "Component_[4521094551057628689]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 4521094551057628689
+                },
+                "Component_[5378520857609165944]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 5378520857609165944
+                }
+            }
+        },
+        "Entity_[1390835193677]": {
+            "Id": "Entity_[1390835193677]",
+            "Name": "dynamodb",
+            "Components": {
+                "Component_[13579073750136791325]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 13579073750136791325
+                },
+                "Component_[14581079376974874313]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 14581079376974874313
+                },
+                "Component_[15354545119837386836]": {
+                    "$type": "SelectionComponent",
+                    "Id": 15354545119837386836
+                },
+                "Component_[15913971829919706180]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 15913971829919706180
+                },
+                "Component_[17308449372189366987]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 17308449372189366987
+                },
+                "Component_[17741852956994822371]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 17741852956994822371
+                },
+                "Component_[4363122368868820254]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 4363122368868820254
+                },
+                "Component_[4890242568951925088]": {
+                    "$type": "EditorScriptCanvasComponent",
+                    "Id": 4890242568951925088,
+                    "m_name": "dynamodbdemo.scriptcanvas",
+                    "runtimeDataIsValid": true,
+                    "runtimeDataOverrides": {
+                        "source": {
+                            "id": "{004B97C6-75F3-5B95-ADA4-EBF751EEF697}"
+                        }
+                    },
+                    "sourceHandle": {
+                        "id": "{004B97C6-75F3-5B95-ADA4-EBF751EEF697}"
+                    }
+                },
+                "Component_[7140725680315799866]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 7140725680315799866
+                },
+                "Component_[8431133659360426398]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 8431133659360426398,
+                    "Parent Entity": "Entity_[1146574390643]",
+                    "Transform Data": {
+                        "Translate": [
+                            0.0,
+                            0.10000038146972656,
+                            4.005923748016357
+                        ]
+                    }
+                },
+                "Component_[9486500593077263666]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 9486500593077263666
+                }
+            }
+        },
+        "Entity_[1395130160973]": {
+            "Id": "Entity_[1395130160973]",
+            "Name": "lambda",
+            "Components": {
+                "Component_[14224781635611846065]": {
+                    "$type": "SelectionComponent",
+                    "Id": 14224781635611846065
+                },
+                "Component_[14532864313352417822]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 14532864313352417822
+                },
+                "Component_[14621438229914413040]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 14621438229914413040
+                },
+                "Component_[15642112885025274607]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 15642112885025274607
+                },
+                "Component_[16340039184260739086]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 16340039184260739086
+                },
+                "Component_[17170806711467412600]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 17170806711467412600,
+                    "Parent Entity": "Entity_[1146574390643]",
+                    "Transform Data": {
+                        "Translate": [
+                            0.0,
+                            0.10000038146972656,
+                            4.005923748016357
+                        ]
+                    }
+                },
+                "Component_[18080677632538463069]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 18080677632538463069
+                },
+                "Component_[2663457305102263144]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 2663457305102263144
+                },
+                "Component_[4954526281430171003]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 4954526281430171003
+                },
+                "Component_[6251151424244415885]": {
+                    "$type": "EditorScriptCanvasComponent",
+                    "Id": 6251151424244415885,
+                    "m_name": "lambdademo.scriptcanvas",
+                    "runtimeDataIsValid": true,
+                    "runtimeDataOverrides": {
+                        "source": {
+                            "id": "{3DCA213D-534E-5C86-9308-2F7675A08029}"
+                        }
+                    },
+                    "sourceHandle": {
+                        "id": "{3DCA213D-534E-5C86-9308-2F7675A08029}"
+                    }
+                },
+                "Component_[6526999075003995619]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 6526999075003995619
+                }
+            }
+        }
+    }
+}

AutomatedTesting/Levels/AWS/Core/filelist.xml

@@ -1,6 +0,0 @@
-<download name="Core" type="Map">
- <index src="filelist.xml" dest="filelist.xml"/>
- <files>
-  <file src="level.pak" dest="level.pak" size="EBE" md5="2b5b16a34ef2c8f62956dfb5588c4578"/>
- </files>
-</download>

AutomatedTesting/Levels/AWS/Core/level.pak

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4ba2f409fc974c72b8ee8b660d200ed1d013ee8408419b0e91d6d487e71e4997
-size 3774

AutomatedTesting/Levels/AWS/Metrics/Metrics.ly

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:023992998ab5a1d64b38dacd1d5e1a9dc930ff704289c0656ed6eaba6951d660
-size 9066

AutomatedTesting/Levels/AWS/Metrics/Metrics.prefab

@@ -0,0 +1,627 @@
+{
+    "ContainerEntity": {
+        "Id": "Entity_[1146574390643]",
+        "Name": "Level",
+        "Components": {
+            "Component_[10641544592923449938]": {
+                "$type": "EditorInspectorComponent",
+                "Id": 10641544592923449938
+            },
+            "Component_[12039882709170782873]": {
+                "$type": "EditorOnlyEntityComponent",
+                "Id": 12039882709170782873
+            },
+            "Component_[12265484671603697631]": {
+                "$type": "EditorPendingCompositionComponent",
+                "Id": 12265484671603697631
+            },
+            "Component_[14126657869720434043]": {
+                "$type": "EditorEntitySortComponent",
+                "Id": 14126657869720434043,
+                "Child Entity Order": [
+                    "Entity_[1176639161715]",
+                    "Entity_[2086619895629]",
+                    "Entity_[2086619895629]"
+                ]
+            },
+            "Component_[15230859088967841193]": {
+                "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                "Id": 15230859088967841193,
+                "Parent Entity": ""
+            },
+            "Component_[16239496886950819870]": {
+                "$type": "EditorDisabledCompositionComponent",
+                "Id": 16239496886950819870
+            },
+            "Component_[5688118765544765547]": {
+                "$type": "EditorEntityIconComponent",
+                "Id": 5688118765544765547
+            },
+            "Component_[6545738857812235305]": {
+                "$type": "SelectionComponent",
+                "Id": 6545738857812235305
+            },
+            "Component_[7247035804068349658]": {
+                "$type": "EditorPrefabComponent",
+                "Id": 7247035804068349658
+            },
+            "Component_[9307224322037797205]": {
+                "$type": "EditorLockComponent",
+                "Id": 9307224322037797205
+            },
+            "Component_[9562516168917670048]": {
+                "$type": "EditorVisibilityComponent",
+                "Id": 9562516168917670048
+            }
+        }
+    },
+    "Entities": {
+        "Entity_[1155164325235]": {
+            "Id": "Entity_[1155164325235]",
+            "Name": "Sun",
+            "Components": {
+                "Component_[10440557478882592717]": {
+                    "$type": "SelectionComponent",
+                    "Id": 10440557478882592717
+                },
+                "Component_[13620450453324765907]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 13620450453324765907
+                },
+                "Component_[2134313378593666258]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 2134313378593666258
+                },
+                "Component_[234010807770404186]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 234010807770404186
+                },
+                "Component_[2970359110423865725]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 2970359110423865725
+                },
+                "Component_[3722854130373041803]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 3722854130373041803
+                },
+                "Component_[5992533738676323195]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 5992533738676323195
+                },
+                "Component_[7378860763541895402]": {
+                    "$type": "AZ::Render::EditorDirectionalLightComponent",
+                    "Id": 7378860763541895402,
+                    "Controller": {
+                        "Configuration": {
+                            "Intensity": 1.0,
+                            "CameraEntityId": "",
+                            "ShadowFilterMethod": 1
+                        }
+                    }
+                },
+                "Component_[7892834440890947578]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 7892834440890947578,
+                    "Parent Entity": "Entity_[1176639161715]",
+                    "Transform Data": {
+                        "Translate": [
+                            0.0,
+                            0.0,
+                            13.487043380737305
+                        ],
+                        "Rotate": [
+                            -76.13099670410156,
+                            -0.847000002861023,
+                            -15.8100004196167
+                        ]
+                    }
+                },
+                "Component_[8599729549570828259]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 8599729549570828259
+                },
+                "Component_[952797371922080273]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 952797371922080273
+                }
+            }
+        },
+        "Entity_[1159459292531]": {
+            "Id": "Entity_[1159459292531]",
+            "Name": "Ground",
+            "Components": {
+                "Component_[11701138785793981042]": {
+                    "$type": "SelectionComponent",
+                    "Id": 11701138785793981042
+                },
+                "Component_[12260880513256986252]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 12260880513256986252
+                },
+                "Component_[13711420870643673468]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 13711420870643673468
+                },
+                "Component_[138002849734991713]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 138002849734991713
+                },
+                "Component_[16578565737331764849]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 16578565737331764849,
+                    "Parent Entity": "Entity_[1176639161715]"
+                },
+                "Component_[16919232076966545697]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 16919232076966545697
+                },
+                "Component_[5182430712893438093]": {
+                    "$type": "EditorMaterialComponent",
+                    "Id": 5182430712893438093
+                },
+                "Component_[5675108321710651991]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 5675108321710651991,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{0CD745C0-6AA8-569A-A68A-73A3270986C4}",
+                                    "subId": 277889906
+                                },
+                                "assetHint": "objects/groudplane/groundplane_512x512m.azmodel"
+                            }
+                        }
+                    }
+                },
+                "Component_[5681893399601237518]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 5681893399601237518
+                },
+                "Component_[592692962543397545]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 592692962543397545
+                },
+                "Component_[7090012899106946164]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 7090012899106946164
+                },
+                "Component_[9410832619875640998]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 9410832619875640998
+                }
+            }
+        },
+        "Entity_[1163754259827]": {
+            "Id": "Entity_[1163754259827]",
+            "Name": "Camera",
+            "Components": {
+                "Component_[11895140916889160460]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 11895140916889160460
+                },
+                "Component_[16880285896855930892]": {
+                    "$type": "{CA11DA46-29FF-4083-B5F6-E02C3A8C3A3D} EditorCameraComponent",
+                    "Id": 16880285896855930892,
+                    "Controller": {
+                        "Configuration": {
+                            "Field of View": 55.0,
+                            "EditorEntityId": 6861302815203973165
+                        }
+                    }
+                },
+                "Component_[17187464423780271193]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 17187464423780271193
+                },
+                "Component_[17495696818315413311]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 17495696818315413311
+                },
+                "Component_[18086214374043522055]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 18086214374043522055,
+                    "Parent Entity": "Entity_[1176639161715]",
+                    "Transform Data": {
+                        "Translate": [
+                            -2.3000001907348633,
+                            -3.9368600845336914,
+                            1.0
+                        ],
+                        "Rotate": [
+                            -2.050307512283325,
+                            1.9552897214889526,
+                            -43.623355865478516
+                        ]
+                    }
+                },
+                "Component_[18387556550380114975]": {
+                    "$type": "SelectionComponent",
+                    "Id": 18387556550380114975
+                },
+                "Component_[2654521436129313160]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 2654521436129313160
+                },
+                "Component_[5265045084611556958]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 5265045084611556958
+                },
+                "Component_[7169798125182238623]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 7169798125182238623
+                },
+                "Component_[7255796294953281766]": {
+                    "$type": "GenericComponentWrapper",
+                    "Id": 7255796294953281766,
+                    "m_template": {
+                        "$type": "FlyCameraInputComponent"
+                    }
+                },
+                "Component_[8866210352157164042]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 8866210352157164042
+                },
+                "Component_[9129253381063760879]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 9129253381063760879
+                }
+            }
+        },
+        "Entity_[1168049227123]": {
+            "Id": "Entity_[1168049227123]",
+            "Name": "Grid",
+            "Components": {
+                "Component_[11443347433215807130]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 11443347433215807130
+                },
+                "Component_[11779275529534764488]": {
+                    "$type": "SelectionComponent",
+                    "Id": 11779275529534764488
+                },
+                "Component_[14249419413039427459]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 14249419413039427459
+                },
+                "Component_[15448581635946161318]": {
+                    "$type": "AZ::Render::EditorGridComponent",
+                    "Id": 15448581635946161318,
+                    "Controller": {
+                        "Configuration": {
+                            "primarySpacing": 4.0,
+                            "primaryColor": [
+                                0.501960813999176,
+                                0.501960813999176,
+                                0.501960813999176
+                            ],
+                            "secondarySpacing": 0.5,
+                            "secondaryColor": [
+                                0.250980406999588,
+                                0.250980406999588,
+                                0.250980406999588
+                            ]
+                        }
+                    }
+                },
+                "Component_[1843303322527297409]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 1843303322527297409
+                },
+                "Component_[380249072065273654]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 380249072065273654,
+                    "Parent Entity": "Entity_[1176639161715]"
+                },
+                "Component_[7476660583684339787]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 7476660583684339787
+                },
+                "Component_[7557626501215118375]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 7557626501215118375
+                },
+                "Component_[7984048488947365511]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 7984048488947365511
+                },
+                "Component_[8118181039276487398]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 8118181039276487398
+                },
+                "Component_[9189909764215270515]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 9189909764215270515
+                }
+            }
+        },
+        "Entity_[1172344194419]": {
+            "Id": "Entity_[1172344194419]",
+            "Name": "Shader Ball",
+            "Components": {
+                "Component_[10789351944715265527]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 10789351944715265527
+                },
+                "Component_[12037033284781049225]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 12037033284781049225
+                },
+                "Component_[13759153306105970079]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 13759153306105970079
+                },
+                "Component_[14135560884830586279]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 14135560884830586279
+                },
+                "Component_[16247165675903986673]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 16247165675903986673
+                },
+                "Component_[18082433625958885247]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 18082433625958885247
+                },
+                "Component_[6472623349872972660]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 6472623349872972660,
+                    "Parent Entity": "Entity_[1176639161715]",
+                    "Transform Data": {
+                        "Rotate": [
+                            0.0,
+                            0.10000000149011612,
+                            180.0
+                        ]
+                    }
+                },
+                "Component_[6495255223970673916]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 6495255223970673916,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{FD340C30-755C-5911-92A3-19A3F7A77931}",
+                                    "subId": 281415304
+                                },
+                                "assetHint": "objects/shaderball/shaderball_default_1m.azmodel"
+                            }
+                        }
+                    }
+                },
+                "Component_[8056625192494070973]": {
+                    "$type": "SelectionComponent",
+                    "Id": 8056625192494070973
+                },
+                "Component_[8550141614185782969]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 8550141614185782969
+                },
+                "Component_[9439770997198325425]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 9439770997198325425
+                }
+            }
+        },
+        "Entity_[1176639161715]": {
+            "Id": "Entity_[1176639161715]",
+            "Name": "Atom Default Environment",
+            "Components": {
+                "Component_[10757302973393310045]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 10757302973393310045,
+                    "Parent Entity": "Entity_[1146574390643]"
+                },
+                "Component_[14505817420424255464]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 14505817420424255464,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 10757302973393310045
+                        }
+                    ]
+                },
+                "Component_[14988041764659020032]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 14988041764659020032
+                },
+                "Component_[15808690248755038124]": {
+                    "$type": "SelectionComponent",
+                    "Id": 15808690248755038124
+                },
+                "Component_[15900837685796817138]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 15900837685796817138
+                },
+                "Component_[3298767348226484884]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 3298767348226484884
+                },
+                "Component_[4076975109609220594]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 4076975109609220594
+                },
+                "Component_[5679760548946028854]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 5679760548946028854
+                },
+                "Component_[5855590796136709437]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 5855590796136709437,
+                    "Child Entity Order": [
+                        "Entity_[1155164325235]",
+                        "Entity_[1180934129011]",
+                        "Entity_[1172344194419]",
+                        "Entity_[1168049227123]",
+                        "Entity_[1163754259827]",
+                        "Entity_[1159459292531]"
+                    ]
+                },
+                "Component_[9277695270015777859]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 9277695270015777859
+                }
+            }
+        },
+        "Entity_[1180934129011]": {
+            "Id": "Entity_[1180934129011]",
+            "Name": "Global Sky",
+            "Components": {
+                "Component_[11231930600558681245]": {
+                    "$type": "AZ::Render::EditorHDRiSkyboxComponent",
+                    "Id": 11231930600558681245,
+                    "Controller": {
+                        "Configuration": {
+                            "CubemapAsset": {
+                                "assetId": {
+                                    "guid": "{215E47FD-D181-5832-B1AB-91673ABF6399}",
+                                    "subId": 1000
+                                },
+                                "assetHint": "lightingpresets/highcontrast/goegap_4k_skyboxcm.exr.streamingimage"
+                            }
+                        }
+                    }
+                },
+                "Component_[11980494120202836095]": {
+                    "$type": "SelectionComponent",
+                    "Id": 11980494120202836095
+                },
+                "Component_[1428633914413949476]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 1428633914413949476
+                },
+                "Component_[14936200426671614999]": {
+                    "$type": "AZ::Render::EditorImageBasedLightComponent",
+                    "Id": 14936200426671614999,
+                    "Controller": {
+                        "Configuration": {
+                            "diffuseImageAsset": {
+                                "assetId": {
+                                    "guid": "{3FD09945-D0F2-55C8-B9AF-B2FD421FE3BE}",
+                                    "subId": 3000
+                                },
+                                "assetHint": "lightingpresets/highcontrast/goegap_4k_iblglobalcm_ibldiffuse.exr.streamingimage"
+                            },
+                            "specularImageAsset": {
+                                "assetId": {
+                                    "guid": "{3FD09945-D0F2-55C8-B9AF-B2FD421FE3BE}",
+                                    "subId": 2000
+                                },
+                                "assetHint": "lightingpresets/highcontrast/goegap_4k_iblglobalcm_iblspecular.exr.streamingimage"
+                            }
+                        }
+                    }
+                },
+                "Component_[14994774102579326069]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 14994774102579326069
+                },
+                "Component_[15417479889044493340]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 15417479889044493340
+                },
+                "Component_[15826613364991382688]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 15826613364991382688
+                },
+                "Component_[1665003113283562343]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 1665003113283562343
+                },
+                "Component_[3704934735944502280]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 3704934735944502280
+                },
+                "Component_[5698542331457326479]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 5698542331457326479
+                },
+                "Component_[6644513399057217122]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 6644513399057217122,
+                    "Parent Entity": "Entity_[1176639161715]"
+                },
+                "Component_[931091830724002070]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 931091830724002070
+                }
+            }
+        },
+        "Entity_[2086619895629]": {
+            "Id": "Entity_[2086619895629]",
+            "Name": "metrics",
+            "Components": {
+                "Component_[10664937239001700943]": {
+                    "$type": "SelectionComponent",
+                    "Id": 10664937239001700943
+                },
+                "Component_[12411100785613400502]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 12411100785613400502
+                },
+                "Component_[13461617945403887462]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 13461617945403887462
+                },
+                "Component_[1398528805938487915]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 1398528805938487915
+                },
+                "Component_[15586634767575159325]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 15586634767575159325
+                },
+                "Component_[1737734807882912852]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 1737734807882912852
+                },
+                "Component_[2398400563175352537]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 2398400563175352537
+                },
+                "Component_[3845542252660517302]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 3845542252660517302
+                },
+                "Component_[3873433240186817282]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 3873433240186817282
+                },
+                "Component_[4474288881478318615]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 4474288881478318615,
+                    "Parent Entity": "Entity_[1146574390643]",
+                    "Transform Data": {
+                        "Translate": [
+                            0.0,
+                            0.10000038146972656,
+                            4.005923748016357
+                        ]
+                    }
+                },
+                "Component_[5865591669658426602]": {
+                    "$type": "ScriptEditorComponent",
+                    "Id": 5865591669658426602,
+                    "ScriptComponent": {
+                        "Script": {
+                            "assetId": {
+                                "guid": "{50D66834-9277-5469-892E-DAD087FF4C0E}",
+                                "subId": 1
+                            },
+                            "loadBehavior": "QueueLoad",
+                            "assetHint": "levels/aws/metrics/script/metrics.luac"
+                        }
+                    },
+                    "ScriptAsset": {
+                        "assetId": {
+                            "guid": "{50D66834-9277-5469-892E-DAD087FF4C0E}",
+                            "subId": 1
+                        },
+                        "assetHint": "levels/aws/metrics/script/metrics.luac"
+                    }
+                }
+            }
+        }
+    }
+}

AutomatedTesting/Levels/AWS/Metrics/filelist.xml

@@ -1,6 +0,0 @@
-<download name="Metrics" type="Map">
- <index src="filelist.xml" dest="filelist.xml"/>
- <files>
-  <file src="level.pak" dest="level.pak" size="E09" md5="f16fff2970a4037af5909b269ceece4b"/>
- </files>
-</download>

AutomatedTesting/Levels/AWS/Metrics/level.pak

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e7c0c07b13bb64db344b94d5712e1e802e607a9dee506768b34481f4a76d8505
-size 3593

AutomatedTesting/Levels/PbrMaterialChart/materials/basic.material

@@ -0,0 +1,32 @@
+{
+    "materialType": "Materials/Types/StandardPBR.materialtype",
+    "propertyLayoutVersion": 1,
+    "properties": {
+        "baseColor": {
+            "color": [ 1.0, 1.0, 1.0 ],
+            "factor": 0.75,
+            "useTexture": false,
+            "textureMap": ""
+        },
+        "metallic": {
+            "factor": 0.0,
+            "useTexture": false,
+            "textureMap": ""
+        },
+        "roughness": {
+            "factor": 0.0,
+            "useTexture": false,
+            "textureMap": ""
+        },
+        "specularF0": {
+            "factor": 0.5,
+            "useTexture": false,
+            "textureMap": ""
+        },
+        "normal": {
+            "factor": 1.0,
+            "useTexture": false,
+            "textureMap": ""
+        }
+    }
+}

AutomatedTesting/Levels/PbrMaterialChart/materials/basic_m00_r00.material

@@ -0,0 +1,13 @@
+{
+    "parentMaterial": "./basic.material",
+    "materialType": "Materials/Types/StandardPBR.materialtype",
+    "propertyLayoutVersion": 1,
+    "properties": {
+        "metallic": {
+            "factor": 0.0
+        },
+        "roughness": {
+            "factor": 0.0
+        }
+    }
+}

AutomatedTesting/Levels/PbrMaterialChart/materials/basic_m00_r01.material

@@ -0,0 +1,13 @@
+{
+    "parentMaterial": "./basic.material",
+    "materialType": "Materials/Types/StandardPBR.materialtype",
+    "propertyLayoutVersion": 1,
+    "properties": {
+        "metallic": {
+            "factor": 0.0
+        },
+        "roughness": {
+            "factor": 0.1
+        }
+    }
+}

AutomatedTesting/Levels/PbrMaterialChart/materials/basic_m00_r02.material

@@ -0,0 +1,13 @@
+{
+    "parentMaterial": "./basic.material",
+    "materialType": "Materials/Types/StandardPBR.materialtype",
+    "propertyLayoutVersion": 1,
+    "properties": {
+        "metallic": {
+            "factor": 0.0
+        },
+        "roughness": {
+            "factor": 0.2
+        }
+    }
+}

AutomatedTesting/Levels/PbrMaterialChart/materials/basic_m00_r03.material

@@ -0,0 +1,13 @@
+{
+    "parentMaterial": "./basic.material",
+    "materialType": "Materials/Types/StandardPBR.materialtype",
+    "propertyLayoutVersion": 1,
+    "properties": {
+        "metallic": {
+            "factor": 0.0
+        },
+        "roughness": {
+            "factor": 0.3
+        }
+    }
+}

AutomatedTesting/Levels/PbrMaterialChart/materials/basic_m00_r04.material

@@ -0,0 +1,13 @@
+{
+    "parentMaterial": "./basic.material",
+    "materialType": "Materials/Types/StandardPBR.materialtype",
+    "propertyLayoutVersion": 1,
+    "properties": {
+        "metallic": {
+            "factor": 0.0
+        },
+        "roughness": {
+            "factor": 0.4
+        }
+    }
+}

AutomatedTesting/Levels/PbrMaterialChart/materials/basic_m00_r05.material

@@ -0,0 +1,13 @@
+{
+    "parentMaterial": "./basic.material",
+    "materialType": "Materials/Types/StandardPBR.materialtype",
+    "propertyLayoutVersion": 1,
+    "properties": {
+        "metallic": {
+            "factor": 0.0
+        },
+        "roughness": {
+            "factor": 0.5
+        }
+    }
+}

AutomatedTesting/Levels/PbrMaterialChart/materials/basic_m00_r06.material

@@ -0,0 +1,13 @@
+{
+    "parentMaterial": "./basic.material",
+    "materialType": "Materials/Types/StandardPBR.materialtype",
+    "propertyLayoutVersion": 1,
+    "properties": {
+        "metallic": {
+            "factor": 0.0
+        },
+        "roughness": {
+            "factor": 0.6
+        }
+    }
+}

AutomatedTesting/Levels/PbrMaterialChart/materials/basic_m00_r07.material

@@ -0,0 +1,13 @@
+{
+    "parentMaterial": "./basic.material",
+    "materialType": "Materials/Types/StandardPBR.materialtype",
+    "propertyLayoutVersion": 1,
+    "properties": {
+        "metallic": {
+            "factor": 0.0
+        },
+        "roughness": {
+            "factor": 0.7
+        }
+    }
+}

AutomatedTesting/Levels/PbrMaterialChart/materials/basic_m00_r08.material

@@ -0,0 +1,13 @@
+{
+    "parentMaterial": "./basic.material",
+    "materialType": "Materials/Types/StandardPBR.materialtype",
+    "propertyLayoutVersion": 1,
+    "properties": {
+        "metallic": {
+            "factor": 0.0
+        },
+        "roughness": {
+            "factor": 0.8
+        }
+    }
+}

AutomatedTesting/Levels/PbrMaterialChart/materials/basic_m00_r09.material

@@ -0,0 +1,13 @@
+{
+    "parentMaterial": "./basic.material",
+    "materialType": "Materials/Types/StandardPBR.materialtype",
+    "propertyLayoutVersion": 1,
+    "properties": {
+        "metallic": {
+            "factor": 0.0
+        },
+        "roughness": {
+            "factor": 0.9
+        }
+    }
+}

AutomatedTesting/Levels/PbrMaterialChart/materials/basic_m00_r10.material

@@ -0,0 +1,13 @@
+{
+    "parentMaterial": "./basic.material",
+    "materialType": "Materials/Types/StandardPBR.materialtype",
+    "propertyLayoutVersion": 1,
+    "properties": {
+        "metallic": {
+            "factor": 0.0
+        },
+        "roughness": {
+            "factor": 1.0
+        }
+    }
+}

AutomatedTesting/Levels/PbrMaterialChart/materials/basic_m10_r00.material

@@ -0,0 +1,13 @@
+{
+    "parentMaterial": "./basic.material",
+    "materialType": "Materials/Types/StandardPBR.materialtype",
+    "propertyLayoutVersion": 1,
+    "properties": {
+        "metallic": {
+            "factor": 1.0
+        },
+        "roughness": {
+            "factor": 0.0
+        }
+    }
+}

AutomatedTesting/Levels/PbrMaterialChart/materials/basic_m10_r01.material

@@ -0,0 +1,13 @@
+{
+    "parentMaterial": "./basic.material",
+    "materialType": "Materials/Types/StandardPBR.materialtype",
+    "propertyLayoutVersion": 1,
+    "properties": {
+        "metallic": {
+            "factor": 1.0
+        },
+        "roughness": {
+            "factor": 0.1
+        }
+    }
+}

AutomatedTesting/Levels/PbrMaterialChart/materials/basic_m10_r02.material

@@ -0,0 +1,13 @@
+{
+    "parentMaterial": "./basic.material",
+    "materialType": "Materials/Types/StandardPBR.materialtype",
+    "propertyLayoutVersion": 1,
+    "properties": {
+        "metallic": {
+            "factor": 1.0
+        },
+        "roughness": {
+            "factor": 0.2
+        }
+    }
+}

AutomatedTesting/Levels/PbrMaterialChart/materials/basic_m10_r03.material

@@ -0,0 +1,13 @@
+{
+    "parentMaterial": "./basic.material",
+    "materialType": "Materials/Types/StandardPBR.materialtype",
+    "propertyLayoutVersion": 1,
+    "properties": {
+        "metallic": {
+            "factor": 1.0
+        },
+        "roughness": {
+            "factor": 0.3
+        }
+    }
+}

AutomatedTesting/Levels/PbrMaterialChart/materials/basic_m10_r04.material

@@ -0,0 +1,13 @@
+{
+    "parentMaterial": "./basic.material",
+    "materialType": "Materials/Types/StandardPBR.materialtype",
+    "propertyLayoutVersion": 1,
+    "properties": {
+        "metallic": {
+            "factor": 1.0
+        },
+        "roughness": {
+            "factor": 0.4
+        }
+    }
+}

AutomatedTesting/Levels/PbrMaterialChart/materials/basic_m10_r05.material

@@ -0,0 +1,13 @@
+{
+    "parentMaterial": "./basic.material",
+    "materialType": "Materials/Types/StandardPBR.materialtype",
+    "propertyLayoutVersion": 1,
+    "properties": {
+        "metallic": {
+            "factor": 1.0
+        },
+        "roughness": {
+            "factor": 0.5
+        }
+    }
+}

AutomatedTesting/Levels/PbrMaterialChart/materials/basic_m10_r06.material

@@ -0,0 +1,13 @@
+{
+    "parentMaterial": "./basic.material",
+    "materialType": "Materials/Types/StandardPBR.materialtype",
+    "propertyLayoutVersion": 1,
+    "properties": {
+        "metallic": {
+            "factor": 1.0
+        },
+        "roughness": {
+            "factor": 0.6
+        }
+    }
+}

AutomatedTesting/Levels/PbrMaterialChart/materials/basic_m10_r07.material

@@ -0,0 +1,13 @@
+{
+    "parentMaterial": "./basic.material",
+    "materialType": "Materials/Types/StandardPBR.materialtype",
+    "propertyLayoutVersion": 1,
+    "properties": {
+        "metallic": {
+            "factor": 1.0
+        },
+        "roughness": {
+            "factor": 0.7
+        }
+    }
+}

AutomatedTesting/Levels/PbrMaterialChart/materials/basic_m10_r08.material

@@ -0,0 +1,13 @@
+{
+    "parentMaterial": "./basic.material",
+    "materialType": "Materials/Types/StandardPBR.materialtype",
+    "propertyLayoutVersion": 1,
+    "properties": {
+        "metallic": {
+            "factor": 1.0
+        },
+        "roughness": {
+            "factor": 0.8
+        }
+    }
+}

AutomatedTesting/Levels/PbrMaterialChart/materials/basic_m10_r09.material

@@ -0,0 +1,13 @@
+{
+    "parentMaterial": "./basic.material",
+    "materialType": "Materials/Types/StandardPBR.materialtype",
+    "propertyLayoutVersion": 1,
+    "properties": {
+        "metallic": {
+            "factor": 1.0
+        },
+        "roughness": {
+            "factor": 0.9
+        }
+    }
+}

AutomatedTesting/Levels/PbrMaterialChart/materials/basic_m10_r10.material

@@ -0,0 +1,13 @@
+{
+    "parentMaterial": "./basic.material",
+    "materialType": "Materials/Types/StandardPBR.materialtype",
+    "propertyLayoutVersion": 1,
+    "properties": {
+        "metallic": {
+            "factor": 1.0
+        },
+        "roughness": {
+            "factor": 1.0
+        }
+    }
+}

AutomatedTesting/Levels/PbrMaterialChart/tags.txt

@@ -0,0 +1,12 @@
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0

AutomatedTesting/Levels/Performance/10KEntityCpuPerfTest/tags.txt

@@ -0,0 +1,12 @@
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0

AutomatedTesting/Levels/Performance/10kVegInstancesTest/tags.txt

@@ -0,0 +1,12 @@
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0

AutomatedTesting/Objects/sphere.fbx

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a476e99b55cf2a76fef6775c5a57dad29f8ffcb942c625bab04c89051a72a560
+size 62626

AutomatedTesting/Prefabs/TestData/Graphics/CubeAluminumPolishedPBR.prefab

@@ -0,0 +1,156 @@
+{
+    "ContainerEntity": {
+        "Id": "ContainerEntity",
+        "Name": "CubeAluminumPolishedPBR",
+        "Components": {
+            "Component_[1006636009791072742]": {
+                "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                "Id": 1006636009791072742,
+                "Parent Entity": ""
+            },
+            "Component_[1076262440422199293]": {
+                "$type": "EditorEntitySortComponent",
+                "Id": 1076262440422199293,
+                "Child Entity Order": [
+                    "Entity_[1040185651401]"
+                ]
+            },
+            "Component_[10918235158079012184]": {
+                "$type": "EditorEntityIconComponent",
+                "Id": 10918235158079012184
+            },
+            "Component_[14325323304581185195]": {
+                "$type": "EditorOnlyEntityComponent",
+                "Id": 14325323304581185195
+            },
+            "Component_[15952647410502679667]": {
+                "$type": "EditorPendingCompositionComponent",
+                "Id": 15952647410502679667
+            },
+            "Component_[1646402264018781142]": {
+                "$type": "EditorVisibilityComponent",
+                "Id": 1646402264018781142
+            },
+            "Component_[2017972571432187012]": {
+                "$type": "EditorInspectorComponent",
+                "Id": 2017972571432187012
+            },
+            "Component_[478000835478069459]": {
+                "$type": "EditorDisabledCompositionComponent",
+                "Id": 478000835478069459
+            },
+            "Component_[7132130710158542124]": {
+                "$type": "EditorPrefabComponent",
+                "Id": 7132130710158542124
+            },
+            "Component_[7457311619910333402]": {
+                "$type": "SelectionComponent",
+                "Id": 7457311619910333402
+            },
+            "Component_[8761313808145525748]": {
+                "$type": "EditorLockComponent",
+                "Id": 8761313808145525748
+            }
+        }
+    },
+    "Entities": {
+        "Entity_[1040185651401]": {
+            "Id": "Entity_[1040185651401]",
+            "Name": "Entity1",
+            "Components": {
+                "Component_[11024839750215572075]": {
+                    "$type": "SelectionComponent",
+                    "Id": 11024839750215572075
+                },
+                "Component_[11384176886283708819]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 11384176886283708819,
+                    "Parent Entity": "ContainerEntity"
+                },
+                "Component_[1606410272595503925]": {
+                    "$type": "EditorMaterialComponent",
+                    "Id": 1606410272595503925,
+                    "Controller": {
+                        "Configuration": {
+                            "materials": [
+                                {
+                                    "Key": {
+                                        "materialSlotStableId": 2418540911
+                                    },
+                                    "Value": {
+                                        "MaterialAsset": {
+                                            "assetId": {
+                                                "guid": "{64C1F6A6-6BDA-551A-BE56-1829E5913278}"
+                                            },
+                                            "assetHint": "materials/presets/pbr/metal_aluminum_polished.azmaterial"
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                },
+                "Component_[16470114336751653654]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 16470114336751653654,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 11384176886283708819
+                        },
+                        {
+                            "ComponentId": 89717634602996901,
+                            "SortIndex": 1
+                        },
+                        {
+                            "ComponentId": 1606410272595503925,
+                            "SortIndex": 2
+                        }
+                    ]
+                },
+                "Component_[4303036201889516060]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 4303036201889516060
+                },
+                "Component_[44336138790150350]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 44336138790150350
+                },
+                "Component_[4558973254917759795]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 4558973254917759795
+                },
+                "Component_[4674030476408790307]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 4674030476408790307
+                },
+                "Component_[4802851695039968062]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 4802851695039968062
+                },
+                "Component_[5821006029055754615]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 5821006029055754615
+                },
+                "Component_[8587156575497792590]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 8587156575497792590
+                },
+                "Component_[89717634602996901]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 89717634602996901,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{E14975EF-E676-51A4-B826-3EF59CB645AA}",
+                                    "subId": 285127096
+                                },
+                                "assetHint": "testdata/objects/cube/cube.azmodel"
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

AutomatedTesting/Prefabs/TestData/Graphics/CubeBrassPolishedPBR.prefab

@@ -0,0 +1,156 @@
+{
+    "ContainerEntity": {
+        "Id": "ContainerEntity",
+        "Name": "CubeBrassPolishedPBR",
+        "Components": {
+            "Component_[11392538078593907718]": {
+                "$type": "EditorVisibilityComponent",
+                "Id": 11392538078593907718
+            },
+            "Component_[15271285664593091377]": {
+                "$type": "EditorPrefabComponent",
+                "Id": 15271285664593091377
+            },
+            "Component_[16445950008096288691]": {
+                "$type": "EditorDisabledCompositionComponent",
+                "Id": 16445950008096288691
+            },
+            "Component_[17031759897155285515]": {
+                "$type": "EditorOnlyEntityComponent",
+                "Id": 17031759897155285515
+            },
+            "Component_[17333992135029064645]": {
+                "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                "Id": 17333992135029064645,
+                "Parent Entity": ""
+            },
+            "Component_[2440848159410013062]": {
+                "$type": "EditorInspectorComponent",
+                "Id": 2440848159410013062
+            },
+            "Component_[4872690920600271776]": {
+                "$type": "EditorEntityIconComponent",
+                "Id": 4872690920600271776
+            },
+            "Component_[8105157811055641931]": {
+                "$type": "SelectionComponent",
+                "Id": 8105157811055641931
+            },
+            "Component_[8121804356127130254]": {
+                "$type": "EditorLockComponent",
+                "Id": 8121804356127130254
+            },
+            "Component_[9156467458085058309]": {
+                "$type": "EditorPendingCompositionComponent",
+                "Id": 9156467458085058309
+            },
+            "Component_[998572165026441124]": {
+                "$type": "EditorEntitySortComponent",
+                "Id": 998572165026441124,
+                "Child Entity Order": [
+                    "Entity_[1169034670281]"
+                ]
+            }
+        }
+    },
+    "Entities": {
+        "Entity_[1169034670281]": {
+            "Id": "Entity_[1169034670281]",
+            "Name": "Entity1",
+            "Components": {
+                "Component_[11024839750215572075]": {
+                    "$type": "SelectionComponent",
+                    "Id": 11024839750215572075
+                },
+                "Component_[11384176886283708819]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 11384176886283708819,
+                    "Parent Entity": "ContainerEntity"
+                },
+                "Component_[1606410272595503925]": {
+                    "$type": "EditorMaterialComponent",
+                    "Id": 1606410272595503925,
+                    "Controller": {
+                        "Configuration": {
+                            "materials": [
+                                {
+                                    "Key": {
+                                        "materialSlotStableId": 2418540911
+                                    },
+                                    "Value": {
+                                        "MaterialAsset": {
+                                            "assetId": {
+                                                "guid": "{FC69F2F8-F73B-5A0C-B8B7-94BAA45780FC}"
+                                            },
+                                            "assetHint": "materials/presets/pbr/metal_brass_polished.azmaterial"
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                },
+                "Component_[16470114336751653654]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 16470114336751653654,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 11384176886283708819
+                        },
+                        {
+                            "ComponentId": 89717634602996901,
+                            "SortIndex": 1
+                        },
+                        {
+                            "ComponentId": 1606410272595503925,
+                            "SortIndex": 2
+                        }
+                    ]
+                },
+                "Component_[4303036201889516060]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 4303036201889516060
+                },
+                "Component_[44336138790150350]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 44336138790150350
+                },
+                "Component_[4558973254917759795]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 4558973254917759795
+                },
+                "Component_[4674030476408790307]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 4674030476408790307
+                },
+                "Component_[4802851695039968062]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 4802851695039968062
+                },
+                "Component_[5821006029055754615]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 5821006029055754615
+                },
+                "Component_[8587156575497792590]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 8587156575497792590
+                },
+                "Component_[89717634602996901]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 89717634602996901,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{E14975EF-E676-51A4-B826-3EF59CB645AA}",
+                                    "subId": 285127096
+                                },
+                                "assetHint": "testdata/objects/cube/cube.azmodel"
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

AutomatedTesting/Prefabs/TestData/Graphics/CubeChromePolishedPBR.prefab

@@ -0,0 +1,156 @@
+{
+    "ContainerEntity": {
+        "Id": "ContainerEntity",
+        "Name": "CubeChromePolishedPBR",
+        "Components": {
+            "Component_[10194322458002226643]": {
+                "$type": "EditorOnlyEntityComponent",
+                "Id": 10194322458002226643
+            },
+            "Component_[12036481316264753863]": {
+                "$type": "EditorVisibilityComponent",
+                "Id": 12036481316264753863
+            },
+            "Component_[12378089635489881977]": {
+                "$type": "EditorInspectorComponent",
+                "Id": 12378089635489881977
+            },
+            "Component_[14430665156325163680]": {
+                "$type": "EditorPendingCompositionComponent",
+                "Id": 14430665156325163680
+            },
+            "Component_[15205683346512266293]": {
+                "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                "Id": 15205683346512266293,
+                "Parent Entity": ""
+            },
+            "Component_[16051828087924530008]": {
+                "$type": "EditorLockComponent",
+                "Id": 16051828087924530008
+            },
+            "Component_[3910753277078082783]": {
+                "$type": "EditorDisabledCompositionComponent",
+                "Id": 3910753277078082783
+            },
+            "Component_[4999195701117409226]": {
+                "$type": "EditorEntityIconComponent",
+                "Id": 4999195701117409226
+            },
+            "Component_[5435519106043975119]": {
+                "$type": "EditorEntitySortComponent",
+                "Id": 5435519106043975119,
+                "Child Entity Order": [
+                    "Entity_[1315063558345]"
+                ]
+            },
+            "Component_[6762050164377989214]": {
+                "$type": "EditorPrefabComponent",
+                "Id": 6762050164377989214
+            },
+            "Component_[7395721573111063938]": {
+                "$type": "SelectionComponent",
+                "Id": 7395721573111063938
+            }
+        }
+    },
+    "Entities": {
+        "Entity_[1315063558345]": {
+            "Id": "Entity_[1315063558345]",
+            "Name": "Entity1",
+            "Components": {
+                "Component_[11024839750215572075]": {
+                    "$type": "SelectionComponent",
+                    "Id": 11024839750215572075
+                },
+                "Component_[11384176886283708819]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 11384176886283708819,
+                    "Parent Entity": "ContainerEntity"
+                },
+                "Component_[1606410272595503925]": {
+                    "$type": "EditorMaterialComponent",
+                    "Id": 1606410272595503925,
+                    "Controller": {
+                        "Configuration": {
+                            "materials": [
+                                {
+                                    "Key": {
+                                        "materialSlotStableId": 2418540911
+                                    },
+                                    "Value": {
+                                        "MaterialAsset": {
+                                            "assetId": {
+                                                "guid": "{CAF50181-3384-5DF2-9304-C6E48E83C72D}"
+                                            },
+                                            "assetHint": "materials/presets/pbr/metal_chrome_polished.azmaterial"
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                },
+                "Component_[16470114336751653654]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 16470114336751653654,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 11384176886283708819
+                        },
+                        {
+                            "ComponentId": 89717634602996901,
+                            "SortIndex": 1
+                        },
+                        {
+                            "ComponentId": 1606410272595503925,
+                            "SortIndex": 2
+                        }
+                    ]
+                },
+                "Component_[4303036201889516060]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 4303036201889516060
+                },
+                "Component_[44336138790150350]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 44336138790150350
+                },
+                "Component_[4558973254917759795]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 4558973254917759795
+                },
+                "Component_[4674030476408790307]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 4674030476408790307
+                },
+                "Component_[4802851695039968062]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 4802851695039968062
+                },
+                "Component_[5821006029055754615]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 5821006029055754615
+                },
+                "Component_[8587156575497792590]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 8587156575497792590
+                },
+                "Component_[89717634602996901]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 89717634602996901,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{E14975EF-E676-51A4-B826-3EF59CB645AA}",
+                                    "subId": 285127096
+                                },
+                                "assetHint": "testdata/objects/cube/cube.azmodel"
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

AutomatedTesting/Prefabs/TestData/Graphics/CubeCobaltPolishedPBR.prefab

@@ -0,0 +1,156 @@
+{
+    "ContainerEntity": {
+        "Id": "ContainerEntity",
+        "Name": "CubeCobaltPolishedPBR",
+        "Components": {
+            "Component_[12811832964126776693]": {
+                "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                "Id": 12811832964126776693,
+                "Parent Entity": ""
+            },
+            "Component_[13295886036381057017]": {
+                "$type": "EditorPrefabComponent",
+                "Id": 13295886036381057017
+            },
+            "Component_[13767840970182343359]": {
+                "$type": "SelectionComponent",
+                "Id": 13767840970182343359
+            },
+            "Component_[16269039178417460408]": {
+                "$type": "EditorDisabledCompositionComponent",
+                "Id": 16269039178417460408
+            },
+            "Component_[16338942903899315753]": {
+                "$type": "EditorLockComponent",
+                "Id": 16338942903899315753
+            },
+            "Component_[16938354010512315058]": {
+                "$type": "EditorVisibilityComponent",
+                "Id": 16938354010512315058
+            },
+            "Component_[18087692989611771228]": {
+                "$type": "EditorEntitySortComponent",
+                "Id": 18087692989611771228,
+                "Child Entity Order": [
+                    "Entity_[1478272315593]"
+                ]
+            },
+            "Component_[2408892657833094901]": {
+                "$type": "EditorInspectorComponent",
+                "Id": 2408892657833094901
+            },
+            "Component_[3273159330768091937]": {
+                "$type": "EditorPendingCompositionComponent",
+                "Id": 3273159330768091937
+            },
+            "Component_[8251134042453350781]": {
+                "$type": "EditorEntityIconComponent",
+                "Id": 8251134042453350781
+            },
+            "Component_[9830348537229676775]": {
+                "$type": "EditorOnlyEntityComponent",
+                "Id": 9830348537229676775
+            }
+        }
+    },
+    "Entities": {
+        "Entity_[1478272315593]": {
+            "Id": "Entity_[1478272315593]",
+            "Name": "Entity1",
+            "Components": {
+                "Component_[11024839750215572075]": {
+                    "$type": "SelectionComponent",
+                    "Id": 11024839750215572075
+                },
+                "Component_[11384176886283708819]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 11384176886283708819,
+                    "Parent Entity": "ContainerEntity"
+                },
+                "Component_[1606410272595503925]": {
+                    "$type": "EditorMaterialComponent",
+                    "Id": 1606410272595503925,
+                    "Controller": {
+                        "Configuration": {
+                            "materials": [
+                                {
+                                    "Key": {
+                                        "materialSlotStableId": 2418540911
+                                    },
+                                    "Value": {
+                                        "MaterialAsset": {
+                                            "assetId": {
+                                                "guid": "{93DF55AE-8D1B-5AD1-A609-05F1BD9F6EA0}"
+                                            },
+                                            "assetHint": "materials/presets/pbr/metal_cobalt_polished.azmaterial"
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                },
+                "Component_[16470114336751653654]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 16470114336751653654,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 11384176886283708819
+                        },
+                        {
+                            "ComponentId": 89717634602996901,
+                            "SortIndex": 1
+                        },
+                        {
+                            "ComponentId": 1606410272595503925,
+                            "SortIndex": 2
+                        }
+                    ]
+                },
+                "Component_[4303036201889516060]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 4303036201889516060
+                },
+                "Component_[44336138790150350]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 44336138790150350
+                },
+                "Component_[4558973254917759795]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 4558973254917759795
+                },
+                "Component_[4674030476408790307]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 4674030476408790307
+                },
+                "Component_[4802851695039968062]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 4802851695039968062
+                },
+                "Component_[5821006029055754615]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 5821006029055754615
+                },
+                "Component_[8587156575497792590]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 8587156575497792590
+                },
+                "Component_[89717634602996901]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 89717634602996901,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{E14975EF-E676-51A4-B826-3EF59CB645AA}",
+                                    "subId": 285127096
+                                },
+                                "assetHint": "testdata/objects/cube/cube.azmodel"
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

AutomatedTesting/Prefabs/TestData/Graphics/CubeCopperPolishedPBR.prefab

@@ -0,0 +1,156 @@
+{
+    "ContainerEntity": {
+        "Id": "ContainerEntity",
+        "Name": "CubeCopperPolishedPBR",
+        "Components": {
+            "Component_[14120317269315619433]": {
+                "$type": "SelectionComponent",
+                "Id": 14120317269315619433
+            },
+            "Component_[143917687187100454]": {
+                "$type": "EditorInspectorComponent",
+                "Id": 143917687187100454
+            },
+            "Component_[15260876699496078513]": {
+                "$type": "EditorPrefabComponent",
+                "Id": 15260876699496078513
+            },
+            "Component_[1746418914802949089]": {
+                "$type": "EditorOnlyEntityComponent",
+                "Id": 1746418914802949089
+            },
+            "Component_[18443523081045072277]": {
+                "$type": "EditorPendingCompositionComponent",
+                "Id": 18443523081045072277
+            },
+            "Component_[4010874908443542212]": {
+                "$type": "EditorLockComponent",
+                "Id": 4010874908443542212
+            },
+            "Component_[4271734532103635304]": {
+                "$type": "EditorDisabledCompositionComponent",
+                "Id": 4271734532103635304
+            },
+            "Component_[4383829137523954163]": {
+                "$type": "EditorEntityIconComponent",
+                "Id": 4383829137523954163
+            },
+            "Component_[5749675910289562089]": {
+                "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                "Id": 5749675910289562089,
+                "Parent Entity": ""
+            },
+            "Component_[6232920837132171119]": {
+                "$type": "EditorVisibilityComponent",
+                "Id": 6232920837132171119
+            },
+            "Component_[7306146920796854544]": {
+                "$type": "EditorEntitySortComponent",
+                "Id": 7306146920796854544,
+                "Child Entity Order": [
+                    "Entity_[1658660942025]"
+                ]
+            }
+        }
+    },
+    "Entities": {
+        "Entity_[1658660942025]": {
+            "Id": "Entity_[1658660942025]",
+            "Name": "Entity1",
+            "Components": {
+                "Component_[11024839750215572075]": {
+                    "$type": "SelectionComponent",
+                    "Id": 11024839750215572075
+                },
+                "Component_[11384176886283708819]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 11384176886283708819,
+                    "Parent Entity": "ContainerEntity"
+                },
+                "Component_[1606410272595503925]": {
+                    "$type": "EditorMaterialComponent",
+                    "Id": 1606410272595503925,
+                    "Controller": {
+                        "Configuration": {
+                            "materials": [
+                                {
+                                    "Key": {
+                                        "materialSlotStableId": 2418540911
+                                    },
+                                    "Value": {
+                                        "MaterialAsset": {
+                                            "assetId": {
+                                                "guid": "{CF5C7B01-4912-58AE-991A-F25251E505AC}"
+                                            },
+                                            "assetHint": "materials/presets/pbr/metal_copper_polished.azmaterial"
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                },
+                "Component_[16470114336751653654]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 16470114336751653654,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 11384176886283708819
+                        },
+                        {
+                            "ComponentId": 89717634602996901,
+                            "SortIndex": 1
+                        },
+                        {
+                            "ComponentId": 1606410272595503925,
+                            "SortIndex": 2
+                        }
+                    ]
+                },
+                "Component_[4303036201889516060]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 4303036201889516060
+                },
+                "Component_[44336138790150350]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 44336138790150350
+                },
+                "Component_[4558973254917759795]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 4558973254917759795
+                },
+                "Component_[4674030476408790307]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 4674030476408790307
+                },
+                "Component_[4802851695039968062]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 4802851695039968062
+                },
+                "Component_[5821006029055754615]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 5821006029055754615
+                },
+                "Component_[8587156575497792590]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 8587156575497792590
+                },
+                "Component_[89717634602996901]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 89717634602996901,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{E14975EF-E676-51A4-B826-3EF59CB645AA}",
+                                    "subId": 285127096
+                                },
+                                "assetHint": "testdata/objects/cube/cube.azmodel"
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

AutomatedTesting/Prefabs/TestData/Graphics/CubeGoldPolishedPBR.prefab

@@ -0,0 +1,156 @@
+{
+    "ContainerEntity": {
+        "Id": "ContainerEntity",
+        "Name": "CubeGoldPolishedPBR",
+        "Components": {
+            "Component_[10011820011377711118]": {
+                "$type": "EditorLockComponent",
+                "Id": 10011820011377711118
+            },
+            "Component_[10068789746496377466]": {
+                "$type": "EditorPrefabComponent",
+                "Id": 10068789746496377466
+            },
+            "Component_[11570676153379582500]": {
+                "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                "Id": 11570676153379582500,
+                "Parent Entity": ""
+            },
+            "Component_[13003038310843603631]": {
+                "$type": "EditorVisibilityComponent",
+                "Id": 13003038310843603631
+            },
+            "Component_[15807328745370882636]": {
+                "$type": "SelectionComponent",
+                "Id": 15807328745370882636
+            },
+            "Component_[2750440106393392905]": {
+                "$type": "EditorEntitySortComponent",
+                "Id": 2750440106393392905,
+                "Child Entity Order": [
+                    "Entity_[1856229437641]"
+                ]
+            },
+            "Component_[2761752922494043610]": {
+                "$type": "EditorDisabledCompositionComponent",
+                "Id": 2761752922494043610
+            },
+            "Component_[3027606009106407466]": {
+                "$type": "EditorInspectorComponent",
+                "Id": 3027606009106407466
+            },
+            "Component_[4326682049246572673]": {
+                "$type": "EditorPendingCompositionComponent",
+                "Id": 4326682049246572673
+            },
+            "Component_[5821381882600148312]": {
+                "$type": "EditorOnlyEntityComponent",
+                "Id": 5821381882600148312
+            },
+            "Component_[6068739143830165037]": {
+                "$type": "EditorEntityIconComponent",
+                "Id": 6068739143830165037
+            }
+        }
+    },
+    "Entities": {
+        "Entity_[1856229437641]": {
+            "Id": "Entity_[1856229437641]",
+            "Name": "Entity1",
+            "Components": {
+                "Component_[11024839750215572075]": {
+                    "$type": "SelectionComponent",
+                    "Id": 11024839750215572075
+                },
+                "Component_[11384176886283708819]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 11384176886283708819,
+                    "Parent Entity": "ContainerEntity"
+                },
+                "Component_[1606410272595503925]": {
+                    "$type": "EditorMaterialComponent",
+                    "Id": 1606410272595503925,
+                    "Controller": {
+                        "Configuration": {
+                            "materials": [
+                                {
+                                    "Key": {
+                                        "materialSlotStableId": 2418540911
+                                    },
+                                    "Value": {
+                                        "MaterialAsset": {
+                                            "assetId": {
+                                                "guid": "{FB4657EB-FB3A-5EC3-A772-DC36D6F733C3}"
+                                            },
+                                            "assetHint": "materials/presets/pbr/metal_gold_polished.azmaterial"
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                },
+                "Component_[16470114336751653654]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 16470114336751653654,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 11384176886283708819
+                        },
+                        {
+                            "ComponentId": 89717634602996901,
+                            "SortIndex": 1
+                        },
+                        {
+                            "ComponentId": 1606410272595503925,
+                            "SortIndex": 2
+                        }
+                    ]
+                },
+                "Component_[4303036201889516060]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 4303036201889516060
+                },
+                "Component_[44336138790150350]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 44336138790150350
+                },
+                "Component_[4558973254917759795]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 4558973254917759795
+                },
+                "Component_[4674030476408790307]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 4674030476408790307
+                },
+                "Component_[4802851695039968062]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 4802851695039968062
+                },
+                "Component_[5821006029055754615]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 5821006029055754615
+                },
+                "Component_[8587156575497792590]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 8587156575497792590
+                },
+                "Component_[89717634602996901]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 89717634602996901,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{E14975EF-E676-51A4-B826-3EF59CB645AA}",
+                                    "subId": 285127096
+                                },
+                                "assetHint": "testdata/objects/cube/cube.azmodel"
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

AutomatedTesting/Prefabs/TestData/Graphics/CubeIronPolishedPBR.prefab

@@ -0,0 +1,156 @@
+{
+    "ContainerEntity": {
+        "Id": "ContainerEntity",
+        "Name": "CubeIronPolishedPBR",
+        "Components": {
+            "Component_[10744633821142630765]": {
+                "$type": "EditorOnlyEntityComponent",
+                "Id": 10744633821142630765
+            },
+            "Component_[15160812085690623525]": {
+                "$type": "EditorPrefabComponent",
+                "Id": 15160812085690623525
+            },
+            "Component_[17506200912680653288]": {
+                "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                "Id": 17506200912680653288,
+                "Parent Entity": ""
+            },
+            "Component_[1779514216896114299]": {
+                "$type": "EditorDisabledCompositionComponent",
+                "Id": 1779514216896114299
+            },
+            "Component_[2089200513910230823]": {
+                "$type": "EditorPendingCompositionComponent",
+                "Id": 2089200513910230823
+            },
+            "Component_[3904312129158421170]": {
+                "$type": "EditorEntityIconComponent",
+                "Id": 3904312129158421170
+            },
+            "Component_[5126366677360310098]": {
+                "$type": "EditorVisibilityComponent",
+                "Id": 5126366677360310098
+            },
+            "Component_[6443652007083636420]": {
+                "$type": "EditorEntitySortComponent",
+                "Id": 6443652007083636420,
+                "Child Entity Order": [
+                    "Entity_[2070977802441]"
+                ]
+            },
+            "Component_[8531209872369121358]": {
+                "$type": "EditorInspectorComponent",
+                "Id": 8531209872369121358
+            },
+            "Component_[8558242753126803571]": {
+                "$type": "SelectionComponent",
+                "Id": 8558242753126803571
+            },
+            "Component_[8938179055081804896]": {
+                "$type": "EditorLockComponent",
+                "Id": 8938179055081804896
+            }
+        }
+    },
+    "Entities": {
+        "Entity_[2070977802441]": {
+            "Id": "Entity_[2070977802441]",
+            "Name": "Entity1",
+            "Components": {
+                "Component_[11024839750215572075]": {
+                    "$type": "SelectionComponent",
+                    "Id": 11024839750215572075
+                },
+                "Component_[11384176886283708819]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 11384176886283708819,
+                    "Parent Entity": "ContainerEntity"
+                },
+                "Component_[1606410272595503925]": {
+                    "$type": "EditorMaterialComponent",
+                    "Id": 1606410272595503925,
+                    "Controller": {
+                        "Configuration": {
+                            "materials": [
+                                {
+                                    "Key": {
+                                        "materialSlotStableId": 2418540911
+                                    },
+                                    "Value": {
+                                        "MaterialAsset": {
+                                            "assetId": {
+                                                "guid": "{A7F03135-ECAD-5440-99DB-E84ABA3D50DA}"
+                                            },
+                                            "assetHint": "materials/presets/pbr/metal_iron_polished.azmaterial"
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                },
+                "Component_[16470114336751653654]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 16470114336751653654,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 11384176886283708819
+                        },
+                        {
+                            "ComponentId": 89717634602996901,
+                            "SortIndex": 1
+                        },
+                        {
+                            "ComponentId": 1606410272595503925,
+                            "SortIndex": 2
+                        }
+                    ]
+                },
+                "Component_[4303036201889516060]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 4303036201889516060
+                },
+                "Component_[44336138790150350]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 44336138790150350
+                },
+                "Component_[4558973254917759795]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 4558973254917759795
+                },
+                "Component_[4674030476408790307]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 4674030476408790307
+                },
+                "Component_[4802851695039968062]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 4802851695039968062
+                },
+                "Component_[5821006029055754615]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 5821006029055754615
+                },
+                "Component_[8587156575497792590]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 8587156575497792590
+                },
+                "Component_[89717634602996901]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 89717634602996901,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{E14975EF-E676-51A4-B826-3EF59CB645AA}",
+                                    "subId": 285127096
+                                },
+                                "assetHint": "testdata/objects/cube/cube.azmodel"
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

AutomatedTesting/Prefabs/TestData/Graphics/CubeMercuryPBR.prefab

@@ -0,0 +1,156 @@
+{
+    "ContainerEntity": {
+        "Id": "ContainerEntity",
+        "Name": "CubeMercuryPBR",
+        "Components": {
+            "Component_[11796219437064669544]": {
+                "$type": "SelectionComponent",
+                "Id": 11796219437064669544
+            },
+            "Component_[12551667429170676889]": {
+                "$type": "EditorPrefabComponent",
+                "Id": 12551667429170676889
+            },
+            "Component_[12693460746131498096]": {
+                "$type": "EditorInspectorComponent",
+                "Id": 12693460746131498096
+            },
+            "Component_[14262931207267008977]": {
+                "$type": "EditorEntityIconComponent",
+                "Id": 14262931207267008977
+            },
+            "Component_[18045441039226816973]": {
+                "$type": "EditorEntitySortComponent",
+                "Id": 18045441039226816973,
+                "Child Entity Order": [
+                    "Entity_[928516501705]"
+                ]
+            },
+            "Component_[2268958959705742396]": {
+                "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                "Id": 2268958959705742396,
+                "Parent Entity": ""
+            },
+            "Component_[3379321424051234761]": {
+                "$type": "EditorVisibilityComponent",
+                "Id": 3379321424051234761
+            },
+            "Component_[3967973434353405611]": {
+                "$type": "EditorLockComponent",
+                "Id": 3967973434353405611
+            },
+            "Component_[6260092263143569388]": {
+                "$type": "EditorDisabledCompositionComponent",
+                "Id": 6260092263143569388
+            },
+            "Component_[6596926416684557718]": {
+                "$type": "EditorOnlyEntityComponent",
+                "Id": 6596926416684557718
+            },
+            "Component_[9068640134216835201]": {
+                "$type": "EditorPendingCompositionComponent",
+                "Id": 9068640134216835201
+            }
+        }
+    },
+    "Entities": {
+        "Entity_[928516501705]": {
+            "Id": "Entity_[928516501705]",
+            "Name": "Entity1",
+            "Components": {
+                "Component_[11024839750215572075]": {
+                    "$type": "SelectionComponent",
+                    "Id": 11024839750215572075
+                },
+                "Component_[11384176886283708819]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 11384176886283708819,
+                    "Parent Entity": "ContainerEntity"
+                },
+                "Component_[1606410272595503925]": {
+                    "$type": "EditorMaterialComponent",
+                    "Id": 1606410272595503925,
+                    "Controller": {
+                        "Configuration": {
+                            "materials": [
+                                {
+                                    "Key": {
+                                        "materialSlotStableId": 2418540911
+                                    },
+                                    "Value": {
+                                        "MaterialAsset": {
+                                            "assetId": {
+                                                "guid": "{F2AD0EBF-7137-58D1-9991-9552FAD41B19}"
+                                            },
+                                            "assetHint": "materials/presets/pbr/metal_mercury.azmaterial"
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                },
+                "Component_[16470114336751653654]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 16470114336751653654,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 11384176886283708819
+                        },
+                        {
+                            "ComponentId": 89717634602996901,
+                            "SortIndex": 1
+                        },
+                        {
+                            "ComponentId": 1606410272595503925,
+                            "SortIndex": 2
+                        }
+                    ]
+                },
+                "Component_[4303036201889516060]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 4303036201889516060
+                },
+                "Component_[44336138790150350]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 44336138790150350
+                },
+                "Component_[4558973254917759795]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 4558973254917759795
+                },
+                "Component_[4674030476408790307]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 4674030476408790307
+                },
+                "Component_[4802851695039968062]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 4802851695039968062
+                },
+                "Component_[5821006029055754615]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 5821006029055754615
+                },
+                "Component_[8587156575497792590]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 8587156575497792590
+                },
+                "Component_[89717634602996901]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 89717634602996901,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{E14975EF-E676-51A4-B826-3EF59CB645AA}",
+                                    "subId": 285127096
+                                },
+                                "assetHint": "testdata/objects/cube/cube.azmodel"
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

AutomatedTesting/Prefabs/TestData/Graphics/CubeNickelPolishedPBR.prefab

@@ -0,0 +1,156 @@
+{
+    "ContainerEntity": {
+        "Id": "ContainerEntity",
+        "Name": "CubeNickelPolishedPBR",
+        "Components": {
+            "Component_[10826024012928681054]": {
+                "$type": "EditorPendingCompositionComponent",
+                "Id": 10826024012928681054
+            },
+            "Component_[12821987693261496174]": {
+                "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                "Id": 12821987693261496174,
+                "Parent Entity": ""
+            },
+            "Component_[1347237730046420905]": {
+                "$type": "EditorDisabledCompositionComponent",
+                "Id": 1347237730046420905
+            },
+            "Component_[13962868105035894085]": {
+                "$type": "EditorInspectorComponent",
+                "Id": 13962868105035894085
+            },
+            "Component_[17956955568472089321]": {
+                "$type": "EditorOnlyEntityComponent",
+                "Id": 17956955568472089321
+            },
+            "Component_[1982369816302736367]": {
+                "$type": "EditorLockComponent",
+                "Id": 1982369816302736367
+            },
+            "Component_[2765278216943439310]": {
+                "$type": "EditorEntityIconComponent",
+                "Id": 2765278216943439310
+            },
+            "Component_[2823302329697962266]": {
+                "$type": "SelectionComponent",
+                "Id": 2823302329697962266
+            },
+            "Component_[5490362878017390612]": {
+                "$type": "EditorVisibilityComponent",
+                "Id": 5490362878017390612
+            },
+            "Component_[7468073145776592577]": {
+                "$type": "EditorEntitySortComponent",
+                "Id": 7468073145776592577,
+                "Child Entity Order": [
+                    "Entity_[2302906036425]"
+                ]
+            },
+            "Component_[7692885660975737763]": {
+                "$type": "EditorPrefabComponent",
+                "Id": 7692885660975737763
+            }
+        }
+    },
+    "Entities": {
+        "Entity_[2302906036425]": {
+            "Id": "Entity_[2302906036425]",
+            "Name": "Entity1",
+            "Components": {
+                "Component_[11024839750215572075]": {
+                    "$type": "SelectionComponent",
+                    "Id": 11024839750215572075
+                },
+                "Component_[11384176886283708819]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 11384176886283708819,
+                    "Parent Entity": "ContainerEntity"
+                },
+                "Component_[1606410272595503925]": {
+                    "$type": "EditorMaterialComponent",
+                    "Id": 1606410272595503925,
+                    "Controller": {
+                        "Configuration": {
+                            "materials": [
+                                {
+                                    "Key": {
+                                        "materialSlotStableId": 2418540911
+                                    },
+                                    "Value": {
+                                        "MaterialAsset": {
+                                            "assetId": {
+                                                "guid": "{E66E4343-F45A-536D-AAE1-C4D096420640}"
+                                            },
+                                            "assetHint": "materials/presets/pbr/metal_nickel_polished.azmaterial"
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                },
+                "Component_[16470114336751653654]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 16470114336751653654,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 11384176886283708819
+                        },
+                        {
+                            "ComponentId": 89717634602996901,
+                            "SortIndex": 1
+                        },
+                        {
+                            "ComponentId": 1606410272595503925,
+                            "SortIndex": 2
+                        }
+                    ]
+                },
+                "Component_[4303036201889516060]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 4303036201889516060
+                },
+                "Component_[44336138790150350]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 44336138790150350
+                },
+                "Component_[4558973254917759795]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 4558973254917759795
+                },
+                "Component_[4674030476408790307]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 4674030476408790307
+                },
+                "Component_[4802851695039968062]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 4802851695039968062
+                },
+                "Component_[5821006029055754615]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 5821006029055754615
+                },
+                "Component_[8587156575497792590]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 8587156575497792590
+                },
+                "Component_[89717634602996901]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 89717634602996901,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{E14975EF-E676-51A4-B826-3EF59CB645AA}",
+                                    "subId": 285127096
+                                },
+                                "assetHint": "testdata/objects/cube/cube.azmodel"
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

AutomatedTesting/Prefabs/TestData/Graphics/CubePalladiumPolishedPBR.prefab

@@ -0,0 +1,156 @@
+{
+    "ContainerEntity": {
+        "Id": "ContainerEntity",
+        "Name": "CubePalladiumPolishedPBR",
+        "Components": {
+            "Component_[10678536274818457672]": {
+                "$type": "EditorInspectorComponent",
+                "Id": 10678536274818457672
+            },
+            "Component_[12041428694628704247]": {
+                "$type": "EditorPendingCompositionComponent",
+                "Id": 12041428694628704247
+            },
+            "Component_[12143022343588526078]": {
+                "$type": "EditorDisabledCompositionComponent",
+                "Id": 12143022343588526078
+            },
+            "Component_[15178316190409605112]": {
+                "$type": "EditorVisibilityComponent",
+                "Id": 15178316190409605112
+            },
+            "Component_[16012620721047170064]": {
+                "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                "Id": 16012620721047170064,
+                "Parent Entity": ""
+            },
+            "Component_[1646888921009876369]": {
+                "$type": "EditorPrefabComponent",
+                "Id": 1646888921009876369
+            },
+            "Component_[17677550467282239311]": {
+                "$type": "EditorEntitySortComponent",
+                "Id": 17677550467282239311,
+                "Child Entity Order": [
+                    "Entity_[2552014139593]"
+                ]
+            },
+            "Component_[4972639499125068141]": {
+                "$type": "EditorLockComponent",
+                "Id": 4972639499125068141
+            },
+            "Component_[5526570610744382545]": {
+                "$type": "SelectionComponent",
+                "Id": 5526570610744382545
+            },
+            "Component_[6509459924043770606]": {
+                "$type": "EditorOnlyEntityComponent",
+                "Id": 6509459924043770606
+            },
+            "Component_[7268409859686144269]": {
+                "$type": "EditorEntityIconComponent",
+                "Id": 7268409859686144269
+            }
+        }
+    },
+    "Entities": {
+        "Entity_[2552014139593]": {
+            "Id": "Entity_[2552014139593]",
+            "Name": "Entity1",
+            "Components": {
+                "Component_[11024839750215572075]": {
+                    "$type": "SelectionComponent",
+                    "Id": 11024839750215572075
+                },
+                "Component_[11384176886283708819]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 11384176886283708819,
+                    "Parent Entity": "ContainerEntity"
+                },
+                "Component_[1606410272595503925]": {
+                    "$type": "EditorMaterialComponent",
+                    "Id": 1606410272595503925,
+                    "Controller": {
+                        "Configuration": {
+                            "materials": [
+                                {
+                                    "Key": {
+                                        "materialSlotStableId": 2418540911
+                                    },
+                                    "Value": {
+                                        "MaterialAsset": {
+                                            "assetId": {
+                                                "guid": "{D0E9960A-4B31-5136-BAC6-5482B203D3B4}"
+                                            },
+                                            "assetHint": "materials/presets/pbr/metal_palladium_polished.azmaterial"
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                },
+                "Component_[16470114336751653654]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 16470114336751653654,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 11384176886283708819
+                        },
+                        {
+                            "ComponentId": 89717634602996901,
+                            "SortIndex": 1
+                        },
+                        {
+                            "ComponentId": 1606410272595503925,
+                            "SortIndex": 2
+                        }
+                    ]
+                },
+                "Component_[4303036201889516060]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 4303036201889516060
+                },
+                "Component_[44336138790150350]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 44336138790150350
+                },
+                "Component_[4558973254917759795]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 4558973254917759795
+                },
+                "Component_[4674030476408790307]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 4674030476408790307
+                },
+                "Component_[4802851695039968062]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 4802851695039968062
+                },
+                "Component_[5821006029055754615]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 5821006029055754615
+                },
+                "Component_[8587156575497792590]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 8587156575497792590
+                },
+                "Component_[89717634602996901]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 89717634602996901,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{E14975EF-E676-51A4-B826-3EF59CB645AA}",
+                                    "subId": 285127096
+                                },
+                                "assetHint": "testdata/objects/cube/cube.azmodel"
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

AutomatedTesting/Prefabs/TestData/Graphics/CubePlatinumPolishedPBR.prefab

@@ -0,0 +1,156 @@
+{
+    "ContainerEntity": {
+        "Id": "ContainerEntity",
+        "Name": "CubePlatinumPolishedPBR",
+        "Components": {
+            "Component_[12172311178585433096]": {
+                "$type": "EditorEntityIconComponent",
+                "Id": 12172311178585433096
+            },
+            "Component_[14133734575774270778]": {
+                "$type": "EditorDisabledCompositionComponent",
+                "Id": 14133734575774270778
+            },
+            "Component_[1499102502234135899]": {
+                "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                "Id": 1499102502234135899,
+                "Parent Entity": ""
+            },
+            "Component_[17753826932279572795]": {
+                "$type": "EditorOnlyEntityComponent",
+                "Id": 17753826932279572795
+            },
+            "Component_[3472150728361446089]": {
+                "$type": "EditorPrefabComponent",
+                "Id": 3472150728361446089
+            },
+            "Component_[5413614787652013946]": {
+                "$type": "EditorLockComponent",
+                "Id": 5413614787652013946
+            },
+            "Component_[6608132617418028580]": {
+                "$type": "EditorEntitySortComponent",
+                "Id": 6608132617418028580,
+                "Child Entity Order": [
+                    "Entity_[2818302111945]"
+                ]
+            },
+            "Component_[6809102061425149362]": {
+                "$type": "EditorInspectorComponent",
+                "Id": 6809102061425149362
+            },
+            "Component_[6916818921856882722]": {
+                "$type": "EditorPendingCompositionComponent",
+                "Id": 6916818921856882722
+            },
+            "Component_[7486700682637381880]": {
+                "$type": "SelectionComponent",
+                "Id": 7486700682637381880
+            },
+            "Component_[7993011597330638847]": {
+                "$type": "EditorVisibilityComponent",
+                "Id": 7993011597330638847
+            }
+        }
+    },
+    "Entities": {
+        "Entity_[2818302111945]": {
+            "Id": "Entity_[2818302111945]",
+            "Name": "Entity1",
+            "Components": {
+                "Component_[11024839750215572075]": {
+                    "$type": "SelectionComponent",
+                    "Id": 11024839750215572075
+                },
+                "Component_[11384176886283708819]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 11384176886283708819,
+                    "Parent Entity": "ContainerEntity"
+                },
+                "Component_[1606410272595503925]": {
+                    "$type": "EditorMaterialComponent",
+                    "Id": 1606410272595503925,
+                    "Controller": {
+                        "Configuration": {
+                            "materials": [
+                                {
+                                    "Key": {
+                                        "materialSlotStableId": 2418540911
+                                    },
+                                    "Value": {
+                                        "MaterialAsset": {
+                                            "assetId": {
+                                                "guid": "{79419183-FFCE-5A89-AA16-C2789D81AF75}"
+                                            },
+                                            "assetHint": "materials/presets/pbr/metal_platinum_polished.azmaterial"
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                },
+                "Component_[16470114336751653654]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 16470114336751653654,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 11384176886283708819
+                        },
+                        {
+                            "ComponentId": 89717634602996901,
+                            "SortIndex": 1
+                        },
+                        {
+                            "ComponentId": 1606410272595503925,
+                            "SortIndex": 2
+                        }
+                    ]
+                },
+                "Component_[4303036201889516060]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 4303036201889516060
+                },
+                "Component_[44336138790150350]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 44336138790150350
+                },
+                "Component_[4558973254917759795]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 4558973254917759795
+                },
+                "Component_[4674030476408790307]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 4674030476408790307
+                },
+                "Component_[4802851695039968062]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 4802851695039968062
+                },
+                "Component_[5821006029055754615]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 5821006029055754615
+                },
+                "Component_[8587156575497792590]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 8587156575497792590
+                },
+                "Component_[89717634602996901]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 89717634602996901,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{E14975EF-E676-51A4-B826-3EF59CB645AA}",
+                                    "subId": 285127096
+                                },
+                                "assetHint": "testdata/objects/cube/cube.azmodel"
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

AutomatedTesting/Prefabs/TestData/Graphics/CubeSilverPolishedPBR.prefab

@@ -0,0 +1,156 @@
+{
+    "ContainerEntity": {
+        "Id": "ContainerEntity",
+        "Name": "CubeSilverPolishedPBR",
+        "Components": {
+            "Component_[10846467226799581471]": {
+                "$type": "EditorPrefabComponent",
+                "Id": 10846467226799581471
+            },
+            "Component_[11321068769303258722]": {
+                "$type": "SelectionComponent",
+                "Id": 11321068769303258722
+            },
+            "Component_[14255141886015898000]": {
+                "$type": "EditorDisabledCompositionComponent",
+                "Id": 14255141886015898000
+            },
+            "Component_[14442599743555977836]": {
+                "$type": "EditorLockComponent",
+                "Id": 14442599743555977836
+            },
+            "Component_[15390328167304917483]": {
+                "$type": "EditorOnlyEntityComponent",
+                "Id": 15390328167304917483
+            },
+            "Component_[16667892946203958068]": {
+                "$type": "EditorInspectorComponent",
+                "Id": 16667892946203958068
+            },
+            "Component_[17957849336986334052]": {
+                "$type": "EditorPendingCompositionComponent",
+                "Id": 17957849336986334052
+            },
+            "Component_[18049054501916401618]": {
+                "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                "Id": 18049054501916401618,
+                "Parent Entity": ""
+            },
+            "Component_[362051120594559781]": {
+                "$type": "EditorVisibilityComponent",
+                "Id": 362051120594559781
+            },
+            "Component_[5852346937789040993]": {
+                "$type": "EditorEntitySortComponent",
+                "Id": 5852346937789040993,
+                "Child Entity Order": [
+                    "Entity_[3101769953481]"
+                ]
+            },
+            "Component_[7250311833503679341]": {
+                "$type": "EditorEntityIconComponent",
+                "Id": 7250311833503679341
+            }
+        }
+    },
+    "Entities": {
+        "Entity_[3101769953481]": {
+            "Id": "Entity_[3101769953481]",
+            "Name": "Entity1",
+            "Components": {
+                "Component_[11024839750215572075]": {
+                    "$type": "SelectionComponent",
+                    "Id": 11024839750215572075
+                },
+                "Component_[11384176886283708819]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 11384176886283708819,
+                    "Parent Entity": "ContainerEntity"
+                },
+                "Component_[1606410272595503925]": {
+                    "$type": "EditorMaterialComponent",
+                    "Id": 1606410272595503925,
+                    "Controller": {
+                        "Configuration": {
+                            "materials": [
+                                {
+                                    "Key": {
+                                        "materialSlotStableId": 2418540911
+                                    },
+                                    "Value": {
+                                        "MaterialAsset": {
+                                            "assetId": {
+                                                "guid": "{2AC06FA3-7670-542E-8996-DF346AFF1B61}"
+                                            },
+                                            "assetHint": "materials/presets/pbr/metal_silver_polished.azmaterial"
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                },
+                "Component_[16470114336751653654]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 16470114336751653654,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 11384176886283708819
+                        },
+                        {
+                            "ComponentId": 89717634602996901,
+                            "SortIndex": 1
+                        },
+                        {
+                            "ComponentId": 1606410272595503925,
+                            "SortIndex": 2
+                        }
+                    ]
+                },
+                "Component_[4303036201889516060]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 4303036201889516060
+                },
+                "Component_[44336138790150350]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 44336138790150350
+                },
+                "Component_[4558973254917759795]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 4558973254917759795
+                },
+                "Component_[4674030476408790307]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 4674030476408790307
+                },
+                "Component_[4802851695039968062]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 4802851695039968062
+                },
+                "Component_[5821006029055754615]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 5821006029055754615
+                },
+                "Component_[8587156575497792590]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 8587156575497792590
+                },
+                "Component_[89717634602996901]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 89717634602996901,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{E14975EF-E676-51A4-B826-3EF59CB645AA}",
+                                    "subId": 285127096
+                                },
+                                "assetHint": "testdata/objects/cube/cube.azmodel"
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

AutomatedTesting/Prefabs/TestData/Graphics/CubeTitaniumPolishedPBR.prefab

@@ -0,0 +1,156 @@
+{
+    "ContainerEntity": {
+        "Id": "ContainerEntity",
+        "Name": "CubeTitaniumPolishedPBR",
+        "Components": {
+            "Component_[11835136016071721229]": {
+                "$type": "EditorInspectorComponent",
+                "Id": 11835136016071721229
+            },
+            "Component_[14924371629431224666]": {
+                "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                "Id": 14924371629431224666,
+                "Parent Entity": ""
+            },
+            "Component_[15534521734777674027]": {
+                "$type": "EditorPrefabComponent",
+                "Id": 15534521734777674027
+            },
+            "Component_[16612248066971579226]": {
+                "$type": "SelectionComponent",
+                "Id": 16612248066971579226
+            },
+            "Component_[16806731875899878085]": {
+                "$type": "EditorLockComponent",
+                "Id": 16806731875899878085
+            },
+            "Component_[3294763415970396682]": {
+                "$type": "EditorOnlyEntityComponent",
+                "Id": 3294763415970396682
+            },
+            "Component_[3871617444656658973]": {
+                "$type": "EditorEntitySortComponent",
+                "Id": 3871617444656658973,
+                "Child Entity Order": [
+                    "Entity_[3406712631497]"
+                ]
+            },
+            "Component_[6604961087017250006]": {
+                "$type": "EditorEntityIconComponent",
+                "Id": 6604961087017250006
+            },
+            "Component_[6721284225512452216]": {
+                "$type": "EditorDisabledCompositionComponent",
+                "Id": 6721284225512452216
+            },
+            "Component_[8673188027501037544]": {
+                "$type": "EditorPendingCompositionComponent",
+                "Id": 8673188027501037544
+            },
+            "Component_[9993323762911548658]": {
+                "$type": "EditorVisibilityComponent",
+                "Id": 9993323762911548658
+            }
+        }
+    },
+    "Entities": {
+        "Entity_[3406712631497]": {
+            "Id": "Entity_[3406712631497]",
+            "Name": "Entity1",
+            "Components": {
+                "Component_[11024839750215572075]": {
+                    "$type": "SelectionComponent",
+                    "Id": 11024839750215572075
+                },
+                "Component_[11384176886283708819]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 11384176886283708819,
+                    "Parent Entity": "ContainerEntity"
+                },
+                "Component_[1606410272595503925]": {
+                    "$type": "EditorMaterialComponent",
+                    "Id": 1606410272595503925,
+                    "Controller": {
+                        "Configuration": {
+                            "materials": [
+                                {
+                                    "Key": {
+                                        "materialSlotStableId": 2418540911
+                                    },
+                                    "Value": {
+                                        "MaterialAsset": {
+                                            "assetId": {
+                                                "guid": "{3F0DF0C4-5F23-5EB1-B762-7344AFFDC011}"
+                                            },
+                                            "assetHint": "materials/presets/pbr/metal_titanium_polished.azmaterial"
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                },
+                "Component_[16470114336751653654]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 16470114336751653654,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 11384176886283708819
+                        },
+                        {
+                            "ComponentId": 89717634602996901,
+                            "SortIndex": 1
+                        },
+                        {
+                            "ComponentId": 1606410272595503925,
+                            "SortIndex": 2
+                        }
+                    ]
+                },
+                "Component_[4303036201889516060]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 4303036201889516060
+                },
+                "Component_[44336138790150350]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 44336138790150350
+                },
+                "Component_[4558973254917759795]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 4558973254917759795
+                },
+                "Component_[4674030476408790307]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 4674030476408790307
+                },
+                "Component_[4802851695039968062]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 4802851695039968062
+                },
+                "Component_[5821006029055754615]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 5821006029055754615
+                },
+                "Component_[8587156575497792590]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 8587156575497792590
+                },
+                "Component_[89717634602996901]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 89717634602996901,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{E14975EF-E676-51A4-B826-3EF59CB645AA}",
+                                    "subId": 285127096
+                                },
+                                "assetHint": "testdata/objects/cube/cube.azmodel"
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

Code/Editor/Core/LevelEditorMenuHandler.cpp

@@ -538,6 +538,7 @@ void LevelEditorMenuHandler::PopulateEditMenu(ActionManager::MenuWrapper& editMe
     auto snapMenu = modifyMenu.AddMenu(tr("Snap"));
 
     snapMenu.AddAction(AzToolsFramework::SnapAngle);
+    snapMenu.AddAction(AzToolsFramework::SnapToGrid);
 
     auto transformModeMenu = modifyMenu.AddMenu(tr("Transform Mode"));
     transformModeMenu.AddAction(AzToolsFramework::EditModeMove);
@@ -723,7 +724,8 @@ QMenu* LevelEditorMenuHandler::CreateViewMenu()
     // MISSING AVIRECORDER
 
     viewportViewsMenuWrapper.AddSeparator();
-    viewportViewsMenuWrapper.AddAction(ID_DISPLAY_SHOWHELPERS);
+    viewportViewsMenuWrapper.AddAction(AzToolsFramework::Helpers);
+    viewportViewsMenuWrapper.AddAction(AzToolsFramework::Icons);
 
     // Refresh Style
     viewMenu.AddAction(ID_SKINS_REFRESH);

Code/Editor/CryEdit.cpp

@@ -445,7 +445,6 @@ void CCryEditApp::RegisterActionHandlers()
     ON_COMMAND(ID_OPEN_ASSET_BROWSER, OnOpenAssetBrowserView)
     ON_COMMAND(ID_OPEN_AUDIO_CONTROLS_BROWSER, OnOpenAudioControlsEditor)
 
-    ON_COMMAND(ID_DISPLAY_SHOWHELPERS, OnShowHelpers)
     ON_COMMAND(ID_OPEN_TRACKVIEW, OnOpenTrackView)
     ON_COMMAND(ID_OPEN_UICANVASEDITOR, OnOpenUICanvasEditor)
 
@@ -2617,12 +2616,6 @@ void CCryEditApp::OnUpdateSelected(QAction* action)
     action->setEnabled(!GetIEditor()->GetSelection()->IsEmpty());
 }
 
-void CCryEditApp::OnShowHelpers()
-{
-    GetIEditor()->GetDisplaySettings()->DisplayHelpers(!GetIEditor()->GetDisplaySettings()->IsDisplayHelpers());
-    GetIEditor()->Notify(eNotify_OnDisplayRenderUpdate);
-}
-
 //////////////////////////////////////////////////////////////////////////
 void CCryEditApp::OnEditLevelData()
 {

Code/Editor/CryEdit.h

@@ -237,7 +237,6 @@ public:
     void OnSyncPlayerUpdate(QAction* action);
     void OnResourcesReduceworkingset();
     void OnDummyCommand() {};
-    void OnShowHelpers();
     void OnFileSave();
     void OnUpdateDocumentReady(QAction* action);
     void OnUpdateFileOpen(QAction* action);

Code/Editor/DisplaySettings.cpp

@@ -68,8 +68,6 @@ void CDisplaySettings::SetObjectHideMask(int hideMask)
     m_objectHideMask = hideMask;
 
     gSettings.objectHideMask = m_objectHideMask;
-
-    GetIEditor()->Notify(eNotify_OnDisplayRenderUpdate);
 };
 
 //////////////////////////////////////////////////////////////////////////

Code/Editor/EditorViewportWidget.cpp

@@ -46,6 +46,7 @@
 #include <AzToolsFramework/API/EditorCameraBus.h>
 #include <AzToolsFramework/API/ViewportEditorModeTrackerInterface.h>
 #include <AzToolsFramework/Manipulators/ManipulatorManager.h>
+#include <AzToolsFramework/Viewport/ViewportSettings.h>
 #include <AzToolsFramework/ViewportSelection/EditorInteractionSystemViewportSelectionRequestBus.h>
 #include <AzToolsFramework/ViewportSelection/EditorTransformComponentSelectionRequestBus.h>
 
@@ -1621,14 +1622,14 @@ Vec3 EditorViewportWidget::ViewToWorld(
     auto ray = m_renderViewport->ViewportScreenToWorldRay(AzToolsFramework::ViewportInteraction::ScreenPointFromQPoint(vp));
 
     const float maxDistance = 10000.f;
-    Vec3 v = AZVec3ToLYVec3(ray.direction) * maxDistance;
+    Vec3 v = AZVec3ToLYVec3(ray.m_direction) * maxDistance;
 
     if (!_finite(v.x) || !_finite(v.y) || !_finite(v.z))
     {
         return Vec3(0, 0, 0);
     }
 
-    Vec3 colp = AZVec3ToLYVec3(ray.origin) + 0.002f * v;
+    Vec3 colp = AZVec3ToLYVec3(ray.m_origin) + 0.002f * v;
 
     return colp;
 }
@@ -2420,6 +2421,16 @@ AZ::Vector3 EditorViewportSettings::DefaultEditorCameraPosition() const
     return SandboxEditor::CameraDefaultEditorPosition();
 }
 
+bool EditorViewportSettings::IconsVisible() const
+{
+    return AzToolsFramework::IconsVisible();
+}
+
+bool EditorViewportSettings::HelpersVisible() const
+{
+    return AzToolsFramework::HelpersVisible();
+}
+
 AZ_CVAR_EXTERNED(bool, ed_previewGameInFullscreen_once);
 
 bool EditorViewportWidget::ShouldPreviewFullscreen() const

Code/Editor/EditorViewportWidget.h

@@ -79,6 +79,8 @@ struct EditorViewportSettings : public AzToolsFramework::ViewportInteraction::Vi
     float ManipulatorCircleBoundWidth() const override;
     bool StickySelectEnabled() const override;
     AZ::Vector3 DefaultEditorCameraPosition() const override;
+    bool IconsVisible() const override;
+    bool HelpersVisible() const override;
 };
 
 // EditorViewportWidget window

Code/Editor/IEditor.h

@@ -168,8 +168,6 @@ enum EEditorNotifyEvent
     eNotify_OnVegetationObjectSelection, // When vegetation objects selection change.
     eNotify_OnVegetationPanelUpdate,   // When vegetation objects selection change.
 
-    eNotify_OnDisplayRenderUpdate,     // Sent when editor finish terrain texture generation.
-
     eNotify_OnDataBaseUpdate,          // DataBase Library was modified.
 
     eNotify_OnLayerImportBegin,         //layer import was started

Code/Editor/MainWindow.cpp

@@ -47,6 +47,7 @@ AZ_POP_DISABLE_WARNING
 #include <AzToolsFramework/API/EditorAnimationSystemRequestBus.h>
 #include <AzToolsFramework/SourceControl/QtSourceControlNotificationHandler.h>
 #include <AzToolsFramework/PythonTerminal/ScriptTermDialog.h>
+#include <AzToolsFramework/Viewport/ViewportSettings.h>
 #include <AzToolsFramework/ViewportSelection/EditorTransformComponentSelectionRequestBus.h>
 
 // AzQtComponents
@@ -445,11 +446,11 @@ void MainWindow::Initialize()
 {
     m_viewPaneManager->SetMainWindow(m_viewPaneHost, &m_settings, /*unused*/ QByteArray());
 
+    InitActions();
+
     RegisterStdViewClasses();
     InitCentralWidget();
 
-    InitActions();
-
     // load toolbars ("shelves") and macros
     GetIEditor()->GetToolBoxManager()->Load(m_actionManager);
 
@@ -798,27 +799,40 @@ void MainWindow::InitActions()
                     EditorTransformComponentSelectionRequests::Mode::Scale);
             });
 
-    am->AddAction(AzToolsFramework::SnapToGrid, tr("Snap to grid"))
+    am->AddAction(AzToolsFramework::SnapToGrid, tr("Grid snapping"))
         .SetIcon(Style::icon("Grid"))
+        .SetStatusTip(tr("Toggle grid snapping"))
         .SetShortcut(tr("G"))
-        .SetToolTip(tr("Snap to grid (G)"))
-        .SetStatusTip(tr("Toggles snap to grid"))
         .SetCheckable(true)
-        .RegisterUpdateCallback([](QAction* action) {
-            Q_ASSERT(action->isCheckable());
-            action->setChecked(SandboxEditor::GridSnappingEnabled());
-        })
-        .Connect(&QAction::triggered, []() { SandboxEditor::SetGridSnapping(!SandboxEditor::GridSnappingEnabled()); });
+        .RegisterUpdateCallback(
+            [](QAction* action)
+            {
+                Q_ASSERT(action->isCheckable());
+                action->setChecked(SandboxEditor::GridSnappingEnabled());
+            })
+        .Connect(
+            &QAction::triggered,
+            []
+            {
+                SandboxEditor::SetGridSnapping(!SandboxEditor::GridSnappingEnabled());
+            });
 
-    am->AddAction(AzToolsFramework::SnapAngle, tr("Snap angle"))
+    am->AddAction(AzToolsFramework::SnapAngle, tr("Angle snapping"))
         .SetIcon(Style::icon("Angle"))
-        .SetStatusTip(tr("Snap angle"))
+        .SetStatusTip(tr("Toggle angle snapping"))
         .SetCheckable(true)
-        .RegisterUpdateCallback([](QAction* action) {
-            Q_ASSERT(action->isCheckable());
-            action->setChecked(SandboxEditor::AngleSnappingEnabled());
-        })
-        .Connect(&QAction::triggered, []() { SandboxEditor::SetAngleSnapping(!SandboxEditor::AngleSnappingEnabled()); });
+        .RegisterUpdateCallback(
+            [](QAction* action)
+            {
+                Q_ASSERT(action->isCheckable());
+                action->setChecked(SandboxEditor::AngleSnappingEnabled());
+            })
+        .Connect(
+            &QAction::triggered,
+            []
+            {
+                SandboxEditor::SetAngleSnapping(!SandboxEditor::AngleSnappingEnabled());
+            });
 
     // Display actions
     am->AddAction(ID_SWITCHCAMERA_DEFAULTCAMERA, tr("Default Camera")).SetCheckable(true)
@@ -918,9 +932,41 @@ void MainWindow::InitActions()
         .SetStatusTip(tr("Cycle 2D Viewport"))
         .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateNonGameMode);
 #endif
-    am->AddAction(ID_DISPLAY_SHOWHELPERS, tr("Show/Hide Helpers"))
+    am->AddAction(AzToolsFramework::Helpers, tr("Show Helpers"))
         .SetShortcut(tr("Shift+Space"))
-        .SetToolTip(tr("Show/Hide Helpers (Shift+Space)"));
+        .SetToolTip(tr("Show/Hide Helpers (Shift+Space)"))
+        .SetCheckable(true)
+        .RegisterUpdateCallback(
+            [](QAction* action)
+            {
+                Q_ASSERT(action->isCheckable());
+                action->setChecked(AzToolsFramework::HelpersVisible());
+            })
+        .Connect(
+            &QAction::triggered,
+            []()
+            {
+                AzToolsFramework::SetHelpersVisible(!AzToolsFramework::HelpersVisible());
+                AzToolsFramework::ViewportInteraction::ViewportSettingsNotificationBus::Broadcast(
+                    &AzToolsFramework::ViewportInteraction::ViewportSettingNotifications::OnDrawHelpersChanged,
+                    AzToolsFramework::HelpersVisible());
+            });
+    am->AddAction(AzToolsFramework::Icons, tr("Show Icons"))
+        .SetShortcut(tr("Ctrl+Space"))
+        .SetToolTip(tr("Show/Hide Icons (Ctrl+Space)"))
+        .SetCheckable(true)
+        .RegisterUpdateCallback(
+            [](QAction* action)
+            {
+                Q_ASSERT(action->isCheckable());
+                action->setChecked(AzToolsFramework::IconsVisible());
+            })
+        .Connect(
+            &QAction::triggered,
+            []()
+            {
+                AzToolsFramework::SetIconsVisible(!AzToolsFramework::IconsVisible());
+            });
 
     // Audio actions
     am->AddAction(ID_SOUND_STOPALLSOUNDS, tr("Stop All Sounds"))

Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp

@@ -1986,8 +1986,3 @@ void SandboxIntegrationManager::BrowseForAssets(AssetSelectionModel& selection)
 {
     AssetBrowserComponentRequestBus::Broadcast(&AssetBrowserComponentRequests::PickAssets, selection, GetMainWindow());
 }
-
-bool SandboxIntegrationManager::DisplayHelpersVisible()
-{
-    return GetIEditor()->GetDisplaySettings()->IsDisplayHelpers();
-}

Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.h

@@ -165,7 +165,6 @@ private:
     void InstantiateSliceFromAssetId(const AZ::Data::AssetId& assetId) override;
     void ClearRedoStack() override;
     int GetIconTextureIdFromEntityIconPath(const AZStd::string& entityIconPath) override;
-    bool DisplayHelpersVisible() override;
     //////////////////////////////////////////////////////////////////////////
 
     //////////////////////////////////////////////////////////////////////////

Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerWidget.cpp

@@ -1281,6 +1281,8 @@ void OutlinerWidget::OnSearchTextChanged(const QString& activeTextFilter)
 
     m_listModel->SearchStringChanged(filterString);
     m_proxyModel->UpdateFilter();
+
+    m_gui->m_objectTree->expandAll();
 }
 
 void OutlinerWidget::OnFilterChanged(const AzQtComponents::SearchTypeFilterList& activeTypeFilters)

Code/Editor/Resource.h

@@ -191,7 +191,6 @@
 #define ID_BRUSH_CSGSUBSTRUCT                      33837
 #define ID_MATERIAL_PICKTOOL                       33842
 #define ID_MODIFY_AIPOINT_PICKIMPASSLINK           33865
-#define ID_DISPLAY_SHOWHELPERS                     33871
 #define ID_FILE_EXPORTSELECTION                    33875
 #define ID_EDIT_PASTE_WITH_LINKS                   33893
 #define ID_FILE_EXPORT_TERRAINAREA                 33904

Code/Editor/ViewportManipulatorController.cpp

@@ -129,8 +129,8 @@ namespace SandboxEditor
                 ViewportInteractionRequestBus::EventResult(
                     ray, GetViewportId(), &ViewportInteractionRequestBus::Events::ViewportScreenToWorldRay, screenPoint);
 
-                m_mouseInteraction.m_mousePick.m_rayOrigin = ray.origin;
-                m_mouseInteraction.m_mousePick.m_rayDirection = ray.direction;
+                m_mouseInteraction.m_mousePick.m_rayOrigin = ray.m_origin;
+                m_mouseInteraction.m_mousePick.m_rayDirection = ray.m_direction;
                 m_mouseInteraction.m_mousePick.m_screenCoordinates = screenPoint;
             }
 

Code/Editor/ViewportTitleDlg.cpp

@@ -6,7 +6,6 @@
  *
  */
 
-
 // Description : CViewportTitleDlg implementation file
 
 #if !defined(Q_MOC_RUN)
@@ -42,38 +41,18 @@
 #include <AzCore/std/algorithm.h>
 #include <AzFramework/API/ApplicationAPI.h>
 #include <AzToolsFramework/Viewport/ViewportMessages.h>
+#include <AzToolsFramework/Viewport/ViewportSettings.h>
+#include <AzToolsFramework/ViewportSelection/EditorTransformComponentSelectionRequestBus.h>
 
 #include <LmbrCentral/Audio/AudioSystemComponentBus.h>
 
 AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
 #include "ui_ViewportTitleDlg.h"
 AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-#endif //!defined(Q_MOC_RUN)
+#endif //! defined(Q_MOC_RUN)
 
 // CViewportTitleDlg dialog
 
-inline namespace Helpers
-{
-    void ToggleHelpers()
-    {
-        const bool newValue = !GetIEditor()->GetDisplaySettings()->IsDisplayHelpers();
-        GetIEditor()->GetDisplaySettings()->DisplayHelpers(newValue);
-        GetIEditor()->Notify(eNotify_OnDisplayRenderUpdate);
-
-        if (newValue == false)
-        {
-            GetIEditor()->GetObjectManager()->SendEvent(EVENT_HIDE_HELPER);
-        }
-        AzToolsFramework::ViewportInteraction::ViewportSettingsNotificationBus::Broadcast(
-            &AzToolsFramework::ViewportInteraction::ViewportSettingNotifications::OnDrawHelpersChanged, newValue);
-    }
-
-    bool IsHelpersShown()
-    {
-        return GetIEditor()->GetDisplaySettings()->IsDisplayHelpers();
-    }
-}
-
 namespace
 {
     class CViewportTitleDlgDisplayInfoHelper
@@ -98,7 +77,7 @@ namespace
             emit ViewportInfoStatusUpdated(static_cast<int>(state));
         }
     };
-} //end anonymous namespace
+} // end anonymous namespace
 
 CViewportTitleDlg::CViewportTitleDlg(QWidget* pParent)
     : QWidget(pParent)
@@ -215,13 +194,65 @@ void CViewportTitleDlg::SetupViewportInformationMenu()
     m_ui->m_debugInformationMenu->setMenu(GetViewportInformationMenu());
     connect(m_ui->m_debugInformationMenu, &QToolButton::clicked, this, &CViewportTitleDlg::OnToggleDisplayInfo);
     m_ui->m_debugInformationMenu->setPopupMode(QToolButton::MenuButtonPopup);
-
 }
 
 void CViewportTitleDlg::SetupHelpersButton()
 {
-    connect(m_ui->m_helpers, &QToolButton::clicked, this, &CViewportTitleDlg::OnToggleHelpers);
-    m_ui->m_helpers->setChecked(Helpers::IsHelpersShown());
+    if (m_helpersMenu == nullptr)
+    {
+        m_helpersMenu = new QMenu("Helpers State", this);
+
+        auto helperAction = MainWindow::instance()->GetActionManager()->GetAction(AzToolsFramework::Helpers);
+        connect(
+            helperAction, &QAction::triggered, this,
+            [this]
+            {
+                m_ui->m_helpers->setChecked(AzToolsFramework::HelpersVisible() || AzToolsFramework::IconsVisible());
+            });
+
+        auto iconAction = MainWindow::instance()->GetActionManager()->GetAction(AzToolsFramework::Icons);
+        connect(
+            iconAction, &QAction::triggered, this,
+            [this]
+            {
+                m_ui->m_helpers->setChecked(AzToolsFramework::HelpersVisible() || AzToolsFramework::IconsVisible());
+            });
+
+        m_helpersAction = new QAction(tr("Helpers"), m_helpersMenu);
+        m_helpersAction->setCheckable(true);
+        connect(
+            m_helpersAction, &QAction::triggered, this,
+            [helperAction]
+            {
+                helperAction->trigger();
+            });
+
+        m_iconsAction = new QAction(tr("Icons"), m_helpersMenu);
+        m_iconsAction->setCheckable(true);
+        connect(
+            m_iconsAction, &QAction::triggered, this,
+            [iconAction]
+            {
+                iconAction->trigger();
+            });
+
+        m_helpersMenu->addAction(m_helpersAction);
+        m_helpersMenu->addAction(m_iconsAction);
+
+        connect(
+            m_helpersMenu, &QMenu::aboutToShow, this,
+            [this]
+            {
+                m_helpersAction->setChecked(AzToolsFramework::HelpersVisible());
+                m_iconsAction->setChecked(AzToolsFramework::IconsVisible());
+            });
+
+        m_ui->m_helpers->setCheckable(true);
+        m_ui->m_helpers->setMenu(m_helpersMenu);
+        m_ui->m_helpers->setPopupMode(QToolButton::InstantPopup);
+    }
+
+    m_ui->m_helpers->setChecked(AzToolsFramework::HelpersVisible() || AzToolsFramework::IconsVisible());
 }
 
 void CViewportTitleDlg::SetupOverflowMenu()
@@ -279,15 +310,20 @@ void CViewportTitleDlg::SetupOverflowMenu()
     UpdateMuteActionText();
 }
 
-
 //////////////////////////////////////////////////////////////////////////
 void CViewportTitleDlg::SetViewPane(CLayoutViewPane* pViewPane)
 {
     if (m_pViewPane)
+    {
         m_pViewPane->disconnect(this);
+    }
+
     m_pViewPane = pViewPane;
+
     if (m_pViewPane)
+    {
         connect(this, &QWidget::customContextMenuRequested, m_pViewPane, &CLayoutViewPane::ShowTitleMenu);
+    }
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -318,7 +354,6 @@ void CViewportTitleDlg::OnInitDialog()
         m_ui->m_prefabFocusPath->hide();
         m_ui->m_prefabFocusBackButton->hide();
     }
-    
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -336,13 +371,6 @@ void CViewportTitleDlg::OnMaximize()
     }
 }
 
-//////////////////////////////////////////////////////////////////////////
-void CViewportTitleDlg::OnToggleHelpers()
-{
-    Helpers::ToggleHelpers();
-    m_ui->m_helpers->setChecked(Helpers::IsHelpersShown());
-}
-
 void CViewportTitleDlg::SetNoViewportInfo()
 {
     AZ::AtomBridge::AtomViewportInfoDisplayRequestBus::Broadcast(
@@ -367,7 +395,6 @@ void CViewportTitleDlg::SetCompactViewportInfo()
         &AZ::AtomBridge::AtomViewportInfoDisplayRequestBus::Events::SetDisplayState, AZ::AtomBridge::ViewportInfoDisplayState::CompactInfo);
 }
 
-
 //////////////////////////////////////////////////////////////////////////
 void CViewportTitleDlg::UpdateDisplayInfo()
 {
@@ -783,9 +810,6 @@ void CViewportTitleDlg::OnEditorNotifyEvent(EEditorNotifyEvent event)
 {
     switch (event)
     {
-    case eNotify_OnDisplayRenderUpdate:
-        m_ui->m_helpers->setChecked(Helpers::IsHelpersShown());
-        break;
     case eNotify_OnBeginGameMode:
     case eNotify_OnEndGameMode:
         UpdateMuteActionText();
@@ -997,24 +1021,18 @@ void CViewportTitleDlg::UpdateOverFlowMenuState()
     m_angleSizeActionWidget->setEnabled(angleSnappingActive);
 }
 
-namespace
+ namespace
 {
     void PyToggleHelpers()
     {
-        GetIEditor()->GetDisplaySettings()->DisplayHelpers(!GetIEditor()->GetDisplaySettings()->IsDisplayHelpers());
-        GetIEditor()->Notify(eNotify_OnDisplayRenderUpdate);
-
-        if (GetIEditor()->GetDisplaySettings()->IsDisplayHelpers() == false)
-        {
-            GetIEditor()->GetObjectManager()->SendEvent(EVENT_HIDE_HELPER);
-        }
+        AzToolsFramework::SetHelpersVisible(!AzToolsFramework::HelpersVisible());
     }
 
     bool PyIsHelpersShown()
     {
-        return GetIEditor()->GetDisplaySettings()->IsDisplayHelpers();
+        return AzToolsFramework::HelpersVisible();
     }
-}
+} // namespace
 
 namespace AzToolsFramework
 {
@@ -1029,11 +1047,12 @@ namespace AzToolsFramework
                     ->Attribute(AZ::Script::Attributes::Category, "Legacy/Editor")
                     ->Attribute(AZ::Script::Attributes::Module, "legacy.general");
             };
+
             addLegacyGeneral(behaviorContext->Method("toggle_helpers", PyToggleHelpers, nullptr, "Toggles the display of helpers."));
             addLegacyGeneral(behaviorContext->Method("is_helpers_shown", PyIsHelpersShown, nullptr, "Gets the display state of helpers."));
         }
     }
-}
+} // namespace AzToolsFramework
 
 #include "ViewportTitleDlg.moc"
 #include <moc_ViewportTitleDlg.cpp>

Code/Editor/ViewportTitleDlg.h

@@ -80,7 +80,6 @@ protected:
     void OnSystemEvent(ESystemEvent event, UINT_PTR wparam, UINT_PTR lparam) override;
 
     void OnMaximize();
-    void OnToggleHelpers();
     void UpdateDisplayInfo();
 
     void SetupCameraDropdownMenu();
@@ -153,6 +152,9 @@ protected:
     QMenu* m_aspectMenu = nullptr;
     QMenu* m_resolutionMenu = nullptr;
     QMenu* m_viewportInformationMenu = nullptr;
+    QMenu* m_helpersMenu = nullptr;
+    QAction* m_helpersAction = nullptr;
+    QAction* m_iconsAction = nullptr;
     QAction* m_noInformationAction = nullptr;
     QAction* m_normalInformationAction = nullptr;
     QAction* m_fullInformationAction = nullptr;

Code/Framework/AzCore/AzCore/Math/Quaternion.cpp

@@ -254,13 +254,13 @@ namespace AZ
                 Method("CreateFromMatrix3x3", &Quaternion::CreateFromMatrix3x3)->
                 Method("CreateFromMatrix4x4", &Quaternion::CreateFromMatrix4x4)->
                 Method("CreateFromAxisAngle", &Quaternion::CreateFromAxisAngle)->
+                Method("CreateFromScaledAxisAngle", &Quaternion::CreateFromScaledAxisAngle)->
                 Method("CreateShortestArc", &Quaternion::CreateShortestArc)->
                 Method("CreateFromEulerAnglesDegrees", &Quaternion::CreateFromEulerAnglesDegrees)
                 ;
         }
     }
 
-
     Quaternion Quaternion::CreateFromMatrix3x3(const Matrix3x3& m)
     {
         return CreateFromBasis(m.GetBasisX(), m.GetBasisY(), m.GetBasisZ());
@@ -430,4 +430,24 @@ namespace AZ
             outAngle = 0.0f;
         }
     }
+
+
+    Vector3 Quaternion::ConvertToScaledAxisAngle() const
+    {
+        // Take the log of the quaternion to convert it to the exponential map
+        // and multiply it by 2.0 to bring it into the scaled axis-angle representation.
+        const AZ::Vector3 imaginary = GetImaginary();
+        const float length = imaginary.GetLength();
+        if (length < AZ::Constants::FloatEpsilon)
+        {
+            return imaginary * 2.0f;
+        }
+        else
+        {
+            const float halfAngle = acosf(AZ::GetClamp(GetW(), -1.0f, 1.0f));
+
+            // Multiply by 2.0 to convert the half angle into the full one.
+            return halfAngle * 2.0f * (imaginary / length);
+        }
+    }
 }

Code/Framework/AzCore/AzCore/Math/Quaternion.h

@@ -77,6 +77,9 @@ namespace AZ
 
         static Quaternion CreateFromAxisAngle(const Vector3& axis, float angle);
 
+        //! Create a quaternion from a scaled axis-angle representation.
+        static Quaternion CreateFromScaledAxisAngle(const Vector3& scaledAxisAngle);
+
         static Quaternion CreateShortestArc(const Vector3& v1, const Vector3& v2);
 
         //! Creates a quaternion using rotation in degrees about the axes. First rotated about the X axis, followed by the Y axis, then the Z axis.
@@ -231,6 +234,9 @@ namespace AZ
         //! @param[out] outAngle A float rotation angle around the axis in radians.
         void ConvertToAxisAngle(Vector3& outAxis, float& outAngle) const;
 
+        //! Convert the quaternion into scaled axis-angle representation.
+        Vector3 ConvertToScaledAxisAngle() const;
+
         //! Returns the imaginary (X/Y/Z) portion of the quaternion.
         Vector3 GetImaginary() const;
 

Code/Framework/AzCore/AzCore/Math/Quaternion.inl

@@ -109,6 +109,24 @@ namespace AZ
     }
 
 
+    AZ_MATH_INLINE Quaternion Quaternion::CreateFromScaledAxisAngle(const Vector3& scaledAxisAngle)
+    {
+        const AZ::Vector3 exponentialMap = scaledAxisAngle / 2.0f;
+        const float halfAngle = exponentialMap.GetLength();
+
+        if (halfAngle < AZ::Constants::FloatEpsilon)
+        {
+            return AZ::Quaternion::CreateFromVector3AndValue(exponentialMap, 1.0f).GetNormalized();
+        }
+        else
+        {
+            float sin, cos;
+            SinCos(halfAngle, sin, cos);
+            return AZ::Quaternion::CreateFromVector3AndValue((sin / halfAngle) * exponentialMap, cos);
+        }
+    }
+
+
     AZ_MATH_INLINE void Quaternion::StoreToFloat4(float* values) const
     {
         Simd::Vec4::StoreUnaligned(values, m_value);

Code/Framework/AzCore/AzCore/Memory/AllocationRecords.cpp

@@ -16,438 +16,421 @@
 
 #include <AzCore/Debug/StackTracer.h>
 
-using namespace AZ;
-using namespace AZ::Debug;
+namespace AZ::Debug
+{
+    // Many PC tools break with alloc/free size mismatches when the memory guard is enabled.  Disable for now
+    //#define ENABLE_MEMORY_GUARD
 
-// Many PC tools break with alloc/free size mismatches when the memory guard is enabled.  Disable for now
-//#define ENABLE_MEMORY_GUARD
-
-//=========================================================================
-// AllocationRecords
-// [9/16/2009]
-//=========================================================================
-AllocationRecords::AllocationRecords(unsigned char stackRecordLevels, [[maybe_unused]] bool isMemoryGuard, bool isMarkUnallocatedMemory, const char* allocatorName)
-    : m_mode(AllocatorManager::Instance().m_defaultTrackingRecordMode)
-    , m_isAutoIntegrityCheck(false)
-    , m_isMarkUnallocatedMemory(isMarkUnallocatedMemory)
-    , m_saveNames(false)
-    , m_decodeImmediately(false)
-    , m_numStackLevels(stackRecordLevels)
+    //=========================================================================
+    // AllocationRecords
+    // [9/16/2009]
+    //=========================================================================
+    AllocationRecords::AllocationRecords(
+        unsigned char stackRecordLevels, [[maybe_unused]] bool isMemoryGuard, bool isMarkUnallocatedMemory, const char* allocatorName)
+        : m_mode(AllocatorManager::Instance().m_defaultTrackingRecordMode)
+        , m_isAutoIntegrityCheck(false)
+        , m_isMarkUnallocatedMemory(isMarkUnallocatedMemory)
+        , m_saveNames(false)
+        , m_decodeImmediately(false)
+        , m_numStackLevels(stackRecordLevels)
 #if defined(ENABLE_MEMORY_GUARD)
-    , m_memoryGuardSize(isMemoryGuard ? sizeof(Debug::GuardValue) : 0)
+        , m_memoryGuardSize(isMemoryGuard ? sizeof(Debug::GuardValue) : 0)
 #else
-    , m_memoryGuardSize(0)
+        , m_memoryGuardSize(0)
 #endif
-    , m_requestedAllocs(0)
-    , m_requestedBytes(0)
-    , m_requestedBytesPeak(0)
-    , m_allocatorName(allocatorName)
-{
-
-}
-
-//=========================================================================
-// ~AllocationRecords
-// [9/16/2009]
-//=========================================================================
-AllocationRecords::~AllocationRecords()
-{
-    if (!AllocatorManager::Instance().m_isAllocatorLeaking)
+        , m_requestedAllocs(0)
+        , m_requestedBytes(0)
+        , m_requestedBytesPeak(0)
+        , m_allocatorName(allocatorName)
     {
-        // dump all allocation (we should not have any at this point).
-        bool includeNameAndFilename = (m_saveNames || m_mode == RECORD_FULL);
-        EnumerateAllocations(PrintAllocationsCB(true, includeNameAndFilename));
-        AZ_Error("Memory", m_records.empty(), "We still have %d allocations on record! They must be freed prior to destroy!", m_records.size());
-    }
-}
-
-//=========================================================================
-// lock
-// [9/16/2009]
-//=========================================================================
-void
-AllocationRecords::lock()
-{
-    m_recordsMutex.lock();
-}
-
-//=========================================================================
-// try_lock
-// [9/16/2009]
-//=========================================================================
-bool AllocationRecords::try_lock()
-{
-    return m_recordsMutex.try_lock();
-}
-
-//=========================================================================
-// unlock
-// [9/16/2009]
-//=========================================================================
-void
-AllocationRecords::unlock()
-{
-    m_recordsMutex.unlock();
-}
-
-//=========================================================================
-// RegisterAllocation
-// [9/11/2009]
-//=========================================================================
-const AllocationInfo*
-AllocationRecords::RegisterAllocation(void* address, size_t byteSize, size_t alignment, const char* name, const char* fileName, int lineNum, unsigned int stackSuppressCount)
-{
-    (void)stackSuppressCount;
-    if (m_mode == RECORD_NO_RECORDS)
-    {
-        return nullptr;
-    }
-    if (address == nullptr)
-    {
-        return nullptr;
     }
 
-    // memory guard
-    if (m_memoryGuardSize == sizeof(Debug::GuardValue))
+    //=========================================================================
+    // ~AllocationRecords
+    // [9/16/2009]
+    //=========================================================================
+    AllocationRecords::~AllocationRecords()
     {
-        if (m_isAutoIntegrityCheck)
+        if (!AllocatorManager::Instance().m_isAllocatorLeaking)
         {
-            IntegrityCheck();
+            // dump all allocation (we should not have any at this point).
+            bool includeNameAndFilename = (m_saveNames || m_mode == RECORD_FULL);
+            EnumerateAllocations(PrintAllocationsCB(true, includeNameAndFilename));
+            AZ_Error(
+                "Memory", m_records.empty(), "We still have %d allocations on record! They must be freed prior to destroy!",
+                m_records.size());
+        }
+    }
+
+    //=========================================================================
+    // lock
+    // [9/16/2009]
+    //=========================================================================
+    void AllocationRecords::lock()
+    {
+        m_recordsMutex.lock();
+    }
+
+    //=========================================================================
+    // try_lock
+    // [9/16/2009]
+    //=========================================================================
+    bool AllocationRecords::try_lock()
+    {
+        return m_recordsMutex.try_lock();
+    }
+
+    //=========================================================================
+    // unlock
+    // [9/16/2009]
+    //=========================================================================
+    void AllocationRecords::unlock()
+    {
+        m_recordsMutex.unlock();
+    }
+
+    //=========================================================================
+    // RegisterAllocation
+    // [9/11/2009]
+    //=========================================================================
+    const AllocationInfo* AllocationRecords::RegisterAllocation(
+        void* address,
+        size_t byteSize,
+        size_t alignment,
+        const char* name,
+        const char* fileName,
+        int lineNum,
+        unsigned int stackSuppressCount)
+    {
+        (void)stackSuppressCount;
+        if (m_mode == RECORD_NO_RECORDS)
+        {
+            return nullptr;
+        }
+        if (address == nullptr)
+        {
+            return nullptr;
         }
 
-        AZ_Assert(byteSize>sizeof(Debug::GuardValue), "Did you forget to add the extra MemoryGuardSize() bytes?");
-        byteSize -= sizeof(Debug::GuardValue);
-        new(reinterpret_cast<char*>(address)+byteSize) Debug::GuardValue();
-    }
-
-    Debug::AllocationRecordsType::pair_iter_bool iterBool;
-    {
-        AZStd::scoped_lock lock(m_recordsMutex);
-        iterBool = m_records.insert_key(address);
-    }
-    
-    if (!iterBool.second)
-    {
-        // If that memory address was already registered, print the stack trace of the previous registration
-        PrintAllocationsCB(true, (m_saveNames || m_mode == RECORD_FULL))(address, iterBool.first->second, m_numStackLevels);
-        AZ_Assert(iterBool.second, "Memory address 0x%p is already allocated and in the records!", address);
-    }
-
-    Debug::AllocationInfo& ai = iterBool.first->second;
-    ai.m_byteSize =  byteSize;
-    ai.m_alignment = static_cast<unsigned int>(alignment);
-    if ((m_saveNames || m_mode == RECORD_FULL) && name && fileName)
-    {
-        // In RECORD_FULL mode or when specifically enabled in app descriptor with 
-        // m_allocationRecordsSaveNames, we allocate our own memory to save off name and fileName.
-        // When testing for memory leaks, on process shutdown AllocationRecords::~AllocationRecords 
-        // gets called to enumerate the remaining (leaked) allocations. Unfortunately, any names
-        // referenced in dynamic module memory whose modules are unloaded won't be valid
-        // references anymore and we won't get useful information from the enumeration print.
-        // This code block ensures we keep our name/fileName valid for when we need it.
-        const size_t nameLength = strlen(name);
-        const size_t fileNameLength = strlen(fileName);
-        const size_t totalLength = nameLength + fileNameLength + 2; // + 2 for terminating null characters
-        ai.m_namesBlock = m_records.get_allocator().allocate(totalLength, 1);
-        ai.m_namesBlockSize = totalLength;
-        char* savedName = reinterpret_cast<char*>(ai.m_namesBlock);
-        char* savedFileName = savedName + nameLength + 1;
-        memcpy(reinterpret_cast<void*>(savedName), reinterpret_cast<const void*>(name), nameLength + 1);
-        memcpy(reinterpret_cast<void*>(savedFileName), reinterpret_cast<const void*>(fileName), fileNameLength + 1);
-        ai.m_name = savedName;
-        ai.m_fileName = savedFileName;
-    }
-    else
-    {
-        ai.m_name = name;
-        ai.m_fileName = fileName;
-        ai.m_namesBlock = nullptr;
-        ai.m_namesBlockSize = 0;
-    }
-    ai.m_lineNum = lineNum;
-    ai.m_timeStamp = AZStd::GetTimeNowMicroSecond();
-
-    // if we don't have a fileName,lineNum record the stack or if the user requested it.
-    if ((fileName == nullptr && m_mode == RECORD_STACK_IF_NO_FILE_LINE) || m_mode == RECORD_FULL)
-    {
-        ai.m_stackFrames = m_numStackLevels ? reinterpret_cast<AZ::Debug::StackFrame*>(m_records.get_allocator().allocate(sizeof(AZ::Debug::StackFrame)*m_numStackLevels, 1)) : nullptr;
-        if (ai.m_stackFrames)
+        // memory guard
+        if (m_memoryGuardSize == sizeof(Debug::GuardValue))
         {
-            Debug::StackRecorder::Record(ai.m_stackFrames, m_numStackLevels, stackSuppressCount + 1);
-
-            if (m_decodeImmediately)
+            if (m_isAutoIntegrityCheck)
             {
-                // OPTIONAL DEBUGGING CODE - enable in app descriptor m_allocationRecordsAttemptDecodeImmediately
-                // This is optionally-enabled code for tracking down memory allocations
-                // that fail to be decoded. DecodeFrames() typically runs at the end of
-                // your application when leaks were found. Sometimes you have stack prints
-                // full of "(module-name not available)" and "(function-name not available)"
-                // that are not actionable. If you have those, enable this code. It'll slow
-                // down your process significantly because for every allocation recorded
-                // we get the stack trace on the spot. Put a breakpoint in DecodeFrames()
-                // at the "(module-name not available)" and "(function-name not available)"
-                // locations and now at the moment those allocations happen you'll have the
-                // full stack trace available and the ability to debug what could be causing it
+                IntegrityCheck();
+            }
+
+            AZ_Assert(byteSize > sizeof(Debug::GuardValue), "Did you forget to add the extra MemoryGuardSize() bytes?");
+            byteSize -= sizeof(Debug::GuardValue);
+            new (reinterpret_cast<char*>(address) + byteSize) Debug::GuardValue();
+        }
+
+        Debug::AllocationRecordsType::pair_iter_bool iterBool;
+        {
+            AZStd::scoped_lock lock(m_recordsMutex);
+            iterBool = m_records.insert_key(address);
+        }
+
+        if (!iterBool.second)
+        {
+            // If that memory address was already registered, print the stack trace of the previous registration
+            PrintAllocationsCB(true, (m_saveNames || m_mode == RECORD_FULL))(address, iterBool.first->second, m_numStackLevels);
+            AZ_Assert(iterBool.second, "Memory address 0x%p is already allocated and in the records!", address);
+        }
+
+        Debug::AllocationInfo& ai = iterBool.first->second;
+        ai.m_byteSize = byteSize;
+        ai.m_alignment = static_cast<unsigned int>(alignment);
+        if ((m_saveNames || m_mode == RECORD_FULL) && name && fileName)
+        {
+            // In RECORD_FULL mode or when specifically enabled in app descriptor with
+            // m_allocationRecordsSaveNames, we allocate our own memory to save off name and fileName.
+            // When testing for memory leaks, on process shutdown AllocationRecords::~AllocationRecords
+            // gets called to enumerate the remaining (leaked) allocations. Unfortunately, any names
+            // referenced in dynamic module memory whose modules are unloaded won't be valid
+            // references anymore and we won't get useful information from the enumeration print.
+            // This code block ensures we keep our name/fileName valid for when we need it.
+            const size_t nameLength = strlen(name);
+            const size_t fileNameLength = strlen(fileName);
+            const size_t totalLength = nameLength + fileNameLength + 2; // + 2 for terminating null characters
+            ai.m_namesBlock = m_records.get_allocator().allocate(totalLength, 1);
+            ai.m_namesBlockSize = totalLength;
+            char* savedName = reinterpret_cast<char*>(ai.m_namesBlock);
+            char* savedFileName = savedName + nameLength + 1;
+            memcpy(reinterpret_cast<void*>(savedName), reinterpret_cast<const void*>(name), nameLength + 1);
+            memcpy(reinterpret_cast<void*>(savedFileName), reinterpret_cast<const void*>(fileName), fileNameLength + 1);
+            ai.m_name = savedName;
+            ai.m_fileName = savedFileName;
+        }
+        else
+        {
+            ai.m_name = name;
+            ai.m_fileName = fileName;
+            ai.m_namesBlock = nullptr;
+            ai.m_namesBlockSize = 0;
+        }
+        ai.m_lineNum = lineNum;
+        ai.m_timeStamp = AZStd::GetTimeNowMicroSecond();
+
+        // if we don't have a fileName,lineNum record the stack or if the user requested it.
+        if ((fileName == nullptr && m_mode == RECORD_STACK_IF_NO_FILE_LINE) || m_mode == RECORD_FULL)
+        {
+            ai.m_stackFrames = m_numStackLevels ? reinterpret_cast<AZ::Debug::StackFrame*>(m_records.get_allocator().allocate(
+                                                      sizeof(AZ::Debug::StackFrame) * m_numStackLevels, 1))
+                                                : nullptr;
+            if (ai.m_stackFrames)
+            {
+                Debug::StackRecorder::Record(ai.m_stackFrames, m_numStackLevels, stackSuppressCount + 1);
+
+                if (m_decodeImmediately)
                 {
-                    const unsigned char decodeStep = 40;
-                    Debug::SymbolStorage::StackLine lines[decodeStep];
-                    unsigned char iFrame = 0;
-                    unsigned char numStackLevels = m_numStackLevels;
-                    while (numStackLevels > 0)
+                    // OPTIONAL DEBUGGING CODE - enable in app descriptor m_allocationRecordsAttemptDecodeImmediately
+                    // This is optionally-enabled code for tracking down memory allocations
+                    // that fail to be decoded. DecodeFrames() typically runs at the end of
+                    // your application when leaks were found. Sometimes you have stack prints
+                    // full of "(module-name not available)" and "(function-name not available)"
+                    // that are not actionable. If you have those, enable this code. It'll slow
+                    // down your process significantly because for every allocation recorded
+                    // we get the stack trace on the spot. Put a breakpoint in DecodeFrames()
+                    // at the "(module-name not available)" and "(function-name not available)"
+                    // locations and now at the moment those allocations happen you'll have the
+                    // full stack trace available and the ability to debug what could be causing it
                     {
-                        unsigned char numToDecode = AZStd::GetMin(decodeStep, numStackLevels);
-                        Debug::SymbolStorage::DecodeFrames(&ai.m_stackFrames[iFrame], numToDecode, lines);
-                        numStackLevels -= numToDecode;
-                        iFrame += numToDecode;
+                        const unsigned char decodeStep = 40;
+                        Debug::SymbolStorage::StackLine lines[decodeStep];
+                        unsigned char iFrame = 0;
+                        unsigned char numStackLevels = m_numStackLevels;
+                        while (numStackLevels > 0)
+                        {
+                            unsigned char numToDecode = AZStd::GetMin(decodeStep, numStackLevels);
+                            Debug::SymbolStorage::DecodeFrames(&ai.m_stackFrames[iFrame], numToDecode, lines);
+                            numStackLevels -= numToDecode;
+                            iFrame += numToDecode;
+                        }
                     }
                 }
             }
         }
+
+        AllocatorManager::Instance().DebugBreak(address, ai);
+
+        // statistics
+        m_requestedBytes += byteSize;
+
+        size_t currentRequestedBytePeak;
+        size_t newRequestedBytePeak;
+        do
+        {
+            currentRequestedBytePeak = m_requestedBytesPeak.load(std::memory_order::memory_order_relaxed);
+            newRequestedBytePeak = AZStd::GetMax(currentRequestedBytePeak, m_requestedBytes.load(std::memory_order::memory_order_relaxed));
+        } while (!m_requestedBytesPeak.compare_exchange_weak(currentRequestedBytePeak, newRequestedBytePeak));
+
+        ++m_requestedAllocs;
+
+        return &ai;
     }
 
-    AllocatorManager::Instance().DebugBreak(address, ai);
-
-    // statistics
-    m_requestedBytes += byteSize;
-
-    size_t currentRequestedBytePeak;
-    size_t newRequestedBytePeak;
-    do
+    //=========================================================================
+    // UnregisterAllocation
+    // [9/11/2009]
+    //=========================================================================
+    void AllocationRecords::UnregisterAllocation(void* address, size_t byteSize, size_t alignment, AllocationInfo* info)
     {
-        currentRequestedBytePeak = m_requestedBytesPeak.load(std::memory_order::memory_order_relaxed);
-        newRequestedBytePeak = AZStd::GetMax(currentRequestedBytePeak, m_requestedBytes.load(std::memory_order::memory_order_relaxed));
-    } while (!m_requestedBytesPeak.compare_exchange_weak(currentRequestedBytePeak, newRequestedBytePeak));
-
-    ++m_requestedAllocs;
-
-    return &ai;
-}
-
-//=========================================================================
-// UnregisterAllocation
-// [9/11/2009]
-//=========================================================================
-void AllocationRecords::UnregisterAllocation(void* address, size_t byteSize, size_t alignment, AllocationInfo* info)
-{
-    if (m_mode == RECORD_NO_RECORDS)
-    {
-        return;
-    }
-    if (address == nullptr)
-    {
-        return;
-    }
-
-    AllocationInfo allocationInfo;
-    {
-        AZStd::scoped_lock lock(m_recordsMutex);
-        Debug::AllocationRecordsType::iterator iter = m_records.find(address);
-        // We cannot assert if an allocation does not exist because allocations may have been made before tracking was enabled. 
-        // It is currently impossible to actually track all allocations that happen before a certain point
-        // AZ_Assert(iter!=m_records.end(), "Could not find address 0x%p in the allocator!", address);
-        if (iter == m_records.end())
+        if (m_mode == RECORD_NO_RECORDS)
         {
             return;
         }
-        allocationInfo = iter->second;
-        m_records.erase(iter);
-
-        // try to be more aggressive and keep the memory footprint low.
-        // \todo store the load factor at the last rehash to avoid unnecessary rehash
-        if (m_records.load_factor() < 0.9f)
+        if (address == nullptr)
         {
-            m_records.rehash(0);
+            return;
         }
-    }
 
-    
-    AllocatorManager::Instance().DebugBreak(address, allocationInfo);
-
-    (void)byteSize;
-    (void)alignment;
-    AZ_Assert(byteSize==0||byteSize==allocationInfo.m_byteSize, "Mismatched byteSize at deallocation! You supplied an invalid value!");
-    AZ_Assert(alignment==0||alignment==allocationInfo.m_alignment, "Mismatched alignment at deallocation! You supplied an invalid value!");
-
-    // statistics
-    m_requestedBytes -= allocationInfo.m_byteSize;
-    
-#if defined(ENABLE_MEMORY_GUARD)
-    // memory guard
-    if (m_memoryGuardSize == sizeof(Debug::GuardValue))
-    {
-        if (m_isAutoIntegrityCheck)
-        {
-            // full integrity check
-            IntegrityCheck();
-        }
-        else
-        {
-            // check current allocation
-            char* guardAddress = reinterpret_cast<char*>(address)+allocationInfo.m_byteSize;
-            Debug::GuardValue* guard = reinterpret_cast<Debug::GuardValue*>(guardAddress);
-            if (!guard->Validate())
-            {
-                AZ_Printf("Memory", "Memory stomp located at address %p, part of allocation:", guardAddress);
-                PrintAllocationsCB printAlloc(true);
-                printAlloc(address, allocationInfo, m_numStackLevels);
-                AZ_Assert(false, "MEMORY STOMP DETECTED!!!");
-            }
-            guard->~GuardValue();
-        }
-    }
-#endif
-
-    // delete allocation record
-    if (allocationInfo.m_namesBlock)
-    {
-        m_records.get_allocator().deallocate(allocationInfo.m_namesBlock, allocationInfo.m_namesBlockSize, 1);
-        allocationInfo.m_namesBlock = nullptr;
-        allocationInfo.m_namesBlockSize = 0;
-        allocationInfo.m_name = nullptr;
-        allocationInfo.m_fileName = nullptr;
-    }
-    if (allocationInfo.m_stackFrames)
-    {
-        m_records.get_allocator().deallocate(allocationInfo.m_stackFrames, sizeof(AZ::Debug::StackFrame)*m_numStackLevels, 1);
-        allocationInfo.m_stackFrames = nullptr;
-    }
-
-    if (info)
-    {
-        *info = allocationInfo;
-    }
-
-
-
-    // if requested set memory to a specific value.
-    if (m_isMarkUnallocatedMemory)
-    {
-        memset(address, GetUnallocatedMarkValue(), byteSize);
-    }
-}
-
-//=========================================================================
-// ResizeAllocation
-// [9/20/2009]
-//=========================================================================
-void
-AllocationRecords::ResizeAllocation(void* address, size_t newSize)
-{
-    if (m_mode == RECORD_NO_RECORDS)
-    {
-        return;
-    }
-
-    AllocationInfo* allocationInfo;
-    {
-        AZStd::scoped_lock lock(m_recordsMutex);
-        Debug::AllocationRecordsType::iterator iter = m_records.find(address);
-        AZ_Assert(iter != m_records.end(), "Could not find address 0x%p in the allocator!", address);
-        allocationInfo = &iter->second;
-    }
-    AllocatorManager::Instance().DebugBreak(address, *allocationInfo);
-    
-#if defined(ENABLE_MEMORY_GUARD)
-    if (m_memoryGuardSize == sizeof(Debug::GuardValue))
-    {
-        if (m_isAutoIntegrityCheck)
-        {
-            // full integrity check
-            IntegrityCheck();
-        }
-        else
-        {
-            // check memory guard
-            char* guardAddress = reinterpret_cast<char*>(address) + allocationInfo->m_byteSize;
-            Debug::GuardValue* guard = reinterpret_cast<Debug::GuardValue*>(guardAddress);
-            if (!guard->Validate())
-            {
-                AZ_Printf("Memory", "Memory stomp located at address %p, part of allocation:", guardAddress);
-                PrintAllocationsCB printAlloc(true);
-                printAlloc(address, iter->second, m_numStackLevels);
-                AZ_Assert(false, "MEMORY STOMP DETECTED!!!");
-            }
-            guard->~GuardValue();
-        }
-        // init the new memory guard
-        newSize -= sizeof(Debug::GuardValue);
-        new(reinterpret_cast<char*>(address)+newSize) Debug::GuardValue();
-    }
-#endif
-
-    // statistics
-    m_requestedBytes -= allocationInfo->m_byteSize;
-    m_requestedBytes += newSize;
-    size_t currentRequestedBytePeak;
-    size_t newRequestedBytePeak;
-    do
-    {
-        currentRequestedBytePeak = m_requestedBytesPeak.load(std::memory_order::memory_order_relaxed);
-        newRequestedBytePeak = AZStd::GetMax(currentRequestedBytePeak, m_requestedBytes.load(std::memory_order::memory_order_relaxed));
-    } while (!m_requestedBytesPeak.compare_exchange_weak(currentRequestedBytePeak, newRequestedBytePeak));
-    ++m_requestedAllocs;
-
-    // update allocation size
-    allocationInfo->m_byteSize = newSize;
-}
-
-//=========================================================================
-// EnumerateAllocations
-// [9/29/2009]
-//=========================================================================
-void
-AllocationRecords::SetMode(Mode mode)
-{
-    if (mode == RECORD_NO_RECORDS)
-    {
+        AllocationInfo allocationInfo;
         {
             AZStd::scoped_lock lock(m_recordsMutex);
-            m_records.clear();
+            Debug::AllocationRecordsType::iterator iter = m_records.find(address);
+            // We cannot assert if an allocation does not exist because allocations may have been made before tracking was enabled.
+            // It is currently impossible to actually track all allocations that happen before a certain point
+            // AZ_Assert(iter!=m_records.end(), "Could not find address 0x%p in the allocator!", address);
+            if (iter == m_records.end())
+            {
+                return;
+            }
+            allocationInfo = iter->second;
+            m_records.erase(iter);
+
+            // try to be more aggressive and keep the memory footprint low.
+            // \todo store the load factor at the last rehash to avoid unnecessary rehash
+            if (m_records.load_factor() < 0.9f)
+            {
+                m_records.rehash(0);
+            }
         }
-        m_requestedBytes = 0;
-        m_requestedBytesPeak = 0;
-        m_requestedAllocs = 0;
-    }
 
-    AZ_Warning("Memory", m_mode != RECORD_NO_RECORDS || mode == RECORD_NO_RECORDS, "Records recording was disabled and now it's enabled! You might get assert when you free memory, if a you have allocations which were not recorded!");
+        AllocatorManager::Instance().DebugBreak(address, allocationInfo);
 
-    m_mode = mode;
-}
+        (void)byteSize;
+        (void)alignment;
+        AZ_Assert(
+            byteSize == 0 || byteSize == allocationInfo.m_byteSize, "Mismatched byteSize at deallocation! You supplied an invalid value!");
+        AZ_Assert(
+            alignment == 0 || alignment == allocationInfo.m_alignment,
+            "Mismatched alignment at deallocation! You supplied an invalid value!");
 
-//=========================================================================
-// EnumerateAllocations
-// [9/29/2009]
-//=========================================================================
-void
-AllocationRecords::EnumerateAllocations(AllocationInfoCBType cb)
-{
-    // enumerate all allocations and stop if requested.
-    // Since allocations can change during the iteration (code that prints out the records could allocate, which will
-    // mutate m_records), we are going to make a copy and iterate the copy.
-    Debug::AllocationRecordsType recordsCopy;
-    {
-        AZStd::scoped_lock lock(m_recordsMutex);
-        recordsCopy = m_records;
-    }
-    for (Debug::AllocationRecordsType::const_iterator iter = recordsCopy.begin(); iter != recordsCopy.end(); ++iter)
-    {
-        if (!cb(iter->first, iter->second, m_numStackLevels))
-        {
-            break;
-        }
-    }
-}
+        // statistics
+        m_requestedBytes -= allocationInfo.m_byteSize;
 
-//=========================================================================
-// IntegrityCheck
-// [9/9/2011]
-//=========================================================================
-void
-AllocationRecords::IntegrityCheck() const
-{
 #if defined(ENABLE_MEMORY_GUARD)
-    if (m_memoryGuardSize == sizeof(Debug::GuardValue))
+        // memory guard
+        if (m_memoryGuardSize == sizeof(Debug::GuardValue))
+        {
+            if (m_isAutoIntegrityCheck)
+            {
+                // full integrity check
+                IntegrityCheck();
+            }
+            else
+            {
+                // check current allocation
+                char* guardAddress = reinterpret_cast<char*>(address) + allocationInfo.m_byteSize;
+                Debug::GuardValue* guard = reinterpret_cast<Debug::GuardValue*>(guardAddress);
+                if (!guard->Validate())
+                {
+                    AZ_Printf("Memory", "Memory stomp located at address %p, part of allocation:", guardAddress);
+                    PrintAllocationsCB printAlloc(true);
+                    printAlloc(address, allocationInfo, m_numStackLevels);
+                    AZ_Assert(false, "MEMORY STOMP DETECTED!!!");
+                }
+                guard->~GuardValue();
+            }
+        }
+#endif
+
+        // delete allocation record
+        if (allocationInfo.m_namesBlock)
+        {
+            m_records.get_allocator().deallocate(allocationInfo.m_namesBlock, allocationInfo.m_namesBlockSize, 1);
+            allocationInfo.m_namesBlock = nullptr;
+            allocationInfo.m_namesBlockSize = 0;
+            allocationInfo.m_name = nullptr;
+            allocationInfo.m_fileName = nullptr;
+        }
+        if (allocationInfo.m_stackFrames)
+        {
+            m_records.get_allocator().deallocate(allocationInfo.m_stackFrames, sizeof(AZ::Debug::StackFrame) * m_numStackLevels, 1);
+            allocationInfo.m_stackFrames = nullptr;
+        }
+
+        if (info)
+        {
+            *info = allocationInfo;
+        }
+
+        // if requested set memory to a specific value.
+        if (m_isMarkUnallocatedMemory)
+        {
+            memset(address, GetUnallocatedMarkValue(), byteSize);
+        }
+    }
+
+    //=========================================================================
+    // ResizeAllocation
+    // [9/20/2009]
+    //=========================================================================
+    void AllocationRecords::ResizeAllocation(void* address, size_t newSize)
     {
+        if (m_mode == RECORD_NO_RECORDS)
+        {
+            return;
+        }
+
+        AllocationInfo* allocationInfo;
+        {
+            AZStd::scoped_lock lock(m_recordsMutex);
+            Debug::AllocationRecordsType::iterator iter = m_records.find(address);
+            AZ_Assert(iter != m_records.end(), "Could not find address 0x%p in the allocator!", address);
+            allocationInfo = &iter->second;
+        }
+        AllocatorManager::Instance().DebugBreak(address, *allocationInfo);
+
+#if defined(ENABLE_MEMORY_GUARD)
+        if (m_memoryGuardSize == sizeof(Debug::GuardValue))
+        {
+            if (m_isAutoIntegrityCheck)
+            {
+                // full integrity check
+                IntegrityCheck();
+            }
+            else
+            {
+                // check memory guard
+                char* guardAddress = reinterpret_cast<char*>(address) + allocationInfo->m_byteSize;
+                Debug::GuardValue* guard = reinterpret_cast<Debug::GuardValue*>(guardAddress);
+                if (!guard->Validate())
+                {
+                    AZ_Printf("Memory", "Memory stomp located at address %p, part of allocation:", guardAddress);
+                    PrintAllocationsCB printAlloc(true);
+                    printAlloc(address, iter->second, m_numStackLevels);
+                    AZ_Assert(false, "MEMORY STOMP DETECTED!!!");
+                }
+                guard->~GuardValue();
+            }
+            // init the new memory guard
+            newSize -= sizeof(Debug::GuardValue);
+            new (reinterpret_cast<char*>(address) + newSize) Debug::GuardValue();
+        }
+#endif
+
+        // statistics
+        m_requestedBytes -= allocationInfo->m_byteSize;
+        m_requestedBytes += newSize;
+        size_t currentRequestedBytePeak;
+        size_t newRequestedBytePeak;
+        do
+        {
+            currentRequestedBytePeak = m_requestedBytesPeak.load(std::memory_order::memory_order_relaxed);
+            newRequestedBytePeak = AZStd::GetMax(currentRequestedBytePeak, m_requestedBytes.load(std::memory_order::memory_order_relaxed));
+        } while (!m_requestedBytesPeak.compare_exchange_weak(currentRequestedBytePeak, newRequestedBytePeak));
+        ++m_requestedAllocs;
+
+        // update allocation size
+        allocationInfo->m_byteSize = newSize;
+    }
+
+    //=========================================================================
+    // EnumerateAllocations
+    // [9/29/2009]
+    //=========================================================================
+    void AllocationRecords::SetMode(Mode mode)
+    {
+        if (mode == RECORD_NO_RECORDS)
+        {
+            {
+                AZStd::scoped_lock lock(m_recordsMutex);
+                m_records.clear();
+            }
+            m_requestedBytes = 0;
+            m_requestedBytesPeak = 0;
+            m_requestedAllocs = 0;
+        }
+
+        AZ_Warning(
+            "Memory", m_mode != RECORD_NO_RECORDS || mode == RECORD_NO_RECORDS,
+            "Records recording was disabled and now it's enabled! You might get assert when you free memory, if a you have allocations "
+            "which were not recorded!");
+
+        m_mode = mode;
+    }
+
+    //=========================================================================
+    // EnumerateAllocations
+    // [9/29/2009]
+    //=========================================================================
+    void AllocationRecords::EnumerateAllocations(AllocationInfoCBType cb)
+    {
+        // enumerate all allocations and stop if requested.
+        // Since allocations can change during the iteration (code that prints out the records could allocate, which will
+        // mutate m_records), we are going to make a copy and iterate the copy.
         Debug::AllocationRecordsType recordsCopy;
         {
             AZStd::scoped_lock lock(m_recordsMutex);
@@ -455,67 +438,93 @@ AllocationRecords::IntegrityCheck() const
         }
         for (Debug::AllocationRecordsType::const_iterator iter = recordsCopy.begin(); iter != recordsCopy.end(); ++iter)
         {
-            // check memory guard
-            const char* guardAddress = reinterpret_cast<const char*>(iter->first)+ iter->second.m_byteSize;
-            if (!reinterpret_cast<const Debug::GuardValue*>(guardAddress)->Validate())
+            if (!cb(iter->first, iter->second, m_numStackLevels))
             {
-                // We have to turn off the integrity check at this point if we want to succesfully report the memory
-                // stomp we just found. If we don't turn this off, the printf just winds off the stack as each memory
-                // allocation done therein recurses this same code.
-                *const_cast<bool*>(&m_isAutoIntegrityCheck) = false;
-                AZ_Printf("Memory", "Memory stomp located at address %p, part of allocation:", guardAddress);
-                PrintAllocationsCB printAlloc(true);
-                printAlloc(iter->first, iter->second, m_numStackLevels);
-                AZ_Error("Memory", false, "MEMORY STOMP DETECTED!!!");
+                break;
             }
         }
     }
-#endif
-}
 
-//=========================================================================
-// operator()
-// [9/29/2009]
-//=========================================================================
-bool
-PrintAllocationsCB::operator()(void* address, const AllocationInfo& info, unsigned char numStackLevels)
-{
-    if (m_includeNameAndFilename && info.m_name)
+    //=========================================================================
+    // IntegrityCheck
+    // [9/9/2011]
+    //=========================================================================
+    void AllocationRecords::IntegrityCheck() const
     {
-        AZ_Printf("Memory", "Allocation Name: \"%s\" Addr: 0%p Size: %d Alignment: %d\n", info.m_name, address, info.m_byteSize, info.m_alignment);
-    }
-    else
-    {
-        AZ_Printf("Memory", "Allocation Addr: 0%p Size: %d Alignment: %d\n", address, info.m_byteSize, info.m_alignment);
-    }
-
-    if (m_isDetailed)
-    {
-        if (!info.m_stackFrames)
+#if defined(ENABLE_MEMORY_GUARD)
+        if (m_memoryGuardSize == sizeof(Debug::GuardValue))
         {
-            AZ_Printf("Memory", " %s (%d)\n", info.m_fileName, info.m_lineNum);
+            Debug::AllocationRecordsType recordsCopy;
+            {
+                AZStd::scoped_lock lock(m_recordsMutex);
+                recordsCopy = m_records;
+            }
+            for (Debug::AllocationRecordsType::const_iterator iter = recordsCopy.begin(); iter != recordsCopy.end(); ++iter)
+            {
+                // check memory guard
+                const char* guardAddress = reinterpret_cast<const char*>(iter->first) + iter->second.m_byteSize;
+                if (!reinterpret_cast<const Debug::GuardValue*>(guardAddress)->Validate())
+                {
+                    // We have to turn off the integrity check at this point if we want to succesfully report the memory
+                    // stomp we just found. If we don't turn this off, the printf just winds off the stack as each memory
+                    // allocation done therein recurses this same code.
+                    *const_cast<bool*>(&m_isAutoIntegrityCheck) = false;
+                    AZ_Printf("Memory", "Memory stomp located at address %p, part of allocation:", guardAddress);
+                    PrintAllocationsCB printAlloc(true);
+                    printAlloc(iter->first, iter->second, m_numStackLevels);
+                    AZ_Error("Memory", false, "MEMORY STOMP DETECTED!!!");
+                }
+            }
+        }
+#endif
+    }
+
+    //=========================================================================
+    // operator()
+    // [9/29/2009]
+    //=========================================================================
+    bool PrintAllocationsCB::operator()(void* address, const AllocationInfo& info, unsigned char numStackLevels)
+    {
+        if (m_includeNameAndFilename && info.m_name)
+        {
+            AZ_Printf(
+                "Memory", "Allocation Name: \"%s\" Addr: 0%p Size: %d Alignment: %d\n", info.m_name, address, info.m_byteSize,
+                info.m_alignment);
         }
         else
         {
-            // Allocation callstack
-            const unsigned char decodeStep = 40;
-            Debug::SymbolStorage::StackLine lines[decodeStep];
-            unsigned char iFrame = 0;
-            while (numStackLevels>0)
+            AZ_Printf("Memory", "Allocation Addr: 0%p Size: %d Alignment: %d\n", address, info.m_byteSize, info.m_alignment);
+        }
+
+        if (m_isDetailed)
+        {
+            if (!info.m_stackFrames)
             {
-                unsigned char numToDecode = AZStd::GetMin(decodeStep, numStackLevels);
-                Debug::SymbolStorage::DecodeFrames(&info.m_stackFrames[iFrame], numToDecode, lines);
-                for (unsigned char i = 0; i < numToDecode; ++i)
+                AZ_Printf("Memory", " %s (%d)\n", info.m_fileName, info.m_lineNum);
+            }
+            else
+            {
+                // Allocation callstack
+                const unsigned char decodeStep = 40;
+                Debug::SymbolStorage::StackLine lines[decodeStep];
+                unsigned char iFrame = 0;
+                while (numStackLevels > 0)
                 {
-                    if (info.m_stackFrames[iFrame+i].IsValid())
+                    unsigned char numToDecode = AZStd::GetMin(decodeStep, numStackLevels);
+                    Debug::SymbolStorage::DecodeFrames(&info.m_stackFrames[iFrame], numToDecode, lines);
+                    for (unsigned char i = 0; i < numToDecode; ++i)
                     {
-                        AZ_Printf("Memory", " %s\n", lines[i]);
+                        if (info.m_stackFrames[iFrame + i].IsValid())
+                        {
+                            AZ_Printf("Memory", " %s\n", lines[i]);
+                        }
                     }
+                    numStackLevels -= numToDecode;
+                    iFrame += numToDecode;
                 }
-                numStackLevels -= numToDecode;
-                iFrame += numToDecode;
             }
         }
+        return true; // continue enumerating
     }
-    return true; // continue enumerating
-}
+
+} // namespace AZ::Debug

Code/Framework/AzCore/AzCore/Memory/AllocatorBase.cpp

@@ -6,194 +6,203 @@
  *
  */
 
-#include <AzCore/Memory/Memory.h>
 #include <AzCore/Memory/AllocatorManager.h>
+#include <AzCore/Memory/Memory.h>
 
-using namespace AZ;
-
-AllocatorBase::AllocatorBase(IAllocatorAllocate* allocationSource, const char* name, const char* desc) :
-    IAllocator(allocationSource),
-    m_name(name),
-    m_desc(desc)
+namespace AZ
 {
-}
-
-AllocatorBase::~AllocatorBase()
-{
-    AZ_Assert(!m_isReady, "Allocator %s (%s) is being destructed without first having gone through proper calls to PreDestroy() and Destroy(). Use AllocatorInstance<> for global allocators or AllocatorWrapper<> for local allocators.", m_name, m_desc);
-}
-
-const char* AllocatorBase::GetName() const
-{
-    return m_name;
-}
-
-const char* AllocatorBase::GetDescription() const
-{
-    return m_desc;
-}
-
-IAllocatorAllocate* AllocatorBase::GetSchema()
-{
-    return nullptr;
-}
-
-Debug::AllocationRecords* AllocatorBase::GetRecords()
-{
-    return m_records;
-}
-
-void AllocatorBase::SetRecords(Debug::AllocationRecords* records)
-{
-    m_records = records;
-    m_memoryGuardSize = records ? records->MemoryGuardSize() : 0;
-}
-
-bool AllocatorBase::IsReady() const
-{
-    return m_isReady;
-}
-
-bool AllocatorBase::CanBeOverridden() const
-{
-    return m_canBeOverridden;
-}
-
-void AllocatorBase::PostCreate()
-{
-    if (m_registrationEnabled)
+    AllocatorBase::AllocatorBase(IAllocatorAllocate* allocationSource, const char* name, const char* desc)
+        : IAllocator(allocationSource)
+        , m_name(name)
+        , m_desc(desc)
     {
-        if (AZ::Environment::IsReady())
+    }
+
+    AllocatorBase::~AllocatorBase()
+    {
+        AZ_Assert(
+            !m_isReady,
+            "Allocator %s (%s) is being destructed without first having gone through proper calls to PreDestroy() and Destroy(). Use "
+            "AllocatorInstance<> for global allocators or AllocatorWrapper<> for local allocators.",
+            m_name, m_desc);
+    }
+
+    const char* AllocatorBase::GetName() const
+    {
+        return m_name;
+    }
+
+    const char* AllocatorBase::GetDescription() const
+    {
+        return m_desc;
+    }
+
+    IAllocatorAllocate* AllocatorBase::GetSchema()
+    {
+        return nullptr;
+    }
+
+    Debug::AllocationRecords* AllocatorBase::GetRecords()
+    {
+        return m_records;
+    }
+
+    void AllocatorBase::SetRecords(Debug::AllocationRecords* records)
+    {
+        m_records = records;
+        m_memoryGuardSize = records ? records->MemoryGuardSize() : 0;
+    }
+
+    bool AllocatorBase::IsReady() const
+    {
+        return m_isReady;
+    }
+
+    bool AllocatorBase::CanBeOverridden() const
+    {
+        return m_canBeOverridden;
+    }
+
+    void AllocatorBase::PostCreate()
+    {
+        if (m_registrationEnabled)
         {
-            AllocatorManager::Instance().RegisterAllocator(this);
+            if (AZ::Environment::IsReady())
+            {
+                AllocatorManager::Instance().RegisterAllocator(this);
+            }
+            else
+            {
+                AllocatorManager::PreRegisterAllocator(this);
+            }
         }
-        else
+
+        const auto debugConfig = GetDebugConfig();
+        if (!debugConfig.m_excludeFromDebugging)
         {
-            AllocatorManager::PreRegisterAllocator(this);
+            SetRecords(aznew Debug::AllocationRecords(
+                (unsigned char)debugConfig.m_stackRecordLevels, debugConfig.m_usesMemoryGuards, debugConfig.m_marksUnallocatedMemory,
+                GetName()));
         }
+
+        m_isReady = true;
     }
 
-    const auto debugConfig = GetDebugConfig();
-    if (!debugConfig.m_excludeFromDebugging)
+    void AllocatorBase::PreDestroy()
     {
-        SetRecords(aznew Debug::AllocationRecords((unsigned char)debugConfig.m_stackRecordLevels, debugConfig.m_usesMemoryGuards, debugConfig.m_marksUnallocatedMemory, GetName()));
+        Debug::AllocationRecords* allocatorRecords = GetRecords();
+        if (allocatorRecords)
+        {
+            delete allocatorRecords;
+            SetRecords(nullptr);
+        }
+
+        if (m_registrationEnabled && AZ::AllocatorManager::IsReady())
+        {
+            AllocatorManager::Instance().UnRegisterAllocator(this);
+        }
+
+        m_isReady = false;
     }
 
-    m_isReady = true;
-}
-
-void AllocatorBase::PreDestroy()
-{
-    Debug::AllocationRecords* allocatorRecords = GetRecords();
-    if(allocatorRecords)
+    void AllocatorBase::SetLazilyCreated(bool lazy)
     {
-        delete allocatorRecords;
-        SetRecords(nullptr);
+        m_isLazilyCreated = lazy;
     }
 
-    if (m_registrationEnabled && AZ::AllocatorManager::IsReady())
+    bool AllocatorBase::IsLazilyCreated() const
     {
-        AllocatorManager::Instance().UnRegisterAllocator(this);
+        return m_isLazilyCreated;
     }
 
-    m_isReady = false;
-}
+    void AllocatorBase::SetProfilingActive(bool active)
+    {
+        m_isProfilingActive = active;
+    }
 
-void AllocatorBase::SetLazilyCreated(bool lazy)
-{
-    m_isLazilyCreated = lazy;
-}
+    bool AllocatorBase::IsProfilingActive() const
+    {
+        return m_isProfilingActive;
+    }
 
-bool AllocatorBase::IsLazilyCreated() const
-{
-    return m_isLazilyCreated;
-}
+    void AllocatorBase::DisableOverriding()
+    {
+        m_canBeOverridden = false;
+    }
 
-void AllocatorBase::SetProfilingActive(bool active)
-{
-    m_isProfilingActive = active;
-}
+    void AllocatorBase::DisableRegistration()
+    {
+        m_registrationEnabled = false;
+    }
 
-bool AllocatorBase::IsProfilingActive() const
-{
-    return m_isProfilingActive;
-}
-
-void AllocatorBase::DisableOverriding()
-{
-    m_canBeOverridden = false;
-}
-
-void AllocatorBase::DisableRegistration()
-{
-    m_registrationEnabled = false;
-}
-
-void AllocatorBase::ProfileAllocation(void* ptr, size_t byteSize, size_t alignment, const char* name, const char* fileName, int lineNum, int suppressStackRecord)
-{
+    void AllocatorBase::ProfileAllocation(
+        void* ptr, size_t byteSize, size_t alignment, const char* name, const char* fileName, int lineNum, int suppressStackRecord)
+    {
 #if defined(AZ_HAS_VARIADIC_TEMPLATES) && defined(AZ_DEBUG_BUILD)
-    ++suppressStackRecord; // one more for the fact the ebus is a function
+        ++suppressStackRecord; // one more for the fact the ebus is a function
 #endif // AZ_HAS_VARIADIC_TEMPLATES
 
-    if (m_isProfilingActive)
-    {
-        auto records = GetRecords();
-        if (records)
+        if (m_isProfilingActive)
         {
-            records->RegisterAllocation(ptr, byteSize, alignment, name, fileName, lineNum, suppressStackRecord + 1);
+            auto records = GetRecords();
+            if (records)
+            {
+                records->RegisterAllocation(ptr, byteSize, alignment, name, fileName, lineNum, suppressStackRecord + 1);
+            }
         }
     }
-}
 
-void AllocatorBase::ProfileDeallocation(void* ptr, size_t byteSize, size_t alignment, Debug::AllocationInfo* info)
-{
-    if (m_isProfilingActive)
+    void AllocatorBase::ProfileDeallocation(void* ptr, size_t byteSize, size_t alignment, Debug::AllocationInfo* info)
     {
-        auto records = GetRecords();
-        if (records)
+        if (m_isProfilingActive)
         {
-            records->UnregisterAllocation(ptr, byteSize, alignment, info);
+            auto records = GetRecords();
+            if (records)
+            {
+                records->UnregisterAllocation(ptr, byteSize, alignment, info);
+            }
         }
     }
-}
 
-void AllocatorBase::ProfileReallocationBegin([[maybe_unused]] void* ptr, [[maybe_unused]] size_t newSize)
-{
-}
-
-void AllocatorBase::ProfileReallocationEnd(void* ptr, void* newPtr, size_t newSize, size_t newAlignment)
-{
-    if (m_isProfilingActive)
+    void AllocatorBase::ProfileReallocationBegin([[maybe_unused]] void* ptr, [[maybe_unused]] size_t newSize)
     {
-        Debug::AllocationInfo info;
-        ProfileDeallocation(ptr, 0, 0, &info);
-        ProfileAllocation(newPtr, newSize, newAlignment, info.m_name, info.m_fileName, info.m_lineNum, 0);
     }
-}
 
-void AllocatorBase::ProfileReallocation(void* ptr, void* newPtr, size_t newSize, size_t newAlignment)
-{
-    ProfileReallocationEnd(ptr, newPtr, newSize, newAlignment);
-}
-
-void AllocatorBase::ProfileResize(void* ptr, size_t newSize)
-{
-    if (newSize && m_isProfilingActive)
+    void AllocatorBase::ProfileReallocationEnd(void* ptr, void* newPtr, size_t newSize, size_t newAlignment)
     {
-        auto records = GetRecords();
-        if (records)
+        if (m_isProfilingActive)
         {
-            records->ResizeAllocation(ptr, newSize);
+            Debug::AllocationInfo info;
+            ProfileDeallocation(ptr, 0, 0, &info);
+            ProfileAllocation(newPtr, newSize, newAlignment, info.m_name, info.m_fileName, info.m_lineNum, 0);
         }
     }
-}
 
-bool AllocatorBase::OnOutOfMemory(size_t byteSize, size_t alignment, int flags, const char* name, const char* fileName, int lineNum)
-{
-    if (AllocatorManager::IsReady() && AllocatorManager::Instance().m_outOfMemoryListener)
+    void AllocatorBase::ProfileReallocation(void* ptr, void* newPtr, size_t newSize, size_t newAlignment)
     {
-        AllocatorManager::Instance().m_outOfMemoryListener(this, byteSize, alignment, flags, name, fileName, lineNum);
-        return true;
+        ProfileReallocationEnd(ptr, newPtr, newSize, newAlignment);
     }
-    return false;
-}
+
+    void AllocatorBase::ProfileResize(void* ptr, size_t newSize)
+    {
+        if (newSize && m_isProfilingActive)
+        {
+            auto records = GetRecords();
+            if (records)
+            {
+                records->ResizeAllocation(ptr, newSize);
+            }
+        }
+    }
+
+    bool AllocatorBase::OnOutOfMemory(size_t byteSize, size_t alignment, int flags, const char* name, const char* fileName, int lineNum)
+    {
+        if (AllocatorManager::IsReady() && AllocatorManager::Instance().m_outOfMemoryListener)
+        {
+            AllocatorManager::Instance().m_outOfMemoryListener(this, byteSize, alignment, flags, name, fileName, lineNum);
+            return true;
+        }
+        return false;
+    }
+
+} // namespace AZ