chore: monitor service

Author: karenc-bq

.github/workflows/integration_tests.yml

@@ -5,6 +5,7 @@ on:
   push:
     branches:
       - main
+      - refactor/monitor-service
     paths-ignore:
       - "**/*.md"
       - "**/*.jpg"
@@ -29,7 +30,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        dbEngine: ["aurora-mysql", "aurora-postgres", "multi-az-mysql"]
+        dbEngine: ["aurora-mysql", "aurora-postgres"]
 
     steps:
       - name: Clone repository
@@ -64,7 +65,7 @@ jobs:
           AWS_ACCESS_KEY_ID: ${{ steps.creds.outputs.aws-access-key-id }}
           AWS_SECRET_ACCESS_KEY: ${{ steps.creds.outputs.aws-secret-access-key }}
           AWS_SESSION_TOKEN: ${{ steps.creds.outputs.aws-session-token }}
-          AURORA_MYSQL_DB_ENGINE_VERSION: ${{ matrix.dbEngine }}
+          AURORA_MYSQL_DB_ENGINE_VERSION: default
           AURORA_PG_DB_ENGINE_VERSION: default
 
       - name: "Get Github Action IP"
@@ -131,7 +132,7 @@ jobs:
           AWS_ACCESS_KEY_ID: ${{ steps.creds.outputs.aws-access-key-id }}
           AWS_SECRET_ACCESS_KEY: ${{ steps.creds.outputs.aws-secret-access-key }}
           AWS_SESSION_TOKEN: ${{ steps.creds.outputs.aws-session-token }}
-          AURORA_MYSQL_DB_ENGINE_VERSION: ${{ matrix.dbEngine }}
+          AURORA_MYSQL_DB_ENGINE_VERSION: latest
           AURORA_PG_DB_ENGINE_VERSION: latest
 
       - name: "Get Github Action IP"

common/lib/aws_client.ts

@@ -139,12 +139,12 @@ export abstract class AwsClient extends EventEmitter implements SessionStateClie
     await this.setup();
     const hostListProvider: HostListProvider = this.pluginService
       .getDialect()
-      .getHostListProvider(this.properties, this.properties.get("host"), <HostListProviderService>(<unknown>this.pluginService));
+      .getHostListProvider(this.properties, this.properties.get("host"), this.fullServiceContainer);
     this.pluginService.setHostListProvider(hostListProvider);
     await this.pluginService.refreshHostList();
     const initialHostInfo = this.pluginService.getInitialConnectionHostInfo();
     if (initialHostInfo != null) {
-      await this.pluginManager.initHostProvider(initialHostInfo, this.properties, <HostListProviderService>(<unknown>this.pluginService));
+      await this.pluginManager.initHostProvider(initialHostInfo, this.properties, this.fullServiceContainer.getHostListProviderService());
       await this.pluginService.refreshHostList();
     }
   }
@@ -176,15 +176,15 @@ export abstract class AwsClient extends EventEmitter implements SessionStateClie
 
   abstract setTransactionIsolation(level: TransactionIsolationLevel): Promise<any | void>;
 
-  abstract getTransactionIsolation(): TransactionIsolationLevel;
+  abstract getTransactionIsolation(): TransactionIsolationLevel | undefined;
 
   abstract setSchema(schema: any): Promise<any | void>;
 
-  abstract getSchema(): string;
+  abstract getSchema(): string | undefined;
 
   abstract setCatalog(catalog: string): Promise<any | void>;
 
-  abstract getCatalog(): string;
+  abstract getCatalog(): string | undefined;
 
   abstract end(): Promise<any>;
 

common/lib/database_dialect/database_dialect.ts

@@ -21,6 +21,7 @@ import { FailoverRestriction } from "../plugins/failover/failover_restriction";
 import { ErrorHandler } from "../error_handler";
 import { TransactionIsolationLevel } from "../utils/transaction_isolation_level";
 import { HostRole } from "../host_role";
+import { FullServicesContainer } from "../utils/full_services_container";
 
 export enum DatabaseType {
   MYSQL,
@@ -41,7 +42,7 @@ export interface DatabaseDialect {
   getErrorHandler(): ErrorHandler;
   getHostRole(targetClient: ClientWrapper): Promise<HostRole>;
   isDialect(targetClient: ClientWrapper): Promise<boolean>;
-  getHostListProvider(props: Map<string, any>, originalUrl: string, hostListProviderService: HostListProviderService): HostListProvider;
+  getHostListProvider(props: Map<string, any>, originalUrl: string, servicesContainer: FullServicesContainer): HostListProvider;
   isClientValid(targetClient: ClientWrapper): Promise<boolean>;
   getDatabaseType(): DatabaseType;
   getDialectName(): string;

common/lib/host_list_provider/connection_string_host_list_provider.ts

@@ -65,17 +65,12 @@ export class ConnectionStringHostListProvider implements StaticHostListProvider
     this.isInitialized = true;
   }
 
-  refresh(): Promise<HostInfo[]>;
-  refresh(client: ClientWrapper): Promise<HostInfo[]>;
-  refresh(client?: ClientWrapper): Promise<HostInfo[]>;
-  refresh(client?: ClientWrapper | undefined): Promise<HostInfo[]> {
+  refresh(): Promise<HostInfo[]> {
     this.init();
     return Promise.resolve(this.hostList);
   }
 
-  forceRefresh(): Promise<HostInfo[]>;
-  forceRefresh(client: ClientWrapper): Promise<HostInfo[]>;
-  forceRefresh(client?: ClientWrapper): Promise<HostInfo[]> {
+  forceRefresh(): Promise<HostInfo[]> {
     this.init();
     return Promise.resolve(this.hostList);
   }
@@ -89,7 +84,7 @@ export class ConnectionStringHostListProvider implements StaticHostListProvider
       return null;
     }
     const instance = await this.hostListProviderService.getDialect().getHostAliasAndParseResults(client.client);
-    const topology = await this.refresh(client.client);
+    const topology = await this.refresh();
     if (!topology || topology.length == 0) {
       return null;
     }

common/lib/host_list_provider/host_list_provider.ts

@@ -23,20 +23,12 @@ export type DynamicHostListProvider = HostListProvider;
 
 export type StaticHostListProvider = HostListProvider;
 
-export interface BlockingHostListProvider extends HostListProvider {
-  forceMonitoringRefresh(shouldVerifyWriter: boolean, timeoutMs: number): Promise<HostInfo[]>;
-
-  clearAll(): Promise<void>;
-}
-
 export interface HostListProvider {
   refresh(): Promise<HostInfo[]>;
 
-  refresh(client: ClientWrapper): Promise<HostInfo[]>;
-
   forceRefresh(): Promise<HostInfo[]>;
 
-  forceRefresh(client: ClientWrapper): Promise<HostInfo[]>;
+  forceMonitoringRefresh(shouldVerifyWriter: boolean, timeoutMs: number): Promise<HostInfo[]>;
 
   getHostRole(client: ClientWrapper, dialect: DatabaseDialect): Promise<HostRole>;