Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DataFactory]Upgrade SDK Version To 0.2.0 #23107

Merged
merged 1 commit into from
Oct 31, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@ public GoogleAdWordsLinkedService()
/// <param name="parameters">Parameters for linked service.</param>
/// <param name="annotations">List of tags that can be used for
/// describing the linked service.</param>
/// <param name="connectionProperties">Properties used to connect to
/// GoogleAds. It is mutually exclusive with any other properties in
/// the linked service. Type: object.</param>
/// <param name="clientCustomerID">The Client customer ID of the
/// AdWords account that you want to fetch report data for. Type:
/// string (or Expression with resultType string).</param>
Expand All @@ -65,37 +62,39 @@ public GoogleAdWordsLinkedService()
/// <param name="email">The service account email ID that is used for
/// ServiceAuthentication and can only be used on self-hosted IR. Type:
/// string (or Expression with resultType string).</param>
/// <param name="keyFilePath">The full path to the .p12 key file that
/// is used to authenticate the service account email address and can
/// only be used on self-hosted IR. Type: string (or Expression with
/// resultType string).</param>
/// <param name="trustedCertPath">The full path of the .pem file
/// containing trusted CA certificates for verifying the server when
/// connecting over SSL. This property can only be set when using SSL
/// on self-hosted IR. The default value is the cacerts.pem file
/// installed with the IR. Type: string (or Expression with resultType
/// <param name="privateKey">The private key that is used to
/// authenticate the service account email address and can only be used
/// on self-hosted IR.</param>
/// <param name="loginCustomerID">The customer ID of the Google Ads
/// Manager account through which you want to fetch report data of
/// specific Customer. Type: string (or Expression with resultType
/// string).</param>
/// <param name="useSystemTrustStore">Specifies whether to use a CA
/// certificate from the system trust store or from a specified PEM
/// file. The default value is false. Type: boolean (or Expression with
/// resultType boolean).</param>
/// <param name="googleAdsApiVersion">The Google Ads API major version
/// such as v14. The supported major versions could be found on
/// https://developers.google.com/google-ads/api/docs/sunset-dates#timetable.
/// Type: string (or Expression with resultType string).</param>
/// <param name="supportLegacyDataTypes">Specifies whether to use the
/// legacy data type mappings, which maps float, int32 and int64 from
/// Google to string. Do not set this to true unless you want to keep
/// backward compatibility with legacy driver's data type mappings.
/// Type: boolean (or Expression with resultType boolean).</param>
/// <param name="encryptedCredential">The encrypted credential used for
/// authentication. Credentials are encrypted using the integration
/// runtime credential manager. Type: string.</param>
public GoogleAdWordsLinkedService(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary<string, ParameterSpecification> parameters = default(IDictionary<string, ParameterSpecification>), IList<object> annotations = default(IList<object>), object connectionProperties = default(object), object clientCustomerID = default(object), SecretBase developerToken = default(SecretBase), string authenticationType = default(string), SecretBase refreshToken = default(SecretBase), object clientId = default(object), SecretBase clientSecret = default(SecretBase), object email = default(object), object keyFilePath = default(object), object trustedCertPath = default(object), object useSystemTrustStore = default(object), string encryptedCredential = default(string))
public GoogleAdWordsLinkedService(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary<string, ParameterSpecification> parameters = default(IDictionary<string, ParameterSpecification>), IList<object> annotations = default(IList<object>), object clientCustomerID = default(object), SecretBase developerToken = default(SecretBase), string authenticationType = default(string), SecretBase refreshToken = default(SecretBase), object clientId = default(object), SecretBase clientSecret = default(SecretBase), object email = default(object), SecretBase privateKey = default(SecretBase), object loginCustomerID = default(object), object googleAdsApiVersion = default(object), object supportLegacyDataTypes = default(object), string encryptedCredential = default(string))
: base(additionalProperties, connectVia, description, parameters, annotations)
{
ConnectionProperties = connectionProperties;
ClientCustomerID = clientCustomerID;
DeveloperToken = developerToken;
AuthenticationType = authenticationType;
RefreshToken = refreshToken;
ClientId = clientId;
ClientSecret = clientSecret;
Email = email;
KeyFilePath = keyFilePath;
TrustedCertPath = trustedCertPath;
UseSystemTrustStore = useSystemTrustStore;
PrivateKey = privateKey;
LoginCustomerID = loginCustomerID;
GoogleAdsApiVersion = googleAdsApiVersion;
SupportLegacyDataTypes = supportLegacyDataTypes;
EncryptedCredential = encryptedCredential;
CustomInit();
}
Expand All @@ -105,14 +104,6 @@ public GoogleAdWordsLinkedService()
/// </summary>
partial void CustomInit();

/// <summary>
/// Gets or sets properties used to connect to GoogleAds. It is
/// mutually exclusive with any other properties in the linked service.
/// Type: object.
/// </summary>
[JsonProperty(PropertyName = "typeProperties.connectionProperties")]
public object ConnectionProperties { get; set; }

/// <summary>
/// Gets or sets the Client customer ID of the AdWords account that you
/// want to fetch report data for. Type: string (or Expression with
Expand Down Expand Up @@ -168,31 +159,39 @@ public GoogleAdWordsLinkedService()
public object Email { get; set; }

/// <summary>
/// Gets or sets the full path to the .p12 key file that is used to
/// authenticate the service account email address and can only be used
/// on self-hosted IR. Type: string (or Expression with resultType
/// string).
/// Gets or sets the private key that is used to authenticate the
/// service account email address and can only be used on self-hosted
/// IR.
/// </summary>
[JsonProperty(PropertyName = "typeProperties.keyFilePath")]
public object KeyFilePath { get; set; }
[JsonProperty(PropertyName = "typeProperties.privateKey")]
public SecretBase PrivateKey { get; set; }

/// <summary>
/// Gets or sets the full path of the .pem file containing trusted CA
/// certificates for verifying the server when connecting over SSL.
/// This property can only be set when using SSL on self-hosted IR. The
/// default value is the cacerts.pem file installed with the IR. Type:
/// string (or Expression with resultType string).
/// Gets or sets the customer ID of the Google Ads Manager account
/// through which you want to fetch report data of specific Customer.
/// Type: string (or Expression with resultType string).
/// </summary>
[JsonProperty(PropertyName = "typeProperties.loginCustomerID")]
public object LoginCustomerID { get; set; }

/// <summary>
/// Gets or sets the Google Ads API major version such as v14. The
/// supported major versions could be found on
/// https://developers.google.com/google-ads/api/docs/sunset-dates#timetable.
/// Type: string (or Expression with resultType string).
/// </summary>
[JsonProperty(PropertyName = "typeProperties.trustedCertPath")]
public object TrustedCertPath { get; set; }
[JsonProperty(PropertyName = "typeProperties.googleAdsApiVersion")]
public object GoogleAdsApiVersion { get; set; }

/// <summary>
/// Gets or sets specifies whether to use a CA certificate from the
/// system trust store or from a specified PEM file. The default value
/// is false. Type: boolean (or Expression with resultType boolean).
/// Gets or sets specifies whether to use the legacy data type
/// mappings, which maps float, int32 and int64 from Google to string.
/// Do not set this to true unless you want to keep backward
/// compatibility with legacy driver's data type mappings. Type:
/// boolean (or Expression with resultType boolean).
/// </summary>
[JsonProperty(PropertyName = "typeProperties.useSystemTrustStore")]
public object UseSystemTrustStore { get; set; }
[JsonProperty(PropertyName = "typeProperties.supportLegacyDataTypes")]
public object SupportLegacyDataTypes { get; set; }

/// <summary>
/// Gets or sets the encrypted credential used for authentication.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
// <auto-generated>
// 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.
// </auto-generated>

namespace Microsoft.Azure.Management.DataFactory.Models
{
using Newtonsoft.Json;
using System.Collections;
using System.Collections.Generic;
using System.Linq;

/// <summary>
/// Parquet read settings.
/// </summary>
[Newtonsoft.Json.JsonObject("ParquetReadSettings")]
public partial class ParquetReadSettings : FormatReadSettings
{
/// <summary>
/// Initializes a new instance of the ParquetReadSettings class.
/// </summary>
public ParquetReadSettings()
{
CustomInit();
}

/// <summary>
/// Initializes a new instance of the ParquetReadSettings class.
/// </summary>
/// <param name="additionalProperties">Unmatched properties from the
/// message are deserialized this collection</param>
/// <param name="compressionProperties">Compression settings.</param>
public ParquetReadSettings(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), CompressionReadSettings compressionProperties = default(CompressionReadSettings))
: base(additionalProperties)
{
CompressionProperties = compressionProperties;
CustomInit();
}

/// <summary>
/// An initialization method that performs custom operations like setting defaults
/// </summary>
partial void CustomInit();

/// <summary>
/// Gets or sets compression settings.
/// </summary>
[JsonProperty(PropertyName = "compressionProperties")]
public CompressionReadSettings CompressionProperties { get; set; }

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,15 @@ public ParquetSource()
/// metrics collection. Default is false. Type: boolean (or Expression
/// with resultType boolean).</param>
/// <param name="storeSettings">Parquet store settings.</param>
/// <param name="formatSettings">Parquet format settings.</param>
/// <param name="additionalColumns">Specifies the additional columns to
/// be added to source data. Type: array of objects(AdditionalColumns)
/// (or Expression with resultType array of objects).</param>
public ParquetSource(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), StoreReadSettings storeSettings = default(StoreReadSettings), object additionalColumns = default(object))
public ParquetSource(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), StoreReadSettings storeSettings = default(StoreReadSettings), ParquetReadSettings formatSettings = default(ParquetReadSettings), object additionalColumns = default(object))
: base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection)
{
StoreSettings = storeSettings;
FormatSettings = formatSettings;
AdditionalColumns = additionalColumns;
CustomInit();
}
Expand All @@ -68,6 +70,12 @@ public ParquetSource()
[JsonProperty(PropertyName = "storeSettings")]
public StoreReadSettings StoreSettings { get; set; }

/// <summary>
/// Gets or sets parquet format settings.
/// </summary>
[JsonProperty(PropertyName = "formatSettings")]
public ParquetReadSettings FormatSettings { get; set; }

/// <summary>
/// Gets or sets specifies the additional columns to be added to source
/// data. Type: array of objects(AdditionalColumns) (or Expression with
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@
[assembly: CLSCompliant(false)]
[assembly: Guid("F0FA0885-A662-4E33-8495-2A7DC03A0855")]

[assembly: AssemblyVersion("0.1.0")]
[assembly: AssemblyFileVersion("0.1.0")]
[assembly: AssemblyVersion("0.2.0")]
[assembly: AssemblyFileVersion("0.2.0")]
2 changes: 1 addition & 1 deletion src/DataFactory/DataFactory.Management.Sdk/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ payload-flattening-threshold: 2

###
``` yaml
commit: 9ec0fcc278aa2128c4fbb2b8a1aa93432d72cce0
commit: 9464b7e7f74c6676d729095492575c4331ca144f
input-file:
- https://github.com/Azure/azure-rest-api-specs/blob/$(commit)/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/datafactory.json

Expand Down
1 change: 1 addition & 0 deletions src/DataFactory/DataFactoryV2/ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
- Additional information about change #1
-->
## Upcoming Release
* Added ParquetReadSettings in ADF
* Fixed minor issues

## Version 1.17.0
Expand Down