diff --git a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt index 7a6a2587c2ed..4c616f768f92 100644 --- a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt +++ b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt @@ -3,13 +3,12 @@ AutoRest installed successfully. 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 -Autorest CSharp Version: 2.3.82 -2021-09-13 02:13:39 UTC +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 +2021-10-08 01:40:17 UTC Azure-rest-api-specs repository information GitHub fork: Azure -Branch: master -Commit: 9a19506631005d0ff1e3f394c86a9ce10cf51910 +Branch: main +Commit: 2ebe584103a362fa87f2f60c9bab89ab410c7571 AutoRest information Requested version: v2 -Bootstrapper version: autorest@3.3.2 +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 e08b5f2b0262..481485464eb7 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 4.26.0 +### Feature Additions +- Supported Power Query model changes for multiple queries +- Added locale support in Power Query activity +- Added publicNetworkAccess into FactoryUpdateParameters + ## Version 4.25.0 ### Feature Additions - Supported UAMI in sql always diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ExecuteWranglingDataflowActivity.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ExecuteWranglingDataflowActivity.cs index 6f66212d22e8..3025552c5ede 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ExecuteWranglingDataflowActivity.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ExecuteWranglingDataflowActivity.cs @@ -62,10 +62,12 @@ public ExecuteWranglingDataflowActivity() /// flow execution. Allows sinks with the same save order to be /// processed concurrently. Type: boolean (or Expression with /// resultType boolean) - /// List of Power Query activity sinks mapped to a - /// queryName. + /// (Deprecated. Please use Queries). List of Power + /// Query activity sinks mapped to a queryName. + /// List of mapping for Power Query mashup query + /// to sink dataset(s). /// Activity policy. - public ExecuteWranglingDataflowActivity(string name, DataFlowReference dataFlow, IDictionary additionalProperties = default(IDictionary), string description = default(string), IList dependsOn = default(IList), IList userProperties = default(IList), DataFlowStagingInfo staging = default(DataFlowStagingInfo), IntegrationRuntimeReference integrationRuntime = default(IntegrationRuntimeReference), ExecuteDataFlowActivityTypePropertiesCompute compute = default(ExecuteDataFlowActivityTypePropertiesCompute), object traceLevel = default(object), object continueOnError = default(object), object runConcurrently = default(object), IDictionary sinks = default(IDictionary), ActivityPolicy policy = default(ActivityPolicy)) + public ExecuteWranglingDataflowActivity(string name, DataFlowReference dataFlow, IDictionary additionalProperties = default(IDictionary), string description = default(string), IList dependsOn = default(IList), IList userProperties = default(IList), DataFlowStagingInfo staging = default(DataFlowStagingInfo), IntegrationRuntimeReference integrationRuntime = default(IntegrationRuntimeReference), ExecuteDataFlowActivityTypePropertiesCompute compute = default(ExecuteDataFlowActivityTypePropertiesCompute), object traceLevel = default(object), object continueOnError = default(object), object runConcurrently = default(object), IDictionary sinks = default(IDictionary), IList queries = default(IList), ActivityPolicy policy = default(ActivityPolicy)) : base(name, additionalProperties, description, dependsOn, userProperties) { DataFlow = dataFlow; @@ -76,6 +78,7 @@ public ExecuteWranglingDataflowActivity() ContinueOnError = continueOnError; RunConcurrently = runConcurrently; Sinks = sinks; + Queries = queries; Policy = policy; CustomInit(); } @@ -134,12 +137,19 @@ public ExecuteWranglingDataflowActivity() public object RunConcurrently { get; set; } /// - /// Gets or sets list of Power Query activity sinks mapped to a - /// queryName. + /// Gets or sets (Deprecated. Please use Queries). List of Power Query + /// activity sinks mapped to a queryName. /// [JsonProperty(PropertyName = "typeProperties.sinks")] public IDictionary Sinks { get; set; } + /// + /// Gets or sets list of mapping for Power Query mashup query to sink + /// dataset(s). + /// + [JsonProperty(PropertyName = "typeProperties.queries")] + public IList Queries { get; set; } + /// /// Gets or sets activity policy. /// diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FactoryUpdateParameters.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FactoryUpdateParameters.cs index 0f65c6a02eb6..fc5f63bde9ce 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FactoryUpdateParameters.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FactoryUpdateParameters.cs @@ -34,10 +34,14 @@ public FactoryUpdateParameters() /// The resource tags. /// Managed service identity of the /// factory. - public FactoryUpdateParameters(IDictionary tags = default(IDictionary), FactoryIdentity identity = default(FactoryIdentity)) + /// Whether or not public network + /// access is allowed for the data factory. Possible values include: + /// 'Enabled', 'Disabled' + public FactoryUpdateParameters(IDictionary tags = default(IDictionary), FactoryIdentity identity = default(FactoryIdentity), string publicNetworkAccess = default(string)) { Tags = tags; Identity = identity; + PublicNetworkAccess = publicNetworkAccess; CustomInit(); } @@ -58,6 +62,13 @@ public FactoryUpdateParameters() [JsonProperty(PropertyName = "identity")] public FactoryIdentity Identity { get; set; } + /// + /// Gets or sets whether or not public network access is allowed for + /// the data factory. Possible values include: 'Enabled', 'Disabled' + /// + [JsonProperty(PropertyName = "publicNetworkAccess")] + public string PublicNetworkAccess { get; set; } + /// /// Validate the object. /// diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PowerQuerySinkMapping.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PowerQuerySinkMapping.cs new file mode 100644 index 000000000000..f4dae5123fb1 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PowerQuerySinkMapping.cs @@ -0,0 +1,63 @@ +// +// 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; + + /// + /// Map Power Query mashup query to sink dataset(s). + /// + public partial class PowerQuerySinkMapping + { + /// + /// Initializes a new instance of the PowerQuerySinkMapping class. + /// + public PowerQuerySinkMapping() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the PowerQuerySinkMapping class. + /// + /// Name of the query in Power Query mashup + /// document. + /// List of sinks mapped to Power Query + /// mashup query. + public PowerQuerySinkMapping(string queryName = default(string), IList dataflowSinks = default(IList)) + { + QueryName = queryName; + DataflowSinks = dataflowSinks; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets name of the query in Power Query mashup document. + /// + [JsonProperty(PropertyName = "queryName")] + public string QueryName { get; set; } + + /// + /// Gets or sets list of sinks mapped to Power Query mashup query. + /// + [JsonProperty(PropertyName = "dataflowSinks")] + public IList DataflowSinks { get; set; } + + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/WranglingDataFlow.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/WranglingDataFlow.cs index aad4c5a477ba..5712b59b5f01 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/WranglingDataFlow.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/WranglingDataFlow.cs @@ -41,11 +41,14 @@ public WranglingDataFlow() /// specified, Data flow will appear at the root level. /// List of sources in Power Query. /// Power query mashup script. - public WranglingDataFlow(string description = default(string), IList annotations = default(IList), DataFlowFolder folder = default(DataFlowFolder), IList sources = default(IList), string script = default(string)) + /// Locale of the Power query mashup + /// document. + public WranglingDataFlow(string description = default(string), IList annotations = default(IList), DataFlowFolder folder = default(DataFlowFolder), IList sources = default(IList), string script = default(string), string documentLocale = default(string)) : base(description, annotations, folder) { Sources = sources; Script = script; + DocumentLocale = documentLocale; CustomInit(); } @@ -66,5 +69,11 @@ public WranglingDataFlow() [JsonProperty(PropertyName = "typeProperties.script")] public string Script { get; set; } + /// + /// Gets or sets locale of the Power query mashup document. + /// + [JsonProperty(PropertyName = "typeProperties.documentLocale")] + public string DocumentLocale { get; set; } + } } 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 274954c37b4f..f8818360c715 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,14 +5,14 @@ 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.25.0 + 4.26.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 a2cbce82465a..ff0b9cbee244 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.25.0.0")] -[assembly: AssemblyFileVersion("4.25.0.0")] +[assembly: AssemblyVersion("4.26.0.0")] +[assembly: AssemblyFileVersion("4.26.0.0")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Microsoft")] [assembly: AssemblyProduct("Microsoft Azure .NET SDK")] diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/DataFlowJsonSamples.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/DataFlowJsonSamples.cs index d00cdb7e53a3..56069d86cabd 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/DataFlowJsonSamples.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/DataFlowJsonSamples.cs @@ -116,7 +116,8 @@ public class DataFlowJsonSamples : JsonSampleCollection ""name"": ""CADSource"" } ], - ""script"": ""some script"" + ""script"": ""some script"", + ""documentLocale"": ""de-DE"" } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/PipelineJsonSamples.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/PipelineJsonSamples.cs index 37e9f5b233e3..6ea70750358e 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/PipelineJsonSamples.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/PipelineJsonSamples.cs @@ -7542,6 +7542,51 @@ public class PipelineJsonSamples : JsonSampleCollection ] } } +"; + + [JsonSample] + public const string ExecuteWranglingDataFlowActivityPipelineNew = @" +{ + name: ""My Power Query Activity pipeline"", + properties: + { + activities: + [ + { + name: ""TestActivity"", + description: ""Test activity description"", + type: ""ExecuteWranglingDataflow"", + typeProperties: { + dataFlow: { + referenceName: ""referenced1"", + type: ""DataFlowReference"" + }, + staging: { + linkedService: { + referenceName: ""referenced2"", + type: ""LinkedServiceReference"" + }, + folderPath: ""adfjobs/staging"" + }, + integrationRuntime: { + referenceName: ""dataflowIR10minTTL"", + type: ""IntegrationRuntimeReference"" + }, + compute: { + computeType: ""MemoryOptimized"", + coreCount: 8 + }, + queries:[ + { + queryName: """", + dataflowSinks: [] + } + ] + } + } + ] + } +} "; } }