[DataFactory] Add Encryption To Factory object

eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt

@@ -3,12 +3,12 @@ AutoRest installed successfully.
 Commencing code generation
 Generating CSharp code
 Executing AutoRest command
-cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/datafactory/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --tag=package-2018-06 --csharp-sdks-folder=D:\Projects\azure-sdk-for-net\sdk
-2020-11-18 07:45:56 UTC
+cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/datafactory/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --tag=package-2018-06 --csharp-sdks-folder=D:\Git\Swagger\azure-sdk-for-net\sdk
+2020-12-04 19:24:25 UTC
 Azure-rest-api-specs repository information
 GitHub fork: Azure
 Branch:      master
-Commit:      146aefa430221f1dba5befb2d8dad17b8e4c88b7
+Commit:      7184ee0b5506063fd3c800cc2e08f31ca88333e6
 AutoRest information
 Requested version: v2
 Bootstrapper version:    autorest@2.0.4413

sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog for the Azure Data Factory V2 .NET SDK
 
+## Version 4.14.0
+###  Feature Additions
+- Added encryption property for Customer Managed Key
+
 ## Version 4.13.0
 ###  Feature Additions
 - Added publicNetworkAccess property to datafactory

sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj

@@ -5,18 +5,12 @@
   <PropertyGroup>
     <PackageId>Microsoft.Azure.Management.DataFactory</PackageId>
     <Description>Azure Data Factory V2 is the data integration platform that goes beyond Azure Data Factory V1's orchestration and batch-processing of time-series data, with a general purpose app model supporting modern data warehousing patterns and scenarios, lift-and-shift SSIS, and data-driven SaaS applications. Compose and manage reliable and secure data integration workflows at scale. Use native ADF data connectors and Integration Runtimes to move and transform cloud and on-premises data that can be unstructured, semi-structured, and structured with Hadoop, Azure Data Lake, Spark, SQL Server, Cosmos DB and many other data platforms.</Description>
-    <Version>4.13.0</Version>
+    <Version>4.14.0</Version>
     <AssemblyName>Microsoft.Azure.Management.DataFactory</AssemblyName>
     <PackageTags>Microsoft Azure resource management;Data Factory;ADF;</PackageTags>
     <PackageReleaseNotes>
   <![CDATA[
-- Added publicNetworkAccess property to datafactory
-- Added logSettings property into CopyActivity
-- Added connectionProperties property into Concur linkedService
-- Added authenticationType and sessionToken properties into AmazonS3 linkedService
-- Added support for more frequency types for TumblingWindowTrigger
-- Set computeType, coreCount to object type to allow expressions
-- Change property PartitionOption type to object for NetezzaSource, OracleSource, SapHanaSource, SapTableSource, SqlDWSource, SqlMISource, SqlServerSource, SqlSource, TeradataSource. 
+- Added encryption property for Customer Managed Key 
   ]]></PackageReleaseNotes>
   </PropertyGroup>
   <PropertyGroup>

sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs

@@ -6,8 +6,8 @@
 
 [assembly: AssemblyTitle("Microsoft Azure Data Factory Management Library")]
 [assembly: AssemblyDescription("Provides management functionality for Microsoft Azure Data Factory Resources.")]
-[assembly: AssemblyVersion("4.13.0.0")]
-[assembly: AssemblyFileVersion("4.13.0.0")]
+[assembly: AssemblyVersion("4.14.0.0")]
+[assembly: AssemblyFileVersion("4.14.0.0")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Microsoft")]
 [assembly: AssemblyProduct("Microsoft Azure .NET SDK")]

sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/ScenarioTests/DataFactoryScenarioTests.cs

@@ -17,7 +17,7 @@ namespace DataFactory.Tests.ScenarioTests
 {
     public class DataFactoryScenarioTests : ScenarioTestBase<DataFactoryScenarioTests>
     {
-        public Factory expectedFactory = new Factory(location: FactoryLocation, publicNetworkAccess: "true");
+        public Factory expectedFactory = new Factory(location: FactoryLocation, publicNetworkAccess: "true", encryption: new EncryptionConfiguration() { VaultBaseUrl = "dummyurl", KeyName = "dummyName" });
 
         [Fact]
         [Trait(TraitName.TestType, TestType.Scenario)]
@@ -42,6 +42,7 @@ internal static async Task Create(DataFactoryManagementClient client, string res
             AzureOperationResponse<Factory> createResponse = await client.Factories.CreateOrUpdateWithHttpMessagesAsync(resourceGroupName, dataFactoryName, expectedFactory);
             ValidateFactory(createResponse.Body, dataFactoryName);
             Assert.Equal(createResponse.Body.PublicNetworkAccess, expectedFactory.PublicNetworkAccess);
+            Assert.Equal(createResponse.Body?.Encryption?.VaultBaseUrl, expectedFactory.Encryption?.VaultBaseUrl);
             Assert.Equal(HttpStatusCode.OK, createResponse.Response.StatusCode);
 
             AzureOperationResponse<Factory> getResponse = await client.Factories.GetWithHttpMessagesAsync(resourceGroupName, dataFactoryName);