test: mysql inte tests

Author: ColinKYuen

.github/workflows/integration_test.yaml

@@ -25,7 +25,7 @@
 
 class DialectAuroraMySql : virtual public Dialect {
 public:
-    int GetDefaultPort() override { return DEFAULT_POSTGRES_PORT; };
+    int GetDefaultPort() override { return DEFAULT_MYSQL_PORT; };
     std::string GetTopologyQuery() override { return TOPOLOGY_QUERY; };
     std::string GetWriterIdQuery() override { return WRITER_ID_QUERY; };
     std::string GetNodeIdQuery() override { return NODE_ID_QUERY; };
@@ -46,7 +46,7 @@ class DialectAuroraMySql : virtual public Dialect {
     };
 
 private:
-    const int DEFAULT_POSTGRES_PORT = 3306;
+    const int DEFAULT_MYSQL_PORT = 3306;
     const std::string TOPOLOGY_QUERY =
         "SELECT SERVER_ID, CASE WHEN SESSION_ID = 'MASTER_SESSION_ID' THEN TRUE ELSE FALSE END, \
         CPU, REPLICA_LAG_IN_MILLISECONDS, LAST_UPDATE_TIMESTAMP \

driver/dialect/dialect_aurora_mysql.h

@@ -42,7 +42,7 @@ function add_ip_to_db_sg {
     cidrBlock="$LocalIp/32"
 
     # Allow inbound traffic from the local IP address to the DB security group using AWS CLI
-    aws ec2 authorize-security-group-ingress --group-id $securityGroupId --protocol tcp --cidr $cidrBlock --port 5432 --region $Region || true
+    aws ec2 authorize-security-group-ingress --group-id $securityGroupId --protocol tcp --cidr $cidrBlock --port 0-65535 --region $Region || true
 
     # Sleep to ensure IP is added and propagated to DBs before moving onto next step
     sleep 60
@@ -76,7 +76,7 @@ function remove_ip_from_db_sg {
     cidrBlock="$LocalIp/32"
 
     # Revoke Inbound traffic
-    aws ec2 revoke-security-group-ingress --group-id $securityGroupId --protocol tcp --cidr $cidrBlock --port 5432 --region $Region || true
+    aws ec2 revoke-security-group-ingress --group-id $securityGroupId --protocol tcp --cidr $cidrBlock --port 0-65565 --region $Region || true
 
     # Check if revoked successfully
     if [ $? -eq 0 ]; then

scripts/aws_rds_helper_unix.sh

@@ -226,7 +226,7 @@ function Add-Ip-To-Db-Sg {
     $cidrBlock = "$localIp/32"
 
     # Allow inbound traffic from the local IP address to the DB security group using AWS CLI
-    $authorizeResult = aws ec2 authorize-security-group-ingress --group-id $securityGroupId --protocol tcp --cidr $cidrBlock --port 5432 --region $Region
+    $authorizeResult = aws ec2 authorize-security-group-ingress --group-id $securityGroupId --protocol tcp --cidr $cidrBlock --port 0-65535 --region $Region
 
     # Check if the ingress rule was successfully added
     if ($?) {

scripts/aws_rds_helper_win.ps1

@@ -157,20 +157,17 @@ ENDIF()
 # ODBC Unix DSN ---------------------------------------------------------------------------------------------
 SET(ODBC_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../resources/)
 
-# Common Settings
+# DSN Settings
 SET(THREADING "0")
-SET(TEST_SERVER ${TEST_SERVER},${TEST_PORT})
-SET(TEST_DATABASE ${TEST_DATABASE})
-
-# Test Driver
-SET(TEST_DSN ${TEST_DSN})
-SET(TEST_DRIVER_NAME "aws-odbc-wrapper")
-SET(TEST_DRIVER_PATH ${TEST_DRIVER_PATH})
-
-# Base PG Driver
-SET(BASE_PG_DSN "pg-dsn")
-SET(BASE_PG_DRIVER_NAME "community-pg")
-SET(BASE_PG_DRIVER_PATH ${BASE_PG_DRIVER_PATH})
+
+# To be set via flags
+# -D TEST_DRIVER_PATH
+# -D PG_DRIVER_PATH
+# -D PG_SERVER
+# -D PG_DATABASE
+# -D MYSQL_DRIVER_PATH
+# -D MYSQL_SERVER
+# -D MYSQL_DATABASE
 
 CONFIGURE_FILE(
     ${ODBC_PATH}/odbcinst.ini.in

test/integration/CMakeLists.txt

@@ -84,8 +84,9 @@ class BaseFailoverIntegrationTest : public BaseConnectionTest {
     // Test Queries
     std::string DROP_TABLE_QUERY = "DROP TABLE IF EXISTS failover_transaction";
     std::string CREATE_TABLE_QUERY = "CREATE TABLE failover_transaction (id INT NOT NULL PRIMARY KEY, failover_transaction_field VARCHAR(255) NOT NULL)";
-    std::string SERVER_ID_QUERY = "SELECT aurora_db_instance_identifier()";
     std::string COUNT_FAILOVER_TRANSACTION_ROWS_QUERY = "SELECT count(*) FROM failover_transaction";
+    // Based off of dialect
+    std::string SERVER_ID_QUERY = "";
 
     static void SetUpTestSuite() {
         BaseConnectionTest::SetUpTestSuite();
@@ -112,6 +113,14 @@ class BaseFailoverIntegrationTest : public BaseConnectionTest {
             test_server.substr(cluster_id_prefix_index + cluster_prefix.size(), test_server.size());
         db_conn_str_suffix = "." + instance_endpoint;
         cluster_ro_url = ".cluster-ro-" + instance_endpoint;
+
+        if ("AURORA_POSTGRESQL" == test_dialect) {
+            SERVER_ID_QUERY = "SELECT pg_catalog.aurora_db_instance_identifier();";
+        } else if ("AURORA_MYSQL" == test_dialect) {
+            SERVER_ID_QUERY = "SELECT @@aurora_server_id";
+        } else {
+            GTEST_SKIP() << "Failover requires database dialect to know which query to call.";
+        }
     }
 
     void TearDown() override {

test/integration/base_failover_integration_test.h

@@ -19,3 +19,14 @@ SERVER          = @PG_SERVER@
 Driver          = @MYSQL_DRIVER_PATH@
 DATABASE        = @MYSQL_DATABASE@
 SERVER          = @MYSQL_SERVER@
+
+[inte-wrapper-dsn]
+Driver          = @TEST_DRIVER_PATH@
+DATABASE        = @TEST_DATABASE@
+SERVER          = @TEST_SERVER@
+BASE_DRIVER     = @BASE_DRIVER_PATH@
+
+[inte-base-dsn]
+Driver          = @BASE_DRIVER_PATH@
+DATABASE        = @TEST_DATABASE@
+SERVER          = @TEST_SERVER@