Updated OCI regions: CDG (Paris), MAD (Madrid), QRO (Queretaro)

Author: connelly38

CHANGELOG.md

@@ -11,6 +11,9 @@ be used in a try-with-resources statement to ensure proper closing of
 resources.
 - updated NoSQLHandle and QueryRequest interfaces to extend AutoClosable
 
+### Changed
+- Cloud only: Updated OCI regions: CDG, MAD, QRO
+
 ## [5.3.2] 2022-03-21
 
 ### Added

driver/src/main/java/oracle/nosql/driver/Region.java

@@ -72,15 +72,19 @@ public class Region {
 
     public static final Region EU_AMSTERDAM_1 = new Region("eu-amsterdam-1");
     public static final Region EU_FRANKFURT_1 = new Region("eu-frankfurt-1");
+    public static final Region EU_MADRID_1 = new Region("eu-madrid-1");
     public static final Region EU_MARSEILLE_1 = new Region("eu-marseille-1");
     public static final Region EU_MILAN_1 = new Region("eu-milan-1");
+    public static final Region EU_PARIS_1 = new Region("eu-paris-1");
     public static final Region EU_STOCKHOLM_1 = new Region("eu-stockholm-1");
     public static final Region EU_ZURICH_1 = new Region("eu-zurich-1");
 
     public static final Region ME_ABUDHABI_1 = new Region("me-abudhabi-1");
     public static final Region ME_DUBAI_1 = new Region("me-dubai-1");
     public static final Region ME_JEDDAH_1 = new Region("me-jeddah-1");
 
+    public static final Region MX_QUERETARO_1 = new Region("mx-queretaro-1");
+
     public static final Region IL_JERUSALEM_1 = new Region("il-jerusalem-1");
 
     public static final Region US_ASHBURN_1 = new Region("us-ashburn-1");
@@ -139,15 +143,19 @@ public class Region {
 
         OC1_REGIONS.put(EU_AMSTERDAM_1.getRegionId(), EU_AMSTERDAM_1);
         OC1_REGIONS.put(EU_FRANKFURT_1.getRegionId(), EU_FRANKFURT_1);
+        OC1_REGIONS.put(EU_MADRID_1.getRegionId(), EU_MADRID_1);
         OC1_REGIONS.put(EU_MARSEILLE_1.getRegionId(), EU_MARSEILLE_1);
         OC1_REGIONS.put(EU_MILAN_1.getRegionId(), EU_MILAN_1);
+        OC1_REGIONS.put(EU_PARIS_1.getRegionId(), EU_PARIS_1);
         OC1_REGIONS.put(EU_STOCKHOLM_1.getRegionId(), EU_STOCKHOLM_1);
         OC1_REGIONS.put(EU_ZURICH_1.getRegionId(), EU_ZURICH_1);
 
         OC1_REGIONS.put(ME_ABUDHABI_1.getRegionId(), ME_ABUDHABI_1);
         OC1_REGIONS.put(ME_DUBAI_1.getRegionId(), ME_DUBAI_1);
         OC1_REGIONS.put(ME_JEDDAH_1.getRegionId(), ME_JEDDAH_1);
 
+        OC1_REGIONS.put(MX_QUERETARO_1.getRegionId(), MX_QUERETARO_1);
+
         OC1_REGIONS.put(IL_JERUSALEM_1.getRegionId(), IL_JERUSALEM_1);
 
         /* LAD */

driver/src/main/java/oracle/nosql/driver/iam/Utils.java

@@ -123,15 +123,19 @@ class Utils {
 
         IAM_URI.put("ams", OC1_EP_BASE.format(new Object[] {"eu-amsterdam-1"}));
         IAM_URI.put("fra", OC1_EP_BASE.format(new Object[] {"eu-frankfurt-1"}));
+        IAM_URI.put("mad", OC1_EP_BASE.format(new Object[] {"eu-madrid-1"}));
         IAM_URI.put("mrs", OC1_EP_BASE.format(new Object[] {"eu-marseille-1"}));
         IAM_URI.put("lin", OC1_EP_BASE.format(new Object[] {"eu-milan-1"}));
+        IAM_URI.put("cdg", OC1_EP_BASE.format(new Object[] {"eu-paris-1"}));
         IAM_URI.put("arn", OC1_EP_BASE.format(new Object[] {"eu-stockholm-1"}));
         IAM_URI.put("zrh", OC1_EP_BASE.format(new Object[] {"eu-zurich-1"}));
 
         IAM_URI.put("auh", OC1_EP_BASE.format(new Object[] {"me-abudhabi-1"}));
         IAM_URI.put("dxb", OC1_EP_BASE.format(new Object[] {"me-dubai-1"}));
         IAM_URI.put("jed", OC1_EP_BASE.format(new Object[] {"me-jeddah-1"}));
 
+        IAM_URI.put("qro", OC1_EP_BASE.format(new Object[] {"mx-queretaro-1"}));
+
         IAM_URI.put("mtz", OC1_EP_BASE.format(new Object[] {"il-jerusalem-1"}));
 
         IAM_URI.put("gru", OC1_EP_BASE.format(new Object[] {"sa-saopaulo-1"}));

driver/src/test/java/oracle/nosql/driver/iam/ConfigFileTest.java

@@ -288,6 +288,12 @@ private String authEndpoint(ArrayValue realms, MapValue mv) {
     }
 
 
+    /*
+     * To execute this specific test, given a regions.json file:
+     *
+     * mvn -Ptest-local -DargLine="-Dtest.regionsfile=<path>/regions.json" \
+     *     -Dtest=oracle.nosql.driver.iam.ConfigFileTest test
+     */
     @Test
     public void testAllRegionCodes() {
         /* only execute if we're supplied a path to regions.json file */