Merge branch 'development' into LYN-3705-2

Assets/Editor/LambdaFunctions/LwALambdaFunction.js

@@ -1,6 +1,7 @@
 /*
- * 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.
- * 
+ * 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
  *
  */

Assets/Editor/LambdaFunctions/LwFacebookLambdaFunction.js

@@ -1,6 +1,7 @@
 /*
- * 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.
- * 
+ * 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
  *
  */

Assets/Editor/LambdaFunctions/LwGenericOpenIdConnectLambdaFunction.js

@@ -1,6 +1,7 @@
 /*
- * 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.
- * 
+ * 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
  *
  */

Assets/Editor/LambdaFunctions/LwGoogleLambdaFunction.js

@@ -1,6 +1,7 @@
 /*
- * 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.
- * 
+ * 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
  *
  */

Assets/Editor/MissionTemplate.lua

@@ -1,7 +1,8 @@
 ----------------------------------------------------------------------------------------------------
 --
--- 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.
--- 
+-- 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
 --
 --

Assets/Editor/Scripts/TrackView/example.py

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

Assets/Editor/Scripts/editor_script_validation.py

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

Assets/Editor/Scripts/export_all_project_levels.py

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

Assets/Editor/Scripts/generatelod.py

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

Assets/Editor/Scripts/rename_cgf.py

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

Assets/Editor/Scripts/select_story_anim_objects.py

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

Assets/Editor/Scripts/tools_shelf_actions.py

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

Assets/Editor/UI/removeTranslationFiles.py

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

Assets/Editor/UI/updateTranslatableText.py

@@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# 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.
-# 
+# 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
 #
 #

Assets/Engine/Scripts/EngineCommon.lua

@@ -1,7 +1,8 @@
 ----------------------------------------------------------------------------------------------------
 --
--- 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.
--- 
+-- 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
 --
 --

Assets/Engine/Scripts/Entities/AI/NavigationSeedPoint.lua

@@ -1,7 +1,8 @@
 ----------------------------------------------------------------------------------------------------
 --
--- 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.
--- 
+-- 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
 --
 --

Assets/Engine/Scripts/Entities/AI/SmartObject.lua

@@ -1,7 +1,8 @@
 ----------------------------------------------------------------------------------------------------
 --
--- 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.
--- 
+-- 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
 --
 --

Assets/Engine/Scripts/Entities/AI/TagPoint.lua

@@ -1,7 +1,8 @@
 ----------------------------------------------------------------------------------------------------
 --
--- 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.
--- 
+-- 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
 --
 --

Assets/Engine/Scripts/Entities/Actor/CActorWrapper.lua

@@ -1,7 +1,8 @@
 ----------------------------------------------------------------------------------------------------
 --
--- 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.
--- 
+-- 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
 --
 --

Assets/Engine/Scripts/Entities/Anim/MannequinObject.lua

@@ -1,7 +1,8 @@
 ----------------------------------------------------------------------------------------------------
 --
--- 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.
--- 
+-- 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
 --
 --

Assets/Engine/Scripts/Entities/Default/GeomEntity.lua

@@ -1,7 +1,8 @@
 ----------------------------------------------------------------------------------------------------
 --
--- 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.
--- 
+-- 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
 --
 --

Assets/Engine/Scripts/Entities/Default/RopeEntity.lua

@@ -1,7 +1,8 @@
 ----------------------------------------------------------------------------------------------------
 --
--- 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.
--- 
+-- 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
 --
 --

Assets/Engine/Scripts/Entities/Environment/WaterVolume.lua

@@ -1,7 +1,8 @@
 ----------------------------------------------------------------------------------------------------
 --
--- 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.
--- 
+-- 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
 --
 --

Assets/Engine/Scripts/Entities/Lights/EnvironmentLight.lua

@@ -1,7 +1,8 @@
 ----------------------------------------------------------------------------------------------------
 --
--- 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.
--- 
+-- 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
 --
 --

Assets/Engine/Scripts/Entities/Lights/Light.lua

@@ -1,7 +1,8 @@
 ----------------------------------------------------------------------------------------------------
 --
--- 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.
--- 
+-- 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
 --
 --

Assets/Engine/Scripts/Entities/Others/CameraSource.lua

@@ -1,7 +1,8 @@
 ----------------------------------------------------------------------------------------------------
 --
--- 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.
--- 
+-- 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
 --
 --

Assets/Engine/Scripts/Entities/Others/CameraTarget.lua

@@ -1,7 +1,8 @@
 ----------------------------------------------------------------------------------------------------
 --
--- 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.
--- 
+-- 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
 --
 --

Assets/Engine/Scripts/Entities/Others/Comment.lua

@@ -1,7 +1,8 @@
 ----------------------------------------------------------------------------------------------------
 --
--- 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.
--- 
+-- 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
 --
 --

Assets/Engine/Scripts/Entities/Others/ProceduralObject.lua

@@ -1,7 +1,8 @@
 ----------------------------------------------------------------------------------------------------
 --
--- 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.
--- 
+-- 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
 --
 --

Assets/Engine/Scripts/Entities/Others/RigidBody.lua

@@ -1,7 +1,8 @@
 ----------------------------------------------------------------------------------------------------
 --
--- 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.
--- 
+-- 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
 --
 --

Assets/Engine/Scripts/Entities/Particle/ParticleEffect.lua

@@ -1,7 +1,8 @@
 ----------------------------------------------------------------------------------------------------
 --
--- 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.
--- 
+-- 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
 --
 --

Assets/Engine/Scripts/Entities/Physics/AnimObject.lua

@@ -1,7 +1,8 @@
 ----------------------------------------------------------------------------------------------------
 --
--- 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.
--- 
+-- 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
 --
 --

Assets/Engine/Scripts/Entities/Physics/AreaBezierVolume.lua

@@ -1,7 +1,8 @@
 ----------------------------------------------------------------------------------------------------
 --
--- 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.
--- 
+-- 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
 --
 --

Assets/Engine/Scripts/Entities/Physics/BasicEntity.lua

@@ -1,7 +1,8 @@
 ----------------------------------------------------------------------------------------------------
 --
--- 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.
--- 
+-- 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
 --
 --

Assets/Engine/Scripts/Entities/Physics/LivingEntity.lua

@@ -1,7 +1,8 @@
 ----------------------------------------------------------------------------------------------------
 --
--- 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.
--- 
+-- 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
 --
 --

Assets/Engine/Scripts/Entities/Physics/RigidBodyEx.lua

@@ -1,7 +1,8 @@
 ----------------------------------------------------------------------------------------------------
 --
--- 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.
--- 
+-- 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
 --
 --

Assets/Engine/Scripts/Entities/Render/FogVolume.lua

@@ -1,7 +1,8 @@
 ----------------------------------------------------------------------------------------------------
 --
--- 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.
--- 
+-- 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
 --
 --

Assets/Engine/Scripts/Entities/Render/GeomCache.lua

@@ -1,7 +1,8 @@
 ----------------------------------------------------------------------------------------------------
 --
--- 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.
--- 
+-- 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
 --
 --

Assets/Engine/Scripts/Entities/Sound/AudioAreaAmbience.lua

@@ -1,7 +1,8 @@
 ----------------------------------------------------------------------------------------------------
 --
--- 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.
--- 
+-- 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
 --
 --

Assets/Engine/Scripts/Entities/Sound/AudioAreaEntity.lua

@@ -1,7 +1,8 @@
 ----------------------------------------------------------------------------------------------------
 --
--- 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.
--- 
+-- 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
 --
 --

Assets/Engine/Scripts/Entities/Sound/AudioAreaRandom.lua

@@ -1,7 +1,8 @@
 ----------------------------------------------------------------------------------------------------
 --
--- 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.
--- 
+-- 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
 --
 --

Assets/Engine/Scripts/Entities/Sound/AudioTriggerSpot.lua

@@ -1,7 +1,8 @@
 ----------------------------------------------------------------------------------------------------
 --
--- 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.
--- 
+-- 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
 --
 --

Assets/Engine/Scripts/Entities/Sound/Shared/AudioUtils.lua

@@ -1,7 +1,8 @@
 ----------------------------------------------------------------------------------------------------
 --
--- 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.
--- 
+-- 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
 --
 --

Assets/Engine/Scripts/Entities/Triggers/AreaTrigger.lua

@@ -1,7 +1,8 @@
 ----------------------------------------------------------------------------------------------------
 --
--- 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.
--- 
+-- 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
 --
 --

Assets/Engine/Scripts/Entities/Triggers/ProximityTrigger.lua

@@ -1,7 +1,8 @@
 ----------------------------------------------------------------------------------------------------
 --
--- 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.
--- 
+-- 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
 --
 --

Assets/Engine/Scripts/Entities/UI/UiCanvasRefEntity.lua

@@ -1,7 +1,8 @@
 ----------------------------------------------------------------------------------------------------
 --
--- 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.
--- 
+-- 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
 --
 --

Assets/Engine/Scripts/Utils/Components/GameplayUtils.lua

@@ -1,7 +1,8 @@
 ----------------------------------------------------------------------------------------------------
 --
--- 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.
--- 
+-- 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
 --
 --

Assets/Engine/Scripts/Utils/Components/InputUtils.lua

@@ -1,7 +1,8 @@
 ----------------------------------------------------------------------------------------------------
 --
--- 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.
--- 
+-- 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
 --
 --

Assets/Engine/Scripts/Utils/Components/MultiHandlers.lua

@@ -1,7 +1,8 @@
 ----------------------------------------------------------------------------------------------------
 --
--- 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.
--- 
+-- 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
 --
 --

Assets/Engine/Scripts/Utils/Containers.lua

@@ -1,7 +1,8 @@
 ----------------------------------------------------------------------------------------------------
 --
--- 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.
--- 
+-- 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
 --
 --

Assets/Engine/Scripts/Utils/EntityUtils.lua

@@ -1,7 +1,8 @@
 ----------------------------------------------------------------------------------------------------
 --
--- 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.
--- 
+-- 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
 --
 --

Assets/Engine/Scripts/Utils/Math.lua

@@ -1,7 +1,8 @@
 ----------------------------------------------------------------------------------------------------
 --
--- 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.
--- 
+-- 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/CMakeLists.txt

@@ -1,6 +1,7 @@
 #
-# 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.
-# 
+# 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/Editor/Scripts/SettingsRegistry/__init__.py

@@ -1,6 +1,7 @@
 #
-# 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.
-# 
+# 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/Editor/Scripts/SettingsRegistry/settings_registry_example.py

@@ -1,6 +1,7 @@
 #
-# 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.
-# 
+# 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/Editor/Scripts/__init__.py

@@ -1,6 +1,7 @@
 #
-# 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.
-# 
+# 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/EngineFinder.cmake

@@ -1,6 +1,7 @@
 #
-# 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.
-# 
+# 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/CMakeLists.txt

@@ -1,6 +1,7 @@
 #
-# 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.
-# 
+# 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/Code/CMakeLists.txt

@@ -1,6 +1,7 @@
 #
-# 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.
-# 
+# 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/Code/Include/AutomatedTesting/AutomatedTestingBus.h

@@ -1,6 +1,7 @@
 /*
- * 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.
- * 
+ * 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/Code/Platform/Android/platform_android_files.cmake

@@ -1,6 +1,7 @@
 #
-# 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.
-# 
+# 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/Code/Platform/Linux/platform_linux_files.cmake

@@ -1,6 +1,7 @@
 #
-# 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.
-# 
+# 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/Code/Platform/Mac/platform_mac_files.cmake

@@ -1,6 +1,7 @@
 #
-# 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.
-# 
+# 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/Code/Platform/Mac/runtime_dependencies.cmake

@@ -1,6 +1,7 @@
 #
-# 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.
-# 
+# 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/Code/Platform/Mac/tool_dependencies.cmake

@@ -1,6 +1,7 @@
 #
-# 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.
-# 
+# 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/Code/Platform/Windows/platform_windows_files.cmake

@@ -1,6 +1,7 @@
 #
-# 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.
-# 
+# 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/Code/Platform/iOS/platform_ios_files.cmake

@@ -1,6 +1,7 @@
 #
-# 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.
-# 
+# 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/Code/Source/AutomatedTestingModule.cpp

@@ -1,6 +1,7 @@
 /*
- * 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.
- * 
+ * 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/Code/Source/AutomatedTestingSystemComponent.cpp

@@ -1,6 +1,7 @@
 /*
- * 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.
- * 
+ * 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/Code/Source/AutomatedTestingSystemComponent.h

@@ -1,6 +1,7 @@
 /*
- * 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.
- * 
+ * 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/Code/automatedtesting_files.cmake

@@ -1,6 +1,7 @@
 #
-# 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.
-# 
+# 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/Code/enabled_gems.cmake

@@ -1,6 +1,7 @@
 #
-# 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.
-# 
+# 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
 #
 #
@@ -20,7 +21,7 @@ set(ENABLED_GEMS
     QtForPython
     PythonAssetBuilder
     Metastream
-    AudioSystem
+
     Camera
     EMotionFX
     PhysX
@@ -51,4 +52,9 @@ set(ENABLED_GEMS
     AWSCore
     AWSClientAuth
     AWSMetrics
+
+
+
+    
+    AudioSystem
 )

AutomatedTesting/Gem/Editor/Scripts/__init__.py

@@ -1,5 +1,6 @@
 """
-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.
+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/Editor/Scripts/bootstrap.py

@@ -1,5 +1,6 @@
 """
-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.
+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/PythonCoverage/CMakeLists.txt

@@ -1,6 +1,7 @@
 #
-# 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.
-# 
+# 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/PythonCoverage/Code/CMakeLists.txt

@@ -1,6 +1,7 @@
 #
-# 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.
-# 
+# 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/PythonCoverage/Code/Platform/Android/PAL_android.cmake

@@ -1,6 +1,7 @@
 #
-# 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.
-# 
+# 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/PythonCoverage/Code/Platform/Linux/PAL_linux.cmake

@@ -1,6 +1,7 @@
 #
-# 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.
-# 
+# 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/PythonCoverage/Code/Platform/Mac/PAL_mac.cmake

@@ -1,6 +1,7 @@
 #
-# 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.
-# 
+# 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/PythonCoverage/Code/Platform/Windows/PAL_windows.cmake

@@ -1,6 +1,7 @@
 #
-# 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.
-# 
+# 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/PythonCoverage/Code/Platform/iOS/PAL_ios.cmake

@@ -1,6 +1,7 @@
 #
-# 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.
-# 
+# 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/PythonCoverage/Code/Source/PythonCoverageEditorModule.cpp

@@ -1,6 +1,7 @@
 /*
- * 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.
- * 
+ * 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/PythonCoverage/Code/Source/PythonCoverageEditorModule.h

@@ -1,6 +1,7 @@
 /*
- * 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.
- * 
+ * 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/PythonCoverage/Code/Source/PythonCoverageEditorSystemComponent.cpp

@@ -1,6 +1,7 @@
 /*
- * 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.
- * 
+ * 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/PythonCoverage/Code/Source/PythonCoverageEditorSystemComponent.h

@@ -1,6 +1,7 @@
 /*
- * 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.
- * 
+ * 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/PythonCoverage/Code/pythoncoverage_editor_files.cmake

@@ -1,6 +1,7 @@
 #
-# 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.
-# 
+# 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/PythonCoverage/Code/pythoncoverage_editor_shared_files.cmake

@@ -1,6 +1,7 @@
 #
-# 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.
-# 
+# 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/CMakeLists.txt

@@ -1,6 +1,7 @@
 #
-# 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.
-# 
+# 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/__init__.py

@@ -1,5 +1,6 @@
 """
-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.
+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/aws_metrics/__init__.py

@@ -1,5 +1,6 @@
 """
-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.
+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/aws_metrics/aws_metrics_automation_test.py

@@ -1,5 +1,6 @@
 """
-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.
+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
 """
@@ -7,58 +8,43 @@ SPDX-License-Identifier: Apache-2.0 OR MIT
 import logging
 import os
 import pytest
-import time
 import typing
 
 from datetime import datetime
 import ly_test_tools.log.log_monitor
 
 # fixture imports
-from AWS.Windows.resource_mappings.resource_mappings import resource_mappings
 from assetpipeline.ap_fixtures.asset_processor_fixture import asset_processor
 from .aws_metrics_utils import aws_metrics_utils
+from .aws_metrics_custom_thread import AWSMetricsThread
 
 AWS_METRICS_FEATURE_NAME = 'AWSMetrics'
 GAME_LOG_NAME = 'Game.log'
+CONTEXT_VARIABLE = ['-c', 'batch_processing=true']
 
 logger = logging.getLogger(__name__)
 
 
-def setup(launcher: ly_test_tools.launchers.Launcher,
-          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]:
+def setup(launcher: pytest.fixture,
+          asset_processor: pytest.fixture) -> pytest.fixture:
     """
-    Set up the CDK application and start the log monitor.
+    Set up the resource mapping configuration and start the log monitor.
     :param launcher: Client launcher for running the test level.
-    :param cdk: CDK application for deploying the AWS resources.
     :param asset_processor: asset_processor fixture.
-    :param resource_mappings: resource_mappings fixture.
-    :param context_variable: context_variable for enable optional CDK feature.
     :return log monitor object, metrics file path and the metrics stack name.
     """
-    logger.info(f'Cdk stack names:\n{cdk.list()}')
-    stacks = cdk.deploy(context_variable=context_variable)
-    resource_mappings.populate_output_keys(stacks)
-
     asset_processor.start()
     asset_processor.wait_for_idle()
 
-    metrics_file_path = os.path.join(launcher.workspace.paths.project(), 'user',
-                                     AWS_METRICS_FEATURE_NAME, 'metrics.json')
-    remove_file(metrics_file_path)
-
     file_to_monitor = os.path.join(launcher.workspace.paths.project_log(), GAME_LOG_NAME)
-    remove_file(file_to_monitor)
 
     # Initialize the log monitor.
     log_monitor = ly_test_tools.log.log_monitor.LogMonitor(launcher=launcher, log_file_path=file_to_monitor)
 
-    return log_monitor, metrics_file_path, stacks[0]
+    return log_monitor
 
 
-def monitor_metrics_submission(log_monitor: ly_test_tools.log.log_monitor.LogMonitor) -> None:
+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.
@@ -66,6 +52,7 @@ def monitor_metrics_submission(log_monitor: ly_test_tools.log.log_monitor.LogMon
     expected_lines = [
         '(Script) - Submitted metrics without buffer.',
         '(Script) - Submitted metrics with buffer.',
+        '(Script) - Flushed the buffered metrics.',
         '(Script) - Metrics is sent successfully.'
     ]
 
@@ -86,87 +73,132 @@ def monitor_metrics_submission(log_monitor: ly_test_tools.log.log_monitor.LogMon
         f'unexpected_lines values: {unexpected_lines}')
 
 
-def remove_file(file_path: str) -> None:
+def query_metrics_from_s3(aws_metrics_utils: pytest.fixture, stack_name: str) -> None:
     """
-    Remove a local file and its directory.
-    :param file_path: Path to the local file.
+    Verify that the metrics events are delivered to the S3 bucket and can be queried.
+    aws_metrics_utils: aws_metrics_utils fixture.
+    stack_name: name of the CloudFormation stack.
     """
-    if os.path.exists(file_path):
-        os.remove(file_path)
+    analytics_bucket_name = aws_metrics_utils.get_analytics_bucket_name(stack_name)
+    aws_metrics_utils.verify_s3_delivery(analytics_bucket_name)
+    logger.info('Metrics are sent to S3.')
 
-    file_dir = os.path.dirname(file_path)
-    if os.path.exists(file_dir) and len(os.listdir(file_dir)) == 0:
-        os.rmdir(file_dir)
+    aws_metrics_utils.run_glue_crawler(f'{stack_name}-EventsCrawler')
+    aws_metrics_utils.run_named_queries(f'{stack_name}-AthenaWorkGroup')
+    logger.info('Query metrics from S3 successfully.')
 
+    # Empty the S3 bucket. S3 buckets can only be deleted successfully when it doesn't contain any object.
+    aws_metrics_utils.empty_batch_analytics_bucket(analytics_bucket_name)
+
+
+def verify_operational_metrics(aws_metrics_utils: pytest.fixture, stack_name: str, start_time: datetime) -> None:
+    """
+    Verify that operational health metrics are delivered to CloudWatch.
+    aws_metrics_utils: aws_metrics_utils fixture.
+    stack_name: name of the CloudFormation stack.
+    start_time: Time when the game launcher starts.
+    """
+    aws_metrics_utils.verify_cloud_watch_delivery(
+        'AWS/Lambda',
+        'Invocations',
+        [{'Name': 'FunctionName',
+          'Value': f'{stack_name}-AnalyticsProcessingLambdaName'}],
+        start_time)
+    logger.info('AnalyticsProcessingLambda metrics are sent to CloudWatch.')
+
+    aws_metrics_utils.verify_cloud_watch_delivery(
+        'AWS/Lambda',
+        'Invocations',
+        [{'Name': 'FunctionName',
+          'Value': f'{stack_name}-EventsProcessingLambda'}],
+        start_time)
+    logger.info('EventsProcessingLambda metrics are sent to CloudWatch.')
+
+
+def start_kinesis_analytics_application(aws_metrics_utils: pytest.fixture, stack_name: str) -> None:
+    """
+    Start the Kinesis analytics application for real-time analytics.
+    aws_metrics_utils: aws_metrics_utils fixture.
+    stack_name: name of the CloudFormation stack.
+    """
+    analytics_application_name = f'{stack_name}-AnalyticsApplication'
+    aws_metrics_utils.start_kinesis_data_analytics_application(analytics_application_name)
 
 @pytest.mark.SUITE_periodic
 @pytest.mark.usefixtures('automatic_process_killer')
 @pytest.mark.parametrize('project', ['AutomatedTesting'])
 @pytest.mark.parametrize('level', ['AWS/Metrics'])
 @pytest.mark.parametrize('feature_name', [AWS_METRICS_FEATURE_NAME])
+@pytest.mark.usefixtures('resource_mappings')
 @pytest.mark.parametrize('resource_mappings_filename', ['default_aws_resource_mappings.json'])
+@pytest.mark.usefixtures('aws_credentials')
 @pytest.mark.parametrize('profile_name', ['AWSAutomationTest'])
 @pytest.mark.parametrize('region_name', ['us-west-2'])
 @pytest.mark.parametrize('assume_role_arn', ['arn:aws:iam::645075835648:role/o3de-automation-tests'])
+@pytest.mark.usefixtures('cdk')
 @pytest.mark.parametrize('session_name', ['o3de-Automation-session'])
+@pytest.mark.parametrize('deployment_params', [CONTEXT_VARIABLE])
 class TestAWSMetricsWindows(object):
-    def test_realtime_analytics_metrics_sent_to_cloudwatch(self,
-                                                           level: str,
-                                                           launcher: ly_test_tools.launchers.Launcher,
-                                                           asset_processor: pytest.fixture,
-                                                           workspace: pytest.fixture,
-                                                           aws_utils: pytest.fixture,
-                                                           aws_credentials: pytest.fixture,
-                                                           resource_mappings: pytest.fixture,
-                                                           cdk: pytest.fixture,
-                                                           aws_metrics_utils: aws_metrics_utils,
-                                                           ):
-        """
-        Tests that the submitted metrics are sent to CloudWatch for real-time analytics.
-        """
-        log_monitor, metrics_file_path, stack_name = setup(launcher, cdk, asset_processor, resource_mappings)
+    """
+    Test class to verify the real-time and batch analytics for metrics.
+    """
 
-        # Start the Kinesis Data Analytics application for real-time analytics.
-        analytics_application_name = f'{stack_name}-AnalyticsApplication'
-        aws_metrics_utils.start_kinesis_data_analytics_application(analytics_application_name)
+    @pytest.mark.parametrize('destroy_stacks_on_teardown', [False])
+    def test_realtime_and_batch_analytics(self,
+                                          level: str,
+                                          launcher: pytest.fixture,
+                                          asset_processor: pytest.fixture,
+                                          workspace: pytest.fixture,
+                                          aws_utils: pytest.fixture,
+                                          cdk: 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=start_kinesis_analytics_application,
+                                                                args=(aws_metrics_utils, cdk.stacks[0]))
+        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):
-            start_time = datetime.utcnow()
             monitor_metrics_submission(log_monitor)
-            # Verify that operational health metrics are delivered to CloudWatch.
-            aws_metrics_utils.verify_cloud_watch_delivery(
-                'AWS/Lambda',
-                'Invocations',
-                [{'Name': 'FunctionName',
-                  'Value': f'{stack_name}-AnalyticsProcessingLambdaName'}],
-                start_time)
-            logger.info('Operational health metrics sent to CloudWatch.')
 
+            # 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 sent to CloudWatch.')
+            logger.info('Real-time metrics are sent to CloudWatch.')
 
-        # Stop the Kinesis Data Analytics application.
-        aws_metrics_utils.stop_kinesis_data_analytics_application(analytics_application_name)
+        # Run time-consuming verifications on separate threads to avoid blocking the test.
+        verification_threads = list()
+        verification_threads.append(
+            AWSMetricsThread(target=query_metrics_from_s3, args=(aws_metrics_utils, cdk.stacks[0])))
+        verification_threads.append(
+            AWSMetricsThread(target=verify_operational_metrics, args=(aws_metrics_utils, cdk.stacks[0], start_time)))
+        for thread in verification_threads:
+            thread.start()
+        for thread in verification_threads:
+            thread.join()
 
+    @pytest.mark.parametrize('destroy_stacks_on_teardown', [True])
     def test_unauthorized_user_request_rejected(self,
                                                 level: str,
-                                                launcher: ly_test_tools.launchers.Launcher,
-                                                cdk: pytest.fixture,
-                                                aws_credentials: pytest.fixture,
+                                                launcher: pytest.fixture,
                                                 asset_processor: pytest.fixture,
-                                                resource_mappings: pytest.fixture,
                                                 workspace: pytest.fixture):
         """
-        Tests that unauthorized users cannot send metrics events to the AWS backed backend.
+        Verify that unauthorized users cannot send metrics events to the AWS backed backend.
         """
-        log_monitor, metrics_file_path, stack_name = setup(launcher, cdk, asset_processor, resource_mappings)
+        log_monitor = setup(launcher, asset_processor)
+
         # Set invalid AWS credentials.
         launcher.args = ['+LoadLevel', level, '+cl_awsAccessKey', 'AKIAIOSFODNN7EXAMPLE',
                          '+cl_awsSecretKey', 'wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY']
@@ -179,51 +211,3 @@ class TestAWSMetricsWindows(object):
                 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_batch_analytics_metrics_delivered_to_s3(self,
-                                                            level: str,
-                                                            launcher: ly_test_tools.launchers.Launcher,
-                                                            cdk: pytest.fixture,
-                                                            aws_credentials: pytest.fixture,
-                                                            asset_processor: pytest.fixture,
-                                                            resource_mappings: pytest.fixture,
-                                                            aws_utils: pytest.fixture,
-                                                            aws_metrics_utils: aws_metrics_utils,
-                                                            workspace: pytest.fixture):
-        """
-        Tests that the submitted metrics are sent to the data lake for batch analytics.
-        """
-        log_monitor, metrics_file_path, stack_name = setup(launcher, cdk, asset_processor, resource_mappings,
-                                                           context_variable='batch_processing=true')
-
-        analytics_bucket_name = aws_metrics_utils.get_analytics_bucket_name(stack_name)
-
-        launcher.args = ['+LoadLevel', level]
-        launcher.args.extend(['-rhi=null'])
-
-        with launcher.start(launch_ap=False):
-            start_time = datetime.utcnow()
-            monitor_metrics_submission(log_monitor)
-            # Verify that operational health metrics are delivered to CloudWatch.
-            aws_metrics_utils.verify_cloud_watch_delivery(
-                'AWS/Lambda',
-                'Invocations',
-                [{'Name': 'FunctionName',
-                  'Value': f'{stack_name}-EventsProcessingLambda'}],
-                start_time)
-            logger.info('Operational health metrics sent to CloudWatch.')
-
-        aws_metrics_utils.verify_s3_delivery(analytics_bucket_name)
-        logger.info('Metrics sent to S3.')
-
-        # Run the glue crawler to populate the AWS Glue Data Catalog with tables.
-        aws_metrics_utils.run_glue_crawler(f'{stack_name}-EventsCrawler')
-        # Run named queries on the table to verify the batch analytics.
-        aws_metrics_utils.run_named_queries(f'{stack_name}-AthenaWorkGroup')
-        logger.info('Query metrics from S3 successfully.')
-
-        # Kinesis Data Firehose buffers incoming data before it delivers it to Amazon S3. Sleep for the
-        # default interval (60s) to make sure that all the metrics are sent to the bucket before cleanup.
-        time.sleep(60)
-        # Empty the S3 bucket. S3 buckets can only be deleted successfully when it doesn't contain any object.
-        aws_metrics_utils.empty_s3_bucket(analytics_bucket_name)

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

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

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

@@ -1,5 +1,6 @@
 """
-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.
+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
 """
@@ -12,7 +13,6 @@ import typing
 from datetime import datetime
 from botocore.exceptions import WaiterError
 
-from AWS.common.aws_utils import AwsUtils
 from .aws_metrics_waiters import KinesisAnalyticsApplicationUpdatedWaiter, \
     CloudWatchMetricsDeliveredWaiter, DataLakeMetricsDeliveredWaiter, GlueCrawlerReadyWaiter
 
@@ -28,7 +28,7 @@ class AWSMetricsUtils:
     Provide utils functions for the AWSMetrics gem to interact with the deployed resources.
     """
 
-    def __init__(self, aws_utils: AwsUtils):
+    def __init__(self, aws_utils: pytest.fixture):
         self._aws_util = aws_utils
 
     def start_kinesis_data_analytics_application(self, application_name: str) -> None:
@@ -198,14 +198,13 @@ class AWSMetricsUtils:
 
             assert state == 'SUCCEEDED', f'Failed to run the named query {named_query.get("Name", {})}'
 
-    def empty_s3_bucket(self, bucket_name: str) -> None:
+    def empty_batch_analytics_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)
 

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

@@ -1,5 +1,6 @@
 """
-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.
+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/cdk/__init__.py

@@ -1,5 +1,6 @@
 """
-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.
+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/cdk/cdk_utils.py

@@ -1,5 +1,6 @@
 """
-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.
+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
 """
@@ -71,15 +72,14 @@ class Cdk:
                                f'\nError:{error.stderr}')
 
     def setup(self, cdk_path: str, project: str, account_id: str,
-                 workspace: pytest.fixture, session: boto3.session.Session, bootstrap_required: bool):
+              workspace: pytest.fixture, session: boto3.session.Session):
         """
         :param cdk_path: Path where cdk app.py is stored.
         :param project: Project name used for cdk project name env variable.
         :param account_id: AWS account id to use with cdk application.
         :param workspace: ly_test_tools workspace fixture.
-        :param workspace: bootstrap_required deploys bootstrap stack.
+        :param session: Current boto3 session, provides credentials and region.
         """
-
         self._cdk_env = os.environ.copy()
         unique_id = uuid.uuid4().hex[-4:]
         self._cdk_env['O3DE_AWS_PROJECT_NAME'] = project[:4] + unique_id if len(project) > 4 else project + unique_id
@@ -103,8 +103,7 @@ class Cdk:
 
         logger.info(f'Installing cdk python dependencies: {output}')
 
-        if bootstrap_required:
-            self.bootstrap()
+        self.bootstrap()
 
     def bootstrap(self) -> None:
         """
@@ -123,15 +122,19 @@ class Cdk:
             logger.warning(f'Failed creating Bootstrap stack {BOOTSTRAP_STACK_NAME} not found. '
                            f'\nError:{clientError["Error"]["Message"]}')
 
-    def list(self) -> List[str]:
+    def list(self, deployment_params: List[str] = None) -> List[str]:
         """
-        lists cdk stack names
-        :return List of cdk stack names
+        lists cdk stack names.
+        :param deployment_params: Deployment parameters like --all can be passed in this way.
+        :return List of cdk stack names.
         """
         if not self._cdk_path:
             return []
 
         list_cdk_application_cmd = ['cdk', 'list']
+        if deployment_params:
+            list_cdk_application_cmd.extend(deployment_params)
+
         output = process_utils.check_output(
             list_cdk_application_cmd,
             cwd=self._cdk_path,
@@ -140,36 +143,36 @@ class Cdk:
 
         return output.splitlines()
 
-    def synthesize(self) -> None:
+    def synthesize(self, deployment_params: List[str] = None) -> None:
         """
-        Synthesizes all cdk stacks
+        Synthesizes all cdk stacks.
+        :param deployment_params: Deployment parameters like --all can be passed in this way.
         """
         if not self._cdk_path:
             return
 
-        list_cdk_application_cmd = ['cdk', 'synth']
+        synth_cdk_application_cmd = ['cdk', 'synth']
+        if deployment_params:
+            synth_cdk_application_cmd.extend(deployment_params)
 
         process_utils.check_output(
-            list_cdk_application_cmd,
+            synth_cdk_application_cmd,
             cwd=self._cdk_path,
             env=self._cdk_env,
             shell=True)
 
-    def deploy(self, context_variable: str = '', additonal_params: List[str] = None) -> List[str]:
+    def deploy(self, deployment_params: List[str] = None) -> List[str]:
         """
         Deploys all the CDK stacks.
-        :param context_variable: Context variable for enabling optional features.
-        :param additonal_params: Additonal parameters like --all can be passed in this way.
+        :param deployment_params: Deployment parameters like --all can be passed in this way.
         :return List of deployed stack arns.
         """
         if not self._cdk_path:
             return []
 
         deploy_cdk_application_cmd = ['cdk', 'deploy', '--require-approval', 'never']
-        if additonal_params:
-            deploy_cdk_application_cmd.extend(additonal_params)
-        if context_variable:
-            deploy_cdk_application_cmd.extend(['-c', f'{context_variable}'])
+        if deployment_params:
+            deploy_cdk_application_cmd.extend(deployment_params)
 
         output = process_utils.check_output(
             deploy_cdk_application_cmd,
@@ -177,21 +180,23 @@ class Cdk:
             env=self._cdk_env,
             shell=True)
 
-        stacks = []
         for line in output.splitlines():
             line_sections = line.split('/')
             assert len(line_sections), 3
-            stacks.append(line.split('/')[-2])
+            self._stacks.append(line.split('/')[-2])
 
-        return stacks
+        return self._stacks
 
-    def destroy(self) -> None:
+    def destroy(self, deployment_params: List[str] = None) -> None:
         """
         Destroys the cdk application.
+        :param deployment_params: Deployment parameters like --all can be passed in this way.
         """
 
         logger.info(f'CDK Path {self._cdk_path}')
-        destroy_cdk_application_cmd = ['cdk', 'destroy', '--all', '-f']
+        destroy_cdk_application_cmd = ['cdk', 'destroy', '-f']
+        if deployment_params:
+            destroy_cdk_application_cmd.extend(deployment_params)
 
         try:
             process_utils.check_output(
@@ -237,3 +242,7 @@ class Cdk:
         # self._session.client('cloudformation').delete_stack(
         #     StackName=BOOTSTRAP_STACK_NAME
         # )
+
+    @property
+    def stacks(self):
+        return self._stacks

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

@@ -1,5 +1,6 @@
 """
-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.
+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/client_auth/aws_client_auth_automation_test.py

@@ -1,5 +1,6 @@
 """
-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.
+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
 """
@@ -9,10 +10,7 @@ import logging
 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 assetpipeline.ap_fixtures.asset_processor_fixture import asset_processor
 
 AWS_PROJECT_NAME = 'AWS-AutomationTest'
 AWS_CLIENT_AUTH_FEATURE_NAME = 'AWSClientAuth'
@@ -36,11 +34,47 @@ logger = logging.getLogger(__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'])
-class TestAWSClientAuthPasswordSignIn(object):
+@pytest.mark.usefixtures('cdk')
+@pytest.mark.parametrize('deployment_params', [[]])
+class TestAWSClientAuthWindows(object):
     """
-    Test class to verify AWS Cognito IDP Password sign in and Cognito Identity pool authenticated authorization.
+    Test class to verify AWS Client Auth gem features on Windows.
     """
 
+    @pytest.mark.parametrize('level', ['AWS/ClientAuth'])
+    @pytest.mark.parametrize('destroy_stacks_on_teardown', [False])
+    def test_anonymous_credentials(self,
+                                   level: str,
+                                   launcher: pytest.fixture,
+                                   resource_mappings: pytest.fixture,
+                                   workspace: pytest.fixture,
+                                   asset_processor: pytest.fixture
+                                   ):
+        """
+        Test to verify AWS Cognito Identity pool anonymous authorization.
+
+        Setup: Deploys cdk and updates resource mapping file.
+        Tests: Getting credentials when no credentials are configured
+        Verification: Log monitor looks for success credentials log.
+        """
+        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)
+
+        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) - Success anonymous credentials'],
+                unexpected_lines=['(Script) - Fail anonymous credentials'],
+                halt_on_unexpected=True,
+            )
+            assert result, 'Anonymous credentials fetched successfully.'
+
+    @pytest.mark.parametrize('destroy_stacks_on_teardown', [True])
     def test_password_signin_credentials(self,
                                          launcher: pytest.fixture,
                                          cdk: pytest.fixture,
@@ -50,13 +84,12 @@ class TestAWSClientAuthPasswordSignIn(object):
                                          aws_utils: pytest.fixture
                                          ):
         """
+        Test to verify AWS Cognito IDP Password sign in and Cognito Identity pool authenticated authorization.
+
         Setup: Deploys cdk and updates resource mapping file.
         Tests: Sign up new test user, admin confirm the user, sign in and get aws credentials.
         Verification: Log monitor looks for success credentials log.
         """
-        logger.info(f'Cdk stack names:\n{cdk.list()}')
-        stacks = cdk.deploy()
-        resource_mappings.populate_output_keys(stacks)
         asset_processor.start()
         asset_processor.wait_for_idle()
 

AutomatedTesting/Gem/PythonTests/AWS/Windows/client_auth/test_anonymous_credentials.py

@@ -1,76 +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
-"""
-import pytest
-import os
-import logging
-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
-
-AWS_PROJECT_NAME = 'AWS-AutomationTest'
-AWS_CLIENT_AUTH_FEATURE_NAME = 'AWSClientAuth'
-AWS_CLIENT_AUTH_DEFAULT_PROFILE_NAME = 'default'
-
-GAME_LOG_NAME = 'Game.log'
-
-logger = logging.getLogger(__name__)
-
-
-@pytest.mark.SUITE_periodic
-@pytest.mark.usefixtures('automatic_process_killer')
-@pytest.mark.usefixtures('asset_processor')
-@pytest.mark.usefixtures('workspace')
-@pytest.mark.parametrize('project', ['AutomatedTesting'])
-@pytest.mark.parametrize('level', ['AWS/ClientAuth'])
-@pytest.mark.usefixtures('cdk')
-@pytest.mark.parametrize('feature_name', [AWS_CLIENT_AUTH_FEATURE_NAME])
-@pytest.mark.usefixtures('resource_mappings')
-@pytest.mark.parametrize('resource_mappings_filename', ['default_aws_resource_mappings.json'])
-@pytest.mark.usefixtures('aws_utils')
-@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'])
-class TestAWSClientAuthAnonymousCredentials(object):
-    """
-    Test class to verify AWS Cognito Identity pool anonymous authorization.
-    """
-
-    def test_anonymous_credentials(self,
-                                   level: str,
-                                   launcher: pytest.fixture,
-                                   cdk: pytest.fixture,
-                                   resource_mappings: pytest.fixture,
-                                   workspace: pytest.fixture,
-                                   asset_processor: 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 credentials log.
-        """
-        logger.info(f'Cdk stack names:\n{cdk.list()}')
-        stacks = cdk.deploy()
-        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)
-
-        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) - Success anonymous credentials'],
-                unexpected_lines=['(Script) - Fail anonymous credentials'],
-                halt_on_unexpected=True,
-            )
-            assert result, 'Anonymous credentials fetched successfully.'

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

@@ -1,5 +1,6 @@
 """
-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.
+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
 """