Skip to content

Commit 4be031b

Browse files
authored
[DataFactory]Support New Features In ADF (#26070)
1 parent 924eb68 commit 4be031b

File tree

8 files changed

+364
-7
lines changed

8 files changed

+364
-7
lines changed
Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
// Copyright (c) Microsoft Corporation. All rights reserved.
2+
// Licensed under the MIT License. See License.txt in the project root for license information.
3+
// Code generated by Microsoft (R) AutoRest Code Generator.
4+
// Changes may cause incorrect behavior and will be lost if the code is regenerated.
5+
6+
namespace Microsoft.Azure.Management.DataFactory.Models
7+
{
8+
using System.Linq;
9+
10+
/// <summary>
11+
/// Iceberg dataset.
12+
/// </summary>
13+
[Newtonsoft.Json.JsonObject("Iceberg")]
14+
[Microsoft.Rest.Serialization.JsonTransformation]
15+
public partial class IcebergDataset : Dataset
16+
{
17+
/// <summary>
18+
/// Initializes a new instance of the IcebergDataset class.
19+
/// </summary>
20+
public IcebergDataset()
21+
{
22+
this.LinkedServiceName = new LinkedServiceReference();
23+
CustomInit();
24+
}
25+
26+
/// <summary>
27+
/// Initializes a new instance of the IcebergDataset class.
28+
/// </summary>
29+
30+
/// <param name="additionalProperties">The Azure Data Factory nested object which identifies data within different
31+
/// data stores, such as tables, files, folders, and documents.
32+
/// </param>
33+
34+
/// <param name="description">Dataset description.
35+
/// </param>
36+
37+
/// <param name="structure">Columns that define the structure of the dataset. Type: array (or
38+
/// Expression with resultType array), itemType: DatasetDataElement.
39+
/// </param>
40+
41+
/// <param name="schema">Columns that define the physical type schema of the dataset. Type: array
42+
/// (or Expression with resultType array), itemType: DatasetSchemaDataElement.
43+
/// </param>
44+
45+
/// <param name="linkedServiceName">Linked service reference.
46+
/// </param>
47+
48+
/// <param name="parameters">Parameters for dataset.
49+
/// </param>
50+
51+
/// <param name="annotations">List of tags that can be used for describing the Dataset.
52+
/// </param>
53+
54+
/// <param name="folder">The folder that this Dataset is in. If not specified, Dataset will appear
55+
/// at the root level.
56+
/// </param>
57+
58+
/// <param name="location">The location of the iceberg storage. Setting a file name is not allowed for
59+
/// iceberg format.
60+
/// </param>
61+
public IcebergDataset(LinkedServiceReference linkedServiceName, System.Collections.Generic.IDictionary<string, object> additionalProperties = default(System.Collections.Generic.IDictionary<string, object>), string description = default(string), object structure = default(object), object schema = default(object), System.Collections.Generic.IDictionary<string, ParameterSpecification> parameters = default(System.Collections.Generic.IDictionary<string, ParameterSpecification>), System.Collections.Generic.IList<object> annotations = default(System.Collections.Generic.IList<object>), DatasetFolder folder = default(DatasetFolder), DatasetLocation location = default(DatasetLocation))
62+
63+
: base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder)
64+
{
65+
this.Location = location;
66+
CustomInit();
67+
}
68+
69+
/// <summary>
70+
/// An initialization method that performs custom operations like setting defaults
71+
/// </summary>
72+
partial void CustomInit();
73+
74+
75+
/// <summary>
76+
/// Gets or sets the location of the iceberg storage. Setting a file name is
77+
/// not allowed for iceberg format.
78+
/// </summary>
79+
[Newtonsoft.Json.JsonProperty(PropertyName = "typeProperties.location")]
80+
public DatasetLocation Location {get; set; }
81+
/// <summary>
82+
/// Validate the object.
83+
/// </summary>
84+
/// <exception cref="Microsoft.Rest.ValidationException">
85+
/// Thrown if validation fails
86+
/// </exception>
87+
public override void Validate()
88+
{
89+
base.Validate();
90+
91+
}
92+
}
93+
}
Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
// Copyright (c) Microsoft Corporation. All rights reserved.
2+
// Licensed under the MIT License. See License.txt in the project root for license information.
3+
// Code generated by Microsoft (R) AutoRest Code Generator.
4+
// Changes may cause incorrect behavior and will be lost if the code is regenerated.
5+
6+
namespace Microsoft.Azure.Management.DataFactory.Models
7+
{
8+
using System.Linq;
9+
10+
/// <summary>
11+
/// Iceberg dataset properties.
12+
/// </summary>
13+
public partial class IcebergDatasetTypeProperties
14+
{
15+
/// <summary>
16+
/// Initializes a new instance of the IcebergDatasetTypeProperties class.
17+
/// </summary>
18+
public IcebergDatasetTypeProperties()
19+
{
20+
CustomInit();
21+
}
22+
23+
/// <summary>
24+
/// Initializes a new instance of the IcebergDatasetTypeProperties class.
25+
/// </summary>
26+
27+
/// <param name="location">The location of the iceberg storage. Setting a file name is not allowed for
28+
/// iceberg format.
29+
/// </param>
30+
public IcebergDatasetTypeProperties(DatasetLocation location)
31+
32+
{
33+
this.Location = location;
34+
CustomInit();
35+
}
36+
37+
/// <summary>
38+
/// An initialization method that performs custom operations like setting defaults
39+
/// </summary>
40+
partial void CustomInit();
41+
42+
43+
/// <summary>
44+
/// Gets or sets the location of the iceberg storage. Setting a file name is
45+
/// not allowed for iceberg format.
46+
/// </summary>
47+
[Newtonsoft.Json.JsonProperty(PropertyName = "location")]
48+
public DatasetLocation Location {get; set; }
49+
/// <summary>
50+
/// Validate the object.
51+
/// </summary>
52+
/// <exception cref="Microsoft.Rest.ValidationException">
53+
/// Thrown if validation fails
54+
/// </exception>
55+
public virtual void Validate()
56+
{
57+
if (this.Location == null)
58+
{
59+
throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.CannotBeNull, "Location");
60+
}
61+
62+
}
63+
}
64+
}
Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
// Copyright (c) Microsoft Corporation. All rights reserved.
2+
// Licensed under the MIT License. See License.txt in the project root for license information.
3+
// Code generated by Microsoft (R) AutoRest Code Generator.
4+
// Changes may cause incorrect behavior and will be lost if the code is regenerated.
5+
6+
namespace Microsoft.Azure.Management.DataFactory.Models
7+
{
8+
using System.Linq;
9+
10+
/// <summary>
11+
/// A copy activity Iceberg sink.
12+
/// </summary>
13+
[Newtonsoft.Json.JsonObject("IcebergSink")]
14+
public partial class IcebergSink : CopySink
15+
{
16+
/// <summary>
17+
/// Initializes a new instance of the IcebergSink class.
18+
/// </summary>
19+
public IcebergSink()
20+
{
21+
CustomInit();
22+
}
23+
24+
/// <summary>
25+
/// Initializes a new instance of the IcebergSink class.
26+
/// </summary>
27+
28+
/// <param name="writeBatchSize">Write batch size. Type: integer (or Expression with resultType integer),
29+
/// minimum: 0.
30+
/// </param>
31+
32+
/// <param name="writeBatchTimeout">Write batch timeout. Type: string (or Expression with resultType string),
33+
/// pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])).
34+
/// </param>
35+
36+
/// <param name="sinkRetryCount">Sink retry count. Type: integer (or Expression with resultType integer).
37+
/// </param>
38+
39+
/// <param name="sinkRetryWait">Sink retry wait. Type: string (or Expression with resultType string),
40+
/// pattern: ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])).
41+
/// </param>
42+
43+
/// <param name="maxConcurrentConnections">The maximum concurrent connection count for the sink data store. Type:
44+
/// integer (or Expression with resultType integer).
45+
/// </param>
46+
47+
/// <param name="disableMetricsCollection">If true, disable data store metrics collection. Default is false. Type:
48+
/// boolean (or Expression with resultType boolean).
49+
/// </param>
50+
51+
/// <param name="storeSettings">Iceberg store settings.
52+
/// </param>
53+
54+
/// <param name="formatSettings">Iceberg format settings.
55+
/// </param>
56+
public IcebergSink(object writeBatchSize = default(object), object writeBatchTimeout = default(object), object sinkRetryCount = default(object), object sinkRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), StoreWriteSettings storeSettings = default(StoreWriteSettings), IcebergWriteSettings formatSettings = default(IcebergWriteSettings))
57+
58+
: base(writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection)
59+
{
60+
this.StoreSettings = storeSettings;
61+
this.FormatSettings = formatSettings;
62+
CustomInit();
63+
}
64+
65+
/// <summary>
66+
/// An initialization method that performs custom operations like setting defaults
67+
/// </summary>
68+
partial void CustomInit();
69+
70+
71+
/// <summary>
72+
/// Gets or sets iceberg store settings.
73+
/// </summary>
74+
[Newtonsoft.Json.JsonProperty(PropertyName = "storeSettings")]
75+
public StoreWriteSettings StoreSettings {get; set; }
76+
77+
/// <summary>
78+
/// Gets or sets iceberg format settings.
79+
/// </summary>
80+
[Newtonsoft.Json.JsonProperty(PropertyName = "formatSettings")]
81+
public IcebergWriteSettings FormatSettings {get; set; }
82+
}
83+
}
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
// Copyright (c) Microsoft Corporation. All rights reserved.
2+
// Licensed under the MIT License. See License.txt in the project root for license information.
3+
// Code generated by Microsoft (R) AutoRest Code Generator.
4+
// Changes may cause incorrect behavior and will be lost if the code is regenerated.
5+
6+
namespace Microsoft.Azure.Management.DataFactory.Models
7+
{
8+
using System.Linq;
9+
10+
/// <summary>
11+
/// Iceberg write settings.
12+
/// </summary>
13+
[Newtonsoft.Json.JsonObject("IcebergWriteSettings")]
14+
public partial class IcebergWriteSettings : FormatWriteSettings
15+
{
16+
/// <summary>
17+
/// Initializes a new instance of the IcebergWriteSettings class.
18+
/// </summary>
19+
public IcebergWriteSettings()
20+
{
21+
CustomInit();
22+
}
23+
24+
/// <summary>
25+
/// Initializes a new instance of the IcebergWriteSettings class.
26+
/// </summary>
27+
28+
/// <param name="additionalProperties">Format write settings.
29+
/// </param>
30+
public IcebergWriteSettings(System.Collections.Generic.IDictionary<string, object> additionalProperties = default(System.Collections.Generic.IDictionary<string, object>))
31+
32+
: base(additionalProperties)
33+
{
34+
CustomInit();
35+
}
36+
37+
/// <summary>
38+
/// An initialization method that performs custom operations like setting defaults
39+
/// </summary>
40+
partial void CustomInit();
41+
42+
}
43+
}

src/DataFactory/DataFactory.Management.Sdk/Generated/Models/MariaDBLinkedService.cs

Lines changed: 39 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ public MariaDBLinkedService()
4747

4848
/// <param name="driverVersion">The version of the MariaDB driver. Type: string. V1 or empty for legacy
4949
/// driver, V2 for new driver. V1 can support connection string and property
50-
/// bag, V2 can only support connection string.
50+
/// bag, V2 can only support connection string. The legacy driver is scheduled
51+
/// for deprecation by October 2024.
5152
/// </param>
5253

5354
/// <param name="connectionString">An ODBC connection string. Type: string, SecureString or
@@ -66,13 +67,25 @@ public MariaDBLinkedService()
6667
/// <param name="database">Database name for connection. Type: string.
6768
/// </param>
6869

70+
/// <param name="sslMode">This option specifies whether the driver uses TLS encryption and
71+
/// verification when connecting to MariaDB. E.g., SSLMode=&lt;0/1/2/3/4&gt;.
72+
/// Options: DISABLED (0) / PREFERRED (1) (Default) / REQUIRED (2) / VERIFY_CA
73+
/// (3) / VERIFY_IDENTITY (4), REQUIRED (2) is recommended to only allow
74+
/// connections encrypted with SSL/TLS.
75+
/// </param>
76+
77+
/// <param name="useSystemTrustStore">This option specifies whether to use a CA certificate from the system trust
78+
/// store, or from a specified PEM file. E.g. UseSystemTrustStore=&lt;0/1&gt;;
79+
/// Options: Enabled (1) / Disabled (0) (Default)
80+
/// </param>
81+
6982
/// <param name="password">The Azure key vault secret reference of password in connection string.
7083
/// </param>
7184

7285
/// <param name="encryptedCredential">The encrypted credential used for authentication. Credentials are encrypted
7386
/// using the integration runtime credential manager. Type: string.
7487
/// </param>
75-
public MariaDBLinkedService(System.Collections.Generic.IDictionary<string, object> additionalProperties = default(System.Collections.Generic.IDictionary<string, object>), string version = default(string), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), System.Collections.Generic.IDictionary<string, ParameterSpecification> parameters = default(System.Collections.Generic.IDictionary<string, ParameterSpecification>), System.Collections.Generic.IList<object> annotations = default(System.Collections.Generic.IList<object>), object driverVersion = default(object), object connectionString = default(object), object server = default(object), object port = default(object), object username = default(object), object database = default(object), AzureKeyVaultSecretReference password = default(AzureKeyVaultSecretReference), string encryptedCredential = default(string))
88+
public MariaDBLinkedService(System.Collections.Generic.IDictionary<string, object> additionalProperties = default(System.Collections.Generic.IDictionary<string, object>), string version = default(string), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), System.Collections.Generic.IDictionary<string, ParameterSpecification> parameters = default(System.Collections.Generic.IDictionary<string, ParameterSpecification>), System.Collections.Generic.IList<object> annotations = default(System.Collections.Generic.IList<object>), object driverVersion = default(object), object connectionString = default(object), object server = default(object), object port = default(object), object username = default(object), object database = default(object), object sslMode = default(object), object useSystemTrustStore = default(object), AzureKeyVaultSecretReference password = default(AzureKeyVaultSecretReference), string encryptedCredential = default(string))
7689

7790
: base(additionalProperties, version, connectVia, description, parameters, annotations)
7891
{
@@ -82,6 +95,8 @@ public MariaDBLinkedService()
8295
this.Port = port;
8396
this.Username = username;
8497
this.Database = database;
98+
this.SslMode = sslMode;
99+
this.UseSystemTrustStore = useSystemTrustStore;
85100
this.Password = password;
86101
this.EncryptedCredential = encryptedCredential;
87102
CustomInit();
@@ -96,7 +111,8 @@ public MariaDBLinkedService()
96111
/// <summary>
97112
/// Gets or sets the version of the MariaDB driver. Type: string. V1 or empty
98113
/// for legacy driver, V2 for new driver. V1 can support connection string and
99-
/// property bag, V2 can only support connection string.
114+
/// property bag, V2 can only support connection string. The legacy driver is
115+
/// scheduled for deprecation by October 2024.
100116
/// </summary>
101117
[Newtonsoft.Json.JsonProperty(PropertyName = "typeProperties.driverVersion")]
102118
public object DriverVersion {get; set; }
@@ -132,6 +148,24 @@ public MariaDBLinkedService()
132148
[Newtonsoft.Json.JsonProperty(PropertyName = "typeProperties.database")]
133149
public object Database {get; set; }
134150

151+
/// <summary>
152+
/// Gets or sets this option specifies whether the driver uses TLS encryption
153+
/// and verification when connecting to MariaDB. E.g., SSLMode=&lt;0/1/2/3/4&gt;.
154+
/// Options: DISABLED (0) / PREFERRED (1) (Default) / REQUIRED (2) / VERIFY_CA
155+
/// (3) / VERIFY_IDENTITY (4), REQUIRED (2) is recommended to only allow
156+
/// connections encrypted with SSL/TLS.
157+
/// </summary>
158+
[Newtonsoft.Json.JsonProperty(PropertyName = "typeProperties.sslMode")]
159+
public object SslMode {get; set; }
160+
161+
/// <summary>
162+
/// Gets or sets this option specifies whether to use a CA certificate from the
163+
/// system trust store, or from a specified PEM file. E.g.
164+
/// UseSystemTrustStore=&lt;0/1&gt;; Options: Enabled (1) / Disabled (0) (Default)
165+
/// </summary>
166+
[Newtonsoft.Json.JsonProperty(PropertyName = "typeProperties.useSystemTrustStore")]
167+
public object UseSystemTrustStore {get; set; }
168+
135169
/// <summary>
136170
/// Gets or sets the Azure key vault secret reference of password in connection
137171
/// string.
@@ -161,6 +195,8 @@ public override void Validate()
161195

162196

163197

198+
199+
164200
if (this.Password != null)
165201
{
166202
this.Password.Validate();

0 commit comments

Comments
 (0)