feat(core): Pull IAM URL from VCAP_SERVICES

Author: lpatino10

core/src/main/java/com/ibm/watson/developer_cloud/service/WatsonService.java

@@ -101,8 +101,13 @@ public abstract class WatsonService {
   public WatsonService(final String name) {
     this.name = name;
     String iamApiKey = CredentialUtils.getIAMKey(name);
-    if (iamApiKey != null) {
-      tokenManager = new IamTokenManager(new IamOptions.Builder().apiKey(iamApiKey).build());
+    String iamUrl = CredentialUtils.getIAMUrl(name);
+    if (iamApiKey != null && iamUrl != null) {
+      IamOptions iamOptions = new IamOptions.Builder()
+          .apiKey(iamApiKey)
+          .url(iamUrl)
+          .build();
+      tokenManager = new IamTokenManager(iamOptions);
     }
     apiKey = CredentialUtils.getAPIKey(name);
     String url = CredentialUtils.getAPIUrl(name);

core/src/main/java/com/ibm/watson/developer_cloud/util/CredentialUtils.java

@@ -77,6 +77,9 @@ public String getUsername() {
   /** The Constant APIKEY. */
   private static final String APIKEY = "apikey";
 
+  /** The Constant IAM_API_KEY_NAME. */
+  private static final String IAM_API_KEY_NAME = "iam_apikey_name";
+
   /** The Constant CREDENTIALS. */
   private static final String CREDENTIALS = "credentials";
 
@@ -101,6 +104,9 @@ public String getUsername() {
   /** The Constant URL. */
   private static final String URL = "url";
 
+  /** The Constant IAM_URL. */
+  private static final String IAM_URL = "iam_url";
+
   /** The Constant PLAN_EXPERIMENTAL. */
   public static final String PLAN_EXPERIMENTAL = "experimental";
 
@@ -205,7 +211,7 @@ public static String getIAMKey(String serviceName) {
     }
 
     final JsonObject credentials = getCredentialsObject(services, serviceName, null);
-    if (credentials != null && credentials.get(APIKEY) != null && credentials.get("iam_apikey_name") != null) {
+    if (credentials != null && credentials.get(APIKEY) != null && credentials.get(IAM_API_KEY_NAME) != null) {
       return credentials.get(APIKEY).getAsString();
     }
 
@@ -369,6 +375,21 @@ public static String getAPIUrl(String serviceName, String plan) {
     return null;
   }
 
+  public static String getIAMUrl(String serviceName) {
+    final JsonObject services = getVCAPServices();
+
+    if (serviceName == null || services == null) {
+      return null;
+    }
+
+    final JsonObject credentials = getCredentialsObject(services, serviceName, null);
+    if (credentials != null && credentials.get(IAM_URL) != null) {
+      return credentials.get(IAM_URL).getAsString();
+    }
+
+    return null;
+  }
+
   /**
    * Sets the VCAP_SERVICES variable. This is utility variable for testing
    *

core/src/test/resources/vcap_services.json

@@ -70,7 +70,8 @@
             "iam_apikey_name": "auto-generated-apikey-111-222-333",
             "iam_role_crn": "crn:v1:bluemix:public:iam::::serviceRole:Manager",
             "iam_serviceid_crn": "crn:v1:staging:public:iam-identity::a/::serviceid:ServiceID-1234",
-            "url": "https://gateway.watsonplatform.net/language-translator/api"
+            "url": "https://gateway.watsonplatform.net/language-translator/api",
+            "iam_url": "https://iam.ng.bluemix.net/identity/token"
          }
       }
    ],