[Storage] Support encryption context property when creating a datalakegen2 item

src/Storage/Storage.Management.Test/Storage.Management.Test.csproj

@@ -11,10 +11,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Azure.Storage.Blobs" Version="12.16.0" />
-    <PackageReference Include="Azure.Storage.Files.DataLake" Version="12.14.0" />
-    <PackageReference Include="Azure.Storage.Files.Shares" Version="12.14.0" />
-    <PackageReference Include="Azure.Storage.Queues" Version="12.14.0" />
+    <PackageReference Include="Azure.Storage.Blobs" Version="12.17.0" />
+    <PackageReference Include="Azure.Storage.Files.DataLake" Version="12.15.0" />
+    <PackageReference Include="Azure.Storage.Files.Shares" Version="12.15.0" />
+    <PackageReference Include="Azure.Storage.Queues" Version="12.15.0" />
   </ItemGroup>
 
   <ItemGroup>

src/Storage/Storage.Management/ChangeLog.md

@@ -19,6 +19,9 @@
 -->
 ## Upcoming Release
 * Updated Azure.Core to 1.34.0.
+* Added support for encryption context 
+    - `New-AzDataLakeGen2Item`
+
 
 ## Version 5.9.0
 * Supported OAuth authentication on File service cmdlets

src/Storage/Storage.Management/help/New-AzDataLakeGen2Item.md

@@ -15,9 +15,9 @@ Create a file or directory in a filesystem.
 ### File (Default)
 ```
 New-AzDataLakeGen2Item [-FileSystem] <String> [-Path] <String> -Source <String> [-Umask <String>]
- [-Permission <String>] [-Property <Hashtable>] [-Metadata <Hashtable>] [-Force] [-AsJob]
- [-Context <IStorageContext>] [-DefaultProfile <IAzureContextContainer>] [-ConcurrentTaskCount <Int32>]
- [-WhatIf] [-Confirm] [<CommonParameters>]
+ [-Permission <String>] [-EncryptionContext <String>] [-Property <Hashtable>] [-Metadata <Hashtable>] [-Force]
+ [-AsJob] [-Context <IStorageContext>] [-DefaultProfile <IAzureContextContainer>]
+ [-ConcurrentTaskCount <Int32>] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ### Directory
@@ -66,6 +66,18 @@ dir1/dir2/file1      False        14400000        2020-03-23 09:19:13Z rw-r-----
 
 This command creates(upload) a data lake file from a local source file, and the cmdlet runs in background.
 
+### Example 3: Create(upload) a data lake file from a local source file and set its encryption context 
+```powershell
+$file = New-AzDataLakeGen2Item -FileSystem "testfilesystem" -Path "dir1/dir2/file1" -Source "c:\sourcefile.txt" -EncryptionContext "encryptioncontext"
+$file.Properties.EncryptionContext
+```
+
+```output
+encryptioncontext
+```
+
+This command creates(upload) a data lake file from a local source file and sets its encryption context value to "encryptioncontext".
+
 ## PARAMETERS
 
 ### -AsJob
@@ -143,6 +155,21 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -EncryptionContext
+Encryption context of the file. Encryption context is metadata that is not encrypted when stored on the file. The primary application of this field is to store non-encrypted data that can be used to derive the customer-provided key for a file. Not applicable for directories.
+
+```yaml
+Type: System.String
+Parameter Sets: File
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -FileSystem
 FileSystem name
 

src/Storage/Storage/DatalakeGen2/Cmdlet/NewAzDataLakeGen2Item.cs

@@ -89,6 +89,10 @@ public string Source
         [ValidatePattern("([r-][w-][x-]){2}([r-][w-][xtT-])")]
         public string Permission { get; set; }
 
+        [Parameter(Mandatory = false,
+            HelpMessage = "Encryption context of the file. Encryption context is metadata that is not encrypted when stored on the file. The primary application of this field is to store non-encrypted data that can be used to derive the customer-provided key for a file. Not applicable for directories.",
+            ParameterSetName = FileParameterSet)]
+        public string EncryptionContext { get; set; }
 
         [Parameter(HelpMessage = "Specifies properties for the created directory or file. "+
             "The supported properties for file are: CacheControl, ContentDisposition, ContentEncoding, ContentLanguage, ContentMD5, ContentType." +
@@ -213,9 +217,12 @@ public override void ExecuteCmdlet()
                 DataLakeFileClient fileClient = fileSystem.GetFileClient(this.Path);
                 if (ShouldProcess(GetDataLakeItemUriWithoutSas(fileClient), "Create File: "))
                 {
-                    // Use SDK to upload directly when use SAS credential, and need set permission, since set permission after upload will fail with SAS
-                    if (Channel.StorageContext.StorageAccount != null && Channel.StorageContext.StorageAccount.Credentials != null &&
-                        Channel.StorageContext.StorageAccount.Credentials.IsSAS && (!string.IsNullOrEmpty(this.Permission) || !string.IsNullOrEmpty(this.Umask)))
+                    // Use SDK to upload directly when
+                    // 1. use SAS credential, and need set permission, since set permission after upload will fail with SAS, or 
+                    // 2. file encryption context is set by user 
+                    if ((Channel.StorageContext.StorageAccount != null && Channel.StorageContext.StorageAccount.Credentials != null &&
+                        Channel.StorageContext.StorageAccount.Credentials.IsSAS && (!string.IsNullOrEmpty(this.Permission) || !string.IsNullOrEmpty(this.Umask))) || 
+                        this.EncryptionContext != null)
                     {
                         Func<long, Task> taskGenerator = (taskId) => UploadDataLakeFile(taskId, fileClient, ResolvedFileName);
                         RunTask(taskGenerator);
@@ -271,7 +278,8 @@ await fileClient.UploadAsync(ResolvedFileName,
                         Permissions = this.Permission,
                         Umask = this.Umask != null ? DataLakeModels.PathPermissions.ParseSymbolicPermissions(this.Umask).ToOctalPermissions() : null,
                         ProgressHandler = progressHandler,
-                        HttpHeaders = pathHttpHeaders
+                        HttpHeaders = pathHttpHeaders,
+                        EncryptionContext = this.EncryptionContext 
                     },
                     this.CmdletCancellationToken).ConfigureAwait(false);
 

src/Storage/Storage/Storage.csproj

@@ -13,10 +13,10 @@
 
   <ItemGroup>
     <PackageReference Include="Azure.Data.Tables" Version="12.8.0" />
-    <PackageReference Include="Azure.Storage.Blobs" Version="12.16.0" />
-    <PackageReference Include="Azure.Storage.Files.DataLake" Version="12.14.0" />
-    <PackageReference Include="Azure.Storage.Files.Shares" Version="12.14.0" />
-    <PackageReference Include="Azure.Storage.Queues" Version="12.14.0" />
+    <PackageReference Include="Azure.Storage.Blobs" Version="12.17.0" />
+    <PackageReference Include="Azure.Storage.Files.DataLake" Version="12.15.0" />
+    <PackageReference Include="Azure.Storage.Files.Shares" Version="12.15.0" />
+    <PackageReference Include="Azure.Storage.Queues" Version="12.15.0" />
     <PackageReference Include="Microsoft.Azure.Cosmos.Table" Version="1.0.8" />
     <PackageReference Include="System.Security.Permissions" Version="4.7.0" />
     <PackageReference Include="Microsoft.Azure.Storage.Blob" Version="11.2.2" />