Skip to content

Commit 5b748ad

Browse files
committed
Revert "add support of the following domains: eu, au, uk (#1587)"
This reverts commit 54aa632.
1 parent 274ca55 commit 5b748ad

File tree

1 file changed

+0
-14
lines changed

1 file changed

+0
-14
lines changed

wrapper/src/test/java/software/amazon/jdbc/util/RdsUtilsTests.java

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,6 @@ public class RdsUtilsTests {
4444
private static final String usEastRegionLimitlessDbShardGroup =
4545
"database-test-name.shardgrp-XYZ.us-east-2.rds.amazonaws.com";
4646

47-
private static final String euRedshift =
48-
"redshift-test-name.XYZ.eusc-de-east-1.rds.amazonaws.eu";
49-
5047
private static final String chinaRegionCluster =
5148
"database-test-name.cluster-XYZ.rds.cn-northwest-1.amazonaws.com.cn";
5249
private static final String chinaRegionClusterTrailingDot =
@@ -142,7 +139,6 @@ public void testIsRdsDns() {
142139
assertFalse(target.isRdsDns(usEastRegionElbUrl));
143140
assertFalse(target.isRdsDns(usEastRegionElbUrlTrailingDot));
144141
assertTrue(target.isRdsDns(usEastRegionLimitlessDbShardGroup));
145-
assertTrue(target.isRdsDns(euRedshift));
146142

147143
assertTrue(target.isRdsDns(chinaRegionCluster));
148144
assertTrue(target.isRdsDns(chinaRegionClusterTrailingDot));
@@ -220,9 +216,6 @@ public void testGetRdsInstanceHostPattern() {
220216
assertEquals(oldChinaExpectedHostPattern, target.getRdsInstanceHostPattern(oldChinaRegionProxy));
221217
assertEquals(oldChinaExpectedHostPattern, target.getRdsInstanceHostPattern(oldChinaRegionCustomDomain));
222218
assertEquals(oldChinaExpectedHostPattern, target.getRdsInstanceHostPattern(oldChinaRegionLimitlessDbShardGroup));
223-
224-
final String euRedshiftExpectedHostPattern = "?.XYZ.eusc-de-east-1.rds.amazonaws.eu";
225-
assertEquals(euRedshiftExpectedHostPattern, target.getRdsInstanceHostPattern(euRedshift));
226219
}
227220

228221
@Test
@@ -235,7 +228,6 @@ public void testIsRdsClusterDns() {
235228
assertFalse(target.isRdsClusterDns(usEastRegionCustomDomain));
236229
assertFalse(target.isRdsClusterDns(usEastRegionElbUrl));
237230
assertFalse(target.isRdsClusterDns(usEastRegionLimitlessDbShardGroup));
238-
assertFalse(target.isRdsClusterDns(euRedshift));
239231

240232
assertTrue(target.isRdsClusterDns(usIsobEastRegionCluster));
241233
assertTrue(target.isRdsClusterDns(usIsobEastRegionClusterReadOnly));
@@ -276,7 +268,6 @@ public void testIsWriterClusterDns() {
276268
assertFalse(target.isWriterClusterDns(usEastRegionCustomDomain));
277269
assertFalse(target.isWriterClusterDns(usEastRegionElbUrl));
278270
assertFalse(target.isWriterClusterDns(usEastRegionLimitlessDbShardGroup));
279-
assertFalse(target.isWriterClusterDns(euRedshift));
280271

281272
assertTrue(target.isWriterClusterDns(usIsobEastRegionCluster));
282273
assertFalse(target.isWriterClusterDns(usIsobEastRegionClusterReadOnly));
@@ -317,7 +308,6 @@ public void testIsReaderClusterDns() {
317308
assertFalse(target.isReaderClusterDns(usEastRegionCustomDomain));
318309
assertFalse(target.isReaderClusterDns(usEastRegionElbUrl));
319310
assertFalse(target.isReaderClusterDns(usEastRegionLimitlessDbShardGroup));
320-
assertFalse(target.isReaderClusterDns(euRedshift));
321311

322312
assertFalse(target.isReaderClusterDns(usIsobEastRegionCluster));
323313
assertTrue(target.isReaderClusterDns(usIsobEastRegionClusterReadOnly));
@@ -358,7 +348,6 @@ public void testIsLimitlessDbShardGroupDns() {
358348
assertFalse(target.isLimitlessDbShardGroupDns(usEastRegionCustomDomain));
359349
assertFalse(target.isLimitlessDbShardGroupDns(usEastRegionElbUrl));
360350
assertTrue(target.isLimitlessDbShardGroupDns(usEastRegionLimitlessDbShardGroup));
361-
assertFalse(target.isLimitlessDbShardGroupDns(euRedshift));
362351

363352
assertFalse(target.isLimitlessDbShardGroupDns(usIsobEastRegionCluster));
364353
assertFalse(target.isLimitlessDbShardGroupDns(usIsobEastRegionClusterReadOnly));
@@ -434,9 +423,6 @@ public void testGetRdsRegion() {
434423
assertEquals(chinaExpectedHostPattern, target.getRdsRegion(oldChinaRegionProxy));
435424
assertEquals(chinaExpectedHostPattern, target.getRdsRegion(oldChinaRegionCustomDomain));
436425
assertEquals(chinaExpectedHostPattern, target.getRdsRegion(oldChinaRegionLimitlessDbShardGroup));
437-
438-
final String euRedshiftExpectedHostPattern = "eusc-de-east-1";
439-
assertEquals(euRedshiftExpectedHostPattern, target.getRdsRegion(euRedshift));
440426
}
441427

442428
@Test

0 commit comments

Comments
 (0)