Skip to content

Commit 5cd1e81

Browse files
[DataFactory]Support New Features In ADF (#25600)
* [DataFactory]Support New Features In ADF * Update ChangeLog.md --------- Co-authored-by: Yabo Hu <[email protected]>
1 parent a8b308f commit 5cd1e81

21 files changed

+411
-33
lines changed

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

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,14 @@ public AzureTableStorageLinkedService()
6060
/// <param name="encryptedCredential">The encrypted credential used for authentication. Credentials are encrypted
6161
/// using the integration runtime credential manager. Type: string.
6262
/// </param>
63-
public AzureTableStorageLinkedService(System.Collections.Generic.IDictionary<string, object> additionalProperties = default(System.Collections.Generic.IDictionary<string, object>), 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 connectionString = default(object), AzureKeyVaultSecretReference accountKey = default(AzureKeyVaultSecretReference), object sasUri = default(object), AzureKeyVaultSecretReference sasToken = default(AzureKeyVaultSecretReference), string encryptedCredential = default(string))
63+
64+
/// <param name="serviceEndpoint">Table service endpoint of the Azure Table Storage resource. It is mutually
65+
/// exclusive with connectionString, sasUri property.
66+
/// </param>
67+
68+
/// <param name="credential">The credential reference containing authentication information.
69+
/// </param>
70+
public AzureTableStorageLinkedService(System.Collections.Generic.IDictionary<string, object> additionalProperties = default(System.Collections.Generic.IDictionary<string, object>), 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 connectionString = default(object), AzureKeyVaultSecretReference accountKey = default(AzureKeyVaultSecretReference), object sasUri = default(object), AzureKeyVaultSecretReference sasToken = default(AzureKeyVaultSecretReference), string encryptedCredential = default(string), object serviceEndpoint = default(object), CredentialReference credential = default(CredentialReference))
6471

6572
: base(additionalProperties, connectVia, description, parameters, annotations)
6673
{
@@ -69,6 +76,8 @@ public AzureTableStorageLinkedService()
6976
this.SasUri = sasUri;
7077
this.SasToken = sasToken;
7178
this.EncryptedCredential = encryptedCredential;
79+
this.ServiceEndpoint = serviceEndpoint;
80+
this.Credential = credential;
7281
CustomInit();
7382
}
7483

@@ -113,6 +122,20 @@ public AzureTableStorageLinkedService()
113122
/// </summary>
114123
[Newtonsoft.Json.JsonProperty(PropertyName = "typeProperties.encryptedCredential")]
115124
public string EncryptedCredential {get; set; }
125+
126+
/// <summary>
127+
/// Gets or sets table service endpoint of the Azure Table Storage resource. It
128+
/// is mutually exclusive with connectionString, sasUri property.
129+
/// </summary>
130+
[Newtonsoft.Json.JsonProperty(PropertyName = "typeProperties.serviceEndpoint")]
131+
public object ServiceEndpoint {get; set; }
132+
133+
/// <summary>
134+
/// Gets or sets the credential reference containing authentication
135+
/// information.
136+
/// </summary>
137+
[Newtonsoft.Json.JsonProperty(PropertyName = "typeProperties.credential")]
138+
public CredentialReference Credential {get; set; }
116139
/// <summary>
117140
/// Validate the object.
118141
/// </summary>
@@ -133,6 +156,11 @@ public override void Validate()
133156
this.SasToken.Validate();
134157
}
135158

159+
160+
if (this.Credential != null)
161+
{
162+
this.Credential.Validate();
163+
}
136164
}
137165
}
138166
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
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+
/// Azure Table Storage linked service properties.
12+
/// </summary>
13+
public partial class AzureTableStorageLinkedServiceTypeProperties : AzureStorageLinkedServiceTypeProperties
14+
{
15+
/// <summary>
16+
/// Initializes a new instance of the AzureTableStorageLinkedServiceTypeProperties class.
17+
/// </summary>
18+
public AzureTableStorageLinkedServiceTypeProperties()
19+
{
20+
CustomInit();
21+
}
22+
23+
/// <summary>
24+
/// Initializes a new instance of the AzureTableStorageLinkedServiceTypeProperties class.
25+
/// </summary>
26+
27+
/// <param name="connectionString">The connection string. It is mutually exclusive with sasUri property. Type:
28+
/// string, SecureString or AzureKeyVaultSecretReference.
29+
/// </param>
30+
31+
/// <param name="accountKey">The Azure key vault secret reference of accountKey in connection string.
32+
/// </param>
33+
34+
/// <param name="sasUri">SAS URI of the Azure Storage resource. It is mutually exclusive with
35+
/// connectionString property. Type: string, SecureString or
36+
/// AzureKeyVaultSecretReference.
37+
/// </param>
38+
39+
/// <param name="sasToken">The Azure key vault secret reference of sasToken in sas uri.
40+
/// </param>
41+
42+
/// <param name="encryptedCredential">The encrypted credential used for authentication. Credentials are encrypted
43+
/// using the integration runtime credential manager. Type: string.
44+
/// </param>
45+
46+
/// <param name="serviceEndpoint">Table service endpoint of the Azure Table Storage resource. It is mutually
47+
/// exclusive with connectionString, sasUri property.
48+
/// </param>
49+
50+
/// <param name="credential">The credential reference containing authentication information.
51+
/// </param>
52+
public AzureTableStorageLinkedServiceTypeProperties(object connectionString = default(object), AzureKeyVaultSecretReference accountKey = default(AzureKeyVaultSecretReference), object sasUri = default(object), AzureKeyVaultSecretReference sasToken = default(AzureKeyVaultSecretReference), string encryptedCredential = default(string), object serviceEndpoint = default(object), CredentialReference credential = default(CredentialReference))
53+
54+
: base(connectionString, accountKey, sasUri, sasToken, encryptedCredential)
55+
{
56+
this.ServiceEndpoint = serviceEndpoint;
57+
this.Credential = credential;
58+
CustomInit();
59+
}
60+
61+
/// <summary>
62+
/// An initialization method that performs custom operations like setting defaults
63+
/// </summary>
64+
partial void CustomInit();
65+
66+
67+
/// <summary>
68+
/// Gets or sets table service endpoint of the Azure Table Storage resource. It
69+
/// is mutually exclusive with connectionString, sasUri property.
70+
/// </summary>
71+
[Newtonsoft.Json.JsonProperty(PropertyName = "serviceEndpoint")]
72+
public object ServiceEndpoint {get; set; }
73+
74+
/// <summary>
75+
/// Gets or sets the credential reference containing authentication
76+
/// information.
77+
/// </summary>
78+
[Newtonsoft.Json.JsonProperty(PropertyName = "credential")]
79+
public CredentialReference Credential {get; set; }
80+
/// <summary>
81+
/// Validate the object.
82+
/// </summary>
83+
/// <exception cref="Microsoft.Rest.ValidationException">
84+
/// Thrown if validation fails
85+
/// </exception>
86+
public override void Validate()
87+
{
88+
base.Validate();
89+
90+
if (this.Credential != null)
91+
{
92+
this.Credential.Validate();
93+
}
94+
}
95+
}
96+
}

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

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,12 @@ public CommonDataServiceForAppsLinkedService()
7272
/// <param name="authenticationType">The authentication type to connect to Common Data Service for Apps server.
7373
/// &#39;Office365&#39; for online scenario, &#39;Ifd&#39; for on-premises with Ifd scenario.
7474
/// &#39;AADServicePrincipal&#39; for Server-To-Server authentication in online
75-
/// scenario. Type: string (or Expression with resultType string).
75+
/// scenario, &#39;Active Directory&#39; for Dynamics on-premises with IFD. Type:
76+
/// string (or Expression with resultType string).
77+
/// </param>
78+
79+
/// <param name="domain">The Active Directory domain that will verify user credentials. Type: string
80+
/// (or Expression with resultType string).
7681
/// </param>
7782

7883
/// <param name="username">User name to access the Common Data Service for Apps instance. Type: string
@@ -104,7 +109,7 @@ public CommonDataServiceForAppsLinkedService()
104109
/// <param name="encryptedCredential">The encrypted credential used for authentication. Credentials are encrypted
105110
/// using the integration runtime credential manager. Type: string.
106111
/// </param>
107-
public CommonDataServiceForAppsLinkedService(object deploymentType, object authenticationType, System.Collections.Generic.IDictionary<string, object> additionalProperties = default(System.Collections.Generic.IDictionary<string, object>), 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 hostName = default(object), object port = default(object), object serviceUri = default(object), object organizationName = default(object), object username = default(object), SecretBase password = default(SecretBase), object servicePrincipalId = default(object), object servicePrincipalCredentialType = default(object), SecretBase servicePrincipalCredential = default(SecretBase), string encryptedCredential = default(string))
112+
public CommonDataServiceForAppsLinkedService(object deploymentType, object authenticationType, System.Collections.Generic.IDictionary<string, object> additionalProperties = default(System.Collections.Generic.IDictionary<string, object>), 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 hostName = default(object), object port = default(object), object serviceUri = default(object), object organizationName = default(object), object domain = default(object), object username = default(object), SecretBase password = default(SecretBase), object servicePrincipalId = default(object), object servicePrincipalCredentialType = default(object), SecretBase servicePrincipalCredential = default(SecretBase), string encryptedCredential = default(string))
108113

109114
: base(additionalProperties, connectVia, description, parameters, annotations)
110115
{
@@ -114,6 +119,7 @@ public CommonDataServiceForAppsLinkedService()
114119
this.ServiceUri = serviceUri;
115120
this.OrganizationName = organizationName;
116121
this.AuthenticationType = authenticationType;
122+
this.Domain = domain;
117123
this.Username = username;
118124
this.Password = password;
119125
this.ServicePrincipalId = servicePrincipalId;
@@ -175,11 +181,19 @@ public CommonDataServiceForAppsLinkedService()
175181
/// Gets or sets the authentication type to connect to Common Data Service for
176182
/// Apps server. &#39;Office365&#39; for online scenario, &#39;Ifd&#39; for on-premises with
177183
/// Ifd scenario. &#39;AADServicePrincipal&#39; for Server-To-Server authentication in
178-
/// online scenario. Type: string (or Expression with resultType string).
184+
/// online scenario, &#39;Active Directory&#39; for Dynamics on-premises with IFD.
185+
/// Type: string (or Expression with resultType string).
179186
/// </summary>
180187
[Newtonsoft.Json.JsonProperty(PropertyName = "typeProperties.authenticationType")]
181188
public object AuthenticationType {get; set; }
182189

190+
/// <summary>
191+
/// Gets or sets the Active Directory domain that will verify user credentials.
192+
/// Type: string (or Expression with resultType string).
193+
/// </summary>
194+
[Newtonsoft.Json.JsonProperty(PropertyName = "typeProperties.domain")]
195+
public object Domain {get; set; }
196+
183197
/// <summary>
184198
/// Gets or sets user name to access the Common Data Service for Apps instance.
185199
/// Type: string (or Expression with resultType string).
@@ -257,6 +271,7 @@ public override void Validate()
257271

258272

259273

274+
260275
}
261276
}
262277
}

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

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,12 @@ public CommonDataServiceForAppsLinkedServiceTypeProperties()
5454
/// <param name="authenticationType">The authentication type to connect to Common Data Service for Apps server.
5555
/// &#39;Office365&#39; for online scenario, &#39;Ifd&#39; for on-premises with Ifd scenario.
5656
/// &#39;AADServicePrincipal&#39; for Server-To-Server authentication in online
57-
/// scenario. Type: string (or Expression with resultType string).
57+
/// scenario, &#39;Active Directory&#39; for Dynamics on-premises with IFD. Type:
58+
/// string (or Expression with resultType string).
59+
/// </param>
60+
61+
/// <param name="domain">The Active Directory domain that will verify user credentials. Type: string
62+
/// (or Expression with resultType string).
5863
/// </param>
5964

6065
/// <param name="username">User name to access the Common Data Service for Apps instance. Type: string
@@ -86,7 +91,7 @@ public CommonDataServiceForAppsLinkedServiceTypeProperties()
8691
/// <param name="encryptedCredential">The encrypted credential used for authentication. Credentials are encrypted
8792
/// using the integration runtime credential manager. Type: string.
8893
/// </param>
89-
public CommonDataServiceForAppsLinkedServiceTypeProperties(object deploymentType, object authenticationType, object hostName = default(object), object port = default(object), object serviceUri = default(object), object organizationName = default(object), object username = default(object), SecretBase password = default(SecretBase), object servicePrincipalId = default(object), object servicePrincipalCredentialType = default(object), SecretBase servicePrincipalCredential = default(SecretBase), string encryptedCredential = default(string))
94+
public CommonDataServiceForAppsLinkedServiceTypeProperties(object deploymentType, object authenticationType, object hostName = default(object), object port = default(object), object serviceUri = default(object), object organizationName = default(object), object domain = default(object), object username = default(object), SecretBase password = default(SecretBase), object servicePrincipalId = default(object), object servicePrincipalCredentialType = default(object), SecretBase servicePrincipalCredential = default(SecretBase), string encryptedCredential = default(string))
9095

9196
{
9297
this.DeploymentType = deploymentType;
@@ -95,6 +100,7 @@ public CommonDataServiceForAppsLinkedServiceTypeProperties()
95100
this.ServiceUri = serviceUri;
96101
this.OrganizationName = organizationName;
97102
this.AuthenticationType = authenticationType;
103+
this.Domain = domain;
98104
this.Username = username;
99105
this.Password = password;
100106
this.ServicePrincipalId = servicePrincipalId;
@@ -156,11 +162,19 @@ public CommonDataServiceForAppsLinkedServiceTypeProperties()
156162
/// Gets or sets the authentication type to connect to Common Data Service for
157163
/// Apps server. &#39;Office365&#39; for online scenario, &#39;Ifd&#39; for on-premises with
158164
/// Ifd scenario. &#39;AADServicePrincipal&#39; for Server-To-Server authentication in
159-
/// online scenario. Type: string (or Expression with resultType string).
165+
/// online scenario, &#39;Active Directory&#39; for Dynamics on-premises with IFD.
166+
/// Type: string (or Expression with resultType string).
160167
/// </summary>
161168
[Newtonsoft.Json.JsonProperty(PropertyName = "authenticationType")]
162169
public object AuthenticationType {get; set; }
163170

171+
/// <summary>
172+
/// Gets or sets the Active Directory domain that will verify user credentials.
173+
/// Type: string (or Expression with resultType string).
174+
/// </summary>
175+
[Newtonsoft.Json.JsonProperty(PropertyName = "domain")]
176+
public object Domain {get; set; }
177+
164178
/// <summary>
165179
/// Gets or sets user name to access the Common Data Service for Apps instance.
166180
/// Type: string (or Expression with resultType string).
@@ -237,6 +251,7 @@ public virtual void Validate()
237251

238252

239253

254+
240255
}
241256
}
242257
}
Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
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+
/// Continuation settings for execute data flow activity.
12+
/// </summary>
13+
public partial class ContinuationSettingsReference
14+
{
15+
/// <summary>
16+
/// Initializes a new instance of the ContinuationSettingsReference class.
17+
/// </summary>
18+
public ContinuationSettingsReference()
19+
{
20+
CustomInit();
21+
}
22+
23+
/// <summary>
24+
/// Initializes a new instance of the ContinuationSettingsReference class.
25+
/// </summary>
26+
27+
/// <param name="continuationTtlInMinutes">Continuation TTL in minutes.
28+
/// </param>
29+
30+
/// <param name="idleCondition">Idle condition.
31+
/// </param>
32+
33+
/// <param name="customizedCheckpointKey">Customized checkpoint key.
34+
/// </param>
35+
public ContinuationSettingsReference(object continuationTtlInMinutes = default(object), object idleCondition = default(object), object customizedCheckpointKey = default(object))
36+
37+
{
38+
this.ContinuationTtlInMinutes = continuationTtlInMinutes;
39+
this.IdleCondition = idleCondition;
40+
this.CustomizedCheckpointKey = customizedCheckpointKey;
41+
CustomInit();
42+
}
43+
44+
/// <summary>
45+
/// An initialization method that performs custom operations like setting defaults
46+
/// </summary>
47+
partial void CustomInit();
48+
49+
50+
/// <summary>
51+
/// Gets or sets continuation TTL in minutes.
52+
/// </summary>
53+
[Newtonsoft.Json.JsonProperty(PropertyName = "continuationTtlInMinutes")]
54+
public object ContinuationTtlInMinutes {get; set; }
55+
56+
/// <summary>
57+
/// Gets or sets idle condition.
58+
/// </summary>
59+
[Newtonsoft.Json.JsonProperty(PropertyName = "idleCondition")]
60+
public object IdleCondition {get; set; }
61+
62+
/// <summary>
63+
/// Gets or sets customized checkpoint key.
64+
/// </summary>
65+
[Newtonsoft.Json.JsonProperty(PropertyName = "customizedCheckpointKey")]
66+
public object CustomizedCheckpointKey {get; set; }
67+
}
68+
}

0 commit comments

Comments
 (0)