From a907aa9be22b59535d42bcff9ee8803267f475dc Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Tue, 4 Jan 2022 11:04:53 +0800 Subject: [PATCH 01/10] [DataFactory]Added new features into 5.1.0 --- .../datafactory_resource-manager.txt | 5 +- .../src/CHANGELOG.md | 5 ++ .../GoogleAdWordsLinkedService.cs | 72 +++++++++++++++++++ .../AzureDatabricksDeltaLakeLinkedService.cs | 27 ++++++- .../Generated/Models/CosmosDbLinkedService.cs | 16 ++++- .../Generated/Models/DynamicsLinkedService.cs | 16 ++++- .../Models/GoogleAdWordsLinkedService.cs | 40 +++++------ ...nkedIntegrationRuntimeRbacAuthorization.cs | 16 ++++- ...rosoft.Azure.Management.DataFactory.csproj | 8 +-- .../src/Properties/AssemblyInfo.cs | 4 +- .../JsonSamples/LinkedServiceJsonSamples.cs | 19 +++++ 11 files changed, 194 insertions(+), 34 deletions(-) create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/GoogleAdWordsLinkedService.cs diff --git a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt index 620a19559122..3d701fa75c92 100644 --- a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt +++ b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt @@ -4,12 +4,11 @@ Commencing code generation 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 -2021-12-09 02:19:59 UTC +2022-01-04 02:45:58 UTC Azure-rest-api-specs repository information GitHub fork: Azure Branch: main -Commit: 40cb73ed0c84fa515b911af5fdf77f68b764ea74 +Commit: 2b083f0d1b7ecb0717741551fa543a73e86d672c 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 d3b5d422ee80..7e5e4c8f290b 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 5.1.0 +### Feature Additions +- Support UAMI M2 +- Add connectionProperties in GoogleAdWordsLinkedService + ## Version 5.0.0 ### Feature Additions ### Breaking Changes diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/GoogleAdWordsLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/GoogleAdWordsLinkedService.cs new file mode 100644 index 000000000000..bcaae254ee68 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/GoogleAdWordsLinkedService.cs @@ -0,0 +1,72 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Microsoft.Azure.Management.DataFactory.Models +{ + public partial class GoogleAdWordsLinkedService : LinkedService + { + /// + /// Initializes a new instance of the GoogleAdWordsLinkedService class. + /// + /// The Client customer ID of the + /// AdWords account that you want to fetch report data for. + /// The developer token associated with + /// the manager account that you use to grant access to the AdWords + /// API. + /// The OAuth 2.0 authentication + /// mechanism used for authentication. ServiceAuthentication can only + /// be used on self-hosted IR. Possible values include: + /// 'ServiceAuthentication', 'UserAuthentication' + /// 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 refresh token obtained from Google + /// for authorizing access to AdWords for UserAuthentication. + /// The client id of the google application used + /// to acquire the refresh token. Type: string (or Expression with + /// resultType string). + /// The client secret of the google + /// application used to acquire the refresh token. + /// The service account email ID that is used for + /// ServiceAuthentication and can only be used on self-hosted + /// IR. + /// 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. + /// 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. + /// Specifies whether to use a CA + /// certificate from the system trust store or from a specified PEM + /// file. The default value is false. + /// The encrypted credential used for + /// authentication. Credentials are encrypted using the integration + /// runtime credential manager. Type: string (or Expression with + /// resultType string). + public GoogleAdWordsLinkedService(object clientCustomerID, SecretBase developerToken, string authenticationType, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), 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), object encryptedCredential = default(object)) + : base(additionalProperties, connectVia, description, parameters, annotations) + { + ClientCustomerID = clientCustomerID; + DeveloperToken = developerToken; + AuthenticationType = authenticationType; + RefreshToken = refreshToken; + ClientId = clientId; + ClientSecret = clientSecret; + Email = email; + KeyFilePath = keyFilePath; + TrustedCertPath = trustedCertPath; + UseSystemTrustStore = useSystemTrustStore; + EncryptedCredential = encryptedCredential; + CustomInit(); + } + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDatabricksDeltaLakeLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDatabricksDeltaLakeLinkedService.cs index ec88ac66a5ac..a88260a18eb3 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDatabricksDeltaLakeLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDatabricksDeltaLakeLinkedService.cs @@ -58,13 +58,20 @@ public AzureDatabricksDeltaLakeLinkedService() /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public AzureDatabricksDeltaLakeLinkedService(object domain, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), SecretBase accessToken = default(SecretBase), object clusterId = default(object), object encryptedCredential = default(object)) + /// The credential reference containing + /// authentication information. + /// Workspace resource id for + /// databricks REST API. Type: string (or Expression with resultType + /// string). + public AzureDatabricksDeltaLakeLinkedService(object domain, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), SecretBase accessToken = default(SecretBase), object clusterId = default(object), object encryptedCredential = default(object), CredentialReference credential = default(CredentialReference), object workspaceResourceId = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { Domain = domain; AccessToken = accessToken; ClusterId = clusterId; EncryptedCredential = encryptedCredential; + Credential = credential; + WorkspaceResourceId = workspaceResourceId; CustomInit(); } @@ -105,6 +112,20 @@ public AzureDatabricksDeltaLakeLinkedService() [JsonProperty(PropertyName = "typeProperties.encryptedCredential")] public object EncryptedCredential { get; set; } + /// + /// Gets or sets the credential reference containing authentication + /// information. + /// + [JsonProperty(PropertyName = "typeProperties.credential")] + public CredentialReference Credential { get; set; } + + /// + /// Gets or sets workspace resource id for databricks REST API. Type: + /// string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.workspaceResourceId")] + public object WorkspaceResourceId { get; set; } + /// /// Validate the object. /// @@ -118,6 +139,10 @@ public override void Validate() { throw new ValidationException(ValidationRules.CannotBeNull, "Domain"); } + if (Credential != null) + { + Credential.Validate(); + } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CosmosDbLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CosmosDbLinkedService.cs index 0ae5ab29f54c..8536e1707798 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CosmosDbLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CosmosDbLinkedService.cs @@ -83,7 +83,9 @@ public CosmosDbLinkedService() /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public CosmosDbLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object connectionString = default(object), object accountEndpoint = default(object), object database = default(object), SecretBase accountKey = default(SecretBase), object servicePrincipalId = default(object), string servicePrincipalCredentialType = default(string), SecretBase servicePrincipalCredential = default(SecretBase), object tenant = default(object), object azureCloudType = default(object), string connectionMode = default(string), object encryptedCredential = default(object)) + /// The credential reference containing + /// authentication information. + public CosmosDbLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object connectionString = default(object), object accountEndpoint = default(object), object database = default(object), SecretBase accountKey = default(SecretBase), object servicePrincipalId = default(object), string servicePrincipalCredentialType = default(string), SecretBase servicePrincipalCredential = default(SecretBase), object tenant = default(object), object azureCloudType = default(object), string connectionMode = default(string), object encryptedCredential = default(object), CredentialReference credential = default(CredentialReference)) : base(additionalProperties, connectVia, description, parameters, annotations) { ConnectionString = connectionString; @@ -97,6 +99,7 @@ public CosmosDbLinkedService() AzureCloudType = azureCloudType; ConnectionMode = connectionMode; EncryptedCredential = encryptedCredential; + Credential = credential; CustomInit(); } @@ -197,6 +200,13 @@ public CosmosDbLinkedService() [JsonProperty(PropertyName = "typeProperties.encryptedCredential")] public object EncryptedCredential { get; set; } + /// + /// Gets or sets the credential reference containing authentication + /// information. + /// + [JsonProperty(PropertyName = "typeProperties.credential")] + public CredentialReference Credential { get; set; } + /// /// Validate the object. /// @@ -206,6 +216,10 @@ public CosmosDbLinkedService() public override void Validate() { base.Validate(); + if (Credential != null) + { + Credential.Validate(); + } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DynamicsLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DynamicsLinkedService.cs index 8bc7dbd7d0eb..d2db924bf121 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DynamicsLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DynamicsLinkedService.cs @@ -90,7 +90,9 @@ public DynamicsLinkedService() /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public DynamicsLinkedService(object deploymentType, object authenticationType, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), 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), object encryptedCredential = default(object)) + /// The credential reference containing + /// authentication information. + public DynamicsLinkedService(object deploymentType, object authenticationType, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), 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), object encryptedCredential = default(object), CredentialReference credential = default(CredentialReference)) : base(additionalProperties, connectVia, description, parameters, annotations) { DeploymentType = deploymentType; @@ -105,6 +107,7 @@ public DynamicsLinkedService() ServicePrincipalCredentialType = servicePrincipalCredentialType; ServicePrincipalCredential = servicePrincipalCredential; EncryptedCredential = encryptedCredential; + Credential = credential; CustomInit(); } @@ -215,6 +218,13 @@ public DynamicsLinkedService() [JsonProperty(PropertyName = "typeProperties.encryptedCredential")] public object EncryptedCredential { get; set; } + /// + /// Gets or sets the credential reference containing authentication + /// information. + /// + [JsonProperty(PropertyName = "typeProperties.credential")] + public CredentialReference Credential { get; set; } + /// /// Validate the object. /// @@ -232,6 +242,10 @@ public override void Validate() { throw new ValidationException(ValidationRules.CannotBeNull, "AuthenticationType"); } + if (Credential != null) + { + Credential.Validate(); + } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GoogleAdWordsLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GoogleAdWordsLinkedService.cs index 05eb27a16103..2a3bdf659ae7 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GoogleAdWordsLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GoogleAdWordsLinkedService.cs @@ -35,6 +35,16 @@ public GoogleAdWordsLinkedService() /// /// Initializes a new instance of the GoogleAdWordsLinkedService 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. + /// Properties used to connect to + /// GoogleAds. It is mutually exclusive with any other properties in + /// the linked service. Type: object. /// The Client customer ID of the /// AdWords account that you want to fetch report data for. /// The developer token associated with @@ -44,13 +54,6 @@ public GoogleAdWordsLinkedService() /// mechanism used for authentication. ServiceAuthentication can only /// be used on self-hosted IR. Possible values include: /// 'ServiceAuthentication', 'UserAuthentication' - /// 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 refresh token obtained from Google /// for authorizing access to AdWords for UserAuthentication. /// The client id of the google application used @@ -76,9 +79,10 @@ public GoogleAdWordsLinkedService() /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public GoogleAdWordsLinkedService(object clientCustomerID, SecretBase developerToken, string authenticationType, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), 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), object encryptedCredential = default(object)) + public GoogleAdWordsLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), 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), object encryptedCredential = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { + ConnectionProperties = connectionProperties; ClientCustomerID = clientCustomerID; DeveloperToken = developerToken; AuthenticationType = authenticationType; @@ -98,6 +102,14 @@ public GoogleAdWordsLinkedService() /// partial void CustomInit(); + /// + /// Gets or sets properties used to connect to GoogleAds. It is + /// mutually exclusive with any other properties in the linked service. + /// Type: object. + /// + [JsonProperty(PropertyName = "typeProperties.connectionProperties")] + public object ConnectionProperties { get; set; } + /// /// Gets or sets the Client customer ID of the AdWords account that you /// want to fetch report data for. @@ -192,18 +204,6 @@ public GoogleAdWordsLinkedService() public override void Validate() { base.Validate(); - if (ClientCustomerID == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "ClientCustomerID"); - } - if (DeveloperToken == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "DeveloperToken"); - } - if (AuthenticationType == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "AuthenticationType"); - } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/LinkedIntegrationRuntimeRbacAuthorization.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/LinkedIntegrationRuntimeRbacAuthorization.cs index 6dc560c8f96f..2296f23be6dc 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/LinkedIntegrationRuntimeRbacAuthorization.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/LinkedIntegrationRuntimeRbacAuthorization.cs @@ -36,9 +36,12 @@ public LinkedIntegrationRuntimeRbacAuthorization() /// /// The resource identifier of the integration /// runtime to be shared. - public LinkedIntegrationRuntimeRbacAuthorization(string resourceId) + /// The credential reference containing + /// authentication information. + public LinkedIntegrationRuntimeRbacAuthorization(string resourceId, CredentialReference credential = default(CredentialReference)) { ResourceId = resourceId; + Credential = credential; CustomInit(); } @@ -54,6 +57,13 @@ public LinkedIntegrationRuntimeRbacAuthorization(string resourceId) [JsonProperty(PropertyName = "resourceId")] public string ResourceId { get; set; } + /// + /// Gets or sets the credential reference containing authentication + /// information. + /// + [JsonProperty(PropertyName = "credential")] + public CredentialReference Credential { get; set; } + /// /// Validate the object. /// @@ -66,6 +76,10 @@ public virtual void Validate() { throw new ValidationException(ValidationRules.CannotBeNull, "ResourceId"); } + if (Credential != null) + { + Credential.Validate(); + } } } } 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 f0dc89dee1a6..830d39edfbbc 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,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. - 5.0.0 + 5.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 a61b4f110ab7..6ede3735f133 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs @@ -6,8 +6,8 @@ [assembly: AssemblyTitle("Microsoft Azure Data Factory Management Library")] [assembly: AssemblyDescription("Provides management functionality for Microsoft Azure Data Factory Resources.")] -[assembly: AssemblyVersion("5.0.0.0")] -[assembly: AssemblyFileVersion("5.0.0.0")] +[assembly: AssemblyVersion("5.1.0.0")] +[assembly: AssemblyFileVersion("5.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 783bdd2978ed..e2c7dabdf8a4 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/LinkedServiceJsonSamples.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/LinkedServiceJsonSamples.cs @@ -2677,6 +2677,25 @@ public class LinkedServiceJsonSamples : JsonSampleCollection Date: Tue, 4 Jan 2022 11:06:26 +0800 Subject: [PATCH 02/10] update --- .../Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md index 7e5e4c8f290b..990e4e3bf0c4 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md @@ -2,8 +2,8 @@ ## Version 5.1.0 ### Feature Additions -- Support UAMI M2 -- Add connectionProperties in GoogleAdWordsLinkedService +- Added support UAMI M2 +- Added connectionProperties in GoogleAdWordsLinkedService ## Version 5.0.0 ### Feature Additions From 4967c05cc6031e0f851321ba3b07fd60ccd90c03 Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Wed, 5 Jan 2022 12:30:43 +0800 Subject: [PATCH 03/10] add one change --- .../datafactory_resource-manager.txt | 5 ++- .../src/CHANGELOG.md | 1 + .../Models/AzureBlobFSLinkedService.cs | 37 ++++++++++++++++++- ...rosoft.Azure.Management.DataFactory.csproj | 5 ++- .../JsonSamples/LinkedServiceJsonSamples.cs | 7 +++- 5 files changed, 49 insertions(+), 6 deletions(-) diff --git a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt index 3d701fa75c92..28443ac9b1f2 100644 --- a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt +++ b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt @@ -4,11 +4,12 @@ Commencing code generation 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 -2022-01-04 02:45:58 UTC +Autorest CSharp Version: 2.3.82 +2022-01-05 04:17:30 UTC Azure-rest-api-specs repository information GitHub fork: Azure Branch: main -Commit: 2b083f0d1b7ecb0717741551fa543a73e86d672c +Commit: 7b89a1a3fcb08b6f9f12ee67049b6b8d561ad684 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 990e4e3bf0c4..dcabea5b249c 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md @@ -4,6 +4,7 @@ ### Feature Additions - Added support UAMI M2 - Added connectionProperties in GoogleAdWordsLinkedService +- Added servicePrincipalCredentialType and servicePrincipalCredential into AzureBlobFSLinkedService ## Version 5.0.0 ### Feature Additions diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobFSLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobFSLinkedService.cs index ec81f0322ca5..ef79d222a831 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobFSLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobFSLinkedService.cs @@ -68,7 +68,19 @@ public AzureBlobFSLinkedService() /// resultType string). /// The credential reference containing /// authentication information. - public AzureBlobFSLinkedService(object url, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object accountKey = default(object), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object azureCloudType = default(object), object encryptedCredential = default(object), CredentialReference credential = default(CredentialReference)) + /// The service principal + /// credential type to use in Server-To-Server authentication. + /// 'ServicePrincipalKey' for key/secret, 'ServicePrincipalCert' for + /// certificate. Type: string (or Expression with resultType + /// string). + /// The credential of the + /// service principal object in Azure Active Directory. If + /// servicePrincipalCredentialType is 'ServicePrincipalKey', + /// servicePrincipalCredential can be SecureString or + /// AzureKeyVaultSecretReference. If servicePrincipalCredentialType is + /// 'ServicePrincipalCert', servicePrincipalCredential can only be + /// AzureKeyVaultSecretReference. + public AzureBlobFSLinkedService(object url, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object accountKey = default(object), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object azureCloudType = default(object), object encryptedCredential = default(object), CredentialReference credential = default(CredentialReference), object servicePrincipalCredentialType = default(object), SecretBase servicePrincipalCredential = default(SecretBase)) : base(additionalProperties, connectVia, description, parameters, annotations) { Url = url; @@ -79,6 +91,8 @@ public AzureBlobFSLinkedService() AzureCloudType = azureCloudType; EncryptedCredential = encryptedCredential; Credential = credential; + ServicePrincipalCredentialType = servicePrincipalCredentialType; + ServicePrincipalCredential = servicePrincipalCredential; CustomInit(); } @@ -149,6 +163,27 @@ public AzureBlobFSLinkedService() [JsonProperty(PropertyName = "typeProperties.credential")] public CredentialReference Credential { get; set; } + /// + /// Gets or sets the service principal credential type to use in + /// Server-To-Server authentication. 'ServicePrincipalKey' for + /// key/secret, 'ServicePrincipalCert' for certificate. Type: string + /// (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.servicePrincipalCredentialType")] + public object ServicePrincipalCredentialType { get; set; } + + /// + /// Gets or sets the credential of the service principal object in + /// Azure Active Directory. If servicePrincipalCredentialType is + /// 'ServicePrincipalKey', servicePrincipalCredential can be + /// SecureString or AzureKeyVaultSecretReference. If + /// servicePrincipalCredentialType is 'ServicePrincipalCert', + /// servicePrincipalCredential can only be + /// AzureKeyVaultSecretReference. + /// + [JsonProperty(PropertyName = "typeProperties.servicePrincipalCredential")] + public SecretBase ServicePrincipalCredential { get; set; } + /// /// Validate the object. /// 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 830d39edfbbc..09a2fb1ae1bd 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 @@ -10,8 +10,9 @@ Microsoft Azure resource management;Data Factory;ADF; 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 e2c7dabdf8a4..cdb07ff29899 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/LinkedServiceJsonSamples.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/LinkedServiceJsonSamples.cs @@ -27,7 +27,12 @@ public class LinkedServiceJsonSamples : JsonSampleCollection Date: Mon, 7 Feb 2022 10:15:32 +0800 Subject: [PATCH 04/10] [DataFactory]Added new features into 5.2.0 --- .../datafactory_resource-manager.txt | 4 +- .../src/CHANGELOG.md | 5 + .../Models/FactoryUpdateParameters.cs | 7 +- .../src/Generated/Models/FailActivity.cs | 107 ++++++++++++++++++ ...rosoft.Azure.Management.DataFactory.csproj | 7 +- .../src/Properties/AssemblyInfo.cs | 4 +- 6 files changed, 124 insertions(+), 10 deletions(-) create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FailActivity.cs diff --git a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt index 28443ac9b1f2..1fb700cf39cb 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-01-05 04:17:30 UTC +2022-02-07 01:57:04 UTC Azure-rest-api-specs repository information GitHub fork: Azure Branch: main -Commit: 7b89a1a3fcb08b6f9f12ee67049b6b8d561ad684 +Commit: 6af1afc7c3fbdea232a80f1334894d459e1dc922 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 dcabea5b249c..63a56d4df4d7 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 5.2.0 +### Feature Additions +- Added FailActivity in ADF +- Fixed update PublicNetworkAccess not work in Factory Update API + ## Version 5.1.0 ### Feature Additions - Added support UAMI M2 diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FactoryUpdateParameters.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FactoryUpdateParameters.cs index fc5f63bde9ce..6cd911726e6c 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FactoryUpdateParameters.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FactoryUpdateParameters.cs @@ -10,6 +10,8 @@ namespace Microsoft.Azure.Management.DataFactory.Models { + using Microsoft.Rest; + using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Collections; using System.Collections.Generic; @@ -18,6 +20,7 @@ namespace Microsoft.Azure.Management.DataFactory.Models /// /// Parameters for updating a factory resource. /// + [Rest.Serialization.JsonTransformation] public partial class FactoryUpdateParameters { /// @@ -66,13 +69,13 @@ public FactoryUpdateParameters() /// Gets or sets whether or not public network access is allowed for /// the data factory. Possible values include: 'Enabled', 'Disabled' /// - [JsonProperty(PropertyName = "publicNetworkAccess")] + [JsonProperty(PropertyName = "properties.publicNetworkAccess")] public string PublicNetworkAccess { get; set; } /// /// Validate the object. /// - /// + /// /// Thrown if validation fails /// public virtual void Validate() diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FailActivity.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FailActivity.cs new file mode 100644 index 000000000000..8f4c66ca5d0d --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FailActivity.cs @@ -0,0 +1,107 @@ +// +// 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; + + /// + /// This activity will fail within its own scope and output a custom error + /// message and error code. The error message and code can provided either + /// as a string literal or as an expression that can be evaluated to a + /// string at runtime. The activity scope can be the whole pipeline or a + /// control activity (e.g. foreach, switch, until), if the fail activity is + /// contained in it. + /// + [Newtonsoft.Json.JsonObject("Fail")] + [Rest.Serialization.JsonTransformation] + public partial class FailActivity : ControlActivity + { + /// + /// Initializes a new instance of the FailActivity class. + /// + public FailActivity() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the FailActivity class. + /// + /// Activity name. + /// The error message that surfaced in the Fail + /// activity. It can be dynamic content that's evaluated to a non + /// empty/blank string at runtime. Type: string (or Expression with + /// resultType string). + /// The error code that categorizes the error + /// type of the Fail activity. It can be dynamic content that's + /// evaluated to a non empty/blank string at runtime. Type: string (or + /// Expression with resultType string). + /// Unmatched properties from the + /// message are deserialized this collection + /// Activity description. + /// Activity depends on condition. + /// Activity user properties. + public FailActivity(string name, object message, object errorCode, IDictionary additionalProperties = default(IDictionary), string description = default(string), IList dependsOn = default(IList), IList userProperties = default(IList)) + : base(name, additionalProperties, description, dependsOn, userProperties) + { + Message = message; + ErrorCode = errorCode; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the error message that surfaced in the Fail activity. + /// It can be dynamic content that's evaluated to a non empty/blank + /// string at runtime. Type: string (or Expression with resultType + /// string). + /// + [JsonProperty(PropertyName = "typeProperties.message")] + public object Message { get; set; } + + /// + /// Gets or sets the error code that categorizes the error type of the + /// Fail activity. It can be dynamic content that's evaluated to a non + /// empty/blank string at runtime. Type: string (or Expression with + /// resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.errorCode")] + public object ErrorCode { get; set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public override void Validate() + { + base.Validate(); + if (Message == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "Message"); + } + if (ErrorCode == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "ErrorCode"); + } + } + } +} 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 09a2fb1ae1bd..b295c8ca31aa 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,14 +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. - 5.1.0 + 5.2.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 6ede3735f133..b8679468bfab 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs @@ -6,8 +6,8 @@ [assembly: AssemblyTitle("Microsoft Azure Data Factory Management Library")] [assembly: AssemblyDescription("Provides management functionality for Microsoft Azure Data Factory Resources.")] -[assembly: AssemblyVersion("5.1.0.0")] -[assembly: AssemblyFileVersion("5.1.0.0")] +[assembly: AssemblyVersion("5.2.0.0")] +[assembly: AssemblyFileVersion("5.2.0.0")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Microsoft")] [assembly: AssemblyProduct("Microsoft Azure .NET SDK")] From a4d3bbf1182ad1d815292cb97e6cf9cd7096f642 Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Mon, 21 Feb 2022 09:47:08 +0800 Subject: [PATCH 05/10] [DataFactory]Added new features into 5.3.0 --- .../datafactory_resource-manager.txt | 4 +- .../src/CHANGELOG.md | 5 + .../Models/QuickbaseLinkedService.cs | 107 ++++++++++++++ .../src/Generated/Models/ScriptActivity.cs | 98 +++++++++++++ .../Models/ScriptActivityLogDestination.cs | 22 +++ .../Models/ScriptActivityParameter.cs | 93 ++++++++++++ .../ScriptActivityParameterDirection.cs | 23 +++ .../Models/ScriptActivityParameterType.cs | 32 +++++ .../Models/ScriptActivityScriptBlock.cs | 92 ++++++++++++ ...ScriptActivityTypePropertiesLogSettings.cs | 83 +++++++++++ .../src/Generated/Models/ScriptType.cs | 22 +++ .../Models/SmartsheetLinkedService.cs | 93 ++++++++++++ .../Models/TeamDeskAuthenticationType.cs | 22 +++ .../Generated/Models/TeamDeskLinkedService.cs | 135 ++++++++++++++++++ .../Models/ZendeskAuthenticationType.cs | 22 +++ .../Generated/Models/ZendeskLinkedService.cs | 135 ++++++++++++++++++ ...rosoft.Azure.Management.DataFactory.csproj | 6 +- .../src/Properties/AssemblyInfo.cs | 4 +- .../JsonSamples/LinkedServiceJsonSamples.cs | 66 +++++++++ .../tests/JsonSamples/PipelineJsonSamples.cs | 32 +++++ 20 files changed, 1089 insertions(+), 7 deletions(-) create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/QuickbaseLinkedService.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ScriptActivity.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ScriptActivityLogDestination.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ScriptActivityParameter.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ScriptActivityParameterDirection.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ScriptActivityParameterType.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ScriptActivityScriptBlock.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ScriptActivityTypePropertiesLogSettings.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ScriptType.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SmartsheetLinkedService.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/TeamDeskAuthenticationType.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/TeamDeskLinkedService.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ZendeskAuthenticationType.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ZendeskLinkedService.cs diff --git a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt index 1fb700cf39cb..3a4c095fa705 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-02-07 01:57:04 UTC +2022-02-21 00:53:12 UTC Azure-rest-api-specs repository information GitHub fork: Azure Branch: main -Commit: 6af1afc7c3fbdea232a80f1334894d459e1dc922 +Commit: 3a1da75f85a757b87642c6482c6a4ee6ad70ff60 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 63a56d4df4d7..bbf160f0ad80 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 5.3.0 +### Feature Additions +- Added ScriptActivity in ADF +- Added TeamDesk, Quickbase, Smartsheet, Zendesk connectors in ADF + ## Version 5.2.0 ### Feature Additions - Added FailActivity in ADF diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/QuickbaseLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/QuickbaseLinkedService.cs new file mode 100644 index 000000000000..d177176b91bb --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/QuickbaseLinkedService.cs @@ -0,0 +1,107 @@ +// +// 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 Quickbase. + /// + [Newtonsoft.Json.JsonObject("Quickbase")] + [Rest.Serialization.JsonTransformation] + public partial class QuickbaseLinkedService : LinkedService + { + /// + /// Initializes a new instance of the QuickbaseLinkedService class. + /// + public QuickbaseLinkedService() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the QuickbaseLinkedService class. + /// + /// The url to connect Quickbase source. Type: string + /// (or Expression with resultType string). + /// The user token for the Quickbase + /// 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 QuickbaseLinkedService(object url, SecretBase userToken, 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) + { + Url = url; + UserToken = userToken; + EncryptedCredential = encryptedCredential; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the url to connect Quickbase source. Type: string (or + /// Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.url")] + public object Url { get; set; } + + /// + /// Gets or sets the user token for the Quickbase source. + /// + [JsonProperty(PropertyName = "typeProperties.userToken")] + public SecretBase UserToken { 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 (Url == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "Url"); + } + if (UserToken == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "UserToken"); + } + } + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ScriptActivity.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ScriptActivity.cs new file mode 100644 index 000000000000..248ef5440521 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ScriptActivity.cs @@ -0,0 +1,98 @@ +// +// 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; + + /// + /// Script activity type. + /// + [Newtonsoft.Json.JsonObject("Script")] + [Rest.Serialization.JsonTransformation] + public partial class ScriptActivity : ExecutionActivity + { + /// + /// Initializes a new instance of the ScriptActivity class. + /// + public ScriptActivity() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the ScriptActivity class. + /// + /// Activity name. + /// Unmatched properties from the + /// message are deserialized this collection + /// Activity description. + /// Activity depends on condition. + /// Activity user properties. + /// Linked service reference. + /// Activity policy. + /// Array of script blocks. Type: array. + /// Log settings of script activity. + public ScriptActivity(string name, IDictionary additionalProperties = default(IDictionary), string description = default(string), IList dependsOn = default(IList), IList userProperties = default(IList), LinkedServiceReference linkedServiceName = default(LinkedServiceReference), ActivityPolicy policy = default(ActivityPolicy), IList scripts = default(IList), ScriptActivityTypePropertiesLogSettings logSettings = default(ScriptActivityTypePropertiesLogSettings)) + : base(name, additionalProperties, description, dependsOn, userProperties, linkedServiceName, policy) + { + Scripts = scripts; + LogSettings = logSettings; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets array of script blocks. Type: array. + /// + [JsonProperty(PropertyName = "typeProperties.scripts")] + public IList Scripts { get; set; } + + /// + /// Gets or sets log settings of script activity. + /// + [JsonProperty(PropertyName = "typeProperties.logSettings")] + public ScriptActivityTypePropertiesLogSettings LogSettings { get; set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public override void Validate() + { + base.Validate(); + if (Scripts != null) + { + foreach (var element in Scripts) + { + if (element != null) + { + element.Validate(); + } + } + } + if (LogSettings != null) + { + LogSettings.Validate(); + } + } + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ScriptActivityLogDestination.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ScriptActivityLogDestination.cs new file mode 100644 index 000000000000..25cd34c60cf0 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ScriptActivityLogDestination.cs @@ -0,0 +1,22 @@ +// +// 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 +{ + + /// + /// Defines values for ScriptActivityLogDestination. + /// + public static class ScriptActivityLogDestination + { + public const string ActivityOutput = "ActivityOutput"; + public const string ExternalStore = "ExternalStore"; + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ScriptActivityParameter.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ScriptActivityParameter.cs new file mode 100644 index 000000000000..90f77239c6f7 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ScriptActivityParameter.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 Newtonsoft.Json; + using System.Linq; + + /// + /// Parameters of a script block. + /// + public partial class ScriptActivityParameter + { + /// + /// Initializes a new instance of the ScriptActivityParameter class. + /// + public ScriptActivityParameter() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the ScriptActivityParameter class. + /// + /// The name of the parameter. Type: string (or + /// Expression with resultType string). + /// The type of the parameter. Possible values + /// include: 'Boolean', 'DateTime', 'DateTimeOffset', 'Decimal', + /// 'Double', 'Guid', 'Int16', 'Int32', 'Int64', 'Single', 'String', + /// 'Timespan' + /// The value of the parameter. + /// The direction of the parameter. Possible + /// values include: 'Input', 'Output', 'InputOutput' + /// The size of the output direction + /// parameter. + public ScriptActivityParameter(object name = default(object), string type = default(string), object value = default(object), string direction = default(string), int? size = default(int?)) + { + Name = name; + Type = type; + Value = value; + Direction = direction; + Size = size; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the name of the parameter. Type: string (or Expression + /// with resultType string). + /// + [JsonProperty(PropertyName = "name")] + public object Name { get; set; } + + /// + /// Gets or sets the type of the parameter. Possible values include: + /// 'Boolean', 'DateTime', 'DateTimeOffset', 'Decimal', 'Double', + /// 'Guid', 'Int16', 'Int32', 'Int64', 'Single', 'String', 'Timespan' + /// + [JsonProperty(PropertyName = "type")] + public string Type { get; set; } + + /// + /// Gets or sets the value of the parameter. + /// + [JsonProperty(PropertyName = "value")] + public object Value { get; set; } + + /// + /// Gets or sets the direction of the parameter. Possible values + /// include: 'Input', 'Output', 'InputOutput' + /// + [JsonProperty(PropertyName = "direction")] + public string Direction { get; set; } + + /// + /// Gets or sets the size of the output direction parameter. + /// + [JsonProperty(PropertyName = "size")] + public int? Size { get; set; } + + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ScriptActivityParameterDirection.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ScriptActivityParameterDirection.cs new file mode 100644 index 000000000000..a1389ad2974a --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ScriptActivityParameterDirection.cs @@ -0,0 +1,23 @@ +// +// 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 +{ + + /// + /// Defines values for ScriptActivityParameterDirection. + /// + public static class ScriptActivityParameterDirection + { + public const string Input = "Input"; + public const string Output = "Output"; + public const string InputOutput = "InputOutput"; + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ScriptActivityParameterType.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ScriptActivityParameterType.cs new file mode 100644 index 000000000000..0832da239198 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ScriptActivityParameterType.cs @@ -0,0 +1,32 @@ +// +// 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 +{ + + /// + /// Defines values for ScriptActivityParameterType. + /// + public static class ScriptActivityParameterType + { + public const string Boolean = "Boolean"; + public const string DateTime = "DateTime"; + public const string DateTimeOffset = "DateTimeOffset"; + public const string Decimal = "Decimal"; + public const string Double = "Double"; + public const string Guid = "Guid"; + public const string Int16 = "Int16"; + public const string Int32 = "Int32"; + public const string Int64 = "Int64"; + public const string Single = "Single"; + public const string String = "String"; + public const string Timespan = "Timespan"; + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ScriptActivityScriptBlock.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ScriptActivityScriptBlock.cs new file mode 100644 index 000000000000..b94be41797b9 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ScriptActivityScriptBlock.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 Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; + using System.Linq; + + /// + /// Script block of scripts. + /// + public partial class ScriptActivityScriptBlock + { + /// + /// Initializes a new instance of the ScriptActivityScriptBlock class. + /// + public ScriptActivityScriptBlock() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the ScriptActivityScriptBlock class. + /// + /// The query text. Type: string (or Expression with + /// resultType string). + /// The type of the query. Type: string. Possible + /// values include: 'Query', 'NonQuery' + /// Array of script parameters. Type: + /// array. + public ScriptActivityScriptBlock(object text, string type, IList parameters = default(IList)) + { + Text = text; + Type = type; + Parameters = parameters; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the query text. Type: string (or Expression with + /// resultType string). + /// + [JsonProperty(PropertyName = "text")] + public object Text { get; set; } + + /// + /// Gets or sets the type of the query. Type: string. Possible values + /// include: 'Query', 'NonQuery' + /// + [JsonProperty(PropertyName = "type")] + public string Type { get; set; } + + /// + /// Gets or sets array of script parameters. Type: array. + /// + [JsonProperty(PropertyName = "parameters")] + public IList Parameters { get; set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public virtual void Validate() + { + if (Text == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "Text"); + } + if (Type == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "Type"); + } + } + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ScriptActivityTypePropertiesLogSettings.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ScriptActivityTypePropertiesLogSettings.cs new file mode 100644 index 000000000000..c37b3cd21ac5 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ScriptActivityTypePropertiesLogSettings.cs @@ -0,0 +1,83 @@ +// +// 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 Newtonsoft.Json; + using System.Linq; + + /// + /// Log settings of script activity. + /// + public partial class ScriptActivityTypePropertiesLogSettings + { + /// + /// Initializes a new instance of the + /// ScriptActivityTypePropertiesLogSettings class. + /// + public ScriptActivityTypePropertiesLogSettings() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the + /// ScriptActivityTypePropertiesLogSettings class. + /// + /// The destination of logs. Type: string. + /// Possible values include: 'ActivityOutput', 'ExternalStore' + /// Log location settings customer + /// needs to provide when enabling log. + public ScriptActivityTypePropertiesLogSettings(string logDestination, LogLocationSettings logLocationSettings = default(LogLocationSettings)) + { + LogDestination = logDestination; + LogLocationSettings = logLocationSettings; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the destination of logs. Type: string. Possible values + /// include: 'ActivityOutput', 'ExternalStore' + /// + [JsonProperty(PropertyName = "logDestination")] + public string LogDestination { get; set; } + + /// + /// Gets or sets log location settings customer needs to provide when + /// enabling log. + /// + [JsonProperty(PropertyName = "logLocationSettings")] + public LogLocationSettings LogLocationSettings { get; set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public virtual void Validate() + { + if (LogDestination == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "LogDestination"); + } + if (LogLocationSettings != null) + { + LogLocationSettings.Validate(); + } + } + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ScriptType.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ScriptType.cs new file mode 100644 index 000000000000..fb0d08c8b2ee --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ScriptType.cs @@ -0,0 +1,22 @@ +// +// 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 +{ + + /// + /// Defines values for ScriptType. + /// + public static class ScriptType + { + public const string Query = "Query"; + public const string NonQuery = "NonQuery"; + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SmartsheetLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SmartsheetLinkedService.cs new file mode 100644 index 000000000000..bbc61008bcbb --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SmartsheetLinkedService.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 Smartsheet. + /// + [Newtonsoft.Json.JsonObject("Smartsheet")] + [Rest.Serialization.JsonTransformation] + public partial class SmartsheetLinkedService : LinkedService + { + /// + /// Initializes a new instance of the SmartsheetLinkedService class. + /// + public SmartsheetLinkedService() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the SmartsheetLinkedService class. + /// + /// The api token for the Smartsheet + /// 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 SmartsheetLinkedService(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 Smartsheet 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/TeamDeskAuthenticationType.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/TeamDeskAuthenticationType.cs new file mode 100644 index 000000000000..fe1b0cb5872f --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/TeamDeskAuthenticationType.cs @@ -0,0 +1,22 @@ +// +// 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 +{ + + /// + /// Defines values for TeamDeskAuthenticationType. + /// + public static class TeamDeskAuthenticationType + { + public const string Basic = "Basic"; + public const string Token = "Token"; + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/TeamDeskLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/TeamDeskLinkedService.cs new file mode 100644 index 000000000000..1c22f1d59e13 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/TeamDeskLinkedService.cs @@ -0,0 +1,135 @@ +// +// 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 TeamDesk. + /// + [Newtonsoft.Json.JsonObject("TeamDesk")] + [Rest.Serialization.JsonTransformation] + public partial class TeamDeskLinkedService : LinkedService + { + /// + /// Initializes a new instance of the TeamDeskLinkedService class. + /// + public TeamDeskLinkedService() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the TeamDeskLinkedService class. + /// + /// The authentication type to use. + /// Possible values include: 'Basic', 'Token' + /// The url to connect TeamDesk source. Type: string + /// (or Expression with resultType string). + /// 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 username of the TeamDesk source. Type: + /// string (or Expression with resultType string). + /// The password of the TeamDesk source. + /// The api token for the TeamDesk + /// source. + /// The encrypted credential used for + /// authentication. Credentials are encrypted using the integration + /// runtime credential manager. Type: string (or Expression with + /// resultType string). + public TeamDeskLinkedService(string authenticationType, object url, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object userName = default(object), SecretBase password = default(SecretBase), SecretBase apiToken = default(SecretBase), object encryptedCredential = default(object)) + : base(additionalProperties, connectVia, description, parameters, annotations) + { + AuthenticationType = authenticationType; + Url = url; + UserName = userName; + Password = password; + ApiToken = apiToken; + EncryptedCredential = encryptedCredential; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the authentication type to use. Possible values + /// include: 'Basic', 'Token' + /// + [JsonProperty(PropertyName = "typeProperties.authenticationType")] + public string AuthenticationType { get; set; } + + /// + /// Gets or sets the url to connect TeamDesk source. Type: string (or + /// Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.url")] + public object Url { get; set; } + + /// + /// Gets or sets the username of the TeamDesk source. Type: string (or + /// Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.userName")] + public object UserName { get; set; } + + /// + /// Gets or sets the password of the TeamDesk source. + /// + [JsonProperty(PropertyName = "typeProperties.password")] + public SecretBase Password { get; set; } + + /// + /// Gets or sets the api token for the TeamDesk 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 (AuthenticationType == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "AuthenticationType"); + } + if (Url == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "Url"); + } + } + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ZendeskAuthenticationType.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ZendeskAuthenticationType.cs new file mode 100644 index 000000000000..4f43799c39e5 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ZendeskAuthenticationType.cs @@ -0,0 +1,22 @@ +// +// 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 +{ + + /// + /// Defines values for ZendeskAuthenticationType. + /// + public static class ZendeskAuthenticationType + { + public const string Basic = "Basic"; + public const string Token = "Token"; + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ZendeskLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ZendeskLinkedService.cs new file mode 100644 index 000000000000..c55e6cb6488f --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ZendeskLinkedService.cs @@ -0,0 +1,135 @@ +// +// 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 Zendesk. + /// + [Newtonsoft.Json.JsonObject("Zendesk")] + [Rest.Serialization.JsonTransformation] + public partial class ZendeskLinkedService : LinkedService + { + /// + /// Initializes a new instance of the ZendeskLinkedService class. + /// + public ZendeskLinkedService() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the ZendeskLinkedService class. + /// + /// The authentication type to use. + /// Possible values include: 'Basic', 'Token' + /// The url to connect Zendesk source. Type: string + /// (or Expression with resultType string). + /// 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 username of the Zendesk source. Type: + /// string (or Expression with resultType string). + /// The password of the Zendesk source. + /// The api token for the Zendesk + /// source. + /// The encrypted credential used for + /// authentication. Credentials are encrypted using the integration + /// runtime credential manager. Type: string (or Expression with + /// resultType string). + public ZendeskLinkedService(string authenticationType, object url, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object userName = default(object), SecretBase password = default(SecretBase), SecretBase apiToken = default(SecretBase), object encryptedCredential = default(object)) + : base(additionalProperties, connectVia, description, parameters, annotations) + { + AuthenticationType = authenticationType; + Url = url; + UserName = userName; + Password = password; + ApiToken = apiToken; + EncryptedCredential = encryptedCredential; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the authentication type to use. Possible values + /// include: 'Basic', 'Token' + /// + [JsonProperty(PropertyName = "typeProperties.authenticationType")] + public string AuthenticationType { get; set; } + + /// + /// Gets or sets the url to connect Zendesk source. Type: string (or + /// Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.url")] + public object Url { get; set; } + + /// + /// Gets or sets the username of the Zendesk source. Type: string (or + /// Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.userName")] + public object UserName { get; set; } + + /// + /// Gets or sets the password of the Zendesk source. + /// + [JsonProperty(PropertyName = "typeProperties.password")] + public SecretBase Password { get; set; } + + /// + /// Gets or sets the api token for the Zendesk 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 (AuthenticationType == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "AuthenticationType"); + } + if (Url == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "Url"); + } + } + } +} 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 b295c8ca31aa..f2f3af9bb8db 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. - 5.2.0 + 5.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 b8679468bfab..ebb109eea6ef 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs @@ -6,8 +6,8 @@ [assembly: AssemblyTitle("Microsoft Azure Data Factory Management Library")] [assembly: AssemblyDescription("Provides management functionality for Microsoft Azure Data Factory Resources.")] -[assembly: AssemblyVersion("5.2.0.0")] -[assembly: AssemblyFileVersion("5.2.0.0")] +[assembly: AssemblyVersion("5.3.0.0")] +[assembly: AssemblyFileVersion("5.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 cdb07ff29899..78af312785dd 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/LinkedServiceJsonSamples.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/LinkedServiceJsonSamples.cs @@ -3304,6 +3304,72 @@ public class LinkedServiceJsonSamples : JsonSampleCollection ] } } +"; + + [JsonSample] + public const string ExecuteScriptActivityPipeline = @" +{ + ""name"": ""##PipelineName##"", + ""properties"": { + ""activities"": [ + { + ""name"": ""MyScriptActivity"", + ""type"": ""Script"", + ""linkedServiceName"": { + ""referenceName"": ""myLinkedService"", + ""type"": ""LinkedServiceReference"" + }, + ""typeProperties"": { + ""scripts"": [ + { + ""text"": ""@pipeline().parameters.query"", + ""type"": ""Query"" + } + ] + } + } + ], + ""parameters"": { + ""query"": { + ""type"": ""String"" + } + } + } +} "; } } From 82e46321abf038a1568a12f4e211b8b4517bcfd4 Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Mon, 21 Mar 2022 10:38:12 +0800 Subject: [PATCH 06/10] [DataFactory]Added new features into 5.4.0 --- .../datafactory_resource-manager.txt | 4 +- .../src/CHANGELOG.md | 4 ++ .../src/Customizations/WebActivity.cs | 55 +++++++++++++++++++ .../src/Generated/Models/WebActivity.cs | 12 +++- ...rosoft.Azure.Management.DataFactory.csproj | 5 +- .../src/Properties/AssemblyInfo.cs | 4 +- .../tests/UnitTests/ActivityTests.cs | 5 +- 7 files changed, 79 insertions(+), 10 deletions(-) create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/WebActivity.cs diff --git a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt index 3a4c095fa705..4315c8929c47 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-02-21 00:53:12 UTC +2022-03-21 01:51:54 UTC Azure-rest-api-specs repository information GitHub fork: Azure Branch: main -Commit: 3a1da75f85a757b87642c6482c6a4ee6ad70ff60 +Commit: 0d9772a5c3a716070662572a2a7700718cfba959 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 bbf160f0ad80..0aa36b40757e 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog for the Azure Data Factory V2 .NET SDK +## Version 5.4.0 +### Feature Additions +- Added Web Activity disable cert validation + ## Version 5.3.0 ### Feature Additions - Added ScriptActivity in ADF diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/WebActivity.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/WebActivity.cs new file mode 100644 index 000000000000..b2d499d9e1f2 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/WebActivity.cs @@ -0,0 +1,55 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Microsoft.Azure.Management.DataFactory.Models +{ + public partial class WebActivity + { + /// + /// Initializes a new instance of the WebActivity class. + /// + /// Activity name. + /// Rest API method for target endpoint. Possible + /// values include: 'GET', 'POST', 'PUT', 'DELETE' + /// Web activity target endpoint and path. Type: + /// string (or Expression with resultType string). + /// Unmatched properties from the + /// message are deserialized this collection + /// Activity description. + /// Activity depends on condition. + /// Activity user properties. + /// Linked service reference. + /// Activity policy. + /// Represents the headers that will be sent to + /// the request. For example, to set the language and type on a + /// request: "headers" : { "Accept-Language": "en-us", "Content-Type": + /// "application/json" }. Type: string (or Expression with resultType + /// string). + /// Represents the payload that will be sent to the + /// endpoint. Required for POST/PUT method, not allowed for GET method + /// Type: string (or Expression with resultType string). + /// Authentication method used for calling + /// the endpoint. + /// List of datasets passed to web + /// endpoint. + /// List of linked services passed to web + /// endpoint. + /// The integration runtime reference. + public WebActivity(string name, string method, object url, IDictionary additionalProperties = default(IDictionary), string description = default(string), IList dependsOn = default(IList), IList userProperties = default(IList), LinkedServiceReference linkedServiceName = default(LinkedServiceReference), ActivityPolicy policy = default(ActivityPolicy), object headers = default(object), object body = default(object), WebActivityAuthentication authentication = default(WebActivityAuthentication), IList datasets = default(IList), IList linkedServices = default(IList), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference)) + : base(name, additionalProperties, description, dependsOn, userProperties, linkedServiceName, policy) + { + Method = method; + Url = url; + Headers = headers; + Body = body; + Authentication = authentication; + Datasets = datasets; + LinkedServices = linkedServices; + ConnectVia = connectVia; + CustomInit(); + } + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/WebActivity.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/WebActivity.cs index 22903288be1c..43d85ea4bf7c 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/WebActivity.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/WebActivity.cs @@ -56,12 +56,14 @@ public WebActivity() /// Type: string (or Expression with resultType string). /// Authentication method used for calling /// the endpoint. + /// When set to true, Certificate + /// validation will be disabled. /// List of datasets passed to web /// endpoint. /// List of linked services passed to web /// endpoint. /// The integration runtime reference. - public WebActivity(string name, string method, object url, IDictionary additionalProperties = default(IDictionary), string description = default(string), IList dependsOn = default(IList), IList userProperties = default(IList), LinkedServiceReference linkedServiceName = default(LinkedServiceReference), ActivityPolicy policy = default(ActivityPolicy), object headers = default(object), object body = default(object), WebActivityAuthentication authentication = default(WebActivityAuthentication), IList datasets = default(IList), IList linkedServices = default(IList), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference)) + public WebActivity(string name, string method, object url, IDictionary additionalProperties = default(IDictionary), string description = default(string), IList dependsOn = default(IList), IList userProperties = default(IList), LinkedServiceReference linkedServiceName = default(LinkedServiceReference), ActivityPolicy policy = default(ActivityPolicy), object headers = default(object), object body = default(object), WebActivityAuthentication authentication = default(WebActivityAuthentication), bool? disableCertValidation = default(bool?), IList datasets = default(IList), IList linkedServices = default(IList), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference)) : base(name, additionalProperties, description, dependsOn, userProperties, linkedServiceName, policy) { Method = method; @@ -69,6 +71,7 @@ public WebActivity() Headers = headers; Body = body; Authentication = authentication; + DisableCertValidation = disableCertValidation; Datasets = datasets; LinkedServices = linkedServices; ConnectVia = connectVia; @@ -118,6 +121,13 @@ public WebActivity() [JsonProperty(PropertyName = "typeProperties.authentication")] public WebActivityAuthentication Authentication { get; set; } + /// + /// Gets or sets when set to true, Certificate validation will be + /// disabled. + /// + [JsonProperty(PropertyName = "typeProperties.disableCertValidation")] + public bool? DisableCertValidation { get; set; } + /// /// Gets or sets list of datasets passed to web endpoint. /// 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 f2f3af9bb8db..94b94fc5a619 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,12 @@ 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. - 5.3.0 + 5.4.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 ebb109eea6ef..8c705581933e 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs @@ -6,8 +6,8 @@ [assembly: AssemblyTitle("Microsoft Azure Data Factory Management Library")] [assembly: AssemblyDescription("Provides management functionality for Microsoft Azure Data Factory Resources.")] -[assembly: AssemblyVersion("5.3.0.0")] -[assembly: AssemblyFileVersion("5.3.0.0")] +[assembly: AssemblyVersion("5.4.0.0")] +[assembly: AssemblyFileVersion("5.4.0.0")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Microsoft")] [assembly: AssemblyProduct("Microsoft Azure .NET SDK")] diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/UnitTests/ActivityTests.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/UnitTests/ActivityTests.cs index 4aa8e2c92176..de3f4c024172 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/UnitTests/ActivityTests.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/UnitTests/ActivityTests.cs @@ -34,7 +34,7 @@ public void Activity_SerializationTest(JsonSampleInfo jsonSample) { TestJsonSample(jsonSample); } - + [Fact] public void ExecutePipelineActivity_SDKSample() { @@ -139,7 +139,8 @@ public void ExecuteBasicWebActivity_SDKSample() Username = "test", Password = new SecureString("fake"), Type = "Basic" - } + }, + DisableCertValidation = false }; var handler = new RecordedDelegatingHandler(); From a9c57f0dff7bca7f82f037b2449fa25413883c9a Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Mon, 11 Apr 2022 10:01:56 +0800 Subject: [PATCH 07/10] [DataFactory]Added new features into 5.5.0 --- .../datafactory_resource-manager.txt | 4 +- .../src/CHANGELOG.md | 5 ++ .../Customizations/ExecutePipelineActivity.cs | 30 +++++++++ .../Models/ExecutePipelineActivity.cs | 10 ++- .../Models/ExecutePipelineActivityPolicy.cs | 67 +++++++++++++++++++ .../SqlServerStoredProcedureActivity.cs | 4 +- ...rosoft.Azure.Management.DataFactory.csproj | 5 +- .../src/Properties/AssemblyInfo.cs | 4 +- .../tests/UnitTests/ActivityTests.cs | 9 +-- 9 files changed, 125 insertions(+), 13 deletions(-) create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/ExecutePipelineActivity.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ExecutePipelineActivityPolicy.cs diff --git a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt index 4315c8929c47..4a3a5bafea92 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-03-21 01:51:54 UTC +2022-04-11 01:10:45 UTC Azure-rest-api-specs repository information GitHub fork: Azure Branch: main -Commit: 0d9772a5c3a716070662572a2a7700718cfba959 +Commit: 74ca59fc8cb6563d5a9d66fb533b8622522143eb 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 0aa36b40757e..b123bf6a1c55 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 5.5.0 +### Feature Additions +- Fixed Expression mode for SqlServerStoredProcedureActivity +- Added Policy property into ExecutePipelineActivity + ## Version 5.4.0 ### Feature Additions - Added Web Activity disable cert validation diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/ExecutePipelineActivity.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/ExecutePipelineActivity.cs new file mode 100644 index 000000000000..3ebdc58a4b4c --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/ExecutePipelineActivity.cs @@ -0,0 +1,30 @@ +using System.Collections.Generic; + +namespace Microsoft.Azure.Management.DataFactory.Models +{ + public partial class ExecutePipelineActivity : ControlActivity + { + /// + /// Initializes a new instance of the ExecutePipelineActivity class. + /// + /// Activity name. + /// Pipeline reference. + /// Unmatched properties from the + /// message are deserialized this collection + /// Activity description. + /// Activity depends on condition. + /// Activity user properties. + /// Pipeline parameters. + /// Defines whether activity execution + /// will wait for the dependent pipeline execution to finish. Default + /// is false. + public ExecutePipelineActivity(string name, PipelineReference pipeline, IDictionary additionalProperties = default(IDictionary), string description = default(string), IList dependsOn = default(IList), IList userProperties = default(IList), IDictionary parameters = default(IDictionary), bool? waitOnCompletion = default(bool?)) + : base(name, additionalProperties, description, dependsOn, userProperties) + { + Pipeline = pipeline; + Parameters = parameters; + WaitOnCompletion = waitOnCompletion; + CustomInit(); + } + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ExecutePipelineActivity.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ExecutePipelineActivity.cs index 062a707223fe..c8bc0a59f944 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ExecutePipelineActivity.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ExecutePipelineActivity.cs @@ -43,13 +43,15 @@ public ExecutePipelineActivity() /// Activity description. /// Activity depends on condition. /// Activity user properties. + /// Execute pipeline activity policy. /// Pipeline parameters. /// Defines whether activity execution /// will wait for the dependent pipeline execution to finish. Default /// is false. - public ExecutePipelineActivity(string name, PipelineReference pipeline, IDictionary additionalProperties = default(IDictionary), string description = default(string), IList dependsOn = default(IList), IList userProperties = default(IList), IDictionary parameters = default(IDictionary), bool? waitOnCompletion = default(bool?)) + public ExecutePipelineActivity(string name, PipelineReference pipeline, IDictionary additionalProperties = default(IDictionary), string description = default(string), IList dependsOn = default(IList), IList userProperties = default(IList), ExecutePipelineActivityPolicy policy = default(ExecutePipelineActivityPolicy), IDictionary parameters = default(IDictionary), bool? waitOnCompletion = default(bool?)) : base(name, additionalProperties, description, dependsOn, userProperties) { + Policy = policy; Pipeline = pipeline; Parameters = parameters; WaitOnCompletion = waitOnCompletion; @@ -61,6 +63,12 @@ public ExecutePipelineActivity() /// partial void CustomInit(); + /// + /// Gets or sets execute pipeline activity policy. + /// + [JsonProperty(PropertyName = "policy")] + public ExecutePipelineActivityPolicy Policy { get; set; } + /// /// Gets or sets pipeline reference. /// diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ExecutePipelineActivityPolicy.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ExecutePipelineActivityPolicy.cs new file mode 100644 index 000000000000..502c8137f185 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ExecutePipelineActivityPolicy.cs @@ -0,0 +1,67 @@ +// +// 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; + + /// + /// Execution policy for an execute pipeline activity. + /// + public partial class ExecutePipelineActivityPolicy + { + /// + /// Initializes a new instance of the ExecutePipelineActivityPolicy + /// class. + /// + public ExecutePipelineActivityPolicy() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the ExecutePipelineActivityPolicy + /// class. + /// + /// Unmatched properties from the + /// message are deserialized this collection + /// When set to true, Input from activity is + /// considered as secure and will not be logged to monitoring. + public ExecutePipelineActivityPolicy(IDictionary additionalProperties = default(IDictionary), bool? secureInput = default(bool?)) + { + AdditionalProperties = additionalProperties; + SecureInput = secureInput; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets unmatched properties from the message are deserialized + /// this collection + /// + [JsonExtensionData] + public IDictionary AdditionalProperties { get; set; } + + /// + /// Gets or sets when set to true, Input from activity is considered as + /// secure and will not be logged to monitoring. + /// + [JsonProperty(PropertyName = "secureInput")] + public bool? SecureInput { get; set; } + + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlServerStoredProcedureActivity.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlServerStoredProcedureActivity.cs index ddd80da8c3b4..3e1c004afe25 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlServerStoredProcedureActivity.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlServerStoredProcedureActivity.cs @@ -50,7 +50,7 @@ public SqlServerStoredProcedureActivity() /// Value and type setting for /// stored procedure parameters. Example: "{Parameter1: {value: "1", /// type: "int"}}". - public SqlServerStoredProcedureActivity(string name, object storedProcedureName, IDictionary additionalProperties = default(IDictionary), string description = default(string), IList dependsOn = default(IList), IList userProperties = default(IList), LinkedServiceReference linkedServiceName = default(LinkedServiceReference), ActivityPolicy policy = default(ActivityPolicy), IDictionary storedProcedureParameters = default(IDictionary)) + public SqlServerStoredProcedureActivity(string name, object storedProcedureName, IDictionary additionalProperties = default(IDictionary), string description = default(string), IList dependsOn = default(IList), IList userProperties = default(IList), LinkedServiceReference linkedServiceName = default(LinkedServiceReference), ActivityPolicy policy = default(ActivityPolicy), object storedProcedureParameters = default(object)) : base(name, additionalProperties, description, dependsOn, userProperties, linkedServiceName, policy) { StoredProcedureName = storedProcedureName; @@ -75,7 +75,7 @@ public SqlServerStoredProcedureActivity() /// parameters. Example: "{Parameter1: {value: "1", type: "int"}}". /// [JsonProperty(PropertyName = "typeProperties.storedProcedureParameters")] - public IDictionary StoredProcedureParameters { get; set; } + public object StoredProcedureParameters { get; set; } /// /// Validate the object. 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 94b94fc5a619..ccb48ed761b8 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,12 +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. - 5.4.0 + 5.5.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 8c705581933e..36ce1994512c 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs @@ -6,8 +6,8 @@ [assembly: AssemblyTitle("Microsoft Azure Data Factory Management Library")] [assembly: AssemblyDescription("Provides management functionality for Microsoft Azure Data Factory Resources.")] -[assembly: AssemblyVersion("5.4.0.0")] -[assembly: AssemblyFileVersion("5.4.0.0")] +[assembly: AssemblyVersion("5.5.0.0")] +[assembly: AssemblyFileVersion("5.5.0.0")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Microsoft")] [assembly: AssemblyProduct("Microsoft Azure .NET SDK")] diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/UnitTests/ActivityTests.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/UnitTests/ActivityTests.cs index de3f4c024172..9de815de1e75 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/UnitTests/ActivityTests.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/UnitTests/ActivityTests.cs @@ -2,14 +2,14 @@ // Licensed under the MIT License. See License.txt in the project root for // license information. +using System; +using System.Collections.Generic; +using System.Globalization; using DataFactory.Tests.JsonSamples; using DataFactory.Tests.Utils; using Microsoft.Azure.Management.DataFactory.Models; using Microsoft.Rest.Serialization; using Newtonsoft.Json.Linq; -using System; -using System.Collections.Generic; -using System.Globalization; using Xunit; using Xunit.Abstractions; using Xunit.Sdk; @@ -45,7 +45,8 @@ public void ExecutePipelineActivity_SDKSample() Description = "Execute pipeline activity", Pipeline = new PipelineReference(triggeredPipelineName), Parameters = new Dictionary(), - WaitOnCompletion = true + WaitOnCompletion = true, + Policy = new ExecutePipelineActivityPolicy() }; var handler = new RecordedDelegatingHandler(); From 8dd3fbb8fe5754dd56af63302ca3043be7a0a326 Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Tue, 12 Apr 2022 14:15:10 +0800 Subject: [PATCH 08/10] Update --- .../Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md | 3 ++- .../src/Microsoft.Azure.Management.DataFactory.csproj | 2 +- .../src/Properties/AssemblyInfo.cs | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md index b123bf6a1c55..44549cdc5993 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md @@ -1,7 +1,8 @@ # Changelog for the Azure Data Factory V2 .NET SDK -## Version 5.5.0 +## Version 6.0.0 ### Feature Additions +### Breaking Changes - Fixed Expression mode for SqlServerStoredProcedureActivity - Added Policy property into ExecutePipelineActivity 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 ccb48ed761b8..7b2b832bbe29 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,7 +5,7 @@ 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. - 5.5.0 + 6.0.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 36ce1994512c..04dcf8343d00 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs @@ -6,8 +6,8 @@ [assembly: AssemblyTitle("Microsoft Azure Data Factory Management Library")] [assembly: AssemblyDescription("Provides management functionality for Microsoft Azure Data Factory Resources.")] -[assembly: AssemblyVersion("5.5.0.0")] -[assembly: AssemblyFileVersion("5.5.0.0")] +[assembly: AssemblyVersion("6.0.0.0")] +[assembly: AssemblyFileVersion("6.0.0.0")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Microsoft")] [assembly: AssemblyProduct("Microsoft Azure .NET SDK")] From b6ffa27fd5fa734398af9d73590db89eac09ceaa Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Tue, 26 Apr 2022 09:51:46 +0800 Subject: [PATCH 09/10] [DataFactory]Added new features into 6.1.0 --- .../datafactory_resource-manager.txt | 4 +- .../src/CHANGELOG.md | 5 + .../Models/AppFiguresLinkedService.cs | 106 ++++++++++++++++++ .../Generated/Models/AsanaLinkedService.cs | 92 +++++++++++++++ .../Models/DataworldLinkedService.cs | 93 +++++++++++++++ .../src/Generated/Models/PrivateEndpoint.cs | 51 +++++++++ .../PrivateLinkConnectionApprovalRequest.cs | 11 +- .../Generated/Models/TwilioLinkedService.cs | 91 +++++++++++++++ ...rosoft.Azure.Management.DataFactory.csproj | 6 +- .../src/Properties/AssemblyInfo.cs | 4 +- .../JsonSamples/LinkedServiceJsonSamples.cs | 15 +++ .../PrivateEndpointConnection_Create.json | 3 + 12 files changed, 473 insertions(+), 8 deletions(-) create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AppFiguresLinkedService.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AsanaLinkedService.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DataworldLinkedService.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PrivateEndpoint.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/TwilioLinkedService.cs 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..595a38390f50 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs @@ -6,8 +6,8 @@ [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: AssemblyVersion("6.1.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 Date: Wed, 27 Apr 2022 10:02:57 +0800 Subject: [PATCH 10/10] update --- .../src/Properties/AssemblyInfo.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 595a38390f50..952a88018607 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs @@ -6,7 +6,7 @@ [assembly: AssemblyTitle("Microsoft Azure Data Factory Management Library")] [assembly: AssemblyDescription("Provides management functionality for Microsoft Azure Data Factory Resources.")] -[assembly: AssemblyVersion("6.1.0.0")] +[assembly: AssemblyVersion("6.0.0.0")] [assembly: AssemblyFileVersion("6.1.0.0")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Microsoft")]