diff --git a/Gems/AWSCore/Code/Source/Editor/Attribution/AWSCoreAttributionManager.cpp b/Gems/AWSCore/Code/Source/Editor/Attribution/AWSCoreAttributionManager.cpp index f2ff7ed816..8f0c07edb5 100644 --- a/Gems/AWSCore/Code/Source/Editor/Attribution/AWSCoreAttributionManager.cpp +++ b/Gems/AWSCore/Code/Source/Editor/Attribution/AWSCoreAttributionManager.cpp @@ -38,9 +38,8 @@ namespace AWSCore constexpr char AWSAttributionDelaySecondsKey[] = "/Amazon/AWS/Preferences/AWSAttributionDelaySeconds"; constexpr char AWSAttributionLastTimeStampKey[] = "/Amazon/AWS/Preferences/AWSAttributionLastTimeStamp"; constexpr char AWSAttributionConsentShownKey[] = "/Amazon/AWS/Preferences/AWSAttributionConsentShown"; - constexpr char AWSAttributionApiId[] = "2zxvvmv8d7"; - constexpr char AWSAttributionChinaApiId[] = ""; - constexpr char AWSAttributionApiStage[] = "prod"; + constexpr char AWSAttributionEndpoint[] = "https://o3deattribution.us-east-1.amazonaws.com"; + constexpr char AWSAttributionChinaEndpoint[] = ""; const int AWSAttributionDefaultDelayInDays = 7; AWSAttributionManager::AWSAttributionManager() @@ -253,17 +252,17 @@ namespace AWSCore // Assumption to determine China region is the default profile is set to China region. auto profile_name = Aws::Auth::GetConfigProfileName(); Aws::Client::ClientConfiguration clientConfig(profile_name.c_str()); - AZStd::string apiId = AWSAttributionApiId; if (clientConfig.region == Aws::Region::CN_NORTH_1 || clientConfig.region == Aws::Region::CN_NORTHWEST_1) { config->region = Aws::Region::CN_NORTH_1; - apiId = AWSAttributionChinaApiId; + config->endpointOverride = AWSAttributionChinaEndpoint; + } + else + { + config->region = Aws::Region::US_EAST_1; + config->endpointOverride = AWSAttributionEndpoint; } - - config->region = Aws::Region::US_WEST_2; - config->endpointOverride = - AWSResourceMappingUtils::FormatRESTApiUrl(apiId, config->region.value().c_str(), AWSAttributionApiStage).c_str(); } bool AWSAttributionManager::CheckConsentShown() diff --git a/Gems/AWSCore/Code/Tests/Editor/Attribution/AWSCoreAttributionManagerTest.cpp b/Gems/AWSCore/Code/Tests/Editor/Attribution/AWSCoreAttributionManagerTest.cpp index ca402b9edd..ef75ac7df3 100644 --- a/Gems/AWSCore/Code/Tests/Editor/Attribution/AWSCoreAttributionManagerTest.cpp +++ b/Gems/AWSCore/Code/Tests/Editor/Attribution/AWSCoreAttributionManagerTest.cpp @@ -418,8 +418,8 @@ namespace AWSAttributionUnitTest manager.SetApiEndpointAndRegion(config); // THEN - ASSERT_TRUE(config->region == Aws::Region::US_WEST_2); - ASSERT_TRUE(config->endpointOverride->find("execute-api.us-west-2.amazonaws.com") != Aws::String::npos); + ASSERT_TRUE(config->region == Aws::Region::US_EAST_1); + ASSERT_TRUE(config->endpointOverride->find("o3deattribution.us-east-1.amazonaws.com") != Aws::String::npos); delete config; }