fix: custom endpoint tests with multi-az (#409)

Author: joyc-bq

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

@@ -35,6 +35,8 @@ import { logger } from "../../../../common/logutils";
 import { ProxyHelper } from "./utils/proxy_helper";
 import { PluginManager } from "../../../../common/lib";
 import { TestDriver } from "./utils/test_driver";
+import { DatabaseEngineDeployment } from "./utils/database_engine_deployment";
+
 
 const itIf =
   features.includes(TestEnvironmentFeatures.FAILOVER_SUPPORTED) &&
@@ -44,6 +46,9 @@ const itIf =
     ? it
     : 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 endpointId1 = `test-endpoint-1-${randomUUID()}`;
 const endpointId2 = `test-endpoint-2-${randomUUID()}`;
 let endpointId3: string;
@@ -203,7 +208,7 @@ async function deleteEndpoint(rdsClient: RDSClient, endpointId: string): Promise
   }
 }
 
-describe("custom endpoint", () => {
+describeIf("custom endpoint", () => {
   beforeAll(async () => {
     env = await TestEnvironment.getCurrent();
     const clusterId = env.auroraClusterName;

tests/integration/container/tests/utils/test_environment_features.ts

@@ -24,5 +24,6 @@ export enum TestEnvironmentFeatures {
   PERFORMANCE = "PERFORMANCE",
   RUN_AUTOSCALING_TESTS_ONLY = "RUN_AUTOSCALING_TESTS_ONLY",
   SKIP_MYSQL_DRIVER_TESTS = "SKIP_MYSQL_DRIVER_TESTS",
-  SKIP_PG_DRIVER_TESTS = "SKIP_PG_DRIVER_TESTS"
+  SKIP_PG_DRIVER_TESTS = "SKIP_PG_DRIVER_TESTS",
+  RDS_MULTI_AZ_CLUSTER_SUPPORTED = "RDS_MULTI_AZ_CLUSTER_SUPPORTED"
 }

tests/integration/host/src/test/java/integration/host/TestEnvironmentConfig.java

@@ -93,6 +93,7 @@ public static TestEnvironmentConfig build(TestEnvironmentRequest request) throws
       case RDS_MULTI_AZ_CLUSTER:
         initDatabaseParams(env);
         createDbCluster(env);
+        request.getFeatures().add(TestEnvironmentFeatures.RDS_MULTI_AZ_CLUSTER_SUPPORTED);
 
         if (request.getFeatures().contains(TestEnvironmentFeatures.IAM)) {
           if (request.getDatabaseEngineDeployment() == DatabaseEngineDeployment.RDS_MULTI_AZ_CLUSTER) {

tests/integration/host/src/test/java/integration/host/TestEnvironmentFeatures.java

@@ -28,5 +28,6 @@ public enum TestEnvironmentFeatures {
   SKIP_MYSQL_DRIVER_TESTS,
   SKIP_PG_DRIVER_TESTS,
   TELEMETRY_TRACES_ENABLED,
-  TELEMETRY_METRICS_ENABLED
+  TELEMETRY_METRICS_ENABLED,
+  RDS_MULTI_AZ_CLUSTER_SUPPORTED
 }