From e689db7e1f92dba6f4911d51f6fce97fb952857b Mon Sep 17 00:00:00 2001
From: Jingshu923 <52914166+Jingshu923@users.noreply.github.com>
Date: Thu, 4 Feb 2021 03:18:14 +0800
Subject: [PATCH] [DataFactory]Merge new features into master (#18380)
---
.../datafactory_resource-manager.txt | 4 +-
.../src/CHANGELOG.md | 10 ++
.../Models/AzureDatabricksLinkedService.cs | 49 ++++++--
.../Generated/Models/CMKIdentityDefinition.cs | 53 ++++++++
.../src/Generated/Models/CustomActivity.cs | 13 +-
.../Generated/Models/CustomEventsTrigger.cs | 118 ++++++++++++++++++
.../Models/EncryptionConfiguration.cs | 102 +++++++++++++++
.../src/Generated/Models/Factory.cs | 16 ++-
.../src/Generated/Models/FactoryIdentity.cs | 16 ++-
.../IntegrationRuntimeSsisCatalogInfo.cs | 12 +-
.../Models/ManagedIntegrationRuntime.cs | 15 ++-
.../Models/ManagedVirtualNetworkReference.cs | 81 ++++++++++++
...rosoft.Azure.Management.DataFactory.csproj | 16 +--
.../src/Properties/AssemblyInfo.cs | 4 +-
.../JsonSamples/LinkedServiceJsonSamples.cs | 21 ++++
.../tests/JsonSamples/PipelineJsonSamples.cs | 3 +-
.../tests/JsonSamples/TriggerJsonSamples.cs | 18 +++
.../ScenarioTests/DataFactoryScenarioTests.cs | 3 +-
.../IntegrationRuntimeScenarioTests.cs | 3 +-
.../DataFactoryCrud.json | 2 +-
20 files changed, 527 insertions(+), 32 deletions(-)
create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CMKIdentityDefinition.cs
create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CustomEventsTrigger.cs
create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/EncryptionConfiguration.cs
create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ManagedVirtualNetworkReference.cs
diff --git a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt
index ee4baa4227e7..4ad6dede1b6c 100644
--- a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt
+++ b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt
@@ -4,11 +4,11 @@ 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
+2021-02-02 06:19:32 UTC
Azure-rest-api-specs repository information
GitHub fork: Azure
Branch: master
-Commit: 146aefa430221f1dba5befb2d8dad17b8e4c88b7
+Commit: c40f8fafa2c9b1bc3bb81e1feea4ff715d48e00c
AutoRest information
Requested version: v2
Bootstrapper version: autorest@2.0.4413
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md
index 49055e53b72a..7169c488fe54 100644
--- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md
@@ -1,5 +1,15 @@
# Changelog for the Azure Data Factory V2 .NET SDK
+## Version 4.14.0
+### Feature Additions
+- Added encryption property for Customer Managed Key
+- Added custom events trigger definition
+- Added Policy property into Databricks linkedService
+- Added managed identity support for authentication in Databricks linkedService
+- Added admin property in Custom Activity typeProperties
+- Added dualStandbyPairName property in IntegrationRuntimeSsisCatalogInfo to support SSISDB failover
+- Added managedVirtualNetwork reference to IR
+
## Version 4.13.0
### Feature Additions
- Added publicNetworkAccess property to datafactory
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDatabricksLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDatabricksLinkedService.cs
index 76f63b301128..1a9b875cf53a 100644
--- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDatabricksLinkedService.cs
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDatabricksLinkedService.cs
@@ -40,10 +40,6 @@ public AzureDatabricksLinkedService()
/// <REGION>.azuredatabricks.net, domain
/// name of your Databricks deployment. Type: string (or Expression
/// with resultType string).
- /// Access token for databricks REST API.
- /// Refer to
- /// https://docs.azuredatabricks.net/api/latest/authentication.html.
- /// Type: string (or Expression with resultType string).
/// Unmatched properties from the
/// message are deserialized this collection
/// The integration runtime reference.
@@ -51,6 +47,16 @@ public AzureDatabricksLinkedService()
/// Parameters for linked service.
/// List of tags that can be used for
/// describing the linked service.
+ /// Access token for databricks REST API.
+ /// Refer to
+ /// https://docs.azuredatabricks.net/api/latest/authentication.html.
+ /// Type: string (or Expression with resultType string).
+ /// Required to specify MSI, if using
+ /// Workspace resource id for databricks REST API. Type: string (or
+ /// Expression with resultType string).
+ /// Workspace resource id for
+ /// databricks REST API. Type: string (or Expression with resultType
+ /// string).
/// The id of an existing interactive
/// cluster that will be used for all runs of this activity. Type:
/// string (or Expression with resultType string).
@@ -102,11 +108,16 @@ public AzureDatabricksLinkedService()
/// authentication. Credentials are encrypted using the integration
/// runtime credential manager. Type: string (or Expression with
/// resultType string).
- public AzureDatabricksLinkedService(object domain, SecretBase accessToken, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList