diff --git a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt index 4315c8929c478..4a3a5bafea921 100644 --- a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt +++ b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt @@ -5,11 +5,11 @@ Generating CSharp code Executing AutoRest command cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/main/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 Autorest CSharp Version: 2.3.82 -2022-03-21 01:51:54 UTC +2022-04-11 01:10:45 UTC Azure-rest-api-specs repository information GitHub fork: Azure Branch: main -Commit: 0d9772a5c3a716070662572a2a7700718cfba959 +Commit: 74ca59fc8cb6563d5a9d66fb533b8622522143eb 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 0aa36b40757ec..44549cdc59938 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog for the Azure Data Factory V2 .NET SDK +## Version 6.0.0 +### Feature Additions +### Breaking Changes +- Fixed Expression mode for SqlServerStoredProcedureActivity +- Added Policy property into ExecutePipelineActivity + ## Version 5.4.0 ### Feature Additions - Added Web Activity disable cert validation diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/ExecutePipelineActivity.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/ExecutePipelineActivity.cs new file mode 100644 index 0000000000000..3ebdc58a4b4cf --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/ExecutePipelineActivity.cs @@ -0,0 +1,30 @@ +using System.Collections.Generic; + +namespace Microsoft.Azure.Management.DataFactory.Models +{ + public partial class ExecutePipelineActivity : ControlActivity + { + /// + /// Initializes a new instance of the ExecutePipelineActivity class. + /// + /// Activity name. + /// Pipeline reference. + /// Unmatched properties from the + /// message are deserialized this collection + /// Activity description. + /// Activity depends on condition. + /// Activity user properties. + /// Pipeline parameters. + /// Defines whether activity execution + /// will wait for the dependent pipeline execution to finish. Default + /// is false. + public ExecutePipelineActivity(string name, PipelineReference pipeline, IDictionary additionalProperties = default(IDictionary), string description = default(string), IList dependsOn = default(IList), IList userProperties = default(IList), IDictionary parameters = default(IDictionary), bool? waitOnCompletion = default(bool?)) + : base(name, additionalProperties, description, dependsOn, userProperties) + { + Pipeline = pipeline; + Parameters = parameters; + WaitOnCompletion = waitOnCompletion; + CustomInit(); + } + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ExecutePipelineActivity.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ExecutePipelineActivity.cs index 062a707223fec..c8bc0a59f9441 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ExecutePipelineActivity.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ExecutePipelineActivity.cs @@ -43,13 +43,15 @@ public ExecutePipelineActivity() /// Activity description. /// Activity depends on condition. /// Activity user properties. + /// Execute pipeline activity policy. /// Pipeline parameters. /// Defines whether activity execution /// will wait for the dependent pipeline execution to finish. Default /// is false. - public ExecutePipelineActivity(string name, PipelineReference pipeline, IDictionary additionalProperties = default(IDictionary), string description = default(string), IList dependsOn = default(IList), IList userProperties = default(IList), IDictionary parameters = default(IDictionary), bool? waitOnCompletion = default(bool?)) + public ExecutePipelineActivity(string name, PipelineReference pipeline, IDictionary additionalProperties = default(IDictionary), string description = default(string), IList dependsOn = default(IList), IList userProperties = default(IList), ExecutePipelineActivityPolicy policy = default(ExecutePipelineActivityPolicy), IDictionary parameters = default(IDictionary), bool? waitOnCompletion = default(bool?)) : base(name, additionalProperties, description, dependsOn, userProperties) { + Policy = policy; Pipeline = pipeline; Parameters = parameters; WaitOnCompletion = waitOnCompletion; @@ -61,6 +63,12 @@ public ExecutePipelineActivity() /// partial void CustomInit(); + /// + /// Gets or sets execute pipeline activity policy. + /// + [JsonProperty(PropertyName = "policy")] + public ExecutePipelineActivityPolicy Policy { get; set; } + /// /// Gets or sets pipeline reference. /// diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ExecutePipelineActivityPolicy.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ExecutePipelineActivityPolicy.cs new file mode 100644 index 0000000000000..502c8137f185b --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ExecutePipelineActivityPolicy.cs @@ -0,0 +1,67 @@ +// +// 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.Collections; + using System.Collections.Generic; + using System.Linq; + + /// + /// Execution policy for an execute pipeline activity. + /// + public partial class ExecutePipelineActivityPolicy + { + /// + /// Initializes a new instance of the ExecutePipelineActivityPolicy + /// class. + /// + public ExecutePipelineActivityPolicy() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the ExecutePipelineActivityPolicy + /// class. + /// + /// Unmatched properties from the + /// message are deserialized this collection + /// When set to true, Input from activity is + /// considered as secure and will not be logged to monitoring. + public ExecutePipelineActivityPolicy(IDictionary additionalProperties = default(IDictionary), bool? secureInput = default(bool?)) + { + AdditionalProperties = additionalProperties; + SecureInput = secureInput; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets unmatched properties from the message are deserialized + /// this collection + /// + [JsonExtensionData] + public IDictionary AdditionalProperties { get; set; } + + /// + /// Gets or sets when set to true, Input from activity is considered as + /// secure and will not be logged to monitoring. + /// + [JsonProperty(PropertyName = "secureInput")] + public bool? SecureInput { get; set; } + + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlServerStoredProcedureActivity.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlServerStoredProcedureActivity.cs index ddd80da8c3b48..3e1c004afe256 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlServerStoredProcedureActivity.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlServerStoredProcedureActivity.cs @@ -50,7 +50,7 @@ public SqlServerStoredProcedureActivity() /// Value and type setting for /// stored procedure parameters. Example: "{Parameter1: {value: "1", /// type: "int"}}". - public SqlServerStoredProcedureActivity(string name, object storedProcedureName, IDictionary additionalProperties = default(IDictionary), string description = default(string), IList dependsOn = default(IList), IList userProperties = default(IList), LinkedServiceReference linkedServiceName = default(LinkedServiceReference), ActivityPolicy policy = default(ActivityPolicy), IDictionary storedProcedureParameters = default(IDictionary)) + public SqlServerStoredProcedureActivity(string name, object storedProcedureName, IDictionary additionalProperties = default(IDictionary), string description = default(string), IList dependsOn = default(IList), IList userProperties = default(IList), LinkedServiceReference linkedServiceName = default(LinkedServiceReference), ActivityPolicy policy = default(ActivityPolicy), object storedProcedureParameters = default(object)) : base(name, additionalProperties, description, dependsOn, userProperties, linkedServiceName, policy) { StoredProcedureName = storedProcedureName; @@ -75,7 +75,7 @@ public SqlServerStoredProcedureActivity() /// parameters. Example: "{Parameter1: {value: "1", type: "int"}}". /// [JsonProperty(PropertyName = "typeProperties.storedProcedureParameters")] - public IDictionary StoredProcedureParameters { get; set; } + public object StoredProcedureParameters { get; set; } /// /// Validate the object. 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 94b94fc5a6196..7b2b832bbe297 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,12 +5,13 @@ 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. - 5.4.0 + 6.0.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 8c705581933ed..04dcf8343d002 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("5.4.0.0")] -[assembly: AssemblyFileVersion("5.4.0.0")] +[assembly: AssemblyVersion("6.0.0.0")] +[assembly: AssemblyFileVersion("6.0.0.0")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Microsoft")] [assembly: AssemblyProduct("Microsoft Azure .NET SDK")] diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/UnitTests/ActivityTests.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/UnitTests/ActivityTests.cs index de3f4c024172d..9de815de1e756 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/UnitTests/ActivityTests.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/UnitTests/ActivityTests.cs @@ -2,14 +2,14 @@ // Licensed under the MIT License. See License.txt in the project root for // license information. +using System; +using System.Collections.Generic; +using System.Globalization; using DataFactory.Tests.JsonSamples; using DataFactory.Tests.Utils; using Microsoft.Azure.Management.DataFactory.Models; using Microsoft.Rest.Serialization; using Newtonsoft.Json.Linq; -using System; -using System.Collections.Generic; -using System.Globalization; using Xunit; using Xunit.Abstractions; using Xunit.Sdk; @@ -45,7 +45,8 @@ public void ExecutePipelineActivity_SDKSample() Description = "Execute pipeline activity", Pipeline = new PipelineReference(triggeredPipelineName), Parameters = new Dictionary(), - WaitOnCompletion = true + WaitOnCompletion = true, + Policy = new ExecutePipelineActivityPolicy() }; var handler = new RecordedDelegatingHandler();