From 273f4f89a1a55faa7d99ad72f67e412dc7e5f3cc Mon Sep 17 00:00:00 2001
From: Vincent Liu <5900509+onecent1101@users.noreply.github.com>
Date: Thu, 17 Jun 2021 14:53:16 -0700
Subject: [PATCH] [LYN-3988] Remove session token cvar (#1407)

---
 .../Code/Source/Credential/AWSCVarCredentialHandler.cpp     | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Gems/AWSCore/Code/Source/Credential/AWSCVarCredentialHandler.cpp b/Gems/AWSCore/Code/Source/Credential/AWSCVarCredentialHandler.cpp
index f4315c41c2..30a810eb23 100644
--- a/Gems/AWSCore/Code/Source/Credential/AWSCVarCredentialHandler.cpp
+++ b/Gems/AWSCore/Code/Source/Credential/AWSCVarCredentialHandler.cpp
@@ -18,7 +18,6 @@ namespace AWSCore
 {
     AZ_CVAR(AZ::CVarFixedString, cl_awsAccessKey, "", nullptr, AZ::ConsoleFunctorFlags::Null, "Override AWS access key");
     AZ_CVAR(AZ::CVarFixedString, cl_awsSecretKey, "", nullptr, AZ::ConsoleFunctorFlags::Null, "Override AWS secret key");
-    AZ_CVAR(AZ::CVarFixedString, cl_awsSessionToken, "", nullptr, AZ::ConsoleFunctorFlags::Null, "Override AWS session token");
 
     static constexpr char AWSCVARCREDENTIALHANDLER_ALLOC_TAG[] = "AWSCVarCredentialHandler";
 
@@ -43,13 +42,12 @@ namespace AWSCore
     {
         auto accessKey = static_cast<AZ::CVarFixedString>(cl_awsAccessKey);
         auto secretKey = static_cast<AZ::CVarFixedString>(cl_awsSecretKey);
-        auto sessionToken = static_cast<AZ::CVarFixedString>(cl_awsSessionToken);
-        // Session token is not always required
+
         if (!accessKey.empty() && !secretKey.empty())
         {
             AZStd::lock_guard<AZStd::mutex> credentialsLock{m_credentialMutex};
             m_cvarCredentialsProvider = Aws::MakeShared<Aws::Auth::SimpleAWSCredentialsProvider>(
-                AWSCVARCREDENTIALHANDLER_ALLOC_TAG, accessKey.c_str(), secretKey.c_str(), sessionToken.c_str());
+                AWSCVARCREDENTIALHANDLER_ALLOC_TAG, accessKey.c_str(), secretKey.c_str());
             return m_cvarCredentialsProvider;
         }
         return nullptr;