Merge pull request Azure#4023 from begoldsm/preview

Add Enable-AdlStoreKeyVault cmdlet and help

Author: cormacpayne

src/ResourceManager/DataLakeStore/AzureRM.DataLakeStore.psd1

@@ -82,6 +82,7 @@ CmdletsToExport = 'Get-AzureRmDataLakeStoreTrustedIdProvider',
                'Set-AzureRmDataLakeStoreFirewallRule', 
                'Add-AzureRmDataLakeStoreFirewallRule', 
                'Add-AzureRmDataLakeStoreItemContent', 
+               'Enable-AzureRmDataLakeStoreKeyVault', 
                'Export-AzureRmDataLakeStoreItem', 
                'Get-AzureRmDataLakeStoreChildItem', 'Get-AzureRmDataLakeStoreItem', 
                'Get-AzureRmDataLakeStoreItemAclEntry', 
@@ -112,7 +113,7 @@ AliasesToExport = 'Get-AdlStoreTrustedIdProvider', 'Remove-AdlStoreTrustedIdProv
                'Remove-AdlStoreFirewallRule', 'Set-AdlStoreTrustedIdProvider', 
                'Add-AdlStoreTrustedIdProvider', 'Get-AdlStoreFirewallRule', 
                'Set-AdlStoreFirewallRule', 'Add-AdlStoreFirewallRule', 
-               'Add-AdlStoreItemContent', 'Export-AdlStoreItem', 
+               'Add-AdlStoreItemContent', 'Export-AdlStoreItem', 'Enable-AdlStoreKeyVault',
                'Get-AdlStoreChildItem', 'Get-AdlStoreItem', 
                'Get-AdlStoreItemAclEntry', 'Get-AdlStoreItemContent', 
                'Get-AdlStoreItemOwner', 'Get-AdlStoreItemPermission', 

src/ResourceManager/DataLakeStore/Commands.DataLakeStore.Test/ScenarioTests/AdlsAliasTests.ps1

@@ -336,6 +336,11 @@ function Test-DataLakeStoreAccount
 		$accountCreated = New-AdlStore -ResourceGroupName $resourceGroupName -Name $secondAccountName -Location $location
 		Assert-True {$accountCreated.EncryptionConfig -ne $null}
 		Assert-AreEqual "ServiceManaged" $accountCreated.EncryptionConfig.Type
+		Assert-AreEqual "Enabled" $accountCreated.EncryptionState
+
+		# attempt to enable the key vault, which should throw since it is already enabled
+		Assert-Throws {Enable-AdlStoreKeyVault -ResourceGroupName $resourceGroupName -Account $secondAccountName}
+		
 
 		# Create an account with no encryption explicitly.
 		$thirdAccountName = Get-DataLakeStoreAccountName

src/ResourceManager/DataLakeStore/Commands.DataLakeStore.Test/ScenarioTests/AdlsTests.ps1

@@ -336,6 +336,11 @@ function Test-DataLakeStoreAccount
 		$accountCreated = New-AzureRMDataLakeStoreAccount -ResourceGroupName $resourceGroupName -Name $secondAccountName -Location $location
 		Assert-True {$accountCreated.EncryptionConfig -ne $null}
 		Assert-AreEqual "ServiceManaged" $accountCreated.EncryptionConfig.Type
+		Assert-AreEqual "Enabled" $accountCreated.EncryptionState
+
+		# attempt to enable the key vault, which should throw since it is already enabled
+		Assert-Throws {Enable-AzureRMDataLakeStoreKeyVault -ResourceGroupName $resourceGroupName -Account $secondAccountName}
+		
 
 		# Create an account with no encryption explicitly.
 		$thirdAccountName = Get-DataLakeStoreAccountName

src/ResourceManager/DataLakeStore/Commands.DataLakeStore.Test/SessionRecords/Microsoft.Azure.Commands.DataLakeStore.Test.ScenarioTests.AdlsAliasTests/TestAdlsAccount.json

@@ -106,6 +106,7 @@
     <Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Commands\EnableAzureRmDataLakeStoreKeyVault.cs" />
     <Compile Include="Commands\GetAzureRmDataLakeStoreTrustedIdProvider.cs" />
     <Compile Include="Commands\RemoveAzureRmDataLakeStoreTrustedIdProvider.cs" />
     <Compile Include="Commands\RemoveAzureRmDataLakeStoreFirewallRule.cs" />

src/ResourceManager/DataLakeStore/Commands.DataLakeStore.Test/SessionRecords/Microsoft.Azure.Commands.DataLakeStore.Test.ScenarioTests.AdlsAliasTests/TestAdlsFileSystem.json

@@ -0,0 +1,44 @@
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+
+using Microsoft.Azure.Commands.DataLakeStore.Models;
+using Microsoft.Azure.Commands.DataLakeStore.Properties;
+using System.Management.Automation;
+
+namespace Microsoft.Azure.Commands.DataLakeStore
+{
+    [Cmdlet(VerbsLifecycle.Enable, "AzureRmDataLakeStoreKeyVault", SupportsShouldProcess = true)]
+    [Alias("Enable-AdlStoreKeyVault")]
+    public class EnableAzureDataLakeStoreKeyVault : DataLakeStoreCmdletBase
+    {
+        [Parameter(ValueFromPipelineByPropertyName = true, Position = 0, Mandatory = true,
+            HelpMessage = "The Data Lake Store account to enable the Key Vault for")]
+        [ValidateNotNullOrEmpty]
+        [Alias("AccountName","Name")]
+        public string Account { get; set; }
+
+        [Parameter(ValueFromPipelineByPropertyName = true, Mandatory = false,
+            HelpMessage = "Name of resource group associated with the account.")]
+        [ValidateNotNullOrEmpty]
+        public string ResourceGroupName { get; set; }
+
+        public override void ExecuteCmdlet()
+        {
+            ConfirmAction(
+                string.Format(Resources.EnableKeyVault, Account),
+                Account,
+                () => DataLakeStoreClient.EnableKeyVault(ResourceGroupName, Account));
+        }
+    }
+}

src/ResourceManager/DataLakeStore/Commands.DataLakeStore.Test/SessionRecords/Microsoft.Azure.Commands.DataLakeStore.Test.ScenarioTests.AdlsTests/TestAdlsAccount.json

@@ -192,6 +192,17 @@ public DataLakeStoreAccount GetAccount(string resourceGroupName, string accountN
 
             return _client.Account.Get(resourceGroupName, accountName);
         }
+
+        public void EnableKeyVault(string resourceGroupName, string accountName)
+        {
+            if (string.IsNullOrEmpty(resourceGroupName))
+            {
+                resourceGroupName = GetResourceGroupByAccount(accountName);
+            }
+
+            _client.Account.EnableKeyVault(resourceGroupName, accountName);
+        }
+
         public FirewallRule AddOrUpdateFirewallRule(string resourceGroupName, string accountName, string ruleName, string startIp, string endIp, Cmdlet runningCommand)
         {
             if (string.IsNullOrEmpty(resourceGroupName))

src/ResourceManager/DataLakeStore/Commands.DataLakeStore.Test/SessionRecords/Microsoft.Azure.Commands.DataLakeStore.Test.ScenarioTests.AdlsTests/TestAdlsFileSystem.json

@@ -141,6 +141,9 @@
   <data name="DownloadFileDataMessage" xml:space="preserve">
     <value>Download file data</value>
   </data>
+  <data name="EnableKeyVault" xml:space="preserve">
+    <value>Enabling user supplied KeyVault to the Data Lake Store Account: '{0}' ...</value>
+  </data>
   <data name="FailedToDiscoverResourceGroup" xml:space="preserve">
     <value>Could not find account: '{0}' in any resource group in the currently selected subscription: {1}. Please ensure this account exists and that the current user has access to it.</value>
   </data>

src/ResourceManager/DataLakeStore/Commands.DataLakeStore/Commands.DataLakeStore.csproj

@@ -20,6 +20,9 @@ Adds content to an item in a Data Lake Store.
 ### [Add-AzureRmDataLakeStoreTrustedIdProvider](Add-AzureRmDataLakeStoreTrustedIdProvider.md)
 Adds a trusted identity provider to the specified Data Lake Store account.
 
+### [Enable-AzureRmDataLakeStoreKeyVault](Enable-AzureRmDataLakeStoreKeyVault.md)
+Attempts to enable a user managed Key Vault for encryption of the specified Data Lake Store account.
+
 ### [Export-AzureRmDataLakeStoreItem](Export-AzureRmDataLakeStoreItem.md)
 Downloads a file from Data Lake Store.
 

src/ResourceManager/DataLakeStore/Commands.DataLakeStore/Commands/EnableAzureRmDataLakeStoreKeyVault.cs

@@ -0,0 +1,109 @@
+---
+external help file: Microsoft.Azure.Commands.DataLakeStore.dll-Help.xml
+online version: 
+schema: 2.0.0
+---
+
+# Enable-AzureRmDataLakeStoreKeyVault
+
+## SYNOPSIS
+Attempts to enable a user managed Key Vault for encryption of the specified Data Lake Store account.
+
+## SYNTAX
+
+```
+Enable-AzureRmDataLakeStoreKeyVault [-Account] <String> [-ResourceGroupName <String>] [-WhatIf] [-Confirm]
+ [<CommonParameters>]
+```
+
+## DESCRIPTION
+The **Enable-AzureRmDataLakeStoreKeyVault** cmdlet attempts to enable a user managed Key Vault for encryption of the specified Data Lake Store account.
+
+## EXAMPLES
+
+### Example 1: Enable the Key Vault for the ContosoADLS account
+```
+PS C:\>Enable-AzureRmDataLakeStoreKeyVault -Name "ContosoADLS"
+```
+
+This command attempts to enable the user managed Key Vault for the Data Lake Store account named ContosoADLS.
+
+## PARAMETERS
+
+### -Account
+The Data Lake Store account to enable the user managed Key Vault for
+
+```yaml
+Type: String
+Parameter Sets: (All)
+Aliases: AccountName, Name
+
+Required: True
+Position: 0
+Default value: None
+Accept pipeline input: True (ByPropertyName)
+Accept wildcard characters: False
+```
+
+### -ResourceGroupName
+Name of resource group associated with the account. If not specified will attempt to be discovered.
+
+```yaml
+Type: String
+Parameter Sets: (All)
+Aliases: 
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: True (ByPropertyName)
+Accept wildcard characters: False
+```
+
+### -Confirm
+Prompts you for confirmation before running the cmdlet.
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases: cf
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -WhatIf
+Shows what would happen if the cmdlet runs. The cmdlet is not run.
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases: wi
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### CommonParameters
+This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see about_CommonParameters (http://go.microsoft.com/fwlink/?LinkID=113216).
+
+## INPUTS
+
+### System.String
+
+## OUTPUTS
+
+## NOTES
+
+## RELATED LINKS
+
+[New-AzureRmDataLakeStoreAccount](./New-AzureRmDataLakeStoreAccount.md)
+
+[Set-AzureRmDataLakeStoreAccount](./Set-AzureRmDataLakeStoreAccount.md)
+

src/ResourceManager/DataLakeStore/Commands.DataLakeStore/Models/DataLakeStoreClient.cs

@@ -21,13 +21,13 @@ Get-AzureRmDataLakeStoreItemContent [-Account] <String> [-Path] <DataLakeStorePa
 
 ### Preview file rows from the head of the file
 ```
-Get-AzureRmDataLakeStoreItemContent [-Account] <String> [-Path] <DataLakeStorePathInstance> [-Head <Int32>]
+Get-AzureRmDataLakeStoreItemContent [-Account] <String> [-Path] <DataLakeStorePathInstance> [[-Head] <Int32>]
  [[-Encoding] <FileSystemCmdletProviderEncoding>] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ### Preview file rows from the tail of the file
 ```
-Get-AzureRmDataLakeStoreItemContent [-Account] <String> [-Path] <DataLakeStorePathInstance> [-Tail <Int32>]
+Get-AzureRmDataLakeStoreItemContent [-Account] <String> [-Path] <DataLakeStorePathInstance> [[-Tail] <Int32>]
  [[-Encoding] <FileSystemCmdletProviderEncoding>] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
@@ -118,7 +118,7 @@ Parameter Sets: Preview file rows from the head of the file
 Aliases: 
 
 Required: False
-Position: Named
+Position: 2
 Default value: None
 Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False
@@ -176,7 +176,7 @@ Parameter Sets: Preview file rows from the tail of the file
 Aliases: 
 
 Required: False
-Position: Named
+Position: 2
 Default value: None
 Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False