Changing identity parameter to a switch parameter

Author: markcowl

src/ResourceManager/Storage/Commands.Management.Storage.Test/ScenarioTests/StorageAccountTests.ps1

@@ -310,7 +310,7 @@ function Test-SetAzureRmStorageAccountKeySource
         Assert-AreEqual $sto.Encryption.Keyvaultproperties.KeyVersion $null;
         Assert-AreEqual $sto.Encryption.Keyvaultproperties.KeyVaultUri $null;
 
-		$sto = Set-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname -EnableEncryptionService File -IdentityType SystemAssigned
+		$sto = Set-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname -EnableEncryptionService File -AssignIdentity
         Assert-AreEqual $sto.StorageAccountName $stoname;
         Assert-AreEqual $sto.Sku.Name $stotype;
         Assert-AreEqual $sto.Location $loc;

src/ResourceManager/Storage/Commands.Management.Storage/StorageAccount/NewAzureStorageAccount.cs

@@ -122,9 +122,8 @@ public bool EnableHttpsTrafficOnly
 
         [Parameter(
         Mandatory = false,
-        HelpMessage = "Storage Account Identity Type.")]
-        [ValidateSet("SystemAssigned", IgnoreCase = true)]
-        public string IdentityType { get; set; }
+        HelpMessage = "Generate and assign a new Storage Account Identity for this storage account for use with key management services like Azure KeyVault.")]
+        public SwitchParameter AssignIdentity { get; set; }
 
         public override void ExecuteCmdlet()
         {
@@ -176,7 +175,7 @@ public override void ExecuteCmdlet()
                 createParameters.EnableHttpsTrafficOnly = enableHttpsTrafficOnly;
             }
 
-            if (IdentityType != null)
+            if (AssignIdentity.IsPresent)
             {
                 createParameters.Identity = new Identity();
             }

src/ResourceManager/Storage/Commands.Management.Storage/StorageAccount/SetAzureStorageAccount.cs

@@ -175,9 +175,8 @@ public string KeyVaultUri
 
         [Parameter(
         Mandatory = false,
-        HelpMessage = "Storage Account Identity Type.")]
-        [ValidateSet("SystemAssigned",IgnoreCase = true)]
-        public string IdentityType { get; set; }
+        HelpMessage = "Generate and assign a new Storage Account Identity for this storage account for use with key management services like Azure KeyVault.")]
+        public SwitchParameter AssignIdentity { get; set; }
 
         public override void ExecuteCmdlet()
         {
@@ -221,7 +220,7 @@ public override void ExecuteCmdlet()
                         updateParameters.EnableHttpsTrafficOnly = enableHttpsTrafficOnly;
                     }
 
-                    if (IdentityType != null)
+                    if (AssignIdentity.IsPresent)
                     {
                         updateParameters.Identity = new Identity();
                     }

src/ResourceManager/Storage/Commands.Management.Storage/help/New-AzureRmStorageAccount.md

@@ -16,7 +16,7 @@ Creates a Storage account.
 New-AzureRmStorageAccount [-ResourceGroupName] <String> [-Name] <String> [-SkuName] <String>
  [-Location] <String> [[-Kind] <String>] [[-AccessTier] <String>] [[-CustomDomainName] <String>]
  [[-UseSubDomain] <Boolean>] [[-EnableEncryptionService] <EncryptionSupportServiceEnum>] [[-Tag] <Hashtable>]
- [-EnableHttpsTrafficOnly <Boolean>] [-IdentityType <String>] [-InformationAction <ActionPreference>]
+ [-EnableHttpsTrafficOnly <Boolean>] [-AssignIdentity] [-InformationAction <ActionPreference>]
  [-InformationVariable <String>] [<CommonParameters>]
 ```
 
@@ -25,27 +25,28 @@ The **New-AzureRmStorageAccount** cmdlet creates an Azure Storage account.
 
 ## EXAMPLES
 
-### Example 1: Create a Storage account
+### Example 1: Create a Storage Account
 ```
 PS C:\>New-AzureRmStorageAccount -ResourceGroupName "MyResourceGroup" -AccountName "MyStorageAccount" -Location "US West" -Type "Standard_GRS"
 ```
 
 This command creates a Storage account for the resource group name MyResourceGroup.
 
-### Example 2: Create a bBlob Storage account that uses Storage Service encryptionB
+### Example 2: Create a Blob Storage account that uses Storage Service Encryption
 ```
 PS C:\>New-AzureRmStorageAccount -ResourceGroupName "MyResourceGroup" -AccountName "MyStorageAccount" -Location "US West" -SkuName "Standard_GRS" -EnableEncryptionService Blob -Kind "BlobStorage" -AccessTier Hot
 ```
 
 This command creates a Blob Storage account that uses the hot access type.
 The account has enabled Storage Service encryption on Blob Service.
 
-### Example 3: Create a Storage account that Enable Storage Service encryption on Blob and File Services, and set IdentityType to SystemAssigned.
+### Example 3: Create a Storage Account that Enables Storage Service Encryption on Blob and File Services, and Generate and Assign an Identity for Azure KeyVault.
 ```
-PS C:\>New-AzureRmStorageAccount -ResourceGroupName "MyResourceGroup" -AccountName "MyStorageAccount" -Location "US West" -SkuName "Standard_GRS" -EnableEncryptionService "Blob,File" -IdentityType SystemAssigned
+PS C:\>New-AzureRmStorageAccount -ResourceGroupName "MyResourceGroup" -AccountName "MyStorageAccount" -Location "US West" -SkuName "Standard_GRS" -EnableEncryptionService "Blob,File" -AssignIdentity
 ```
 
-This command creates a Storage account that enabled Storage Service encryption on Blob and File Services, IdentityType as SystemAssigned.
+This command creates a Storage account that enabled Storage Service encryption on Blob and File Services.  It also generates and assigns an identity that can be sued to manage 
+account keys through Azure KeyVault.
 
 ## PARAMETERS
 
@@ -69,6 +70,19 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -AssignIdentity
+Generate and assign a new Storage Account Identity for this storage account for use with key management services like Azure KeyVault.```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases: 
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -CustomDomainName
 Specifies the name of the custom domain of the Storage account.
 The default value is Storage.
@@ -114,19 +128,6 @@ Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False
 ```
 
-### -IdentityType
-Specifies Storage Account Identity Type. ```yaml
-Type: String
-Parameter Sets: (All)
-Aliases: 
-
-Required: False
-Position: Named
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
 ### -InformationAction
 Specifies how this cmdlet responds to an information event.
 

src/ResourceManager/Storage/Commands.Management.Storage/help/Set-AzureRmStorageAccount.md

@@ -18,7 +18,7 @@ Set-AzureRmStorageAccount [-ResourceGroupName] <String> [-Name] <String> [-Force
  [[-AccessTier] <String>] [[-CustomDomainName] <String>] [[-UseSubDomain] <Boolean>]
  [[-EnableEncryptionService] <EncryptionSupportServiceEnum>]
  [[-DisableEncryptionService] <EncryptionSupportServiceEnum>] [[-Tag] <Hashtable>]
- [-EnableHttpsTrafficOnly <Boolean>] [-StorageEncryption] [-IdentityType <String>]
+ [-EnableHttpsTrafficOnly <Boolean>] [-StorageEncryption] [-AssignIdentity]
  [-InformationAction <ActionPreference>] [-InformationVariable <String>] [-WhatIf] [-Confirm]
  [<CommonParameters>]
 ```
@@ -30,7 +30,7 @@ Set-AzureRmStorageAccount [-ResourceGroupName] <String> [-Name] <String> [-Force
  [[-EnableEncryptionService] <EncryptionSupportServiceEnum>]
  [[-DisableEncryptionService] <EncryptionSupportServiceEnum>] [[-Tag] <Hashtable>]
  [-EnableHttpsTrafficOnly <Boolean>] [-KeyvaultEncryption] -KeyName <String> -KeyVersion <String>
- -KeyVaultUri <String> [-IdentityType <String>] [-InformationAction <ActionPreference>]
+ -KeyVaultUri <String> [-AssignIdentity] [-InformationAction <ActionPreference>]
  [-InformationVariable <String>] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
@@ -77,7 +77,7 @@ The command sets the Access Tier value to be cool.
 
 ### Example 5: Enable encryption on Blob Services with Keyvault
 ```
-PS C:\>Set-AzureRmStorageAccount -ResourceGroupName "MyResourceGroup" -AccountName "MyStorageAccount" -IdentityType SystemAssigned
+PS C:\>Set-AzureRmStorageAccount -ResourceGroupName "MyResourceGroup" -AccountName "MyStorageAccount" -AssignIdentity
 PS C:\>$account = Get-AzureRmStorageAccount -ResourceGroupName "MyResourceGroup" -AccountName "MyStorageAccount"
 
 PS C:\>$keyVault = New-AzureRmKeyVault -VaultName "MyKeyVault" -ResourceGroupName "MyResourceGroup" -Location "EastUS2"
@@ -118,6 +118,19 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -AssignIdentity
+Generate and assign a new Storage Account Identity for this storage account for use with key management services like Azure KeyVault.```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases: 
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -CustomDomainName
 Specifies the name of the custom domain.
 
@@ -195,19 +208,6 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -IdentityType
-Specifies Storage Account Identity Type.```yaml
-Type: String
-Parameter Sets: (All)
-Aliases: 
-
-Required: False
-Position: Named
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
 ### -InformationAction
 Specifies how this cmdlet responds to an information event.