Merge pull request #279 from riptano/CPP-787/test

mikefero · web-flow · commit 129b2bfd0750 · 2019-09-04T09:10:05.000-04:00
test: Integration tests for DBaaS using SNI single endpoint proxy
diff --git a/build.yaml b/build.yaml
@@ -35,11 +35,15 @@ build:
       build/cassandra-unit-tests --gtest_output=xml:cassandra-unit-test-results.xml
       build/dse-unit-tests --gtest_output=xml:dse-unit-test-results.xml
 
+      if [ -f build/cassandra-integration-tests ]; then
+        build/cassandra-integration-tests --category=cassandra --keep-clusters --verbose --gtest_filter=DbaasTests* --gtest_output=xml:dbaas-integration-test-results.xml
+      fi
+
       install_driver
       test_installed_driver 'dse'
 
   - xunit:
-    - "*unit-test-results.xml"
+    - "*test-results.xml"
 package:
   allow_empty: true
   include: # list of files and glob paths to include in the artifact, relative to the current working directory
diff --git a/cpp-driver/.build.sh b/cpp-driver/.build.sh
@@ -35,8 +35,8 @@ else
 fi
 
 get_driver_version() {
-  local header_file=$1
-  local driver_prefix=$2
+  local header_file=${1}
+  local driver_prefix=${2}
   local driver_version=$(grep "#define[ \t]\+${driver_prefix}_VERSION_\(MAJOR\|MINOR\|PATCH\|SUFFIX\)" ${header_file}  | awk '
     BEGIN { major="?"; minor="?"; patch="?" }
     /_VERSION_MAJOR/ { major=$3 }
@@ -65,23 +65,33 @@ install_dependencies() {
 }
 
 build_driver() {
-  local driver_prefix=$1
+  local driver_prefix=${1}
 
   # Ensure build directory is cleaned (static nodes are not cleaned)
   [[ -d build ]] && rm -rf build
   mkdir build
 
   (
     cd build
-    cmake -DCMAKE_BUILD_TYPE=Release -D${driver_prefix}_BUILD_SHARED=On -D${driver_prefix}_BUILD_STATIC=On -D${driver_prefix}_BUILD_EXAMPLES=On -D${driver_prefix}_BUILD_UNIT_TESTS=On ..
+    BUILD_INTEGRATION_TESTS=Off
+    if [ "${RELEASE}" = "bionic64" ]; then
+      BUILD_INTEGRATION_TESTS=On
+    fi
+    cmake -DCMAKE_BUILD_TYPE=Release \
+          -D${driver_prefix}_BUILD_SHARED=On \
+          -D${driver_prefix}_BUILD_STATIC=On \
+          -D${driver_prefix}_BUILD_EXAMPLES=On \
+          -D${driver_prefix}_BUILD_UNIT_TESTS=On \
+          -D${driver_prefix}_BUILD_INTEGRATION_TESTS=${BUILD_INTEGRATION_TESTS} \
+          ..
     [[ -x $(which clang-format) ]] && make format-check
     make -j${PROCS}
   )
 }
 
 check_driver_exports() {(
   set +e  #Disable fail fast for this subshell
-  local driver_library=$1
+  local driver_library=${1}
   if [ -f ${driver_library} ]; then
     declare -a MISSING_FUNCTIONS
     for function in "${@:2}"; do
diff --git a/cpp-driver/build.yaml b/cpp-driver/build.yaml
@@ -33,11 +33,15 @@ build:
 
       build/cassandra-unit-tests --gtest_output=xml:cassandra-unit-test-results.xml
 
+      if [ -f build/cassandra-integration-tests ]; then
+        build/cassandra-integration-tests --category=cassandra --keep-clusters --verbose --gtest_filter=DbaasTests* --gtest_output=xml:dbaas-integration-test-results.xml
+      fi
+
       install_driver
       test_installed_driver 'cassandra'
 
   - xunit:
-    - "*unit-test-results.xml"
+    - "*test-results.xml"
 package:
   allow_empty: true
   include: # list of files and glob paths to include in the artifact, relative to the current working directory
diff --git a/cpp-driver/gtests/src/integration/driver_utils.cpp b/cpp-driver/gtests/src/integration/driver_utils.cpp
@@ -79,6 +79,16 @@ std::string test::driver::internals::Utils::host(CassFuture* future) {
   return "";
 }
 
+std::string test::driver::internals::Utils::server_name(CassFuture* future) {
+  if (future) {
+    Future* cass_future = static_cast<Future*>(future);
+    if (cass_future->type() == Future::FUTURE_TYPE_RESPONSE) {
+      return static_cast<ResponseFuture*>(cass_future)->address().server_name().c_str();
+    }
+  }
+  return "";
+}
+
 int64_t test::driver::internals::Utils::murmur3_hash(const std::string& value) {
   return MurmurHash3_x64_128(value.data(), value.size(), 0);
 }
diff --git a/cpp-driver/gtests/src/integration/driver_utils.hpp b/cpp-driver/gtests/src/integration/driver_utils.hpp
@@ -73,6 +73,14 @@ class Utils {
    */
   static std::string host(CassFuture* future);
 
+  /**
+   * Get the server name of the future
+   *
+   * @param future Future to retrieve server name from
+   * @return Server name
+   */
+  static std::string server_name(CassFuture* future);
+
   /**
    * Get the Murmur3 hash for a given value
    *
diff --git a/cpp-driver/gtests/src/integration/integration.cpp b/cpp-driver/gtests/src/integration/integration.cpp
@@ -52,6 +52,7 @@ Integration::Integration()
     , is_with_vnodes_(false)
     , is_randomized_contact_points_(false)
     , is_schema_metadata_(false)
+    , is_ccm_requested_(true)
     , is_ccm_start_requested_(true)
     , is_ccm_start_node_individually_(false)
     , is_session_requested_(true)
@@ -138,47 +139,49 @@ void Integration::SetUp() {
   data_center_nodes.push_back(number_dc1_nodes_);
   data_center_nodes.push_back(number_dc2_nodes_);
 
-  try {
-    // Create and start the CCM cluster (if not already created)
-    ccm_ = new CCM::Bridge(
-        server_version_, Options::use_git(), Options::branch_tag(), Options::use_install_dir(),
-        Options::install_dir(), Options::is_dse(), dse_workload_, Options::cluster_prefix(),
-        Options::dse_credentials(), Options::dse_username(), Options::dse_password(),
-        Options::deployment_type(), Options::authentication_type(), Options::host(),
-        Options::port(), Options::username(), Options::password(), Options::public_key(),
-        Options::private_key(), Options::is_verbose_ccm());
-    if (ccm_->create_cluster(data_center_nodes, is_with_vnodes_, is_password_authenticator_,
-                             is_ssl_, is_client_authentication_)) {
-      if (is_ccm_start_requested_) {
-        if (is_ccm_start_node_individually_) {
-          for (unsigned short node = 1; node <= (number_dc1_nodes_ + number_dc2_nodes_); ++node) {
+  if (is_ccm_requested_) {
+    try {
+      // Create and start the CCM cluster (if not already created)
+      ccm_ = new CCM::Bridge(
+          server_version_, Options::use_git(), Options::branch_tag(), Options::use_install_dir(),
+          Options::install_dir(), Options::is_dse(), dse_workload_, Options::cluster_prefix(),
+          Options::dse_credentials(), Options::dse_username(), Options::dse_password(),
+          Options::deployment_type(), Options::authentication_type(), Options::host(),
+          Options::port(), Options::username(), Options::password(), Options::public_key(),
+          Options::private_key(), Options::is_verbose_ccm());
+      if (ccm_->create_cluster(data_center_nodes, is_with_vnodes_, is_password_authenticator_,
+                               is_ssl_, is_client_authentication_)) {
+        if (is_ccm_start_requested_) {
+          if (is_ccm_start_node_individually_) {
+            for (unsigned short node = 1; node <= (number_dc1_nodes_ + number_dc2_nodes_); ++node) {
+              if (is_password_authenticator_) {
+                ccm_->start_node(node, "-Dcassandra.superuser_setup_delay_ms=0");
+              } else {
+                ccm_->start_node(node);
+              }
+            }
+          } else {
             if (is_password_authenticator_) {
-              ccm_->start_node(node, "-Dcassandra.superuser_setup_delay_ms=0");
+              ccm_->start_cluster("-Dcassandra.superuser_setup_delay_ms=0");
             } else {
-              ccm_->start_node(node);
+              ccm_->start_cluster();
             }
           }
-        } else {
-          if (is_password_authenticator_) {
-            ccm_->start_cluster("-Dcassandra.superuser_setup_delay_ms=0");
-          } else {
-            ccm_->start_cluster();
-          }
         }
       }
-    }
 
-    // Generate the default contact points
-    contact_points_ =
-        generate_contact_points(ccm_->get_ip_prefix(), number_dc1_nodes_ + number_dc2_nodes_);
+      // Generate the default contact points
+      contact_points_ =
+          generate_contact_points(ccm_->get_ip_prefix(), number_dc1_nodes_ + number_dc2_nodes_);
 
-    // Determine if the session connection should be established
-    if (is_session_requested_ && is_ccm_start_requested_) {
-      connect();
+      // Determine if the session connection should be established
+      if (is_session_requested_ && is_ccm_start_requested_) {
+        connect();
+      }
+    } catch (CCM::BridgeException be) {
+      // Issue creating the CCM bridge instance (force failure)
+      FAIL() << be.what();
     }
-  } catch (CCM::BridgeException be) {
-    // Issue creating the CCM bridge instance (force failure)
-    FAIL() << be.what();
   }
 }
 
diff --git a/cpp-driver/gtests/src/integration/integration.hpp b/cpp-driver/gtests/src/integration/integration.hpp
@@ -252,6 +252,12 @@ class Integration : public testing::Test {
    * (DEFAULT: false)
    */
   bool is_schema_metadata_;
+  /**
+   * Setting to determine if CCM instance should be created. True if CCM instance
+   * should be created; false otherwise.
+   * (DEFAULT: true)
+   */
+  bool is_ccm_requested_;
   /**
    * Setting to determine if CCM cluster should be started. True if CCM cluster
    * should be started; false otherwise.
diff --git a/cpp-driver/gtests/src/integration/main.cpp b/cpp-driver/gtests/src/integration/main.cpp
@@ -18,13 +18,16 @@
 
 #include "bridge.hpp"
 #include "options.hpp"
+#include "ssl.hpp"
 #include "win_debug.hpp"
 
 #include "cassandra.h"
 #include "test_utils.hpp"
 
 #include <ostream>
 
+using datastax::internal::core::SslContextFactory;
+
 /**
  * Bootstrap listener for handling start and end of the integration tests.
  */
@@ -65,6 +68,10 @@ class BootstrapListener : public testing::EmptyTestEventListener {
     }
   }
 
+  void OnTestStart(const testing::TestInfo& test_information) { SslContextFactory::init(); }
+
+  void OnTestEnd(const testing::TestInfo& test_information) { SslContextFactory::cleanup(); }
+
 private:
   /**
    * Current category
@@ -106,11 +113,7 @@ std::string generate_filter(TestCategory category, const std::string& base_filte
 int main(int argc, char* argv[]) {
   // Initialize the Google testing framework
   testing::InitGoogleTest(&argc, argv);
-
-  // Add a bootstrap mechanism for program start and finish
-  BootstrapListener* listener = NULL;
   testing::TestEventListeners& listeners = testing::UnitTest::GetInstance()->listeners();
-  listeners.Append(listener = new BootstrapListener());
 
 #if defined(_WIN32) && defined(_DEBUG)
   // Add the memory leak checking to the listener callbacks
@@ -121,6 +124,10 @@ int main(int argc, char* argv[]) {
 #endif
 #endif
 
+  // Add a bootstrap mechanism for program start and finish
+  BootstrapListener* listener = NULL;
+  listeners.Append(listener = new BootstrapListener());
+
   // Initialize the options for the integration test
   if (Options::initialize(argc, argv)) {
     // Run the integration tests from each applicable category
diff --git a/cpp-driver/gtests/src/integration/objects/future.hpp b/cpp-driver/gtests/src/integration/objects/future.hpp
@@ -97,6 +97,13 @@ class Future : public Object<CassFuture, cass_future_free> {
    */
   const std::string host() { return internals::Utils::host(get()); }
 
+  /**
+   * Get the server name of the future
+   *
+   * @return Server name
+   */
+  const std::string server_name() { return internals::Utils::server_name(get()); }
+
   /**
    * Get the result from the future
    *
diff --git a/cpp-driver/gtests/src/integration/objects/result.hpp b/cpp-driver/gtests/src/integration/objects/result.hpp
@@ -113,6 +113,13 @@ class Result : public Object<const CassResult, cass_result_free> {
    */
   const std::string host() { return future_.host(); }
 
+  /**
+   * Get the server name of the future
+   *
+   * @return Server name
+   */
+  const std::string server_name() { return future_.server_name(); }
+
   /**
    * Get the number of columns from the result
    *
diff --git a/cpp-driver/gtests/src/integration/test_utils.cpp b/cpp-driver/gtests/src/integration/test_utils.cpp
@@ -274,3 +274,10 @@ bool test::Utils::wait_for_port(const std::string& ip_address, unsigned short po
   // Unable to establish connection to node on port
   return false;
 }
+
+std::string test::Utils::home_directory() {
+  char home[FILE_PATH_SIZE] = { 0 };
+  size_t home_length = sizeof(home);
+  uv_os_homedir(home, &home_length);
+  return std::string(home, home_length);
+}
diff --git a/cpp-driver/gtests/src/integration/test_utils.hpp b/cpp-driver/gtests/src/integration/test_utils.hpp
@@ -185,6 +185,13 @@ class Utils {
   static bool wait_for_port(const std::string& ip_address, unsigned short port,
                             unsigned int number_of_retries = 100,
                             unsigned int retry_delay_ms = 100);
+
+  /**
+   * Get the home directory for the current user (not thread safe)
+   *
+   * @return Home directory
+   */
+  static std::string home_directory();
 };
 
 } // namespace test
diff --git a/cpp-driver/gtests/src/integration/tests/test_dbaas.cpp b/cpp-driver/gtests/src/integration/tests/test_dbaas.cpp
diff --git a/cpp-driver/gtests/src/unit/tests/test_cloud_secure_connect_config.cpp b/cpp-driver/gtests/src/unit/tests/test_cloud_secure_connect_config.cpp
diff --git a/cpp-driver/src/cloud_secure_connection_config.cpp b/cpp-driver/src/cloud_secure_connection_config.cpp
diff --git a/cpp-driver/src/cloud_secure_connection_config.hpp b/cpp-driver/src/cloud_secure_connection_config.hpp
diff --git a/cpp-driver/src/cluster_config.cpp b/cpp-driver/src/cluster_config.cpp
