Fixed a couple region codes

Fixed uk-gov-cardiff-1 and sa-vinhedo-1.
Added internal regions test.

Author: connelly38

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

@@ -105,7 +105,7 @@ public class Region {
 
     /* OC4 */
     public static final Region UK_GOV_LONDON_1 = new Region("uk-gov-london-1");
-    public static final Region UK_GOV_CARDIFF_1 = new Region("uk-gov-london-1");
+    public static final Region UK_GOV_CARDIFF_1 = new Region("uk-gov-cardiff-1");
 
     /* OC8 */
     public static final Region AP_CHIYODA_1 = new Region("ap-chiyoda-1");
@@ -119,6 +119,9 @@ public class Region {
 
     static {
         /* OC1 */
+        /* AF */
+        OC1_REGIONS.put(AF_JOHANNESBURG_1.getRegionId(), AF_JOHANNESBURG_1);
+
         /* APAC */
         OC1_REGIONS.put(AP_CHUNCHEON_1.getRegionId(), AP_CHUNCHEON_1);
         OC1_REGIONS.put(AP_HYDERABAD_1.getRegionId(), AP_HYDERABAD_1);
@@ -150,7 +153,7 @@ public class Region {
         /* LAD */
         OC1_REGIONS.put(SA_SAOPAULO_1.getRegionId(), SA_SAOPAULO_1);
         OC1_REGIONS.put(SA_SANTIAGO_1.getRegionId(), SA_SANTIAGO_1);
-        OC1_REGIONS.put(SA_VINHEDO_1.getRegionId(), SA_SANTIAGO_1);
+        OC1_REGIONS.put(SA_VINHEDO_1.getRegionId(), SA_VINHEDO_1);
 
         /* North America */
         OC1_REGIONS.put(US_ASHBURN_1.getRegionId(), US_ASHBURN_1);

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

@@ -7,10 +7,13 @@
 
 package oracle.nosql.driver.iam;
 
+import static oracle.nosql.driver.iam.Utils.getIAMURL;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -21,6 +24,10 @@
 import oracle.nosql.driver.NoSQLHandleConfig;
 import oracle.nosql.driver.Region;
 import oracle.nosql.driver.iam.OCIConfigFileReader.OCIConfigFile;
+import oracle.nosql.driver.values.ArrayValue;
+import oracle.nosql.driver.values.FieldValue;
+import oracle.nosql.driver.values.JsonUtils;
+import oracle.nosql.driver.values.MapValue;
 
 import org.junit.After;
 import org.junit.Before;
@@ -244,4 +251,123 @@ public void testRegionProvider()
         } catch (IllegalArgumentException iae) {
         }
     }
+
+    private MapValue getRealm(ArrayValue realms, String realm) {
+        for (FieldValue fv : realms) {
+            MapValue mv = fv.asMap();
+            String name = mv.get("name").asString().getValue();
+            if (realm.compareTo(name) == 0) {
+                return mv;
+            }
+        }
+        return null;
+    }
+
+    private String nosqlEndpoint(ArrayValue realms, MapValue mv) {
+        String realm = mv.get("realm").asString().getValue();
+        MapValue realmVals = getRealm(realms, realm);
+        if (realmVals == null) {
+            return null;
+        }
+        String prefix = realmVals.get("epprefix").asString().getValue();
+        String suffix = realmVals.get("epsuffix").asString().getValue();
+        String regionId = mv.get("name").asString().getValue();
+        return "https://" + prefix + regionId + suffix;
+    }
+
+    private String authEndpoint(ArrayValue realms, MapValue mv) {
+        String realm = mv.get("realm").asString().getValue();
+        MapValue realmVals = getRealm(realms, realm);
+        if (realmVals == null) {
+            return null;
+        }
+        String prefix = realmVals.get("authprefix").asString().getValue();
+        String suffix = realmVals.get("authsuffix").asString().getValue();
+        String regionId = mv.get("name").asString().getValue();
+        return "https://" + prefix + regionId + suffix;
+    }
+
+
+    @Test
+    public void testAllRegionCodes() {
+        /* only execute if we're supplied a path to regions.json file */
+        String jsonPath = System.getProperty("test.regionsfile");
+        assumeTrue("Skipping region codes test: no regionsfile given",
+            (jsonPath != null && !jsonPath.isEmpty()));
+        MapValue jsonMap = null;
+        FileInputStream fis = null;
+        try {
+            fis = new FileInputStream(jsonPath);
+            jsonMap = JsonUtils.createValueFromJson(fis, null).asMap();
+        } catch (Exception e) {
+            fail("Can't read regions json file '" + jsonPath + "': " + e);
+        } finally {
+            if (fis != null) {
+                try {
+                    fis.close();
+                } catch (Exception e) {}
+            }
+        }
+
+        /*
+         * Regions json has two fields: "realms" and "regions":
+         *  "realms": [
+         *      {
+         *         "name": "oc1",
+         *         "epprefix": "nosql.",
+         *         "epsuffix": ".oci.oraclecloud.com",
+         *         "authprefix": "auth.",
+         *         "authsuffix": ".oraclecloud.com"
+         *      },
+         *      ...]
+         *
+         *  "regions": [
+         *      {"tlc": "jnb", "realm": "oc1", "name": "af-johannesburg-1"},
+         *      {"tlc": "yny", "realm": "oc1", "name": "ap-chuncheon-1"},
+         *      {"tlc": "nja", "realm": "oc8", "name": "ap-chiyoda-1"},
+         *      ...]
+         *
+         * Walk all regions, and verify endpoints for each.
+         */
+        ArrayValue realms = jsonMap.get("realms").asArray();
+        StringBuilder errs = new StringBuilder();
+        ArrayValue regions = jsonMap.get("regions").asArray();
+        for (FieldValue fv : regions) {
+            MapValue mv = fv.asMap();
+            String regionId = mv.get("name").asString().getValue();
+            Region r = Region.fromRegionId(regionId);
+            if (r == null) {
+                errs.append(" Missing region '").append(regionId).append("'\n");
+            } else {
+                String endpoint = r.endpoint();
+                String expEndpoint = nosqlEndpoint(realms, mv);
+                if (expEndpoint.compareTo(endpoint) != 0) {
+                    errs.append(" Wrong nosql endpoint for region '")
+                        .append(regionId).append("':\n")
+                        .append("  expected=").append(expEndpoint).append("\n")
+                        .append("  observed=").append(endpoint).append("\n");
+                }
+            }
+            String expAuthURL = authEndpoint(realms, mv);
+
+            String authURL = getIAMURL(regionId);
+            if (authURL == null || expAuthURL.compareTo(authURL) != 0) {
+                errs.append(" Wrong auth endpoint for region '")
+                    .append(regionId).append("':\n")
+                    .append("  expected=").append(expAuthURL).append("\n")
+                    .append("  observed=").append(authURL).append("\n");
+            }
+            String regionCode = mv.get("tlc").asString().getValue();
+            authURL = getIAMURL(regionCode);
+            if (authURL == null ||expAuthURL.compareTo(authURL) != 0) {
+                errs.append(" Wrong auth endpoint for region code '")
+                    .append(regionCode).append("':\n")
+                    .append("  expected=").append(expAuthURL).append("\n")
+                    .append("  observed=").append(authURL).append("\n");
+            }
+        }
+        if (errs.length() > 0) {
+            fail("\nErrors found in regions:\n" + errs.toString());
+        }
+    }
 }