Feature credential service

.gitignore

@@ -53,6 +53,7 @@ README.md.meta
 Travis.meta
 exclude-filter.txt
 exclude-filter.txt.meta
+etc.meta
 /Travis/UnityTestProject/Assets/StreamingAssets/Config.json
 /Travis/UnityTestProject/Assets/StreamingAssets/Config.json.meta
 /Travis/UnityTestProject/Assets/StreamingAssets/Config.json.enc.meta

Scripts/Services/DocumentConversion/v1/DocumentConversion.cs

@@ -71,6 +71,8 @@ public Credentials Credentials
         #region Constructor
         public DocumentConversion(Credentials credentials)
         {
+            Log.Warning("DocumentConversion", "The Document Conversion service has been deprecated. Please use the Discovery service.");
+
             if (credentials.HasCredentials() || credentials.HasAuthorizationToken())
             {
                 Credentials = credentials;

Scripts/Services/DocumentConversion/v1/README.md

@@ -1,5 +1,7 @@
 # Document Conversion
 
+Important: Starting on 11-03-2017, it will no longer be possible to create a new instance of Document Conversion on Bluemix. Existing service instances will be supported until 10-03-2018. To continue using features, you will need to [migrate](https://console.bluemix.net/docs/services/discovery/migrate-dcs-rr.html#migrating-from-watson-document-conversion-and-retrieve-and-rank). Note: May not apply in select Dedicated environments.
+
 The IBM Watson™ [Document conversion][document_conversion] service converts a single HTML, PDF, or Microsoft Word™ document into a normalized HTML, plain text, or a set of JSON-formatted Answer units that can be used with other Watson services. Carefully inspect output to make sure that it contains all elements and metadata required by the security standards of you or your organization.
 
 ## Usage

Scripts/UnitTests/TestConversation.cs

@@ -47,42 +47,45 @@ public class TestConversation : UnitTest
         public override IEnumerator RunTest()
         {
             LogSystem.InstallDefaultReactors();
-            try
-            {
-                VcapCredentials vcapCredentials = new VcapCredentials();
-                fsData data = null;
-
-                //  Get credentials from a credential file defined in environmental variables in the VCAP_SERVICES format. 
-                //  See https://console.bluemix.net/docs/services/watson/getting-started-variables.html.
-                var environmentalVariable = Environment.GetEnvironmentVariable("VCAP_SERVICES");
-                var fileContent = File.ReadAllText(environmentalVariable);
-
-                //  Add in a parent object because Unity does not like to deserialize root level collection types.
-                fileContent = Utility.AddTopLevelObjectToJson(fileContent, "VCAP_SERVICES");
-
-                //  Convert json to fsResult
-                fsResult r = fsJsonParser.Parse(fileContent, out data);
-                if (!r.Succeeded)
-                    throw new WatsonException(r.FormattedMessages);
-
-                //  Convert fsResult to VcapCredentials
-                object obj = vcapCredentials;
-                r = _serializer.TryDeserialize(data, obj.GetType(), ref obj);
-                if (!r.Succeeded)
-                    throw new WatsonException(r.FormattedMessages);
-
-                //  Set credentials from imported credntials
-                Credential credential = vcapCredentials.VCAP_SERVICES["conversation"][TestCredentialIndex].Credentials;
-                _username = credential.Username.ToString();
-                _password = credential.Password.ToString();
-                _url = credential.Url.ToString();
-                _workspaceId = credential.WorkspaceId.ToString();
-            }
-            catch
+
+            VcapCredentials vcapCredentials = new VcapCredentials();
+            fsData data = null;
+
+            string result = null;
+
+            var vcapUrl = Environment.GetEnvironmentVariable("VCAP_URL");
+            var vcapUsername = Environment.GetEnvironmentVariable("VCAP_USERNAME");
+            var vcapPassword = Environment.GetEnvironmentVariable("VCAP_PASSWORD");
+
+            using (SimpleGet simpleGet = new SimpleGet(vcapUrl, vcapUsername, vcapPassword))
             {
-                Log.Debug("TestConversation.RunTest()", "Failed to get credentials from VCAP_SERVICES file. Please configure credentials to run this test. For more information, see: https://github.com/watson-developer-cloud/unity-sdk/#authentication");
+                while (!simpleGet.IsComplete)
+                    yield return null;
+
+                result = simpleGet.Result;
             }
 
+            //  Add in a parent object because Unity does not like to deserialize root level collection types.
+            result = Utility.AddTopLevelObjectToJson(result, "VCAP_SERVICES");
+
+            //  Convert json to fsResult
+            fsResult r = fsJsonParser.Parse(result, out data);
+            if (!r.Succeeded)
+                throw new WatsonException(r.FormattedMessages);
+
+            //  Convert fsResult to VcapCredentials
+            object obj = vcapCredentials;
+            r = _serializer.TryDeserialize(data, obj.GetType(), ref obj);
+            if (!r.Succeeded)
+                throw new WatsonException(r.FormattedMessages);
+
+            //  Set credentials from imported credntials
+            Credential credential = vcapCredentials.VCAP_SERVICES["conversation"];
+            _username = credential.Username.ToString();
+            _password = credential.Password.ToString();
+            _url = credential.Url.ToString();
+            _workspaceId = credential.WorkspaceId.ToString();
+
             //  Create credential and instantiate service
             Credentials credentials = new Credentials(_username, _password, _url);
 

Scripts/UnitTests/TestDiscovery.cs

@@ -76,41 +76,43 @@ public override IEnumerator RunTest()
         {
             LogSystem.InstallDefaultReactors();
 
-            try
-            {
-                VcapCredentials vcapCredentials = new VcapCredentials();
-                fsData data = null;
-
-                //  Get credentials from a credential file defined in environmental variables in the VCAP_SERVICES format. 
-                //  See https://console.bluemix.net/docs/services/watson/getting-started-variables.html.
-                var environmentalVariable = System.Environment.GetEnvironmentVariable("VCAP_SERVICES");
-                var fileContent = File.ReadAllText(environmentalVariable);
-
-                //  Add in a parent object because Unity does not like to deserialize root level collection types.
-                fileContent = Utility.AddTopLevelObjectToJson(fileContent, "VCAP_SERVICES");
-
-                //  Convert json to fsResult
-                fsResult r = fsJsonParser.Parse(fileContent, out data);
-                if (!r.Succeeded)
-                    throw new WatsonException(r.FormattedMessages);
-
-                //  Convert fsResult to VcapCredentials
-                object obj = vcapCredentials;
-                r = _serializer.TryDeserialize(data, obj.GetType(), ref obj);
-                if (!r.Succeeded)
-                    throw new WatsonException(r.FormattedMessages);
-
-                //  Set credentials from imported credntials
-                Credential credential = vcapCredentials.VCAP_SERVICES["discovery"][TestCredentialIndex].Credentials;
-                _username = credential.Username.ToString();
-                _password = credential.Password.ToString();
-                _url = credential.Url.ToString();
-            }
-            catch
+            VcapCredentials vcapCredentials = new VcapCredentials();
+            fsData data = null;
+
+            string result = null;
+
+            var vcapUrl = System.Environment.GetEnvironmentVariable("VCAP_URL");
+            var vcapUsername = System.Environment.GetEnvironmentVariable("VCAP_USERNAME");
+            var vcapPassword = System.Environment.GetEnvironmentVariable("VCAP_PASSWORD");
+
+            using (SimpleGet simpleGet = new SimpleGet(vcapUrl, vcapUsername, vcapPassword))
             {
-                Log.Debug("TestDiscovery.RunTest()", "Failed to get credentials from VCAP_SERVICES file. Please configure credentials to run this test. For more information, see: https://github.com/watson-developer-cloud/unity-sdk/#authentication");
+                while (!simpleGet.IsComplete)
+                    yield return null;
+
+                result = simpleGet.Result;
             }
 
+            //  Add in a parent object because Unity does not like to deserialize root level collection types.
+            result = Utility.AddTopLevelObjectToJson(result, "VCAP_SERVICES");
+
+            //  Convert json to fsResult
+            fsResult r = fsJsonParser.Parse(result, out data);
+            if (!r.Succeeded)
+                throw new WatsonException(r.FormattedMessages);
+
+            //  Convert fsResult to VcapCredentials
+            object obj = vcapCredentials;
+            r = _serializer.TryDeserialize(data, obj.GetType(), ref obj);
+            if (!r.Succeeded)
+                throw new WatsonException(r.FormattedMessages);
+
+            //  Set credentials from imported credntials
+            Credential credential = vcapCredentials.VCAP_SERVICES["discovery"];
+            _username = credential.Username.ToString();
+            _password = credential.Password.ToString();
+            _url = credential.Url.ToString();
+
             //  Create credential and instantiate service
             Credentials credentials = new Credentials(_username, _password, _url);
 
@@ -464,7 +466,7 @@ private void OnDeleteCollection(DeleteCollectionResponse resp, Dictionary<string
         {
             Log.Debug("TestDiscovery.OnDeleteCollection()", "Discovery - Delete collection Response: deleted:{0}", customData["json"].ToString());
 
-                _createdCollectionID = default(string);
+            _createdCollectionID = default(string);
             Test(resp != null);
 
             _deleteCollectionTested = true;
@@ -474,9 +476,9 @@ private void OnDeleteConfiguration(DeleteConfigurationResponse resp, Dictionary<
         {
             Log.Debug("TestDiscovery.OnDeleteConfiguration()", "Discovery - Delete configuration Response: deleted:{0}", customData["json"].ToString());
 
-                _createdConfigurationID = default(string);
+            _createdConfigurationID = default(string);
             Test(resp != null);
-            
+
             _deleteConfigurationTested = true;
         }
 

Scripts/UnitTests/TestDocumentConversion.cs

@@ -44,41 +44,43 @@ public override IEnumerator RunTest()
         {
             LogSystem.InstallDefaultReactors();
 
-            try
-            {
-                VcapCredentials vcapCredentials = new VcapCredentials();
-                fsData data = null;
-
-                //  Get credentials from a credential file defined in environmental variables in the VCAP_SERVICES format. 
-                //  See https://console.bluemix.net/docs/services/watson/getting-started-variables.html.
-                var environmentalVariable = Environment.GetEnvironmentVariable("VCAP_SERVICES");
-                var fileContent = File.ReadAllText(environmentalVariable);
-
-                //  Add in a parent object because Unity does not like to deserialize root level collection types.
-                fileContent = Utility.AddTopLevelObjectToJson(fileContent, "VCAP_SERVICES");
-
-                //  Convert json to fsResult
-                fsResult r = fsJsonParser.Parse(fileContent, out data);
-                if (!r.Succeeded)
-                    throw new WatsonException(r.FormattedMessages);
-
-                //  Convert fsResult to VcapCredentials
-                object obj = vcapCredentials;
-                r = _serializer.TryDeserialize(data, obj.GetType(), ref obj);
-                if (!r.Succeeded)
-                    throw new WatsonException(r.FormattedMessages);
-
-                //  Set credentials from imported credntials
-                Credential credential = vcapCredentials.VCAP_SERVICES["document_conversion"][TestCredentialIndex].Credentials;
-                _username = credential.Username.ToString();
-                _password = credential.Password.ToString();
-                _url = credential.Url.ToString();
-            }
-            catch
+            VcapCredentials vcapCredentials = new VcapCredentials();
+            fsData data = null;
+
+            string result = null;
+
+            var vcapUrl = Environment.GetEnvironmentVariable("VCAP_URL");
+            var vcapUsername = Environment.GetEnvironmentVariable("VCAP_USERNAME");
+            var vcapPassword = Environment.GetEnvironmentVariable("VCAP_PASSWORD");
+
+            using (SimpleGet simpleGet = new SimpleGet(vcapUrl, vcapUsername, vcapPassword))
             {
-                Log.Debug("TestDocumentConversion.RunTest()", "Failed to get credentials from VCAP_SERVICES file. Please configure credentials to run this test. For more information, see: https://github.com/watson-developer-cloud/unity-sdk/#authentication");
+                while (!simpleGet.IsComplete)
+                    yield return null;
+
+                result = simpleGet.Result;
             }
 
+            //  Add in a parent object because Unity does not like to deserialize root level collection types.
+            result = Utility.AddTopLevelObjectToJson(result, "VCAP_SERVICES");
+
+            //  Convert json to fsResult
+            fsResult r = fsJsonParser.Parse(result, out data);
+            if (!r.Succeeded)
+                throw new WatsonException(r.FormattedMessages);
+
+            //  Convert fsResult to VcapCredentials
+            object obj = vcapCredentials;
+            r = _serializer.TryDeserialize(data, obj.GetType(), ref obj);
+            if (!r.Succeeded)
+                throw new WatsonException(r.FormattedMessages);
+
+            //  Set credentials from imported credntials
+            Credential credential = vcapCredentials.VCAP_SERVICES["document_conversion"];
+            _username = credential.Username.ToString();
+            _password = credential.Password.ToString();
+            _url = credential.Url.ToString();
+
             //  Create credential and instantiate service
             Credentials credentials = new Credentials(_username, _password, _url);
 

Scripts/UnitTests/TestLanguageTranslator.cs

@@ -54,41 +54,43 @@ public override IEnumerator RunTest()
         {
             LogSystem.InstallDefaultReactors();
 
-            try
-            {
-                VcapCredentials vcapCredentials = new VcapCredentials();
-                fsData data = null;
-
-                //  Get credentials from a credential file defined in environmental variables in the VCAP_SERVICES format. 
-                //  See https://console.bluemix.net/docs/services/watson/getting-started-variables.html.
-                var environmentalVariable = Environment.GetEnvironmentVariable("VCAP_SERVICES");
-                var fileContent = File.ReadAllText(environmentalVariable);
-
-                //  Add in a parent object because Unity does not like to deserialize root level collection types.
-                fileContent = Utility.AddTopLevelObjectToJson(fileContent, "VCAP_SERVICES");
-
-                //  Convert json to fsResult
-                fsResult r = fsJsonParser.Parse(fileContent, out data);
-                if (!r.Succeeded)
-                    throw new WatsonException(r.FormattedMessages);
-
-                //  Convert fsResult to VcapCredentials
-                object obj = vcapCredentials;
-                r = _serializer.TryDeserialize(data, obj.GetType(), ref obj);
-                if (!r.Succeeded)
-                    throw new WatsonException(r.FormattedMessages);
-
-                //  Set credentials from imported credntials
-                Credential credential = vcapCredentials.VCAP_SERVICES["language_translator"][TestCredentialIndex].Credentials;
-                _username = credential.Username.ToString();
-                _password = credential.Password.ToString();
-                _url = credential.Url.ToString();
-            }
-            catch
+            VcapCredentials vcapCredentials = new VcapCredentials();
+            fsData data = null;
+
+            string result = null;
+
+            var vcapUrl = Environment.GetEnvironmentVariable("VCAP_URL");
+            var vcapUsername = Environment.GetEnvironmentVariable("VCAP_USERNAME");
+            var vcapPassword = Environment.GetEnvironmentVariable("VCAP_PASSWORD");
+
+            using (SimpleGet simpleGet = new SimpleGet(vcapUrl, vcapUsername, vcapPassword))
             {
-                Log.Debug("TestLanguageTranslator.RunTest()", "Failed to get credentials from VCAP_SERVICES file. Please configure credentials to run this test. For more information, see: https://github.com/watson-developer-cloud/unity-sdk/#authentication");
+                while (!simpleGet.IsComplete)
+                    yield return null;
+
+                result = simpleGet.Result;
             }
 
+            //  Add in a parent object because Unity does not like to deserialize root level collection types.
+            result = Utility.AddTopLevelObjectToJson(result, "VCAP_SERVICES");
+
+            //  Convert json to fsResult
+            fsResult r = fsJsonParser.Parse(result, out data);
+            if (!r.Succeeded)
+                throw new WatsonException(r.FormattedMessages);
+
+            //  Convert fsResult to VcapCredentials
+            object obj = vcapCredentials;
+            r = _serializer.TryDeserialize(data, obj.GetType(), ref obj);
+            if (!r.Succeeded)
+                throw new WatsonException(r.FormattedMessages);
+
+            //  Set credentials from imported credntials
+            Credential credential = vcapCredentials.VCAP_SERVICES["language_translator"];
+            _username = credential.Username.ToString();
+            _password = credential.Password.ToString();
+            _url = credential.Url.ToString();
+
             //  Create credential and instantiate service
             Credentials credentials = new Credentials(_username, _password, _url);