Updated OCI regions (SGU, IFP)

Author: connelly38

CHANGELOG.md

@@ -20,6 +20,7 @@ field
      * PrepareRequest.setGetQuerySchema
      * PreparedStatement.getQuerySchema
  - Cloud only: added use of ETags, DefinedTags and FreeFormTags in TableRequest and TableResult
+ - Cloud only: Updated OCI regions (SGU, IFP)
 
 ### Changed
 - Consistency is now a class and no longer a simple enumeration. Applications must

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

@@ -55,6 +55,8 @@ public class Region {
     private static final Map<String, Region> OC9_REGIONS = new HashMap<>();
     private static final Map<String, Region> OC10_REGIONS = new HashMap<>();
     private static final Map<String, Region> OC14_REGIONS = new HashMap<>();
+    private static final Map<String, Region> OC16_REGIONS = new HashMap<>();
+    private static final Map<String, Region> OC17_REGIONS = new HashMap<>();
 
     /* OC1 */
     public static final Region AF_JOHANNESBURG_1 = new Region("af-johannesburg-1");
@@ -135,6 +137,12 @@ public class Region {
     public static final Region AP_DCC_RATING_1 = new Region("eu-dcc-rating-1");
     public static final Region AP_DCC_RATING_2 = new Region("eu-dcc-rating-2");
 
+    /* OC16 */
+    public static final Region US_WESTJORDAN_1 = new Region("us-westjordan-1");
+
+    /* OC17 */
+    public static final Region US_DCC_PHOENIX_1 = new Region("us-dcc-phoenix-1");
+
     static {
         /* OC1 */
         /* AF */
@@ -219,6 +227,12 @@ public class Region {
         OC14_REGIONS.put(AP_DCC_MILAN_2.getRegionId(), AP_DCC_MILAN_2);
         OC14_REGIONS.put(AP_DCC_RATING_1.getRegionId(), AP_DCC_RATING_1);
         OC14_REGIONS.put(AP_DCC_RATING_2.getRegionId(), AP_DCC_RATING_2);
+
+        /* OC16 */
+        OC16_REGIONS.put(US_WESTJORDAN_1.getRegionId(), US_WESTJORDAN_1);
+
+        /* OC17 */
+        OC17_REGIONS.put(US_DCC_PHOENIX_1.getRegionId(), US_DCC_PHOENIX_1);
     }
 
     private final static MessageFormat OC1_EP_BASE = new MessageFormat(
@@ -237,6 +251,10 @@ public class Region {
         "https://nosql.{0}.oci.oraclecloud10.com");
     private final static MessageFormat OC14_EP_BASE = new MessageFormat(
         "https://nosql.{0}.oci.oraclecloud14.com");
+    private final static MessageFormat OC16_EP_BASE = new MessageFormat(
+        "https://nosql.{0}.oci.oraclecloud16.com");
+    private final static MessageFormat OC17_EP_BASE = new MessageFormat(
+        "https://nosql.{0}.oci.oraclecloud17.com");
 
     private String regionId;
 
@@ -273,6 +291,12 @@ public String endpoint() {
         if (isOC14Region(regionId)) {
             return OC14_EP_BASE.format(new Object[] { regionId });
         }
+        if (isOC16Region(regionId)) {
+            return OC16_EP_BASE.format(new Object[] { regionId });
+        }
+        if (isOC17Region(regionId)) {
+            return OC17_EP_BASE.format(new Object[] { regionId });
+        }
         throw new IllegalArgumentException(
             "Unable to find endpoint for unknwon region" + regionId);
     }
@@ -312,6 +336,12 @@ public static Region fromRegionId(String regionId) {
         if (region == null) {
             region = OC14_REGIONS.get(regionId);
         }
+        if (region == null) {
+            region = OC16_REGIONS.get(regionId);
+        }
+        if (region == null) {
+            region = OC17_REGIONS.get(regionId);
+        }
 
         return region;
     }
@@ -405,6 +435,26 @@ public static boolean isOC14Region(String regionId) {
         return (OC14_REGIONS.get(regionId) != null);
     }
 
+    /**
+     * @hidden
+     * Internal use only
+     * @param regionId the region id
+     * @return the value
+     */
+    public static boolean isOC16Region(String regionId) {
+        return (OC16_REGIONS.get(regionId) != null);
+    }
+
+    /**
+     * @hidden
+     * Internal use only
+     * @param regionId the region id
+     * @return the value
+     */
+    public static boolean isOC17Region(String regionId) {
+        return (OC17_REGIONS.get(regionId) != null);
+    }
+
     /**
      * @hidden
      * Internal use only
@@ -477,6 +527,24 @@ public static Collection<Region> getOC14Regions() {
         return OC14_REGIONS.values();
     }
 
+    /**
+     * @hidden
+     * Internal use only
+     * @return the regions
+     */
+    public static Collection<Region> getOC16Regions() {
+        return OC16_REGIONS.values();
+    }
+
+    /**
+     * @hidden
+     * Internal use only
+     * @return the regions
+     */
+    public static Collection<Region> getOC17Regions() {
+        return OC17_REGIONS.values();
+    }
+
     /**
      * @hidden
      * Internal use only

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

@@ -107,6 +107,10 @@ class Utils {
         "https://auth.{0}.oraclecloud10.com");
     private final static MessageFormat OC14_EP_BASE = new MessageFormat(
         "https://auth.{0}.oraclecloud14.com");
+    private final static MessageFormat OC16_EP_BASE = new MessageFormat(
+        "https://auth.{0}.oraclecloud16.com");
+    private final static MessageFormat OC17_EP_BASE = new MessageFormat(
+        "https://auth.{0}.oraclecloud17.com");
 
     static {
         /* OC1 */
@@ -187,6 +191,12 @@ class Utils {
         IAM_URI.put("mxp", OC14_EP_BASE.format(new Object[] {"eu-dcc-milan-2"}));
         IAM_URI.put("dus", OC14_EP_BASE.format(new Object[] {"eu-dcc-rating-1"}));
         IAM_URI.put("dtm", OC14_EP_BASE.format(new Object[] {"eu-dcc-rating-2"}));
+
+        /* OC16 */
+        IAM_URI.put("sgu", OC16_EP_BASE.format(new Object[] {"us-westjordan-1"}));
+
+        /* OC17 */
+        IAM_URI.put("ifp", OC17_EP_BASE.format(new Object[] {"us-dcc-phoenix-1"}));
     }
 
     static String getIAMURL(String regionIdOrCode) {
@@ -216,6 +226,12 @@ static String getIAMURL(String regionIdOrCode) {
             if (Region.isOC14Region(regionIdOrCode)) {
                 return OC14_EP_BASE.format(new Object[] {regionIdOrCode});
             }
+            if (Region.isOC16Region(regionIdOrCode)) {
+                return OC16_EP_BASE.format(new Object[] {regionIdOrCode});
+            }
+            if (Region.isOC17Region(regionIdOrCode)) {
+                return OC17_EP_BASE.format(new Object[] {regionIdOrCode});
+            }
         }
 
         return uri;