Merge branch 'development' of https://github.com/o3de/o3de into jckand/DynVegXfailFixes

AutomatedTesting/Gem/Code/enabled_gems.cmake

@@ -47,8 +47,7 @@ set(ENABLED_GEMS
     LmbrCentral
     LyShine
     HttpRequestor
-    Atom_AtomBridge
-    PythonCoverage
+    Atom
     AWSCore
     AWSClientAuth
     AWSMetrics

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

@@ -15,10 +15,7 @@ import ly_test_tools.log.log_monitor
 
 # fixture imports
 from AWS.Windows.resource_mappings.resource_mappings import resource_mappings
-from AWS.Windows.cdk.cdk_utils import Cdk
-from AWS.common.aws_utils import AwsUtils
-from assetpipeline.ap_fixtures.asset_processor_fixture import asset_processor as asset_processor
-from AWS.common.aws_credentials import aws_credentials
+from assetpipeline.ap_fixtures.asset_processor_fixture import asset_processor
 from .aws_metrics_utils import aws_metrics_utils
 
 AWS_METRICS_FEATURE_NAME = 'AWSMetrics'
@@ -28,7 +25,7 @@ logger = logging.getLogger(__name__)
 
 
 def setup(launcher: ly_test_tools.launchers.Launcher,
-          cdk: Cdk,
+          cdk: pytest.fixture,
           asset_processor: asset_processor,
           resource_mappings: resource_mappings,
           context_variable: str = '') -> typing.Tuple[ly_test_tools.log.log_monitor.LogMonitor, str, str]:
@@ -119,7 +116,7 @@ class TestAWSMetricsWindows(object):
                                                            asset_processor: pytest.fixture,
                                                            workspace: pytest.fixture,
                                                            aws_utils: pytest.fixture,
-                                                           aws_credentials: aws_credentials,
+                                                           aws_credentials: pytest.fixture,
                                                            resource_mappings: pytest.fixture,
                                                            cdk: pytest.fixture,
                                                            aws_metrics_utils: aws_metrics_utils,
@@ -162,7 +159,7 @@ class TestAWSMetricsWindows(object):
                                                 level: str,
                                                 launcher: ly_test_tools.launchers.Launcher,
                                                 cdk: pytest.fixture,
-                                                aws_credentials: aws_credentials,
+                                                aws_credentials: pytest.fixture,
                                                 asset_processor: pytest.fixture,
                                                 resource_mappings: pytest.fixture,
                                                 workspace: pytest.fixture):
@@ -187,7 +184,7 @@ class TestAWSMetricsWindows(object):
                                                             level: str,
                                                             launcher: ly_test_tools.launchers.Launcher,
                                                             cdk: pytest.fixture,
-                                                            aws_credentials: aws_credentials,
+                                                            aws_credentials: pytest.fixture,
                                                             asset_processor: pytest.fixture,
                                                             resource_mappings: pytest.fixture,
                                                             aws_utils: pytest.fixture,

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

@@ -0,0 +1,5 @@
+"""
+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/Windows/core/test_aws_resource_interaction.py

@@ -0,0 +1,186 @@
+"""
+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 os
+import logging
+import time
+
+import pytest
+import ly_test_tools
+import ly_test_tools.log.log_monitor
+import ly_test_tools.environment.process_utils as process_utils
+import ly_test_tools.o3de.asset_processor_utils as asset_processor_utils
+
+from botocore.exceptions import ClientError
+from AWS.Windows.resource_mappings.resource_mappings import resource_mappings
+from assetpipeline.ap_fixtures.asset_processor_fixture import asset_processor
+
+AWS_CORE_FEATURE_NAME = 'AWSCore'
+AWS_RESOURCE_MAPPING_FILE_NAME = 'default_aws_resource_mappings.json'
+
+process_utils.kill_processes_named("o3de", ignore_extensions=True)  # Kill ProjectManager windows
+
+GAME_LOG_NAME = 'Game.log'
+
+logger = logging.getLogger(__name__)
+
+
+def setup(launcher: pytest.fixture, cdk: pytest.fixture, resource_mappings: pytest.fixture, asset_processor: pytest.fixture):
+    asset_processor_utils.kill_asset_processor()
+    logger.info(f'Cdk stack names:\n{cdk.list()}')
+    stacks = cdk.deploy(additonal_params=['--all'])
+    resource_mappings.populate_output_keys(stacks)
+    asset_processor.start()
+    asset_processor.wait_for_idle()
+
+    file_to_monitor = os.path.join(launcher.workspace.paths.project_log(), GAME_LOG_NAME)
+    log_monitor = ly_test_tools.log.log_monitor.LogMonitor(launcher=launcher, log_file_path=file_to_monitor)
+
+    return log_monitor
+
+
+@pytest.mark.SUITE_periodic
+@pytest.mark.usefixtures('automatic_process_killer')
+@pytest.mark.usefixtures('asset_processor')
+@pytest.mark.usefixtures('cdk')
+@pytest.mark.parametrize('feature_name', [AWS_CORE_FEATURE_NAME])
+@pytest.mark.parametrize('region_name', ['us-west-2'])
+@pytest.mark.parametrize('assume_role_arn', ['arn:aws:iam::645075835648:role/o3de-automation-tests'])
+@pytest.mark.parametrize('session_name', ['o3de-Automation-session'])
+@pytest.mark.usefixtures('workspace')
+@pytest.mark.parametrize('project', ['AutomatedTesting'])
+@pytest.mark.parametrize('level', ['AWS/Core'])
+@pytest.mark.usefixtures('resource_mappings')
+@pytest.mark.parametrize('resource_mappings_filename', [AWS_RESOURCE_MAPPING_FILE_NAME])
+@pytest.mark.usefixtures('aws_credentials')
+@pytest.mark.parametrize('profile_name', ['AWSAutomationTest'])
+class TestAWSCoreAWSResourceInteraction(object):
+    """
+    Test class to verify AWSCore can downloading a file from S3.
+    """
+    def test_download_from_s3(self,
+                              level: str,
+                              launcher: pytest.fixture,
+                              cdk: pytest.fixture,
+                              workspace: pytest.fixture,
+                              asset_processor: pytest.fixture,
+                              resource_mappings: pytest.fixture
+                              ):
+        """
+        Setup: Deploys cdk and updates resource mapping file.
+        Tests: Getting AWS credentials for no signed in user.
+        Verification: Log monitor looks for success download. The existence and contents of the file are also verified.
+        """
+
+        log_monitor = setup(launcher, cdk, resource_mappings, asset_processor)
+
+        launcher.args = ['+LoadLevel', level]
+        launcher.args.extend(['-rhi=null'])
+
+        user_dir = os.path.join(workspace.paths.project(), 'user')
+        download_dir = os.path.join(user_dir, 's3_download')
+        if not os.path.exists(download_dir):
+            os.makedirs(download_dir)
+
+        with launcher.start(launch_ap=False):
+            result = log_monitor.monitor_log_for_lines(
+                expected_lines=['(Script) - [S3] Head object request is done',
+                                '(Script) - [S3] Head object success: Object example.txt is found.',
+                                '(Script) - [S3] Get object success: Object example.txt is downloaded.'],
+                unexpected_lines=['(Script) - [S3] Head object error: No response body.',
+                                  '(Script) - [S3] Get object error: Request validation failed, output file directory doesn\'t exist.'],
+                halt_on_unexpected=True
+                )
+
+            assert result, "Expected lines weren't found."
+
+        download_path = os.path.join(download_dir, 'output.txt')
+
+        file_was_downloaded = os.path.exists(download_path)
+        # clean up the file directories.
+        if file_was_downloaded:
+            os.remove(download_path)
+        os.rmdir(download_dir)
+
+        assert file_was_downloaded, 'The expected file wasn\'t successfully downloaded'
+
+    def test_invoke_lambda(self,
+                           level: str,
+                           launcher: pytest.fixture,
+                           cdk: pytest.fixture,
+                           resource_mappings: pytest.fixture,
+                           workspace: pytest.fixture,
+                           asset_processor: pytest.fixture
+                           ):
+        """
+        Setup: Deploys the CDK.
+        Tests: Runs the test level.
+        Verification: Searches the logs for the expected output from the example lambda.
+        """
+
+        log_monitor = setup(launcher, cdk, resource_mappings, asset_processor)
+
+        launcher.args = ['+LoadLevel', level]
+        launcher.args.extend(['-rhi=null'])
+
+        with launcher.start(launch_ap=False):
+            result = log_monitor.monitor_log_for_lines(
+                expected_lines=['(Script) - [Lambda] Completed Invoke',
+                                '(Script) - [Lambda] Invoke success: {"statusCode": 200, "body": {}}'],
+                unexpected_lines=['(Script) - Request validation failed, output file miss full path.',
+                                  '(Script) - '],
+                halt_on_unexpected=True
+            )
+
+        assert result
+
+    def test_get_dynamodb_value(self,
+                                level: str,
+                                launcher: pytest.fixture,
+                                cdk: pytest.fixture,
+                                resource_mappings: pytest.fixture,
+                                workspace: pytest.fixture,
+                                asset_processor: pytest.fixture,
+                                aws_utils: pytest.fixture,
+                                ):
+        """
+        Setup: Deploys  the CDK application
+        Test: Runs a launcher with a level that loads a scriptcanvas that pulls a DynamoDB table value.
+        Verification: The value is output in the logs and verified by the test.
+        """
+
+        def write_test_table_data():
+            client = aws_utils.client('dynamodb')
+            table_name = resource_mappings.get_resource_name_id("AWSCore.ExampleDynamoTableOutput")
+            try:
+                client.put_item(
+                    TableName=table_name,
+                    Item={
+                        'id': {
+                            'S': 'Item1'
+                        }
+                    }
+                )
+                logger.info(f'Loaded data into table {table_name}')
+            except ClientError:
+                logger.exception(f'Failed to load data into table {table_name}')
+                raise
+
+        log_monitor = setup(launcher, cdk, resource_mappings, asset_processor)
+        write_test_table_data()
+
+        launcher.args = ['+LoadLevel', level]
+        launcher.args.extend(['-rhi=null'])
+
+        with launcher.start(launch_ap=False):
+            result = log_monitor.monitor_log_for_lines(
+                expected_lines=['(Script) - [DynamoDB] Results finished'],
+                unexpected_lines=['(Script) - Request validation failed, output file miss full path.',
+                                  '(Script) - '],
+                halt_on_unexpected=True
+            )
+
+        assert result

AutomatedTesting/Gem/PythonTests/AWS/common/aws_credentials.py

@@ -107,24 +107,3 @@ class AwsCredentials:
         else:
             self._credentials[self._profile_name][attribute_name] = attribute_value
 
-
-@pytest.fixture(scope='function')
-def aws_credentials(request: pytest.fixture, aws_utils: pytest.fixture, profile_name: str):
-    """
-    Fixture for setting up temporary AWS credentials from assume role.
-
-    :param request: _pytest.fixtures.SubRequest class that handles getting
-        a pytest fixture from a pytest function/fixture.
-    :param aws_utils: aws_utils fixture.
-    :param profile_name: Named AWS profile to store temporary credentials.
-    """
-    aws_credentials_obj = AwsCredentials(profile_name)
-    original_access_key, original_secret_access_key, original_token = aws_credentials_obj.get_aws_credentials()
-    aws_credentials_obj.set_aws_credentials_by_session(aws_utils.assume_session())
-
-    def teardown():
-        # Reset to the named profile using the original AWS credentials
-        aws_credentials_obj.set_aws_credentials(original_access_key, original_secret_access_key, original_token)
-    request.addfinalizer(teardown)
-
-    return aws_credentials_obj

AutomatedTesting/Gem/PythonTests/AWS/conftest.py

@@ -6,6 +6,7 @@ SPDX-License-Identifier: Apache-2.0 OR MIT
 import pytest
 import logging
 from AWS.common.aws_utils import AwsUtils
+from AWS.common.aws_credentials import AwsCredentials
 from AWS.Windows.cdk.cdk_utils import Cdk
 
 logger = logging.getLogger(__name__)
@@ -81,3 +82,26 @@ def cdk(
     request.addfinalizer(teardown)
 
     return pytest.cdk_obj
+
+
+
+@pytest.fixture(scope='function')
+def aws_credentials(request: pytest.fixture, aws_utils: pytest.fixture, profile_name: str):
+    """
+    Fixture for setting up temporary AWS credentials from assume role.
+
+    :param request: _pytest.fixtures.SubRequest class that handles getting
+        a pytest fixture from a pytest function/fixture.
+    :param aws_utils: aws_utils fixture.
+    :param profile_name: Named AWS profile to store temporary credentials.
+    """
+    aws_credentials_obj = AwsCredentials(profile_name)
+    original_access_key, original_secret_access_key, original_token = aws_credentials_obj.get_aws_credentials()
+    aws_credentials_obj.set_aws_credentials_by_session(aws_utils.assume_session())
+
+    def teardown():
+        # Reset to the named profile using the original AWS credentials
+        aws_credentials_obj.set_aws_credentials(original_access_key, original_secret_access_key, original_token)
+    request.addfinalizer(teardown)
+
+    return aws_credentials_obj

AutomatedTesting/Gem/PythonTests/atom_renderer/CMakeLists.txt

@@ -38,7 +38,7 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_BUILD_TESTS_SUPPORTED AND AutomatedT
         TEST_SUITE main
         TEST_REQUIRES gpu
         TEST_SERIAL
-        TIMEOUT 400
+        TIMEOUT 800
         PATH ${CMAKE_CURRENT_LIST_DIR}/test_Atom_GPUTests.py
         RUNTIME_DEPENDENCIES
             AssetProcessor

AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_GPUTests.py

@@ -17,7 +17,7 @@ import editor_python_test_tools.hydra_test_utils as hydra
 
 logger = logging.getLogger(__name__)
 DEFAULT_SUBFOLDER_PATH = 'user/PythonTests/Automated/Screenshots'
-EDITOR_TIMEOUT = 300
+EDITOR_TIMEOUT = 600
 TEST_DIRECTORY = os.path.join(os.path.dirname(__file__), "atom_hydra_scripts")
 
 
@@ -77,7 +77,6 @@ class TestAllComponentsIndepthTests(object):
             unexpected_lines=unexpected_lines,
             halt_on_unexpected=True,
             cfg_args=[level],
-            auto_test_mode=False,
             null_renderer=False,
         )
 

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

@@ -60,24 +60,7 @@ class TestEditMenuOptions(EditorTestHelper):
             ("Modify", "Transform Mode", "Rotate"),
             ("Modify", "Transform Mode", "Scale"),
             ("Editor Settings", "Global Preferences"),
-            ("Editor Settings", "Graphics Settings"),
             ("Editor Settings", "Editor Settings Manager"),
-            ("Editor Settings", "Graphics Performance", "PC", "Very High"),
-            ("Editor Settings", "Graphics Performance", "PC", "High"),
-            ("Editor Settings", "Graphics Performance", "PC", "Medium"),
-            ("Editor Settings", "Graphics Performance", "PC", "Low"),
-            ("Editor Settings", "Graphics Performance", "OSX Metal", "Very High"),
-            ("Editor Settings", "Graphics Performance", "OSX Metal", "High"),
-            ("Editor Settings", "Graphics Performance", "OSX Metal", "Medium"),
-            ("Editor Settings", "Graphics Performance", "OSX Metal", "Low"),
-            ("Editor Settings", "Graphics Performance", "Android", "Very High"),
-            ("Editor Settings", "Graphics Performance", "Android", "High"),
-            ("Editor Settings", "Graphics Performance", "Android", "Medium"),
-            ("Editor Settings", "Graphics Performance", "Android", "Low"),
-            ("Editor Settings", "Graphics Performance", "iOS", "Very High"),
-            ("Editor Settings", "Graphics Performance", "iOS", "High"),
-            ("Editor Settings", "Graphics Performance", "iOS", "Medium"),
-            ("Editor Settings", "Graphics Performance", "iOS", "Low"),
             ("Editor Settings", "Keyboard Customization", "Customize Keyboard"),
             ("Editor Settings", "Keyboard Customization", "Export Keyboard Settings"),
             ("Editor Settings", "Keyboard Customization", "Import Keyboard Settings"),

AutomatedTesting/Gem/PythonTests/editor/test_Menus.py

@@ -55,12 +55,7 @@ class TestMenus(object):
             "Rotate Action triggered",
             "Scale Action triggered",
             "Global Preferences Action triggered",
-            "Graphics Settings Action triggered",
             "Editor Settings Manager Action triggered",
-            "Very High Action triggered",
-            "High Action triggered",
-            "Medium Action triggered",
-            "Low Action triggered",
             "Customize Keyboard Action triggered",
             "Export Keyboard Settings Action triggered",
             "Import Keyboard Settings Action triggered",

AutomatedTesting/Gem/PythonTests/smoke/CMakeLists.txt

@@ -51,4 +51,18 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
             AutomatedTesting.GameLauncher
             AutomatedTesting.Assets
     )
+
+    ly_add_pytest(
+        NAME AutomatedTesting::GameLauncherWithGPU
+        TEST_SUITE sandbox
+        TEST_REQUIRES gpu
+        PATH ${CMAKE_CURRENT_LIST_DIR}/test_GameLauncher_EnterExitGameMode_Works.py
+        TIMEOUT 100
+        RUNTIME_DEPENDENCIES
+            AZ::AssetProcessor
+            AZ::PythonBindingsExample
+            Legacy::Editor
+            AutomatedTesting.GameLauncher
+            AutomatedTesting.Assets
+    )
 endif()

AutomatedTesting/Levels/AWS/Core/Core.ly

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

AutomatedTesting/Levels/AWS/Core/filelist.xml

@@ -0,0 +1,6 @@
+<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

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

AutomatedTesting/Levels/AWS/Core/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