test: fix integration tests

Author: karenc-bq

common/lib/wrapper_property.ts

@@ -106,8 +106,6 @@ export interface AwsClientConfig {
   clusterInstanceHostPattern?: string;
   /** Set to true if you are providing a connection string with multiple comma-delimited hosts and your cluster has only one writer. The writer must be the first host in the connection string */
   singleWriterConnectionString?: boolean;
-  /** Enables replacing a green host name with the original hostname after a blue/green switchover and the green name no longer resolves. */
-  enableGreenHostReplacement?: boolean;
   /** The strategy that should be used to select a new reader host. */
   readerHostSelectorStrategy?: string;
   /** Maximum allowed time for the retries opening a connection. */
@@ -170,6 +168,8 @@ export interface AwsClientConfig {
   customEndpointMonitorExpirationMs?: number;
   /** The region of the cluster's custom endpoints. If not specified, the region will be parsed from the URL. */
   customEndpointRegion?: string;
+  /** Enables replacing a green host name with the original hostname after a blue/green switchover and the green name no longer resolves. */
+  enableGreenHostReplacement?: boolean;
   /** Connect timeout in milliseconds during Blue/Green Deployment switchover. */
   bgConnectTimeoutMs?: number;
   /** Blue/Green Deployment ID */

mysql/lib/client.ts

@@ -44,7 +44,7 @@ import { MySQLClient, MySQLPoolClient } from "./mysql_client";
 import { DriverConnectionProvider } from "../../common/lib/driver_connection_provider";
 import { AwsClientConfig } from "../../common/lib/wrapper_property";
 
-export interface AwsMysQLClientConfig extends ConnectionOptions, AwsClientConfig {}
+export interface AwsMySQLClientConfig extends ConnectionOptions, AwsClientConfig {}
 
 class BaseAwsMySQLClient extends AwsClient implements MySQLClient {
   private static readonly knownDialectsByCode: Map<string, DatabaseDialect> = new Map([
@@ -54,7 +54,7 @@ class BaseAwsMySQLClient extends AwsClient implements MySQLClient {
     [DatabaseDialectCodes.RDS_MULTI_AZ_MYSQL, new RdsMultiAZClusterMySQLDatabaseDialect()]
   ]);
 
-  constructor(config: AwsMysQLClientConfig, connectionProvider?: ConnectionProvider) {
+  constructor(config: AwsMySQLClientConfig, connectionProvider?: ConnectionProvider) {
     super(
       config,
       DatabaseType.MYSQL,

tests/integration/container/tests/aurora_failover.test.ts

@@ -40,7 +40,7 @@ const itIf =
     : it.skip;
 const itIfTwoInstance = instanceCount == 2 ? itIf : it.skip;
 const itIfThreeInstanceAuroraCluster =
-  instanceCount == 3 && !features.includes(TestEnvironmentFeatures.RDS_MULTI_AZ_CLUSTER_SUPPORTED) ? it : it.skip;
+  instanceCount == 3 && !features.includes(TestEnvironmentFeatures.RDS_MULTI_AZ_SUPPORTED) ? it : it.skip;
 
 let env: TestEnvironment;
 let driver;

tests/integration/container/tests/basic_connectivity.test.ts

@@ -21,20 +21,21 @@ import { AuroraTestUtility } from "./utils/aurora_test_utility";
 import { logger } from "../../../../common/logutils";
 import { DatabaseEngine } from "./utils/database_engine";
 import { TestEnvironmentFeatures } from "./utils/test_environment_features";
-import { features } from "./config";
+import { features, instanceCount } from "./config";
 import { DatabaseEngineDeployment } from "./utils/database_engine_deployment";
 import { PluginManager } from "../../../../index";
 
 const itIf =
   !features.includes(TestEnvironmentFeatures.PERFORMANCE) && !features.includes(TestEnvironmentFeatures.RUN_AUTOSCALING_TESTS_ONLY) ? it : it.skip;
+const itIfMinTwoInstance = instanceCount >= 2 ? itIf : it.skip;
 
 let client: any;
 let auroraTestUtility: AuroraTestUtility;
 
-async function executeInstanceQuery(client: any, engine: DatabaseEngine, deployment: DatabaseEngineDeployment, props: any): Promise<void> {
+async function executeSelect1(client: any, engine: DatabaseEngine, deployment: DatabaseEngineDeployment, props: any): Promise<void> {
   await client.connect();
 
-  const res = await DriverHelper.executeInstanceQuery(engine, deployment, client);
+  const res = await DriverHelper.executeQuery(engine, client, "SELECT 1", 10000);
 
   expect(res).not.toBeNull();
 }
@@ -59,8 +60,8 @@ afterEach(async () => {
   logger.info(`Test finished: ${expect.getState().currentTestName}`);
 }, 1320000);
 
-describe("basic_connectivity", () => {
-  itIf(
+describe("basic connectivity", () => {
+  itIfMinTwoInstance(
     "wrapper with failover plugins read only endpoint",
     async () => {
       const env = await TestEnvironment.getCurrent();
@@ -82,12 +83,12 @@ describe("basic_connectivity", () => {
       props = DriverHelper.addDriverSpecificConfiguration(props, env.engine);
       client = initClientFunc(props);
 
-      await executeInstanceQuery(client, env.engine, env.deployment, props);
+      await executeSelect1(client, env.engine, env.deployment, props);
     },
     1320000
   );
 
-  itIf(
+  itIfMinTwoInstance(
     "wrapper with failover plugins cluster endpoint",
     async () => {
       const env = await TestEnvironment.getCurrent();
@@ -109,7 +110,7 @@ describe("basic_connectivity", () => {
       props = DriverHelper.addDriverSpecificConfiguration(props, env.engine);
 
       client = initClientFunc(props);
-      await executeInstanceQuery(client, env.engine, env.deployment, props);
+      await executeSelect1(client, env.engine, env.deployment, props);
     },
     1320000
   );
@@ -136,7 +137,7 @@ describe("basic_connectivity", () => {
       props = DriverHelper.addDriverSpecificConfiguration(props, env.engine);
 
       client = initClientFunc(props);
-      await executeInstanceQuery(client, env.engine, env.deployment, props);
+      await executeSelect1(client, env.engine, env.deployment, props);
     },
     1320000
   );
@@ -165,15 +166,15 @@ describe("basic_connectivity", () => {
       client = initClientFunc(props);
       await client.connect();
 
-      const res = await DriverHelper.executeInstanceQuery(env.engine, env.deployment, client);
+      const res = await executeSelect1(client, env.engine, env.deployment, props);
 
       expect(res).not.toBeNull();
     },
     1320000
   );
 
   itIf(
-    "wrapper_proxy",
+    "wrapper proxy",
     async () => {
       const env = await TestEnvironment.getCurrent();
       const driver = DriverHelper.getDriverForDatabaseEngine(env.engine);

tests/integration/container/tests/custom_endpoint.test.ts

@@ -45,7 +45,7 @@ const itIf =
     : it.skip;
 
 // Custom endpoint is not compatible with multi-az clusters.
-const describeIf = !features.includes(TestEnvironmentFeatures.RDS_MULTI_AZ_CLUSTER_SUPPORTED) ? describe : describe.skip;
+const describeIf = !features.includes(TestEnvironmentFeatures.RDS_MULTI_AZ_SUPPORTED) ? describe : describe.skip;
 
 const endpointId1 = `test-endpoint-1-${randomUUID()}`;
 const endpointId2 = `test-endpoint-2-${randomUUID()}`;

tests/integration/container/tests/parameterized_queries.test.ts

@@ -22,6 +22,7 @@ import { features } from "./config";
 import { AwsPoolConfig, InternalPooledConnectionProvider, PluginManager } from "../../../../index";
 import { AwsPgPoolClient } from "../../../../pg";
 import { AwsMySQLPoolClient } from "../../../../mysql";
+import { readFileSync } from "fs";
 
 const itIf =
   !features.includes(TestEnvironmentFeatures.PERFORMANCE) && !features.includes(TestEnvironmentFeatures.RUN_AUTOSCALING_TESTS_ONLY) ? it : it.skip;
@@ -39,6 +40,10 @@ async function createConnection(plugins: string = "failover"): Promise<any> {
     database: env.databaseInfo.defaultDbName,
     password: env.databaseInfo.password,
     port: env.databaseInfo.instanceEndpointPort,
+    ssl: {
+      rejectUnauthorized: false,
+      ca: readFileSync("/app/global-bundle.pem").toString()
+    },
     plugins
   };
   const configuredProps = DriverHelper.addDriverSpecificConfiguration(props, env.engine);
@@ -56,6 +61,10 @@ async function createAwsPGPool(plugins: string = "failover"): Promise<AwsPgPoolC
     database: env.databaseInfo.defaultDbName,
     password: env.databaseInfo.password,
     port: env.databaseInfo.instanceEndpointPort,
+    ssl: {
+      rejectUnauthorized: false,
+      ca: readFileSync("/app/global-bundle.pem").toString()
+    },
     plugins
   };
   const poolConfig = new AwsPoolConfig({
@@ -80,6 +89,10 @@ async function createAwsPGPoolWithICP(plugins: string = "failover"): Promise<Aws
     database: env.databaseInfo.defaultDbName,
     password: env.databaseInfo.password,
     port: env.databaseInfo.instanceEndpointPort,
+    ssl: {
+      rejectUnauthorized: false,
+      ca: readFileSync("/app/global-bundle.pem").toString()
+    },
     plugins,
     provider: provider
   };

tests/integration/container/tests/pg_pool.test.ts

@@ -28,6 +28,7 @@ import {
 import { DriverHelper } from "./utils/driver_helper";
 import { AuroraTestUtility } from "./utils/aurora_test_utility";
 import { sleep } from "../../../../common/lib/utils/utils";
+import { readFileSync } from "fs";
 
 const itIf =
   !features.includes(TestEnvironmentFeatures.PERFORMANCE) && !features.includes(TestEnvironmentFeatures.RUN_AUTOSCALING_TESTS_ONLY) ? it : it.skip;
@@ -48,6 +49,10 @@ async function createPool(plugins: string = "efm2,failover2"): Promise<any> {
     database: env.databaseInfo.defaultDbName,
     password: env.databaseInfo.password,
     port: env.databaseInfo.instanceEndpointPort,
+    ssl: {
+      rejectUnauthorized: false,
+      ca: readFileSync("/app/global-bundle.pem").toString()
+    },
     plugins
   };
   const poolConfig = new AwsPoolConfig({