New OCI region code: IZQ / OC31 / ap-hobsonville-1 (#109)

Author: connelly38

CHANGELOG.md

@@ -5,7 +5,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 ## Unreleased
 
 ### Added
-- Cloud only: added new OCI regions (TYO, AHU, DAC, DOH)
+- Cloud only: added new OCI regions (TYO, AHU, DAC, DOH, IZQ)
 - Cloud only: added use of ETag in AddReplicaRequest and DropReplicaRequest
 
 ## [5.4.14] 2023-11-17

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

@@ -66,6 +66,7 @@ public class Region {
     private static final Map<String, Region> OC26_REGIONS = new HashMap<>();
     private static final Map<String, Region> OC27_REGIONS = new HashMap<>();
     private static final Map<String, Region> OC28_REGIONS = new HashMap<>();
+    private static final Map<String, Region> OC31_REGIONS = new HashMap<>();
 
     /* OC1 */
     /** JNB */
@@ -259,6 +260,10 @@ public class Region {
     /** DRS */
     public static final Region US_DCC_SWJORDAN_2 = new Region("us-dcc-swjordan-2");
 
+    /* OC31 */
+    /** IZQ */
+    public static final Region AP_HOBSONVILLE_1 = new Region("ap-hobsonville-1");
+
     static {
         /* OC1 */
         /* AF */
@@ -386,6 +391,9 @@ public class Region {
 
         /* OC28 */
         OC28_REGIONS.put(US_DCC_SWJORDAN_2.getRegionId(), US_DCC_SWJORDAN_2);
+
+        /* OC31 */
+        OC31_REGIONS.put(AP_HOBSONVILLE_1.getRegionId(), AP_HOBSONVILLE_1);
     }
 
     private final static MessageFormat OC1_EP_BASE = new MessageFormat(
@@ -428,6 +436,8 @@ public class Region {
         "https://nosql.{0}.oci.oraclecloud27.com");
     private final static MessageFormat OC28_EP_BASE = new MessageFormat(
         "https://nosql.{0}.oci.oraclecloud28.com");
+    private final static MessageFormat OC31_EP_BASE = new MessageFormat(
+        "https://nosql.{0}.oci.sovereigncloud.nz");
 
     private String regionId;
 
@@ -500,6 +510,9 @@ public String endpoint() {
         if (isOC28Region(regionId)) {
             return OC28_EP_BASE.format(new Object[] { regionId });
         }
+        if (isOC31Region(regionId)) {
+            return OC31_EP_BASE.format(new Object[] { regionId });
+        }
         throw new IllegalArgumentException(
             "Unable to find endpoint for unknown region" + regionId);
     }
@@ -575,6 +588,9 @@ public static Region fromRegionId(String regionId) {
         if (region == null) {
             region = OC28_REGIONS.get(regionId);
         }
+        if (region == null) {
+            region = OC31_REGIONS.get(regionId);
+        }
 
         return region;
     }
@@ -788,6 +804,16 @@ public static boolean isOC28Region(String regionId) {
         return (OC28_REGIONS.get(regionId) != null);
     }
 
+    /**
+     * @hidden
+     * Internal use only
+     * @param regionId the region id
+     * @return the value
+     */
+    public static boolean isOC31Region(String regionId) {
+        return (OC31_REGIONS.get(regionId) != null);
+    }
+
     /**
      * @hidden
      * Internal use only

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

@@ -131,6 +131,8 @@ class Utils {
         "https://auth.{0}.oraclecloud27.com");
     private final static MessageFormat OC28_EP_BASE = new MessageFormat(
         "https://auth.{0}.oraclecloud28.com");
+    private final static MessageFormat OC31_EP_BASE = new MessageFormat(
+        "https://auth.{0}.sovereigncloud.nz");
 
     static {
         /* OC1 */
@@ -254,6 +256,9 @@ class Utils {
 
         /* OC28 */
         IAM_URI.put("drs", OC28_EP_BASE.format(new Object[] {"us-dcc-swjordan-2"}));
+
+        /* OC31 */
+        IAM_URI.put("izq", OC31_EP_BASE.format(new Object[] {"ap-hobsonville-1"}));
     }
 
     static String getIAMURL(String regionIdOrCode) {
@@ -319,6 +324,9 @@ static String getIAMURL(String regionIdOrCode) {
             if (Region.isOC28Region(regionIdOrCode)) {
                 return OC28_EP_BASE.format(new Object[] {regionIdOrCode});
             }
+            if (Region.isOC31Region(regionIdOrCode)) {
+                return OC31_EP_BASE.format(new Object[] {regionIdOrCode});
+            }
         }
 
         return uri;