make more static vars

aws · Apr 21, 2023 · 6a7fadc · 6a7fadc
1 parent 2ec1ae5
commit 6a7fadc
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 21 deletions.
diff --git a/integration/base_failover_integration_test.cc b/integration/base_failover_integration_test.cc
@@ -65,6 +65,13 @@
 static std::string DOWN_STREAM_STR = "DOWNSTREAM";
 static std::string UP_STREAM_STR = "UPSTREAM";
 
+static std::string ACCESS_KEY = std::getenv("AWS_ACCESS_KEY_ID");
+static std::string SECRET_ACCESS_KEY = std::getenv("AWS_SECRET_ACCESS_KEY");
+static std::string SESSION_TOKEN = std::getenv("AWS_SESSION_TOKEN");
+static Aws::Auth::AWSCredentials credentials = Aws::Auth::AWSCredentials(Aws::String(ACCESS_KEY),
+                                                                  Aws::String(SECRET_ACCESS_KEY),
+                                                                  Aws::String(SESSION_TOKEN));
+static Aws::Client::ClientConfiguration client_config;
 static Aws::SDKOptions options;
 static std::shared_ptr<Aws::RDS::RDSClient> rds_client;
 

diff --git a/integration/failover_integration_test.cc b/integration/failover_integration_test.cc
@@ -31,13 +31,6 @@
 
 class FailoverIntegrationTest : public BaseFailoverIntegrationTest {
 protected:
-  std::string ACCESS_KEY = std::getenv("AWS_ACCESS_KEY_ID");
-  std::string SECRET_ACCESS_KEY = std::getenv("AWS_SECRET_ACCESS_KEY");
-  std::string SESSION_TOKEN = std::getenv("AWS_SESSION_TOKEN");
-  Aws::Auth::AWSCredentials credentials = Aws::Auth::AWSCredentials(Aws::String(ACCESS_KEY),
-                                                                    Aws::String(SECRET_ACCESS_KEY),
-                                                                    Aws::String(SESSION_TOKEN));
-  Aws::Client::ClientConfiguration client_config;
   SQLHENV env = nullptr;
   SQLHDBC dbc = nullptr;
 

diff --git a/integration/failover_performance_test.cc b/integration/failover_performance_test.cc
@@ -144,13 +144,6 @@ class FailoverPerformanceTest :
   public ::testing::WithParamInterface<std::tuple<int, int, int, int, int>>,
   public BaseFailoverIntegrationTest {
 protected:
-  std::string ACCESS_KEY = std::getenv("AWS_ACCESS_KEY_ID");
-  std::string SECRET_ACCESS_KEY = std::getenv("AWS_SECRET_ACCESS_KEY");
-  std::string SESSION_TOKEN = std::getenv("AWS_SESSION_TOKEN");
-  Aws::Auth::AWSCredentials credentials = Aws::Auth::AWSCredentials(Aws::String(ACCESS_KEY),
-                                                                    Aws::String(SECRET_ACCESS_KEY),
-                                                                    Aws::String(SESSION_TOKEN));
-  Aws::Client::ClientConfiguration client_config;
   SQLHENV env = nullptr;
   SQLHDBC dbc = nullptr;
 

diff --git a/integration/network_failover_integration_test.cc b/integration/network_failover_integration_test.cc
@@ -31,13 +31,6 @@
 
 class NetworkFailoverIntegrationTest : public BaseFailoverIntegrationTest {
 protected:
-  std::string ACCESS_KEY = std::getenv("AWS_ACCESS_KEY_ID");
-  std::string SECRET_ACCESS_KEY = std::getenv("AWS_SECRET_ACCESS_KEY");
-  std::string SESSION_TOKEN = std::getenv("AWS_SESSION_TOKEN");
-  Aws::Auth::AWSCredentials credentials = Aws::Auth::AWSCredentials(Aws::String(ACCESS_KEY),
-                                                                    Aws::String(SECRET_ACCESS_KEY),
-                                                                    Aws::String(SESSION_TOKEN));
-  Aws::Client::ClientConfiguration client_config;
   SQLHENV env = nullptr;
   SQLHDBC dbc = nullptr;