diff --git a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt index 78c468870395..c4eea622e90a 100644 --- a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt +++ b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt @@ -4,11 +4,12 @@ Commencing code generation 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=2.0.4421 --reflect-api-versions --tag=package-2018-06 --csharp-sdks-folder=D:\Code\azure-sdk-for-net\sdk -2023-01-12 03:56:29 UTC +Autorest CSharp Version: 2.3.82 +2023-02-03 15:43:00 UTC Azure-rest-api-specs repository information GitHub fork: Azure Branch: main -Commit: 6e011aae8dd50b5acb4bd5e951f5b930a010bc41 +Commit: 8c9a6bd96daf9e0e7f4bba47df78dfa0a23acf07 AutoRest information Requested version: 2.0.4421 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 bdb7f659ac19..1fab86b70934 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog for the Azure Data Factory V2 .NET SDK +## Version 9.1.0 +### Feature Additions +- Added AzureBlobStorage containerUri and authenticationType properties in ADF +- Added support copyComputeScale And pipelineExternalComputeScale in IntegrationRuntime + ## Version 9.0.0 ### Feature Additions ### Breaking Changes diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobStorageLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobStorageLinkedService.cs index a6c32f5a87bf..ecfdb1e951ad 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobStorageLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobStorageLinkedService.cs @@ -81,7 +81,13 @@ public AzureBlobStorageLinkedService() /// resultType string). /// The credential reference containing /// authentication information. - public AzureBlobStorageLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object connectionString = default(object), AzureKeyVaultSecretReference accountKey = default(AzureKeyVaultSecretReference), object sasUri = default(object), AzureKeyVaultSecretReference sasToken = default(AzureKeyVaultSecretReference), string serviceEndpoint = default(string), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object azureCloudType = default(object), string accountKind = default(string), string encryptedCredential = default(string), CredentialReference credential = default(CredentialReference)) + /// The type used for authentication. + /// Type: string. Possible values include: 'Anonymous', 'AccountKey', + /// 'SasUri', 'ServicePrincipal', 'Msi' + /// Container uri of the Azure Blob Storage + /// resource only support for anonymous access. Type: string (or + /// Expression with resultType string). + public AzureBlobStorageLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object connectionString = default(object), AzureKeyVaultSecretReference accountKey = default(AzureKeyVaultSecretReference), object sasUri = default(object), AzureKeyVaultSecretReference sasToken = default(AzureKeyVaultSecretReference), string serviceEndpoint = default(string), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object azureCloudType = default(object), string accountKind = default(string), string encryptedCredential = default(string), CredentialReference credential = default(CredentialReference), string authenticationType = default(string), object containerUri = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { ConnectionString = connectionString; @@ -96,6 +102,8 @@ public AzureBlobStorageLinkedService() AccountKind = accountKind; EncryptedCredential = encryptedCredential; Credential = credential; + AuthenticationType = authenticationType; + ContainerUri = containerUri; CustomInit(); } @@ -199,6 +207,22 @@ public AzureBlobStorageLinkedService() [JsonProperty(PropertyName = "typeProperties.credential")] public CredentialReference Credential { get; set; } + /// + /// Gets or sets the type used for authentication. Type: string. + /// Possible values include: 'Anonymous', 'AccountKey', 'SasUri', + /// 'ServicePrincipal', 'Msi' + /// + [JsonProperty(PropertyName = "typeProperties.authenticationType")] + public string AuthenticationType { get; set; } + + /// + /// Gets or sets container uri of the Azure Blob Storage resource only + /// support for anonymous access. Type: string (or Expression with + /// resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.containerUri")] + public object ContainerUri { get; set; } + /// /// Validate the object. /// diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureStorageAuthenticationType.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureStorageAuthenticationType.cs new file mode 100644 index 000000000000..27ed0889979a --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureStorageAuthenticationType.cs @@ -0,0 +1,25 @@ +// +// 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 AzureStorageAuthenticationType. + /// + public static class AzureStorageAuthenticationType + { + public const string Anonymous = "Anonymous"; + public const string AccountKey = "AccountKey"; + public const string SasUri = "SasUri"; + public const string ServicePrincipal = "ServicePrincipal"; + public const string Msi = "Msi"; + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CopyComputeScaleProperties.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CopyComputeScaleProperties.cs new file mode 100644 index 000000000000..e2645c4adbf5 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CopyComputeScaleProperties.cs @@ -0,0 +1,94 @@ +// +// 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.Collections; + using System.Collections.Generic; + using System.Linq; + + /// + /// CopyComputeScale properties for managed integration runtime. + /// + public partial class CopyComputeScaleProperties + { + /// + /// Initializes a new instance of the CopyComputeScaleProperties class. + /// + public CopyComputeScaleProperties() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the CopyComputeScaleProperties class. + /// + /// Unmatched properties from the + /// message are deserialized this collection + /// DIU number setting reserved for + /// copy activity execution. Supported values are multiples of 4 in + /// range 4-256. + /// Time to live (in minutes) setting of + /// integration runtime which will execute copy activity. + public CopyComputeScaleProperties(IDictionary additionalProperties = default(IDictionary), int? dataIntegrationUnit = default(int?), int? timeToLive = default(int?)) + { + AdditionalProperties = additionalProperties; + DataIntegrationUnit = dataIntegrationUnit; + TimeToLive = timeToLive; + 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 DIU number setting reserved for copy activity + /// execution. Supported values are multiples of 4 in range 4-256. + /// + [JsonProperty(PropertyName = "dataIntegrationUnit")] + public int? DataIntegrationUnit { get; set; } + + /// + /// Gets or sets time to live (in minutes) setting of integration + /// runtime which will execute copy activity. + /// + [JsonProperty(PropertyName = "timeToLive")] + public int? TimeToLive { get; set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public virtual void Validate() + { + if (DataIntegrationUnit < 4) + { + throw new ValidationException(ValidationRules.InclusiveMinimum, "DataIntegrationUnit", 4); + } + if (TimeToLive < 5) + { + throw new ValidationException(ValidationRules.InclusiveMinimum, "TimeToLive", 5); + } + } + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeComputeProperties.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeComputeProperties.cs index 6af3e2c5a5cc..edb9da5bc1a1 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeComputeProperties.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeComputeProperties.cs @@ -49,7 +49,12 @@ public IntegrationRuntimeComputeProperties() /// integration runtime. /// VNet properties for managed /// integration runtime. - public IntegrationRuntimeComputeProperties(IDictionary additionalProperties = default(IDictionary), string location = default(string), string nodeSize = default(string), int? numberOfNodes = default(int?), int? maxParallelExecutionsPerNode = default(int?), IntegrationRuntimeDataFlowProperties dataFlowProperties = default(IntegrationRuntimeDataFlowProperties), IntegrationRuntimeVNetProperties vNetProperties = default(IntegrationRuntimeVNetProperties)) + /// CopyComputeScale + /// properties for managed integration runtime. + /// PipelineExternalComputeScale + /// properties for managed integration runtime. + public IntegrationRuntimeComputeProperties(IDictionary additionalProperties = default(IDictionary), string location = default(string), string nodeSize = default(string), int? numberOfNodes = default(int?), int? maxParallelExecutionsPerNode = default(int?), IntegrationRuntimeDataFlowProperties dataFlowProperties = default(IntegrationRuntimeDataFlowProperties), IntegrationRuntimeVNetProperties vNetProperties = default(IntegrationRuntimeVNetProperties), CopyComputeScaleProperties copyComputeScaleProperties = default(CopyComputeScaleProperties), PipelineExternalComputeScaleProperties pipelineExternalComputeScaleProperties = default(PipelineExternalComputeScaleProperties)) { AdditionalProperties = additionalProperties; Location = location; @@ -58,6 +63,8 @@ public IntegrationRuntimeComputeProperties() MaxParallelExecutionsPerNode = maxParallelExecutionsPerNode; DataFlowProperties = dataFlowProperties; VNetProperties = vNetProperties; + CopyComputeScaleProperties = copyComputeScaleProperties; + PipelineExternalComputeScaleProperties = pipelineExternalComputeScaleProperties; CustomInit(); } @@ -114,6 +121,20 @@ public IntegrationRuntimeComputeProperties() [JsonProperty(PropertyName = "vNetProperties")] public IntegrationRuntimeVNetProperties VNetProperties { get; set; } + /// + /// Gets or sets copyComputeScale properties for managed integration + /// runtime. + /// + [JsonProperty(PropertyName = "copyComputeScaleProperties")] + public CopyComputeScaleProperties CopyComputeScaleProperties { get; set; } + + /// + /// Gets or sets pipelineExternalComputeScale properties for managed + /// integration runtime. + /// + [JsonProperty(PropertyName = "pipelineExternalComputeScaleProperties")] + public PipelineExternalComputeScaleProperties PipelineExternalComputeScaleProperties { get; set; } + /// /// Validate the object. /// @@ -134,6 +155,14 @@ public virtual void Validate() { DataFlowProperties.Validate(); } + if (CopyComputeScaleProperties != null) + { + CopyComputeScaleProperties.Validate(); + } + if (PipelineExternalComputeScaleProperties != null) + { + PipelineExternalComputeScaleProperties.Validate(); + } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PipelineExternalComputeScaleProperties.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PipelineExternalComputeScaleProperties.cs new file mode 100644 index 000000000000..db5ea32afe0b --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PipelineExternalComputeScaleProperties.cs @@ -0,0 +1,83 @@ +// +// 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.Collections; + using System.Collections.Generic; + using System.Linq; + + /// + /// PipelineExternalComputeScale properties for managed integration + /// runtime. + /// + public partial class PipelineExternalComputeScaleProperties + { + /// + /// Initializes a new instance of the + /// PipelineExternalComputeScaleProperties class. + /// + public PipelineExternalComputeScaleProperties() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the + /// PipelineExternalComputeScaleProperties class. + /// + /// Unmatched properties from the + /// message are deserialized this collection + /// Time to live (in minutes) setting of + /// integration runtime which will execute pipeline and external + /// activity. + public PipelineExternalComputeScaleProperties(IDictionary additionalProperties = default(IDictionary), int? timeToLive = default(int?)) + { + AdditionalProperties = additionalProperties; + TimeToLive = timeToLive; + 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 time to live (in minutes) setting of integration + /// runtime which will execute pipeline and external activity. + /// + [JsonProperty(PropertyName = "timeToLive")] + public int? TimeToLive { get; set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public virtual void Validate() + { + if (TimeToLive < 5) + { + throw new ValidationException(ValidationRules.InclusiveMinimum, "TimeToLive", 5); + } + } + } +} 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 5343a3aba4a9..6d93f0318541 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,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. - 9.0.0 + 9.1.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 be9ee89b3250..af5db0353ae7 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs @@ -7,7 +7,7 @@ [assembly: AssemblyTitle("Microsoft Azure Data Factory Management Library")] [assembly: AssemblyDescription("Provides management functionality for Microsoft Azure Data Factory Resources.")] [assembly: AssemblyVersion("9.0.0.0")] -[assembly: AssemblyFileVersion("9.0.0.0")] +[assembly: AssemblyFileVersion("9.1.0.0")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Microsoft")] [assembly: AssemblyProduct("Microsoft Azure .NET SDK")]