Bug fixes: 1908985, 1907418, 1898689,1901426

Author: robertla

src/ServiceManagement/RemoteApp/Commands.RemoteApp/Collection/GetAzureRemoteAppCollectionUsageDetails.cs

@@ -13,11 +13,15 @@
 // ----------------------------------------------------------------------------------
 
 using Microsoft.Azure.Commands.RemoteApp;
+using Microsoft.Azure.Management.RemoteApp;
 using Microsoft.Azure.Management.RemoteApp.Models;
-using Microsoft.PowerShell.Commands;
 using System;
 using System.Collections.ObjectModel;
 using System.Management.Automation;
+using System.IO;
+using System.Linq;
+using System.Management.Automation;
+using System.Net;
 
 namespace Microsoft.Azure.Management.RemoteApp.Cmdlets
 {
@@ -46,18 +50,15 @@ public class GetAzureRemoteAppCollectionUsageDetails : RdsCmdlet
         public string UsageYear { get; set; }
 
         [Parameter(Mandatory = false,
-            HelpMessage = "Allows to run the cmdlet in the background as a PS job.")]
+            HelpMessage = "Allows running the cmdlet in the background as a PS job.")]
         public SwitchParameter AsJob { get; set; }
 
         private LongRunningTask<GetAzureRemoteAppCollectionUsageDetails> task = null;
 
         private void GetPublishedUsageDetails(CollectionUsageDetailsResult detailsUsage)
         {
             RemoteAppOperationStatusResult operationResult = null;
-            int maxRetryCount = 60;
-            Collection<WebResponseObject> htmlWebResponse = null;
-            string scriptBlock = "Invoke-WebRequest -Uri " + "\"" + detailsUsage.UsageDetails.SasUri + "\"";
-            
+
             // The request is async and we have to wait for the usage details to be produced here
             do
             {
@@ -67,38 +68,49 @@ private void GetPublishedUsageDetails(CollectionUsageDetailsResult detailsUsage)
                 operationResult = CallClient(() => Client.OperationResults.Get(detailsUsage.UsageDetails.OperationTrackingId), Client.OperationResults);
             }
             while (operationResult.RemoteAppOperationResult.Status != RemoteAppOperationStatus.Success &&
-                operationResult.RemoteAppOperationResult.Status != RemoteAppOperationStatus.Failed &&
-                --maxRetryCount > 0);
+                operationResult.RemoteAppOperationResult.Status != RemoteAppOperationStatus.Failed);
 
             if (operationResult.RemoteAppOperationResult.Status == RemoteAppOperationStatus.Success)
             {
-                htmlWebResponse = CallPowershellWithReturnType<WebResponseObject>(scriptBlock);
-                string usage = new string(System.Text.Encoding.UTF8.GetChars(htmlWebResponse[0].Content));
-                WriteObject(usage);
+                WriteUsageDetails(detailsUsage);
             }
             else
             {
-                if (operationResult.RemoteAppOperationResult.Status == RemoteAppOperationStatus.Failed)
-                {
-                    ErrorRecord error = RemoteAppCollectionErrorState.CreateErrorRecordFromString(
-                        Commands_RemoteApp.DetailedUsageFailureMessage,
-                        String.Empty,
-                        Client.Collections,
-                        ErrorCategory.ResourceUnavailable);
+                ErrorRecord error = RemoteAppCollectionErrorState.CreateErrorRecordFromString(
+                    Commands_RemoteApp.DetailedUsageFailureMessage,
+                    String.Empty,
+                    Client.Collections,
+                    ErrorCategory.ResourceUnavailable);
 
-                    WriteError(error);
-                }
-                else if (maxRetryCount <= 0)
+                WriteError(error);
+            }
+        }
+
+        private void WriteUsageDetails(CollectionUsageDetailsResult detailsUsage)
+        {
+            // 
+            // Display the content pointed to by the returned URI
+            //
+            WebResponse response = null;
+
+            WebRequest request = WebRequest.Create(detailsUsage.UsageDetails.SasUri);
+
+            try
+            {
+                response = (HttpWebResponse)request.GetResponse();
+            }
+            catch (Exception e)
+            {
+                ErrorRecord error = RemoteAppCollectionErrorState.CreateErrorRecordFromException(e, String.Empty, Client.Collections, ErrorCategory.InvalidResult);
+                WriteError(error);
+            }
+
+            using (Stream dataStream = response.GetResponseStream())
+            {
+                using (StreamReader reader = new StreamReader(dataStream))
                 {
-                    ErrorRecord error = RemoteAppCollectionErrorState.CreateErrorRecordFromString(
-                        String.Format(System.Globalization.CultureInfo.InvariantCulture,
-                            Commands_RemoteApp.RequestTimedOutFormat,
-                            detailsUsage.UsageDetails.OperationTrackingId),
-                        String.Empty,
-                        Client.Collections,
-                        ErrorCategory.OperationTimeout);
-
-                    WriteError(error);
+                    String csvContent = reader.ReadToEnd();
+                    WriteObject(csvContent);
                 }
             }
         }

src/ServiceManagement/RemoteApp/Commands.RemoteApp/Commands.RemoteApp.Designer.cs

@@ -89,10 +89,6 @@
     <Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms">
       <HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.12.111071459\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.PowerShell.Commands.Utility, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\WINDOWS\Microsoft.NET\assembly\GAC_MSIL\Microsoft.PowerShell.Commands.Utility\v4.0_3.0.0.0__31bf3856ad364e35\Microsoft.PowerShell.Commands.Utility.dll</HintPath>
-    </Reference>
     <Reference Include="Microsoft.Threading.Tasks">
       <HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
     </Reference>

src/ServiceManagement/RemoteApp/Commands.RemoteApp/Commands.RemoteApp.csproj

@@ -241,9 +241,18 @@
     <value>No usage found for the requested period.</value>
   </data>
   <data name="DownloadingUsageDetails" xml:space="preserve">
-    <value>Retrieving UsageDetails</value>
+    <value>Retrieving usage details</value>
+  </data>
+  <data name="RequestFailed" xml:space="preserve">
+    <value>The request failed.</value>
+  </data>
+  <data name="RequestSuccessful" xml:space="preserve">
+    <value>The request completed successfully.</value>
+  </data>
+  <data name="VNetTimeout" xml:space="preserve">
+    <value>The request took too long to complete.</value>
   </data>
   <data name="UsageDetails" xml:space="preserve">
-    <value>Get UsageDetails</value>
+    <value>Get usage details</value>
   </data>
 </root>