From a27bc389b7ad63743d4fb79c3dc3ca41c02e9780 Mon Sep 17 00:00:00 2001 From: Jingshu923 <52914166+Jingshu923@users.noreply.github.com> Date: Tue, 14 Jun 2022 15:57:18 +0800 Subject: [PATCH] [DataFactory]Added new features into 6.3.0 (#29279) * [DataFactory]Added new features into 5.1.0 * update * add one change * [DataFactory]Added new features into 5.2.0 * [DataFactory]Added new features into 5.3.0 * [DataFactory]Added new features into 5.4.0 * [DataFactory]Added new features into 5.5.0 * Update * [DataFactory]Added new features into 6.1.0 * update * [DataFactory]Added new features into 6.2.0 * fix a build issue * update * update for comments * [DataFactory]Added new features into 6.3.0 --- .../src/CHANGELOG.md | 6 + .../Models/FactoryGitHubConfiguration.cs | 4 +- .../Models/RestServiceAuthenticationType.cs | 1 + .../Models/RestServiceLinkedService.cs | 64 ++++- .../Generated/Models/SapOdpLinkedService.cs | 271 ++++++++++++++++++ .../Generated/Models/SapOdpResourceDataset.cs | 104 +++++++ .../src/Generated/Models/SapOdpSource.cs | 112 ++++++++ ...rosoft.Azure.Management.DataFactory.csproj | 9 +- .../src/Properties/AssemblyInfo.cs | 2 +- .../JsonSamples/LinkedServiceJsonSamples.cs | 22 ++ 10 files changed, 584 insertions(+), 11 deletions(-) create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SapOdpLinkedService.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SapOdpResourceDataset.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SapOdpSource.cs diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md index b9324a5ded6c5..c6bef5e48f5fc 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.3.0 +### Feature Additions +- Changed FactoryGitHubConfiguration url format for hostName description +- Added SAP ODP connector in ADF +- Added support OAuth2ClientCredential auth in RestSevice + ## Version 6.2.0 ### Feature Additions - Added globalParameters apis into ADF diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FactoryGitHubConfiguration.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FactoryGitHubConfiguration.cs index 37f563160f92c..8722faac6464e 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FactoryGitHubConfiguration.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FactoryGitHubConfiguration.cs @@ -35,7 +35,7 @@ public FactoryGitHubConfiguration() /// Root folder. /// Last commit id. /// GitHub Enterprise host name. For example: - /// https://github.mydomain.com + /// `https://github.mydomain.com` /// GitHub bring your own app client id. /// GitHub bring your own app client secret /// information. @@ -55,7 +55,7 @@ public FactoryGitHubConfiguration() /// /// Gets or sets gitHub Enterprise host name. For example: - /// https://github.mydomain.com + /// `https://github.mydomain.com` /// [JsonProperty(PropertyName = "hostName")] public string HostName { get; set; } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/RestServiceAuthenticationType.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/RestServiceAuthenticationType.cs index 28c096262569c..507bb90f19c5b 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/RestServiceAuthenticationType.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/RestServiceAuthenticationType.cs @@ -20,5 +20,6 @@ public static class RestServiceAuthenticationType public const string Basic = "Basic"; public const string AadServicePrincipal = "AadServicePrincipal"; public const string ManagedServiceIdentity = "ManagedServiceIdentity"; + public const string OAuth2ClientCredential = "OAuth2ClientCredential"; } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/RestServiceLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/RestServiceLinkedService.cs index 189c59e656fbd..416e740ea1b1c 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/RestServiceLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/RestServiceLinkedService.cs @@ -38,7 +38,8 @@ public RestServiceLinkedService() /// The base URL of the REST service. /// Type of authentication used to /// connect to the REST service. Possible values include: 'Anonymous', - /// 'Basic', 'AadServicePrincipal', 'ManagedServiceIdentity' + /// 'Basic', 'AadServicePrincipal', 'ManagedServiceIdentity', + /// 'OAuth2ClientCredential' /// Unmatched properties from the /// message are deserialized this collection /// The integration runtime reference. @@ -77,7 +78,21 @@ public RestServiceLinkedService() /// resultType string). /// The credential reference containing /// authentication information. - public RestServiceLinkedService(object url, string authenticationType, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object enableServerCertificateValidation = default(object), object userName = default(object), SecretBase password = default(SecretBase), object authHeaders = default(object), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object azureCloudType = default(object), object aadResourceId = default(object), object encryptedCredential = default(object), CredentialReference credential = default(CredentialReference)) + /// The client ID associated with your + /// application. Type: string (or Expression with resultType + /// string). + /// The client secret associated with your + /// application. + /// The token endpoint of the authorization + /// server to acquire access token. Type: string (or Expression with + /// resultType string). + /// The target service or resource to which the + /// access will be requested. Type: string (or Expression with + /// resultType string). + /// The scope of the access required. It describes + /// what kind of access will be requested. Type: string (or Expression + /// with resultType string). + public RestServiceLinkedService(object url, string authenticationType, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object enableServerCertificateValidation = default(object), object userName = default(object), SecretBase password = default(SecretBase), object authHeaders = default(object), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object azureCloudType = default(object), object aadResourceId = default(object), object encryptedCredential = default(object), CredentialReference credential = default(CredentialReference), object clientId = default(object), SecretBase clientSecret = default(SecretBase), object tokenEndpoint = default(object), object resource = default(object), object scope = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { Url = url; @@ -93,6 +108,11 @@ public RestServiceLinkedService() AadResourceId = aadResourceId; EncryptedCredential = encryptedCredential; Credential = credential; + ClientId = clientId; + ClientSecret = clientSecret; + TokenEndpoint = tokenEndpoint; + Resource = resource; + Scope = scope; CustomInit(); } @@ -118,7 +138,8 @@ public RestServiceLinkedService() /// /// Gets or sets type of authentication used to connect to the REST /// service. Possible values include: 'Anonymous', 'Basic', - /// 'AadServicePrincipal', 'ManagedServiceIdentity' + /// 'AadServicePrincipal', 'ManagedServiceIdentity', + /// 'OAuth2ClientCredential' /// [JsonProperty(PropertyName = "typeProperties.authenticationType")] public string AuthenticationType { get; set; } @@ -196,6 +217,43 @@ public RestServiceLinkedService() [JsonProperty(PropertyName = "typeProperties.credential")] public CredentialReference Credential { get; set; } + /// + /// Gets or sets the client ID associated with your application. Type: + /// string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.clientId")] + public object ClientId { get; set; } + + /// + /// Gets or sets the client secret associated with your application. + /// + [JsonProperty(PropertyName = "typeProperties.clientSecret")] + public SecretBase ClientSecret { get; set; } + + /// + /// Gets or sets the token endpoint of the authorization server to + /// acquire access token. Type: string (or Expression with resultType + /// string). + /// + [JsonProperty(PropertyName = "typeProperties.tokenEndpoint")] + public object TokenEndpoint { get; set; } + + /// + /// Gets or sets the target service or resource to which the access + /// will be requested. Type: string (or Expression with resultType + /// string). + /// + [JsonProperty(PropertyName = "typeProperties.resource")] + public object Resource { get; set; } + + /// + /// Gets or sets the scope of the access required. It describes what + /// kind of access will be requested. Type: string (or Expression with + /// resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.scope")] + public object Scope { get; set; } + /// /// Validate the object. /// diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SapOdpLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SapOdpLinkedService.cs new file mode 100644 index 0000000000000..407b4f9aae311 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SapOdpLinkedService.cs @@ -0,0 +1,271 @@ +// +// 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; + + /// + /// SAP ODP Linked Service. + /// + [Newtonsoft.Json.JsonObject("SapOdp")] + [Rest.Serialization.JsonTransformation] + public partial class SapOdpLinkedService : LinkedService + { + /// + /// Initializes a new instance of the SapOdpLinkedService class. + /// + public SapOdpLinkedService() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the SapOdpLinkedService class. + /// + /// 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. + /// Host name of the SAP instance where the table + /// is located. Type: string (or Expression with resultType + /// string). + /// System number of the SAP system where + /// the table is located. (Usually a two-digit decimal number + /// represented as a string.) Type: string (or Expression with + /// resultType string). + /// Client ID of the client on the SAP system + /// where the table is located. (Usually a three-digit decimal number + /// represented as a string) Type: string (or Expression with + /// resultType string). + /// Language of the SAP system where the table + /// is located. The default value is EN. Type: string (or Expression + /// with resultType string). + /// SystemID of the SAP system where the table + /// is located. Type: string (or Expression with resultType + /// string). + /// Username to access the SAP server where the + /// table is located. Type: string (or Expression with resultType + /// string). + /// Password to access the SAP server where the + /// table is located. + /// The hostname of the SAP Message Server. + /// Type: string (or Expression with resultType string). + /// The service name or port number + /// of the Message Server. Type: string (or Expression with resultType + /// string). + /// SNC activation indicator to access the SAP + /// server where the table is located. Must be either 0 (off) or 1 + /// (on). Type: string (or Expression with resultType string). + /// Initiator's SNC name to access the SAP + /// server where the table is located. Type: string (or Expression with + /// resultType string). + /// Communication partner's SNC name to + /// access the SAP server where the table is located. Type: string (or + /// Expression with resultType string). + /// External security product's library to + /// access the SAP server where the table is located. Type: string (or + /// Expression with resultType string). + /// SNC Quality of Protection. Allowed value + /// include: 1, 2, 3, 8, 9. Type: string (or Expression with resultType + /// string). + /// SNC X509 certificate file path. + /// Type: string (or Expression with resultType string). + /// The Logon Group for the SAP System. Type: + /// string (or Expression with resultType string). + /// The subscriber name. 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). + public SapOdpLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object server = default(object), object systemNumber = default(object), object clientId = default(object), object language = default(object), object systemId = default(object), object userName = default(object), SecretBase password = default(SecretBase), object messageServer = default(object), object messageServerService = default(object), object sncMode = default(object), object sncMyName = default(object), object sncPartnerName = default(object), object sncLibraryPath = default(object), object sncQop = default(object), object x509CertificatePath = default(object), object logonGroup = default(object), object subscriberName = default(object), object encryptedCredential = default(object)) + : base(additionalProperties, connectVia, description, parameters, annotations) + { + Server = server; + SystemNumber = systemNumber; + ClientId = clientId; + Language = language; + SystemId = systemId; + UserName = userName; + Password = password; + MessageServer = messageServer; + MessageServerService = messageServerService; + SncMode = sncMode; + SncMyName = sncMyName; + SncPartnerName = sncPartnerName; + SncLibraryPath = sncLibraryPath; + SncQop = sncQop; + X509CertificatePath = x509CertificatePath; + LogonGroup = logonGroup; + SubscriberName = subscriberName; + EncryptedCredential = encryptedCredential; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets host name of the SAP instance where the table is + /// located. Type: string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.server")] + public object Server { get; set; } + + /// + /// Gets or sets system number of the SAP system where the table is + /// located. (Usually a two-digit decimal number represented as a + /// string.) Type: string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.systemNumber")] + public object SystemNumber { get; set; } + + /// + /// Gets or sets client ID of the client on the SAP system where the + /// table is located. (Usually a three-digit decimal number represented + /// as a string) Type: string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.clientId")] + public object ClientId { get; set; } + + /// + /// Gets or sets language of the SAP system where the table is located. + /// The default value is EN. Type: string (or Expression with + /// resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.language")] + public object Language { get; set; } + + /// + /// Gets or sets systemID of the SAP system where the table is located. + /// Type: string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.systemId")] + public object SystemId { get; set; } + + /// + /// Gets or sets username to access the SAP server where the table is + /// located. Type: string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.userName")] + public object UserName { get; set; } + + /// + /// Gets or sets password to access the SAP server where the table is + /// located. + /// + [JsonProperty(PropertyName = "typeProperties.password")] + public SecretBase Password { get; set; } + + /// + /// Gets or sets the hostname of the SAP Message Server. Type: string + /// (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.messageServer")] + public object MessageServer { get; set; } + + /// + /// Gets or sets the service name or port number of the Message Server. + /// Type: string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.messageServerService")] + public object MessageServerService { get; set; } + + /// + /// Gets or sets SNC activation indicator to access the SAP server + /// where the table is located. Must be either 0 (off) or 1 (on). Type: + /// string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.sncMode")] + public object SncMode { get; set; } + + /// + /// Gets or sets initiator's SNC name to access the SAP server where + /// the table is located. Type: string (or Expression with resultType + /// string). + /// + [JsonProperty(PropertyName = "typeProperties.sncMyName")] + public object SncMyName { get; set; } + + /// + /// Gets or sets communication partner's SNC name to access the SAP + /// server where the table is located. Type: string (or Expression with + /// resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.sncPartnerName")] + public object SncPartnerName { get; set; } + + /// + /// Gets or sets external security product's library to access the SAP + /// server where the table is located. Type: string (or Expression with + /// resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.sncLibraryPath")] + public object SncLibraryPath { get; set; } + + /// + /// Gets or sets SNC Quality of Protection. Allowed value include: 1, + /// 2, 3, 8, 9. Type: string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.sncQop")] + public object SncQop { get; set; } + + /// + /// Gets or sets SNC X509 certificate file path. Type: string (or + /// Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.x509CertificatePath")] + public object X509CertificatePath { get; set; } + + /// + /// Gets or sets the Logon Group for the SAP System. Type: string (or + /// Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.logonGroup")] + public object LogonGroup { get; set; } + + /// + /// Gets or sets the subscriber name. Type: string (or Expression with + /// resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.subscriberName")] + public object SubscriberName { get; set; } + + /// + /// Gets or sets the encrypted credential used for authentication. + /// Credentials are encrypted using the integration runtime credential + /// manager. Type: string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.encryptedCredential")] + public object EncryptedCredential { get; set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public override void Validate() + { + base.Validate(); + } + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SapOdpResourceDataset.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SapOdpResourceDataset.cs new file mode 100644 index 0000000000000..2859c0ac03725 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SapOdpResourceDataset.cs @@ -0,0 +1,104 @@ +// +// 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; + + /// + /// SAP ODP Resource properties. + /// + [Newtonsoft.Json.JsonObject("SapOdpResource")] + [Rest.Serialization.JsonTransformation] + public partial class SapOdpResourceDataset : Dataset + { + /// + /// Initializes a new instance of the SapOdpResourceDataset class. + /// + public SapOdpResourceDataset() + { + LinkedServiceName = new LinkedServiceReference(); + CustomInit(); + } + + /// + /// Initializes a new instance of the SapOdpResourceDataset class. + /// + /// Linked service reference. + /// The context of the SAP ODP Object. Type: + /// string (or Expression with resultType string). + /// The name of the SAP ODP Object. Type: + /// string (or Expression with resultType string). + /// Unmatched properties from the + /// message are deserialized this collection + /// Dataset description. + /// Columns that define the structure of the + /// dataset. Type: array (or Expression with resultType array), + /// itemType: DatasetDataElement. + /// Columns that define the physical type schema + /// of the dataset. Type: array (or Expression with resultType array), + /// itemType: DatasetSchemaDataElement. + /// Parameters for dataset. + /// List of tags that can be used for + /// describing the Dataset. + /// The folder that this Dataset is in. If not + /// specified, Dataset will appear at the root level. + public SapOdpResourceDataset(LinkedServiceReference linkedServiceName, object context, object objectName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), object schema = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) + { + Context = context; + ObjectName = objectName; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the context of the SAP ODP Object. Type: string (or + /// Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.context")] + public object Context { get; set; } + + /// + /// Gets or sets the name of the SAP ODP Object. Type: string (or + /// Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.objectName")] + public object ObjectName { get; set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public override void Validate() + { + base.Validate(); + if (Context == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "Context"); + } + if (ObjectName == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "ObjectName"); + } + } + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SapOdpSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SapOdpSource.cs new file mode 100644 index 0000000000000..3cc7e910832fa --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SapOdpSource.cs @@ -0,0 +1,112 @@ +// +// 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; + + /// + /// A copy activity source for SAP ODP source. + /// + public partial class SapOdpSource : TabularSource + { + /// + /// Initializes a new instance of the SapOdpSource class. + /// + public SapOdpSource() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the SapOdpSource class. + /// + /// Unmatched properties from the + /// message are deserialized this collection + /// Source retry count. Type: integer + /// (or Expression with resultType integer). + /// Source retry wait. Type: string (or + /// Expression with resultType string), pattern: + /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// The maximum concurrent + /// connection count for the source data store. Type: integer (or + /// Expression with resultType integer). + /// If true, disable data store + /// metrics collection. Default is false. Type: boolean (or Expression + /// with resultType boolean). + /// Query timeout. Type: string (or + /// Expression with resultType string), pattern: + /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (or Expression with resultType array of objects). + /// The extraction mode. Allowed value + /// include: Full, Delta and Recovery. The default value is Full. Type: + /// string (or Expression with resultType string). + /// The subscriber process to manage + /// the delta process. Type: string (or Expression with resultType + /// string). + /// Specifies the selection conditions from + /// source data. Type: array of objects(selection) (or Expression with + /// resultType array of objects). + /// Specifies the columns to be selected from + /// source data. Type: array of objects(projection) (or Expression with + /// resultType array of objects). + public SapOdpSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object extractionMode = default(object), object subscriberProcess = default(object), object selection = default(object), object projection = default(object)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) + { + ExtractionMode = extractionMode; + SubscriberProcess = subscriberProcess; + Selection = selection; + Projection = projection; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the extraction mode. Allowed value include: Full, + /// Delta and Recovery. The default value is Full. Type: string (or + /// Expression with resultType string). + /// + [JsonProperty(PropertyName = "extractionMode")] + public object ExtractionMode { get; set; } + + /// + /// Gets or sets the subscriber process to manage the delta process. + /// Type: string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "subscriberProcess")] + public object SubscriberProcess { get; set; } + + /// + /// Gets or sets specifies the selection conditions from source data. + /// Type: array of objects(selection) (or Expression with resultType + /// array of objects). + /// + [JsonProperty(PropertyName = "selection")] + public object Selection { get; set; } + + /// + /// Gets or sets specifies the columns to be selected from source data. + /// Type: array of objects(projection) (or Expression with resultType + /// array of objects). + /// + [JsonProperty(PropertyName = "projection")] + public object Projection { 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 717affd1dab8a..7953b080cd973 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,15 +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. - 6.2.0 + 6.3.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 b5d3283f55326..6c219afa4ac90 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("6.0.0.0")] -[assembly: AssemblyFileVersion("6.2.0.0")] +[assembly: AssemblyFileVersion("6.3.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 90bf33d2fe852..bc66d2cf449bb 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/LinkedServiceJsonSamples.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/LinkedServiceJsonSamples.cs @@ -3385,6 +3385,28 @@ public class LinkedServiceJsonSamples : JsonSampleCollection