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 annotations = default(IList), object existingClusterId = default(object), object instancePoolId = default(object), object newClusterVersion = default(object), object newClusterNumOfWorker = default(object), object newClusterNodeType = default(object), IDictionary newClusterSparkConf = default(IDictionary), IDictionary newClusterSparkEnvVars = default(IDictionary), IDictionary newClusterCustomTags = default(IDictionary), object newClusterLogDestination = default(object), object newClusterDriverNodeType = default(object), object newClusterInitScripts = default(object), object newClusterEnableElasticDisk = default(object), object encryptedCredential = default(object)) + /// The policy id for limiting the ability to + /// configure clusters based on a user defined set of rules. Type: + /// string (or Expression with resultType string). + public AzureDatabricksLinkedService(object domain, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), SecretBase accessToken = default(SecretBase), object authentication = default(object), object workspaceResourceId = default(object), object existingClusterId = default(object), object instancePoolId = default(object), object newClusterVersion = default(object), object newClusterNumOfWorker = default(object), object newClusterNodeType = default(object), IDictionary newClusterSparkConf = default(IDictionary), IDictionary newClusterSparkEnvVars = default(IDictionary), IDictionary newClusterCustomTags = default(IDictionary), object newClusterLogDestination = default(object), object newClusterDriverNodeType = default(object), object newClusterInitScripts = default(object), object newClusterEnableElasticDisk = default(object), object encryptedCredential = default(object), object policyId = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { Domain = domain; AccessToken = accessToken; + Authentication = authentication; + WorkspaceResourceId = workspaceResourceId; ExistingClusterId = existingClusterId; InstancePoolId = instancePoolId; NewClusterVersion = newClusterVersion; @@ -120,6 +131,7 @@ public AzureDatabricksLinkedService() NewClusterInitScripts = newClusterInitScripts; NewClusterEnableElasticDisk = newClusterEnableElasticDisk; EncryptedCredential = encryptedCredential; + PolicyId = policyId; CustomInit(); } @@ -144,6 +156,21 @@ public AzureDatabricksLinkedService() [JsonProperty(PropertyName = "typeProperties.accessToken")] public SecretBase AccessToken { get; set; } + /// + /// Gets or sets required to specify MSI, if using Workspace resource + /// id for databricks REST API. Type: string (or Expression with + /// resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.authentication")] + public object Authentication { get; set; } + + /// + /// Gets or sets workspace resource id for databricks REST API. Type: + /// string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.workspaceResourceId")] + public object WorkspaceResourceId { get; set; } + /// /// Gets or sets the id of an existing interactive cluster that will be /// used for all runs of this activity. Type: string (or Expression @@ -254,6 +281,14 @@ public AzureDatabricksLinkedService() [JsonProperty(PropertyName = "typeProperties.encryptedCredential")] public object EncryptedCredential { get; set; } + /// + /// Gets or sets the policy id for limiting the ability to configure + /// clusters based on a user defined set of rules. Type: string (or + /// Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.policyId")] + public object PolicyId { get; set; } + /// /// Validate the object. /// @@ -267,10 +302,6 @@ public override void Validate() { throw new ValidationException(ValidationRules.CannotBeNull, "Domain"); } - if (AccessToken == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "AccessToken"); - } } } } 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/CustomActivity.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CustomActivity.cs index ad877000f9ac..5704b5dcee0c 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CustomActivity.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CustomActivity.cs @@ -57,7 +57,10 @@ public CustomActivity() /// The retention time for the files /// submitted for custom activity. Type: double (or Expression with /// resultType double). - public CustomActivity(string name, object command, IDictionary additionalProperties = default(IDictionary), string description = default(string), IList dependsOn = default(IList), IList userProperties = default(IList), LinkedServiceReference linkedServiceName = default(LinkedServiceReference), ActivityPolicy policy = default(ActivityPolicy), LinkedServiceReference resourceLinkedService = default(LinkedServiceReference), object folderPath = default(object), CustomActivityReferenceObject referenceObjects = default(CustomActivityReferenceObject), IDictionary extendedProperties = default(IDictionary), object retentionTimeInDays = default(object)) + /// Elevation level and scope for + /// the user, default is nonadmin task. Type: string (or Expression + /// with resultType double). + public CustomActivity(string name, object command, IDictionary additionalProperties = default(IDictionary), string description = default(string), IList dependsOn = default(IList), IList userProperties = default(IList), LinkedServiceReference linkedServiceName = default(LinkedServiceReference), ActivityPolicy policy = default(ActivityPolicy), LinkedServiceReference resourceLinkedService = default(LinkedServiceReference), object folderPath = default(object), CustomActivityReferenceObject referenceObjects = default(CustomActivityReferenceObject), IDictionary extendedProperties = default(IDictionary), object retentionTimeInDays = default(object), object autoUserSpecification = default(object)) : base(name, additionalProperties, description, dependsOn, userProperties, linkedServiceName, policy) { Command = command; @@ -66,6 +69,7 @@ public CustomActivity() ReferenceObjects = referenceObjects; ExtendedProperties = extendedProperties; RetentionTimeInDays = retentionTimeInDays; + AutoUserSpecification = autoUserSpecification; CustomInit(); } @@ -116,6 +120,13 @@ public CustomActivity() [JsonProperty(PropertyName = "typeProperties.retentionTimeInDays")] public object RetentionTimeInDays { get; set; } + /// + /// Gets or sets elevation level and scope for the user, default is + /// nonadmin task. Type: string (or Expression with resultType double). + /// + [JsonProperty(PropertyName = "typeProperties.autoUserSpecification")] + public object AutoUserSpecification { get; set; } + /// /// Validate the object. /// diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CustomEventsTrigger.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CustomEventsTrigger.cs new file mode 100644 index 000000000000..0d4b9bda3495 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CustomEventsTrigger.cs @@ -0,0 +1,118 @@ +// +// 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; + + /// + /// Trigger that runs every time a custom event is received. + /// + [Rest.Serialization.JsonTransformation] + public partial class CustomEventsTrigger : MultiplePipelineTrigger + { + /// + /// Initializes a new instance of the CustomEventsTrigger class. + /// + public CustomEventsTrigger() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the CustomEventsTrigger class. + /// + /// The list of event types that cause this + /// trigger to fire. + /// The ARM resource ID of the Azure Event Grid + /// Topic. + /// Unmatched properties from the + /// message are deserialized this collection + /// Trigger description. + /// Indicates if trigger is running or not. + /// Updated when Start/Stop APIs are called on the Trigger. Possible + /// values include: 'Started', 'Stopped', 'Disabled' + /// List of tags that can be used for + /// describing the trigger. + /// Pipelines that need to be started. + /// The event subject must begin with + /// the pattern provided for trigger to fire. At least one of these + /// must be provided: subjectBeginsWith, subjectEndsWith. + /// The event subject must end with the + /// pattern provided for trigger to fire. At least one of these must be + /// provided: subjectBeginsWith, subjectEndsWith. + public CustomEventsTrigger(IList events, string scope, IDictionary additionalProperties = default(IDictionary), string description = default(string), string runtimeState = default(string), IList annotations = default(IList), IList pipelines = default(IList), string subjectBeginsWith = default(string), string subjectEndsWith = default(string)) + : base(additionalProperties, description, runtimeState, annotations, pipelines) + { + SubjectBeginsWith = subjectBeginsWith; + SubjectEndsWith = subjectEndsWith; + Events = events; + Scope = scope; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the event subject must begin with the pattern provided + /// for trigger to fire. At least one of these must be provided: + /// subjectBeginsWith, subjectEndsWith. + /// + [JsonProperty(PropertyName = "typeProperties.subjectBeginsWith")] + public string SubjectBeginsWith { get; set; } + + /// + /// Gets or sets the event subject must end with the pattern provided + /// for trigger to fire. At least one of these must be provided: + /// subjectBeginsWith, subjectEndsWith. + /// + [JsonProperty(PropertyName = "typeProperties.subjectEndsWith")] + public string SubjectEndsWith { get; set; } + + /// + /// Gets or sets the list of event types that cause this trigger to + /// fire. + /// + [JsonProperty(PropertyName = "typeProperties.events")] + public IList Events { get; set; } + + /// + /// Gets or sets the ARM resource ID of the Azure Event Grid Topic. + /// + [JsonProperty(PropertyName = "typeProperties.scope")] + public string Scope { get; set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public virtual void Validate() + { + if (Events == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "Events"); + } + if (Scope == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "Scope"); + } + } + } +} 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/IntegrationRuntimeSsisCatalogInfo.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeSsisCatalogInfo.cs index ca91d3ee2fff..34725741a873 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeSsisCatalogInfo.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeSsisCatalogInfo.cs @@ -47,13 +47,16 @@ public IntegrationRuntimeSsisCatalogInfo() /// https://azure.microsoft.com/en-us/pricing/details/sql-database/. /// Possible values include: 'Basic', 'Standard', 'Premium', /// 'PremiumRS' - public IntegrationRuntimeSsisCatalogInfo(IDictionary additionalProperties = default(IDictionary), string catalogServerEndpoint = default(string), string catalogAdminUserName = default(string), SecureString catalogAdminPassword = default(SecureString), string catalogPricingTier = default(string)) + /// The dual standby pair name of + /// Azure-SSIS Integration Runtimes to support SSISDB failover. + public IntegrationRuntimeSsisCatalogInfo(IDictionary additionalProperties = default(IDictionary), string catalogServerEndpoint = default(string), string catalogAdminUserName = default(string), SecureString catalogAdminPassword = default(SecureString), string catalogPricingTier = default(string), string dualStandbyPairName = default(string)) { AdditionalProperties = additionalProperties; CatalogServerEndpoint = catalogServerEndpoint; CatalogAdminUserName = catalogAdminUserName; CatalogAdminPassword = catalogAdminPassword; CatalogPricingTier = catalogPricingTier; + DualStandbyPairName = dualStandbyPairName; CustomInit(); } @@ -98,6 +101,13 @@ public IntegrationRuntimeSsisCatalogInfo() [JsonProperty(PropertyName = "catalogPricingTier")] public string CatalogPricingTier { get; set; } + /// + /// Gets or sets the dual standby pair name of Azure-SSIS Integration + /// Runtimes to support SSISDB failover. + /// + [JsonProperty(PropertyName = "dualStandbyPairName")] + public string DualStandbyPairName { get; set; } + /// /// Validate the object. /// diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ManagedIntegrationRuntime.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ManagedIntegrationRuntime.cs index 7389fafd07e2..3c75564aa8ce 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ManagedIntegrationRuntime.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ManagedIntegrationRuntime.cs @@ -48,12 +48,15 @@ public ManagedIntegrationRuntime() /// integration runtime. /// SSIS properties for managed /// integration runtime. - public ManagedIntegrationRuntime(IDictionary additionalProperties = default(IDictionary), string description = default(string), string state = default(string), IntegrationRuntimeComputeProperties computeProperties = default(IntegrationRuntimeComputeProperties), IntegrationRuntimeSsisProperties ssisProperties = default(IntegrationRuntimeSsisProperties)) + /// Managed Virtual Network + /// reference. + public ManagedIntegrationRuntime(IDictionary additionalProperties = default(IDictionary), string description = default(string), string state = default(string), IntegrationRuntimeComputeProperties computeProperties = default(IntegrationRuntimeComputeProperties), IntegrationRuntimeSsisProperties ssisProperties = default(IntegrationRuntimeSsisProperties), ManagedVirtualNetworkReference managedVirtualNetwork = default(ManagedVirtualNetworkReference)) : base(additionalProperties, description) { State = state; ComputeProperties = computeProperties; SsisProperties = ssisProperties; + ManagedVirtualNetwork = managedVirtualNetwork; CustomInit(); } @@ -83,6 +86,12 @@ public ManagedIntegrationRuntime() [JsonProperty(PropertyName = "typeProperties.ssisProperties")] public IntegrationRuntimeSsisProperties SsisProperties { get; set; } + /// + /// Gets or sets managed Virtual Network reference. + /// + [JsonProperty(PropertyName = "managedVirtualNetwork")] + public ManagedVirtualNetworkReference ManagedVirtualNetwork { get; set; } + /// /// Validate the object. /// @@ -99,6 +108,10 @@ public virtual void Validate() { SsisProperties.Validate(); } + if (ManagedVirtualNetwork != null) + { + ManagedVirtualNetwork.Validate(); + } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ManagedVirtualNetworkReference.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ManagedVirtualNetworkReference.cs new file mode 100644 index 000000000000..f57c069b4c0a --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ManagedVirtualNetworkReference.cs @@ -0,0 +1,81 @@ +// +// 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; + + /// + /// Managed Virtual Network reference type. + /// + public partial class ManagedVirtualNetworkReference + { + /// + /// Initializes a new instance of the ManagedVirtualNetworkReference + /// class. + /// + public ManagedVirtualNetworkReference() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the ManagedVirtualNetworkReference + /// class. + /// + /// Reference ManagedVirtualNetwork + /// name. + public ManagedVirtualNetworkReference(string referenceName) + { + ReferenceName = referenceName; + CustomInit(); + } + /// + /// Static constructor for ManagedVirtualNetworkReference class. + /// + static ManagedVirtualNetworkReference() + { + Type = "ManagedVirtualNetworkReference"; + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets reference ManagedVirtualNetwork name. + /// + [JsonProperty(PropertyName = "referenceName")] + public string ReferenceName { get; set; } + + /// + /// Managed Virtual Network reference type. + /// + [JsonProperty(PropertyName = "type")] + public static string Type { get; private set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public virtual void Validate() + { + if (ReferenceName == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "ReferenceName"); + } + } + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj index e182795416f4..2932b7e14c46 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj @@ -5,18 +5,18 @@ Microsoft.Azure.Management.DataFactory 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. - 4.13.0 + 4.14.0 Microsoft.Azure.Management.DataFactory Microsoft Azure resource management;Data Factory;ADF; diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs index bf155b9ab073..7ac7e98388ae 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs +++ b/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")] diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/LinkedServiceJsonSamples.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/LinkedServiceJsonSamples.cs index ae70c6421df8..ee1306fedec7 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/LinkedServiceJsonSamples.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/LinkedServiceJsonSamples.cs @@ -2595,6 +2595,27 @@ public class LinkedServiceJsonSamples : JsonSampleCollection ""propertyBagPropertyName2"": ""PropertyBagValue2"", ""dateTime1"": ""2015-04-12T12:13:14Z"", }, - ""retentionTimeInDays"": 35 + ""retentionTimeInDays"": 35, + ""autoUserSpecification"" : ""pooladmin"" } } ] diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/TriggerJsonSamples.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/TriggerJsonSamples.cs index 153af7ad04cb..cd3d6fc9d02c 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/TriggerJsonSamples.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/TriggerJsonSamples.cs @@ -290,6 +290,24 @@ public class TriggerJsonSamples : JsonSampleCollection } } } +"; + + [JsonSample] + public const string CustomEventsTriggerSample = @" +{ + name: ""myDemoCustomEventsTrigger"", + properties: { + type: ""CustomEventsTrigger"", + typeProperties: { + subjectBeginsWith: ""B"", + subjectEndsWith: ""E"", + events: [ + ""Microsoft.Storage.BlobCreated"" + ], + scope: ""demoScope"" + } + } +} "; } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/ScenarioTests/DataFactoryScenarioTests.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/ScenarioTests/DataFactoryScenarioTests.cs index e9544976fc63..2a3de5af0be0 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/ScenarioTests/DataFactoryScenarioTests.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/ScenarioTests/DataFactoryScenarioTests.cs @@ -17,7 +17,7 @@ namespace DataFactory.Tests.ScenarioTests { public class DataFactoryScenarioTests : ScenarioTestBase { - 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 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 getResponse = await client.Factories.GetWithHttpMessagesAsync(resourceGroupName, dataFactoryName); diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/ScenarioTests/IntegrationRuntimeScenarioTests.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/ScenarioTests/IntegrationRuntimeScenarioTests.cs index c032db2334ed..de3f76d2b944 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/ScenarioTests/IntegrationRuntimeScenarioTests.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/ScenarioTests/IntegrationRuntimeScenarioTests.cs @@ -164,7 +164,8 @@ public async Task SsisAzureIntegrationRuntimeScenarioTest() CatalogAdminUserName = Environment.GetEnvironmentVariable("CatalogAdminUsername"), CatalogAdminPassword = new SecureString(Environment.GetEnvironmentVariable("CatalogAdminPassword")), CatalogServerEndpoint = Environment.GetEnvironmentVariable("CatalogServerEndpoint"), - CatalogPricingTier = "S1" + CatalogPricingTier = "S1", + DualStandbyPairName="Name" }, DataProxyProperties = new IntegrationRuntimeDataProxyProperties { diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/SessionRecords/DataFactoryScenarioTests/DataFactoryCrud.json b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/SessionRecords/DataFactoryScenarioTests/DataFactoryCrud.json index 19590a2d8517..cf7cc8f70865 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/SessionRecords/DataFactoryScenarioTests/DataFactoryCrud.json +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/SessionRecords/DataFactoryScenarioTests/DataFactoryCrud.json @@ -87,7 +87,7 @@ "Microsoft.Azure.Management.DataFactory.DataFactoryManagementClient/0.8.0.0" ] }, - "ResponseBody": "{\r\n \"name\": \"sdktestingfactory9776\",\r\n \"id\": \"/subscriptions/c39dce18-cead-4065-8fb1-3af7683a5038/resourceGroups/sdktestingadfrg4712/providers/Microsoft.DataFactory/factories/sdktestingfactory9776\",\r\n \"type\": \"Microsoft.DataFactory/factories\",\r\n \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \"createTime\": \"2018-06-22T03:42:16.6466913Z\",\r\n \"version\": \"2018-06-01\",\r\n \"defaults\": {},\r\n \"publicNetworkAccess\": \"true\" },\r\n \"eTag\": \"\\\"0000cd05-0000-0000-0000-5b2c70180000\\\"\",\r\n \"location\": \"West US\",\r\n \"tags\": {}\r\n}", + "ResponseBody": "{\r\n \"name\": \"sdktestingfactory9776\",\r\n \"id\": \"/subscriptions/c39dce18-cead-4065-8fb1-3af7683a5038/resourceGroups/sdktestingadfrg4712/providers/Microsoft.DataFactory/factories/sdktestingfactory9776\",\r\n \"type\": \"Microsoft.DataFactory/factories\",\r\n \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \"createTime\": \"2018-06-22T03:42:16.6466913Z\",\r\n \"version\": \"2018-06-01\",\r\n \"defaults\": {},\r\n \"publicNetworkAccess\": \"true\",\r\n \"encryption\":{\"keyName\":\"dummyName\",\"vaultBaseUrl\":\"dummyurl\",\"keyVersion\":null,\"identity\":null} },\r\n \"eTag\": \"\\\"0000cd05-0000-0000-0000-5b2c70180000\\\"\",\r\n \"location\": \"West US\",\r\n \"tags\": {}\r\n}", "ResponseHeaders": { "Content-Type": [ "application/json; charset=utf-8"