feat: Plugin Service & Host List Providers

driver/CMakeLists.txt

@@ -24,6 +24,13 @@ set(USE_ASAN OFF CACHE BOOL "Toggle to use Address Sanitizer")
 
 # Sources ----------------------------------------------------------------------------------------------------
 set(INC
+    # Host List Providers
+    ${CMAKE_CURRENT_SOURCE_DIR}/host_list_providers/aurora_topology_util.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/host_list_providers/cluster_topology_monitor.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/host_list_providers/host_list_provider.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/host_list_providers/rds_host_list_provider.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/host_list_providers/topology_util.h
+
     # Host Selectors
     ${CMAKE_CURRENT_SOURCE_DIR}/host_selector/highest_weight_host_selector.h
     ${CMAKE_CURRENT_SOURCE_DIR}/host_selector/host_selector.h
@@ -38,8 +45,6 @@ set(INC
     ${CMAKE_CURRENT_SOURCE_DIR}/plugin/custom_endpoint/custom_endpoint_monitor.h
     ${CMAKE_CURRENT_SOURCE_DIR}/plugin/custom_endpoint/custom_endpoint_plugin.h
     ## Failover
-    ${CMAKE_CURRENT_SOURCE_DIR}/plugin/failover/cluster_topology_monitor.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/plugin/failover/cluster_topology_query_helper.h
     ${CMAKE_CURRENT_SOURCE_DIR}/plugin/failover/failover_plugin.h
     ## Federated
     ${CMAKE_CURRENT_SOURCE_DIR}/plugin/federated/adfs_auth_plugin.h
@@ -67,12 +72,12 @@ set(INC
     ${CMAKE_CURRENT_SOURCE_DIR}/util/logger_wrapper.h
     ${CMAKE_CURRENT_SOURCE_DIR}/util/odbc_dsn_helper.h
     ${CMAKE_CURRENT_SOURCE_DIR}/util/odbc_helper.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/util/plugin_service.h
     ${CMAKE_CURRENT_SOURCE_DIR}/util/rds_lib_loader.h
     ${CMAKE_CURRENT_SOURCE_DIR}/util/rds_strings.h
     ${CMAKE_CURRENT_SOURCE_DIR}/util/rds_utils.h
     ${CMAKE_CURRENT_SOURCE_DIR}/util/sliding_cache_map.h
     ${CMAKE_CURRENT_SOURCE_DIR}/util/sql_query_analyzer.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/util/topology_service.h
 
     # Dialects
     ${CMAKE_CURRENT_SOURCE_DIR}/dialect/dialect_aurora_mysql.h
@@ -99,6 +104,12 @@ set(INC
 )
 
 set(SRC
+    # Host List Providers
+    ${CMAKE_CURRENT_SOURCE_DIR}/host_list_providers/aurora_topology_util.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/host_list_providers/cluster_topology_monitor.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/host_list_providers/rds_host_list_provider.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/host_list_providers/topology_util.cpp
+
     # Host Selectors
     ${CMAKE_CURRENT_SOURCE_DIR}/host_selector/highest_weight_host_selector.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/host_selector/random_host_selector.cpp
@@ -107,17 +118,21 @@ set(SRC
     # Plugins
     ${CMAKE_CURRENT_SOURCE_DIR}/plugin/base_plugin.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/plugin/default_plugin.cpp
+    ## Custom Endpoint
     ${CMAKE_CURRENT_SOURCE_DIR}/plugin/custom_endpoint/custom_endpoint_monitor.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/plugin/custom_endpoint/custom_endpoint_plugin.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/plugin/failover/cluster_topology_monitor.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/plugin/failover/cluster_topology_query_helper.cpp
+    ## Failover
     ${CMAKE_CURRENT_SOURCE_DIR}/plugin/failover/failover_plugin.cpp
+    ## Federated Auth
     ${CMAKE_CURRENT_SOURCE_DIR}/plugin/federated/adfs_auth_plugin.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/plugin/federated/html_util.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/plugin/federated/okta_auth_plugin.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/plugin/federated/saml_util.cpp
+    ## IAM
     ${CMAKE_CURRENT_SOURCE_DIR}/plugin/iam/iam_auth_plugin.cpp
+    ## Secrets Manager
     ${CMAKE_CURRENT_SOURCE_DIR}/plugin/secrets_manager/secrets_manager_plugin.cpp
+    ## Limitless
     ${CMAKE_CURRENT_SOURCE_DIR}/plugin/limitless/limitless_query_helper.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/plugin/limitless/limitless_router_monitor.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/plugin/limitless/limitless_router_service.cpp
@@ -133,13 +148,14 @@ set(SRC
     ${CMAKE_CURRENT_SOURCE_DIR}/util/logger_wrapper.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/util/odbc_dsn_helper.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/util/odbc_helper.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/util/plugin_service.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/util/rds_lib_loader.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/util/rds_utils.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/util/sliding_cache_map.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/util/sql_query_analyzer.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/util/topology_service.cpp
 
     # Core
+    ${CMAKE_CURRENT_SOURCE_DIR}/driver.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/host_info.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/odbcapi_common.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/odbcapi_rds_helper.cpp

driver/dialect/dialect.h

@@ -44,6 +44,8 @@ class Dialect {
     virtual bool IsSqlStateAccessError(const char* sql_state) { return false; };
     virtual bool IsSqlStateNetworkError(const char* sql_state) { return false; };
 
+    virtual DatabaseDialectType GetDialectType() { return DatabaseDialectType::UNKNOWN_DIALECT; };
+
     static DatabaseDialectType DatabaseDialectFromString(const std::string &database_dialect) {
         std::string local_str = database_dialect;
         std::string upper_local_str = RDS_STR_UPPER(local_str);

driver/dialect/dialect_aurora_mysql.h

@@ -45,6 +45,8 @@ class DialectAuroraMySql : virtual public Dialect {
         });
     };
 
+    virtual DatabaseDialectType GetDialectType() override { return DatabaseDialectType::AURORA_MYSQL; };
+
 private:
     const int DEFAULT_MYSQL_PORT = 3306;
     const std::string TOPOLOGY_QUERY =

driver/dialect/dialect_aurora_postgres.h

@@ -45,6 +45,8 @@ class DialectAuroraPostgres : virtual public Dialect {
         });
     };
 
+    virtual DatabaseDialectType GetDialectType() override { return DatabaseDialectType::AURORA_POSTGRESQL; };
+
 private:
     const int DEFAULT_POSTGRES_PORT = 5432;
     const std::string TOPOLOGY_QUERY =
@@ -83,6 +85,7 @@ class DialectAuroraPostgres : virtual public Dialect {
 class DialectAuroraPostgresLimitless : public DialectLimitless, public DialectAuroraPostgres {
 public:
     std::string GetLimitlessRouterEndpointQuery() override { return LIMITLESS_ROUTER_ENDPOINT_QUERY; };
+    DatabaseDialectType GetDialectType() override { return DatabaseDialectType::AURORA_POSTGRESQL_LIMITLESS; };
 
 private:
     const std::string LIMITLESS_ROUTER_ENDPOINT_QUERY = "SELECT router_endpoint, load FROM pg_catalog.aurora_limitless_router_endpoints()";

driver/driver.cpp

@@ -0,0 +1,45 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "driver.h"
+
+#include "error.h"
+#include "plugin/base_plugin.h"
+#include "util/logger_wrapper.h"
+#include "util/plugin_service.h"
+#include "util/rds_lib_loader.h"
+
+ENV::~ENV() {
+    delete err;
+    err = nullptr;
+    logger_wrapper = nullptr;
+}
+
+DBC::~DBC() {
+    plugin_service.reset();
+    delete plugin_head;
+    plugin_head = nullptr;
+    delete err;
+    err = nullptr;
+}
+
+STMT::~STMT() {
+    delete err;
+    err = nullptr;
+}
+
+DESC::~DESC() {
+    delete err;
+    err = nullptr;
+}