Merge pull request #84 from IBM/iam-changes

Discovery IAM changes
IBM · Jul 31, 2018 · 6e0ca25 · 6e0ca25
2 parents 55fef95 + c260ee3
commit 6e0ca25
Show file tree

Hide file tree

Showing 7 changed files with 528 additions and 616 deletions.
diff --git a/README.md b/README.md
@@ -177,20 +177,22 @@ Edit the `.env` file with the necessary settings.
 #### `env.sample:`
 
 ```
-# Replace the credentials here with your own.
-# Rename this file to .env before starting the app.
+# Copy this file to .env and replace the credentials with 
+# your own before starting the app.
 
 # Watson Discovery
-DISCOVERY_USERNAME="XXXXXXXX"
-DISCOVERY_PASSWORD="XXXXXXXXX"
-DISCOVERY_VERSION="v1"
-DISCOVERY_VERSION_DATE="2017-11-07"
+DISCOVERY_VERSION_DATE="2018-03-05"
 DISCOVERY_ENV_ID="system"
+DISCOVERY_URL=<add_discovery_url>
+## Un-comment and use either username+password or IAM apikey.
+# DISCOVERY_USERNAME=<add_discovery_username>
+# DISCOVERY_PASSWORD=<add_discovery_password>
+# DISCOVERY_IAM_APIKEY=<add_discovery_iam_apikey>
 
 # Cloudant
-CLOUDANT_USERNAME="XXXXXXXXX"
-CLOUDANT_PASSWORD="XXXXXXXXXXXXXXX"
-CLOUDANT_HOST="XXXXXXXXXXXXXX-bluemix.cloudant.com"
+CLOUDANT_USERNAME=<add_cloudant_username>
+CLOUDANT_PASSWORD=<add_cloudant_password>
+CLOUDANT_HOST=<add_cloudant_host>
 DB_NAME="stock-data"
 
 # App Config

diff --git a/app/services/discovery.js b/app/services/discovery.js
@@ -15,10 +15,9 @@
  */
 
 const config = require('../../config');
-const Discovery = require('watson-developer-cloud/discovery/v1');
-const discovery = new Discovery({
-  version      : config.DISCOVERY.version,
-  version_date : config.DISCOVERY.version_date
+const DiscoveryV1 = require('watson-developer-cloud/discovery/v1');
+const discovery = new DiscoveryV1({
+  version: config.DISCOVERY.version_date
 });
 
 const NUM_DOCS_TO_QUERY = 5;

diff --git a/app/util/cloudantDb.js b/app/util/cloudantDb.js
@@ -19,13 +19,12 @@ const config = require('../../config.js');
 
 var cloudant;
 
-if (config.usingEnv) {
-  console.log('Initializing cloudant from env');
+if (config.usingEnv) {  
   cloudant = Cloudant({
-    account  : config.CLOUDANT.account,
-    key      : config.CLOUDANT.key,
+    account  : config.CLOUDANT.key,    
     password : config.CLOUDANT.password
   });
+  console.log('Successfully initialized cloudant');
 } else if (config.usingVCAP) {
   console.log('Initializing cloudant from VCAP');
   console.log('credentials url: ' + config.CLOUDANT.credentialsURL);

diff --git a/config.js b/config.js
@@ -104,8 +104,7 @@ var theConfig = {
     db_name  : process.env.DB_NAME || 'stock-data'
   },
   DISCOVERY                : {
-    version      : process.env.DISCOVERY_VERSION || 'v1',
-    version_date : process.env.DISCOVERY_VERSION_DATE || '2017-11-07',
+    version_date : process.env.DISCOVERY_VERSION_DATE || '2018-03-05',
     env_id       : process.env.DISCOVERY_ENV_ID || 'system'
   }
 };

diff --git a/env.sample b/env.sample
@@ -1,17 +1,19 @@
-# Replace the credentials here with your own.
-# Rename this file to .env before starting the app.
+# Copy this file to .env and replace the credentials with 
+# your own before starting the app.
 
 # Watson Discovery
-DISCOVERY_USERNAME="XXXXXXXX"
-DISCOVERY_PASSWORD="XXXXXXXXX"
-DISCOVERY_VERSION="v1"
-DISCOVERY_VERSION_DATE="2017-11-07"
+DISCOVERY_VERSION_DATE="2018-03-05"
 DISCOVERY_ENV_ID="system"
+DISCOVERY_URL=<add_discovery_url>
+## Un-comment and use either username+password or IAM apikey.
+# DISCOVERY_USERNAME=<add_discovery_username>
+# DISCOVERY_PASSWORD=<add_discovery_password>
+# DISCOVERY_IAM_APIKEY=<add_discovery_iam_apikey>
 
 # Cloudant
-CLOUDANT_USERNAME="XXXXXXXXX"
-CLOUDANT_PASSWORD="XXXXXXXXXXXXXXX"
-CLOUDANT_HOST="XXXXXXXXXXXXXX-bluemix.cloudant.com"
+CLOUDANT_USERNAME=<add_cloudant_username>
+CLOUDANT_PASSWORD=<add_cloudant_password>
+CLOUDANT_HOST=<add_cloudant_host>
 DB_NAME="stock-data"
 
 # App Config