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 9a3ef89d1f7c..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,7 +53,12 @@ public Factory() /// factory. /// List of parameters for /// factory. - 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)) + /// 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), EncryptionConfiguration encryption = default(EncryptionConfiguration), string publicNetworkAccess = default(string)) : base(id, name, type, location, tags, eTag) { AdditionalProperties = additionalProperties; @@ -63,6 +68,8 @@ public Factory() Version = version; RepoConfiguration = repoConfiguration; GlobalParameters = globalParameters; + Encryption = encryption; + PublicNetworkAccess = publicNetworkAccess; CustomInit(); } @@ -114,6 +121,20 @@ 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' + /// + [JsonProperty(PropertyName = "properties.publicNetworkAccess")] + public string PublicNetworkAccess { get; set; } + /// /// Validate the object. /// @@ -136,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..3841a9224438 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; /// @@ -29,28 +31,35 @@ public FactoryIdentity() /// /// Initializes a new instance of the FactoryIdentity class. /// + /// The identity type. Possible values include: + /// 'SystemAssigned', 'UserAssigned', + /// 'SystemAssigned,UserAssigned' /// 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(string type = default(string), System.Guid? principalId = default(System.Guid?), System.Guid? tenantId = default(System.Guid?), IDictionary userAssignedIdentities = default(IDictionary)) { + Type = type; PrincipalId = principalId; TenantId = tenantId; + UserAssignedIdentities = userAssignedIdentities; CustomInit(); } - /// - /// Static constructor for FactoryIdentity class. - /// - static FactoryIdentity() - { - Type = "SystemAssigned"; - } /// /// An initialization method that performs custom operations like setting defaults /// partial void CustomInit(); + /// + /// Gets or sets the identity type. Possible values include: + /// 'SystemAssigned', 'UserAssigned', 'SystemAssigned,UserAssigned' + /// + [JsonProperty(PropertyName = "type")] + public string Type { get; set; } + /// /// Gets the principal id of the identity. /// @@ -64,11 +73,10 @@ 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 = "type")] - public static string Type { get; private set; } + [JsonProperty(PropertyName = "userAssignedIdentities")] + public IDictionary UserAssignedIdentities { get; set; } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FactoryIdentityType.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FactoryIdentityType.cs new file mode 100644 index 000000000000..242d410d0011 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FactoryIdentityType.cs @@ -0,0 +1,23 @@ +// +// 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 +{ + + /// + /// Defines values for FactoryIdentityType. + /// + public static class FactoryIdentityType + { + public const string SystemAssigned = "SystemAssigned"; + public const string UserAssigned = "UserAssigned"; + public const string SystemAssignedUserAssigned = "SystemAssigned,UserAssigned"; + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PublicNetworkAccess.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PublicNetworkAccess.cs new file mode 100644 index 000000000000..384def984483 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PublicNetworkAccess.cs @@ -0,0 +1,22 @@ +// +// 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 +{ + + /// + /// Defines values for PublicNetworkAccess. + /// + public static class PublicNetworkAccess + { + public const string Enabled = "Enabled"; + public const string Disabled = "Disabled"; + } +} 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 similarity index 100% rename from sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SsisPackageLocation.cs rename to sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SSISPackageLocation.cs 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 } } -