diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CMKIdentityDefinition.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CMKIdentityDefinition.cs
new file mode 100644
index 000000000000..c9eabb262a4e
--- /dev/null
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CMKIdentityDefinition.cs
@@ -0,0 +1,53 @@
+//
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is
+// regenerated.
+//
+
+namespace Microsoft.Azure.Management.DataFactory.Models
+{
+ using Newtonsoft.Json;
+ using System.Linq;
+
+ ///
+ /// Managed Identity used for CMK.
+ ///
+ public partial class CMKIdentityDefinition
+ {
+ ///
+ /// Initializes a new instance of the CMKIdentityDefinition class.
+ ///
+ public CMKIdentityDefinition()
+ {
+ CustomInit();
+ }
+
+ ///
+ /// Initializes a new instance of the CMKIdentityDefinition class.
+ ///
+ /// The resource id of the user
+ /// assigned identity to authenticate to customer's key vault.
+ public CMKIdentityDefinition(string userAssignedIdentity = default(string))
+ {
+ UserAssignedIdentity = userAssignedIdentity;
+ CustomInit();
+ }
+
+ ///
+ /// An initialization method that performs custom operations like setting defaults
+ ///
+ partial void CustomInit();
+
+ ///
+ /// Gets or sets the resource id of the user assigned identity to
+ /// authenticate to customer's key vault.
+ ///
+ [JsonProperty(PropertyName = "userAssignedIdentity")]
+ public string UserAssignedIdentity { get; set; }
+
+ }
+}
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/EncryptionConfiguration.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/EncryptionConfiguration.cs
new file mode 100644
index 000000000000..7a9910e6bb19
--- /dev/null
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/EncryptionConfiguration.cs
@@ -0,0 +1,102 @@
+//
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is
+// regenerated.
+//
+
+namespace Microsoft.Azure.Management.DataFactory.Models
+{
+ using Microsoft.Rest;
+ using Newtonsoft.Json;
+ using System.Linq;
+
+ ///
+ /// Definition of CMK for the factory.
+ ///
+ public partial class EncryptionConfiguration
+ {
+ ///
+ /// Initializes a new instance of the EncryptionConfiguration class.
+ ///
+ public EncryptionConfiguration()
+ {
+ CustomInit();
+ }
+
+ ///
+ /// Initializes a new instance of the EncryptionConfiguration class.
+ ///
+ /// The name of the key in Azure Key Vault to use
+ /// as Customer Managed Key.
+ /// The url of the Azure Key Vault used for
+ /// CMK.
+ /// The version of the key used for CMK. If
+ /// not provided, latest version will be used.
+ /// User assigned identity to use to
+ /// authenticate to customer's key vault. If not provided Managed
+ /// Service Identity will be used.
+ public EncryptionConfiguration(string keyName, string vaultBaseUrl, string keyVersion = default(string), CMKIdentityDefinition identity = default(CMKIdentityDefinition))
+ {
+ KeyName = keyName;
+ VaultBaseUrl = vaultBaseUrl;
+ KeyVersion = keyVersion;
+ Identity = identity;
+ CustomInit();
+ }
+
+ ///
+ /// An initialization method that performs custom operations like setting defaults
+ ///
+ partial void CustomInit();
+
+ ///
+ /// Gets or sets the name of the key in Azure Key Vault to use as
+ /// Customer Managed Key.
+ ///
+ [JsonProperty(PropertyName = "keyName")]
+ public string KeyName { get; set; }
+
+ ///
+ /// Gets or sets the url of the Azure Key Vault used for CMK.
+ ///
+ [JsonProperty(PropertyName = "vaultBaseUrl")]
+ public string VaultBaseUrl { get; set; }
+
+ ///
+ /// Gets or sets the version of the key used for CMK. If not provided,
+ /// latest version will be used.
+ ///
+ [JsonProperty(PropertyName = "keyVersion")]
+ public string KeyVersion { get; set; }
+
+ ///
+ /// Gets or sets user assigned identity to use to authenticate to
+ /// customer's key vault. If not provided Managed Service Identity will
+ /// be used.
+ ///
+ [JsonProperty(PropertyName = "identity")]
+ public CMKIdentityDefinition Identity { get; set; }
+
+ ///
+ /// Validate the object.
+ ///
+ ///
+ /// Thrown if validation fails
+ ///
+ public virtual void Validate()
+ {
+ if (KeyName == null)
+ {
+ throw new ValidationException(ValidationRules.CannotBeNull, "KeyName");
+ }
+ if (VaultBaseUrl == null)
+ {
+ throw new ValidationException(ValidationRules.CannotBeNull, "VaultBaseUrl");
+ }
+ }
+ }
+}
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Factory.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Factory.cs
index e0db13ba3602..d85ff38d01f8 100644
--- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Factory.cs
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Factory.cs
@@ -53,10 +53,12 @@ public Factory()
/// factory.
/// List of parameters for
/// factory.
+ /// Properties to enable Customer Managed Key
+ /// for the factory.
/// Whether or not public network
/// access is allowed for the data factory. Possible values include:
/// 'Enabled', 'Disabled'
- public Factory(string id = default(string), string name = default(string), string type = default(string), string location = default(string), IDictionary tags = default(IDictionary), string eTag = default(string), IDictionary additionalProperties = default(IDictionary), FactoryIdentity identity = default(FactoryIdentity), string provisioningState = default(string), System.DateTime? createTime = default(System.DateTime?), string version = default(string), FactoryRepoConfiguration repoConfiguration = default(FactoryRepoConfiguration), IDictionary globalParameters = default(IDictionary), string publicNetworkAccess = default(string))
+ public Factory(string id = default(string), string name = default(string), string type = default(string), string location = default(string), IDictionary tags = default(IDictionary), string eTag = default(string), IDictionary additionalProperties = default(IDictionary), FactoryIdentity identity = default(FactoryIdentity), string provisioningState = default(string), System.DateTime? createTime = default(System.DateTime?), string version = default(string), FactoryRepoConfiguration repoConfiguration = default(FactoryRepoConfiguration), IDictionary globalParameters = default(IDictionary), EncryptionConfiguration encryption = default(EncryptionConfiguration), string publicNetworkAccess = default(string))
: base(id, name, type, location, tags, eTag)
{
AdditionalProperties = additionalProperties;
@@ -66,6 +68,7 @@ public Factory()
Version = version;
RepoConfiguration = repoConfiguration;
GlobalParameters = globalParameters;
+ Encryption = encryption;
PublicNetworkAccess = publicNetworkAccess;
CustomInit();
}
@@ -118,6 +121,13 @@ public Factory()
[JsonProperty(PropertyName = "properties.globalParameters")]
public IDictionary GlobalParameters { get; set; }
+ ///
+ /// Gets or sets properties to enable Customer Managed Key for the
+ /// factory.
+ ///
+ [JsonProperty(PropertyName = "properties.encryption")]
+ public EncryptionConfiguration Encryption { get; set; }
+
///
/// Gets or sets whether or not public network access is allowed for
/// the data factory. Possible values include: 'Enabled', 'Disabled'
@@ -147,6 +157,10 @@ public virtual void Validate()
}
}
}
+ if (Encryption != null)
+ {
+ Encryption.Validate();
+ }
}
}
}
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FactoryIdentity.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FactoryIdentity.cs
index 7c8c93879118..40f4a1195d4e 100644
--- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FactoryIdentity.cs
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FactoryIdentity.cs
@@ -11,6 +11,8 @@
namespace Microsoft.Azure.Management.DataFactory.Models
{
using Newtonsoft.Json;
+ using System.Collections;
+ using System.Collections.Generic;
using System.Linq;
///
@@ -32,10 +34,13 @@ public FactoryIdentity()
/// The principal id of the identity.
/// The client tenant id of the
/// identity.
- public FactoryIdentity(System.Guid? principalId = default(System.Guid?), System.Guid? tenantId = default(System.Guid?))
+ /// List of user assigned
+ /// identities for the factory.
+ public FactoryIdentity(System.Guid? principalId = default(System.Guid?), System.Guid? tenantId = default(System.Guid?), IDictionary userAssignedIdentities = default(IDictionary))
{
PrincipalId = principalId;
TenantId = tenantId;
+ UserAssignedIdentities = userAssignedIdentities;
CustomInit();
}
///
@@ -64,8 +69,13 @@ static FactoryIdentity()
public System.Guid? TenantId { get; private set; }
///
- /// The identity type. Currently the only supported type is
- /// 'SystemAssigned'.
+ /// Gets or sets list of user assigned identities for the factory.
+ ///
+ [JsonProperty(PropertyName = "userAssignedIdentities")]
+ public IDictionary UserAssignedIdentities { get; set; }
+
+ ///
+ /// The identity type.
///
[JsonProperty(PropertyName = "type")]
public static string Type { get; private set; }
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SSISPackageLocation.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SSISPackageLocation.cs
new file mode 100644
index 000000000000..0c6083576c94
--- /dev/null
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SSISPackageLocation.cs
@@ -0,0 +1,169 @@
+//
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is
+// regenerated.
+//
+
+namespace Microsoft.Azure.Management.DataFactory.Models
+{
+ using Microsoft.Rest;
+ using Microsoft.Rest.Serialization;
+ using Newtonsoft.Json;
+ using System.Collections;
+ using System.Collections.Generic;
+ using System.Linq;
+
+ ///
+ /// SSIS package location.
+ ///
+ [Rest.Serialization.JsonTransformation]
+ public partial class SSISPackageLocation
+ {
+ ///
+ /// Initializes a new instance of the SSISPackageLocation class.
+ ///
+ public SSISPackageLocation()
+ {
+ CustomInit();
+ }
+
+ ///
+ /// Initializes a new instance of the SSISPackageLocation class.
+ ///
+ /// The SSIS package path. Type: string (or
+ /// Expression with resultType string).
+ /// The type of SSIS package location. Possible
+ /// values include: 'SSISDB', 'File', 'InlinePackage',
+ /// 'PackageStore'
+ /// Password of the package.
+ /// The package access
+ /// credential.
+ /// The configuration file of the
+ /// package execution. Type: string (or Expression with resultType
+ /// string).
+ /// The configuration file
+ /// access credential.
+ /// The package name.
+ /// The embedded package content. Type:
+ /// string (or Expression with resultType string).
+ /// The embedded package last
+ /// modified date.
+ /// The embedded child package
+ /// list.
+ public SSISPackageLocation(object packagePath = default(object), string type = default(string), SecretBase packagePassword = default(SecretBase), SSISAccessCredential accessCredential = default(SSISAccessCredential), object configurationPath = default(object), SSISAccessCredential configurationAccessCredential = default(SSISAccessCredential), string packageName = default(string), object packageContent = default(object), string packageLastModifiedDate = default(string), IList childPackages = default(IList))
+ {
+ PackagePath = packagePath;
+ Type = type;
+ PackagePassword = packagePassword;
+ AccessCredential = accessCredential;
+ ConfigurationPath = configurationPath;
+ ConfigurationAccessCredential = configurationAccessCredential;
+ PackageName = packageName;
+ PackageContent = packageContent;
+ PackageLastModifiedDate = packageLastModifiedDate;
+ ChildPackages = childPackages;
+ CustomInit();
+ }
+
+ ///
+ /// An initialization method that performs custom operations like setting defaults
+ ///
+ partial void CustomInit();
+
+ ///
+ /// Gets or sets the SSIS package path. Type: string (or Expression
+ /// with resultType string).
+ ///
+ [JsonProperty(PropertyName = "packagePath")]
+ public object PackagePath { get; set; }
+
+ ///
+ /// Gets or sets the type of SSIS package location. Possible values
+ /// include: 'SSISDB', 'File', 'InlinePackage', 'PackageStore'
+ ///
+ [JsonProperty(PropertyName = "type")]
+ public string Type { get; set; }
+
+ ///
+ /// Gets or sets password of the package.
+ ///
+ [JsonProperty(PropertyName = "typeProperties.packagePassword")]
+ public SecretBase PackagePassword { get; set; }
+
+ ///
+ /// Gets or sets the package access credential.
+ ///
+ [JsonProperty(PropertyName = "typeProperties.accessCredential")]
+ public SSISAccessCredential AccessCredential { get; set; }
+
+ ///
+ /// Gets or sets the configuration file of the package execution. Type:
+ /// string (or Expression with resultType string).
+ ///
+ [JsonProperty(PropertyName = "typeProperties.configurationPath")]
+ public object ConfigurationPath { get; set; }
+
+ ///
+ /// Gets or sets the configuration file access credential.
+ ///
+ [JsonProperty(PropertyName = "typeProperties.configurationAccessCredential")]
+ public SSISAccessCredential ConfigurationAccessCredential { get; set; }
+
+ ///
+ /// Gets or sets the package name.
+ ///
+ [JsonProperty(PropertyName = "typeProperties.packageName")]
+ public string PackageName { get; set; }
+
+ ///
+ /// Gets or sets the embedded package content. Type: string (or
+ /// Expression with resultType string).
+ ///
+ [JsonProperty(PropertyName = "typeProperties.packageContent")]
+ public object PackageContent { get; set; }
+
+ ///
+ /// Gets or sets the embedded package last modified date.
+ ///
+ [JsonProperty(PropertyName = "typeProperties.packageLastModifiedDate")]
+ public string PackageLastModifiedDate { get; set; }
+
+ ///
+ /// Gets or sets the embedded child package list.
+ ///
+ [JsonProperty(PropertyName = "typeProperties.childPackages")]
+ public IList ChildPackages { get; set; }
+
+ ///
+ /// Validate the object.
+ ///
+ ///
+ /// Thrown if validation fails
+ ///
+ public virtual void Validate()
+ {
+ if (AccessCredential != null)
+ {
+ AccessCredential.Validate();
+ }
+ if (ConfigurationAccessCredential != null)
+ {
+ ConfigurationAccessCredential.Validate();
+ }
+ if (ChildPackages != null)
+ {
+ foreach (var element in ChildPackages)
+ {
+ if (element != null)
+ {
+ element.Validate();
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/SdkInfo_DataFactoryManagementClient.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/SdkInfo_DataFactoryManagementClient.cs
index 2011a9871690..75005e8302fd 100644
--- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/SdkInfo_DataFactoryManagementClient.cs
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/SdkInfo_DataFactoryManagementClient.cs
@@ -40,16 +40,5 @@ public static IEnumerable> ApiInfo_DataFactoryMana
}.AsEnumerable();
}
}
- // BEGIN: Code Generation Metadata Section
- public static readonly String AutoRestVersion = "v2";
- public static readonly String AutoRestBootStrapperVersion = "autorest@2.0.4413";
- public static readonly String AutoRestCmdExecuted = "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";
- public static readonly String GithubForkName = "Azure";
- public static readonly String GithubBranchName = "master";
- public static readonly String GithubCommidId = "fce3400431eff281bddd04bed9727e63765b8da0";
- public static readonly String CodeGenerationErrors = "";
- public static readonly String GithubRepoName = "azure-rest-api-specs";
- // END: Code Generation Metadata Section
}
}
-