pg.ddx.io aws/aws-advanced-jdbc-wrapper GitHub issues and pull requests
help / color / mirror / Atom feed[aws/aws-advanced-jdbc-wrapper] PR #2251: Revert "feat: recognize new RDS rw-/ro- endpoint format (#2231)"
4+ messages / 2 participants
[nested] [flat]
* [aws/aws-advanced-jdbc-wrapper] PR #2251: Revert "feat: recognize new RDS rw-/ro- endpoint format (#2231)"
@ 2026-11-16 22:06 "karenc-bq (@karenc-bq)" <noreply+karenc-bq@github.com>
0 siblings, 0 replies; 4+ messages in thread
From: karenc-bq (@karenc-bq) @ 2026-11-16 22:06 UTC (permalink / raw)
To: aws/aws-advanced-jdbc-wrapper <noreply+aws-aws-advanced-jdbc-wrapper@github.com>
### Summary
This reverts commit cf2e0dbca4cebc28d7b4597695b56f0291ee907a
### Description
<!--- Details of what you changed -->
### Additional Reviewers
<!-- Any additional reviewers -->
### By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
inline patch 1: wrapper/src/main/java/software/amazon/jdbc/util/RdsUrlType.java, wrapper/src/main/java/software/amazon/jdbc/util/RdsUtils.java, wrapper/src/test/java/software/amazon/jdbc/util/RdsUtilsTests.java (+7/-81 lines) download inline-1.patch
diff --git a/wrapper/src/main/java/software/amazon/jdbc/util/RdsUrlType.java b/wrapper/src/main/java/software/amazon/jdbc/util/RdsUrlType.java
index 139c57fdc..ed5b3f1b1 100644
--- a/wrapper/src/main/java/software/amazon/jdbc/util/RdsUrlType.java
+++ b/wrapper/src/main/java/software/amazon/jdbc/util/RdsUrlType.java
@@ -26,8 +26,6 @@ public enum RdsUrlType {
RDS_INSTANCE(true, false, true),
RDS_AURORA_LIMITLESS_DB_SHARD_GROUP(true, false, true),
RDS_GLOBAL_WRITER_CLUSTER(true, true, false),
- RDS_CLUSTER_GROUP_WRITER(true, false, true),
- RDS_CLUSTER_GROUP_READER(true, false, true),
OTHER(false, false, false);
private final boolean isRds;
diff --git a/wrapper/src/main/java/software/amazon/jdbc/util/RdsUtils.java b/wrapper/src/main/java/software/amazon/jdbc/util/RdsUtils.java
index fa0e1c66b..e5c725e9f 100644
--- a/wrapper/src/main/java/software/amazon/jdbc/util/RdsUtils.java
+++ b/wrapper/src/main/java/software/amazon/jdbc/util/RdsUtils.java
@@ -50,12 +50,6 @@ public class RdsUtils {
// Instance Endpoint: <instance-name>.<xyz>.<aws-region>.rds.amazonaws.com
// Example: test-postgres-instance-1.123456789012.us-east-2.rds.amazonaws.com
//
- // Cluster Group Writer Endpoint: <cluster-group-id>.rw-<xyz>.db-cluster-group.<aws-region>.rds.amazonaws.com
- // Example: test-postgres-group.rw-c7qgg0siobwq.db-cluster-group.us-east-1.rds.amazonaws.com
- //
- // Cluster Group Reader Endpoint: <cluster-group-id>.ro-<xyz>.db-cluster-group.<aws-region>.rds.amazonaws.com
- // Example: test-postgres-group.ro-c7qgg0siobwq.db-cluster-group.us-east-1.rds.amazonaws.com
- //
//
//
// Similar endpoints for China regions have different structure and are presented below.
@@ -109,13 +103,6 @@ public class RdsUtils {
+ "(?<domain>[a-zA-Z0-9]+\\.(?<region>[a-zA-Z0-9\\-]+)"
+ "\\.(rds|rds-fips)\\.amazonaws\\.(com|au|eu|uk)\\.?)$",
Pattern.CASE_INSENSITIVE);
- private static final Pattern AURORA_CLUSTER_GROUP_DNS_PATTERN =
- Pattern.compile(
- "^(?<instance>.+)\\."
- + "(?<dns>rw-|ro-)"
- + "(?<domain>[a-zA-Z0-9]+\\.db-cluster-group\\.(?<region>[a-zA-Z0-9\\-]+)"
- + "\\.(rds|rds-fips)\\.amazonaws\\.(com|au|eu|uk)\\.?)$",
- Pattern.CASE_INSENSITIVE);
private static final Pattern AURORA_LIMITLESS_CLUSTER_PATTERN =
Pattern.compile(
"(?<instance>.+)\\."
@@ -259,8 +246,7 @@ public boolean isRdsCustomClusterDns(final String host) {
public boolean isRdsDns(final String host) {
final String preparedHost = getPreparedHost(host);
final Matcher matcher = cacheMatcher(preparedHost,
- AURORA_CLUSTER_GROUP_DNS_PATTERN, AURORA_DNS_PATTERN, AURORA_CHINA_DNS_PATTERN,
- AURORA_OLD_CHINA_DNS_PATTERN, AURORA_GOV_DNS_PATTERN);
+ AURORA_DNS_PATTERN, AURORA_CHINA_DNS_PATTERN, AURORA_OLD_CHINA_DNS_PATTERN, AURORA_GOV_DNS_PATTERN);
final String group = getRegexGroup(matcher, DNS_GROUP);
if (group != null) {
cachedDnsPatterns.put(preparedHost, group);
@@ -301,8 +287,7 @@ public boolean isRdsProxyEndpointDns(final String host) {
}
final Matcher matcher = cacheMatcher(preparedHost,
- AURORA_CLUSTER_GROUP_DNS_PATTERN, AURORA_DNS_PATTERN, AURORA_CHINA_DNS_PATTERN,
- AURORA_OLD_CHINA_DNS_PATTERN, AURORA_GOV_DNS_PATTERN);
+ AURORA_DNS_PATTERN, AURORA_CHINA_DNS_PATTERN, AURORA_OLD_CHINA_DNS_PATTERN, AURORA_GOV_DNS_PATTERN);
if (getRegexGroup(matcher, DNS_GROUP) != null) {
return getRegexGroup(matcher, INSTANCE_GROUP);
}
@@ -317,8 +302,7 @@ public boolean isRdsProxyEndpointDns(final String host) {
}
final Matcher matcher = cacheMatcher(preparedHost,
- AURORA_CLUSTER_GROUP_DNS_PATTERN, AURORA_DNS_PATTERN, AURORA_CHINA_DNS_PATTERN,
- AURORA_OLD_CHINA_DNS_PATTERN, AURORA_GOV_DNS_PATTERN);
+ AURORA_DNS_PATTERN, AURORA_CHINA_DNS_PATTERN, AURORA_OLD_CHINA_DNS_PATTERN, AURORA_GOV_DNS_PATTERN);
if (getRegexGroup(matcher, DNS_GROUP) == null) {
return getRegexGroup(matcher, INSTANCE_GROUP);
}
@@ -333,8 +317,7 @@ public String getRdsInstanceHostPattern(final String host) {
}
final Matcher matcher = cacheMatcher(preparedHost,
- AURORA_CLUSTER_GROUP_DNS_PATTERN, AURORA_DNS_PATTERN, AURORA_CHINA_DNS_PATTERN,
- AURORA_OLD_CHINA_DNS_PATTERN, AURORA_GOV_DNS_PATTERN);
+ AURORA_DNS_PATTERN, AURORA_CHINA_DNS_PATTERN, AURORA_OLD_CHINA_DNS_PATTERN, AURORA_GOV_DNS_PATTERN);
final String group = getRegexGroup(matcher, DOMAIN_GROUP);
return group == null ? "?" : "?." + group;
}
@@ -346,8 +329,7 @@ public String getRdsInstanceHostPattern(final String host) {
}
final Matcher matcher = cacheMatcher(preparedHost,
- AURORA_CLUSTER_GROUP_DNS_PATTERN, AURORA_DNS_PATTERN, AURORA_CHINA_DNS_PATTERN,
- AURORA_OLD_CHINA_DNS_PATTERN, AURORA_GOV_DNS_PATTERN);
+ AURORA_DNS_PATTERN, AURORA_CHINA_DNS_PATTERN, AURORA_OLD_CHINA_DNS_PATTERN, AURORA_GOV_DNS_PATTERN);
final String group = getRegexGroup(matcher, REGION_GROUP);
if (group != null) {
return group;
@@ -418,16 +400,6 @@ public boolean isGlobalDbWriterClusterDns(final String host) {
return dnsGroup != null && dnsGroup.equalsIgnoreCase("global-");
}
- public boolean isClusterGroupWriterDns(final String host) {
- final String dnsGroup = getDnsGroup(getPreparedHost(host));
- return dnsGroup != null && dnsGroup.equalsIgnoreCase("rw-");
- }
-
- public boolean isClusterGroupReaderDns(final String host) {
- final String dnsGroup = getDnsGroup(getPreparedHost(host));
- return dnsGroup != null && dnsGroup.equalsIgnoreCase("ro-");
- }
-
public boolean isIP(final String ip) {
return isIPv4(ip) || isIPv6(ip);
}
@@ -462,10 +434,6 @@ public RdsUrlType identifyRdsType(final String host) {
return RdsUrlType.RDS_CUSTOM_CLUSTER;
} else if (isLimitlessDbShardGroupDns(host)) {
return RdsUrlType.RDS_AURORA_LIMITLESS_DB_SHARD_GROUP;
- } else if (isClusterGroupWriterDns(host)) {
- return RdsUrlType.RDS_CLUSTER_GROUP_WRITER;
- } else if (isClusterGroupReaderDns(host)) {
- return RdsUrlType.RDS_CLUSTER_GROUP_READER;
} else if (isRdsProxyDns(host)) {
return RdsUrlType.RDS_PROXY;
} else if (isRdsProxyEndpointDns(host)) {
@@ -569,8 +537,8 @@ public String removeGreenInstancePrefix(final String host) {
return cached;
}
final Matcher matcher = cacheMatcher(host,
- AURORA_CLUSTER_GROUP_DNS_PATTERN, AURORA_DNS_PATTERN, AURORA_CHINA_DNS_PATTERN,
- AURORA_OLD_CHINA_DNS_PATTERN, AURORA_GOV_DNS_PATTERN, AURORA_GLOBAL_WRITER_DNS_PATTERN);
+ AURORA_DNS_PATTERN, AURORA_CHINA_DNS_PATTERN, AURORA_OLD_CHINA_DNS_PATTERN,
+ AURORA_GOV_DNS_PATTERN, AURORA_GLOBAL_WRITER_DNS_PATTERN);
final String group = getRegexGroup(matcher, DNS_GROUP);
if (group != null) {
cachedDnsPatterns.put(host, group);
diff --git a/wrapper/src/test/java/software/amazon/jdbc/util/RdsUtilsTests.java b/wrapper/src/test/java/software/amazon/jdbc/util/RdsUtilsTests.java
index 95c7fced0..f44cf40fa 100644
--- a/wrapper/src/test/java/software/amazon/jdbc/util/RdsUtilsTests.java
+++ b/wrapper/src/test/java/software/amazon/jdbc/util/RdsUtilsTests.java
@@ -124,11 +124,6 @@ public class RdsUtilsTests {
private static final String globalDbWriterCluster =
"global-cluster-test-name.global-XYZ.global.rds.amazonaws.com";
- private static final String usEastRegionClusterGroupWriter =
- "group-test-name.rw-XYZ.db-cluster-group.us-east-2.rds.amazonaws.com";
- private static final String usEastRegionClusterGroupReader =
- "group-test-name.ro-XYZ.db-cluster-group.us-east-2.rds.amazonaws.com";
-
@BeforeEach
public void setupTests() {
RdsUtils.clearCache();
@@ -450,41 +445,6 @@ public void testIsGlobalDbWriterClusterDns() {
assertTrue(target.isGlobalDbWriterClusterDns(globalDbWriterCluster));
}
- @Test
- public void testClusterGroupDns() {
- assertTrue(target.isClusterGroupWriterDns(usEastRegionClusterGroupWriter));
- assertFalse(target.isClusterGroupWriterDns(usEastRegionClusterGroupReader));
- assertFalse(target.isClusterGroupWriterDns(usEastRegionCluster));
- assertFalse(target.isClusterGroupWriterDns(usEastRegionInstance));
-
- assertTrue(target.isClusterGroupReaderDns(usEastRegionClusterGroupReader));
- assertFalse(target.isClusterGroupReaderDns(usEastRegionClusterGroupWriter));
- assertFalse(target.isClusterGroupReaderDns(usEastRegionClusterReadOnly));
- assertFalse(target.isClusterGroupReaderDns(usEastRegionInstance));
-
- assertTrue(target.isRdsDns(usEastRegionClusterGroupWriter));
- assertTrue(target.isRdsDns(usEastRegionClusterGroupReader));
- assertFalse(target.isRdsInstance(usEastRegionClusterGroupWriter));
- assertFalse(target.isRdsInstance(usEastRegionClusterGroupReader));
- assertFalse(target.isRdsClusterDns(usEastRegionClusterGroupWriter));
- assertFalse(target.isRdsClusterDns(usEastRegionClusterGroupReader));
- assertFalse(target.isWriterClusterDns(usEastRegionClusterGroupWriter));
- assertFalse(target.isReaderClusterDns(usEastRegionClusterGroupReader));
-
- assertEquals("us-east-2", target.getRdsRegion(usEastRegionClusterGroupWriter));
- assertEquals("us-east-2", target.getRdsRegion(usEastRegionClusterGroupReader));
- assertEquals("group-test-name", target.getRdsClusterId(usEastRegionClusterGroupWriter));
- assertEquals("group-test-name", target.getRdsClusterId(usEastRegionClusterGroupReader));
- assertNull(target.getRdsInstanceId(usEastRegionClusterGroupWriter));
- assertEquals("?.XYZ.db-cluster-group.us-east-2.rds.amazonaws.com",
- target.getRdsInstanceHostPattern(usEastRegionClusterGroupWriter));
-
- assertEquals(RdsUrlType.RDS_CLUSTER_GROUP_WRITER, target.identifyRdsType(usEastRegionClusterGroupWriter));
- assertEquals(RdsUrlType.RDS_CLUSTER_GROUP_READER, target.identifyRdsType(usEastRegionClusterGroupReader));
- assertEquals(RdsUrlType.RDS_CLUSTER_GROUP_WRITER,
- target.identifyRdsType(usEastRegionClusterGroupWriter.toUpperCase()));
- }
-
@Test
public void testisRdsProxyEndpointDns() {
assertFalse(target.isRdsProxyEndpointDns(usEastRegionProxy));
^ permalink raw [nested|flat] 4+ messages in thread
* Re: [aws/aws-advanced-jdbc-wrapper] PR #2251 (approved): Revert "feat: recognize new RDS rw-/ro- endpoint format (#2231)"
@ 2026-11-16 22:23 ` "sergiyvamz (@sergiyvamz)" <noreply+sergiyvamz@github.com>
2 siblings, 0 replies; 4+ messages in thread
From: sergiyvamz (@sergiyvamz) @ 2026-11-16 22:23 UTC (permalink / raw)
To: aws/aws-advanced-jdbc-wrapper <noreply+aws-aws-advanced-jdbc-wrapper@github.com>
^ permalink raw [nested|flat] 4+ messages in thread
* Re: [aws/aws-advanced-jdbc-wrapper] PR #2251: Revert "feat: recognize new RDS rw-/ro- endpoint format (#2231)"
@ 2026-11-17 16:44 ` "sergiyvamz (@sergiyvamz)" <noreply+sergiyvamz@github.com>
2 siblings, 0 replies; 4+ messages in thread
From: sergiyvamz (@sergiyvamz) @ 2026-11-17 16:44 UTC (permalink / raw)
To: aws/aws-advanced-jdbc-wrapper <noreply+aws-aws-advanced-jdbc-wrapper@github.com>
@sergiyvamz closed this.
^ permalink raw [nested|flat] 4+ messages in thread
* Re: [aws/aws-advanced-jdbc-wrapper] PR #2251: Revert "feat: recognize new RDS rw-/ro- endpoint format (#2231)"
@ 2026-11-17 16:44 ` "sergiyvamz (@sergiyvamz)" <noreply+sergiyvamz@github.com>
2 siblings, 0 replies; 4+ messages in thread
From: sergiyvamz (@sergiyvamz) @ 2026-11-17 16:44 UTC (permalink / raw)
To: aws/aws-advanced-jdbc-wrapper <noreply+aws-aws-advanced-jdbc-wrapper@github.com>
@sergiyvamz merged this (commit 2b9660895911).
^ permalink raw [nested|flat] 4+ messages in thread
end of thread, other threads:[~2026-11-17 16:44 UTC | newest]
Thread overview: 4+ messages (download: mbox mbox.gz follow: Atom feed)
-- links below jump to the message on this page --
2026-11-16 22:06 [aws/aws-advanced-jdbc-wrapper] PR #2251: Revert "feat: recognize new RDS rw-/ro- endpoint format (#2231)" "karenc-bq (@karenc-bq)" <noreply+karenc-bq@github.com>
2026-11-16 22:23 ` Re: [aws/aws-advanced-jdbc-wrapper] PR #2251 (approved): Revert "feat: recognize new RDS rw-/ro- endpoint format (#2231)" "sergiyvamz (@sergiyvamz)" <noreply+sergiyvamz@github.com>
2026-11-17 16:44 ` "sergiyvamz (@sergiyvamz)" <noreply+sergiyvamz@github.com>
2026-11-17 16:44 ` "sergiyvamz (@sergiyvamz)" <noreply+sergiyvamz@github.com>
This inbox is served by DDX for PostgreSQL; see mirroring instructions
for how to clone and mirror all data and code used for this inbox