Removing AWSNativeSDKInit from Code/Tools. WiP, need to move this gem to a new location (#18635)

Signed-off-by: AMZN-Gene <[email protected]>

Code/Tools/AWSNativeSDKInit/CMakeLists.txt

@@ -1,72 +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
-#
-#
-
-o3de_pal_dir(pal_source_dir ${CMAKE_CURRENT_LIST_DIR}/source/Platform/${PAL_PLATFORM_NAME} ${O3DE_ENGINE_RESTRICTED_PATH} ${LY_ROOT_FOLDER})
-
-ly_add_target(
-    NAME AWSNativeSDKInit STATIC
-    NAMESPACE AZ
-    FILES_CMAKE
-        aws_native_sdk_init_files.cmake
-        ${pal_source_dir}/platform_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake
-    INCLUDE_DIRECTORIES
-        PUBLIC
-            include
-        PRIVATE
-            ${pal_dir}
-    BUILD_DEPENDENCIES
-        PRIVATE
-            3rdParty::AWSNativeSDK::AWSCore
-            AZ::AzCore
-)
-
-################################################################################
-# Tests
-################################################################################
-if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
-    ly_add_target(
-        NAME AWSNativeSDKTestLibs STATIC
-        NAMESPACE AZ
-        FILES_CMAKE
-            aws_native_sdk_test_files.cmake
-        INCLUDE_DIRECTORIES
-            PUBLIC
-                include
-                tests/libs
-            PRIVATE
-                source
-        BUILD_DEPENDENCIES
-            PRIVATE
-                3rdParty::AWSNativeSDK::Core
-                AZ::AzCore
-                AZ::AzTest
-    )
-
-    ly_add_target(
-        NAME AWSNativeSDKInit.Tests ${PAL_TRAIT_TEST_TARGET_TYPE}
-        NAMESPACE AZ
-        FILES_CMAKE
-            aws_native_sdk_init_tests_files.cmake
-        INCLUDE_DIRECTORIES
-            PRIVATE
-                include
-                tests
-                source
-        BUILD_DEPENDENCIES
-            PRIVATE
-                AZ::AzCore
-                AZ::AzFramework
-                AZ::AzTest
-                AZ::AWSNativeSDKInit
-                3rdParty::AWSNativeSDK::Core
-    )
-    ly_add_googletest(
-        NAME AZ::AWSNativeSDKInit.Tests
-        LABELS REQUIRES_tiaf
-    )
-endif()

Code/Tools/AWSNativeSDKInit/aws_native_sdk_init_files.cmake

@@ -1,16 +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
-#
-#
-
-set(FILES
-    include/AWSNativeSDKInit/AWSNativeSDKInit.h
-    include/AWSNativeSDKInit/AWSMemoryInterface.h
-    include/AWSNativeSDKInit/AWSLogSystemInterface.h
-    source/AWSNativeSDKInit.cpp
-    source/AWSMemoryInterface.cpp
-    source/AWSLogSystemInterface.cpp
-)

Code/Tools/AWSNativeSDKInit/aws_native_sdk_init_tests_files.cmake

@@ -1,12 +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
-#
-#
-
-set(FILES
-    tests/AWSLogSystemInterfaceTest.cpp
-    tests/AWSNativeSDKInitTest.cpp
-)

Code/Tools/AWSNativeSDKInit/aws_native_sdk_test_files.cmake

@@ -1,12 +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
-#
-#
-
-set(FILES
-    tests/libs/AWSNativeSDKTestManager.cpp
-    tests/libs/AWSNativeSDKTestManager.h
-)

Code/Tools/AWSNativeSDKInit/include/AWSNativeSDKInit/AWSLogSystemInterface.h

@@ -1,89 +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
- *
- */
-
-#pragma once
-
-#if defined(PLATFORM_SUPPORTS_AWS_NATIVE_SDK)
-
-#include <AzCore/PlatformIncl.h>
-
-AZ_PUSH_DISABLE_WARNING(4251 4996, "-Wunknown-warning-option")
-#include <aws/core/utils/logging/LogSystemInterface.h>
-AZ_POP_DISABLE_WARNING
-#else
-#include <sstream>
-namespace Aws
-{
-    using OStringStream = std::basic_ostringstream<char>;
-    namespace Utils
-    {
-        namespace Logging
-        {
-            using LogLevel = int;
-        }
-    }
-}
-#endif
-namespace AWSNativeSDKInit
-{
-    class AWSLogSystemInterface 
-#if defined(PLATFORM_SUPPORTS_AWS_NATIVE_SDK)
-        : public Aws::Utils::Logging::LogSystemInterface
-#endif
-    {
-
-    public:
-        static const char* AWS_API_LOG_PREFIX;
-        static const int MAX_MESSAGE_LENGTH;
-        static const char* MESSAGE_FORMAT;
-        static const char* ERROR_WINDOW_NAME;
-        static const char* LOG_ENV_VAR;
-
-        AWSLogSystemInterface(Aws::Utils::Logging::LogLevel logLevel);
-
-        /**
-        * Gets the currently configured log level for this logger.
-        */
-#if defined(PLATFORM_SUPPORTS_AWS_NATIVE_SDK)
-        Aws::Utils::Logging::LogLevel GetLogLevel(void) const override;
-#else
-        Aws::Utils::Logging::LogLevel GetLogLevel(void) const;
-#endif
-        /**
-        * Does a printf style output to the output stream. Don't use this, it's unsafe. See LogStream
-        */
-#if defined(PLATFORM_SUPPORTS_AWS_NATIVE_SDK)
-        void Log(Aws::Utils::Logging::LogLevel logLevel, const char* tag, const char* formatStr, ...) override;
-#else
-        void Log(Aws::Utils::Logging::LogLevel logLevel, const char* tag, const char* formatStr, ...);
-#endif
-
-        /**
-        * Writes the stream to the output stream.
-        */
-#if defined(PLATFORM_SUPPORTS_AWS_NATIVE_SDK)
-        void LogStream(Aws::Utils::Logging::LogLevel logLevel, const char* tag, const Aws::OStringStream &messageStream) override;
-#else
-        void LogStream(Aws::Utils::Logging::LogLevel logLevel, const char* tag, const Aws::OStringStream& messageStream);
-#endif
-
-#if defined(PLATFORM_SUPPORTS_AWS_NATIVE_SDK)
-        void Flush() override;
-#else
-        void Flush();
-#endif
-
-    private:
-        bool ShouldLog(Aws::Utils::Logging::LogLevel logLevel);
-        void SetLogLevel(Aws::Utils::Logging::LogLevel newLevel);
-        void ForwardAwsApiLogMessage(Aws::Utils::Logging::LogLevel logLevel, const char* tag, const char* message);
-
-        Aws::Utils::Logging::LogLevel m_logLevel;
-    };
-
-}

Code/Tools/AWSNativeSDKInit/include/AWSNativeSDKInit/AWSMemoryInterface.h

@@ -1,51 +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
- *
- */
-
-#pragma once
-
-#include <AzCore/PlatformIncl.h>
-#if defined(PLATFORM_SUPPORTS_AWS_NATIVE_SDK)
-#include <aws/core/utils/memory/MemorySystemInterface.h>
-#else
-#include <cstddef>
-#endif
-
-#include <AzCore/Memory/ChildAllocatorSchema.h>
-#include <AzCore/Memory/SystemAllocator.h>
-
-namespace AWSNativeSDKInit
-{
-    AZ_CHILD_ALLOCATOR_WITH_NAME(AWSNativeSDKAllocator, "AWSNativeSDKAllocator", "{8B4DA42F-2507-4A5B-B13C-4B2A72BC161E}", AZ::SystemAllocator);
-
-#if defined(PLATFORM_SUPPORTS_AWS_NATIVE_SDK)
-    class MemoryManager : public Aws::Utils::Memory::MemorySystemInterface
-    {
-        static const char* AWS_API_ALLOC_TAG;
-    public:
-
-        void Begin() override;
-        void End() override;
-
-        void* AllocateMemory(std::size_t blockSize, std::size_t alignment, const char* allocationTag = nullptr) override;
-        void FreeMemory(void* memoryPtr) override;
-
-        AWSNativeSDKAllocator m_allocator;
-    };
-#else
-
-    class MemoryManager
-    {
-        static const char* AWS_API_ALLOC_TAG;
-    public:
-        void Begin();
-        void End();
-        void* AllocateMemory(std::size_t blockSize, std::size_t alignment, const char* allocationTag = nullptr);
-        void FreeMemory(void* memoryPtr);
-    };
-#endif
-}

Code/Tools/AWSNativeSDKInit/include/AWSNativeSDKInit/AWSNativeSDKInit.h

@@ -1,70 +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
- *
- */
-
-#pragma once
-
-#include <AWSNativeSDKInit/AWSMemoryInterface.h>
-
-#include <AzCore/Module/Environment.h>
-
-#if defined(PLATFORM_SUPPORTS_AWS_NATIVE_SDK)
-#include <AzCore/PlatformIncl.h>
-// The AWS Native SDK AWSAllocator triggers a warning due to accessing members of std::allocator directly.
-// AWSAllocator.h(70): warning C4996: 'std::allocator<T>::pointer': warning STL4010: Various members of std::allocator are deprecated in C++17.
-// Use std::allocator_traits instead of accessing these members directly.
-// You can define _SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING or _SILENCE_ALL_CXX17_DEPRECATION_WARNINGS to acknowledge that you have received this warning.
-AZ_PUSH_DISABLE_WARNING(4251 4996, "-Wunknown-warning-option")
-#include <aws/core/Aws.h>
-AZ_POP_DISABLE_WARNING
-#endif
-
-namespace AWSNativeSDKInit
-{
-    //! Entry point for Open 3D Engine managing the AWSNativeSDK's initialization and shutdown requirements
-    //! Use an AZ::Environment variable to enforce only one init and shutdown
-    class InitializationManager
-    {
-    public:
-        static const char* const initializationManagerTag;
-
-        InitializationManager();
-        ~InitializationManager();
-
-        //! Call to guarantee that the API is initialized with proper Open 3D Engine settings.
-        //! It's fine to call this from every module which needs to use the NativeSDK
-        //! Creates a static shared pointer using the AZ EnvironmentVariable system.
-        //! This will prevent a the AWS SDK from going through the shutdown routine until all references are gone, or
-        //! the AZ::EnvironmentVariable system is brought down.
-        static void InitAwsApi();
-
-        //! Returns true if the AWS SDK is initialized and ready to be used.
-        static bool IsInitialized();
-
-        //! Remove reference, if final reference then shut down SDK.
-        static void Shutdown();
-
-        //! Call this after InitAwsApi to prevent any reachout to the Amazon EC2 instance metadata service (IMDS).
-        //! Unless you are running on EC2 compute this is recommended, otherwise AWS C++ SDK may try to call IMDS for region, config
-        //! or credential information, which will fail on non EC2 compute and waste resources. 
-        //! Note: This is a helper function for managing the environment variable, AWS_EC2_METADATA_DISABLED, but impacts just the current application's environment.
-        //! @param force If true, always set AWS_EC2_METADATA_DISABLED to true, otherwise only set if environment variable is not set.
-        //! @returns True if env var was set or currently prevents calls, False otherwise 
-        static bool PreventAwsEC2MetadataCalls(bool force = false);
-
-    private:    
-        void InitializeAwsApiInternal();
-        void ShutdownAwsApiInternal();
-
-        MemoryManager m_memoryManager;
-
-        static AZ::EnvironmentVariable<InitializationManager> s_initManager;
-#if defined(PLATFORM_SUPPORTS_AWS_NATIVE_SDK)
-        Aws::SDKOptions m_awsSDKOptions;
-#endif
-    };
-}

Code/Tools/AWSNativeSDKInit/source/AWSLogSystemInterface.cpp

@@ -1,163 +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
- *
- */
-
-
-#include <AWSNativeSDKInit/AWSLogSystemInterface.h>
-
-#include <AzCore/base.h>
-#include <AzCore/Console/IConsole.h>
-#include <AzCore/Interface/Interface.h>
-#include <AzCore/Module/Environment.h>
-
-#include <stdarg.h>
-
-#if defined(PLATFORM_SUPPORTS_AWS_NATIVE_SDK)
-AZ_PUSH_DISABLE_WARNING(4251 4996, "-Wunknown-warning-option")
-#include <aws/core/utils/logging/AWSLogging.h>
-#include <aws/core/utils/logging/DefaultLogSystem.h>
-#include <aws/core/utils/logging/ConsoleLogSystem.h>
-AZ_POP_DISABLE_WARNING
-#endif
-
-namespace AWSNativeSDKInit
-{
-    AZ_CVAR(int, bg_awsLogLevel, -1, nullptr, AZ::ConsoleFunctorFlags::Null,
-        "AWSLogLevel used to control verbosity of logging system. Off = 0, Fatal = 1, Error = 2, Warn = 3, Info = 4, Debug = 5, Trace = 6");
-
-    const char* AWSLogSystemInterface::AWS_API_LOG_PREFIX = "AwsApi-";
-    const int AWSLogSystemInterface::MAX_MESSAGE_LENGTH = 4096;
-    const char* AWSLogSystemInterface::MESSAGE_FORMAT = "[AWS] %s - %s";
-    const char* AWSLogSystemInterface::ERROR_WINDOW_NAME = "AwsNativeSDK"; 
-
-    AWSLogSystemInterface::AWSLogSystemInterface(Aws::Utils::Logging::LogLevel logLevel)
-        : m_logLevel(logLevel)
-    {
-    }
-
-    /**
-    * Gets the currently configured log level for this logger.
-    */
-    Aws::Utils::Logging::LogLevel AWSLogSystemInterface::GetLogLevel() const
-    {
-        Aws::Utils::Logging::LogLevel newLevel = m_logLevel;
-        if (auto console = AZ::Interface<AZ::IConsole>::Get(); console != nullptr)
-        {
-            int awsLogLevel = -1;
-            console->GetCvarValue("bg_awsLogLevel", awsLogLevel);
-            if (awsLogLevel >= 0)
-            {
-                newLevel = static_cast<Aws::Utils::Logging::LogLevel>(awsLogLevel);
-            }
-        }
-        return newLevel;
-    }
-
-    /**
-    * Does a printf style output to the output stream. Don't use this, it's unsafe. See LogStream
-    */
-    void AWSLogSystemInterface::Log(Aws::Utils::Logging::LogLevel logLevel, const char* tag, const char* formatStr, ...)
-    {
-
-        if (!ShouldLog(logLevel))
-        {
-            return;
-        }
-
-        char message[MAX_MESSAGE_LENGTH];
-
-        va_list mark;
-        va_start(mark, formatStr);
-        azvsnprintf(message, MAX_MESSAGE_LENGTH, formatStr, mark);
-        va_end(mark);
-
-        ForwardAwsApiLogMessage(logLevel, tag, message);
-
-    }
-
-    /**
-    * Writes the stream to the output stream.
-    */
-    void AWSLogSystemInterface::LogStream(Aws::Utils::Logging::LogLevel logLevel, const char* tag, const Aws::OStringStream &messageStream)
-    {
-        if(!ShouldLog(logLevel)) 
-        {
-            return;
-        }
-
-        ForwardAwsApiLogMessage(logLevel, tag, messageStream.str().c_str());
-    }
-
-    bool AWSLogSystemInterface::ShouldLog(Aws::Utils::Logging::LogLevel logLevel)
-    {
-#if defined(PLATFORM_SUPPORTS_AWS_NATIVE_SDK)
-        Aws::Utils::Logging::LogLevel newLevel = GetLogLevel();
-
-        if (newLevel != m_logLevel)
-        {
-            SetLogLevel(newLevel);
-        }
-#endif
-        return (logLevel <= m_logLevel);
-    }
-
-    void AWSLogSystemInterface::SetLogLevel(Aws::Utils::Logging::LogLevel newLevel)
-    {
-#if defined(PLATFORM_SUPPORTS_AWS_NATIVE_SDK)
-        Aws::Utils::Logging::ShutdownAWSLogging();
-        Aws::Utils::Logging::InitializeAWSLogging(Aws::MakeShared<AWSLogSystemInterface>("AWS", newLevel));
-        m_logLevel = newLevel;
-#endif
-    }
-
-    void AWSLogSystemInterface::ForwardAwsApiLogMessage(Aws::Utils::Logging::LogLevel logLevel, const char* tag, const char* message)
-    {
-#if defined(PLATFORM_SUPPORTS_AWS_NATIVE_SDK)
-        switch (logLevel)
-        {
-
-        case Aws::Utils::Logging::LogLevel::Off:
-            break;
-
-        case Aws::Utils::Logging::LogLevel::Fatal:
-            AZ::Debug::Trace::Instance().Error(__FILE__, __LINE__, AZ_FUNCTION_SIGNATURE, AWSLogSystemInterface::ERROR_WINDOW_NAME, MESSAGE_FORMAT, tag, message);
-            break;
-
-        case Aws::Utils::Logging::LogLevel::Error:
-            AZ::Debug::Trace::Instance().Error(__FILE__, __LINE__, AZ_FUNCTION_SIGNATURE, AWSLogSystemInterface::ERROR_WINDOW_NAME, MESSAGE_FORMAT, tag, message);
-            break;
-
-        case Aws::Utils::Logging::LogLevel::Warn:
-            AZ::Debug::Trace::Instance().Warning(__FILE__, __LINE__, AZ_FUNCTION_SIGNATURE, AWSLogSystemInterface::ERROR_WINDOW_NAME, MESSAGE_FORMAT, tag, message);
-            break;
-
-        case Aws::Utils::Logging::LogLevel::Info:
-            AZ::Debug::Trace::Instance().Printf(AWSLogSystemInterface::ERROR_WINDOW_NAME, MESSAGE_FORMAT, tag, message);
-            break;
-
-        case Aws::Utils::Logging::LogLevel::Debug:
-            AZ::Debug::Trace::Instance().Printf(AWSLogSystemInterface::ERROR_WINDOW_NAME, MESSAGE_FORMAT, tag, message);
-            break;
-
-        case Aws::Utils::Logging::LogLevel::Trace:
-            AZ::Debug::Trace::Instance().Printf(AWSLogSystemInterface::ERROR_WINDOW_NAME, MESSAGE_FORMAT, tag, message);
-            break;
-
-        default:
-            break;
-
-        }
-#endif
-    }
-
-    void AWSLogSystemInterface::Flush()
-    {
-#if defined(PLATFORM_SUPPORTS_AWS_NATIVE_SDK)
-        // No-op AZ Debug Trace doesn't have a flush API
-#endif
-    }
-}

Code/Tools/AWSNativeSDKInit/source/AWSMemoryInterface.cpp

@@ -1,35 +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
- *
- */
-
-
-#include <AWSNativeSDKInit/AWSMemoryInterface.h>
-
-namespace AWSNativeSDKInit
-{
-#if defined(PLATFORM_SUPPORTS_AWS_NATIVE_SDK)
-    const char* MemoryManager::AWS_API_ALLOC_TAG = "AwsApi";
-
-    void MemoryManager::Begin() 
-    {
-    }
-
-    void MemoryManager::End() 
-    {
-    }
-
-    void* MemoryManager::AllocateMemory(std::size_t blockSize, std::size_t alignment, const char* allocationTag) 
-    {
-        return m_allocator.Allocate(blockSize, alignment, 0, allocationTag);
-    }
-
-    void MemoryManager::FreeMemory(void* memoryPtr) 
-    {
-        m_allocator.DeAllocate(memoryPtr);
-    }
-#endif
-}

Code/Tools/AWSNativeSDKInit/source/AWSNativeSDKInit.cpp

@@ -1,120 +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
- *
- */
-
-
-#include <AWSNativeSDKInit/AWSNativeSDKInit.h>
-
-#include <AzCore/Module/Environment.h>
-#include <AzCore/Utils/Utils.h>
-
-#if defined(PLATFORM_SUPPORTS_AWS_NATIVE_SDK)
-#include <AWSNativeSDKInit/AWSLogSystemInterface.h>
-#include <aws/core/Aws.h>
-#include <aws/core/platform/Environment.h>
-#include <aws/core/utils/logging/DefaultLogSystem.h>
-#endif
-
-namespace AWSNativeSDKInit
-{
-    static constexpr char AWS_EC2_METADATA_DISABLED[] = "AWS_EC2_METADATA_DISABLED";
-
-    namespace Platform
-    {
-#if defined(PLATFORM_SUPPORTS_AWS_NATIVE_SDK)
-        void CustomizeSDKOptions(Aws::SDKOptions& options);
-        void CustomizeShutdown();
-
-        void CopyCaCertBundle();
-#endif
-    } // namespace Platform
-
-    const char* const InitializationManager::initializationManagerTag = "AWSNativeSDKInitializer";
-    AZ::EnvironmentVariable<InitializationManager> InitializationManager::s_initManager = nullptr;
-
-    InitializationManager::InitializationManager()
-    {
-        InitializeAwsApiInternal();
-    }
-
-    InitializationManager::~InitializationManager()
-    {
-        ShutdownAwsApiInternal();
-    }
-
-    void InitializationManager::InitAwsApi()
-    {
-        s_initManager = AZ::Environment::CreateVariable<InitializationManager>(initializationManagerTag);
-
-        Platform::CopyCaCertBundle();
-    }
-
-    void InitializationManager::Shutdown()
-    {
-        s_initManager = nullptr;
-    }
-
-    bool InitializationManager::IsInitialized()
-    {
-        return s_initManager.IsConstructed();
-    }
-
-    void InitializationManager::InitializeAwsApiInternal()
-    {
-#if defined(PLATFORM_SUPPORTS_AWS_NATIVE_SDK)
-        Aws::Utils::Logging::LogLevel logLevel;
-#if defined(AZ_DEBUG_BUILD) || defined(AZ_PROFILE_BUILD)
-        logLevel = Aws::Utils::Logging::LogLevel::Warn;
-#else
-        logLevel = Aws::Utils::Logging::LogLevel::Error;
-#endif
-        m_awsSDKOptions.loggingOptions.logLevel = logLevel;
-        m_awsSDKOptions.loggingOptions.logger_create_fn = [logLevel]()
-        {
-            return Aws::MakeShared<AWSLogSystemInterface>("AWS", logLevel);
-        };
-
-        m_awsSDKOptions.memoryManagementOptions.memoryManager = &m_memoryManager;
-        Platform::CustomizeSDKOptions(m_awsSDKOptions);
-        Aws::InitAPI(m_awsSDKOptions);
-
-#endif // #if defined(PLATFORM_SUPPORTS_AWS_NATIVE_SDK)
-    }
-
-    bool InitializationManager::PreventAwsEC2MetadataCalls(bool force)
-    {
-        bool prevented = false;
-#if defined(PLATFORM_SUPPORTS_AWS_NATIVE_SDK)
-
-        // Helper function to prevent calls to the Amazon EC2 instance metadata service (IMDS), unless environment var has been
-        // configured. AWS C++ SDK may reach out to EC2 IMDS for region, config or credentials, but unless code is running on EC2
-        // compute such calls will fail and waste network resources. Note: AWS C++ SDK explicitly only checks if lower case version of
-        // AWS_EC2_METADATA_DISABLED == "true", otherwise it will enable the EC2 metadata service calls.
-        const auto ec2MetadataEnvVar = Aws::Environment::GetEnv(AWS_EC2_METADATA_DISABLED);
-        if (ec2MetadataEnvVar.empty() || force)
-        {
-            prevented = true;
-            AZ::Utils::SetEnv(AWS_EC2_METADATA_DISABLED, "true", true);
-        }
-        else if (Aws::Utils::StringUtils::ToLower(ec2MetadataEnvVar.c_str()) == "true")
-        {
-            prevented = true;
-        }
-
-#endif // #if defined(PLATFORM_SUPPORTS_AWS_NATIVE_SDK)
-        return prevented;
-    }
-
-    void InitializationManager::ShutdownAwsApiInternal()
-    {
-#if defined(PLATFORM_SUPPORTS_AWS_NATIVE_SDK)
-        Aws::ShutdownAPI(m_awsSDKOptions);
-        Platform::CustomizeShutdown();
-#endif // #if defined(PLATFORM_SUPPORTS_AWS_NATIVE_SDK)
-    }
-
-} // namespace AWSNativeSDKInit

Code/Tools/AWSNativeSDKInit/source/Platform/Android/InitializeCerts_Android.cpp

@@ -1,90 +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
- *
- */
-
-#include <AzCore/PlatformDef.h>
-// The AWS Native SDK AWSAllocator triggers a warning due to accessing members of std::allocator directly.
-// AWSAllocator.h(70): warning C4996: 'std::allocator<T>::pointer': warning STL4010: Various members of std::allocator are deprecated in
-// C++17. Use std::allocator_traits instead of accessing these members directly. You can define
-// _SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING or _SILENCE_ALL_CXX17_DEPRECATION_WARNINGS to acknowledge that you have received
-// this warning.
-AZ_PUSH_DISABLE_WARNING(4251 4996, "-Wunknown-warning-option")
-#include <aws/core/utils/memory/stl/AWSString.h>
-AZ_POP_DISABLE_WARNING
-#include <AzCore/Android/Utils.h>
-#include <AzCore/IO/FileIO.h>
-#include <AzCore/IO/SystemFile.h>
-#include <AzCore/std/containers/vector.h>
-
-namespace AWSNativeSDKInit
-{
-    namespace Platform
-    {
-        void CopyCaCertBundle()
-        {
-            AZStd::vector<char> contents;
-            AZStd::string certificatePath = "@products@/certificates/aws/cacert.pem";
-            AZStd::string publicStoragePath = AZ::Android::Utils::GetAppPublicStoragePath();
-            publicStoragePath.append("/certificates/aws/cacert.pem");
-
-            AZ::IO::FileIOBase* fileBase = AZ::IO::FileIOBase::GetInstance();
-
-            if (!fileBase->Exists(certificatePath.c_str()))
-            {
-                AZ_Error("AWSNativeSDKInit", false, "Certificate File(%s) does not exist.\n", certificatePath.c_str());
-            }
-
-            AZ::IO::HandleType fileHandle;
-            AZ::IO::Result fileResult = fileBase->Open(certificatePath.c_str(), AZ::IO::OpenMode::ModeRead, fileHandle);
-
-            if (!fileResult)
-            {
-                AZ_Error("AWSNativeSDKInit", false, "Failed to open certificate file with result %i\n", fileResult.GetResultCode());
-            }
-
-            AZ::u64 fileSize = 0;
-            fileBase->Size(fileHandle, fileSize);
-
-            if (fileSize == 0)
-            {
-                AZ_Error("AWSNativeSDKInit", false, "Given empty file(%s) as the certificate bundle.\n", certificatePath.c_str());
-            }
-
-            contents.resize(fileSize + 1);
-            fileResult = fileBase->Read(fileHandle, contents.data(), fileSize);
-
-            if (!fileResult)
-            {
-                AZ_Error(
-                    "AWSNativeSDKInit", false, "Failed to read from the certificate bundle(%s) with result code(%i).\n", certificatePath.c_str(),
-                    fileResult.GetResultCode());
-            }
-
-            AZ_Printf("AWSNativeSDKInit", "Certificate bundle is read successfully from %s", certificatePath.c_str());
-
-            AZ::IO::HandleType outFileHandle;
-
-            AZ::IO::Result outFileResult = fileBase->Open(publicStoragePath.c_str(), AZ::IO::OpenMode::ModeWrite, outFileHandle);
-
-            if (!outFileResult)
-            {
-                AZ_Error("AWSNativeSDKInit", false, "Failed to open the certificate bundle with result %i\n", fileResult.GetResultCode());
-            }
-
-            AZ::IO::Result writeFileResult = fileBase->Write(outFileHandle, contents.data(), fileSize);
-            if (!writeFileResult)
-            {
-                AZ_Error("AWSNativeSDKInit", false, "Failed to write the certificate bundle with result %i\n", writeFileResult.GetResultCode());
-            }
-
-            fileBase->Close(fileHandle);
-            fileBase->Close(outFileHandle);
-
-            AZ_Printf("AWSNativeSDKInit", "Certificate bundle successfully copied to %s", publicStoragePath.c_str());
-        }
-    } // namespace Platform
-}

Code/Tools/AWSNativeSDKInit/source/Platform/Android/platform_android_files.cmake

@@ -1,12 +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
-#
-#
-
-set(FILES
-    ../Common/Default/AWSNativeSDKInit_Default.cpp
-    InitializeCerts_Android.cpp
-)

Code/Tools/AWSNativeSDKInit/source/Platform/Common/Default/AWSNativeSDKInit_Default.cpp

@@ -1,26 +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
- *
- */
-
-#include <AWSNativeSDKInit/AWSNativeSDKInit.h>
-
-namespace AWSNativeSDKInit
-{
-    namespace Platform
-    {
-#if defined(PLATFORM_SUPPORTS_AWS_NATIVE_SDK)
-        void CustomizeSDKOptions(Aws::SDKOptions& options)
-        {
-            AZ_UNUSED(options);
-        }
-
-        void CustomizeShutdown()
-        {
-        }
-#endif
-    }
-}

Code/Tools/AWSNativeSDKInit/source/Platform/Common/Default/InitializeCerts_Null.cpp

@@ -1,17 +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
- *
- */
-
-namespace AWSNativeSDKInit
-{
-    namespace Platform
-    {
-        void CopyCaCertBundle()
-        {
-        }
-    } // namespace Platform
-} // namespace AWSCore

Code/Tools/AWSNativeSDKInit/source/Platform/Linux/platform_linux_files.cmake

@@ -1,12 +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
-#
-#
-
-set(FILES
-    ../Common/Default/AWSNativeSDKInit_Default.cpp
-    ../Common/Default/InitializeCerts_Null.cpp
-)

Code/Tools/AWSNativeSDKInit/source/Platform/Mac/platform_mac_files.cmake

@@ -1,12 +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
-#
-#
-
-set(FILES
-    ../Common/Default/AWSNativeSDKInit_Default.cpp
-    ../Common/Default/InitializeCerts_Null.cpp
-)

Code/Tools/AWSNativeSDKInit/source/Platform/Windows/platform_windows_files.cmake

@@ -1,12 +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
-#
-#
-
-set(FILES
-    ../Common/Default/AWSNativeSDKInit_Default.cpp
-    ../Common/Default/InitializeCerts_Null.cpp
-)

Code/Tools/AWSNativeSDKInit/source/Platform/iOS/platform_ios_files.cmake

@@ -1,12 +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
-#
-#
-
-set(FILES
-    ../Common/Default/AWSNativeSDKInit_Default.cpp
-    ../Common/Default/InitializeCerts_Null.cpp
-)

Code/Tools/AWSNativeSDKInit/tests/AWSLogSystemInterfaceTest.cpp

@@ -1,169 +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
- *
- */
-
-#include <AzCore/Console/Console.h>
-#include <AzCore/Console/IConsole.h>
-#include <AzCore/Interface/Interface.h>
-#include <AzCore/std/smart_ptr/unique_ptr.h>
-#include <AzCore/UnitTest/TestTypes.h>
-
-#include <AWSNativeSDKInit/AWSLogSystemInterface.h>
-
-#include <aws/core/utils/logging/LogLevel.h>
-
-using namespace AWSNativeSDKInit;
-
-class AWSLogSystemInterfaceTest
-    : public UnitTest::LeakDetectionFixture
-    , public AZ::Debug::TraceMessageBus::Handler
-{
-public:
-    bool OnPreAssert(const char*, int, const char*, const char*) override
-    {
-        return true;
-    }
-
-    bool OnPreError(const char*, const char*, int, const char*, const char*) override
-    {
-        m_error = true;
-        return true;
-    }
-
-    bool OnPreWarning(const char*, const char*, int, const char*, const char*) override
-    {
-        m_warning = true;
-        return true;
-    }
-
-    bool OnPrintf(const char*, const char*) override
-    {
-        m_printf = true;
-        return true;
-    }
-
-    void SetUp() override
-    {
-        BusConnect();
-        if (!AZ::Interface<AZ::IConsole>::Get())
-        {
-            m_console = AZStd::make_unique<AZ::Console>();
-            m_console->LinkDeferredFunctors(AZ::ConsoleFunctorBase::GetDeferredHead());
-            AZ::Interface<AZ::IConsole>::Register(m_console.get());
-        }
-    }
-
-    void TearDown() override
-    {
-        if (m_console)
-        {
-            AZ::Interface<AZ::IConsole>::Unregister(m_console.get());
-            m_console.reset();
-        }
-        BusDisconnect();
-    }
-
-    bool m_error = false;
-    bool m_warning = false;
-    bool m_printf = false;
-
-private:
-    AZStd::unique_ptr<AZ::Console> m_console;
-};
-
-TEST_F(AWSLogSystemInterfaceTest, LogStream_LogFatalMessage_GetExpectedNotification)
-{
-    AWSLogSystemInterface logSystem(Aws::Utils::Logging::LogLevel::Trace);
-    Aws::OStringStream testString;
-    logSystem.LogStream(Aws::Utils::Logging::LogLevel::Fatal, "test", testString);
-    ASSERT_TRUE(m_error);
-    ASSERT_FALSE(m_warning);
-    ASSERT_FALSE(m_printf);
-}
-
-TEST_F(AWSLogSystemInterfaceTest, LogStream_LogErrorMessage_GetExpectedNotification)
-{
-    AWSLogSystemInterface logSystem(Aws::Utils::Logging::LogLevel::Trace);
-    Aws::OStringStream testString;
-    logSystem.LogStream(Aws::Utils::Logging::LogLevel::Error, "test", testString);
-    ASSERT_TRUE(m_error);
-    ASSERT_FALSE(m_warning);
-    ASSERT_FALSE(m_printf);
-}
-
-TEST_F(AWSLogSystemInterfaceTest, LogStream_LogWarningMessage_GetExpectedNotification)
-{
-    AWSLogSystemInterface logSystem(Aws::Utils::Logging::LogLevel::Trace);
-    Aws::OStringStream testString;
-    logSystem.LogStream(Aws::Utils::Logging::LogLevel::Warn, "test", testString);
-    ASSERT_FALSE(m_error);
-    ASSERT_TRUE(m_warning);
-    ASSERT_FALSE(m_printf);
-}
-
-TEST_F(AWSLogSystemInterfaceTest, LogStream_LogInfoMessage_GetExpectedNotification)
-{
-    AWSLogSystemInterface logSystem(Aws::Utils::Logging::LogLevel::Trace);
-    Aws::OStringStream testString;
-    logSystem.LogStream(Aws::Utils::Logging::LogLevel::Info, "test", testString);
-    ASSERT_FALSE(m_error);
-    ASSERT_FALSE(m_warning);
-    ASSERT_TRUE(m_printf);
-}
-
-TEST_F(AWSLogSystemInterfaceTest, LogStream_LogDebugMessage_GetExpectedNotification)
-{
-    AWSLogSystemInterface logSystem(Aws::Utils::Logging::LogLevel::Trace);
-    Aws::OStringStream testString;
-    logSystem.LogStream(Aws::Utils::Logging::LogLevel::Debug, "test", testString);
-    ASSERT_FALSE(m_error);
-    ASSERT_FALSE(m_warning);
-    ASSERT_TRUE(m_printf);
-}
-
-TEST_F(AWSLogSystemInterfaceTest, LogStream_LogTraceMessage_GetExpectedNotification)
-{
-    AWSLogSystemInterface logSystem(Aws::Utils::Logging::LogLevel::Trace);
-    Aws::OStringStream testString;
-    logSystem.LogStream(Aws::Utils::Logging::LogLevel::Trace, "test", testString);
-    ASSERT_FALSE(m_error);
-    ASSERT_FALSE(m_warning);
-    ASSERT_TRUE(m_printf);
-}
-
-TEST_F(AWSLogSystemInterfaceTest, LogStream_OverrideWarnAndLogInfoMessage_GetExpectedNotification)
-{
-    AWSLogSystemInterface logSystem(Aws::Utils::Logging::LogLevel::Trace);
-    Aws::OStringStream testString;
-    AZ::Interface<AZ::IConsole>::Get()->PerformCommand("bg_awsLogLevel 3");
-    logSystem.LogStream(Aws::Utils::Logging::LogLevel::Info, "test", testString);
-    ASSERT_FALSE(m_error);
-    ASSERT_FALSE(m_warning);
-    ASSERT_FALSE(m_printf);
-}
-
-TEST_F(AWSLogSystemInterfaceTest, LogStream_OverrideWarnAndLogeErrorMessage_GetExpectedNotification)
-{
-    AWSLogSystemInterface logSystem(Aws::Utils::Logging::LogLevel::Trace);
-    Aws::OStringStream testString;
-    AZ::Interface<AZ::IConsole>::Get()->PerformCommand("bg_awsLogLevel 3");
-    logSystem.LogStream(Aws::Utils::Logging::LogLevel::Error, "test", testString);
-    ASSERT_TRUE(m_error);
-    ASSERT_FALSE(m_warning);
-    ASSERT_FALSE(m_printf);
-}
-
-TEST_F(AWSLogSystemInterfaceTest, LogStream_OverrideOffAndLogInfoMessage_GetExpectedNotification)
-{
-    AWSLogSystemInterface logSystem(Aws::Utils::Logging::LogLevel::Trace);
-    Aws::OStringStream testString;
-    AZ::Interface<AZ::IConsole>::Get()->PerformCommand("bg_awsLogLevel 0");
-    logSystem.LogStream(Aws::Utils::Logging::LogLevel::Info, "test", testString);
-    ASSERT_FALSE(m_error);
-    ASSERT_FALSE(m_warning);
-    ASSERT_FALSE(m_printf);
-}

Code/Tools/AWSNativeSDKInit/tests/AWSNativeSDKInitTest.cpp

@@ -1,11 +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
- *
- */
-
-#include <AzTest/AzTest.h>
-
-AZ_UNIT_TEST_HOOK(DEFAULT_UNIT_TEST_ENV);

Code/Tools/AWSNativeSDKInit/tests/libs/AWSNativeSDKTestManager.cpp

@@ -1,45 +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
- *
- */
-
-
-#include <AWSNativeSDKTestManager.h>
-
-#include <AzCore/Module/Environment.h>
-#include <AzCore/Utils/Utils.h>
-
-#include <AWSNativeSDKInit/AWSLogSystemInterface.h>
-#include <aws/core/Aws.h>
-#include <aws/core/utils/logging/AWSLogging.h>
-
-namespace AWSNativeSDKTestLibs
-{
-    AZ::EnvironmentVariable<AWSNativeSDKTestManager> AWSNativeSDKTestManager::s_sdkManager = nullptr;
-
-    AWSNativeSDKTestManager::AWSNativeSDKTestManager()
-    {
-        AZ::Utils::SetEnv("AWS_DEFAULT_REGION", "us-east-1", 1);
-        m_awsSDKOptions.memoryManagementOptions.memoryManager = &m_memoryManager;
-        Aws::InitAPI(m_awsSDKOptions);
-    }
-
-    AWSNativeSDKTestManager::~AWSNativeSDKTestManager()
-    {
-        Aws::ShutdownAPI(m_awsSDKOptions);
-        AZ::Utils::UnsetEnv("AWS_DEFAULT_REGION");
-    }
-
-    void AWSNativeSDKTestManager::Init()
-    {
-        s_sdkManager = AZ::Environment::CreateVariable<AWSNativeSDKTestManager>(AWSNativeSDKTestManager::SdkManagerTag);
-    }
-
-    void AWSNativeSDKTestManager::Shutdown()
-    {
-        s_sdkManager = nullptr;
-    }
-}

Code/Tools/AWSNativeSDKInit/tests/libs/AWSNativeSDKTestManager.h

@@ -1,39 +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
- *
- */
-
-#pragma once
-
-#include <AzCore/Module/Environment.h>
-#include <AzCore/PlatformIncl.h>
-
-#include <AWSNativeSDKInit/AWSMemoryInterface.h>
-
-#include <aws/core/Aws.h>
-
-namespace AWSNativeSDKTestLibs
-{
-    // Entry point for AWSNativeSDK's initialization and shutdown for test environment
-    // Use an AZ::Environment variable to enforce only one init and shutdown
-    class AWSNativeSDKTestManager
-    {
-    public:
-        static constexpr const char SdkManagerTag[] = "TestAWSSDKManager";
-
-        AWSNativeSDKTestManager();
-        ~AWSNativeSDKTestManager();
-
-        static void Init();
-        static void Shutdown();
-
-    private:
-        static AZ::EnvironmentVariable<AWSNativeSDKTestManager> s_sdkManager;
-
-        AWSNativeSDKInit::MemoryManager m_memoryManager;
-        Aws::SDKOptions m_awsSDKOptions;
-    };
-}

Code/Tools/CMakeLists.txt

@@ -8,7 +8,6 @@
 
 add_subdirectory(SceneAPI) # Needs to go before AssetProcessor since it provides a builder
 add_subdirectory(AssetProcessor)
-add_subdirectory(AWSNativeSDKInit)
 add_subdirectory(AzTestRunner)
 add_subdirectory(CrashHandler)
 add_subdirectory(PythonBindingsExample)

Gems/AWSCore/README.md

@@ -0,0 +1 @@
+The AWSCore Gem has been moved to the AWS O3DE repo (https://github.com/aws/o3de-repo).