Updating command alias attributes to use spaces for resource manager

Author: markcowl

src/CLU/Commands.Common/CmdletInfoHandler.cs

@@ -64,6 +64,10 @@ protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage reques
             }
             if (ClientRequestId != null)
             {
+                if (request.Headers.Contains("x-ms-client-request-id"))
+                {
+                    request.Headers.Remove("x-ms-client-request-id");
+                }
                 request.Headers.TryAddWithoutValidation("x-ms-client-request-id", ClientRequestId);
             }
             return base.SendAsync(request, cancellationToken);

src/CLU/Commands.Common/MetricHelper.cs

@@ -111,7 +111,7 @@ private static void LogUsageEvent(AzurePSQoSEvent qos)
             {
                 var pageViewTelemetry = new PageViewTelemetry
                 {
-                    Name = qos.CommandName,
+                    Name = qos.CommandName ?? "empty",
                     Duration = qos.Duration,
                     Timestamp = qos.StartTime
                 };

src/CLU/Commands.ResourceManager.Cmdlets/Extensions/ResourceExtensions.cs

@@ -62,7 +62,6 @@ internal static PSResourceObject ToPSResourceObject(this Resource<JToken> resour
             psObject.SubscriptionId = string.IsNullOrEmpty(resource.Id) ? null : ResourceIdUtility.GetSubscriptionId(resource.Id);
             psObject.Tags = TagsHelper.GetTagsHashtables(resource.Tags);
 
-
             var objectProperties = objectDefinition.Where(kvp => kvp.Value != null).SelectManyArray(kvp => new[] { kvp.Key, kvp.Value });
 
             for(int i=0; i< objectProperties.Length; i+=2)

src/CLU/Commands.ResourceManager.Common/AzureRmCmdlet.cs

@@ -23,6 +23,8 @@
 using System.Management.Automation;
 using System.Management.Automation.Host;
 using System.Reflection;
+using System.Linq;
+using System.Globalization;
 
 namespace Microsoft.Azure.Commands.ResourceManager.Common
 {
@@ -140,9 +142,10 @@ protected override void PromptForDataCollectionProfileIfNotExists()
 
         protected override void InitializeQosEvent()
         {
+            var commandAlias = this.GetType().GetTypeInfo().GetCustomAttribute<CliCommandAliasAttribute>();
             QosEvent = new AzurePSQoSEvent()
             {
-                CommandName = this.MyInvocation?.MyCommand?.Name,
+                CommandName = commandAlias != null ? "az " + commandAlias.CommandName : this.MyInvocation?.MyCommand?.Name,
                 ModuleName = this.GetType().GetTypeInfo().Assembly.GetName().Name,
                 ModuleVersion = this.GetType().GetTypeInfo().Assembly.GetName().Version.ToString(),
                 ClientRequestId = this._clientRequestId,
@@ -151,7 +154,9 @@ protected override void InitializeQosEvent()
 
             if (this.MyInvocation != null && this.MyInvocation.BoundParameters != null)
             {
-                QosEvent.Parameters = string.Join(",", this.MyInvocation.BoundParameters.Keys);
+                QosEvent.Parameters = string.Join(" ", 
+                    this.MyInvocation.BoundParameters.Keys.Select(
+                        s => string.Format(CultureInfo.InvariantCulture, "--{0} xxx", s.ToLowerInvariant())));
             }
 
             if (this.DefaultProfile?.Context?.Account?.Id != null)

src/CLU/Microsoft.Azure.Commands.Compute/AvailabilitySets/GetAzureAvailabilitySetCommand.cs

@@ -23,7 +23,7 @@ namespace Microsoft.Azure.Commands.Compute
 {
     [Cmdlet(VerbsCommon.Get, ProfileNouns.AvailabilitySet)]
     [OutputType(typeof(PSAvailabilitySet))]
-    [CliCommandAlias("vm;availabilityset;ls")]
+    [CliCommandAlias("vm availabilityset ls")]
     public class GetAzureAvailabilitySetCommand : AvailabilitySetBaseCmdlet
     {
         [Parameter(

src/CLU/Microsoft.Azure.Commands.Compute/AvailabilitySets/NewAzureAvailabilitySetCommand.cs

@@ -23,7 +23,7 @@ namespace Microsoft.Azure.Commands.Compute
 {
     [Cmdlet(VerbsCommon.New, ProfileNouns.AvailabilitySet)]
     [OutputType(typeof(PSAvailabilitySet))]
-    [CliCommandAlias("vm;availabilityset;new")]
+    [CliCommandAlias("vm availabilityset new")]
     public class NewAzureAvailabilitySetCommand : AvailabilitySetBaseCmdlet
     {
         [Parameter(

src/CLU/Microsoft.Azure.Commands.Compute/AvailabilitySets/RemoveAzureAvailabilitySetCommand.cs

@@ -20,8 +20,8 @@
 namespace Microsoft.Azure.Commands.Compute
 {
     [Cmdlet(VerbsCommon.Remove, ProfileNouns.AvailabilitySet)]
-    [OutputType(typeof(PSOperation))]
-    [CliCommandAlias("vm;availabilityset;rm")]
+    [OutputType(typeof(void))]
+    [CliCommandAlias("vm availabilityset rm")]
     public class RemoveAzureAvailabilitySetCommand : AvailabilitySetBaseCmdlet
     {
         [Parameter(

src/CLU/Microsoft.Azure.Commands.Compute/Content/help/vhd.add.hlp

@@ -0,0 +1,39 @@
+
+Add-AzureRmVhd
+
+
+
+
+
+Command syntax
+
+az vhd add [[--resourcegroupname] <string>] [--destination] <Uri> [--localfilepath] <FileInfo> [[--numberofuploaderthreads] <Nullable`1[Int32]>] [[--baseimageuritopatch] <Uri>] [[--overwrite]] [--informationaction <ActionPreference>] [--informationvariable <string>]
+
+
+Parameters
+
+--resourcegroupname
+
+
+--destination
+
+
+--localfilepath
+
+
+--numberofuploaderthreads
+
+
+--baseimageuritopatch
+
+
+--overwrite
+
+
+--informationaction
+
+
+--informationvariable
+
+
+

src/CLU/Microsoft.Azure.Commands.Compute/Content/help/vhd.save.hlp

@@ -0,0 +1,41 @@
+
+Save-AzureRmVhd
+
+
+
+
+
+Command syntax
+
+az vhd save [--resourcegroupname] <string> [--sourceuri] <Uri> [--localfilepath] <FileInfo> [[--numberofthreads] <int>] [[--overwrite]] [--informationaction <ActionPreference>] [--informationvariable <string>]
+
+az vhd save [--storagekey] <string> [--sourceuri] <Uri> [--localfilepath] <FileInfo> [[--numberofthreads] <int>] [[--overwrite]] [--informationaction <ActionPreference>] [--informationvariable <string>]
+
+
+Parameters
+
+--resourcegroupname
+
+
+--sourceuri
+
+
+--localfilepath
+
+
+--numberofthreads
+
+
+--overwrite
+
+
+--informationaction
+
+
+--informationvariable
+
+
+--storagekey
+
+
+

src/CLU/Microsoft.Azure.Commands.Compute/Content/help/vm.accessextension.ls.hlp

@@ -0,0 +1,33 @@
+
+Get-AzureRmVMAccessExtension: Gets information about the VMAccess extension.
+
+
+The Get-AzureRmVMAccessExtension cmdlet gets information about the Virtual Machine Access (VMAccess) Virtual Machine Extension.
+
+
+Command syntax
+
+az vm accessextension ls [--resourcegroupname] <string> [--vmname] <string> [--name] <string> [[--status]] [--informationaction <ActionPreference>] [--informationvariable <string>]
+
+
+Parameters
+
+--resourcegroupname
+Specifies the name of the resource group of the virtual machine.
+
+--vmname
+Specifies the name of a virtual machine. This cmdlet gets information about VMAccess for the virtual machine that this parameter specifies.
+
+--name
+Specifies the name of the extension that this cmdlet gets.
+
+--status
+Indicates that this cmdlet gets only the instance view of the extension.
+
+--informationaction
+
+
+--informationvariable
+
+
+

src/CLU/Microsoft.Azure.Commands.Compute/Content/help/vm.accessextension.rm.hlp

@@ -0,0 +1,33 @@
+
+Remove-AzureRmVMAccessExtension: Removes the VMAccess extension from a virtual machine.
+
+
+The Remove-AzureRmVMAccessExtension cmdlet removes the Virtual Machine Access (VMAccess) Virtual Machine Extension from a virtual machine.
+
+
+Command syntax
+
+az vm accessextension rm [--resourcegroupname] <string> [--vmname] <string> [--name] <string> [--force] [--informationaction <ActionPreference>] [--informationvariable <string>]
+
+
+Parameters
+
+--resourcegroupname
+Specifies the name of the resource group of the virtual machine.
+
+--vmname
+Specifies the name of a virtual machine. This cmdlet removes VMAccess for the virtual machine that this parameter specifies.
+
+--name
+Specifies the name of the extension that this cmdlet removes.
+
+--force
+Forces the command to run without asking for user confirmation.
+
+--informationaction
+
+
+--informationvariable
+
+
+

src/CLU/Microsoft.Azure.Commands.Compute/Content/help/vm.accessextension.set.hlp

@@ -0,0 +1,42 @@
+
+Set-AzureRmVMAccessExtension: Adds the VMAccess extension to a virtual machine.
+
+
+The Set-AzureRmVMAccessExtension cmdlet adds the Virtual Machine Access (VMAccess) Virtual Machine Extension to a virtual machine. VMAccess can reset the virtual machine user name and password.
+
+
+Command syntax
+
+az vm accessextension set [--resourcegroupname] <string> [--vmname] <string> [--name] <string> [[--typehandlerversion] <string>] [[--username] <string>] [[--password] <string>] [[--location] <string>] [--informationaction <ActionPreference>] [--informationvariable <string>]
+
+
+Parameters
+
+--resourcegroupname
+Specifies the name of the resource group of the virtual machine.
+
+--vmname
+Specifies the name of a virtual machine. This cmdlet adds VMAccess for the virtual machine that this parameter specifies.
+
+--name
+Specifies the name of the extension that this cmdlet adds.
+
+--typehandlerversion
+Specifies the version of the extension to use for this virtual machine. To obtain the version, run the Get-AzureRmVMExtensionImage cmdlet with a value of Microsoft.Compute for the PublisherName parameter and VMAccessAgent for the Type parameter.
+
+--username
+Specifies the new user name for the virtual machine.
+
+--password
+Specifies the new password of the virtual machine.
+
+--location
+Specifies the location of the virtual machine.
+
+--informationaction
+
+
+--informationvariable
+
+
+

src/CLU/Microsoft.Azure.Commands.Compute/Content/help/vm.additional.unattend.content.add.hlp

@@ -0,0 +1,32 @@
+
+Add-AzureRmVMAdditionalUnattendContent: Adds information to the unattended Windows Setup answer file.
+
+
+The Add-AzureRmVMAdditionalUnattendContent cmdlet adds information to the unattended Windows Setup answer file. Specify additional base 64 encoded XML formatted information that this cmdlet adds to the unattend.xml file.
+
+
+Command syntax
+
+az vm additional unattend content add [--vm] <PSVirtualMachine> [[--content] <string>] [[--settingname] <string>] [--informationaction <ActionPreference>] [--informationvariable <string>]
+
+
+Parameters
+
+--vm
+Specifies the virtual machine object that this cmdlet modifies. To obtain a virtual machine object, use the Get-AzureRmVM cmdlet. Create a virtual machine object by using the New-AzureRmVMConfig cmdlet.
+
+--content
+Specifies base 64 encoded XML formatted content. This cmdlet adds the content to the unattend.xml file. The XML content must be less than 4 KB and must include the root element for the setting or feature that this cmdlet inserts.
+
+--settingname
+Specifies the name of the setting to which the content applies. Valid values are: 
+-- FirstLogonCommands
+-- AutoLogon
+
+--informationaction
+
+
+--informationvariable
+
+
+

src/CLU/Microsoft.Azure.Commands.Compute/Content/help/vm.availabilityset.ls.hlp

@@ -0,0 +1,27 @@
+
+Get-AzureRmAvailabilitySet: Gets Azure availability sets in a resource group.
+
+
+The Get-AzureRmAvailabilitySet cmdlet gets Azure availability sets in a resource group. Specify the name of a specific availability set to get.
+
+
+Command syntax
+
+az vm availabilityset ls [--resourcegroupname] <string> [[--name] <string>] [--informationaction <ActionPreference>] [--informationvariable <string>]
+
+
+Parameters
+
+--resourcegroupname
+Specifies the name of a resource group.
+
+--name
+Specifies the name of an availability set to get.
+
+--informationaction
+
+
+--informationvariable
+
+
+

src/CLU/Microsoft.Azure.Commands.Compute/Content/help/vm.availabilityset.new.hlp

@@ -0,0 +1,36 @@
+
+New-AzureRmAvailabilitySet: Creates an Azure availability set.
+
+
+The New-AzureRmAvailabilitySet cmdlet creates an Azure availability set.
+
+
+Command syntax
+
+az vm availabilityset new [--resourcegroupname] <string> [--name] <string> [--location] <string> [[--platformupdatedomaincount] <Nullable`1[Int32]>] [[--platformfaultdomaincount] <Nullable`1[Int32]>] [--informationaction <ActionPreference>] [--informationvariable <string>]
+
+
+Parameters
+
+--resourcegroupname
+Specifies the name of a resource group.
+
+--name
+Specifies a name for the availability set.
+
+--location
+Specifies the location for the availability set.
+
+--platformupdatedomaincount
+Specifies the platform update domain count.
+
+--platformfaultdomaincount
+Specifies the platform fault domain count.
+
+--informationaction
+
+
+--informationvariable
+
+
+