test: fix unit test failure due to missing file

Author: karenc-bq

common/lib/authentication/aws_secrets_manager_plugin.ts

@@ -141,6 +141,7 @@ export class AwsSecretsManagerPlugin extends AbstractConnectionPlugin implements
         }
       }
       logger.debug(Messages.get("AwsSecretsManagerConnectionPlugin.unhandledError", error.name, error.message));
+      throw error;
     }
   }
 

common/lib/internal_pooled_connection_provider.ts

@@ -27,7 +27,7 @@ import { lookup, LookupAddress } from "dns";
 import { promisify } from "util";
 import { HostInfoBuilder } from "./host_info_builder";
 import { RdsUrlType } from "./utils/rds_url_type";
-import { AwsWrapperError } from "./index";
+import { AwsWrapperError } from "./utils/errors";
 import { Messages } from "./utils/messages";
 import { HostSelector } from "./host_selector";
 import { RandomHostSelector } from "./random_host_selector";

common/lib/plugin_service.ts

@@ -22,7 +22,7 @@ import { DynamicHostListProvider, HostListProvider } from "./host_list_provider/
 import { ConnectionUrlParser } from "./utils/connection_url_parser";
 import { DatabaseDialect, DatabaseType } from "./database_dialect/database_dialect";
 import { HostInfoBuilder } from "./host_info_builder";
-import { AwsTimeoutError, AwsWrapperError, UnsupportedMethodError } from "./";
+import { AwsTimeoutError, AwsWrapperError, UnsupportedMethodError } from "./utils/errors";
 import { HostAvailability } from "./host_availability/host_availability";
 import { HostAvailabilityCacheItem } from "./host_availability/host_availability_cache_item";
 import { StatusCacheItem } from "./utils/status_cache_item";

common/lib/utils/status_cache_item.ts

@@ -0,0 +1,23 @@
+/*
+  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.
+*/
+
+export class StatusCacheItem<T> {
+  readonly status: T;
+
+  constructor(status: T) {
+    this.status = status;
+  }
+}

tests/unit/batching_event_publisher.test.ts

@@ -35,8 +35,8 @@ class TestableEventPublisher extends BatchingEventPublisher {
     return this.pendingEvents.size;
   }
 
-  triggerSendMessages(): void {
-    this.sendMessages();
+  async triggerSendMessages(): Promise<void> {
+    await this.sendMessages();
   }
 }
 
@@ -52,7 +52,7 @@ describe("BatchingEventPublisher", () => {
     publisher = new TestableEventPublisher();
     processEventCalls = [];
     mockSubscriber = {
-      processEvent: (event: Event) => {
+      processEvent: async (event: Event) => {
         processEventCalls.push(event);
       }
     };
@@ -62,7 +62,7 @@ describe("BatchingEventPublisher", () => {
     publisher.releaseResources();
   });
 
-  it("should publish events to subscribers and deduplicate", () => {
+  it("should publish events to subscribers and deduplicate", async () => {
     const eventSubscriptions = new Set([DataAccessEvent]);
 
     publisher.subscribe(mockSubscriber, eventSubscriptions);
@@ -73,7 +73,7 @@ describe("BatchingEventPublisher", () => {
     publisher.publish(event);
     publisher.publish(event);
 
-    publisher.triggerSendMessages();
+    await publisher.triggerSendMessages();
 
     expect(publisher.pendingEventCount).toBe(0);
 
@@ -82,7 +82,7 @@ describe("BatchingEventPublisher", () => {
 
     publisher.unsubscribe(mockSubscriber, eventSubscriptions);
     publisher.publish(event);
-    publisher.triggerSendMessages();
+    await publisher.triggerSendMessages();
 
     expect(publisher.pendingEventCount).toBe(0);
 
@@ -105,23 +105,23 @@ describe("BatchingEventPublisher", () => {
     expect(publisher.pendingEventCount).toBe(0);
   });
 
-  it("should not deliver events to unsubscribed subscribers", () => {
+  it("should not deliver events to unsubscribed subscribers", async () => {
     const eventSubscriptions = new Set([DataAccessEvent]);
 
     publisher.subscribe(mockSubscriber, eventSubscriptions);
     publisher.unsubscribe(mockSubscriber, eventSubscriptions);
 
     const event = new DataAccessEvent(TestDataClass, "key");
     publisher.publish(event);
-    publisher.triggerSendMessages();
+    await publisher.triggerSendMessages();
 
     expect(processEventCalls.length).toBe(0);
   });
 
-  it("should handle multiple subscribers", () => {
+  it("should handle multiple subscribers", async () => {
     const processEventCalls2: Event[] = [];
     const mockSubscriber2: EventSubscriber = {
-      processEvent: (event: Event) => {
+      processEvent: async (event: Event) => {
         processEventCalls2.push(event);
       }
     };
@@ -133,7 +133,7 @@ describe("BatchingEventPublisher", () => {
 
     const event = new DataAccessEvent(TestDataClass, "key");
     publisher.publish(event);
-    publisher.triggerSendMessages();
+    await publisher.triggerSendMessages();
 
     expect(processEventCalls.length).toBe(1);
     expect(processEventCalls2.length).toBe(1);

tests/unit/connection_plugin_chain_builder.test.ts

@@ -37,6 +37,11 @@ const mockPluginServiceInstance: PluginService = instance(mockPluginService);
 const mockDefaultConnProvider: ConnectionProvider = mock(DriverConnectionProvider);
 const mockEffectiveConnProvider: ConnectionProvider = mock(DriverConnectionProvider);
 
+const mockServicesContainer: FullServicesContainer = {
+  pluginService: mockPluginServiceInstance,
+  telemetryFactory: new NullTelemetryFactory()
+} as unknown as FullServicesContainer;
+
 describe("testConnectionPluginChainBuilder", () => {
   beforeAll(() => {
     when(mockPluginService.getTelemetryFactory()).thenReturn(new NullTelemetryFactory());
@@ -51,7 +56,7 @@ describe("testConnectionPluginChainBuilder", () => {
     props.set(WrapperProperties.PLUGINS.name, plugins);
 
     const result = await ConnectionPluginChainBuilder.getPlugins(
-      mockPluginServiceInstance,
+      mockServicesContainer,
       props,
       new ConnectionProviderManager(mockDefaultConnProvider, mockEffectiveConnProvider),
       null
@@ -70,7 +75,7 @@ describe("testConnectionPluginChainBuilder", () => {
     props.set(WrapperProperties.AUTO_SORT_PLUGIN_ORDER.name, false);
 
     const result = await ConnectionPluginChainBuilder.getPlugins(
-      mockPluginServiceInstance,
+      mockServicesContainer,
       props,
       new ConnectionProviderManager(mockDefaultConnProvider, mockEffectiveConnProvider),
       null
@@ -89,7 +94,7 @@ describe("testConnectionPluginChainBuilder", () => {
     props.set(WrapperProperties.PLUGINS.name, "executeTime,connectTime,iam");
 
     let result = await ConnectionPluginChainBuilder.getPlugins(
-      mockPluginServiceInstance,
+      mockServicesContainer,
       props,
       new ConnectionProviderManager(mockDefaultConnProvider, mockEffectiveConnProvider),
       null
@@ -104,7 +109,7 @@ describe("testConnectionPluginChainBuilder", () => {
     props.set(WrapperProperties.PLUGINS.name, "iam,executeTime,connectTime,failover");
 
     result = await ConnectionPluginChainBuilder.getPlugins(
-      mockPluginServiceInstance,
+      mockServicesContainer,
       props,
       new ConnectionProviderManager(mockDefaultConnProvider, mockEffectiveConnProvider),
       null
@@ -125,7 +130,7 @@ describe("testConnectionPluginChainBuilder", () => {
     props.set(WrapperProperties.PLUGINS.name, "test");
 
     const result = await ConnectionPluginChainBuilder.getPlugins(
-      mockPluginServiceInstance,
+      mockServicesContainer,
       props,
       new ConnectionProviderManager(mockDefaultConnProvider, mockEffectiveConnProvider),
       null

tests/unit/database_dialect.test.ts

@@ -30,6 +30,8 @@ import { SimpleHostAvailabilityStrategy } from "../../common/lib/host_availabili
 import { ClientWrapper } from "../../common/lib/client_wrapper";
 import { RdsMultiAZClusterMySQLDatabaseDialect } from "../../mysql/lib/dialect/rds_multi_az_mysql_database_dialect";
 import { RdsMultiAZClusterPgDatabaseDialect } from "../../pg/lib/dialect/rds_multi_az_pg_database_dialect";
+import { GlobalAuroraMySQLDatabaseDialect } from "../../mysql/lib/dialect/global_aurora_mysql_database_dialect";
+import { GlobalAuroraPgDatabaseDialect } from "../../pg/lib/dialect/global_aurora_pg_database_dialect";
 import { DatabaseDialectManager } from "../../common/lib/database_dialect/database_dialect_manager";
 import { NodePostgresDriverDialect } from "../../pg/lib/dialect/node_postgres_driver_dialect";
 import { mock } from "ts-mockito";
@@ -49,14 +51,16 @@ const mysqlDialects: Map<DatabaseDialectCodes, DatabaseDialect> = new Map([
   [DatabaseDialectCodes.MYSQL, new MySQLDatabaseDialect()],
   [DatabaseDialectCodes.RDS_MYSQL, new RdsMySQLDatabaseDialect()],
   [DatabaseDialectCodes.AURORA_MYSQL, new AuroraMySQLDatabaseDialect()],
-  [DatabaseDialectCodes.RDS_MULTI_AZ_MYSQL, new RdsMultiAZClusterMySQLDatabaseDialect()]
+  [DatabaseDialectCodes.RDS_MULTI_AZ_MYSQL, new RdsMultiAZClusterMySQLDatabaseDialect()],
+  [DatabaseDialectCodes.GLOBAL_AURORA_MYSQL, new GlobalAuroraMySQLDatabaseDialect()]
 ]);
 
 const pgDialects: Map<DatabaseDialectCodes, DatabaseDialect> = new Map([
   [DatabaseDialectCodes.PG, new PgDatabaseDialect()],
   [DatabaseDialectCodes.RDS_PG, new RdsPgDatabaseDialect()],
   [DatabaseDialectCodes.AURORA_PG, new AuroraPgDatabaseDialect()],
-  [DatabaseDialectCodes.RDS_MULTI_AZ_PG, new RdsMultiAZClusterPgDatabaseDialect()]
+  [DatabaseDialectCodes.RDS_MULTI_AZ_PG, new RdsMultiAZClusterPgDatabaseDialect()],
+  [DatabaseDialectCodes.GLOBAL_AURORA_PG, new GlobalAuroraPgDatabaseDialect()]
 ]);
 
 const MYSQL_QUERY = "SHOW VARIABLES LIKE 'version_comment'";
@@ -287,6 +291,8 @@ describe("test database dialects", () => {
 
     const mockClientWrapper: ClientWrapper = new PgClientWrapper(mockTargetClient, currentHostInfo, new Map<string, any>());
     const pluginService = new PluginServiceImpl(fullServicesContainer, mockClient, databaseType, expectedDialect!.dialects, props, mockDriverDialect);
+    fullServicesContainer.hostListProviderService = pluginService;
+    fullServicesContainer.pluginService = pluginService;
     await pluginService.updateDialect(mockClientWrapper);
     expect(pluginService.getDialect()).toBe(expectedDialectClass);
   });

tests/unit/failover2_plugin.test.ts

@@ -40,6 +40,7 @@ import { MySQLClientWrapper } from "../../common/lib/mysql_client_wrapper";
 import { MySQL2DriverDialect } from "../../mysql/lib/dialect/mysql2_driver_dialect";
 import { DriverDialect } from "../../common/lib/driver_dialect/driver_dialect";
 import { Failover2Plugin } from "../../common/lib/plugins/failover2/failover2_plugin";
+import { FullServicesContainer } from "../../common/lib/utils/full_services_container";
 
 const builder = new HostInfoBuilder({ hostAvailabilityStrategy: new SimpleHostAvailabilityStrategy() });
 
@@ -57,7 +58,10 @@ const properties: Map<string, any> = new Map();
 let plugin: Failover2Plugin;
 
 function initializePlugin(mockPluginServiceInstance: PluginService): void {
-  plugin = new Failover2Plugin(mockPluginServiceInstance, properties, new RdsUtils());
+  const mockContainer = {
+    pluginService: mockPluginServiceInstance
+  } as unknown as FullServicesContainer;
+  plugin = new Failover2Plugin(mockContainer, properties, new RdsUtils());
 }
 
 describe("reader failover handler", () => {

tests/unit/rds_host_list_provider.test.ts

@@ -82,6 +82,9 @@ describe("testRdsHostListProvider", () => {
     when(mockPluginService.getCurrentClient()).thenReturn(instance(mockClient));
     when(mockClient.targetClient).thenReturn(mockClientWrapper);
     when(mockPluginService.getHostInfoBuilder()).thenReturn(new HostInfoBuilder({ hostAvailabilityStrategy: new SimpleHostAvailabilityStrategy() }));
+    when(mockServiceContainer.hostListProviderService).thenReturn(instance(mockPluginService));
+    when(mockServiceContainer.pluginService).thenReturn(instance(mockPluginService));
+    when(mockServiceContainer.storageService).thenReturn(storageService);
   });
 
   afterEach(async () => {
@@ -114,7 +117,6 @@ describe("testRdsHostListProvider", () => {
 
     when(mockPluginService.isClientValid(anything())).thenResolve(true);
 
-    storageService.set(rdsHostListProvider.clusterId, new Topology(hosts));
     const newHosts: HostInfo[] = [
       createHost({
         hostAvailabilityStrategy: new SimpleHostAvailabilityStrategy(),
@@ -123,13 +125,12 @@ describe("testRdsHostListProvider", () => {
     ];
 
     when(mockClient.isValid()).thenResolve(true);
-    when(spiedProvider.getCurrentTopology(mockClientWrapper, anything())).thenReturn(Promise.resolve(newHosts));
+    when(mockPluginService.isDialectConfirmed()).thenReturn(true);
+    when((spiedProvider as any).forceRefreshMonitor(anything(), anything())).thenReturn(Promise.resolve(newHosts));
 
     const result = await rdsHostListProvider.getTopology();
     expect(result.hosts.length).toEqual(1);
     expect(result.hosts).toEqual(newHosts);
-
-    verify(spiedProvider.getCurrentTopology(anything(), anything())).atMost(1);
   });
 
   it("testGetTopology_noForceUpdate_queryReturnsEmptyHostList", async () => {

tests/unit/sliding_expiration_cache.test.ts

@@ -15,8 +15,8 @@
 */
 
 import { SlidingExpirationCache } from "../../common/lib/utils/sliding_expiration_cache";
-import { convertMsToNanos, convertNanosToMs, sleep } from "../../common/lib/utils/utils";
 import { SlidingExpirationCacheWithCleanupTask } from "../../common/lib/utils/sliding_expiration_cache_with_cleanup_task";
+import { convertMsToNanos, convertNanosToMs, sleep } from "../../common/lib/utils/utils";
 
 class DisposableItem {
   shouldDispose: boolean;