diff --git a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt index c4eea622e90a..acc00545a7c8 100644 --- a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt +++ b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt @@ -4,12 +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/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 -Autorest CSharp Version: 2.3.82 -2023-02-03 15:43:00 UTC +2023-02-22 02:56:09 UTC Azure-rest-api-specs repository information GitHub fork: Azure Branch: main -Commit: 8c9a6bd96daf9e0e7f4bba47df78dfa0a23acf07 +Commit: 8d74557bb1605c72732470b8b98988643d18f484 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 1fab86b70934..7f972e04e211 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog for the Azure Data Factory V2 .NET SDK +## Version 9.2.0 +### Feature Additions +- Added AzureBlobFS sasUri and sasToken properties in ADF + ## Version 9.1.0 ### Feature Additions - Added AzureBlobStorage containerUri and authenticationType properties in ADF diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/AzureBlobFSLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/AzureBlobFSLinkedService.cs new file mode 100644 index 000000000000..85c9461bab71 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/AzureBlobFSLinkedService.cs @@ -0,0 +1,75 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Microsoft.Azure.Management.DataFactory.Models +{ + public partial class AzureBlobFSLinkedService + { + /// + /// Initializes a new instance of the AzureBlobFSLinkedService class. + /// + /// Endpoint for the Azure Data Lake Storage Gen2 + /// service. Type: string (or Expression with resultType + /// string). + /// Unmatched properties from the + /// message are deserialized this collection + /// The integration runtime reference. + /// Linked service description. + /// Parameters for linked service. + /// List of tags that can be used for + /// describing the linked service. + /// Account key for the Azure Data Lake + /// Storage Gen2 service. Type: string (or Expression with resultType + /// string). + /// The ID of the application used to + /// authenticate against the Azure Data Lake Storage Gen2 account. + /// Type: string (or Expression with resultType string). + /// The Key of the application used + /// to authenticate against the Azure Data Lake Storage Gen2 + /// account. + /// The name or ID of the tenant to which the + /// service principal belongs. Type: string (or Expression with + /// resultType string). + /// Indicates the azure cloud type of the + /// service principle auth. Allowed values are AzurePublic, AzureChina, + /// AzureUsGovernment, AzureGermany. Default value is the data factory + /// regions’ cloud type. Type: string (or Expression with resultType + /// string). + /// The encrypted credential used for + /// authentication. Credentials are encrypted using the integration + /// runtime credential manager. Type: string (or Expression with + /// resultType string). + /// The credential reference containing + /// authentication information. + /// The service principal + /// credential type to use in Server-To-Server authentication. + /// 'ServicePrincipalKey' for key/secret, 'ServicePrincipalCert' for + /// certificate. Type: string (or Expression with resultType + /// string). + /// The credential of the + /// service principal object in Azure Active Directory. If + /// servicePrincipalCredentialType is 'ServicePrincipalKey', + /// servicePrincipalCredential can be SecureString or + /// AzureKeyVaultSecretReference. If servicePrincipalCredentialType is + /// 'ServicePrincipalCert', servicePrincipalCredential can only be + /// AzureKeyVaultSecretReference. + public AzureBlobFSLinkedService(object url, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object accountKey = default(object), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object azureCloudType = default(object), object encryptedCredential = default(object), CredentialReference credential = default(CredentialReference), object servicePrincipalCredentialType = default(object), SecretBase servicePrincipalCredential = default(SecretBase)) + : base(additionalProperties, connectVia, description, parameters, annotations) + { + Url = url; + AccountKey = accountKey; + ServicePrincipalId = servicePrincipalId; + ServicePrincipalKey = servicePrincipalKey; + Tenant = tenant; + AzureCloudType = azureCloudType; + EncryptedCredential = encryptedCredential; + Credential = credential; + ServicePrincipalCredentialType = servicePrincipalCredentialType; + ServicePrincipalCredential = servicePrincipalCredential; + CustomInit(); + } + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobFSLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobFSLinkedService.cs index ef79d222a831..5710255b56e6 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobFSLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobFSLinkedService.cs @@ -35,9 +35,6 @@ public AzureBlobFSLinkedService() /// /// Initializes a new instance of the AzureBlobFSLinkedService class. /// - /// Endpoint for the Azure Data Lake Storage Gen2 - /// service. Type: string (or Expression with resultType - /// string). /// Unmatched properties from the /// message are deserialized this collection /// The integration runtime reference. @@ -45,6 +42,9 @@ public AzureBlobFSLinkedService() /// Parameters for linked service. /// List of tags that can be used for /// describing the linked service. + /// Endpoint for the Azure Data Lake Storage Gen2 + /// service. Type: string (or Expression with resultType + /// string). /// Account key for the Azure Data Lake /// Storage Gen2 service. Type: string (or Expression with resultType /// string). @@ -80,7 +80,12 @@ public AzureBlobFSLinkedService() /// AzureKeyVaultSecretReference. If servicePrincipalCredentialType is /// 'ServicePrincipalCert', servicePrincipalCredential can only be /// AzureKeyVaultSecretReference. - public AzureBlobFSLinkedService(object url, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object accountKey = default(object), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object azureCloudType = default(object), object encryptedCredential = default(object), CredentialReference credential = default(CredentialReference), object servicePrincipalCredentialType = default(object), SecretBase servicePrincipalCredential = default(SecretBase)) + /// SAS URI of the Azure Data Lake Storage Gen2 + /// service. Type: string, SecureString or + /// AzureKeyVaultSecretReference. + /// The Azure key vault secret reference of + /// sasToken in sas uri. + public AzureBlobFSLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object url = default(object), object accountKey = default(object), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object azureCloudType = default(object), object encryptedCredential = default(object), CredentialReference credential = default(CredentialReference), object servicePrincipalCredentialType = default(object), SecretBase servicePrincipalCredential = default(SecretBase), object sasUri = default(object), SecretBase sasToken = default(SecretBase)) : base(additionalProperties, connectVia, description, parameters, annotations) { Url = url; @@ -93,6 +98,8 @@ public AzureBlobFSLinkedService() Credential = credential; ServicePrincipalCredentialType = servicePrincipalCredentialType; ServicePrincipalCredential = servicePrincipalCredential; + SasUri = sasUri; + SasToken = sasToken; CustomInit(); } @@ -184,6 +191,20 @@ public AzureBlobFSLinkedService() [JsonProperty(PropertyName = "typeProperties.servicePrincipalCredential")] public SecretBase ServicePrincipalCredential { get; set; } + /// + /// Gets or sets SAS URI of the Azure Data Lake Storage Gen2 service. + /// Type: string, SecureString or AzureKeyVaultSecretReference. + /// + [JsonProperty(PropertyName = "typeProperties.sasUri")] + public object SasUri { get; set; } + + /// + /// Gets or sets the Azure key vault secret reference of sasToken in + /// sas uri. + /// + [JsonProperty(PropertyName = "typeProperties.sasToken")] + public SecretBase SasToken { get; set; } + /// /// Validate the object. /// @@ -193,10 +214,6 @@ public AzureBlobFSLinkedService() public override void Validate() { base.Validate(); - if (Url == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "Url"); - } if (Credential != null) { Credential.Validate(); 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 6d93f0318541..78661c668e94 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,13 +5,12 @@ 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.1.0 + 9.2.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 af5db0353ae7..068d15fec3ed 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.1.0.0")] +[assembly: AssemblyFileVersion("9.2.0.0")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Microsoft")] [assembly: AssemblyProduct("Microsoft Azure .NET SDK")]