Merge pull request #230 from watson-developer-cloud/rc-2.2.2

Release 2.2.2

Author: mediumTaj

CHANGELOG.md

@@ -1,5 +1,13 @@
 Change Log
 ==========
+## Version 2.2.2
+_2018-05-18_
+* Regenerated SDK based on latest API definition.
+* Fixed: Added in hand written sessions methods for Speech to Text ([#204](https://github.com/watson-developer-cloud/dotnet-standard-sdk/issues/204), [#205](https://github.com/watson-developer-cloud/dotnet-standard-sdk/pull/205)).
+* Fixed: Revised type of `Timestamps` and `WordConfidence` in `SpeechRecognitionAlternative.cs` from `List<string>` to `string[][]` ([#198](https://github.com/watson-developer-cloud/dotnet-standard-sdk/issues/198), [#205](https://github.com/watson-developer-cloud/dotnet-standard-sdk/pull/205)).
+* New: Revised tests to get credentials from our internal credential github repo([#4456](https://github.ibm.com/Watson/developer-experience/issues/4456), [#215](https://github.com/watson-developer-cloud/dotnet-standard-sdk/pull/215)).
+* New: Support for IAM authentication ([#4288](https://zenhub.innovate.ibm.com/app/workspace/o/watson/developer-experience/issues/4288), [#210](https://github.com/watson-developer-cloud/dotnet-standard-sdk/pull/210)).
+
 ## Version 2.2.1
 _2018-04-21_
 * New: Support for custom request and response headers ([#4311](https://github.ibm.com/Watson/developer-experience/issues/4311), [#206](https://github.com/watson-developer-cloud/dotnet-standard-sdk/pull/206)).

Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = "Watson Developer Cloud .NET Standard SDK"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 2.2.1
+PROJECT_NUMBER         = 2.2.2
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

IBM.WatsonDeveloperCloud.sln

@@ -67,8 +67,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IBM.WatsonDeveloperCloud.NL
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IBM.WatsonDeveloperCloud.NLU.v1.UnitTests", "test\IBM.WatsonDeveloperCloud.NaturalLanguageUnderstanding.v1.UnitTests\IBM.WatsonDeveloperCloud.NLU.v1.UnitTests.csproj", "{B401A97F-FD61-4CC9-9392-26324A8E5461}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IBM.WatsonDeveloperCloud.PersonalityInsights.v3.IntegrationTests", "test\IBM.WatsonDeveloperCloud.PersonalityInsights.v3.IntegrationTests\IBM.WatsonDeveloperCloud.PersonalityInsights.v3.IntegrationTests.csproj", "{89E40543-56DA-4307-8625-074B9FD4EF5A}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IBM.WatsonDeveloperCloud.PersonalityInsights.v3.UnitTests", "test\IBM.WatsonDeveloperCloud.PersonalityInsights.v3.UnitTests\IBM.WatsonDeveloperCloud.PersonalityInsights.v3.UnitTests.csproj", "{9F8D0C47-3DDD-4423-B594-69A35898869F}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IBM.WatsonDeveloperCloud.ToneAnalyzer.v3.IntegrationTests", "test\IBM.WatsonDeveloperCloud.ToneAnalyzer.v3.IntegrationTests\IBM.WatsonDeveloperCloud.ToneAnalyzer.v3.IntegrationTests.csproj", "{E445F5BD-DE8E-418C-809C-C595494BFED1}"
@@ -107,6 +105,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IBM.WatsonDeveloperCloud.As
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IBM.WatsonDeveloperCloud.Assistant.v1.UnitTests", "test\IBM.WatsonDeveloperCloud.Assistant.v1.UnitTests\IBM.WatsonDeveloperCloud.Assistant.v1.UnitTests.csproj", "{3FA3418E-F5C5-463B-B371-FF38093A7D9D}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IBM.WatsonDeveloperCloud.TextToSpeech.v1.Example", "examples\IBM.WatsonDeveloperCloud.TextToSpeech.v1.Example\IBM.WatsonDeveloperCloud.TextToSpeech.v1.Example.csproj", "{B5E2F85E-7A5B-41A0-A2EF-8C678BC0F0C3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IBM.WatsonDeveloperCloud.PersonalityInsights.v3.IntTests", "test\IBM.WatsonDeveloperCloud.PersonalityInsights.v3.IntTests\IBM.WatsonDeveloperCloud.PersonalityInsights.v3.IntTests.csproj", "{7E050830-759C-4D12-BB8F-57DA8853616D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -189,10 +191,6 @@ Global
 		{B401A97F-FD61-4CC9-9392-26324A8E5461}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B401A97F-FD61-4CC9-9392-26324A8E5461}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B401A97F-FD61-4CC9-9392-26324A8E5461}.Release|Any CPU.Build.0 = Release|Any CPU
-		{89E40543-56DA-4307-8625-074B9FD4EF5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{89E40543-56DA-4307-8625-074B9FD4EF5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{89E40543-56DA-4307-8625-074B9FD4EF5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{89E40543-56DA-4307-8625-074B9FD4EF5A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9F8D0C47-3DDD-4423-B594-69A35898869F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9F8D0C47-3DDD-4423-B594-69A35898869F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9F8D0C47-3DDD-4423-B594-69A35898869F}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -261,6 +259,14 @@ Global
 		{3FA3418E-F5C5-463B-B371-FF38093A7D9D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3FA3418E-F5C5-463B-B371-FF38093A7D9D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3FA3418E-F5C5-463B-B371-FF38093A7D9D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B5E2F85E-7A5B-41A0-A2EF-8C678BC0F0C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B5E2F85E-7A5B-41A0-A2EF-8C678BC0F0C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B5E2F85E-7A5B-41A0-A2EF-8C678BC0F0C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B5E2F85E-7A5B-41A0-A2EF-8C678BC0F0C3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7E050830-759C-4D12-BB8F-57DA8853616D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7E050830-759C-4D12-BB8F-57DA8853616D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7E050830-759C-4D12-BB8F-57DA8853616D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7E050830-759C-4D12-BB8F-57DA8853616D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -296,7 +302,6 @@ Global
 		{7DA05E71-3503-4982-AAB6-26C9B76BDD5F} = {8B927AB2-21F8-40DE-BE6B-5B1105453133}
 		{A6BC7470-79A2-4C7E-923A-748540791D97} = {89D715BF-7464-45FB-8DA0-9D7B46AB8C7F}
 		{B401A97F-FD61-4CC9-9392-26324A8E5461} = {89D715BF-7464-45FB-8DA0-9D7B46AB8C7F}
-		{89E40543-56DA-4307-8625-074B9FD4EF5A} = {D65AC99F-4E63-4362-8765-EB6F15838CA0}
 		{9F8D0C47-3DDD-4423-B594-69A35898869F} = {D65AC99F-4E63-4362-8765-EB6F15838CA0}
 		{E445F5BD-DE8E-418C-809C-C595494BFED1} = {C7873F44-7188-49BE-84C5-532BE4E07147}
 		{B1102C7F-58A6-4F2F-A2BC-2D230F0268FA} = {C7873F44-7188-49BE-84C5-532BE4E07147}
@@ -316,6 +321,8 @@ Global
 		{60793E3F-EF8D-4FF8-9C69-33D1ADBC3C39} = {E3D238D7-7A09-4447-B836-8D6ABF4BFF80}
 		{8616701B-F226-4462-9949-DE1F2C88B194} = {E3D238D7-7A09-4447-B836-8D6ABF4BFF80}
 		{3FA3418E-F5C5-463B-B371-FF38093A7D9D} = {E3D238D7-7A09-4447-B836-8D6ABF4BFF80}
+		{B5E2F85E-7A5B-41A0-A2EF-8C678BC0F0C3} = {A86D4D5B-AECE-49F2-A2BC-F6897B3EB2E8}
+		{7E050830-759C-4D12-BB8F-57DA8853616D} = {D65AC99F-4E63-4362-8765-EB6F15838CA0}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {B9D9D17B-1C17-402F-B701-DC671528690A}

README.md

@@ -1,6 +1,7 @@
 # Watson Developer Cloud .NET Standard SDK
 [![Build status](https://ci.appveyor.com/api/projects/status/bcbl2ripwdmh1918/branch/development?svg=true)](https://ci.appveyor.com/project/mediumTaj/dotnet-standard-sdk/branch/development)
 [![Coverage Status](https://coveralls.io/repos/github/watson-developer-cloud/dotnet-standard-sdk/badge.svg?branch=master)](https://coveralls.io/github/watson-developer-cloud/dotnet-standard-sdk?branch=master)
+[![wdc-community.slack.com](https://wdc-slack-inviter.mybluemix.net/badge.svg)](http://wdc-slack-inviter.mybluemix.net/)
 
 The .Net SDK uses the [Watson Developer Cloud][wdc] services, a collection of REST APIs and SDKs that use cognitive computing to solve complex problems.
 
@@ -70,6 +71,23 @@ void Example()
 }
 ```
 
+## IAM Authentication
+You can authenticate using IAM rather than username and password. You can either allow the SDK to manage the token by providing your IAM apikey or manage the token yourself by providing an access token.
+```cs
+void Example()
+{
+    //  Provide either an iamApiKey or iamAccessToken to authenticate the service.
+    TokenOptions iamAssistantTokenOptions = new TokenOptions()
+    {
+        IamApiKey = "<iam-apikey>",
+        IamAccessToken = "<iam-access-token>"
+    };
+
+    _assistant = new AssistantService(iamAssistantTokenOptions, "<version-date>");
+    var results = assistant.Message("<workspace-id>", "<message-request>");
+}
+```
+
 ## Documentation
 Click [here][dotnet-standard-sdk-documentation] for documentation by release and branch.
 

appveyor.yml

@@ -1,4 +1,4 @@
-version: 2.1.{build}
+version: 2.3.{build}
 branches:
   except:
   - gh-pages
@@ -13,12 +13,8 @@ environment:
     secure: J0LjUlYl+lGJMLBcOgVF1m1I07nyr+8yFOMaNBA23RGLMJKvYnRlhmGWXp07ejgu
   CRED_SECRET:
     secure: eEcA/09B7XzeTSb3GlaeqcWfQ/TemXxAq9/0AFM5+z8=
-  VCAP_URL:
-    secure: z68QwNPZhdBxLtcf9lx5CrAIJe2AstVlaygEV2vBjfNWpSDTssdX+U5edJZjhk2mZ1u71BOlKd/aOL0yuVn3Ew==
-  VCAP_USERNAME:
-    secure: xRHH3z2B+DfQKsmd9CWOhA==
-  VCAP_PASSWORD:
-    secure: 3YoxDjzz7qMIbDqokgsB1A==
+  GITHUB_TOKEN:
+    secure: 8sr9qy9Ghr7IaCVsf0mvKITy6nb5RZaEScQ3VIPNMJxPzFCkZ688RHIOmW5qWWy5
 install:
 - cmd: >-
     rm -rf packages
@@ -37,7 +33,12 @@ install:
 
     nuget install -Verbosity quiet -OutputDirectory packages secure-file -ExcludeVersion
 
-- ps: dotnet restore
+before_build:
+- ps: >-
+    git clone https://$env:[email protected]/germanatt/sdk-credentials.git C:\projects\sdk-credentials
+
+    dotnet restore
+
 build:
   project: IBM.WatsonDeveloperCloud.sln
   verbosity: minimal
@@ -99,7 +100,7 @@ after_build:
 
     Copy-Item C:\projects\dotnet-standard-sdk\test\IBM.WatsonDeveloperCloud.LanguageTranslator.v2.IntegrationTests\glossary.tmx C:\projects\dotnet-standard-sdk\glossary.tmx
 test_script:
-- ps: "if((Test-Path -Path coverage))\n{\n  rm coverage -r -force\n}\nNew-Item -path . -name coverage -itemtype directory\nForEach ($folder in (Get-ChildItem -Path C:\\projects\\dotnet-standard-sdk\\test -Directory)) { \n  if($env:APPVEYOR_PULL_REQUEST_NUMBER -eq $null)\n    {\n      Write-Output \"No pull request number. Executing tests\"\n      dotnet test $folder.FullName\n      if($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode )  }\n      echo \"Test passed: $?\"\n      echo \"LastExitCode: $LastExitCode\"\n      $openCover = 'C:\\projects\\dotnet-standard-sdk\\packages\\OpenCover.4.6.519\\tools\\OpenCover.Console.exe'    \n      $targetArgs = '-targetargs: test ' + $folder.FullName + ' -c Release -f netcoreapp1.0'\n      $filter = '-filter:+[IBM.WatsonDeveloperCloud*]*-[*Tests*]*-[*Example*]*'\n      & $openCover '-target:C:\\Program Files\\dotnet\\dotnet.exe' $targetArgs '-register:user' $filter '-oldStyle' '-mergeoutput' '-hideskipped:File' '-searchdirs:$testdir\\bin\\release\\netcoreapp1.0' '-output:coverage\\coverage.xml'\n    }\n    else\n    {\n        Write-Output \"Pull request number is $env:APPVEYOR_PULL_REQUEST_NUMBER. Skipping tests.\"\n    }\n }\n\nC:\\projects\\dotnet-standard-sdk\\packages\\ReportGenerator.2.4.5.0\\tools\\ReportGenerator.exe -reports:coverage\\coverage.xml -targetdir:coverage -verbosity:Error\n\nif($env:COVERALLS_REPO_TOKEN)\n{\n  C:\\projects\\dotnet-standard-sdk\\packages\\coveralls.net.0.7.0\\tools\\csmacnz.Coveralls.exe --opencover -i coverage\\coverage.xml --useRelativePaths\n}\nelse\n{\n  Write-Output \"There is no Coveralls Repo Token - not pushing coverage.\"\n}"
+- ps: "if($env:GITHUB_TOKEN)\n{\nif((Test-Path -Path coverage))\n{\n  rm coverage -r -force\n}\nNew-Item -path . -name coverage -itemtype directory\nForEach ($folder in (Get-ChildItem -Path C:\\projects\\dotnet-standard-sdk\\test -Directory)) { \n  if($env:APPVEYOR_PULL_REQUEST_NUMBER -eq $null)\n    {\n      Write-Output \"No pull request number. Executing tests\"\n      dotnet test $folder.FullName\n      if($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode )  }\n      echo \"Test passed: $?\"\n      echo \"LastExitCode: $LastExitCode\"\n      $openCover = 'C:\\projects\\dotnet-standard-sdk\\packages\\OpenCover.4.6.519\\tools\\OpenCover.Console.exe'    \n      $targetArgs = '-targetargs: test ' + $folder.FullName + ' -c Release -f netcoreapp1.0'\n      $filter = '-filter:+[IBM.WatsonDeveloperCloud*]*-[*Tests*]*-[*Example*]*'\n      & $openCover '-target:C:\\Program Files\\dotnet\\dotnet.exe' $targetArgs '-register:user' $filter '-oldStyle' '-mergeoutput' '-hideskipped:File' '-searchdirs:$testdir\\bin\\release\\netcoreapp1.0' '-output:coverage\\coverage.xml'\n    }\n    else\n    {\n        Write-Output \"Pull request number is $env:APPVEYOR_PULL_REQUEST_NUMBER. Skipping tests.\"\n    }\n }\n\nC:\\projects\\dotnet-standard-sdk\\packages\\ReportGenerator.2.4.5.0\\tools\\ReportGenerator.exe -reports:coverage\\coverage.xml -targetdir:coverage -verbosity:Error\n\nif($env:COVERALLS_REPO_TOKEN)\n{\n  C:\\projects\\dotnet-standard-sdk\\packages\\coveralls.net.0.7.0\\tools\\csmacnz.Coveralls.exe --opencover -i coverage\\coverage.xml --useRelativePaths\n}\nelse\n{\n  Write-Output \"There is no Coveralls Repo Token - not pushing coverage.\"\n}\n}"
 artifacts:
 - path: '\src\IBM.WatsonDeveloperCloud\bin\$(configuration)\*.nupkg'
   name: IBM.WatsonDeveloperCloud

examples/IBM.WatsonDeveloperCloud.Conversation.v1.Example/Example.cs

@@ -17,8 +17,9 @@
 
 using System;
 using Newtonsoft.Json.Linq;
-using System.Threading.Tasks;
 using IBM.WatsonDeveloperCloud.Util;
+using System.IO;
+using Newtonsoft.Json;
 
 namespace IBM.WatsonDeveloperCloud.Conversation.v1.Example
 {
@@ -28,31 +29,53 @@ public static void Main(string[] args)
         {
             string credentials = string.Empty;
 
-            try
-            {
-                credentials = Utility.SimpleGet(
-                    Environment.GetEnvironmentVariable("VCAP_URL"),
-                    Environment.GetEnvironmentVariable("VCAP_USERNAME"),
-                    Environment.GetEnvironmentVariable("VCAP_PASSWORD")).Result;
-            }
-            catch (Exception e)
+            #region Get Credentials
+            string _endpoint = string.Empty;
+            string _username = string.Empty;
+            string _password = string.Empty;
+            string _workspaceID = string.Empty;
+
+            if (string.IsNullOrEmpty(credentials))
             {
-                Console.WriteLine(string.Format("Failed to get credentials: {0}", e.Message));
-            }
+                var parentDirectory = Directory.GetParent(Directory.GetCurrentDirectory()).Parent.Parent.Parent.Parent.Parent.FullName;
+                string credentialsFilepath = parentDirectory + Path.DirectorySeparatorChar + "sdk-credentials" + Path.DirectorySeparatorChar + "credentials.json";
+                if (File.Exists(credentialsFilepath))
+                {
+                    try
+                    {
+                        credentials = File.ReadAllText(credentialsFilepath);
+                        credentials = Utility.AddTopLevelObjectToJson(credentials, "VCAP_SERVICES");
+                    }
+                    catch (Exception e)
+                    {
+                        throw new Exception(string.Format("Failed to load credentials: {0}", e.Message));
+                    }
 
-            Task.WaitAll();
+                    VcapCredentials vcapCredentials = JsonConvert.DeserializeObject<VcapCredentials>(credentials);
+                    var vcapServices = JObject.Parse(credentials);
 
-            var vcapServices = JObject.Parse(credentials);
-            var _url = vcapServices["conversation"]["url"];
-            var _username = vcapServices["conversation"]["username"];
-            var _password = vcapServices["conversation"]["password"];
-            var _workspaceID = "506e4a2e-3d5d-4dca-b374-38edbb4139ab";   //vcapServices["conversation"]["workspace_id"];
+                    Credential credential = vcapCredentials.GetCredentialByname("conversation-sdk")[0].Credentials;
+                    _endpoint = credential.Url;
+                    _username = credential.Username;
+                    _password = credential.Password;
+                    _workspaceID = credential.WorkspaceId;
+                }
+                else
+                {
+                    Console.WriteLine("Credentials file does not exist. Please define credentials.");
+                    _username = "";
+                    _password = "";
+                    _endpoint = "";
+                    _workspaceID = "";
+                }
+            }
+            #endregion
 
             //  Uncomment to run the service example.
-            //ConversationServiceExample _conversationExample = new ConversationServiceExample(_url.ToString(), _username.ToString(), _password.ToString(), _workspaceID.ToString());
+            ConversationServiceExample _conversationExample = new ConversationServiceExample(_endpoint, _username, _password, _workspaceID);
 
             //  Uncomment to run the context example.
-            ConversationContextExample _converationContextExample = new ConversationContextExample(_url.ToString(), _username.ToString(), _password.ToString(), _workspaceID.ToString());
+            ConversationContextExample _converationContextExample = new ConversationContextExample(_endpoint, _username, _password, _workspaceID);
 
             Console.ReadKey();
         }

examples/IBM.WatsonDeveloperCloud.Conversation.v1.Example/IBM.WatsonDeveloperCloud.Conversation.v1.Example.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <VersionPrefix>2.2.1</VersionPrefix>
+    <VersionPrefix>2.2.2</VersionPrefix>
     <TargetFramework>netcoreapp1.0</TargetFramework>
     <AssemblyName>IBM.WatsonDeveloperCloud.Conversation.v1.Example</AssemblyName>
     <OutputType>Exe</OutputType>
@@ -10,7 +10,7 @@
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <Version>2.2.1</Version>
+    <Version>2.2.2</Version>
   </PropertyGroup>
 
   <ItemGroup>