diff --git a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt
index 4a3a5bafea92..e2ac3ef58b31 100644
--- a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt
+++ b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt
@@ -5,11 +5,11 @@ 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=v2 --reflect-api-versions --tag=package-2018-06 --csharp-sdks-folder=D:\Projects\azure-sdk-for-net\sdk
Autorest CSharp Version: 2.3.82
-2022-04-11 01:10:45 UTC
+2022-04-26 01:41:21 UTC
Azure-rest-api-specs repository information
GitHub fork: Azure
Branch: main
-Commit: 74ca59fc8cb6563d5a9d66fb533b8622522143eb
+Commit: fb32676995912336709a2af7d7250e0b63c9333d
AutoRest information
Requested version: v2
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 44549cdc5993..cc70308d0581 100644
--- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md
@@ -1,5 +1,10 @@
# Changelog for the Azure Data Factory V2 .NET SDK
+## Version 6.1.0
+### Feature Additions
+- Added Dataworld, AppFigures, Asana, Twilio connectors in ADF
+- Added PrivateEndpoint property Into PrivateLinkConnectionApprovalRequest
+
## Version 6.0.0
### Feature Additions
### Breaking Changes
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AppFiguresLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AppFiguresLinkedService.cs
new file mode 100644
index 000000000000..c6c62f799ce1
--- /dev/null
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AppFiguresLinkedService.cs
@@ -0,0 +1,106 @@
+//
+// 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;
+
+ ///
+ /// Linked service for AppFigures.
+ ///
+ [Newtonsoft.Json.JsonObject("AppFigures")]
+ [Rest.Serialization.JsonTransformation]
+ public partial class AppFiguresLinkedService : LinkedService
+ {
+ ///
+ /// Initializes a new instance of the AppFiguresLinkedService class.
+ ///
+ public AppFiguresLinkedService()
+ {
+ CustomInit();
+ }
+
+ ///
+ /// Initializes a new instance of the AppFiguresLinkedService class.
+ ///
+ /// The username of the Appfigures
+ /// source.
+ /// The password of the AppFigures
+ /// source.
+ /// The client key for the AppFigures
+ /// source.
+ /// 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.
+ public AppFiguresLinkedService(object userName, SecretBase password, SecretBase clientKey, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList))
+ : base(additionalProperties, connectVia, description, parameters, annotations)
+ {
+ UserName = userName;
+ Password = password;
+ ClientKey = clientKey;
+ CustomInit();
+ }
+
+ ///
+ /// An initialization method that performs custom operations like setting defaults
+ ///
+ partial void CustomInit();
+
+ ///
+ /// Gets or sets the username of the Appfigures source.
+ ///
+ [JsonProperty(PropertyName = "typeProperties.userName")]
+ public object UserName { get; set; }
+
+ ///
+ /// Gets or sets the password of the AppFigures source.
+ ///
+ [JsonProperty(PropertyName = "typeProperties.password")]
+ public SecretBase Password { get; set; }
+
+ ///
+ /// Gets or sets the client key for the AppFigures source.
+ ///
+ [JsonProperty(PropertyName = "typeProperties.clientKey")]
+ public SecretBase ClientKey { get; set; }
+
+ ///
+ /// Validate the object.
+ ///
+ ///
+ /// Thrown if validation fails
+ ///
+ public override void Validate()
+ {
+ base.Validate();
+ if (UserName == null)
+ {
+ throw new ValidationException(ValidationRules.CannotBeNull, "UserName");
+ }
+ if (Password == null)
+ {
+ throw new ValidationException(ValidationRules.CannotBeNull, "Password");
+ }
+ if (ClientKey == null)
+ {
+ throw new ValidationException(ValidationRules.CannotBeNull, "ClientKey");
+ }
+ }
+ }
+}
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AsanaLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AsanaLinkedService.cs
new file mode 100644
index 000000000000..e96061386dcd
--- /dev/null
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AsanaLinkedService.cs
@@ -0,0 +1,92 @@
+//
+// 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;
+
+ ///
+ /// Linked service for Asana.
+ ///
+ [Newtonsoft.Json.JsonObject("Asana")]
+ [Rest.Serialization.JsonTransformation]
+ public partial class AsanaLinkedService : LinkedService
+ {
+ ///
+ /// Initializes a new instance of the AsanaLinkedService class.
+ ///
+ public AsanaLinkedService()
+ {
+ CustomInit();
+ }
+
+ ///
+ /// Initializes a new instance of the AsanaLinkedService class.
+ ///
+ /// The api token for the Asana source.
+ /// 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.
+ /// The encrypted credential used for
+ /// authentication. Credentials are encrypted using the integration
+ /// runtime credential manager. Type: string (or Expression with
+ /// resultType string).
+ public AsanaLinkedService(SecretBase apiToken, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object encryptedCredential = default(object))
+ : base(additionalProperties, connectVia, description, parameters, annotations)
+ {
+ ApiToken = apiToken;
+ EncryptedCredential = encryptedCredential;
+ CustomInit();
+ }
+
+ ///
+ /// An initialization method that performs custom operations like setting defaults
+ ///
+ partial void CustomInit();
+
+ ///
+ /// Gets or sets the api token for the Asana source.
+ ///
+ [JsonProperty(PropertyName = "typeProperties.apiToken")]
+ public SecretBase ApiToken { 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();
+ if (ApiToken == null)
+ {
+ throw new ValidationException(ValidationRules.CannotBeNull, "ApiToken");
+ }
+ }
+ }
+}
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DataworldLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DataworldLinkedService.cs
new file mode 100644
index 000000000000..ce6096d3ff32
--- /dev/null
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DataworldLinkedService.cs
@@ -0,0 +1,93 @@
+//
+// 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;
+
+ ///
+ /// Linked service for Dataworld.
+ ///
+ [Newtonsoft.Json.JsonObject("Dataworld")]
+ [Rest.Serialization.JsonTransformation]
+ public partial class DataworldLinkedService : LinkedService
+ {
+ ///
+ /// Initializes a new instance of the DataworldLinkedService class.
+ ///
+ public DataworldLinkedService()
+ {
+ CustomInit();
+ }
+
+ ///
+ /// Initializes a new instance of the DataworldLinkedService class.
+ ///
+ /// The api token for the Dataworld
+ /// source.
+ /// 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.
+ /// The encrypted credential used for
+ /// authentication. Credentials are encrypted using the integration
+ /// runtime credential manager. Type: string (or Expression with
+ /// resultType string).
+ public DataworldLinkedService(SecretBase apiToken, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object encryptedCredential = default(object))
+ : base(additionalProperties, connectVia, description, parameters, annotations)
+ {
+ ApiToken = apiToken;
+ EncryptedCredential = encryptedCredential;
+ CustomInit();
+ }
+
+ ///
+ /// An initialization method that performs custom operations like setting defaults
+ ///
+ partial void CustomInit();
+
+ ///
+ /// Gets or sets the api token for the Dataworld source.
+ ///
+ [JsonProperty(PropertyName = "typeProperties.apiToken")]
+ public SecretBase ApiToken { 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();
+ if (ApiToken == null)
+ {
+ throw new ValidationException(ValidationRules.CannotBeNull, "ApiToken");
+ }
+ }
+ }
+}
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PrivateEndpoint.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PrivateEndpoint.cs
new file mode 100644
index 000000000000..61d0e8c28536
--- /dev/null
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PrivateEndpoint.cs
@@ -0,0 +1,51 @@
+//
+// 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.Linq;
+
+ ///
+ /// Private endpoint which a connection belongs to.
+ ///
+ public partial class PrivateEndpoint
+ {
+ ///
+ /// Initializes a new instance of the PrivateEndpoint class.
+ ///
+ public PrivateEndpoint()
+ {
+ CustomInit();
+ }
+
+ ///
+ /// Initializes a new instance of the PrivateEndpoint class.
+ ///
+ /// The resource Id for private endpoint
+ public PrivateEndpoint(string id = default(string))
+ {
+ Id = id;
+ CustomInit();
+ }
+
+ ///
+ /// An initialization method that performs custom operations like setting defaults
+ ///
+ partial void CustomInit();
+
+ ///
+ /// Gets or sets the resource Id for private endpoint
+ ///
+ [JsonProperty(PropertyName = "id")]
+ public string Id { get; set; }
+
+ }
+}
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PrivateLinkConnectionApprovalRequest.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PrivateLinkConnectionApprovalRequest.cs
index 8738edfa640e..4241c71b432f 100644
--- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PrivateLinkConnectionApprovalRequest.cs
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PrivateLinkConnectionApprovalRequest.cs
@@ -31,9 +31,12 @@ public PrivateLinkConnectionApprovalRequest()
/// Initializes a new instance of the
/// PrivateLinkConnectionApprovalRequest class.
///
- public PrivateLinkConnectionApprovalRequest(PrivateLinkConnectionState privateLinkServiceConnectionState = default(PrivateLinkConnectionState))
+ /// The resource of private
+ /// endpoint.
+ public PrivateLinkConnectionApprovalRequest(PrivateLinkConnectionState privateLinkServiceConnectionState = default(PrivateLinkConnectionState), PrivateEndpoint privateEndpoint = default(PrivateEndpoint))
{
PrivateLinkServiceConnectionState = privateLinkServiceConnectionState;
+ PrivateEndpoint = privateEndpoint;
CustomInit();
}
@@ -47,5 +50,11 @@ public PrivateLinkConnectionApprovalRequest()
[JsonProperty(PropertyName = "privateLinkServiceConnectionState")]
public PrivateLinkConnectionState PrivateLinkServiceConnectionState { get; set; }
+ ///
+ /// Gets or sets the resource of private endpoint.
+ ///
+ [JsonProperty(PropertyName = "privateEndpoint")]
+ public PrivateEndpoint PrivateEndpoint { get; set; }
+
}
}
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/TwilioLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/TwilioLinkedService.cs
new file mode 100644
index 000000000000..a15f723eb593
--- /dev/null
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/TwilioLinkedService.cs
@@ -0,0 +1,91 @@
+//
+// 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;
+
+ ///
+ /// Linked service for Twilio.
+ ///
+ [Newtonsoft.Json.JsonObject("Twilio")]
+ [Rest.Serialization.JsonTransformation]
+ public partial class TwilioLinkedService : LinkedService
+ {
+ ///
+ /// Initializes a new instance of the TwilioLinkedService class.
+ ///
+ public TwilioLinkedService()
+ {
+ CustomInit();
+ }
+
+ ///
+ /// Initializes a new instance of the TwilioLinkedService class.
+ ///
+ /// The Account SID of Twilio service.
+ /// The auth token of Twilio service.
+ /// 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.
+ public TwilioLinkedService(object userName, SecretBase password, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList))
+ : base(additionalProperties, connectVia, description, parameters, annotations)
+ {
+ UserName = userName;
+ Password = password;
+ CustomInit();
+ }
+
+ ///
+ /// An initialization method that performs custom operations like setting defaults
+ ///
+ partial void CustomInit();
+
+ ///
+ /// Gets or sets the Account SID of Twilio service.
+ ///
+ [JsonProperty(PropertyName = "typeProperties.userName")]
+ public object UserName { get; set; }
+
+ ///
+ /// Gets or sets the auth token of Twilio service.
+ ///
+ [JsonProperty(PropertyName = "typeProperties.password")]
+ public SecretBase Password { get; set; }
+
+ ///
+ /// Validate the object.
+ ///
+ ///
+ /// Thrown if validation fails
+ ///
+ public override void Validate()
+ {
+ base.Validate();
+ if (UserName == null)
+ {
+ throw new ValidationException(ValidationRules.CannotBeNull, "UserName");
+ }
+ if (Password == null)
+ {
+ throw new ValidationException(ValidationRules.CannotBeNull, "Password");
+ }
+ }
+ }
+}
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 7b2b832bbe29..7fa007820764 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,13 @@
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.0.0
+ 6.1.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 04dcf8343d00..952a88018607 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.0.0.0")]
+[assembly: AssemblyFileVersion("6.1.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 78af312785dd..90bf33d2fe85 100644
--- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/LinkedServiceJsonSamples.cs
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/LinkedServiceJsonSamples.cs
@@ -3370,6 +3370,21 @@ public class LinkedServiceJsonSamples : JsonSampleCollection