Customize Temp Test Config File

Andrew Tang · web-flow · commit 76ad8a8c11c2 · 2019-09-12T15:41:00.000-07:00
diff --git a/aws-cpp-sdk-core-tests/aws/auth/AWSCredentialsProviderTest.cpp b/aws-cpp-sdk-core-tests/aws/auth/AWSCredentialsProviderTest.cpp
@@ -53,7 +53,9 @@ class ProfileConfigFileAWSCredentialsProviderTest : public ::testing::Test
         SaveEnvironmentVariable("AWS_DEFAULT_PROFILE");
 
         Aws::FileSystem::CreateDirectoryIfNotExists(ProfileConfigFileAWSCredentialsProvider::GetProfileDirectory().c_str());
-        m_credsFileName = ProfileConfigFileAWSCredentialsProvider::GetCredentialsProfileFilename() + "_blah";
+        Aws::StringStream ss;
+        ss << ProfileConfigFileAWSCredentialsProvider::GetCredentialsProfileFilename() << "_blah" << std::this_thread::get_id();
+        m_credsFileName = ss.str();
 
         Aws::Environment::SetEnv("AWS_SHARED_CREDENTIALS_FILE", m_credsFileName.c_str(), 1);
         Aws::Environment::UnSetEnv("AWS_DEFAULT_PROFILE");
@@ -142,7 +144,9 @@ class EnvironmentModifyingTest : public ::testing::Test
         SaveEnvironmentVariable("AWS_EC2_METADATA_DISABLED");
 
         Aws::FileSystem::CreateDirectoryIfNotExists(ProfileConfigFileAWSCredentialsProvider::GetProfileDirectory().c_str());
-        m_credsFileName = ProfileConfigFileAWSCredentialsProvider::GetCredentialsProfileFilename() + "_blah";
+        Aws::StringStream ss;
+        ss << ProfileConfigFileAWSCredentialsProvider::GetCredentialsProfileFilename() << "_blah" << std::this_thread::get_id();
+        m_credsFileName = ss.str();
         Aws::Environment::SetEnv("AWS_SHARED_CREDENTIALS_FILE", m_credsFileName.c_str(), 1);
 
     }
@@ -491,7 +495,9 @@ class ProcessCredentialsProviderTest : public ::testing::Test
         SaveEnvironmentVariable("AWS_CONFIG_FILE");
         SaveEnvironmentVariable("AWS_DEFAULT_PROFILE");
 
-        m_configFileName = Aws::Auth::GetConfigProfileFilename() + "_blah";
+        Aws::StringStream ss;
+        ss << Aws::Auth::GetConfigProfileFilename() + "_blah" << std::this_thread::get_id();
+        m_configFileName = ss.str();
         Aws::Environment::SetEnv("AWS_CONFIG_FILE", m_configFileName.c_str(), 1);
         Aws::Environment::UnSetEnv("AWS_DEFAULT_PROFILE");
 
@@ -621,7 +627,9 @@ class STSAssumeRoleWithWebIdentityCredentialsProviderTest :public ProcessCredent
         SaveEnvironmentVariable("AWS_ROLE_ARN");
         SaveEnvironmentVariable("AWS_DEFAULT_REGION");
 
-        m_configFileName = Aws::Auth::GetConfigProfileFilename() + "_blah";
+        Aws::StringStream ss;
+        ss << Aws::Auth::GetConfigProfileFilename() + "_blah" << std::this_thread::get_id();
+        m_configFileName = ss.str();
         Aws::Environment::SetEnv("AWS_CONFIG_FILE", m_configFileName.c_str(), 1);
         Aws::Environment::UnSetEnv("AWS_DEFAULT_PROFILE");
         // avoid reading region environment var when testing get correct region from config file
diff --git a/aws-cpp-sdk-core-tests/aws/client/AWSClientTest.cpp b/aws-cpp-sdk-core-tests/aws/client/AWSClientTest.cpp
@@ -29,6 +29,7 @@
 #include <aws/core/auth/AWSCredentialsProvider.h>
 #include <aws/core/platform/Environment.h>
 #include <fstream>
+#include <thread>
 
 using Aws::Utils::DateTime;
 using Aws::Utils::DateFormat;
@@ -360,7 +361,9 @@ TEST(AWSClientTest, TestOverflowContainer)
 TEST_F(AWSConfigTestSuite, TestClientConfigurationWithNonExistentProfile)
 {
     // create a config file with profile named Dijkstra
-    Aws::String configFileName = Aws::Auth::GetConfigProfileFilename() + "Test";
+    Aws::StringStream ss;
+    ss << Aws::Auth::GetConfigProfileFilename() + "_blah" << std::this_thread::get_id();
+    Aws::String configFileName = ss.str();
     Aws::Environment::SetEnv("AWS_CONFIG_FILE", configFileName.c_str(), 1/*overwrite*/);
 
     Aws::OFStream configFileNew(configFileName.c_str(), Aws::OFStream::out | Aws::OFStream::trunc);
@@ -390,7 +393,9 @@ TEST_F(AWSConfigTestSuite, TestClientConfigurationWithNonExistentConfigFile)
 TEST_F(AWSConfigTestSuite, TestClientConfigurationSetsRegionToProfile)
 {
     // create a config file with profile named Dijkstra
-    Aws::String configFileName = Aws::Auth::GetConfigProfileFilename() + "Test";
+    Aws::StringStream ss;
+    ss << Aws::Auth::GetConfigProfileFilename() + "_blah" << std::this_thread::get_id();
+    Aws::String configFileName = ss.str();
     Aws::Environment::SetEnv("AWS_CONFIG_FILE", configFileName.c_str(), 1/*overwrite*/);
 
     Aws::OFStream configFileNew(configFileName.c_str(), Aws::OFStream::out | Aws::OFStream::trunc);
diff --git a/aws-cpp-sdk-identity-management-tests/auth/STSProfileCredentialsProviderTest.cpp b/aws-cpp-sdk-identity-management-tests/auth/STSProfileCredentialsProviderTest.cpp
@@ -26,7 +26,7 @@
 
 #include <fstream>
 #include <cassert>
-
+#include <thread>
 using namespace Aws::Auth;
 using namespace Aws::STS;
 using namespace Aws::Utils;
@@ -88,7 +88,10 @@ class STSProfileCredentialsProviderTest : public ::testing::Test
         Aws::Environment::UnSetEnv("AWS_DEFAULT_PROFILE");
 
         Aws::FileSystem::CreateDirectoryIfNotExists(ProfileConfigFileAWSCredentialsProvider::GetProfileDirectory().c_str());
-        m_configFilename = Aws::Auth::GetConfigProfileFilename() + "_sts_test";
+        
+        Aws::StringStream ss;
+        ss << Aws::Auth::GetConfigProfileFilename() + "_blah" << std::this_thread::get_id();
+        m_configFilename = ss.str();
 
         SaveEnvironmentVariable("AWS_CONFIG");
         Aws::Environment::SetEnv("AWS_CONFIG_FILE", m_configFilename.c_str(), 1);
